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

IOutputPane: constify some member functions

Browse Source 
Change-Id: I023b7f5976b30fc950d2dd5a76f749ef4720ac2f
Reviewed-on: http://codereview.qt-project.org/5618
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2011-09-27 13:47:06 +02:00
committed by Eike Ziller
parent 7d96ba70c9
commit 373d51a1ed
17 changed files with 101 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/plugins/coreplugin/ioutputpane.h
View File

@@ -48,9 +48,9 @@ namespace Core {
class CORE_EXPORT IOutputPane : public QObject class CORE_EXPORT IOutputPane : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
IOutputPane(QObject *parent = 0) : QObject(parent) {} IOutputPane(QObject *parent = 0) : QObject(parent) {}
virtual ~IOutputPane() {}
virtual QWidget *outputWidget(QWidget *parent) = 0; virtual QWidget *outputWidget(QWidget *parent) = 0;
virtual QList<QWidget *> toolBarWidgets() const = 0; virtual QList<QWidget *> toolBarWidgets() const = 0;
@@ -66,45 +66,24 @@ public:
// This function is called to give the outputwindow focus // This function is called to give the outputwindow focus
virtual void setFocus() = 0; virtual void setFocus() = 0;
// Whether the outputpane has focus // Whether the outputpane has focus
virtual bool hasFocus() = 0; virtual bool hasFocus() const = 0;
// Whether the outputpane can be focused at the moment. // 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.) // (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 canNavigate() const = 0;
virtual bool canNext() = 0; virtual bool canNext() const = 0;
virtual bool canPrevious() = 0; virtual bool canPrevious() const = 0;
virtual void goToNext() = 0; virtual void goToNext() = 0;
virtual void goToPrev() = 0; virtual void goToPrev() = 0;
public slots: public slots:
void popup() void popup() { popup(true); }
{ void popup(bool withFocus) { emit showPage(withFocus); }
popup(true); void hide() { emit hidePage(); }
} void toggle() { toggle(true); }
void popup(bool withFocus) void toggle(bool withFocusIfShown) { emit togglePage(withFocusIfShown); }
{ void navigateStateChanged() { emit navigateStateUpdate(); }
emit showPage(withFocus);
}
void hide()
{
emit hidePage();
}
void toggle()
{
toggle(true);
}
void toggle(bool withFocusIfShown)
{
emit togglePage(withFocusIfShown);
}
void navigateStateChanged()
{
emit navigateStateUpdate();
}
signals: signals:
void showPage(bool withFocus); void showPage(bool withFocus);

10
src/plugins/coreplugin/messageoutputwindow.cpp
View File

@@ -50,12 +50,12 @@ MessageOutputWindow::~MessageOutputWindow()
delete m_widget; delete m_widget;
} }
bool MessageOutputWindow::hasFocus() bool MessageOutputWindow::hasFocus() const
{ {
return m_widget->hasFocus(); return m_widget->hasFocus();
} }
bool MessageOutputWindow::canFocus() bool MessageOutputWindow::canFocus() const
{ {
return true; return true;
} }
@@ -95,12 +95,12 @@ int MessageOutputWindow::priorityInStatusBar() const
return -1; return -1;
} }
bool MessageOutputWindow::canNext() bool MessageOutputWindow::canNext() const
{ {
return false; return false;
} }
bool MessageOutputWindow::canPrevious() bool MessageOutputWindow::canPrevious() const
{ {
return false; return false;
} }
@@ -115,7 +115,7 @@ void MessageOutputWindow::goToPrev()
} }
bool MessageOutputWindow::canNavigate() bool MessageOutputWindow::canNavigate() const
{ {
return false; return false;
} }

10
src/plugins/coreplugin/messageoutputwindow.h
View File

