1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Widgets: use pmf-style connect

Browse Source 
Use pmf-style connect for some easy-to-convert connections.

Change-Id: Id0a9d3465b2dfe5966374194a72980a67e978fe8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Christian Ehrlicher 2023-11-03 21:34:52 +01:00
parent 05d69ad42b
commit 6780195d4e
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qeffects.cpp
View File

@ -115,7 +115,7 @@ void QAlphaWidget::run(int time)
qApp->installEventFilter(this); qApp->installEventFilter(this);
widget->setWindowOpacity(0.0); widget->setWindowOpacity(0.0);
widget->show(); widget->show();
connect(&anim, SIGNAL(timeout()), this, SLOT(render())); connect(&anim, &QTimer::timeout, this, &QAlphaWidget::render);
anim.start(1); anim.start(1);
#else #else
//This is roughly equivalent to calling setVisible(true) without actually showing the widget //This is roughly equivalent to calling setVisible(true) without actually showing the widget
@ -138,7 +138,7 @@ void QAlphaWidget::run(int time)
show(); show();
setEnabled(false); setEnabled(false);
connect(&anim, SIGNAL(timeout()), this, SLOT(render())); connect(&anim, &QTimer::timeout, this, &QAlphaWidget::render);
anim.start(1); anim.start(1);
} else { } else {
duration = 0; duration = 0;
@ -428,7 +428,7 @@ void QRollEffect::run(int time)
duration = qMin(qMax(dist/3, 50), 120); duration = qMin(qMax(dist/3, 50), 120);
} }
connect(&anim, SIGNAL(timeout()), this, SLOT(scroll())); connect(&anim, &QTimer::timeout, this, &QRollEffect::scroll);
move(widget->geometry().x(),widget->geometry().y()); move(widget->geometry().x(),widget->geometry().y());
resize(qMin(currentWidth, totalWidth), qMin(currentHeight, totalHeight)); resize(qMin(currentWidth, totalWidth), qMin(currentHeight, totalHeight));

6
src/widgets/widgets/qstackedwidget.cpp
View File

@ -98,8 +98,10 @@ QStackedWidget::QStackedWidget(QWidget *parent)
{ {
Q_D(QStackedWidget); Q_D(QStackedWidget);
d->layout = new QStackedLayout(this); d->layout = new QStackedLayout(this);
connect(d->layout, SIGNAL(widgetRemoved(int)), this, SIGNAL(widgetRemoved(int))); connect(d->layout, &QStackedLayout::widgetRemoved,
connect(d->layout, SIGNAL(currentChanged(int)), this, SIGNAL(currentChanged(int))); this, &QStackedWidget::widgetRemoved);
connect(d->layout, &QStackedLayout::currentChanged,
this, &QStackedWidget::currentChanged);
} }
/*! /*!

2
src/widgets/widgets/qstatusbar.cpp
View File

@ -494,7 +494,7 @@ void QStatusBar::showMessage(const QString &message, int timeout)
if (timeout > 0) { if (timeout > 0) {
if (!d->timer) { if (!d->timer) {
d->timer = new QTimer(this); d->timer = new QTimer(this);
connect(d->timer, SIGNAL(timeout()), this, SLOT(clearMessage())); connect(d->timer, &QTimer::timeout, this, &QStatusBar::clearMessage);
} }
d->timer->start(timeout); d->timer->start(timeout);
} else if (d->timer) { } else if (d->timer) {

3
src/widgets/widgets/qwidgetanimator.cpp
View File

@ -73,7 +73,8 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo
anim->setEasingCurve(QEasingCurve::InOutQuad); anim->setEasingCurve(QEasingCurve::InOutQuad);
anim->setEndValue(final_geometry); anim->setEndValue(final_geometry);
m_animation_map[widget] = anim; m_animation_map[widget] = anim;
connect(anim, SIGNAL(finished()), SLOT(animationFinished())); connect(anim, &QPropertyAnimation::finished,
this, &QWidgetAnimator::animationFinished);
anim->start(QPropertyAnimation::DeleteWhenStopped); anim->start(QPropertyAnimation::DeleteWhenStopped);
} else } else
#endif // animation #endif // animation