From d058ca6db9ab3ba25c8d2fc9cb9f333d9c66b8a8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 4 Jun 2016 22:58:20 +0300 Subject: [PATCH] QmlEditorWidgets: Use Qt5-style connects The heavy lifting was done by clazy. Change-Id: Ie56520a6b0676f986c04a1940ff9afef84d7092f Reviewed-by: Thomas Hartmann --- src/libs/qmleditorwidgets/contextpanetextwidget.h | 1 - src/libs/qmleditorwidgets/contextpanewidget.cpp | 4 ++-- src/libs/qmleditorwidgets/contextpanewidget.h | 4 +--- src/libs/qmleditorwidgets/contextpanewidgetimage.h | 3 +-- src/libs/qmleditorwidgets/contextpanewidgetrectangle.h | 1 - src/libs/qmleditorwidgets/customcolordialog.h | 1 - src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp | 4 ++-- src/libs/qmleditorwidgets/filewidget.h | 1 - src/libs/qmleditorwidgets/fontsizespinbox.h | 6 +++--- 9 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h index 4a15d85838b..6249fe4e854 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.h +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h @@ -50,7 +50,6 @@ public: void setVerticalAlignmentVisible(bool); void setStyleVisible(bool); -public slots: void onTextColorButtonToggled(bool); void onColorButtonToggled(bool); void onColorDialogApplied(const QColor &color); diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index 79d4c2221e1..23beaf61abb 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -191,12 +191,12 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu m_resetAction = new QAction(tr("Pin Toolbar"), this); m_resetAction->setCheckable(true); addAction(m_resetAction.data()); - connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(onResetPosition(bool))); + connect(m_resetAction.data(), &QAction::triggered, this, &ContextPaneWidget::onResetPosition); m_disableAction = new QAction(tr("Show Always"), this); addAction(m_disableAction.data()); m_disableAction->setCheckable(true); - connect(m_disableAction.data(), SIGNAL(toggled(bool)), this, SLOT(onDisable(bool))); + connect(m_disableAction.data(), &QAction::toggled, this, &ContextPaneWidget::onDisable); m_pinned = false; if (HostOsInfo::isMacHost()) setCursor(Qt::ArrowCursor); diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index f7cd9684ad2..f1aea114f55 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -93,7 +93,6 @@ public: bool isPropertyChanges() const { return m_isPropertyChanges; } -public slots: void onTogglePane(); void onShowColorDialog(bool, const QPoint &); @@ -105,12 +104,11 @@ signals: void enabledChanged(bool); void closed(); -private slots: +private: void onDisable(bool); void onResetPosition(bool toggle); protected: - void protectedMoved(); QToolButton *m_toolButton; diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h index 50788b8562c..a031447eec4 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h @@ -98,7 +98,6 @@ public: PreviewLabel *previewLabel() const; int zoom() { return m_zoom; } -public slots: void onTogglePane(); void onSliderMoved(int value); @@ -130,7 +129,7 @@ signals: void removeProperty(const QString &); void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst); -public slots: +public: void onStretchChanged(); void onVerticalStretchChanged(); void onHorizontalStretchChanged(); diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h index 95221276d94..24298b4740a 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h @@ -46,7 +46,6 @@ public: void setProperties(QmlJS::PropertyReader *propertyReader); void enabableGradientEditing(bool); -public slots: void onBorderColorButtonToggled(bool); void onColorButtonToggled(bool); void onColorDialogApplied(const QColor &color); diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index a3753edc316..3b76dc96120 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -56,7 +56,6 @@ public: emit colorChanged(); } -public slots: void changeColor(const QColor &color) { setColor(color); } void spinBoxChanged(); void onColorBoxChanged(); diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp index 78432871ae0..4d44d171383 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp @@ -90,7 +90,7 @@ public: void animate(int duration, QEasingCurve curve) { reset(); m_sequential = new QSequentialAnimationGroup; - connect(m_sequential,SIGNAL(finished()),this,SIGNAL(finished())); + connect(m_sequential,&QAbstractAnimation::finished,this,&EasingSimulation::finished); m_sequential->addPause(150); QPropertyAnimation *m_anim = new QPropertyAnimation (m_qtLogo, "pos"); m_anim->setStartValue(QPointF(0, 0)); @@ -130,7 +130,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) : setGraphDisplayMode(GraphMode); - connect(m_simulation,SIGNAL(finished()),this,SLOT(switchToGraph())); + connect(m_simulation,&EasingSimulation::finished,this,&EasingContextPane::switchToGraph); } EasingContextPane::~EasingContextPane() diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h index ef445b0668e..c8592f9a8e6 100644 --- a/src/libs/qmleditorwidgets/filewidget.h +++ b/src/libs/qmleditorwidgets/filewidget.h @@ -87,7 +87,6 @@ public: bool showComboBox() const { return m_showComboBox; } -public slots: void setFileName(const QUrl &fileName); void setFileNameStr(const QString &fileName); void onButtonReleased(); diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h index 2f86000feff..f3063d03b25 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.h +++ b/src/libs/qmleditorwidgets/fontsizespinbox.h @@ -53,7 +53,7 @@ signals: void formatChanged(); void valueChanged(int); -public slots: +public: void setIsPointSize(bool b) { if (isPointSize() == b) @@ -80,11 +80,11 @@ public slots: protected: StepEnabled stepEnabled() const; -private slots: + +private: void onEditingFinished(); void setText(); -private: bool m_isPointSize; int m_value;