-Make the SampleNav app yellow.

[staging/HomeScreen.git] / interfaces / include / appframework.hpp

diff --git a/interfaces/include/appframework.hpp b/interfaces/include/appframework.hpp
index d95cd9d..d4abefb 100644 (file)
--- a/interfaces/include/appframework.hpp
+++ b/interfaces/include/appframework.hpp
@@ -17,38 +17,32 @@
 #ifndef APPFRAMEWORK_HPP
 #define APPFRAMEWORK_HPP
 
-#include <QObject>
 #include <QtDBus>
-#include <QString>
 
-class AppInfo : public QObject
+class AppInfo
 {
-    Q_OBJECT
 public:
-    explicit AppInfo(QObject *parent = 0);
-    AppInfo(const AppInfo &other);
-    AppInfo& operator=(const AppInfo &other);
-    ~AppInfo();
+    AppInfo();
+    virtual ~AppInfo();
 
-    //register Message with the Qt type system
-    static void registerMetaType();
-
-    friend QDBusArgument &operator<<(QDBusArgument &argument, const AppInfo &appInfo);
-    friend const QDBusArgument &operator>>(const QDBusArgument &argument, AppInfo &appInfo);
-
-    void setName(const QString name) {this->name = name;}
-    QString getName() const {return name;}
-    void setIconPath(const QString iconPath) {this->iconPath = iconPath;}
-    QString getIconPath() const {return iconPath;}
-    void setDescription(const QString description) {this->description = description;}
-    QString getDescription() const {return description;}
-
-private:
+    QString id;
+    QString version;
+    int width;
+    int height;
     QString name;
-    QString iconPath;
     QString description;
+    QString shortname;
+    QString author;
+    QString iconPath;
+
+    void read(const QJsonObject &json);
+
+    friend QDBusArgument &operator <<(QDBusArgument &argument, const AppInfo &mAppInfo);
+    friend const QDBusArgument &operator >>(const QDBusArgument &argument, AppInfo &mAppInfo);
 };
 
+
 Q_DECLARE_METATYPE(AppInfo)
+Q_DECLARE_METATYPE(QList<AppInfo>)
 
 #endif // APPFRAMEWORK_HPP