diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp --- a/src/declarativeimports/core/framesvgitem.cpp +++ b/src/declarativeimports/core/framesvgitem.cpp @@ -263,7 +263,7 @@ m_fixedMargins = new FrameSvgItemMargins(m_frameSvg, this); m_fixedMargins->setFixed(true); setFlag(ItemHasContents, true); - connect(m_frameSvg, SIGNAL(repaintNeeded()), this, SLOT(doUpdate())); + connect(m_frameSvg, &FrameSvg::repaintNeeded, this, &FrameSvgItem::doUpdate); connect(&Units::instance(), &Units::devicePixelRatioChanged, this, &FrameSvgItem::updateDevicePixelRatio); connect(m_frameSvg, &Svg::fromCurrentThemeChanged, this, &FrameSvgItem::fromCurrentThemeChanged); connect(m_frameSvg, &Svg::statusChanged, this, &FrameSvgItem::statusChanged); diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp --- a/src/declarativeimports/core/iconitem.cpp +++ b/src/declarativeimports/core/iconitem.cpp @@ -54,10 +54,10 @@ m_animValue(0) { m_animation = new QPropertyAnimation(this); - connect(m_animation, SIGNAL(valueChanged(QVariant)), - this, SLOT(valueChanged(QVariant))); - connect(m_animation, SIGNAL(finished()), - this, SLOT(animationFinished())); + connect(m_animation, &QPropertyAnimation::valueChanged, + this, &IconItem::valueChanged); + connect(m_animation, &QPropertyAnimation::finished, + this, &IconItem::animationFinished); m_animation->setTargetObject(this); m_animation->setEasingCurve(QEasingCurve::InOutQuad); m_animation->setDuration(250); //FIXME from theme @@ -73,8 +73,8 @@ connect(this, &QQuickItem::windowChanged, this, &IconItem::schedulePixmapUpdate); - connect(this, SIGNAL(overlaysChanged()), - this, SLOT(schedulePixmapUpdate())); + connect(this, &IconItem::overlaysChanged, + this, &IconItem::schedulePixmapUpdate); connect(this, &IconItem::implicitWidthChanged, this, &IconItem::implicitWidthChanged2); connect(this, &IconItem::implicitHeightChanged, this, &IconItem::implicitHeightChanged2); diff --git a/src/declarativeimports/core/svgitem.cpp b/src/declarativeimports/core/svgitem.cpp --- a/src/declarativeimports/core/svgitem.cpp +++ b/src/declarativeimports/core/svgitem.cpp @@ -92,9 +92,9 @@ updateDevicePixelRatio(); if (svg) { - connect(svg, SIGNAL(repaintNeeded()), this, SLOT(updateNeeded())); - connect(svg, SIGNAL(repaintNeeded()), this, SIGNAL(naturalSizeChanged())); - connect(svg, SIGNAL(sizeChanged()), this, SIGNAL(naturalSizeChanged())); + connect(svg, &Svg::repaintNeeded, this, &SvgItem::updateNeeded); + connect(svg, &Svg::repaintNeeded, this, &SvgItem::naturalSizeChanged); + connect(svg, &Svg::sizeChanged, this, &SvgItem::naturalSizeChanged); } if (implicitWidth() <= 0) { diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp --- a/src/scriptengines/qml/plasmoid/appletinterface.cpp +++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp @@ -452,11 +452,11 @@ if (!m_actionSignals) { m_actionSignals = new QSignalMapper(this); - connect(m_actionSignals, SIGNAL(mapped(QString)), - appletScript(), SLOT(executeAction(QString))); + connect(m_actionSignals, static_cast(&QSignalMapper::mapped), + appletScript(), &DeclarativeAppletScript::executeAction); } - connect(action, SIGNAL(triggered()), m_actionSignals, SLOT(map())); + connect(action, &QAction::triggered, m_actionSignals, static_cast(&QSignalMapper::map)); m_actionSignals->setMapping(action, name); } diff --git a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp --- a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp +++ b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp @@ -222,11 +222,10 @@ if (!m_actionSignals) { m_actionSignals = new QSignalMapper(this); - connect(m_actionSignals, SIGNAL(mapped(QString)), - this, SLOT(executeAction(QString))); + connect(m_actionSignals, static_cast(&QSignalMapper::mapped), + this, &WallpaperInterface::executeAction); } - - connect(action, SIGNAL(triggered()), m_actionSignals, SLOT(map())); + connect(action, &QAction::triggered, m_actionSignals, static_cast(&QSignalMapper::map)); m_actionSignals->setMapping(action, name); }