@@ -57,15 +57,15 @@ public:
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
void append(const QString &text); void append(const QString &text);
bool canFocus(); bool canFocus() const;
bool hasFocus(); bool hasFocus() const;
void setFocus(); void setFocus();
virtual bool canNext(); virtual bool canNext() const;
virtual bool canPrevious(); virtual bool canPrevious() const;
virtual void goToNext(); virtual void goToNext();
virtual void goToPrev(); virtual void goToPrev();
bool canNavigate(); bool canNavigate() const;
private: private:
OutputWindow *m_widget; OutputWindow *m_widget;

10
src/plugins/find/searchresultwindow.cpp
View File

@@ -356,7 +356,7 @@ void SearchResultWindow::clearContents()
\fn bool SearchResultWindow::hasFocus() \fn bool SearchResultWindow::hasFocus()
\internal \internal
*/ */
bool SearchResultWindow::hasFocus() bool SearchResultWindow::hasFocus() const
{ {
return d->m_widget->focusWidget() && d->m_widget->focusWidget()->hasFocus(); return d->m_widget->focusWidget() && d->m_widget->focusWidget()->hasFocus();
} }
@@ -365,7 +365,7 @@ bool SearchResultWindow::hasFocus()
\fn bool SearchResultWindow::canFocus() \fn bool SearchResultWindow::canFocus()
\internal \internal
*/ */
bool SearchResultWindow::canFocus() bool SearchResultWindow::canFocus() const
{ {
if (d->isSearchVisible()) if (d->isSearchVisible())
return d->m_searchResultWidgets.at(d->visibleSearchIndex())->canFocusInternally(); return d->m_searchResultWidgets.at(d->visibleSearchIndex())->canFocusInternally();
@@ -459,7 +459,7 @@ int SearchResultWindow::priorityInStatusBar() const
\fn bool SearchResultWindow::canNext() \fn bool SearchResultWindow::canNext()
\internal \internal
*/ */
bool SearchResultWindow::canNext() bool SearchResultWindow::canNext() const
{ {
if (d->isSearchVisible()) if (d->isSearchVisible())
return d->m_searchResultWidgets.at(d->visibleSearchIndex())->count() > 0; return d->m_searchResultWidgets.at(d->visibleSearchIndex())->count() > 0;
@@ -470,7 +470,7 @@ bool SearchResultWindow::canNext()
\fn bool SearchResultWindow::canPrevious() \fn bool SearchResultWindow::canPrevious()
\internal \internal
*/ */
bool SearchResultWindow::canPrevious() bool SearchResultWindow::canPrevious() const
{ {
return canNext(); return canNext();
} }
@@ -501,7 +501,7 @@ void SearchResultWindow::goToPrev()
\fn bool SearchResultWindow::canNavigate() \fn bool SearchResultWindow::canNavigate()
\internal \internal
*/ */
bool SearchResultWindow::canNavigate() bool SearchResultWindow::canNavigate() const
{ {
return true; return true;
} }

10
src/plugins/find/searchresultwindow.h
View File

@@ -142,15 +142,15 @@ public:
QString displayName() const { return tr("Search Results"); } QString displayName() const { return tr("Search Results"); }
int priorityInStatusBar() const; int priorityInStatusBar() const;
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
bool hasFocus(); bool hasFocus() const;
bool canFocus(); bool canFocus() const;
void setFocus(); void setFocus();
bool canNext(); bool canNext() const;
bool canPrevious(); bool canPrevious() const;
void goToNext(); void goToNext();
void goToPrev(); void goToPrev();
bool canNavigate(); bool canNavigate() const;
void setTextEditorFont(const QFont &font); void setTextEditorFont(const QFont &font);
void openNewSearchPanel(); void openNewSearchPanel();

10
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -280,12 +280,12 @@ void AppOutputPane::visibilityChanged(bool /* b */)
{ {
} }
bool AppOutputPane::hasFocus() bool AppOutputPane::hasFocus() const
{ {
return m_tabWidget->currentWidget() && m_tabWidget->currentWidget()->hasFocus(); return m_tabWidget->currentWidget() && m_tabWidget->currentWidget()->hasFocus();
} }
bool AppOutputPane::canFocus() bool AppOutputPane::canFocus() const
{ {
return m_tabWidget->currentWidget(); return m_tabWidget->currentWidget();
} }
@@ -571,12 +571,12 @@ bool AppOutputPane::isRunning() const
return false; return false;
} }
bool AppOutputPane::canNext() bool AppOutputPane::canNext() const
{ {
return false; return false;
} }
bool AppOutputPane::canPrevious() bool AppOutputPane::canPrevious() const
{ {
return false; return false;
} }
@@ -591,7 +591,7 @@ void AppOutputPane::goToPrev()
} }
bool AppOutputPane::canNavigate() bool AppOutputPane::canNavigate() const
{ {
return false; return false;
} }

