OSDN Git Service

Made case-insensitive code completion really case-insensitive
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Wed, 10 Jun 2009 14:08:23 +0000 (16:08 +0200)
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Wed, 10 Jun 2009 14:25:59 +0000 (16:25 +0200)
There was still some "smartness" that made uppercase characters match
case-sensitive, regardless of the case-sensitivity setting. This annoyed
or at least confused many people who prefer case-insensitivity.

Reviewed-by: con
src/plugins/cpptools/cppcodecompletion.cpp

index d69d683..1e64213 100644 (file)
@@ -1210,17 +1210,12 @@ void CppCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
                 if (c.isUpper() && !first) {
                     keyRegExp += QLatin1String("[a-z0-9_]*");
                     keyRegExp += c;
-                } else if (m_caseSensitivity == Qt::CaseInsensitive && c.isLower()) {
-                    keyRegExp += QLatin1Char('[');
-                    keyRegExp += c;
-                    keyRegExp += c.toUpper();
-                    keyRegExp += QLatin1Char(']');
                 } else {
                     keyRegExp += QRegExp::escape(c);
                 }
                 first = false;
             }
-            const QRegExp regExp(keyRegExp, Qt::CaseSensitive);
+            const QRegExp regExp(keyRegExp, m_caseSensitivity);
 
             foreach (TextEditor::CompletionItem item, m_completions) {
                 if (regExp.indexIn(item.m_text) == 0) {