Move unityqmlmenumodel's properties to unitymenumodel

This gets rid of the ad-hoc construct-only properties and ::init() vfunc. Names
and paths can now be changed after creating the menu model. This will probably
be used seldom in practice, but it makes the code a bit cleaner.

Unityqmlmenumodel doesn't do anything interesting right now.

1 files changed, 18 insertions, 6 deletions

diff --git a/libqmenumodel/src/unitymenumodel.h b/libqmenumodel/src/unitymenumodel.h
index 6e735a4..cdfceac 100644
--- a/libqmenumodel/src/unitymenumodel.h
+++ b/libqmenumodel/src/unitymenumodel.h
@@ -24,6 +24,9 @@
 class UnityMenuModel: public QAbstractListModel
 {
     Q_OBJECT
+    Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
+    Q_PROPERTY(QByteArray actionObjectPath READ actionObjectPath WRITE setActionObjectPath NOTIFY actionObjectPathChanged)
+    Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
 
 public:
     enum MenuRoles {
@@ -34,10 +37,18 @@ public:
     };
 
 public:
-    UnityMenuModel(const QByteArray &busName, const QByteArray &actionGroupObjectPath,
-                   const QByteArray &menuObjectPath, QObject *parent = NULL);
+    UnityMenuModel(QObject *parent = NULL);
     virtual ~UnityMenuModel();
 
+    QByteArray busName() const;
+    void setBusName(const QByteArray &name);
+
+    QByteArray actionObjectPath() const;
+    void setActionObjectPath(const QByteArray &path);
+
+    QByteArray menuObjectPath() const;
+    void setMenuObjectPath(const QByteArray &path);
+
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
@@ -47,13 +58,14 @@ public:
 
     Q_INVOKABLE QObject * submenu(int position);
 
+Q_SIGNALS:
+    void busNameChanged(const QByteArray &name);
+    void actionObjectPathChanged(const QByteArray &path);
+    void menuObjectPathChanged(const QByteArray &path);
+
 public Q_SLOTS:
     void activate(int index);
 
-protected:
-    UnityMenuModel(QObject *parent = NULL);
-    void init(const QByteArray &busName, const QByteArray &actionGroupObjectPath, const QByteArray &menuObjectPath);
-
 private:
     class UnityMenuModelPrivate *priv;
     friend class UnityMenuModelPrivate;