diff --git a/plasma/applet.h b/plasma/applet.h index a392016e7..45b4fde10 100644 --- a/plasma/applet.h +++ b/plasma/applet.h @@ -72,9 +72,6 @@ class PLASMA_EXPORT Applet : public QObject Q_OBJECT public: - typedef QList List; - typedef QHash Dict; - //CONSTRUCTORS /** * @param parent the QObject this applet is parented to diff --git a/plasma/containment.cpp b/plasma/containment.cpp index 402844e1d..002037abb 100644 --- a/plasma/containment.cpp +++ b/plasma/containment.cpp @@ -566,7 +566,7 @@ void Containment::addApplet(Applet *applet, const QPointF &pos) applet->d->scheduleModificationNotification(); } -Applet::List Containment::applets() const +QList Containment::applets() const { return d->applets; } diff --git a/plasma/containment.h b/plasma/containment.h index 6394aefd2..995a27ae3 100644 --- a/plasma/containment.h +++ b/plasma/containment.h @@ -211,7 +211,7 @@ class PLASMA_EXPORT Containment : public Applet /** * @return the applets currently in this Containment */ - Applet::List applets() const; + QList applets() const; /** * Removes all applets from this Containment diff --git a/plasma/private/containment_p.h b/plasma/private/containment_p.h index aec8aa5f2..435a885ae 100644 --- a/plasma/private/containment_p.h +++ b/plasma/private/containment_p.h @@ -125,7 +125,7 @@ public: Containment *q; FormFactor formFactor; Location location; - Applet::List applets; + QList applets; QString wallpaper; QHash localActionPlugins; int screen;