diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index 316223d12fb4836b5ac122a837d415e4cb0035ce..861b77bf0bae6838de9ad5d36fdb98405ae85f8d 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -51,7 +51,7 @@ public:
virtual QWidget *outputWidget(QWidget *parent) = 0;
virtual QList<QWidget*> toolBarWidgets() const = 0;
- virtual QString name() const = 0;
+ virtual QString displayName() const = 0;
// -1 don't show in statusBar
// 100...0 show at front...end
diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index 81b798c0d7f6012dcae1ebdf352d0ac3d8f03cff..ee37694e029976a704a33608551bedbc5a5fd44f 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -71,7 +71,7 @@ QWidget *MessageOutputWindow::outputWidget(QWidget *parent)
return m_widget;
}
-QString MessageOutputWindow::name() const
+QString MessageOutputWindow::displayName() const
{
return tr("General Messages");
}
diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h
index 6c4159a45763a14639d3340890c72b1141008453..3e697e13823db0eceae71fdbe0c5db94e6051da8 100644
--- a/src/plugins/coreplugin/messageoutputwindow.h
+++ b/src/plugins/coreplugin/messageoutputwindow.h
@@ -50,7 +50,7 @@ public:
QWidget *outputWidget(QWidget *parent);
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
- QString name() const;
+ QString displayName() const;
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool visible);
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index d677ba27cdbebc02b72a171c6c569d62a13c0bce..6c0a43df971e566d8701caa2aedf8d979b4a2e4a 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -353,9 +353,9 @@ void OutputPaneManager::init()
m_opToolBarWidgets->addWidget(toolButtonsContainer);
- QString actionId = QString("QtCreator.Pane.%1").arg(outPane->name().simplified());
+ QString actionId = QString("QtCreator.Pane.%1").arg(outPane->displayName().simplified());
actionId.remove(QLatin1Char(' '));
- QAction *action = new QAction(outPane->name(), this);
+ QAction *action = new QAction(outPane->displayName(), this);
Command *cmd = am->registerAction(action, actionId, QList<int>() << Constants::C_GLOBAL_ID);
@@ -364,7 +364,7 @@ void OutputPaneManager::init()
if (outPane->priorityInStatusBar() != -1) {
cmd->setDefaultKeySequence(QKeySequence(paneShortCut(shortcutNumber)));
- QPushButton *button = new OutputPaneToggleButton(shortcutNumber, outPane->name(),
+ QPushButton *button = new OutputPaneToggleButton(shortcutNumber, outPane->displayName(),
cmd->action());
++shortcutNumber;
m_buttonsWidget->layout()->addWidget(button);
@@ -373,7 +373,7 @@ void OutputPaneManager::init()
}
// Now add the entry to the combobox, since the first item we add sets the currentIndex, thus we need to be set up for that
- m_widgetComboBox->addItem(outPane->name(), idx);
+ m_widgetComboBox->addItem(outPane->displayName(), idx);
connect(cmd->action(), SIGNAL(triggered()), this, SLOT(shortcutTriggered()));
} while (it != begin);
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index 05f236b5dd93e7ecf6ec68c91eddf81784a39594..7a27bf3c14260665e755c9b4c0319d063ff72234 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -96,7 +96,7 @@ SearchResultWindowPrivate::SearchResultWindowPrivate()
SearchResultWindow::SearchResultWindow() : d(new SearchResultWindowPrivate)
{
d->m_widget = new QStackedWidget;
- d->m_widget->setWindowTitle(name());
+ d->m_widget->setWindowTitle(displayName());
d->m_searchResultTreeView = new Internal::SearchResultTreeView(d->m_widget);
d->m_searchResultTreeView->setFrameStyle(QFrame::NoFrame);
diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h
index c8f38285bc515c9bbe2474fdbdc5b8944680c1db..5adc86fe7c4fcab2efc41fd9e8adc63bb1832759 100644
--- a/src/plugins/find/searchresultwindow.h
+++ b/src/plugins/find/searchresultwindow.h
@@ -86,7 +86,7 @@ public:
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const;
- QString name() const { return tr("Search Results"); }
+ QString displayName() const { return tr("Search Results"); }
int priorityInStatusBar() const;
void visibilityChanged(bool visible);
bool isEmpty() const;
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index 1bdd118c5042a65c654a6fa7fc8fcb55aaae8e22..1ad0aba28a455a54a9d595cd6dcb6f4c3198da9d 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -52,7 +52,7 @@ public:
CompileOutputWindow(BuildManager *bm);
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
- QString name() const { return tr("Compile Output"); }
+ QString displayName() const { return tr("Compile Output"); }
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool visible);
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 8517896de5014bd9d3c8695605026f94b4336e5e..4d6bb74751572b9d1e24430a9a8b7cc700ca4be2 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -155,7 +155,7 @@ QList<QWidget*> OutputPane::toolBarWidgets() const
return QList<QWidget*>() << m_reRunButton << m_stopButton;
}
-QString OutputPane::name() const
+QString OutputPane::displayName() const
{
return tr("Application Output");
}
diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h
index 68ab23935c74dd0b13fcbf8372f57a57327858ac..b29664fe53a8d15f522ce6ca4c4fccf785aa8f71 100644
--- a/src/plugins/projectexplorer/outputwindow.h
+++ b/src/plugins/projectexplorer/outputwindow.h
@@ -71,7 +71,7 @@ public:
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const;
- QString name() const;
+ QString displayName() const;
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool);
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 89c42743788fdb0fdab19daef413ca3fca531c28..bbe22c13c926e620294cd8a3a5f3841051045f85 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -100,12 +100,11 @@ public:
int taskCount() const;
int errorTaskCount() const;
-
// IOutputPane
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const;
- QString name() const { return tr("Build Issues"); }
+ QString displayName() const { return tr("Build Issues"); }
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool visible);
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
index f85ad788dcbdad50fe8da7b51a7b140d0d1899b1..6c8d10b9aa92ec65741a169c4012bbca540791d1 100644
--- a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
@@ -273,7 +273,7 @@ QWidgetList VCSBaseOutputWindow::toolBarWidgets() const
return QWidgetList();
}
-QString VCSBaseOutputWindow::name() const
+QString VCSBaseOutputWindow::displayName() const
{
return tr("Version Control");
}
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.h b/src/plugins/vcsbase/vcsbaseoutputwindow.h
index 2008c202d7db98e63da60d3d671404e25657c2ad..82f2a152d0deb6b88f1bf9d2dcb89eca1f2afec6 100644
--- a/src/plugins/vcsbase/vcsbaseoutputwindow.h
+++ b/src/plugins/vcsbase/vcsbaseoutputwindow.h
@@ -56,7 +56,7 @@ public:
virtual QWidget *outputWidget(QWidget *parent);
virtual QList<QWidget*> toolBarWidgets() const;
- virtual QString name() const;
+ virtual QString displayName() const;
virtual int priorityInStatusBar() const;