diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-10-06 13:17:53 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-10-06 13:17:53 +0200 |
| commit | ba5b62a3b871ac0662aa4a29567c59a1b1b53124 (patch) | |
| tree | 8602920c117a4cda47e68d39d74362b0326dea83 | |
| parent | 51be059a3dcd6a21c7c53a7e22195a6fd027bbaa (diff) | |
Organizer: Use shared include for data needed for communication.
| -rw-r--r-- | src/mobility/mobilitymanager.cpp | 9 | ||||
| -rw-r--r-- | src/mobility/mobilitymanager.h | 1 | ||||
| -rw-r--r-- | src/src.pri | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/mobility/mobilitymanager.cpp b/src/mobility/mobilitymanager.cpp index 9d54bd3..fd00528 100644 --- a/src/mobility/mobilitymanager.cpp +++ b/src/mobility/mobilitymanager.cpp @@ -48,13 +48,6 @@ #include <limits> -// maybe move to a shared location, so mobility and simulator can access it -Q_DECLARE_METATYPE(QtMobility::QOrganizerItem) -static void registerOrganizerTypes() -{ - qRegisterMetaTypeStreamOperators<QOrganizerItem>("QtMobility::QOrganizerItem"); -} - using namespace QtMobility; int MobilityClient::contactsClientsCount = 0; @@ -74,7 +67,7 @@ MobilityServer::MobilityServer(MobilityData *mobility, QObject *parent) qt_registerContactsTypes(); qt_registerLocationTypes(); qt_registerSensorTypes(); - registerOrganizerTypes(); + qt_registerOrganizerTypes(); } MobilityServer::~MobilityServer() diff --git a/src/mobility/mobilitymanager.h b/src/mobility/mobilitymanager.h index 216cbdd..ee9fd28 100644 --- a/src/mobility/mobilitymanager.h +++ b/src/mobility/mobilitymanager.h @@ -45,6 +45,7 @@ #include <contacts/engines/qcontactmemorybackenddata_simulator_p.h> #include <organizer/qorganizeritemid.h> #include <../plugins/sensors/simulator/qsensordata_simulator_p.h> +#include <qorganizerdata_simulator_p.h> class QLocalSocket; class QLocalServer; diff --git a/src/src.pri b/src/src.pri index 4c33012..9b943d4 100644 --- a/src/src.pri +++ b/src/src.pri @@ -26,16 +26,20 @@ INCLUDEPATH += \ $$QT_MOBILITY_SOURCE_PATH/src/contacts/filters \ $$QT_MOBILITY_SOURCE_PATH/src/contacts/details \ $$QT_MOBILITY_SOURCE_PATH/src/contacts/requests \ - $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator + $$QT_MOBILITY_SOURCE_PATH/src/organizer \ + $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator \ + $$QT_MOBILITY_SOURCE_PATH/plugins/organizer/simulator SOURCES += $$QT_MOBILITY_SOURCE_PATH/src/systeminfo/qsysteminfodata_simulator.cpp \ $$QT_MOBILITY_SOURCE_PATH/src/location/qlocationdata_simulator.cpp \ $$QT_MOBILITY_SOURCE_PATH/src/contacts/engines/qcontactmemorybackenddata_simulator.cpp \ - $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator/qsensordata_simulator.cpp + $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator/qsensordata_simulator.cpp \ + $$QT_MOBILITY_SOURCE_PATH/plugins/organizer/simulator/qorganizerdata_simulator.cpp HEADERS += $$QT_MOBILITY_SOURCE_PATH/src/systeminfo/qsysteminfodata_simulator_p.h \ $$QT_MOBILITY_SOURCE_PATH/src/location/qlocationdata_simulator_p.h \ $$QT_MOBILITY_SOURCE_PATH/src/contacts/engines/qcontactmemorybackenddata_simulator_p.h \ - $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator/qsensordata_simulator_p.h + $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator/qsensordata_simulator_p.h \ + $$QT_MOBILITY_SOURCE_PATH/plugins/organizer/simulator/qorganizerdata_simulator_p.h OTHER_FILES += \ $$QT_MOBILITY_SOURCE_PATH/src/mobilitysimulator/mobilityconnection.cpp \ |