10
src/plugins/projectexplorer/appoutputpane.h
View File

@@ -68,15 +68,15 @@ public:
int priorityInStatusBar() const; int priorityInStatusBar() const;
void clearContents(); void clearContents();
void visibilityChanged(bool); void visibilityChanged(bool);
bool canFocus(); bool canFocus() const;
bool hasFocus(); bool hasFocus() const;
void setFocus(); void setFocus();
bool canNext(); bool canNext() const;
bool canPrevious(); bool canPrevious() const;
void goToNext(); void goToNext();
void goToPrev(); void goToPrev();
bool canNavigate(); bool canNavigate() const;
void createNewOutputWindow(RunControl *rc); void createNewOutputWindow(RunControl *rc);
void showTabFor(RunControl *rc); void showTabFor(RunControl *rc);

10
src/plugins/projectexplorer/compileoutputwindow.cpp
View File

@@ -93,12 +93,12 @@ void CompileOutputWindow::updateWordWrapMode()
m_outputWindow->setWordWrapEnabled(ProjectExplorerPlugin::instance()->projectExplorerSettings().wrapAppOutput); m_outputWindow->setWordWrapEnabled(ProjectExplorerPlugin::instance()->projectExplorerSettings().wrapAppOutput);
} }
bool CompileOutputWindow::hasFocus() bool CompileOutputWindow::hasFocus() const
{ {
return m_outputWindow->hasFocus(); return m_outputWindow->hasFocus();
} }
bool CompileOutputWindow::canFocus() bool CompileOutputWindow::canFocus() const
{ {
return true; return true;
} }
@@ -161,12 +161,12 @@ int CompileOutputWindow::priorityInStatusBar() const
return 50; return 50;
} }
bool CompileOutputWindow::canNext() bool CompileOutputWindow::canNext() const
{ {
return false; return false;
} }
bool CompileOutputWindow::canPrevious() bool CompileOutputWindow::canPrevious() const
{ {
return false; return false;
} }
@@ -181,7 +181,7 @@ void CompileOutputWindow::goToPrev()
} }
bool CompileOutputWindow::canNavigate() bool CompileOutputWindow::canNavigate() const
{ {
return false; return false;
} }

10
src/plugins/projectexplorer/compileoutputwindow.h
View File

@@ -68,15 +68,15 @@ public:
void clearContents(); void clearContents();
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
void appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format); void appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format);
bool canFocus(); bool canFocus() const;
bool hasFocus(); bool hasFocus() const;
void setFocus(); void setFocus();
bool canNext(); bool canNext() const;
bool canPrevious(); bool canPrevious() const;
void goToNext(); void goToNext();
void goToPrev(); void goToPrev();
bool canNavigate(); bool canNavigate() const;
void registerPositionOf(const Task &task); void registerPositionOf(const Task &task);
bool knowsPositionOf(const Task &task); bool knowsPositionOf(const Task &task);

