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

Don't clash signal names with other methods

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2020-11-17 15:50:11 +01:00
parent c3a8429dc8
commit d2e1feceac
15 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidrunconfiguration.h
View File

@@ -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;

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

@@ -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);

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

@@ -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);

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

@@ -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)

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

@@ -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());

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

@@ -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,

3
src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h
View File

@@ -49,9 +49,6 @@ public:
void setCustomId(const QString &customId);
QString customId() const;
signals:
void accepted();
private slots:
void acceptedClicked();
void tabChanged(int index);

3
src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h
View File

@@ -49,9 +49,6 @@ public:
void setStatus(GlobalAnnotationStatus status);
GlobalAnnotationStatus globalStatus() const;
signals:
void accepted();
private slots:
void acceptedClicked();
void tabChanged(int index);

1
src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.h
View File

@@ -98,7 +98,6 @@ public:
signals:
void statusBarMessageChanged(const QString &message);
void selectionChanged();
void scroll(const TimelineUtils::Side &side);
private:

9
src/plugins/qmldesigner/components/transitioneditor/transitioneditorgraphicsscene.h
View File

@@ -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;

4
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -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());

2
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -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();

6
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -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);
}

4
src/shared/help/bookmarkmanager.cpp
View File

@@ -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())

2
src/shared/help/bookmarkmanager.h
View File

@@ -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);