Don't clash signal names with other methods

In case when signal name clashes with other method name -
rename accordingly.
Remove some repeated signal declarations - they are already
declared in superclass.

Change-Id: Ie1430b85d6436d26996494fa44c7554fb354b6ce
Reviewed-by: hjk <hjk@qt.io>

15 files changed, 26 insertions, 45 deletions

diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h
index 1ac44f60b6..ebc833b75d 100644
--- a/src/plugins/android/androidrunconfiguration.h
+++ b/src/plugins/android/androidrunconfiguration.h
@@ -53,9 +53,6 @@ public:
     void fromMap(const QVariantMap &map) override;
     void toMap(QVariantMap &map) const override;
 
-signals:
-    void changed();
-
 private:
     QStringList m_value;
     QString m_label;
diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index 68d62550a4..432720f3e5 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -92,9 +92,9 @@ signals:
     void navigateStateUpdate();
     void flashButton();
     void setBadgeNumber(int number);
-    void zoomIn(int range);
-    void zoomOut(int range);
-    void resetZoom();
+    void zoomInRequested(int range);
+    void zoomOutRequested(int range);
+    void resetZoomRequested();
     void wheelZoomEnabledChanged(bool enabled);
     void fontChanged(const QFont &font);
 
diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index 97b47a1e2f..1ca9a6be8f 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -54,9 +54,9 @@ MessageOutputWindow::MessageOutputWindow()
     p.setColor(QPalette::HighlightedText, activeHighlightedText);
     m_widget->setPalette(p);
 
-    connect(this, &IOutputPane::zoomIn, m_widget, &Core::OutputWindow::zoomIn);
-    connect(this, &IOutputPane::zoomOut, m_widget, &Core::OutputWindow::zoomOut);
-    connect(this, &IOutputPane::resetZoom, m_widget, &Core::OutputWindow::resetZoom);
+    connect(this, &IOutputPane::zoomInRequested, m_widget, &Core::OutputWindow::zoomIn);
+    connect(this, &IOutputPane::zoomOutRequested, m_widget, &Core::OutputWindow::zoomOut);
+    connect(this, &IOutputPane::resetZoomRequested, m_widget, &Core::OutputWindow::resetZoom);
     connect(this, &IOutputPane::fontChanged, m_widget, &OutputWindow::setBaseFont);
     connect(this, &IOutputPane::wheelZoomEnabledChanged, m_widget, &OutputWindow::setWheelZoomEnabled);
 
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 92008d6b04..c7c519f1fa 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -100,11 +100,11 @@ IOutputPane::IOutputPane(QObject *parent)
 
     m_zoomInButton->setIcon(Utils::Icons::PLUS_TOOLBAR.icon());
     m_zoomInButton->setCommandId(Constants::ZOOM_IN);
-    connect(m_zoomInButton, &QToolButton::clicked, this, [this] { emit zoomIn(1); });
+    connect(m_zoomInButton, &QToolButton::clicked, this, [this] { emit zoomInRequested(1); });
 
     m_zoomOutButton->setIcon(Utils::Icons::MINUS.icon());
     m_zoomOutButton->setCommandId(Constants::ZOOM_OUT);
-    connect(m_zoomOutButton, &QToolButton::clicked, this, [this] { emit zoomOut(1); });
+    connect(m_zoomOutButton, &QToolButton::clicked, this, [this] { emit zoomOutRequested(1); });
 }
 
 IOutputPane::~IOutputPane()
@@ -199,14 +199,14 @@ void IOutputPane::setupContext(const char *context, QWidget *widget)
 
     const auto zoomInAction = new QAction(this);
     Core::ActionManager::registerAction(zoomInAction, Constants::ZOOM_IN, m_context->context());
-    connect(zoomInAction, &QAction::triggered, this, [this] { emit zoomIn(1); });
+    connect(zoomInAction, &QAction::triggered, this, [this] { emit zoomInRequested(1); });
     const auto zoomOutAction = new QAction(this);
     Core::ActionManager::registerAction(zoomOutAction, Constants::ZOOM_OUT, m_context->context());
