Removed the m_ prefix used in the public members of CompletionItem

7 files changed, 76 insertions, 76 deletions

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index cd0c8f705e..4216acac8a 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -161,7 +161,7 @@ public:
         Symbol *previousSymbol = switchSymbol(symbol);
         accept(symbol->identity());
         if (_item)
-            _item.m_data = QVariant::fromValue(symbol);
+            _item.data = QVariant::fromValue(symbol);
         (void) switchSymbol(previousSymbol);
         return switchCompletionItem(previousItem);
     }
@@ -184,8 +184,8 @@ protected:
     TextEditor::CompletionItem newCompletionItem(Name *name)
     {
         TextEditor::CompletionItem item(_collector);
-        item.m_text = overview.prettyName(name);
-        item.m_icon = _collector->iconForSymbol(_symbol);
+        item.text = overview.prettyName(name);
+        item.icon = _collector->iconForSymbol(_symbol);
         return item;
     }
 
@@ -195,7 +195,7 @@ protected:
     virtual void visit(TemplateNameId *name)
     {
         _item = newCompletionItem(name);
-        _item.m_text = QLatin1String(name->identifier()->chars());
+        _item.text = QLatin1String(name->identifier()->chars());
     }
 
     virtual void visit(DestructorNameId *name)
@@ -474,8 +474,8 @@ int CppQuickFixCollector::startCompletion(TextEditor::ITextEditable *editor)
             int i = 0;
             foreach (QuickFixOperationPtr op, quickFixes) {
                 TextEditor::CompletionItem item(this);
-                item.m_text = op->description();
-                item.m_data = QVariant::fromValue(i);
+                item.text = op->description();
+                item.data = QVariant::fromValue(i);
                 _completions.append(item);
                 ++i;
             }
@@ -494,7 +494,7 @@ void CppQuickFixCollector::complete(const TextEditor::CompletionItem &item)
 {
     CppEditorSupport *extra = _modelManager->editorSupport(_editor);
     const QList<QuickFixOperationPtr> quickFixes = extra->quickFixes();
-    QuickFixOperationPtr quickFix = quickFixes.at(item.m_data.toInt());
+    QuickFixOperationPtr quickFix = quickFixes.at(item.data.toInt());
     TextEditor::BaseTextEditor *ed = qobject_cast<TextEditor::BaseTextEditor *>(_editor->widget());
     quickFix->apply(ed->textCursor());
 }
@@ -508,7 +508,7 @@ CppCodeCompletion::CppCodeCompletion(CppModelManager *manager)
     : ICompletionCollector(manager),
       m_manager(manager),
       m_caseSensitivity(Qt::CaseSensitive),
-      m_autoInsertBrackets(true),
+      awesome(true),
       m_forcedCompletion(false),
       m_completionOperator(T_EOF_SYMBOL)
 {
@@ -531,12 +531,12 @@ void CppCodeCompletion::setCaseSensitivity(Qt::CaseSensitivity caseSensitivity)
 
 bool CppCodeCompletion::autoInsertBrackets() const
 {
-    return m_autoInsertBrackets;
+    return awesome;
 }
 
 void CppCodeCompletion::setAutoInsertBrackets(bool autoInsertBrackets)
 {
-    m_autoInsertBrackets = autoInsertBrackets;
+    awesome = autoInsertBrackets;
 }
 
 bool CppCodeCompletion::isPartialCompletionEnabled() const
@@ -757,8 +757,8 @@ int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
     if (m_completionOperator == T_DOXY_COMMENT) {
         for (int i = 1; i < T_DOXY_LAST_TAG; ++i) {
             TextEditor::CompletionItem item(this);
-            item.m_text.append(QString::fromLatin1(doxygenTagSpell(i)));
-            item.m_icon = m_icons.keywordIcon();
+            item.text.append(QString::fromLatin1(doxygenTagSpell(i)));
+            item.icon = m_icons.keywordIcon();
             m_completions.append(item);
         }
 
@@ -1148,8 +1148,8 @@ void CppCodeCompletion::addKeywords()
     // keyword completion items.
     for (int i = T_FIRST_KEYWORD; i < T_FIRST_OBJC_AT_KEYWORD; ++i) {
         TextEditor::CompletionItem item(this);
-        item.m_text = QLatin1String(Token::name(i));
-        item.m_icon = m_icons.keywordIcon();
+        item.text = QLatin1String(Token::name(i));
+        item.icon = m_icons.keywordIcon();
         m_completions.append(item);
     }
 }
@@ -1164,8 +1164,8 @@ void CppCodeCompletion::addMacros(const LookupContext &context)
 
     foreach (const QString &macroName, definedMacros) {
         TextEditor::CompletionItem item(this);
-        item.m_text = macroName;
-        item.m_icon = m_icons.macroIcon();
+        item.text = macroName;
+        item.icon = m_icons.macroIcon();
         m_completions.append(item);
     }
 }
