From bf4e73f64ddc76a8c1ed98bddcb665401adc5402 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 24 Jun 2013 12:10:56 -0400 Subject: 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. --- libqmenumodel/src/unityqmlmenumodel.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'libqmenumodel/src/unityqmlmenumodel.h') diff --git a/libqmenumodel/src/unityqmlmenumodel.h b/libqmenumodel/src/unityqmlmenumodel.h index a375e8e..d57d52e 100644 --- a/libqmenumodel/src/unityqmlmenumodel.h +++ b/libqmenumodel/src/unityqmlmenumodel.h @@ -27,9 +27,6 @@ class UnityQmlMenuModel: public UnityMenuModel, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) - 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: UnityQmlMenuModel(QObject *parent = NULL); @@ -38,20 +35,6 @@ public: void classBegin(); void componentComplete(); - QByteArray busName() const; - void setBusName(const QByteArray &name); - - QByteArray actionObjectPath() const; - void setActionObjectPath(const QByteArray &path); - - QByteArray menuObjectPath() const; - void setMenuObjectPath(const QByteArray &path); - -Q_SIGNALS: - void busNameChanged(const QByteArray &name); - void actionObjectPathChanged(const QByteArray &path); - void menuObjectPathChanged(const QByteArray &path); - private: struct UnityQmlMenuModelPrivate *priv; }; -- cgit v1.2.3