-    connect(zoomOutAction, &QAction::triggered, this, [this] { emit zoomOut(1); });
+    connect(zoomOutAction, &QAction::triggered, this, [this] { emit zoomOutRequested(1); });
     const auto resetZoomAction = new QAction(this);
     Core::ActionManager::registerAction(resetZoomAction, Constants::ZOOM_RESET,
                                         m_context->context());
-    connect(resetZoomAction, &QAction::triggered, this, &IOutputPane::resetZoom);
+    connect(resetZoomAction, &QAction::triggered, this, &IOutputPane::resetZoomRequested);
 }
 
 void IOutputPane::setZoomButtonsEnabled(bool enabled)
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 95f04e20c5..658028b2b7 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -204,9 +204,9 @@ AppOutputPane::AppOutputPane() :
     connect(m_attachButton, &QToolButton::clicked,
             this, &AppOutputPane::attachToRunControl);
 
-    connect(this, &Core::IOutputPane::zoomIn, this, &AppOutputPane::zoomIn);
-    connect(this, &Core::IOutputPane::zoomOut, this, &AppOutputPane::zoomOut);
-    connect(this, &IOutputPane::resetZoom, this, &AppOutputPane::resetZoom);
+    connect(this, &IOutputPane::zoomInRequested, this, &AppOutputPane::zoomIn);
+    connect(this, &IOutputPane::zoomOutRequested, this, &AppOutputPane::zoomOut);
+    connect(this, &IOutputPane::resetZoomRequested, this, &AppOutputPane::resetZoom);
 
     m_settingsButton->setToolTip(tr("Open Settings Page"));
     m_settingsButton->setIcon(Utils::Icons::SETTINGS_TOOLBAR.icon());
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index 9d8ad02a78..6bd7f7aba8 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -123,9 +123,9 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
     setupFilterUi("CompileOutputPane.Filter");
     setFilteringEnabled(true);
 
-    connect(this, &IOutputPane::zoomIn, m_outputWindow, &Core::OutputWindow::zoomIn);
-    connect(this, &IOutputPane::zoomOut, m_outputWindow, &Core::OutputWindow::zoomOut);
-    connect(this, &IOutputPane::resetZoom, m_outputWindow, &Core::OutputWindow::resetZoom);
+    connect(this, &IOutputPane::zoomInRequested, m_outputWindow, &Core::OutputWindow::zoomIn);
+    connect(this, &IOutputPane::zoomOutRequested, m_outputWindow, &Core::OutputWindow::zoomOut);
+    connect(this, &IOutputPane::resetZoomRequested, m_outputWindow, &Core::OutputWindow::resetZoom);
     connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::fontSettingsChanged,
             this, updateFontSettings);
     connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::behaviorSettingsChanged,
diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h
index cd85129dde..d420d963d4 100644
--- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h
+++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h
@@ -49,9 +49,6 @@ public:
     void setCustomId(const QString &customId);
     QString customId() const;
 
-signals:
-    void accepted();
-
 private slots:
     void acceptedClicked();
     void tabChanged(int index);
diff --git a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h
index 43ec17136f..2858dbed6c 100644
--- a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h
+++ b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h
@@ -49,9 +49,6 @@ public:
     void setStatus(GlobalAnnotationStatus status);
     GlobalAnnotationStatus globalStatus() const;
 
-signals:
-    void accepted();
-
 private slots:
     void acceptedClicked();
     void tabChanged(int index);
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.h b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.h
index fc4da39f32..792264f8fe 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.h
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.h
@@ -98,7 +98,6 @@ public:
 
 signals:
     void statusBarMessageChanged(const QString &message);
-    void selectionChanged();
     void scroll(const TimelineUtils::Side &side);
 
 private:
diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.h b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.h
index d0ade7064c..5f442fc952 100644
--- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.h
+++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.h
@@ -56,12 +56,6 @@ class TransitionEditorPropertyItem;
 class TransitionEditorGraphicsScene : public AbstractScrollGraphicsScene
 {
     Q_OBJECT
-
-signals:
-    void selectionChanged();
-
-    void scroll(const TimelineUtils::Side &side);
-
 public:
     explicit TransitionEditorGraphicsScene(TransitionEditorWidget *parent);
 
@@ -119,9 +113,6 @@ public:
 
     void invalidateScrollbar() override;
 
-signals:
-    void statusBarMessageChanged(const QString &message);
-
 protected:
     bool event(QEvent *event) override;
     void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 52272c352d..c591ecfe2c 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -147,7 +147,7 @@ void QmlJSEditorWidget::finalizeInitialization()
     }
 
     connect(this->document(), &QTextDocument::modificationChanged,
-            this, &QmlJSEditorWidget::modificationChanged);
+            this, &QmlJSEditorWidget::updateModificationChange);
 
     connect(m_qmlJsEditorDocument, &QmlJSEditorDocument::updateCodeWarnings,
             this, &QmlJSEditorWidget::updateCodeWarnings);
@@ -257,7 +257,7 @@ void QmlJSEditorWidget::foldAuxiliaryData()
     }
 }
 
-void QmlJSEditorWidget::modificationChanged(bool changed)
+void QmlJSEditorWidget::updateModificationChange(bool changed)
 {
     if (!changed && m_modelManager)
         m_modelManager->fileChangedOnDisk(textDocument()->filePath().toString());
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 007c34abd1..bcb75a3223 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -80,7 +80,7 @@ signals:
     void selectedElementsChanged(QList<QmlJS::AST::UiObjectMember*> offsets,
                                  const QString &wordAtCursor);
 private:
-    void modificationChanged(bool);
+    void updateModificationChange(bool);
 
     void jumpToOutlineElement(int index);
     void updateContextPane();
diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index ab9617ebb7..dcc144f0fa 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -323,9 +323,9 @@ VcsOutputWindow::VcsOutputWindow()
     updateBehaviorSettings();
     setupContext(Internal::C_VCS_OUTPUT_PANE, &d->widget);
 
-    connect(this, &IOutputPane::zoomIn, &d->widget, &Core::OutputWindow::zoomIn);
-    connect(this, &IOutputPane::zoomOut, &d->widget, &Core::OutputWindow::zoomOut);
-    connect(this, &IOutputPane::resetZoom, &d->widget, &Core::OutputWindow::resetZoom);
+    connect(this, &IOutputPane::zoomInRequested, &d->widget, &Core::OutputWindow::zoomIn);
+    connect(this, &IOutputPane::zoomOutRequested, &d->widget, &Core::OutputWindow::zoomOut);
+    connect(this, &IOutputPane::resetZoomRequested, &d->widget, &Core::OutputWindow::resetZoom);
     connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::behaviorSettingsChanged,
             this, updateBehaviorSettings);
 }
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 562750f0cb..991c43b35e 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -99,7 +99,7 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
             this, &BookmarkDialog::selectBookmarkFolder);
 
     connect(ui.treeView, &TreeView::customContextMenuRequested,
-            this, &BookmarkDialog::customContextMenuRequested);
+            this, &BookmarkDialog::showContextMenu);
 
     connect(ui.treeView->selectionModel(), &QItemSelectionModel::currentChanged,
             this, &BookmarkDialog::currentChanged);
@@ -208,7 +208,7 @@ void BookmarkDialog::selectBookmarkFolder(int index)
     }
 }
 
-void BookmarkDialog::customContextMenuRequested(const QPoint &point)
+void BookmarkDialog::showContextMenu(const QPoint &point)
 {
     QModelIndex index = ui.treeView->indexAt(point);
     if (!index.isValid())
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index 885346df87..ad514fa24e 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -71,7 +71,7 @@ private:
     void itemChanged(QStandardItem *item);
     void textChanged(const QString& string);
     void selectBookmarkFolder(int index);
-    void customContextMenuRequested(const QPoint &point);
+    void showContextMenu(const QPoint &point);
     void currentChanged(const QModelIndex& current);
     bool eventFilter(QObject *object, QEvent *e);