diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index f5d22a9128baaf3c204349900205023fdedf744c..7e1e14669aeeb0c74991fd4e926a7743adfd3dde 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -226,7 +226,7 @@ void FindPlugin::setupFilterMenuItems() d->m_filterActions.clear(); bool haveEnabledFilters = false; foreach (IFindFilter *filter, findInterfaces) { - QAction *action = new QAction(QLatin1String(" ") + filter->name(), this); + QAction *action = new QAction(QLatin1String(" ") + filter->displayName(), this); bool isEnabled = filter->isEnabled(); if (isEnabled) haveEnabledFilters = true; diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp index 5b4bf7d35e38fa50e411550f3835d90161be3e3f..63993c13cd41b0c9c0fa677eef3abe04684409ed 100644 --- a/src/plugins/find/findtoolwindow.cpp +++ b/src/plugins/find/findtoolwindow.cpp @@ -98,7 +98,7 @@ void FindToolWindow::setFindFilters(const QList<IFindFilter *> &filters) m_ui.filterList->clear(); QStringList names; foreach (IFindFilter *filter, filters) { - names << filter->name(); + names << filter->displayName(); m_configWidgets.append(filter->createConfigWidget()); } m_ui.filterList->addItems(names); diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h index 8f7967e9337e63fc58fc783179b7970f51533b75..c063b55329c3f7654f030dd64a6e53ebcc77edd8 100644 --- a/src/plugins/find/ifindfilter.h +++ b/src/plugins/find/ifindfilter.h @@ -50,7 +50,7 @@ public: virtual ~IFindFilter() {} virtual QString id() const = 0; - virtual QString name() const = 0; + virtual QString displayName() const = 0; virtual bool isEnabled() const = 0; virtual QKeySequence defaultShortcut() const = 0; virtual bool isReplaceSupported() const { return false; } diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index abb1b90b23ad302a8e8ae018d1cf1f2ca38ad9c5..78823bda17ada16634063d9b9cf79aa0e7507dd0 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -60,7 +60,7 @@ QString AllProjectsFind::id() const return QLatin1String("All Projects"); } -QString AllProjectsFind::name() const +QString AllProjectsFind::displayName() const { return tr("All Projects"); } diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h index 2f78757c1564c798a3db0bd635b2a8c36c3b5bc6..d4710a7381c781268859b31247c8a2d16e31b850 100644 --- a/src/plugins/projectexplorer/allprojectsfind.h +++ b/src/plugins/projectexplorer/allprojectsfind.h @@ -51,7 +51,7 @@ public: AllProjectsFind(ProjectExplorerPlugin *plugin, Find::SearchResultWindow *resultWindow); QString id() const; - QString name() const; + QString displayName() const; bool isEnabled() const; QKeySequence defaultShortcut() const; diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp index 7256a8603b304d075aec1fa6c22c35f6be5b8105..ef9ec44a9b566bc4b4b1b5e49f38ca9d1237acbd 100644 --- a/src/plugins/projectexplorer/currentprojectfind.cpp +++ b/src/plugins/projectexplorer/currentprojectfind.cpp @@ -60,7 +60,7 @@ QString CurrentProjectFind::id() const return QLatin1String("Current Project"); } -QString CurrentProjectFind::name() const +QString CurrentProjectFind::displayName() const { return tr("Current Project"); } diff --git a/src/plugins/projectexplorer/currentprojectfind.h b/src/plugins/projectexplorer/currentprojectfind.h index 2e98e49e1b1756c72ae11f86a907fd11bd7f530a..5ee35a83c8da8bebdf4d8ff8dc4875dc0f2cc1b0 100644 --- a/src/plugins/projectexplorer/currentprojectfind.h +++ b/src/plugins/projectexplorer/currentprojectfind.h @@ -54,7 +54,7 @@ public: CurrentProjectFind(ProjectExplorerPlugin *plugin, Find::SearchResultWindow *resultWindow); QString id() const; - QString name() const; + QString displayName() const; bool isEnabled() const; QKeySequence defaultShortcut() const; diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 736bc78ae4d6eb8f038b4d37a557da3e6785cb2d..51f9eb3fe8cad228f7d466f8ba10d784bfc15821 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -57,7 +57,7 @@ QString FindInCurrentFile::id() const return "Current File"; } -QString FindInCurrentFile::name() const +QString FindInCurrentFile::displayName() const { return tr("Current File"); } diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h index 7c6f28c93a676913e90a6cff174e08f3837d7124..b532e4cfa794e5d7433969b209b0c0695cabbd18 100644 --- a/src/plugins/texteditor/findincurrentfile.h +++ b/src/plugins/texteditor/findincurrentfile.h @@ -54,7 +54,7 @@ public: explicit FindInCurrentFile(Find::SearchResultWindow *resultWindow); QString id() const; - QString name() const; + QString displayName() const; QKeySequence defaultShortcut() const; bool isEnabled() const; QWidget *createConfigWidget(); diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 963cb0dea135313afb8272762a9c9d90af4effc4..a2d45a06b51cab56b18d719fff5e532ee38e530b 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -52,7 +52,7 @@ QString FindInFiles::id() const return "Files on Disk"; } -QString FindInFiles::name() const +QString FindInFiles::displayName() const { return tr("Files on File System"); } diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h index baf899439d10f99a1d6dfbe104a76cba34865325..45323c1c1d3cd03402ee8deb69ebbcdaed7df09f 100644 --- a/src/plugins/texteditor/findinfiles.h +++ b/src/plugins/texteditor/findinfiles.h @@ -52,7 +52,7 @@ public: explicit FindInFiles(Find::SearchResultWindow *resultWindow); QString id() const; - QString name() const; + QString displayName() const; QKeySequence defaultShortcut() const; void findAll(const QString &txt, QTextDocument::FindFlags findFlags); QWidget *createConfigWidget();