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

tore containment loading

Browse Source 
use new connect syntax to catch signature mismatch of appletAdded
This commit is contained in:
Marco Martin 2013-02-18 18:46:29 +01:00
parent bb005f1cc5
commit 57add3903f
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,11 +43,16 @@ ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent)
qmlRegisterType<ContainmentInterface>(); qmlRegisterType<ContainmentInterface>();
connect(containment(), SIGNAL(appletRemoved(Plasma::Applet *)), this, SLOT(appletRemovedForward(Plasma::Applet *))); connect(containment(), &Plasma::Containment::appletRemoved,
connect(containment(), SIGNAL(appletAdded(Plasma::Applet *, const QPointF &)), this, SLOT(appletAddedForward(Plasma::Applet *, const QPointF &))); this, &ContainmentInterface::appletRemovedForward);
connect(containment(), SIGNAL(screenChanged(int, int, Plasma::Containment*)), this, SIGNAL(screenChanged())); connect(containment(), &Plasma::Containment::appletAdded,
connect(containment(), SIGNAL(activityChanged()), this, SIGNAL(activityChanged())); this, &ContainmentInterface::appletAddedForward);
connect(containment(), SIGNAL(wallpaperChanged()), this, SLOT(loadWallpaper())); connect(containment(), SIGNAL(screenChanged(int, int, Plasma::Containment*)),
this, SIGNAL(screenChanged()));
connect(containment(), SIGNAL(activityChanged()),
this, SIGNAL(activityChanged()));
connect(containment(), SIGNAL(wallpaperChanged()),
this, SLOT(loadWallpaper()));
if (containment()->corona()) { if (containment()->corona()) {
connect(containment()->corona(), SIGNAL(availableScreenRegionChanged()), connect(containment()->corona(), SIGNAL(availableScreenRegionChanged()),
@ -116,7 +121,7 @@ QVariantList ContainmentInterface::availableScreenRegion(int id) const
return regVal; return regVal;
} }
void ContainmentInterface::appletAddedForward(Plasma::Applet *applet, const QPointF &pos) void ContainmentInterface::appletAddedForward(Plasma::Applet *applet)
{ {
QObject *appletGraphicObject = applet->property("graphicObject").value<QObject *>(); QObject *appletGraphicObject = applet->property("graphicObject").value<QObject *>();
QObject *contGraphicObject = containment()->property("graphicObject").value<QObject *>(); QObject *contGraphicObject = containment()->property("graphicObject").value<QObject *>();
@ -142,7 +147,7 @@ void ContainmentInterface::appletAddedForward(Plasma::Applet *applet, const QPoi
} }
m_appletInterfaces << appletGraphicObject; m_appletInterfaces << appletGraphicObject;
emit appletAdded(appletGraphicObject, pos); emit appletAdded(appletGraphicObject);
emit appletsChanged(); emit appletsChanged();
} }

4
src/scriptengines/qml/plasmoid/containmentinterface.h
View File

@ -73,7 +73,7 @@ protected:
void addContainmentActions(KMenu &desktopMenu, QEvent *event); void addContainmentActions(KMenu &desktopMenu, QEvent *event);
Q_SIGNALS: Q_SIGNALS:
void appletAdded(QObject *applet, const QPointF &pos); void appletAdded(QObject *applet);
void appletRemoved(QObject *applet); void appletRemoved(QObject *applet);
void screenChanged(); void screenChanged();
void activityIdChanged(); void activityIdChanged();
@ -81,7 +81,7 @@ Q_SIGNALS:
void appletsChanged(); void appletsChanged();
protected Q_SLOTS: protected Q_SLOTS:
void appletAddedForward(Plasma::Applet *applet, const QPointF &pos); void appletAddedForward(Plasma::Applet *applet);
void appletRemovedForward(Plasma::Applet *applet); void appletRemovedForward(Plasma::Applet *applet);
void loadWallpaper(); void loadWallpaper();