diff --git a/src/plasma/tests/testcontainmentactionsplugin/test.cpp b/src/plasma/tests/testcontainmentactionsplugin/test.cpp index 8a09ff3cb..d7e6499ff 100644 --- a/src/plasma/tests/testcontainmentactionsplugin/test.cpp +++ b/src/plasma/tests/testcontainmentactionsplugin/test.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -60,7 +60,7 @@ void ContextTest::contextEvent(QGraphicsSceneMouseEvent *event) return; } - KMenu desktopMenu; + QMenu desktopMenu; desktopMenu.addTitle(m_text); desktopMenu.addAction(c->action("configure")); desktopMenu.exec(event->screenPos()); diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp index d1f1644fb..bc3e3c202 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -207,7 +207,7 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event) void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event) { - KMenu desktopMenu; + QMenu desktopMenu; //FIXME: very inefficient appletAt() implementation Plasma::Applet *applet = 0; @@ -234,7 +234,7 @@ void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event) -void ContainmentInterface::addAppletActions(KMenu &desktopMenu, Plasma::Applet *applet, QEvent *event) +void ContainmentInterface::addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event) { foreach (QAction *action, applet->contextualActions()) { if (action) { @@ -254,7 +254,7 @@ void ContainmentInterface::addAppletActions(KMenu &desktopMenu, Plasma::Applet * } } - KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", containment()->title()), &desktopMenu); + QMenu *containmentMenu = new QMenu(i18nc("%1 is the name of the containment", "%1 Options", containment()->title()), &desktopMenu); addContainmentActions(*containmentMenu, event); if (!containmentMenu->isEmpty()) { @@ -296,7 +296,7 @@ void ContainmentInterface::addAppletActions(KMenu &desktopMenu, Plasma::Applet * } } -void ContainmentInterface::addContainmentActions(KMenu &desktopMenu, QEvent *event) +void ContainmentInterface::addContainmentActions(QMenu &desktopMenu, QEvent *event) { if (containment()->corona()->immutability() != Plasma::Types::Mutable && !KAuthorized::authorizeKAction("plasma/containment_actions")) { diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h index 39bd94bb8..660c0e005 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.h +++ b/src/scriptengines/qml/plasmoid/containmentinterface.h @@ -21,7 +21,7 @@ #ifndef CONTAINMENTINTERFACE_H #define CONTAINMENTINTERFACE_H -#include +#include #include @@ -74,8 +74,8 @@ protected: void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); - void addAppletActions(KMenu &desktopMenu, Plasma::Applet *applet, QEvent *event); - void addContainmentActions(KMenu &desktopMenu, QEvent *event); + void addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event); + void addContainmentActions(QMenu &desktopMenu, QEvent *event); Q_SIGNALS: void appletAdded(QObject *applet);