diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index 18d41e74dea05b50d063df9bab3069fee7c37c8c..50b14792a01fabf867d9c8dfb8cff9028836b3fe 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -48,12 +48,12 @@ namespace Core {
 class CORE_EXPORT IOutputPane : public QObject
 {
     Q_OBJECT
+
 public:
     IOutputPane(QObject *parent = 0) : QObject(parent) {}
-    virtual ~IOutputPane() {}
 
     virtual QWidget *outputWidget(QWidget *parent) = 0;
-    virtual QList<QWidget*> toolBarWidgets() const = 0;
+    virtual QList<QWidget *> toolBarWidgets() const = 0;
     virtual QString displayName() const = 0;
 
     // -1 don't show in statusBar
@@ -66,45 +66,24 @@ public:
     // This function is called to give the outputwindow focus
     virtual void setFocus() = 0;
     // Whether the outputpane has focus
-    virtual bool hasFocus() = 0;
+    virtual bool hasFocus() const = 0;
     // Whether the outputpane can be focused at the moment.
     // (E.g. the search result window does not want to be focused if the are no results.)
-    virtual bool canFocus() = 0;
+    virtual bool canFocus() const = 0;
 
-    virtual bool canNavigate() = 0;
-    virtual bool canNext() = 0;
-    virtual bool canPrevious() = 0;
+    virtual bool canNavigate() const = 0;
+    virtual bool canNext() const = 0;
+    virtual bool canPrevious() const = 0;
     virtual void goToNext() = 0;
     virtual void goToPrev() = 0;
+
 public slots:
-    void popup()
-    {
-        popup(true);
-    }
-    void popup(bool withFocus)
-    {
-        emit showPage(withFocus);
-    }
-
-    void hide()
-    {
-        emit hidePage();
-    }
-
-    void toggle()
-    {
-        toggle(true);
-    }
-
-    void toggle(bool withFocusIfShown)
-    {
-        emit togglePage(withFocusIfShown);
-    }
-
-    void navigateStateChanged()
-    {
-        emit navigateStateUpdate();
-    }
+    void popup() { popup(true); }
+    void popup(bool withFocus) { emit showPage(withFocus); }
+    void hide() { emit hidePage(); }
+    void toggle() { toggle(true); }
+    void toggle(bool withFocusIfShown) { emit togglePage(withFocusIfShown); }
+    void navigateStateChanged() { emit navigateStateUpdate(); }
 
 signals:
     void showPage(bool withFocus);
diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index 634a1a642361936e4cf71366c489c40f24ce9390..786983b7c37834de891f5b989f3df24c06579302 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -50,12 +50,12 @@ MessageOutputWindow::~MessageOutputWindow()
     delete m_widget;
 }
 
-bool MessageOutputWindow::hasFocus()
+bool MessageOutputWindow::hasFocus() const
 {
     return m_widget->hasFocus();
 }
 
-bool MessageOutputWindow::canFocus()
+bool MessageOutputWindow::canFocus() const
 {
     return true;
 }
@@ -95,12 +95,12 @@ int MessageOutputWindow::priorityInStatusBar() const
     return -1;
 }
 
-bool MessageOutputWindow::canNext()
+bool MessageOutputWindow::canNext() const
 {
     return false;
 }
 
-bool MessageOutputWindow::canPrevious()
+bool MessageOutputWindow::canPrevious() const
 {
     return false;
 }
@@ -115,7 +115,7 @@ void MessageOutputWindow::goToPrev()
 
 }
 
-bool MessageOutputWindow::canNavigate()
+bool MessageOutputWindow::canNavigate() const
 {
     return false;
 }
diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h
index 334b8a2ca50d710fa54a47f58be322c6b3dfafe5..4438bcfaba2013745aabc4c0155c76fb40feec56 100644
--- a/src/plugins/coreplugin/messageoutputwindow.h
+++ b/src/plugins/coreplugin/messageoutputwindow.h
@@ -57,15 +57,15 @@ public:
     void visibilityChanged(bool visible);
 
     void append(const QString &text);
-    bool canFocus();
-    bool hasFocus();
+    bool canFocus() const;
+    bool hasFocus() const;
     void setFocus();
 
-    virtual bool canNext();
-    virtual bool canPrevious();
+    virtual bool canNext() const;
+    virtual bool canPrevious() const;
     virtual void goToNext();
     virtual void goToPrev();
