3 files changed, 39 insertions, 23 deletions
diff --git a/interfaces/include/afm_user_daemon.hpp b/interfaces/include/afm_user_daemon.hpp
new file mode 100644
index 0000000..256292b
--- /dev/null
+++ b/interfaces/include/afm_user_daemon.hpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AFM_USER_DAEMON_HPP
+#define AFM_USER_DAEMON_HPP
+
+
+#endif // AFM_USER_DAEMON_HPP
diff --git a/interfaces/include/appframework.hpp b/interfaces/include/appframework.hpp
index d95cd9d..d4abefb 100644
--- 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
diff --git a/interfaces/include/windowmanager.hpp b/interfaces/include/windowmanager.hpp
index 45c7c6e..ebab2d7 100644
--- a/interfaces/include/windowmanager.hpp
+++ b/interfaces/include/windowmanager.hpp
@@ -24,6 +24,7 @@
 #define WINDOWMANAGER_ERROR_NAME_ALREADY_DEFINED 2
 #define WINDOWMANAGER_ERROR_ID_NOT_FOUND 3
 #define WINDOWMANAGER_ERROR_NAME_NOT_FOUND 4
+#define WINDOWMANAGER_ERROR_ID_IN_USE 5
 
 class SimplePoint
 {