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, 0 insertions, 66 deletions

diff --git a/libqmenumodel/src/unityqmlmenumodel.cpp b/libqmenumodel/src/unityqmlmenumodel.cpp
index 775d974..36bb2bd 100644
--- a/libqmenumodel/src/unityqmlmenumodel.cpp
+++ b/libqmenumodel/src/unityqmlmenumodel.cpp
@@ -18,22 +18,13 @@
 
 #include "unityqmlmenumodel.h"
 
-struct UnityQmlMenuModelPrivate
-{
-    QByteArray busName;
-    QByteArray actionObjectPath;
-    QByteArray menuObjectPath;
-};
-
 UnityQmlMenuModel::UnityQmlMenuModel(QObject *parent):
     UnityMenuModel(parent)
 {
-    priv = new UnityQmlMenuModelPrivate;
 }
 
 UnityQmlMenuModel::~UnityQmlMenuModel()
 {
-    delete priv;
 }
 
 void UnityQmlMenuModel::classBegin()
@@ -42,61 +33,4 @@ void UnityQmlMenuModel::classBegin()
 
 void UnityQmlMenuModel::componentComplete()
 {
-    if (priv->busName.isEmpty())
-        qWarning("UnityQmlMenuModel: property 'busName' must be set");
-    else if (priv->actionObjectPath.isEmpty())
-        qWarning("UnityQmlMenuModel: property 'actionObjectPath' must be set");
-    else if (priv->menuObjectPath.isEmpty())
-        qWarning("UnityQmlMenuModel: property 'menuObjectPath' must be set");
-    else
-        UnityQmlMenuModel::init(priv->busName, priv->actionObjectPath, priv->menuObjectPath);
-}
-
-QByteArray UnityQmlMenuModel::busName() const
-{
-    return priv->busName;
-}
-
-void UnityQmlMenuModel::setBusName(const QByteArray &name)
-{
-    if (!priv->busName.isEmpty()) {
-        qWarning("UnityQmlMenuModel: cannot change bus name after creation");
-        return;
-    }
-
-    priv->busName = name;
-    Q_EMIT busNameChanged(name);
-}
-
-QByteArray UnityQmlMenuModel::actionObjectPath() const
-{
-    return priv->actionObjectPath;
 }
-
-void UnityQmlMenuModel::setActionObjectPath(const QByteArray &path)
-{
-    if (!priv->actionObjectPath.isEmpty()) {
-        qWarning("UnityQmlMenuModel: cannot change object paths after creation");
-        return;
-    }
-
-    priv->actionObjectPath = path;
-    Q_EMIT actionObjectPathChanged(path);
-}
-
-QByteArray UnityQmlMenuModel::menuObjectPath() const
-{
-    return priv->menuObjectPath;
-}
-
-void UnityQmlMenuModel::setMenuObjectPath(const QByteArray &path)
-{
-    if (!priv->menuObjectPath.isEmpty()) {
-        qWarning("UnityQmlMenuModel: cannot change object paths after creation");
-        return;
-    }
-
-    priv->menuObjectPath = path;
-    Q_EMIT menuObjectPathChanged(path);
-}
-