-    bool canNavigate();
+    bool canNavigate() const;
 
 private:
     OutputWindow *m_widget;
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index b5dfafee858bd30bd9297b6acbd325f7af16bc64..9e3aa9c962be016a5c2345463e394257be1bf6da 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -356,7 +356,7 @@ void SearchResultWindow::clearContents()
     \fn bool SearchResultWindow::hasFocus()
     \internal
 */
-bool SearchResultWindow::hasFocus()
+bool SearchResultWindow::hasFocus() const
 {
     return d->m_widget->focusWidget() && d->m_widget->focusWidget()->hasFocus();
 }
@@ -365,7 +365,7 @@ bool SearchResultWindow::hasFocus()
     \fn bool SearchResultWindow::canFocus()
     \internal
 */
-bool SearchResultWindow::canFocus()
+bool SearchResultWindow::canFocus() const
 {
     if (d->isSearchVisible())
         return d->m_searchResultWidgets.at(d->visibleSearchIndex())->canFocusInternally();
@@ -459,7 +459,7 @@ int SearchResultWindow::priorityInStatusBar() const
     \fn bool SearchResultWindow::canNext()
     \internal
 */
-bool SearchResultWindow::canNext()
+bool SearchResultWindow::canNext() const
 {
     if (d->isSearchVisible())
         return d->m_searchResultWidgets.at(d->visibleSearchIndex())->count() > 0;
@@ -470,7 +470,7 @@ bool SearchResultWindow::canNext()
     \fn bool SearchResultWindow::canPrevious()
     \internal
 */
-bool SearchResultWindow::canPrevious()
+bool SearchResultWindow::canPrevious() const
 {
     return canNext();
 }
@@ -501,7 +501,7 @@ void SearchResultWindow::goToPrev()
     \fn bool SearchResultWindow::canNavigate()
     \internal
 */
-bool SearchResultWindow::canNavigate()
+bool SearchResultWindow::canNavigate() const
 {
     return true;
 }
diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h
index 0d09575a666681f93acd2b888e13ab6d078b5e9e..d840cb4c2c2c1ca499f12aaee02e592f78e12132 100644
--- a/src/plugins/find/searchresultwindow.h
+++ b/src/plugins/find/searchresultwindow.h
@@ -142,15 +142,15 @@ public:
     QString displayName() const { return tr("Search Results"); }
     int priorityInStatusBar() const;
     void visibilityChanged(bool visible);
-    bool hasFocus();
-    bool canFocus();
+    bool hasFocus() const;
+    bool canFocus() const;
     void setFocus();
 
-    bool canNext();
-    bool canPrevious();
+    bool canNext() const;
+    bool canPrevious() const;
     void goToNext();
     void goToPrev();
-    bool canNavigate();
+    bool canNavigate() const;
 
     void setTextEditorFont(const QFont &font);
     void openNewSearchPanel();
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 3672a3bf61eecf9224fed0aae66a7141c1da26b5..dd1e285eb6ce8b343e19fd5e88bc9742311602bb 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -280,12 +280,12 @@ void AppOutputPane::visibilityChanged(bool /* b */)
 {
 }
 
-bool AppOutputPane::hasFocus()
+bool AppOutputPane::hasFocus() const
 {
     return m_tabWidget->currentWidget() && m_tabWidget->currentWidget()->hasFocus();
 }
 
-bool AppOutputPane::canFocus()
+bool AppOutputPane::canFocus() const
 {
     return m_tabWidget->currentWidget();
 }
@@ -571,12 +571,12 @@ bool AppOutputPane::isRunning() const
     return false;
 }
 
-bool AppOutputPane::canNext()
+bool AppOutputPane::canNext() const
 {
     return false;
 }
 
-bool AppOutputPane::canPrevious()
+bool AppOutputPane::canPrevious() const
 {
     return false;
 }
@@ -591,7 +591,7 @@ void AppOutputPane::goToPrev()
 
 }
 
-bool AppOutputPane::canNavigate()
+bool AppOutputPane::canNavigate() const
 {
     return false;
 }
diff --git a/src/plugins/projectexplorer/appoutputpane.h b/src/plugins/projectexplorer/appoutputpane.h
index 5dafaa6494e33a2aa045e024e09f06d0803d23bc..397bc02dd03c0d761ae1b6744d1b7f0b2315a9f8 100644
--- a/src/plugins/projectexplorer/appoutputpane.h
+++ b/src/plugins/projectexplorer/appoutputpane.h
@@ -63,20 +63,20 @@ public:
     virtual ~AppOutputPane();
 
     QWidget *outputWidget(QWidget *);
