From 2e361d20ab441615dd22d9e53dfa316443a9fe0a Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 9 Oct 2012 14:02:52 +0200 Subject: [PATCH] TextEditor: adjust ITextMark getters to coding style bool getters should have an 'is' prefix. Change-Id: I6d8b0a680e7985fa454b5e7df1b85ace6da264e6 Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/taskhub.cpp | 4 ++-- src/plugins/texteditor/basetextdocumentlayout.cpp | 6 +++--- src/plugins/texteditor/basetexteditor.cpp | 6 +++--- src/plugins/texteditor/itextmark.cpp | 4 ++-- src/plugins/texteditor/itextmark.h | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index f7a34bc01f8..99200097f1f 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -45,7 +45,7 @@ public: setVisible(visible); } - bool clickable() const; + bool isClickable() const; void clicked(); void updateFileName(const QString &fileName); @@ -72,7 +72,7 @@ void TaskMark::removedFromEditor() ProjectExplorerPlugin::instance()->taskHub()->updateTaskLineNumber(m_id, -1); } -bool TaskMark::clickable() const +bool TaskMark::isClickable() const { return true; } diff --git a/src/plugins/texteditor/basetextdocumentlayout.cpp b/src/plugins/texteditor/basetextdocumentlayout.cpp index 4e4781bed73..a9f33c15466 100644 --- a/src/plugins/texteditor/basetextdocumentlayout.cpp +++ b/src/plugins/texteditor/basetextdocumentlayout.cpp @@ -86,7 +86,7 @@ bool DocumentMarker::addMark(TextEditor::ITextMark *mark) QTC_CHECK(mark->lineNumber() == blockNumber + 1); // Checks that the base class is called mark->updateBlock(block); mark->setMarkableInterface(this); - if (!mark->visible()) + if (!mark->isVisible()) return true; // Update document layout double newMaxWidthFactor = qMax(mark->widthFactor(), documentLayout->maxMarkWidthFactor); @@ -129,7 +129,7 @@ void DocumentMarker::removeMarkFromMarksCache(TextEditor::ITextMark *mark) return; } - if (!mark->visible()) + if (!mark->isVisible()) return; if (documentLayout->maxMarkWidthFactor == 1.0 @@ -140,7 +140,7 @@ void DocumentMarker::removeMarkFromMarksCache(TextEditor::ITextMark *mark) } else { double maxWidthFactor = 1.0; foreach (const ITextMark *mark, marks()) { - if (!mark->visible()) + if (!mark->isVisible()) continue; maxWidthFactor = qMax(mark->widthFactor(), maxWidthFactor); if (maxWidthFactor == documentLayout->maxMarkWidthFactor) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 45c145f354d..e2dbc434ce6 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -3796,7 +3796,7 @@ void BaseTextEditorWidget::extraAreaPaintEvent(QPaintEvent *e) int count = 0; it = marks.constEnd() - 1; while (it != marks.constBegin()) { - if ((*it)->visible()) + if ((*it)->isVisible()) ++count; if (count == 3) break; @@ -3806,7 +3806,7 @@ void BaseTextEditorWidget::extraAreaPaintEvent(QPaintEvent *e) TextMarks::const_iterator end = marks.constEnd(); for ( ; it != end; ++it) { ITextMark *mark = *it; - if (!mark->visible()) + if (!mark->isVisible()) continue; const int height = fmLineSpacing - 1; const int width = int(.5 + height * mark->widthFactor()); @@ -4454,7 +4454,7 @@ void BaseTextEditorWidget::extraAreaMouseEvent(QMouseEvent *e) if (cursor.blockNumber() == n) { if (TextBlockUserData *data = static_cast(cursor.block().userData())) { foreach (ITextMark *mark, data->marks()) { - if (mark->clickable()) { + if (mark->isClickable()) { mark->clicked(); return; } diff --git a/src/plugins/texteditor/itextmark.cpp b/src/plugins/texteditor/itextmark.cpp index b81d742dbd3..d655de0304c 100644 --- a/src/plugins/texteditor/itextmark.cpp +++ b/src/plugins/texteditor/itextmark.cpp @@ -80,7 +80,7 @@ ITextMark::Priority ITextMark::priority() const return m_priority; } -bool ITextMark::visible() const +bool ITextMark::isVisible() const { return m_visible; } @@ -102,7 +102,7 @@ void ITextMark::setWidthFactor(double factor) m_widthFactor = factor; } -bool ITextMark::clickable() const +bool ITextMark::isClickable() const { return false; } diff --git a/src/plugins/texteditor/itextmark.h b/src/plugins/texteditor/itextmark.h index eed816da362..0013c6f2eea 100644 --- a/src/plugins/texteditor/itextmark.h +++ b/src/plugins/texteditor/itextmark.h @@ -74,7 +74,7 @@ public: virtual void updateLineNumber(int lineNumber); virtual void updateBlock(const QTextBlock &block); virtual void removedFromEditor(); - virtual bool clickable() const; + virtual bool isClickable() const; virtual void clicked(); void setIcon(const QIcon &icon); @@ -82,8 +82,8 @@ public: void updateMarker(); Priority priority() const; void setPriority(Priority prioriy); - bool visible() const; - void setVisible(bool visible); + bool isVisible() const; + void setVisible(bool isVisible); double widthFactor() const; void setWidthFactor(double factor);