From 872bfb70948a8fc68eb6296a9a1a5ea6336b92d5 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Thu, 15 Aug 2013 10:04:42 +0200
Subject: [PATCH] CppTools: Adapt C++ locator names to reality
The new names are:
* C++ Methods in Current Document -> C++ Symbols in Current Document
* C++ Classes and Methods -> C++ Classes, Enums and Functions
* C++ Methods and Functions -> C++ Functions
Further notes:
* "C++ Classes" stays the same.
* The term "Methods" was removed since "Functions" says it all (member
functions, non-member functions). Because of this, the "m" shortcut
for this filter does not fit so well to the name anymore.
* "C++ Symbols in..." - "Symbols" means the same as in the C++ Search
dialog: classes, enums, functions and declarations
Change-Id: I8e5f410f2dcb1fafe83d0a1c8607f4c17eabbb8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
---
doc/src/editors/creator-editors.qdoc | 4 ++--
src/plugins/cpptools/cppcurrentdocumentfilter.cpp | 2 +-
src/plugins/cpptools/cppfunctionsfilter.cpp | 2 +-
src/plugins/cpptools/cpplocatorfilter.cpp | 2 +-
src/plugins/qmljstools/qmljsfunctionfilter.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 65e8045f1ab..01d4c821e43 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -2145,10 +2145,10 @@
\li Locating files belonging to your project, such as source, header
resource, and .ui files
- \li Locating class and method definitions in your project or anywhere
+ \li Locating class, enum, and function definitions in your project or anywhere
referenced from your project
- \li Locating class and method definitions in the current document
+ \li Locating symbols in the current document
\li Locating a specific line and column in the document displayed in
your editor
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index 13e5db7ce7a..9ef4d7cbea7 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -40,7 +40,7 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager)
: m_modelManager(manager)
{
setId("Methods in current Document");
- setDisplayName(tr("C++ Methods in Current Document"));
+ setDisplayName(tr("C++ Symbols in Current Document"));
setShortcutString(QString(QLatin1Char('.')));
setIncludedByDefault(false);
diff --git a/src/plugins/cpptools/cppfunctionsfilter.cpp b/src/plugins/cpptools/cppfunctionsfilter.cpp
index 53c94b0f1ce..645f38a5bb4 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.cpp
+++ b/src/plugins/cpptools/cppfunctionsfilter.cpp
@@ -35,7 +35,7 @@ CppFunctionsFilter::CppFunctionsFilter(CppLocatorData *locatorData)
: CppLocatorFilter(locatorData)
{
setId("Methods");
- setDisplayName(tr("C++ Methods and Functions"));
+ setDisplayName(tr("C++ Functions"));
setShortcutString(QString(QLatin1Char('m')));
setIncludedByDefault(false);
}
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index d8caaf82608..d673625a919 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -38,7 +38,7 @@ CppLocatorFilter::CppLocatorFilter(CppLocatorData *locatorData)
: m_data(locatorData)
{
setId("Classes and Methods");
- setDisplayName(tr("C++ Classes and Methods"));
+ setDisplayName(tr("C++ Classes, Enums and Functions"));
setShortcutString(QString(QLatin1Char(':')));
setIncludedByDefault(false);
}
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 89b6c6e9038..26cafebe707 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -43,7 +43,7 @@ FunctionFilter::FunctionFilter(LocatorData *data, QObject *parent)
, m_data(data)
{
setId("Functions");
- setDisplayName(tr("QML Methods and Functions"));
+ setDisplayName(tr("QML Functions"));
setShortcutString(QString(QLatin1Char('m')));
setIncludedByDefault(false);
}
--
GitLab