-    QList<QWidget*> toolBarWidgets() const;
+    QList<QWidget *> toolBarWidgets() const;
     QString displayName() const;
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool);
-    bool canFocus();
-    bool hasFocus();
+    bool canFocus() const;
+    bool hasFocus() const;
     void setFocus();
 
-    bool canNext();
-    bool canPrevious();
+    bool canNext() const;
+    bool canPrevious() const;
     void goToNext();
     void goToPrev();
-    bool canNavigate();
+    bool canNavigate() const;
 
     void createNewOutputWindow(RunControl *rc);
     void showTabFor(RunControl *rc);
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index a0b5d6a15c2e372e8d1542f1f9afe169673d37e3..3e0f7686955adde21b3b59f30291e71f90eb53ad 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -93,12 +93,12 @@ void CompileOutputWindow::updateWordWrapMode()
     m_outputWindow->setWordWrapEnabled(ProjectExplorerPlugin::instance()->projectExplorerSettings().wrapAppOutput);
 }
 
-bool CompileOutputWindow::hasFocus()
+bool CompileOutputWindow::hasFocus() const
 {
     return m_outputWindow->hasFocus();
 }
 
-bool CompileOutputWindow::canFocus()
+bool CompileOutputWindow::canFocus() const
 {
     return true;
 }
@@ -161,12 +161,12 @@ int CompileOutputWindow::priorityInStatusBar() const
     return 50;
 }
 
-bool CompileOutputWindow::canNext()
+bool CompileOutputWindow::canNext() const
 {
     return false;
 }
 
-bool CompileOutputWindow::canPrevious()
+bool CompileOutputWindow::canPrevious() const
 {
     return false;
 }
@@ -181,7 +181,7 @@ void CompileOutputWindow::goToPrev()
 
 }
 
-bool CompileOutputWindow::canNavigate()
+bool CompileOutputWindow::canNavigate() const
 {
     return false;
 }
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index b2983378686fcb6e71e13b1bce95bb81f6d8a668..de68a8a62862b2c5e70b960fab67e1ab78974602 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -62,21 +62,21 @@ public:
     ~CompileOutputWindow();
 
     QWidget *outputWidget(QWidget *);
-    QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
+    QList<QWidget *> toolBarWidgets() const { return QList<QWidget *>(); }
     QString displayName() const { return tr("Compile Output"); }
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
     void appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format);
-    bool canFocus();
-    bool hasFocus();
+    bool canFocus() const;
+    bool hasFocus() const;
     void setFocus();
 
-    bool canNext();
-    bool canPrevious();
+    bool canNext() const;
+    bool canPrevious() const;
     void goToNext();
     void goToPrev();
-    bool canNavigate();
+    bool canNavigate() const;
 
     void registerPositionOf(const Task &task);
     bool knowsPositionOf(const Task &task);
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index c7255ee56c2e0e6bdf9a97c7a19b926664ccd153..9e1def4b3cc90eadcb453433df55bb92489809b8 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -922,12 +922,12 @@ void TaskWindow::clearContents()
     d->m_taskHub->clearTasks(QString());
 }
 
-bool TaskWindow::hasFocus()
+bool TaskWindow::hasFocus() const
 {
     return d->m_listview->hasFocus();
 }
 
-bool TaskWindow::canFocus()
+bool TaskWindow::canFocus() const
 {
     return d->m_filter->rowCount();
 }
@@ -942,12 +942,12 @@ void TaskWindow::setFocus()
     }
 }
 
-bool TaskWindow::canNext()
+bool TaskWindow::canNext() const
 {
     return d->m_filter->rowCount();
 }
 
-bool TaskWindow::canPrevious()
+bool TaskWindow::canPrevious() const
 {
     return d->m_filter->rowCount();
 }
@@ -998,7 +998,7 @@ void TaskWindow::goToPrev()
     triggerDefaultHandler(currentIndex);
 }
 
