11 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index f5d22a9128..7e1e14669a 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 5b4bf7d35e..63993c13cd 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 8f7967e933..c063b55329 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 abb1b90b23..78823bda17 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 2f78757c15..d4710a7381 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 7256a8603b..ef9ec44a9b 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 2e98e49e1b..5ee35a83c8 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 736bc78ae4..51f9eb3fe8 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 7c6f28c93a..b532e4cfa7 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 963cb0dea1..a2d45a06b5 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 baf899439d..45323c1c1d 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();