get rid of position in addApplet()
This commit is contained in:
parent
1303008ee6
commit
2d845a4c91
@ -350,7 +350,7 @@ void Containment::restoreContents(KConfigGroup &group)
|
||||
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();
|
||||
}
|
||||
|
||||
Applet *Containment::addApplet(const QString &name, const QVariantList &args,
|
||||
const QRectF &appletGeometry)
|
||||
Applet *Containment::addApplet(const QString &name, const QVariantList &args)
|
||||
{
|
||||
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) {
|
||||
return;
|
||||
@ -557,7 +556,7 @@ void Containment::addApplet(Applet *applet, const QPointF &pos)
|
||||
applet->updateConstraints(Plasma::AllConstraints);
|
||||
applet->flushPendingConstraintsEvents();
|
||||
|
||||
emit appletAdded(applet, pos);
|
||||
emit appletAdded(applet);
|
||||
|
||||
if (!currentContainment) {
|
||||
applet->updateConstraints(Plasma::StartupCompletedConstraint);
|
||||
|
@ -197,8 +197,7 @@ class PLASMA_EXPORT Containment : public Applet
|
||||
*
|
||||
* @return a pointer to the applet on success, or 0 on failure
|
||||
*/
|
||||
Applet *addApplet(const QString &name, const QVariantList &args = QVariantList(),
|
||||
const QRectF &geometry = QRectF(-1, -1, -1, -1));
|
||||
Applet *addApplet(const QString &name, const QVariantList &args = QVariantList());
|
||||
|
||||
/**
|
||||
* 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 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
|
||||
@ -371,7 +370,7 @@ Q_SIGNALS:
|
||||
/**
|
||||
* 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
|
||||
|
@ -364,8 +364,7 @@ void ContainmentPrivate::containmentConstraintsEvent(Plasma::Constraints constra
|
||||
}
|
||||
}
|
||||
|
||||
Applet *ContainmentPrivate::addApplet(const QString &name, const QVariantList &args,
|
||||
const QRectF &appletGeometry, uint id)
|
||||
Applet *ContainmentPrivate::addApplet(const QString &name, const QVariantList &args, uint id)
|
||||
{
|
||||
if (!q->isContainment()) {
|
||||
return 0;
|
||||
@ -390,7 +389,7 @@ Applet *ContainmentPrivate::addApplet(const QString &name, const QVariantList &a
|
||||
|
||||
//kDebug() << applet->title() << "sizehint:" << applet->sizeHint() << "geometry:" << applet->geometry();
|
||||
|
||||
q->addApplet(applet, appletGeometry.topLeft());
|
||||
q->addApplet(applet);
|
||||
return applet;
|
||||
}
|
||||
|
||||
|
@ -92,8 +92,7 @@ public:
|
||||
void checkRemoveAction();
|
||||
void configChanged();
|
||||
|
||||
Applet *addApplet(const QString &name, const QVariantList &args = QVariantList(),
|
||||
const QRectF &geometry = QRectF(-1, -1, -1, -1), uint id = 0);
|
||||
Applet *addApplet(const QString &name, const QVariantList &args = QVariantList(), uint id = 0);
|
||||
|
||||
KActionCollection *actions();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user