-bool TaskWindow::canNavigate()
+bool TaskWindow::canNavigate() const
 {
     return true;
 }
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index b5f515af2bc0b3ac658266d0472a029e17f51fda..31d4bbedb1db167430142b9ed88bf05c2082e6ff 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -63,20 +63,20 @@ public:
 
     // IOutputPane
     QWidget *outputWidget(QWidget *);
-    QList<QWidget*> toolBarWidgets() const;
+    QList<QWidget *> toolBarWidgets() const;
 
     QString displayName() const { return tr("Build Issues"); }
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
 
-    bool canFocus();
-    bool hasFocus();
+    bool canFocus() const;
+    bool hasFocus() const;
     void setFocus();
 
-    bool canNavigate();
-    bool canNext();
-    bool canPrevious();
+    bool canNavigate() const;
+    bool canNext() const;
+    bool canPrevious() const;
     void goToNext();
     void goToPrev();
 
diff --git a/src/plugins/qttest/resultsview.cpp b/src/plugins/qttest/resultsview.cpp
index 6f7b977e19059bcf0f4ca665a1f87c842fb4b80e..d6f31d211167e4dd7fc19854fe1b36876f2dd2c4 100644
--- a/src/plugins/qttest/resultsview.cpp
+++ b/src/plugins/qttest/resultsview.cpp
@@ -540,12 +540,12 @@ TestResultsWindow::~TestResultsWindow()
     _testResultsInstance = 0;
 }
 
-bool TestResultsWindow::hasFocus()
+bool TestResultsWindow::hasFocus() const
 {
     return m_resultsView->hasFocus();
 }
 
-bool TestResultsWindow::canFocus()
+bool TestResultsWindow::canFocus() const
 {
     return true;
 }
@@ -583,7 +583,7 @@ int TestResultsWindow::priorityInStatusBar() const
     return 50;
 }
 
-bool TestResultsWindow::canNext()
+bool TestResultsWindow::canNext() const
 {
     for (int i = m_resultsView->currentRow() + 1; i < m_resultsView->rowCount(); ++i) {
         if (!m_resultsView->isRowHidden(i))
@@ -592,7 +592,7 @@ bool TestResultsWindow::canNext()
     return false;
 }
 
-bool TestResultsWindow::canPrevious()
+bool TestResultsWindow::canPrevious() const
 {
     for (int i = m_resultsView->currentRow() - 1; i >= 0; --i) {
         if (!m_resultsView->isRowHidden(i))
@@ -621,7 +621,7 @@ void TestResultsWindow::goToPrev()
     }
 }
 
-bool TestResultsWindow::canNavigate()
+bool TestResultsWindow::canNavigate() const
 {
     return true;
 }
diff --git a/src/plugins/qttest/resultsview.h b/src/plugins/qttest/resultsview.h
index 2e53672af29d986efbcc5eb714abca43490134c1..e8e1d0e343c36d3bdb055f8df97c410286f4e9f3 100644
--- a/src/plugins/qttest/resultsview.h
+++ b/src/plugins/qttest/resultsview.h
@@ -132,25 +132,25 @@ public:
 
     static TestResultsWindow *instance();
 
-    virtual QString displayName() const { return "Test Results"; }
+    virtual QString displayName() const { return tr("Test Results"); }
 
     QWidget *outputWidget(QWidget *parent);
-    QList<QWidget*> toolBarWidgets() const;
+    QList<QWidget *> toolBarWidgets() const;
 
     QString name() const;
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
 
-    bool canFocus();
-    bool hasFocus();
+    bool canFocus() const;
+    bool hasFocus() const;
     void setFocus();
 
-    virtual bool canNext();
-    virtual bool canPrevious();
+    virtual bool canNext() const;
+    virtual bool canPrevious() const;
     virtual void goToNext();
     virtual void goToPrev();
-    bool canNavigate();
+    bool canNavigate() const;
     ResultsView *resultsView() { return m_resultsView; }
 
     void addResult(const QString &result, const QString &test, const QString &reason,
diff --git a/src/plugins/qttest/testoutputwindow.cpp b/src/plugins/qttest/testoutputwindow.cpp
index f089b1a645710d633990c55f0de4d75adff008ff..05d9c6125eeab5b358b4ba2a0bb21ddc02e6c9ae 100644
--- a/src/plugins/qttest/testoutputwindow.cpp
+++ b/src/plugins/qttest/testoutputwindow.cpp
@@ -57,12 +57,12 @@ TestOutputWindow::~TestOutputWindow()
     m_instance = 0;
 }
 
-bool TestOutputWindow::hasFocus()
+bool TestOutputWindow::hasFocus() const
 {
     return m_widget->hasFocus();
 }
 
-bool TestOutputWindow::canFocus()
+bool TestOutputWindow::canFocus() const
 {
     return true;
 }
@@ -97,12 +97,12 @@ int TestOutputWindow::priorityInStatusBar() const
     return 50;
 }
 
