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

KMenu becomes QMenu throughout

Browse Source
This commit is contained in:
Sebastian Kügler 2013-07-09 00:55:03 +02:00
parent 4fffde0547
commit ca5c059ecf
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasma/tests/testcontainmentactionsplugin/test.cpp
View File

@ -23,7 +23,7 @@
#include <QGraphicsSceneWheelEvent> #include <QGraphicsSceneWheelEvent>
#include <KDebug> #include <KDebug>
#include <KMenu> #include <QMenu>
#include <Plasma/Containment> #include <Plasma/Containment>
@ -60,7 +60,7 @@ void ContextTest::contextEvent(QGraphicsSceneMouseEvent *event)
return; return;
} }
KMenu desktopMenu; QMenu desktopMenu;
desktopMenu.addTitle(m_text); desktopMenu.addTitle(m_text);
desktopMenu.addAction(c->action("configure")); desktopMenu.addAction(c->action("configure"));
desktopMenu.exec(event->screenPos()); desktopMenu.exec(event->screenPos());

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

@ -207,7 +207,7 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event) void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event)
{ {
KMenu desktopMenu; QMenu desktopMenu;
//FIXME: very inefficient appletAt() implementation //FIXME: very inefficient appletAt() implementation
Plasma::Applet *applet = 0; 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()) { foreach (QAction *action, applet->contextualActions()) {
if (action) { 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); addContainmentActions(*containmentMenu, event);
if (!containmentMenu->isEmpty()) { 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 && if (containment()->corona()->immutability() != Plasma::Types::Mutable &&
!KAuthorized::authorizeKAction("plasma/containment_actions")) { !KAuthorized::authorizeKAction("plasma/containment_actions")) {

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

@ -21,7 +21,7 @@
#ifndef CONTAINMENTINTERFACE_H #ifndef CONTAINMENTINTERFACE_H
#define CONTAINMENTINTERFACE_H #define CONTAINMENTINTERFACE_H
#include <KMenu> #include <QMenu>
#include <Plasma/Containment> #include <Plasma/Containment>
@ -74,8 +74,8 @@ protected:
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event);
void addAppletActions(KMenu &desktopMenu, Plasma::Applet *applet, QEvent *event); void addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event);
void addContainmentActions(KMenu &desktopMenu, QEvent *event); void addContainmentActions(QMenu &desktopMenu, QEvent *event);
Q_SIGNALS: Q_SIGNALS:
void appletAdded(QObject *applet); void appletAdded(QObject *applet);