From c2284cb48e5d8bfb0403938a630f8fe6e6e27ad6 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 11 Jul 2014 10:49:25 +0200 Subject: [PATCH] connect(QPoineter breaks on some gcc versions please, use connect(QPointer.data(), for time to come --- .../qml/plasmoid/containmentinterface.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index dc4836a6b..457f898e4 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -61,9 +61,9 @@ ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent, cons setAcceptedMouseButtons(Qt::AllButtons); - connect(m_containment, &Plasma::Containment::appletRemoved, + connect(m_containment.data(), &Plasma::Containment::appletRemoved, this, &ContainmentInterface::appletRemovedForward); - connect(m_containment, &Plasma::Containment::appletAdded, + connect(m_containment.data(), &Plasma::Containment::appletAdded, this, &ContainmentInterface::appletAddedForward); if (!m_appletInterfaces.isEmpty()) { @@ -75,7 +75,7 @@ ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent, cons if (!m_containment) { return; } - disconnect(m_containment, &Plasma::Containment::appletRemoved, + disconnect(m_containment.data(), &Plasma::Containment::appletRemoved, this, &ContainmentInterface::appletRemovedForward); }); } @@ -144,7 +144,7 @@ void ContainmentInterface::init() loadWallpaper(); } - connect(m_containment, &Plasma::Containment::activityChanged, + connect(m_containment.data(), &Plasma::Containment::activityChanged, this, &ContainmentInterface::activityChanged); connect(m_containment.data(), &Plasma::Containment::activityChanged, [ = ]() { @@ -154,9 +154,9 @@ void ContainmentInterface::init() this, &ContainmentInterface::activityNameChanged); emit activityNameChanged(); }); - connect(m_containment, &Plasma::Containment::wallpaperChanged, + connect(m_containment.data(), &Plasma::Containment::wallpaperChanged, this, &ContainmentInterface::loadWallpaper); - connect(m_containment, &Plasma::Containment::containmentTypeChanged, + connect(m_containment.data(), &Plasma::Containment::containmentTypeChanged, this, &ContainmentInterface::containmentTypeChanged); if (m_containment->corona()) {