Clang: new empty locator filter classes

Introduce classes to replace builtin locator filters.

Change-Id: I5cc6f15fb0f59ea8a51b14a86301cf219cc0d6d6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-11-24 10:46:31 +01:00
parent cf7f898db3
commit 92cdfc0c2a
40 changed files with 1230 additions and 52 deletions

View File

@@ -25,16 +25,18 @@
#include "cppclassesfilter.h"
#include "cpptoolsconstants.h"
using namespace CppTools;
using namespace CppTools::Internal;
CppClassesFilter::CppClassesFilter(CppLocatorData *locatorData)
: CppLocatorFilter(locatorData)
{
setId("Classes");
setId(Constants::CLASSES_FILTER_ID);
setDisplayName(Constants::CLASSES_FILTER_DISPLAY_NAME);
setShortcutString(QLatin1String("c"));
setIncludedByDefault(false);
setDisplayName(tr("C++ Classes"));
}
CppClassesFilter::~CppClassesFilter()

View File

@@ -26,6 +26,7 @@
#include "cppcurrentdocumentfilter.h"
#include "cppmodelmanager.h"
#include "cpptoolsconstants.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
@@ -41,8 +42,8 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppTools::CppModelManager *ma
: m_modelManager(manager)
, search(stringTable)
{
setId("Methods in current Document");
setDisplayName(tr("C++ Symbols in Current Document"));
setId(Constants::CURRENT_DOCUMENT_FILTER_ID);
setDisplayName(Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME);
setShortcutString(".");
setPriority(High);
setIncludedByDefault(false);

View File

@@ -25,6 +25,8 @@
#include "cppfunctionsfilter.h"
#include "cpptoolsconstants.h"
#include <utils/fileutils.h>
using namespace CppTools;
@@ -33,8 +35,8 @@ using namespace CppTools::Internal;
CppFunctionsFilter::CppFunctionsFilter(CppLocatorData *locatorData)
: CppLocatorFilter(locatorData)
{
setId("Methods");
setDisplayName(tr("C++ Functions"));
setId(Constants::FUNCTIONS_FILTER_ID);
setDisplayName(Constants::FUNCTIONS_FILTER_DISPLAY_NAME);
setShortcutString("m");
setIncludedByDefault(false);
}

View File

@@ -26,6 +26,7 @@
#include "cppincludesfilter.h"
#include "cppmodelmanager.h"
#include "cpptoolsconstants.h"
#include <cplusplus/CppDocument.h>
#include <coreplugin/editormanager/documentmodel.h>
@@ -130,8 +131,8 @@ void CppIncludesIterator::fetchMore()
CppIncludesFilter::CppIncludesFilter()
{
setId("All Included C/C++ Files");
setDisplayName(tr("All Included C/C++ Files"));
setId(Constants::INCLUDES_FILTER_ID);
setDisplayName(Constants::INCLUDES_FILTER_DISPLAY_NAME);
setShortcutString("ai");
setIncludedByDefault(true);
setPriority(ILocatorFilter::Low);

View File

@@ -25,6 +25,7 @@
#include "cpplocatorfilter.h"
#include "cppmodelmanager.h"
#include "cpptoolsconstants.h"
#include <coreplugin/editormanager/editormanager.h>
#include <utils/algorithm.h>
@@ -39,8 +40,8 @@ using namespace CppTools::Internal;
CppLocatorFilter::CppLocatorFilter(CppLocatorData *locatorData)
: m_data(locatorData)
{
setId("Classes and Methods");
setDisplayName(tr("C++ Classes, Enums and Functions"));
setId(Constants::LOCATOR_FILTER_ID);
setDisplayName(Constants::LOCATOR_FILTER_DISPLAY_NAME);
setShortcutString(":");
setIncludedByDefault(false);
}

View File

@@ -77,5 +77,24 @@ const char CPP_CLANG_FIXIT_AVAILABLE_MARKER_ID[] = "ClangFixItAvailableMarker";
const char CPP_SETTINGS_ID[] = "Cpp";
const char CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++");
const char CURRENT_DOCUMENT_FILTER_ID[] = "Methods in current Document";
const char CURRENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++ Symbols in Current Document");
const char CLASSES_FILTER_ID[] = "Classes";
const char CLASSES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++ Classes");
const char FUNCTIONS_FILTER_ID[] = "Methods";
const char FUNCTIONS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++ Functions");
const char INCLUDES_FILTER_ID[] = "All Included C/C++ Files";
const char INCLUDES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "All Included C/C++ Files");
const char LOCATOR_FILTER_ID[] = "Classes and Methods";
const char LOCATOR_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++ Classes, Enums and Functions");
const char SYMBOLS_FIND_FILTER_ID[] = "Symbols";
const char SYMBOLS_FIND_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++ Symbols");
} // namespace Constants
} // namespace CppTools

View File

@@ -69,12 +69,12 @@ SymbolsFindFilter::SymbolsFindFilter(CppModelManager *manager)
QString SymbolsFindFilter::id() const
{
return QLatin1String("CppSymbols");
return QLatin1String(Constants::SYMBOLS_FIND_FILTER_ID);
}
QString SymbolsFindFilter::displayName() const
{
return tr("C++ Symbols");
return Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME;
}
bool SymbolsFindFilter::isEnabled() const