10
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -922,12 +922,12 @@ void TaskWindow::clearContents()
d->m_taskHub->clearTasks(QString()); d->m_taskHub->clearTasks(QString());
} }
bool TaskWindow::hasFocus() bool TaskWindow::hasFocus() const
{ {
return d->m_listview->hasFocus(); return d->m_listview->hasFocus();
} }
bool TaskWindow::canFocus() bool TaskWindow::canFocus() const
{ {
return d->m_filter->rowCount(); return d->m_filter->rowCount();
} }
@@ -942,12 +942,12 @@ void TaskWindow::setFocus()
} }
} }
bool TaskWindow::canNext() bool TaskWindow::canNext() const
{ {
return d->m_filter->rowCount(); return d->m_filter->rowCount();
} }
bool TaskWindow::canPrevious() bool TaskWindow::canPrevious() const
{ {
return d->m_filter->rowCount(); return d->m_filter->rowCount();
} }
@@ -998,7 +998,7 @@ void TaskWindow::goToPrev()
triggerDefaultHandler(currentIndex); triggerDefaultHandler(currentIndex);
} }
bool TaskWindow::canNavigate() bool TaskWindow::canNavigate() const
{ {
return true; return true;
} }

10
src/plugins/projectexplorer/taskwindow.h
View File

@@ -70,13 +70,13 @@ public:
void clearContents(); void clearContents();
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
bool canFocus(); bool canFocus() const;
bool hasFocus(); bool hasFocus() const;
void setFocus(); void setFocus();
bool canNavigate(); bool canNavigate() const;
bool canNext(); bool canNext() const;
bool canPrevious(); bool canPrevious() const;
void goToNext(); void goToNext();
void goToPrev(); void goToPrev();

10
src/plugins/qttest/resultsview.cpp
View File

@@ -540,12 +540,12 @@ TestResultsWindow::~TestResultsWindow()
_testResultsInstance = 0; _testResultsInstance = 0;
} }
bool TestResultsWindow::hasFocus() bool TestResultsWindow::hasFocus() const
{ {
return m_resultsView->hasFocus(); return m_resultsView->hasFocus();
} }
bool TestResultsWindow::canFocus() bool TestResultsWindow::canFocus() const
{ {
return true; return true;
} }
@@ -583,7 +583,7 @@ int TestResultsWindow::priorityInStatusBar() const
return 50; return 50;
} }
bool TestResultsWindow::canNext() bool TestResultsWindow::canNext() const
{ {
for (int i = m_resultsView->currentRow() + 1; i < m_resultsView->rowCount(); ++i) { for (int i = m_resultsView->currentRow() + 1; i < m_resultsView->rowCount(); ++i) {
if (!m_resultsView->isRowHidden(i)) if (!m_resultsView->isRowHidden(i))
@@ -592,7 +592,7 @@ bool TestResultsWindow::canNext()
return false; return false;
} }
bool TestResultsWindow::canPrevious() bool TestResultsWindow::canPrevious() const
{ {
for (int i = m_resultsView->currentRow() - 1; i >= 0; --i) { for (int i = m_resultsView->currentRow() - 1; i >= 0; --i) {
if (!m_resultsView->isRowHidden(i)) if (!m_resultsView->isRowHidden(i))
@@ -621,7 +621,7 @@ void TestResultsWindow::goToPrev()
} }
} }
bool TestResultsWindow::canNavigate() bool TestResultsWindow::canNavigate() const
{ {
return true; return true;
} }

12
src/plugins/qttest/resultsview.h
View File

@@ -132,7 +132,7 @@ public:
static TestResultsWindow *instance(); static TestResultsWindow *instance();
virtual QString displayName() const { return "Test Results"; } virtual QString displayName() const { return tr("Test Results"); }
QWidget *outputWidget(QWidget *parent); QWidget *outputWidget(QWidget *parent);
QList<QWidget *> toolBarWidgets() const; QList<QWidget *> toolBarWidgets() const;
@@ -142,15 +142,15 @@ public:
void clearContents(); void clearContents();
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
bool canFocus(); bool canFocus() const;
bool hasFocus(); bool hasFocus() const;
void setFocus(); void setFocus();
virtual bool canNext(); virtual bool canNext() const;
virtual bool canPrevious(); virtual bool canPrevious() const;
virtual void goToNext(); virtual void goToNext();
virtual void goToPrev(); virtual void goToPrev();
bool canNavigate(); bool canNavigate() const;
ResultsView *resultsView() { return m_resultsView; } ResultsView *resultsView() { return m_resultsView; }
void addResult(const QString &result, const QString &test, const QString &reason, void addResult(const QString &result, const QString &test, const QString &reason,

10
src/plugins/qttest/testoutputwindow.cpp
View File

@@ -57,12 +57,12 @@ TestOutputWindow::~TestOutputWindow()
m_instance = 0; m_instance = 0;
} }
bool TestOutputWindow::hasFocus() bool TestOutputWindow::hasFocus() const
{ {
return m_widget->hasFocus(); return m_widget->hasFocus();
} }
bool TestOutputWindow::canFocus() bool TestOutputWindow::canFocus() const
{ {
return true; return true;
} }
@@ -97,12 +97,12 @@ int TestOutputWindow::priorityInStatusBar() const
return 50; return 50;
} }
bool TestOutputWindow::canNext() bool TestOutputWindow::canNext() const
{ {
return false; return false;
} }
bool TestOutputWindow::canPrevious() bool TestOutputWindow::canPrevious() const
{ {
return false; return false;
} }
@@ -117,7 +117,7 @@ void TestOutputWindow::goToPrev()
} }
bool TestOutputWindow::canNavigate() bool TestOutputWindow::canNavigate() const
{ {
return false; return false;
} }

