From f0c9ef58ecae21d83ffbcd9ed24c1aaa2646d370 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 26 Aug 2013 16:55:09 +0200 Subject: [PATCH] CppTools: Fix displaying symbols of CppLocatorFilter The left column of the locator filter displayed the fully qualified name, which is a bit too long... Regression introduced by commit 760aa0f. Change-Id: I57fb44cd205c6e54158de22b6638e4a28014749c Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppclassesfilter.cpp | 8 ------- src/plugins/cpptools/cppclassesfilter.h | 2 -- src/plugins/cpptools/cppfunctionsfilter.cpp | 8 ------- src/plugins/cpptools/cppfunctionsfilter.h | 2 -- src/plugins/cpptools/cpplocatorfilter.cpp | 12 ++--------- src/plugins/cpptools/cpplocatorfilter.h | 2 -- .../cpptools/cpplocatorfilter_test.cpp | 21 ++++++++----------- 7 files changed, 11 insertions(+), 44 deletions(-) diff --git a/src/plugins/cpptools/cppclassesfilter.cpp b/src/plugins/cpptools/cppclassesfilter.cpp index 62ea01f5f9a..1e516084136 100644 --- a/src/plugins/cpptools/cppclassesfilter.cpp +++ b/src/plugins/cpptools/cppclassesfilter.cpp @@ -47,14 +47,6 @@ CppClassesFilter::~CppClassesFilter() { } -QString CppClassesFilter::stringToMatchUserInputAgainst(const ModelItemInfo &info, - bool userInputContainsColonColon) -{ - if (userInputContainsColonColon) - return info.scopedSymbolName(); - return info.symbolName; -} - Locator::FilterEntry CppClassesFilter::filterEntryFromModelItemInfo(const ModelItemInfo &info) { const QVariant id = qVariantFromValue(info); diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h index 7f82d3bef8f..b8d9bc39b33 100644 --- a/src/plugins/cpptools/cppclassesfilter.h +++ b/src/plugins/cpptools/cppclassesfilter.h @@ -44,8 +44,6 @@ public: ~CppClassesFilter(); private: - QString stringToMatchUserInputAgainst(const ModelItemInfo &info, - bool userInputContainsColonColon); Locator::FilterEntry filterEntryFromModelItemInfo(const ModelItemInfo &info); }; diff --git a/src/plugins/cpptools/cppfunctionsfilter.cpp b/src/plugins/cpptools/cppfunctionsfilter.cpp index a82c8e4b81a..101b133bcd1 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.cpp +++ b/src/plugins/cpptools/cppfunctionsfilter.cpp @@ -46,14 +46,6 @@ CppFunctionsFilter::~CppFunctionsFilter() { } -QString CppFunctionsFilter::stringToMatchUserInputAgainst(const CppTools::ModelItemInfo &info, - bool userInputContainsColonColon) -{ - if (userInputContainsColonColon) - return info.scopedSymbolName(); - return info.symbolName; -} - Locator::FilterEntry CppFunctionsFilter::filterEntryFromModelItemInfo(const CppTools::ModelItemInfo &info) { const QVariant id = qVariantFromValue(info); diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h index 58252105230..aa4e97d88ff 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.h +++ b/src/plugins/cpptools/cppfunctionsfilter.h @@ -44,8 +44,6 @@ public: ~CppFunctionsFilter(); private: - QString stringToMatchUserInputAgainst(const ModelItemInfo &info, - bool userInputContainsColonColon); Locator::FilterEntry filterEntryFromModelItemInfo(const ModelItemInfo &info); }; diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 0dd7745e7ef..52cb87695c8 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -108,18 +108,10 @@ void CppLocatorFilter::onAboutToRemoveFiles(const QStringList &files) m_searchList.remove(file); } -QString CppLocatorFilter::stringToMatchUserInputAgainst(const CppTools::ModelItemInfo &info, - bool userInputContainsColonColon) -{ - Q_UNUSED(userInputContainsColonColon) - return info.scopedSymbolName(); -} - Locator::FilterEntry CppLocatorFilter::filterEntryFromModelItemInfo(const CppTools::ModelItemInfo &info) { const QVariant id = qVariantFromValue(info); - const QString name = info.symbolScope.isEmpty() ? info.symbolName : info.scopedSymbolName(); - Locator::FilterEntry filterEntry(this, name, id, info.icon); + Locator::FilterEntry filterEntry(this, info.symbolName, id, info.icon); filterEntry.extraInfo = info.type == ModelItemInfo::Class || info.type == ModelItemInfo::Enum ? info.shortNativeFilePath() : info.symbolType; @@ -163,7 +155,7 @@ QList CppLocatorFilter::matchesFor(QFutureInterface items = it.value(); foreach (const ModelItemInfo &info, items) { - const QString matchString = stringToMatchUserInputAgainst(info, hasColonColon); + const QString matchString = hasColonColon ? info.scopedSymbolName() : info.symbolName; if ((hasWildcard && regexp.exactMatch(matchString)) || (!hasWildcard && matcher.indexIn(matchString) != -1)) { const Locator::FilterEntry filterEntry = filterEntryFromModelItemInfo(info); diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h index 50e5184ecca..866327cdd77 100644 --- a/src/plugins/cpptools/cpplocatorfilter.h +++ b/src/plugins/cpptools/cpplocatorfilter.h @@ -63,8 +63,6 @@ private slots: void onAboutToRemoveFiles(const QStringList &files); private: - virtual QString stringToMatchUserInputAgainst(const ModelItemInfo &info, - bool userInputContainsColonColon); virtual Locator::FilterEntry filterEntryFromModelItemInfo(const ModelItemInfo &info); private: diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp index 682b78cd5b2..14803411a51 100644 --- a/src/plugins/cpptools/cpplocatorfilter_test.cpp +++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp @@ -214,20 +214,17 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data() << _("my") << (QList() << ResultData(_("MyClass"), testFileShort) - << ResultData(_("MyClass::MyClass"), _("()")) - << ResultData(_("MyClass::function2"), _("(bool, int)")) + << ResultData(_("MyClass"), _("()")) + << ResultData(_("MyClass"), _("()")) + << ResultData(_("MyClass"), testFileShort) + << ResultData(_("MyClass"), _("()")) + << ResultData(_("MyClass"), testFileShort) + << ResultData(_("MyEnum"), testFileShort) + << ResultData(_("MyEnum"), testFileShort) << ResultData(_("MyEnum"), testFileShort) - << ResultData(_("MyNamespace::MyClass"), testFileShort) - << ResultData(_("MyNamespace::MyClass::MyClass"), _("()")) - << ResultData(_("MyNamespace::MyClass::function2"), _("(bool, int)")) - << ResultData(_("MyNamespace::MyEnum"), testFileShort) - << ResultData(_("MyNamespace::myFunction"), _("(bool, int)")) << ResultData(_("myFunction"), _("(bool, int)")) - << ResultData(_("::MyClass"), testFileShort) - << ResultData(_("::MyClass::MyClass"), _("()")) - << ResultData(_("::MyClass::function2"), _("(bool, int)")) - << ResultData(_("::MyEnum"), testFileShort) - << ResultData(_("::myFunction"), _("(bool, int)")) + << ResultData(_("myFunction"), _("(bool, int)")) + << ResultData(_("myFunction"), _("(bool, int)")) ); }