QmlEditorWidgets: Use Qt5-style connects

The heavy lifting was done by clazy.

Change-Id: Ie56520a6b0676f986c04a1940ff9afef84d7092f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-06-04 22:58:20 +03:00
committed by Orgad Shaneh
parent 38a13f09c2
commit d058ca6db9
9 changed files with 9 additions and 16 deletions

View File

@@ -50,7 +50,6 @@ public:
void setVerticalAlignmentVisible(bool); void setVerticalAlignmentVisible(bool);
void setStyleVisible(bool); void setStyleVisible(bool);
public slots:
void onTextColorButtonToggled(bool); void onTextColorButtonToggled(bool);
void onColorButtonToggled(bool); void onColorButtonToggled(bool);
void onColorDialogApplied(const QColor &color); void onColorDialogApplied(const QColor &color);

View File

@@ -191,12 +191,12 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
m_resetAction = new QAction(tr("Pin Toolbar"), this); m_resetAction = new QAction(tr("Pin Toolbar"), this);
m_resetAction->setCheckable(true); m_resetAction->setCheckable(true);
addAction(m_resetAction.data()); 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); m_disableAction = new QAction(tr("Show Always"), this);
addAction(m_disableAction.data()); addAction(m_disableAction.data());
m_disableAction->setCheckable(true); 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; m_pinned = false;
if (HostOsInfo::isMacHost()) if (HostOsInfo::isMacHost())
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);

View File

@@ -93,7 +93,6 @@ public:
bool isPropertyChanges() const bool isPropertyChanges() const
{ return m_isPropertyChanges; } { return m_isPropertyChanges; }
public slots:
void onTogglePane(); void onTogglePane();
void onShowColorDialog(bool, const QPoint &); void onShowColorDialog(bool, const QPoint &);
@@ -105,12 +104,11 @@ signals:
void enabledChanged(bool); void enabledChanged(bool);
void closed(); void closed();
private slots: private:
void onDisable(bool); void onDisable(bool);
void onResetPosition(bool toggle); void onResetPosition(bool toggle);
protected: protected:
void protectedMoved(); void protectedMoved();
QToolButton *m_toolButton; QToolButton *m_toolButton;

View File

@@ -98,7 +98,6 @@ public:
PreviewLabel *previewLabel() const; PreviewLabel *previewLabel() const;
int zoom() { return m_zoom; } int zoom() { return m_zoom; }
public slots:
void onTogglePane(); void onTogglePane();
void onSliderMoved(int value); void onSliderMoved(int value);
@@ -130,7 +129,7 @@ signals:
void removeProperty(const QString &); void removeProperty(const QString &);
void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst); void removeAndChangeProperty(const QString &, const QString &, const QVariant &, bool removeFirst);
public slots: public:
void onStretchChanged(); void onStretchChanged();
void onVerticalStretchChanged(); void onVerticalStretchChanged();
void onHorizontalStretchChanged(); void onHorizontalStretchChanged();

View File

@@ -46,7 +46,6 @@ public:
void setProperties(QmlJS::PropertyReader *propertyReader); void setProperties(QmlJS::PropertyReader *propertyReader);
void enabableGradientEditing(bool); void enabableGradientEditing(bool);
public slots:
void onBorderColorButtonToggled(bool); void onBorderColorButtonToggled(bool);
void onColorButtonToggled(bool); void onColorButtonToggled(bool);
void onColorDialogApplied(const QColor &color); void onColorDialogApplied(const QColor &color);

View File

@@ -56,7 +56,6 @@ public:
emit colorChanged(); emit colorChanged();
} }
public slots:
void changeColor(const QColor &color) { setColor(color); } void changeColor(const QColor &color) { setColor(color); }
void spinBoxChanged(); void spinBoxChanged();
void onColorBoxChanged(); void onColorBoxChanged();

View File

@@ -90,7 +90,7 @@ public:
void animate(int duration, QEasingCurve curve) { void animate(int duration, QEasingCurve curve) {
reset(); reset();
m_sequential = new QSequentialAnimationGroup; m_sequential = new QSequentialAnimationGroup;
connect(m_sequential,SIGNAL(finished()),this,SIGNAL(finished())); connect(m_sequential,&QAbstractAnimation::finished,this,&EasingSimulation::finished);
m_sequential->addPause(150); m_sequential->addPause(150);
QPropertyAnimation *m_anim = new QPropertyAnimation (m_qtLogo, "pos"); QPropertyAnimation *m_anim = new QPropertyAnimation (m_qtLogo, "pos");
m_anim->setStartValue(QPointF(0, 0)); m_anim->setStartValue(QPointF(0, 0));
@@ -130,7 +130,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) :
setGraphDisplayMode(GraphMode); setGraphDisplayMode(GraphMode);
connect(m_simulation,SIGNAL(finished()),this,SLOT(switchToGraph())); connect(m_simulation,&EasingSimulation::finished,this,&EasingContextPane::switchToGraph);
} }
EasingContextPane::~EasingContextPane() EasingContextPane::~EasingContextPane()

View File

@@ -87,7 +87,6 @@ public:
bool showComboBox() const bool showComboBox() const
{ return m_showComboBox; } { return m_showComboBox; }
public slots:
void setFileName(const QUrl &fileName); void setFileName(const QUrl &fileName);
void setFileNameStr(const QString &fileName); void setFileNameStr(const QString &fileName);
void onButtonReleased(); void onButtonReleased();

View File

@@ -53,7 +53,7 @@ signals:
void formatChanged(); void formatChanged();
void valueChanged(int); void valueChanged(int);
public slots: public:
void setIsPointSize(bool b) void setIsPointSize(bool b)
{ {
if (isPointSize() == b) if (isPointSize() == b)
@@ -80,11 +80,11 @@ public slots:
protected: protected:
StepEnabled stepEnabled() const; StepEnabled stepEnabled() const;
private slots:
private:
void onEditingFinished(); void onEditingFinished();
void setText(); void setText();
private:
bool m_isPointSize; bool m_isPointSize;
int m_value; int m_value;