diff options
Diffstat (limited to 'src/manager-lib')
-rw-r--r-- | src/manager-lib/abstractcontainer.h | 2 | ||||
-rw-r--r-- | src/manager-lib/abstractruntime.h | 2 | ||||
-rw-r--r-- | src/manager-lib/application.h | 2 | ||||
-rw-r--r-- | src/manager-lib/applicationipcmanager.cpp | 6 | ||||
-rw-r--r-- | src/manager-lib/applicationipcmanager.h | 2 | ||||
-rw-r--r-- | src/manager-lib/applicationmanager.cpp | 14 | ||||
-rw-r--r-- | src/manager-lib/applicationmanager.h | 2 | ||||
-rw-r--r-- | src/manager-lib/applicationmodel.cpp | 2 | ||||
-rw-r--r-- | src/manager-lib/notificationmanager.cpp | 2 | ||||
-rw-r--r-- | src/manager-lib/notificationmanager.h | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/src/manager-lib/abstractcontainer.h b/src/manager-lib/abstractcontainer.h index dd7a70a5..1edb35bc 100644 --- a/src/manager-lib/abstractcontainer.h +++ b/src/manager-lib/abstractcontainer.h @@ -99,7 +99,7 @@ signals: class AbstractContainer : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 2.0") Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup) diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h index 765391e6..ded511a8 100644 --- a/src/manager-lib/abstractruntime.h +++ b/src/manager-lib/abstractruntime.h @@ -104,7 +104,7 @@ private: class AbstractRuntime : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 2.0") Q_PROPERTY(AbstractContainer *container READ container) diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h index 3a8d51af..bdc9d0eb 100644 --- a/src/manager-lib/application.h +++ b/src/manager-lib/application.h @@ -67,7 +67,7 @@ signals: class AbstractApplication : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationObject 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationObject 2.0") Q_PROPERTY(QString id READ id CONSTANT) Q_PROPERTY(QString runtimeName READ runtimeName NOTIFY bulkChange) diff --git a/src/manager-lib/applicationipcmanager.cpp b/src/manager-lib/applicationipcmanager.cpp index f82ac5da..5726c93f 100644 --- a/src/manager-lib/applicationipcmanager.cpp +++ b/src/manager-lib/applicationipcmanager.cpp @@ -82,8 +82,8 @@ ApplicationIPCManager *ApplicationIPCManager::createInstance() qFatal("ApplicationIPCManager::createInstance() was called a second time."); qmlRegisterType<ApplicationIPCInterfaceAttached>(); - qmlRegisterType<ApplicationIPCInterface>("QtApplicationManager.SystemUI", 1, 0, "ApplicationIPCInterface"); - qmlRegisterSingletonType<ApplicationIPCManager>("QtApplicationManager.SystemUI", 1, 0, "ApplicationIPCManager", + qmlRegisterType<ApplicationIPCInterface>("QtApplicationManager.SystemUI", 2, 0, "ApplicationIPCInterface"); + qmlRegisterSingletonType<ApplicationIPCManager>("QtApplicationManager.SystemUI", 2, 0, "ApplicationIPCManager", &ApplicationIPCManager::instanceForQml); return s_instance = new ApplicationIPCManager(); } @@ -195,7 +195,7 @@ ApplicationIPCManager::ApplicationIPCManager(QObject *parent) \qml import QtQuick 2.0 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 ApplicationIPCInterface { id: extension diff --git a/src/manager-lib/applicationipcmanager.h b/src/manager-lib/applicationipcmanager.h index 5c63e4d8..60e92b98 100644 --- a/src/manager-lib/applicationipcmanager.h +++ b/src/manager-lib/applicationipcmanager.h @@ -64,7 +64,7 @@ class Application; class ApplicationIPCManager : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationIPCManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationIPCManager 2.0") public: ~ApplicationIPCManager(); diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp index 8474204a..ef89106b 100644 --- a/src/manager-lib/applicationmanager.cpp +++ b/src/manager-lib/applicationmanager.cpp @@ -173,7 +173,7 @@ \qml import QtQuick 2.0 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 ListView { id: appList @@ -384,20 +384,20 @@ ApplicationManager *ApplicationManager::createInstance(bool singleProcess) QScopedPointer<ApplicationManager> am(new ApplicationManager(singleProcess)); - qmlRegisterSingletonType<ApplicationManager>("QtApplicationManager.SystemUI", 1, 0, "ApplicationManager", + qmlRegisterSingletonType<ApplicationManager>("QtApplicationManager.SystemUI", 2, 0, "ApplicationManager", &ApplicationManager::instanceForQml); - qmlRegisterType<ApplicationModel>("QtApplicationManager.SystemUI", 1, 0, "ApplicationModel"); - qmlRegisterUncreatableType<AbstractApplication>("QtApplicationManager.SystemUI", 1, 0, "ApplicationObject", + qmlRegisterType<ApplicationModel>("QtApplicationManager.SystemUI", 2, 0, "ApplicationModel"); + qmlRegisterUncreatableType<AbstractApplication>("QtApplicationManager.SystemUI", 2, 0, "ApplicationObject", qSL("Cannot create objects of type ApplicationObject")); qRegisterMetaType<AbstractApplication*>("AbstractApplication*"); - qmlRegisterUncreatableType<AbstractRuntime>("QtApplicationManager.SystemUI", 1, 0, "Runtime", + qmlRegisterUncreatableType<AbstractRuntime>("QtApplicationManager.SystemUI", 2, 0, "Runtime", qSL("Cannot create objects of type Runtime")); qRegisterMetaType<AbstractRuntime*>("AbstractRuntime*"); - qmlRegisterUncreatableType<AbstractContainer>("QtApplicationManager.SystemUI", 1, 0, "Container", + qmlRegisterUncreatableType<AbstractContainer>("QtApplicationManager.SystemUI", 2, 0, "Container", qSL("Cannot create objects of type Container")); qRegisterMetaType<AbstractContainer*>("AbstractContainer*"); - qmlRegisterUncreatableType<Am>("QtApplicationManager.SystemUI", 1, 0, "Am", + qmlRegisterUncreatableType<Am>("QtApplicationManager.SystemUI", 2, 0, "Am", qSL("Cannot create objects of type Am")); qRegisterMetaType<Am::RunState>(); diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h index 56e0ba80..344861ba 100644 --- a/src/manager-lib/applicationmanager.h +++ b/src/manager-lib/applicationmanager.h @@ -74,7 +74,7 @@ class ApplicationManager : public QAbstractListModel { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationManager") - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationManager 2.0") Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(bool singleProcess READ isSingleProcess CONSTANT) diff --git a/src/manager-lib/applicationmodel.cpp b/src/manager-lib/applicationmodel.cpp index 2f5282be..c0354fbf 100644 --- a/src/manager-lib/applicationmodel.cpp +++ b/src/manager-lib/applicationmodel.cpp @@ -72,7 +72,7 @@ \qml import QtQuick 2.6 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 ListView { model: ApplicationModel { diff --git a/src/manager-lib/notificationmanager.cpp b/src/manager-lib/notificationmanager.cpp index ffdd2742..48804021 100644 --- a/src/manager-lib/notificationmanager.cpp +++ b/src/manager-lib/notificationmanager.cpp @@ -268,7 +268,7 @@ NotificationManager *NotificationManager::createInstance() if (Q_UNLIKELY(s_instance)) qFatal("NotificationManager::createInstance() was called a second time."); - qmlRegisterSingletonType<NotificationManager>("QtApplicationManager.SystemUI", 1, 0, "NotificationManager", + qmlRegisterSingletonType<NotificationManager>("QtApplicationManager.SystemUI", 2, 0, "NotificationManager", &NotificationManager::instanceForQml); return s_instance = new NotificationManager(); } diff --git a/src/manager-lib/notificationmanager.h b/src/manager-lib/notificationmanager.h index 1551dbfd..6d2c8385 100644 --- a/src/manager-lib/notificationmanager.h +++ b/src/manager-lib/notificationmanager.h @@ -56,7 +56,7 @@ class NotificationManager : public QAbstractListModel { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Notifications") - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/NotificationManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/NotificationManager 2.0") Q_PROPERTY(int count READ count NOTIFY countChanged) |