10
src/plugins/qttest/testoutputwindow.h
View File

@@ -57,15 +57,15 @@ public:
void clearContents(); void clearContents();
void visibilityChanged(bool visible); void visibilityChanged(bool visible);
bool canFocus(); bool canFocus() const;
bool hasFocus(); bool hasFocus() const;
void setFocus(); void setFocus();
virtual bool canNext(); virtual bool canNext() const;
virtual bool canPrevious(); virtual bool canPrevious() const;
virtual void goToNext(); virtual void goToNext();
virtual void goToPrev(); virtual void goToPrev();
bool canNavigate(); bool canNavigate() const;
QTextEdit *m_widget; QTextEdit *m_widget;
}; };

10
src/plugins/vcsbase/vcsbaseoutputwindow.cpp
View File

@@ -318,27 +318,27 @@ void VCSBaseOutputWindow::setFocus()
{ {
} }
bool VCSBaseOutputWindow::hasFocus() bool VCSBaseOutputWindow::hasFocus() const
{ {
return false; return false;
} }
bool VCSBaseOutputWindow::canFocus() bool VCSBaseOutputWindow::canFocus() const
{ {
return false; return false;
} }
bool VCSBaseOutputWindow::canNavigate() bool VCSBaseOutputWindow::canNavigate() const
{ {
return false; return false;
} }
bool VCSBaseOutputWindow::canNext() bool VCSBaseOutputWindow::canNext() const
{ {
return false; return false;
} }
bool VCSBaseOutputWindow::canPrevious() bool VCSBaseOutputWindow::canPrevious() const
{ {
return false; return false;
} }

10
src/plugins/vcsbase/vcsbaseoutputwindow.h
View File

@@ -58,12 +58,12 @@ public:
virtual void visibilityChanged(bool visible); virtual void visibilityChanged(bool visible);
virtual void setFocus(); virtual void setFocus();
virtual bool hasFocus(); virtual bool hasFocus() const;
virtual bool canFocus(); virtual bool canFocus() const;
virtual bool canNavigate(); virtual bool canNavigate() const;
virtual bool canNext(); virtual bool canNext() const;
virtual bool canPrevious(); virtual bool canPrevious() const;
virtual void goToNext(); virtual void goToNext();
virtual void goToPrev(); virtual void goToPrev();