feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

One method name slipped the naming convention displayName.

Browse Source
This commit is contained in:
con
2010-07-12 12:06:15 +02:00
parent ed38d62c9e
commit 8c920ee089
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/find/findplugin.cpp
View File

@@ -226,7 +226,7 @@ void FindPlugin::setupFilterMenuItems()
d->m_filterActions.clear(); d->m_filterActions.clear();
bool haveEnabledFilters = false; bool haveEnabledFilters = false;
foreach (IFindFilter *filter, findInterfaces) { foreach (IFindFilter *filter, findInterfaces) {
QAction *action = new QAction(QLatin1String(" ") + filter->name(), this); QAction *action = new QAction(QLatin1String(" ") + filter->displayName(), this);
bool isEnabled = filter->isEnabled(); bool isEnabled = filter->isEnabled();
if (isEnabled) if (isEnabled)
haveEnabledFilters = true; haveEnabledFilters = true;

2
src/plugins/find/findtoolwindow.cpp
View File

@@ -98,7 +98,7 @@ void FindToolWindow::setFindFilters(const QList<IFindFilter *> &filters)
m_ui.filterList->clear(); m_ui.filterList->clear();
QStringList names; QStringList names;
foreach (IFindFilter *filter, filters) { foreach (IFindFilter *filter, filters) {
names << filter->name(); names << filter->displayName();
m_configWidgets.append(filter->createConfigWidget()); m_configWidgets.append(filter->createConfigWidget());
} }
m_ui.filterList->addItems(names); m_ui.filterList->addItems(names);

2
src/plugins/find/ifindfilter.h
View File

@@ -50,7 +50,7 @@ public:
virtual ~IFindFilter() {} virtual ~IFindFilter() {}
virtual QString id() const = 0; virtual QString id() const = 0;
virtual QString name() const = 0; virtual QString displayName() const = 0;
virtual bool isEnabled() const = 0; virtual bool isEnabled() const = 0;
virtual QKeySequence defaultShortcut() const = 0; virtual QKeySequence defaultShortcut() const = 0;
virtual bool isReplaceSupported() const { return false; } virtual bool isReplaceSupported() const { return false; }

2
src/plugins/projectexplorer/allprojectsfind.cpp
View File

@@ -60,7 +60,7 @@ QString AllProjectsFind::id() const
return QLatin1String("All Projects"); return QLatin1String("All Projects");
} }
QString AllProjectsFind::name() const QString AllProjectsFind::displayName() const
{ {
return tr("All Projects"); return tr("All Projects");
} }

2
src/plugins/projectexplorer/allprojectsfind.h
View File

@@ -51,7 +51,7 @@ public:
AllProjectsFind(ProjectExplorerPlugin *plugin, Find::SearchResultWindow *resultWindow); AllProjectsFind(ProjectExplorerPlugin *plugin, Find::SearchResultWindow *resultWindow);
QString id() const; QString id() const;
QString name() const; QString displayName() const;
bool isEnabled() const; bool isEnabled() const;
QKeySequence defaultShortcut() const; QKeySequence defaultShortcut() const;

2
src/plugins/projectexplorer/currentprojectfind.cpp
View File

@@ -60,7 +60,7 @@ QString CurrentProjectFind::id() const
return QLatin1String("Current Project"); return QLatin1String("Current Project");
} }
QString CurrentProjectFind::name() const QString CurrentProjectFind::displayName() const
{ {
return tr("Current Project"); return tr("Current Project");
} }

2
src/plugins/projectexplorer/currentprojectfind.h
View File

@@ -54,7 +54,7 @@ public:
CurrentProjectFind(ProjectExplorerPlugin *plugin, Find::SearchResultWindow *resultWindow); CurrentProjectFind(ProjectExplorerPlugin *plugin, Find::SearchResultWindow *resultWindow);
QString id() const; QString id() const;
QString name() const; QString displayName() const;
bool isEnabled() const; bool isEnabled() const;
QKeySequence defaultShortcut() const; QKeySequence defaultShortcut() const;

2
src/plugins/texteditor/findincurrentfile.cpp
View File

@@ -57,7 +57,7 @@ QString FindInCurrentFile::id() const
return "Current File"; return "Current File";
} }
QString FindInCurrentFile::name() const QString FindInCurrentFile::displayName() const
{ {
return tr("Current File"); return tr("Current File");
} }

2
src/plugins/texteditor/findincurrentfile.h
View File

@@ -54,7 +54,7 @@ public:
explicit FindInCurrentFile(Find::SearchResultWindow *resultWindow); explicit FindInCurrentFile(Find::SearchResultWindow *resultWindow);
QString id() const; QString id() const;
QString name() const; QString displayName() const;
QKeySequence defaultShortcut() const; QKeySequence defaultShortcut() const;
bool isEnabled() const; bool isEnabled() const;
QWidget *createConfigWidget(); QWidget *createConfigWidget();

2
src/plugins/texteditor/findinfiles.cpp
View File

@@ -52,7 +52,7 @@ QString FindInFiles::id() const
return "Files on Disk"; return "Files on Disk";
} }
QString FindInFiles::name() const QString FindInFiles::displayName() const
{ {
return tr("Files on File System"); return tr("Files on File System");
} }

2
src/plugins/texteditor/findinfiles.h
View File

@@ -52,7 +52,7 @@ public:
explicit FindInFiles(Find::SearchResultWindow *resultWindow); explicit FindInFiles(Find::SearchResultWindow *resultWindow);
QString id() const; QString id() const;
QString name() const; QString displayName() const;
QKeySequence defaultShortcut() const; QKeySequence defaultShortcut() const;
void findAll(const QString &txt, QTextDocument::FindFlags findFlags); void findAll(const QString &txt, QTextDocument::FindFlags findFlags);
QWidget *createConfigWidget(); QWidget *createConfigWidget();