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

get rid of position in addApplet()

Browse Source
This commit is contained in:
Marco Martin 2013-02-18 17:28:29 +01:00
parent 1303008ee6
commit 2d845a4c91
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plasma/containment.cpp
View File

@ -350,7 +350,7 @@ void Containment::restoreContents(KConfigGroup &group)
continue; continue;
} }
d->addApplet(plugin, QVariantList(), appletConfig.readEntry("geometry", QRectF()), appId); d->addApplet(plugin, QVariantList(), appId);
} }
} }
@ -484,13 +484,12 @@ void Containment::clearApplets()
d->applets.clear(); d->applets.clear();
} }
Applet *Containment::addApplet(const QString &name, const QVariantList &args, Applet *Containment::addApplet(const QString &name, const QVariantList &args)
const QRectF &appletGeometry)
{ {
return d->addApplet(name, args, appletGeometry); return d->addApplet(name, args);
} }
void Containment::addApplet(Applet *applet, const QPointF &pos) void Containment::addApplet(Applet *applet)
{ {
if (!isContainment() || immutability() != Mutable) { if (!isContainment() || immutability() != Mutable) {
return; return;
@ -557,7 +556,7 @@ void Containment::addApplet(Applet *applet, const QPointF &pos)
applet->updateConstraints(Plasma::AllConstraints); applet->updateConstraints(Plasma::AllConstraints);
applet->flushPendingConstraintsEvents(); applet->flushPendingConstraintsEvents();
emit appletAdded(applet, pos); emit appletAdded(applet);
if (!currentContainment) { if (!currentContainment) {
applet->updateConstraints(Plasma::StartupCompletedConstraint); applet->updateConstraints(Plasma::StartupCompletedConstraint);

7
src/plasma/containment.h
View File

@ -197,8 +197,7 @@ class PLASMA_EXPORT Containment : public Applet
* *
* @return a pointer to the applet on success, or 0 on failure * @return a pointer to the applet on success, or 0 on failure
*/ */
Applet *addApplet(const QString &name, const QVariantList &args = QVariantList(), Applet *addApplet(const QString &name, const QVariantList &args = QVariantList());
const QRectF &geometry = QRectF(-1, -1, -1, -1));
/** /**
* Add an existing applet to this Containment * Add an existing applet to this Containment
@ -206,7 +205,7 @@ class PLASMA_EXPORT Containment : public Applet
* @param applet the applet that should be added * @param applet the applet that should be added
* @param pos the containment-relative position * @param pos the containment-relative position
*/ */
void addApplet(Applet *applet, const QPointF &pos = QPointF(-1, -1)); void addApplet(Applet *applet);
/** /**
* @return the applets currently in this Containment * @return the applets currently in this Containment
@ -371,7 +370,7 @@ Q_SIGNALS:
/** /**
* This signal is emitted when a new applet is created by the containment * This signal is emitted when a new applet is created by the containment
*/ */
void appletAdded(Plasma::Applet *applet, const QPointF &pos); void appletAdded(Plasma::Applet *applet);
/** /**
* This signal is emitted when an applet is destroyed * This signal is emitted when an applet is destroyed

5
src/plasma/private/containment_p.cpp
View File

@ -364,8 +364,7 @@ void ContainmentPrivate::containmentConstraintsEvent(Plasma::Constraints constra
} }
} }
Applet *ContainmentPrivate::addApplet(const QString &name, const QVariantList &args, Applet *ContainmentPrivate::addApplet(const QString &name, const QVariantList &args, uint id)
const QRectF &appletGeometry, uint id)
{ {
if (!q->isContainment()) { if (!q->isContainment()) {
return 0; return 0;
@ -390,7 +389,7 @@ Applet *ContainmentPrivate::addApplet(const QString &name, const QVariantList &a
//kDebug() << applet->title() << "sizehint:" << applet->sizeHint() << "geometry:" << applet->geometry(); //kDebug() << applet->title() << "sizehint:" << applet->sizeHint() << "geometry:" << applet->geometry();
q->addApplet(applet, appletGeometry.topLeft()); q->addApplet(applet);
return applet; return applet;
} }

3
src/plasma/private/containment_p.h
View File

@ -92,8 +92,7 @@ public:
void checkRemoveAction(); void checkRemoveAction();
void configChanged(); void configChanged();
Applet *addApplet(const QString &name, const QVariantList &args = QVariantList(), Applet *addApplet(const QString &name, const QVariantList &args = QVariantList(), uint id = 0);
const QRectF &geometry = QRectF(-1, -1, -1, -1), uint id = 0);
KActionCollection *actions(); KActionCollection *actions();