-bool TestOutputWindow::canNext()
+bool TestOutputWindow::canNext() const
 {
     return false;
 }
 
-bool TestOutputWindow::canPrevious()
+bool TestOutputWindow::canPrevious() const
 {
     return false;
 }
@@ -117,7 +117,7 @@ void TestOutputWindow::goToPrev()
 
 }
 
-bool TestOutputWindow::canNavigate()
+bool TestOutputWindow::canNavigate() const
 {
     return false;
 }
diff --git a/src/plugins/qttest/testoutputwindow.h b/src/plugins/qttest/testoutputwindow.h
index e988fdfb74deea8536b4f5d5f21a146fe4c65c14..d93801bcccb733bfbb8d2d4a9b01736419adefcb 100644
--- a/src/plugins/qttest/testoutputwindow.h
+++ b/src/plugins/qttest/testoutputwindow.h
@@ -50,22 +50,22 @@ public:
     virtual QString displayName() const { return "Test Output"; }
 
     QWidget *outputWidget(QWidget *parent);
-    QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
+    QList<QWidget *> toolBarWidgets() const { return QList<QWidget *>(); }
 
     QString name() const;
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
 
-    bool canFocus();
-    bool hasFocus();
+    bool canFocus() const;
+    bool hasFocus() const;
     void setFocus();
 
-    virtual bool canNext();
-    virtual bool canPrevious();
+    virtual bool canNext() const;
+    virtual bool canPrevious() const;
     virtual void goToNext();
     virtual void goToPrev();
-    bool canNavigate();
+    bool canNavigate() const;
 
     QTextEdit *m_widget;
 };
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
index fdb71dfda888089e44be094c2713b857c55cd318..f4486e74ce28171b1af2b7964affec90cc21181c 100644
--- a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp
@@ -318,27 +318,27 @@ void VCSBaseOutputWindow::setFocus()
 {
 }
 
-bool VCSBaseOutputWindow::hasFocus()
+bool VCSBaseOutputWindow::hasFocus() const
 {
     return false;
 }
 
-bool VCSBaseOutputWindow::canFocus()
+bool VCSBaseOutputWindow::canFocus() const
 {
     return false;
 }
 
-bool VCSBaseOutputWindow::canNavigate()
+bool VCSBaseOutputWindow::canNavigate() const
 {
     return false;
 }
 
-bool VCSBaseOutputWindow::canNext()
+bool VCSBaseOutputWindow::canNext() const
 {
     return false;
 }
 
-bool VCSBaseOutputWindow::canPrevious()
+bool VCSBaseOutputWindow::canPrevious() const
 {
     return false;
 }
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.h b/src/plugins/vcsbase/vcsbaseoutputwindow.h
index a9d4501a002999a6a01b8f0cb80d1301d8d7b601..0e24aa72cfc71083cf708ab0d5cd061b695288e9 100644
--- a/src/plugins/vcsbase/vcsbaseoutputwindow.h
+++ b/src/plugins/vcsbase/vcsbaseoutputwindow.h
@@ -49,7 +49,7 @@ public:
     virtual ~VCSBaseOutputWindow();
 
     virtual QWidget *outputWidget(QWidget *parent);
-    virtual QList<QWidget*> toolBarWidgets() const;
+    virtual QList<QWidget *> toolBarWidgets() const;
     virtual QString displayName() const;
 
     virtual int priorityInStatusBar() const;
@@ -58,12 +58,12 @@ public:
     virtual void visibilityChanged(bool visible);
 
     virtual void setFocus();
-    virtual bool hasFocus();
-    virtual bool canFocus();
+    virtual bool hasFocus() const;
+    virtual bool canFocus() const;
 
-    virtual bool canNavigate();
-    virtual bool canNext();
-    virtual bool canPrevious();
+    virtual bool canNavigate() const;
+    virtual bool canNext() const;
+    virtual bool canPrevious() const;
     virtual void goToNext();
     virtual void goToPrev();