alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

connect(QPoineter breaks on some gcc versions

Browse Source 
please, use connect(QPointer.data(), for time to come
This commit is contained in:
Marco Martin 2014-07-11 10:49:25 +02:00
parent d1e24d19fb
commit c2284cb48e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -61,9 +61,9 @@ ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent, cons
setAcceptedMouseButtons(Qt::AllButtons); setAcceptedMouseButtons(Qt::AllButtons);
connect(m_containment, &Plasma::Containment::appletRemoved, connect(m_containment.data(), &Plasma::Containment::appletRemoved,
this, &ContainmentInterface::appletRemovedForward); this, &ContainmentInterface::appletRemovedForward);
connect(m_containment, &Plasma::Containment::appletAdded, connect(m_containment.data(), &Plasma::Containment::appletAdded,
this, &ContainmentInterface::appletAddedForward); this, &ContainmentInterface::appletAddedForward);
if (!m_appletInterfaces.isEmpty()) { if (!m_appletInterfaces.isEmpty()) {
@ -75,7 +75,7 @@ ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent, cons
if (!m_containment) { if (!m_containment) {
return; return;
} }
disconnect(m_containment, &Plasma::Containment::appletRemoved, disconnect(m_containment.data(), &Plasma::Containment::appletRemoved,
this, &ContainmentInterface::appletRemovedForward); this, &ContainmentInterface::appletRemovedForward);
}); });
} }
@ -144,7 +144,7 @@ void ContainmentInterface::init()
loadWallpaper(); loadWallpaper();
} }
connect(m_containment, &Plasma::Containment::activityChanged, connect(m_containment.data(), &Plasma::Containment::activityChanged,
this, &ContainmentInterface::activityChanged); this, &ContainmentInterface::activityChanged);
connect(m_containment.data(), &Plasma::Containment::activityChanged, connect(m_containment.data(), &Plasma::Containment::activityChanged,
[ = ]() { [ = ]() {
@ -154,9 +154,9 @@ void ContainmentInterface::init()
this, &ContainmentInterface::activityNameChanged); this, &ContainmentInterface::activityNameChanged);
emit activityNameChanged(); emit activityNameChanged();
}); });
connect(m_containment, &Plasma::Containment::wallpaperChanged, connect(m_containment.data(), &Plasma::Containment::wallpaperChanged,
this, &ContainmentInterface::loadWallpaper); this, &ContainmentInterface::loadWallpaper);
connect(m_containment, &Plasma::Containment::containmentTypeChanged, connect(m_containment.data(), &Plasma::Containment::containmentTypeChanged,
this, &ContainmentInterface::containmentTypeChanged); this, &ContainmentInterface::containmentTypeChanged);
if (m_containment->corona()) { if (m_containment->corona()) {