ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 128
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: plasma-widget-message-indicator
timestamp: Mon 2010-03-08 15:09:51 +0100
message:
  Implement DBusMenuImporter::iconForName
modified:
  src/listenermodel.cpp


--
lp:plasma-widget-message-indicator
https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk

Your team ayatana-commits is subscribed to branch lp:plasma-widget-message-indicator.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk/+edit-subscription.

=== modified file 'src/listenermodel.cpp'
--- src/listenermodel.cpp	2010-03-08 14:01:11 +0000
+++ src/listenermodel.cpp	2010-03-08 14:09:51 +0000
@@ -46,6 +46,29 @@
 };
 
 /**
+ * Our DBusMenuImporter implementation
+ */
+class MyDBusMenuImporter : public DBusMenuImporter
+{
+public:
+    MyDBusMenuImporter(QDBusAbstractInterface* iface, QObject* parent = 0)
+    : DBusMenuImporter(iface, parent)
+    {}
+
+protected:
+    virtual QMenu* createMenu(QWidget* parent)
+    {
+        return new QMenu(parent);
+    }
+
+    virtual QIcon iconForName(const QString& name)
+    {
+        return KIcon(name);
+    }
+};
+
+
+/**
  * An item representing an action from a DBusMenu, for indicate servers which
  * provide a "menu".
  */
@@ -384,25 +407,6 @@
                                           );
 }
 
-class MyDBusMenuImporter : public DBusMenuImporter
-{
-public:
-    MyDBusMenuImporter(QDBusAbstractInterface* iface, QObject* parent = 0)
-    : DBusMenuImporter(iface, parent)
-    {}
-
-protected:
-    virtual QMenu* createMenu(QWidget* parent)
-    {
-        return new QMenu(parent);
-    }
-
-    virtual QIcon iconForName(const QString&)
-    {
-        return QIcon();
-    }
-};
-
 void ListenerModel::slotMenuObjectPathReceived(QIndicate::Listener::Server* server, const QString& objectPath)
 {
     if (objectPath.isEmpty()) {