@@ -1235,9 +1235,9 @@ bool CppCodeCompletion::completeInclude(const QTextCursor &cursor)
             }
             foreach (const QString &itemText, m_manager->includesInPath(realPath)) {
                 TextEditor::CompletionItem item(this);
-                item.m_text += itemText;
+                item.text += itemText;
                 // TODO: Icon for include files
-                item.m_icon = m_icons.keywordIcon();
+                item.icon = m_icons.keywordIcon();
                 m_completions.append(item);
             }
         }
@@ -1252,9 +1252,9 @@ bool CppCodeCompletion::completeInclude(const QTextCursor &cursor)
             }
             foreach (const QString &itemText, m_manager->includesInPath(realPath)) {
                 TextEditor::CompletionItem item(this);
-                item.m_text += itemText;
+                item.text += itemText;
                 // TODO: Icon for include files
-                item.m_icon = m_icons.keywordIcon();
+                item.icon = m_icons.keywordIcon();
                 m_completions.append(item);
             }
         }
@@ -1389,7 +1389,7 @@ bool CppCodeCompletion::completeQtMethod(const QList<TypeOfExpression::Result> &
                         if (! signatures.contains(signature)) {
                             signatures.insert(signature);
 
-                            ci.m_text = signature; // fix the completion item.
+                            ci.text = signature; // fix the completion item.
                             m_completions.append(ci);
                         }
 
@@ -1446,9 +1446,9 @@ void CppCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
             const QRegExp regExp(keyRegExp, m_caseSensitivity);
 
             foreach (TextEditor::CompletionItem item, m_completions) {
-                if (regExp.indexIn(item.m_text) == 0) {
-                    item.m_relevance = (key.length() > 0 &&
-                                         item.m_text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
+                if (regExp.indexIn(item.text) == 0) {
+                    item.relevance = (key.length() > 0 &&
+                                         item.text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
                     (*completions) << item;
                 }
             }
@@ -1456,7 +1456,7 @@ void CppCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
                    m_completionOperator == T_SIGNAL ||
                    m_completionOperator == T_SLOT) {
             foreach (TextEditor::CompletionItem item, m_completions) {
-                if (item.m_text.startsWith(key, Qt::CaseInsensitive)) {
+                if (item.text.startsWith(key, Qt::CaseInsensitive)) {
                     (*completions) << item;
                 }
             }
@@ -1468,8 +1468,8 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
 {
     Symbol *symbol = 0;
 
-    if (item.m_data.isValid())
-        symbol = item.m_data.value<Symbol *>();
+    if (item.data.isValid())
+        symbol = item.data.value<Symbol *>();
 
     QString toInsert;
     QString extraChars;
@@ -1479,19 +1479,19 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
     bool autoParenthesesEnabled = true;
 
     if (m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) {
-        toInsert = item.m_text;
+        toInsert = item.text;
         extraChars += QLatin1Char(')');
     } else if (m_completionOperator == T_STRING_LITERAL || m_completionOperator == T_ANGLE_STRING_LITERAL) {
-        toInsert = item.m_text;
+        toInsert = item.text;
         if (!toInsert.endsWith(QLatin1Char('/')))
             extraChars += QLatin1Char((m_completionOperator == T_ANGLE_STRING_LITERAL) ? '>' : '"');
     } else {
-        toInsert = item.m_text;
+        toInsert = item.text;
 
         //qDebug() << "current symbol:" << overview.prettyName(symbol->name())
         //<< overview.prettyType(symbol->type());
 
-        if (m_autoInsertBrackets && symbol && symbol->type()) {
+        if (awesome && symbol && symbol->type()) {
             if (Function *function = symbol->type()->asFunctionType()) {
                 // If the member is a function, automatically place the opening parenthesis,
                 // except when it might take template parameters.
@@ -1511,7 +1511,7 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
                     bool endWithSemicolon = function->returnType()->isVoidType() && m_completionOperator != T_COLON_COLON;
 
                     // If the function takes no arguments, automatically place the closing parenthesis
-                    if (item.m_duplicateCount == 0 && ! function->hasArguments()) {
+                    if (item.duplicateCount == 0 && ! function->hasArguments()) {
                         extraChars += QLatin1Char(')');
                         if (endWithSemicolon)
                             extraChars += QLatin1Char(';');
@@ -1560,8 +1560,8 @@ bool CppCodeCompletion::partiallyComplete(const QList<TextEditor::CompletionItem
         return true;
     } else if (m_partialCompletionEnabled && m_completionOperator != T_LPAREN) {
         // Compute common prefix
-        QString firstKey = completionItems.first().m_text;
-        QString lastKey = completionItems.last().m_text;
+        QString firstKey = completionItems.first().text;
+        QString lastKey = completionItems.last().text;
         const int length = qMin(firstKey.length(), lastKey.length());
         firstKey.truncate(length);
         lastKey.truncate(length);
diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h
index afe8a16821..484b6425bc 100644
--- a/src/plugins/cpptools/cppcodecompletion.h
+++ b/src/plugins/cpptools/cppcodecompletion.h
@@ -151,7 +151,7 @@ private:
 
     CppModelManager *m_manager;
     Qt::CaseSensitivity m_caseSensitivity;
-    bool m_autoInsertBrackets;
+    bool awesome;
     bool m_partialCompletionEnabled;
 
     bool m_forcedCompletion;
diff --git a/src/plugins/qmleditor/qmlcodecompletion.cpp b/src/plugins/qmleditor/qmlcodecompletion.cpp
index 5f51916e4c..c0b69213d3 100644
--- a/src/plugins/qmleditor/qmlcodecompletion.cpp
+++ b/src/plugins/qmleditor/qmlcodecompletion.cpp
@@ -52,13 +52,13 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
 
     foreach (const QString &word, edit->keywords()) {
         TextEditor::CompletionItem item(this);
-        item.m_text = word;
+        item.text = word;
         m_completions.append(item);
     }
 
     foreach (const QString &word, edit->words()) {
         TextEditor::CompletionItem item(this);
-        item.m_text = word;
+        item.text = word;
         m_completions.append(item);
     }
 
@@ -71,7 +71,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
 
             foreach (const QString &word, visitor(program, m_startPosition)) {
                 TextEditor::CompletionItem item(this);
-                item.m_text = word;
+                item.text = word;
                 m_completions.append(item);
             }
         }
@@ -120,9 +120,9 @@ void QmlCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
         const QRegExp regExp(keyRegExp, Qt::CaseSensitive);
 
         foreach (TextEditor::CompletionItem item, m_completions) {
-            if (regExp.indexIn(item.m_text) == 0) {
-                item.m_relevance = (key.length() > 0 &&
-                                    item.m_text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
+            if (regExp.indexIn(item.text) == 0) {
+                item.relevance = (key.length() > 0 &&
+                                    item.text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
                 (*completions) << item;
             }
         }
@@ -131,7 +131,7 @@ void QmlCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
 
 void QmlCodeCompletion::complete(const TextEditor::CompletionItem &item)
 {
-    const QString toInsert = item.m_text;
+    const QString toInsert = item.text;
     const int length = m_editor->position() - m_startPosition;
     m_editor->setCurPos(m_startPosition);
     m_editor->replace(length, toInsert);
@@ -144,8 +144,8 @@ bool QmlCodeCompletion::partiallyComplete(const QList<TextEditor::CompletionItem
         return true;
     } else {
         // Compute common prefix
-        QString firstKey = completionItems.first().m_text;
-        QString lastKey = completionItems.last().m_text;
+        QString firstKey = completionItems.first().text;
+        QString lastKey = completionItems.last().text;
         const int length = qMin(firstKey.length(), lastKey.length());
         firstKey.truncate(length);
         lastKey.truncate(length);
diff --git a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
index 3bd0071993..dd1380dceb 100644
--- a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
+++ b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
@@ -55,7 +55,7 @@ int QtScriptCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
 
     foreach (const QString &word, edit->words()) {
         TextEditor::CompletionItem item(this);
-        item.m_text = word;
+        item.text = word;
         m_completions.append(item);
     }
 
@@ -102,9 +102,9 @@ void QtScriptCodeCompletion::completions(QList<TextEditor::CompletionItem> *comp
         const QRegExp regExp(keyRegExp, Qt::CaseSensitive);
 
         foreach (TextEditor::CompletionItem item, m_completions) {
-            if (regExp.indexIn(item.m_text) == 0) {
-                item.m_relevance = (key.length() > 0 &&
-                                    item.m_text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
+            if (regExp.indexIn(item.text) == 0) {
+                item.relevance = (key.length() > 0 &&
+                                    item.text.startsWith(key, Qt::CaseInsensitive)) ? 1 : 0;
                 (*completions) << item;
             }
         }
@@ -113,7 +113,7 @@ void QtScriptCodeCompletion::completions(QList<TextEditor::CompletionItem> *comp
 
 void QtScriptCodeCompletion::complete(const TextEditor::CompletionItem &item)
 {
-    const QString toInsert = item.m_text;
+    const QString toInsert = item.text;
     const int length = m_editor->position() - m_startPosition;
     m_editor->setCurPos(m_startPosition);
     m_editor->replace(length, toInsert);
@@ -126,8 +126,8 @@ bool QtScriptCodeCompletion::partiallyComplete(const QList<TextEditor::Completio
         return true;
     } else {
         // Compute common prefix
-        QString firstKey = completionItems.first().m_text;
-        QString lastKey = completionItems.last().m_text;
+        QString firstKey = completionItems.first().text;
+        QString lastKey = completionItems.last().text;
         const int length = qMin(firstKey.length(), lastKey.length());
         firstKey.truncate(length);
         lastKey.truncate(length);
diff --git a/src/plugins/texteditor/completionsupport.cpp b/src/plugins/texteditor/completionsupport.cpp
index 640e8f7bf4..5657650c46 100644
--- a/src/plugins/texteditor/completionsupport.cpp
+++ b/src/plugins/texteditor/completionsupport.cpp
@@ -67,7 +67,7 @@ CompletionSupport::CompletionSupport()
 
 void CompletionSupport::performCompletion(const CompletionItem &item)
 {
-    item.m_collector->complete(item);
+    item.collector->complete(item);
     m_checkCompletionTrigger = true;
 }
 
@@ -189,10 +189,10 @@ static bool lessThan(const QString &l, const QString &r)
 static bool completionItemLessThan(const CompletionItem &i1, const CompletionItem &i2)
 {
     // The order is case-insensitive in principle, but case-sensitive when this would otherwise mean equality
-    const QString lower1 = i1.m_text.toLower();
-    const QString lower2 = i2.m_text.toLower();
+    const QString lower1 = i1.text.toLower();
+    const QString lower2 = i2.text.toLower();
     if (lower1 == lower2)
-        return lessThan(i1.m_text, i2.m_text);
+        return lessThan(i1.text, i2.text);
     else
         return lessThan(lower1, lower2);
 }
@@ -210,11 +210,11 @@ QList<CompletionItem> CompletionSupport::getCompletions() const
     QList<CompletionItem> uniquelist;
 
     foreach (const CompletionItem &item, completionItems) {
-        if (item.m_text != lastKey) {
+        if (item.text != lastKey) {
             uniquelist.append(item);
-            lastKey = item.m_text;
+            lastKey = item.text;
         } else {
-            uniquelist.last().m_duplicateCount++;
+            uniquelist.last().duplicateCount++;
         }
     }
 
diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp
index c656500f07..e4f7c97b80 100644
--- a/src/plugins/texteditor/completionwidget.cpp
+++ b/src/plugins/texteditor/completionwidget.cpp
@@ -87,11 +87,11 @@ QVariant AutoCompletionModel::data(const QModelIndex &index, int role) const
         return QVariant();
 
     if (role == Qt::DisplayRole) {
-        return itemAt(index).m_text;
+        return itemAt(index).text;
     } else if (role == Qt::DecorationRole) {
-        return itemAt(index).m_icon;
+        return itemAt(index).icon;
     } else if (role == Qt::ToolTipRole) {
-        return itemAt(index).m_details;
+        return itemAt(index).details;
     }
 
     return QVariant();
@@ -231,8 +231,8 @@ void CompletionWidget::setCompletionItems(const QList<TextEditor::CompletionItem
     int mostRelevantIndex = 0;
     for (int i = 0; i < completionItems.size(); ++i) {
         const CompletionItem &item = completionItems.at(i);
-        if (item.m_relevance > relevance) {
-            relevance = item.m_relevance;
+        if (item.relevance > relevance) {
+            relevance = item.relevance;
             mostRelevantIndex = i;
         }
     }
diff --git a/src/plugins/texteditor/icompletioncollector.h b/src/plugins/texteditor/icompletioncollector.h
index 18cba3e619..da5373d035 100644
--- a/src/plugins/texteditor/icompletioncollector.h
+++ b/src/plugins/texteditor/icompletioncollector.h
@@ -44,24 +44,24 @@ class ITextEditable;
 struct CompletionItem
 {
     CompletionItem(ICompletionCollector *collector = 0)
-        : m_relevance(0),
-          m_duplicateCount(0),
-          m_collector(collector)
+        : relevance(0),
+          duplicateCount(0),
+          collector(collector)
     { }
 
     bool isValid() const
-    { return m_collector != 0; }
+    { return collector != 0; }
 
     operator bool() const
-    { return m_collector != 0; }
-
-    QString m_text;
-    QString m_details;
-    QIcon m_icon;
-    QVariant m_data;
-    int m_relevance;
-    int m_duplicateCount;
-    ICompletionCollector *m_collector;
+    { return collector != 0; }
+
+    QString text;
+    QString details;
+    QIcon icon;
+    QVariant data;
+    int relevance;
+    int duplicateCount;
+    ICompletionCollector *collector;
 };
 
 /* Defines the interface to completion collectors. A completion collector tells