rename QServiceTypeIdent -> QRemoteServiceIdentifier

rename QServiceTypeRegister -> QRemoteServiceClassRegister

15 files changed, 80 insertions, 81 deletions

diff --git a/src/serviceframework/ipc/instancemanager.cpp b/src/serviceframework/ipc/instancemanager.cpp
index 9478ccde1c..71b7b2a2fd 100644
--- a/src/serviceframework/ipc/instancemanager.cpp
+++ b/src/serviceframework/ipc/instancemanager.cpp
@@ -57,10 +57,10 @@ InstanceManager::InstanceManager()
 
 InstanceManager::~InstanceManager()
 {
-    QList<QServiceTypeIdent> allIdents = metaMap.keys();
+    QList<QRemoteServiceIdentifier> allIdents = metaMap.keys();
     while (!allIdents.isEmpty()) {
         ServiceIdentDescriptor descr = metaMap.take(allIdents.takeFirst());
-        if (descr.instanceType == QServiceTypeRegister::SharedInstance) {
+        if (descr.instanceType == QRemoteServiceClassRegister::SharedInstance) {
             if (descr.sharedInstance)
                descr.sharedInstance->deleteLater();
             descr.sharedInstance = 0;
@@ -75,11 +75,11 @@ InstanceManager::~InstanceManager()
 }
 
 bool InstanceManager::addType(const QMetaObject* meta, 
-        QServiceTypeRegister::CreateServiceFunc func, 
-        QServiceTypeRegister::TypeIdentFunc typeFunc,
-        QServiceTypeRegister::InstanceType type)
+        QRemoteServiceClassRegister::CreateServiceFunc func, 
+        QRemoteServiceClassRegister::TypeIdentFunc typeFunc,
+        QRemoteServiceClassRegister::InstanceType type)
 {
-    QServiceTypeIdent ident = (*typeFunc)();
+    QRemoteServiceIdentifier ident = (*typeFunc)();
 
     QMutexLocker ml(&lock);
 
@@ -97,7 +97,7 @@ bool InstanceManager::addType(const QMetaObject* meta,
     return false;
 }
 
-const QMetaObject* InstanceManager::metaObject(const QServiceTypeIdent& ident) const
+const QMetaObject* InstanceManager::metaObject(const QRemoteServiceIdentifier& ident) const
 {
     QMutexLocker ml(&lock);
     if (metaMap.contains(ident)) {
@@ -107,7 +107,7 @@ const QMetaObject* InstanceManager::metaObject(const QServiceTypeIdent& ident) c
     }
 }
 
-QList<QServiceTypeIdent> InstanceManager::allIdents() const
+QList<QRemoteServiceIdentifier> InstanceManager::allIdents() const
 {
     QMutexLocker ml(&lock);
     return metaMap.keys();
@@ -118,7 +118,7 @@ QList<QServiceTypeIdent> InstanceManager::allIdents() const
     if \a ident cannot be mapped to a known meta object. \a instanceId will
     contain the id for the new service instance.
 */
-QObject* InstanceManager::createObjectInstance(const QServiceTypeIdent& ident, QUuid& instanceId)
+QObject* InstanceManager::createObjectInstance(const QRemoteServiceIdentifier& ident, QUuid& instanceId)
 {
     instanceId = QUuid();
     QMutexLocker ml(&lock);
@@ -128,7 +128,7 @@ QObject* InstanceManager::createObjectInstance(const QServiceTypeIdent& ident, Q
     QObject* service = 0;
     ServiceIdentDescriptor& descr = metaMap[ident];
 
-    if (descr.instanceType == QServiceTypeRegister::SharedInstance) {
+    if (descr.instanceType == QRemoteServiceClassRegister::SharedInstance) {
         if (descr.sharedInstance) {
             service = descr.sharedInstance;
             instanceId = descr.sharedId;
@@ -156,14 +156,14 @@ QObject* InstanceManager::createObjectInstance(const QServiceTypeIdent& ident, Q
 /*!
     The associated service object will be deleted in the process.
 */
-void InstanceManager::removeObjectInstance(const QServiceTypeIdent& ident, const QUuid& instanceId)
+void InstanceManager::removeObjectInstance(const QRemoteServiceIdentifier& ident, const QUuid& instanceId)
 {
     QMutexLocker ml(&lock);
     if (!metaMap.contains(ident))
         return;
     
     ServiceIdentDescriptor& descr = metaMap[ident];
-    if (descr.instanceType == QServiceTypeRegister::SharedInstance) {
+    if (descr.instanceType == QRemoteServiceClassRegister::SharedInstance) {
         if (descr.sharedRefCount < 1)
             return;
 
diff --git a/src/serviceframework/ipc/instancemanager_p.h b/src/serviceframework/ipc/instancemanager_p.h
index 3455d46c35..569f19afb6 100644
--- a/src/serviceframework/ipc/instancemanager_p.h
+++ b/src/serviceframework/ipc/instancemanager_p.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QSERVICE_TYPE_REGISTER_PRIV
-#define QSERVICE_TYPE_REGISTER_PRIV
+#ifndef QSERVICE_INSTANCE_MANAGER
+#define QSERVICE_INSTANCE_MANAGER
 
 #include <qmobilityglobal.h>
-#include "qservicetyperegister.h"
+#include "qremoteserviceclassregister.h"
 #include <QHash>
 #include <QMutexLocker>
 #include <QMetaObject>
@@ -60,11 +60,11 @@ struct ServiceIdentDescriptor
     }
 
     const QMetaObject* meta;
-    QServiceTypeRegister::InstanceType instanceType;
+    QRemoteServiceClassRegister::InstanceType instanceType;
     QHash<QUuid, QObject*> individualInstances;
     QObject* sharedInstance;
     QUuid sharedId;
-    QServiceTypeRegister::CreateServiceFunc create;
+    QRemoteServiceClassRegister::CreateServiceFunc create;
     int sharedRefCount;
 };
 
@@ -75,20 +75,20 @@ public:
     ~InstanceManager();
 
     bool addType(const QMetaObject* meta, 
-            QServiceTypeRegister::CreateServiceFunc func,
-            QServiceTypeRegister::TypeIdentFunc typeFunc,
-            QServiceTypeRegister::InstanceType type);
-    const QMetaObject* metaObject(const QServiceTypeIdent& ident) const;
-    QList<QServiceTypeIdent> allIdents() const;
+            QRemoteServiceClassRegister::CreateServiceFunc func,
+            QRemoteServiceClassRegister::TypeIdentFunc typeFunc,
+            QRemoteServiceClassRegister::InstanceType type);
+    const QMetaObject* metaObject(const QRemoteServiceIdentifier& ident) const;
+    QList<QRemoteServiceIdentifier> allIdents() const;
 
-    QObject* createObjectInstance(const QServiceTypeIdent& ident, QUuid& instanceId);
-    void removeObjectInstance(const QServiceTypeIdent& ident, const QUuid& instanceId);
+    QObject* createObjectInstance(const QRemoteServiceIdentifier& ident, QUuid& instanceId);
+    void removeObjectInstance(const QRemoteServiceIdentifier& ident, const QUuid& instanceId);
 
     static InstanceManager* instance();
 
 private:
     mutable QMutex lock;
-    QHash<QServiceTypeIdent, ServiceIdentDescriptor> metaMap;
+    QHash<QRemoteServiceIdentifier, ServiceIdentDescriptor> metaMap;
 };
 
 
@@ -96,4 +96,4 @@ private:
 QTM_END_NAMESPACE
 
 
-#endif //QSERVICE_TYPE_REGISTER_PRIV
+#endif //QSERVICE_INSTANCE_MANAGER
diff --git a/src/serviceframework/ipc/objectendpoint.cpp b/src/serviceframework/ipc/objectendpoint.cpp
index f581fbf320..e50baf02df 100644
--- a/src/serviceframework/ipc/objectendpoint.cpp
+++ b/src/serviceframework/ipc/objectendpoint.cpp
@@ -151,7 +151,7 @@ public:
     ObjectEndPoint* parent;
 
     //used on service side
-    QServiceTypeIdent typeIdent;
+    QRemoteServiceIdentifier typeIdent;
     QUuid serviceInstanceId;
 };
 
@@ -201,7 +201,7 @@ void ObjectEndPoint::disconnected()
     code and this object must clean itself up upon destruction of
     proxy.
 */
-QObject* ObjectEndPoint::constructProxy(const QServiceTypeIdent& ident)
+QObject* ObjectEndPoint::constructProxy(const QRemoteServiceIdentifier& ident)
 {
     
     //ask for serialized meta object
diff --git a/src/serviceframework/ipc/objectendpoint_p.h b/src/serviceframework/ipc/objectendpoint_p.h
index e9589d4667..cfc0acd25c 100644
--- a/src/serviceframework/ipc/objectendpoint_p.h
+++ b/src/serviceframework/ipc/objectendpoint_p.h
@@ -44,7 +44,7 @@
 
 #include "qmobilityglobal.h"
 #include "ipcendpoint_p.h"
-#include "qservicetyperegister.h"
+#include "qremoteserviceclassregister.h"
 #include <QPointer>
 #include <QHash>
 
@@ -62,7 +62,7 @@ public:
 
     ObjectEndPoint(Type type, QServiceIpcEndPoint* comm, QObject* parent = 0);
     ~ObjectEndPoint();
-    QObject* constructProxy(const QServiceTypeIdent& ident);
+    QObject* constructProxy(const QRemoteServiceIdentifier& ident);
 
     void objectRequest(const QServicePackage& p);
     void methodCall(const QServicePackage& p);
diff --git a/src/serviceframework/ipc/qservicecontrol_p.cpp b/src/serviceframework/ipc/qservicecontrol_p.cpp
index a6dfee22f1..db80429773 100644
--- a/src/serviceframework/ipc/qservicecontrol_p.cpp
+++ b/src/serviceframework/ipc/qservicecontrol_p.cpp
@@ -147,7 +147,7 @@ bool QServiceControlPrivate::createServiceEndPoint(const QString& ident)
 /*!
     Creates endpoint on client side.
 */
-QObject* QServiceControlPrivate::proxyForService(const QServiceTypeIdent& typeIdent, const QString& location)
+QObject* QServiceControlPrivate::proxyForService(const QRemoteServiceIdentifier& typeIdent, const QString& location)
 {
     QLocalSocket* socket = new QLocalSocket();
     //location format:  protocol:address
diff --git a/src/serviceframework/ipc/qservicecontrol_p.h b/src/serviceframework/ipc/qservicecontrol_p.h
index eb2ec8e73d..248aaa216c 100644
--- a/src/serviceframework/ipc/qservicecontrol_p.h
+++ b/src/serviceframework/ipc/qservicecontrol_p.h
@@ -66,7 +66,7 @@ private:
     QList<ObjectEndPoint*> pendingConnections;
 
 public:
-    static QObject* proxyForService(const QServiceTypeIdent& typeId, const QString& location);
+    static QObject* proxyForService(const QRemoteServiceIdentifier& typeId, const QString& location);
 };
 
 QTM_END_NAMESPACE
diff --git a/src/serviceframework/ipc/qservicecontrol_s60.cpp b/src/serviceframework/ipc/qservicecontrol_s60.cpp
index 0e2a3f3357..086c3f7099 100644
--- a/src/serviceframework/ipc/qservicecontrol_s60.cpp
+++ b/src/serviceframework/ipc/qservicecontrol_s60.cpp
@@ -172,7 +172,7 @@ void QServiceControlPrivate::processIncoming(CServiceProviderServerSession* newS
     ObjectEndPoint* endPoint = new ObjectEndPoint(ObjectEndPoint::Service, ipcEndPoint, this);
 }
 
-QObject* QServiceControlPrivate::proxyForService(const QServiceTypeIdent &typeId, const QString &location)
+QObject* QServiceControlPrivate::proxyForService(const QRemoteServiceIdentifier &typeId, const QString &location)
 {
 #ifdef QT_SFW_SYMBIAN_IPC_DEBUG
     qDebug() << "QServiceControlPrivate::proxyForService for location: " << location;
diff --git a/src/serviceframework/ipc/qservicecontrol_s60_p.h b/src/serviceframework/ipc/qservicecontrol_s60_p.h
index 28487cc73e..52fda6c1d6 100644
--- a/src/serviceframework/ipc/qservicecontrol_s60_p.h
+++ b/src/serviceframework/ipc/qservicecontrol_s60_p.h
@@ -45,7 +45,7 @@
 #define QT_SFW_SYMBIAN_IPC_DEBUG
 
 #include "qservicecontrol.h"
-#include "qservicetyperegister.h"
+#include "qremoteserviceclassregister.h"
 #include "qservicepackage_p.h"
 #include <e32base.h>
 
@@ -170,7 +170,7 @@ class QServiceControlPrivate: public QObject
 public:
     QServiceControlPrivate(QObject* parent);
     void publishServices(const QString& ident );
-    static QObject* proxyForService(const QServiceTypeIdent& typeId, const QString& location);
+    static QObject* proxyForService(const QRemoteServiceIdentifier& typeId, const QString& location);
     void processIncoming(CServiceProviderServerSession* session);
 };
 
diff --git a/src/serviceframework/ipc/qservicepackage_p.h b/src/serviceframework/ipc/qservicepackage_p.h
index bfc2b1bf41..a6e1d77a59 100644
--- a/src/serviceframework/ipc/qservicepackage_p.h
+++ b/src/serviceframework/ipc/qservicepackage_p.h
@@ -47,7 +47,7 @@
 #include <QSharedData>
 #include <QUuid>
 #include <QVariant>
-#include "qservicetyperegister.h"
+#include "qremoteserviceclassregister.h"
 
 QT_BEGIN_NAMESPACE
 class QDataStream;
@@ -103,13 +103,13 @@ class QServicePackagePrivate : public QSharedData
 public:
     QServicePackagePrivate() 
         :   packageType(QServicePackage::ObjectCreation),
-            typeId(QServiceTypeIdent()), payload(QVariant()),
+            typeId(QRemoteServiceIdentifier()), payload(QVariant()),
             messageId(QUuid()), responseType(QServicePackage::NotAResponse)
     {
     }
 
     QServicePackage::Type packageType;
-    QServiceTypeIdent typeId;
+    QRemoteServiceIdentifier typeId;
     QVariant payload;
     QUuid messageId;
     QServicePackage::ResponseType responseType;
@@ -119,7 +119,7 @@ public:
         packageType = QServicePackage::ObjectCreation;
         messageId = QUuid();
         payload = QVariant();
-        typeId = QServiceTypeIdent();
+        typeId = QRemoteServiceIdentifier();
         responseType = QServicePackage::NotAResponse;
     }
 };
diff --git a/src/serviceframework/qservicetyperegister.cpp b/src/serviceframework/qremoteserviceclassregister.cpp
index d7663c2e29..dd0c3de96e 100644
--- a/src/serviceframework/qservicetyperegister.cpp
+++ b/src/serviceframework/qremoteserviceclassregister.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qservicetyperegister.h"
+#include "qremoteserviceclassregister.h"
 #include "instancemanager_p.h"
 
 #include <QMutexLocker>
@@ -50,22 +50,32 @@
 QTM_BEGIN_NAMESPACE
 
 /*!
-    \typedef QServiceTypeIdent
-    \relates QServiceTypeRegister
+    \typedef QRemoteServiceIdentifier
+    \relates QRemoteServiceClassRegister
 
     Qt-style synonym for QPair<QByteArray, QByteArray>.
 */
 
 /*!
-    \class QServiceTypeRegister
+    \typedef QRemoteServiceClassRegister::CreateServiceFunc
+    \internal
+*/
+
+/*!
+    \typedef QRemoteServiceClassRegister::TypeIdentFunc
+    \internal
+*/
+
+/*!
+    \class QRemoteServiceClassRegister
     \ingroup servicefw
-    \brief The QServiceTypeRegister class manages the various remote service classes
+    \brief The QRemoteServiceClassRegister class manages the various remote service classes
     which can be instanciated.
 
 */
 
 /*!
-    \enum QServiceTypeRegister::InstanceType
+    \enum QRemoteServiceClassRegister::InstanceType
 
     Defines the possible service instanciation methodologies.
 
@@ -74,13 +84,13 @@ QTM_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn bool QServiceTypeRegister::registerType(QServiceTypeRegister::InstanceType type)
+    \fn bool QRemoteServiceClassRegister::registerType(QRemoteServiceClassRegister::InstanceType type)
 
     This template function registers the provided template class as remote service and returns true if the registration
     was successfull. The \a type specifies the method used for service class instanciation. 
 
     \code
-        QServiceTypeRegister::registerType<ServiceClass>();
+        QRemoteServiceClassRegister::registerType<ServiceClass>();
     \endcode
 
     Every service class must be marked via the \l Q_SERVICE() macro.
@@ -88,7 +98,7 @@ QTM_BEGIN_NAMESPACE
 
 /*!
     \macro Q_SERVICE(T, interface, version)
-    \relates QServiceTypeRegister
+    \relates QRemoteServiceClassRegister
 
     This macro marks a class as remote service and should be placed next to the Q_OBJECT
     macro. \a T represents the name of the class implementing the service, \a interface
@@ -113,8 +123,8 @@ QTM_BEGIN_NAMESPACE
 /*!
     \internal
 */
-bool QServiceTypeRegister::registerType( const QMetaObject* meta,
-        CreateServiceFunc func, TypeIdentFunc tfunc,  QServiceTypeRegister::InstanceType t)
+bool QRemoteServiceClassRegister::registerType( const QMetaObject* meta,
+        CreateServiceFunc func, TypeIdentFunc tfunc,  QRemoteServiceClassRegister::InstanceType t)
 {
     Q_ASSERT(InstanceManager::instance());
     return InstanceManager::instance()->addType(meta, func, tfunc, t);
@@ -123,7 +133,7 @@ bool QServiceTypeRegister::registerType( const QMetaObject* meta,
 /*!
     \internal
 */
-const QMetaObject* QServiceTypeRegister::metaObject(const QServiceTypeIdent& ident) const
+const QMetaObject* QRemoteServiceClassRegister::metaObject(const QRemoteServiceIdentifier& ident) const
 {
     Q_ASSERT(InstanceManager::instance());
     return InstanceManager::instance()->metaObject(ident);
@@ -132,7 +142,7 @@ const QMetaObject* QServiceTypeRegister::metaObject(const QServiceTypeIdent& ide
 /*!
     Returns the list of all registered service types.
 */
-QList<QServiceTypeIdent> QServiceTypeRegister::types() const
+QList<QRemoteServiceIdentifier> QRemoteServiceClassRegister::types() const
 {
     Q_ASSERT(InstanceManager::instance());
     return InstanceManager::instance()->allIdents();
diff --git a/src/serviceframework/qservicetyperegister.h b/src/serviceframework/qremoteserviceclassregister.h
index 38330d5025..3ea3a25653 100644
--- a/src/serviceframework/qservicetyperegister.h
+++ b/src/serviceframework/qremoteserviceclassregister.h
@@ -48,27 +48,26 @@
 
 QTM_BEGIN_NAMESPACE
 
-typedef QPair<QByteArray, QByteArray> QServiceTypeIdent;
+typedef QPair<QByteArray, QByteArray> QRemoteServiceIdentifier;
 
-class QServiceTypeRegisterPrivate;
-class Q_SERVICEFW_EXPORT QServiceTypeRegister 
+class Q_SERVICEFW_EXPORT QRemoteServiceClassRegister 
 {
 public:
     typedef QObject *(*CreateServiceFunc)();
-    typedef QServiceTypeIdent (*TypeIdentFunc)();
+    typedef QRemoteServiceIdentifier (*TypeIdentFunc)();
 
     enum InstanceType {
         SharedInstance = 0,  //every new request for service gets same service instance
         UniqueInstance       //every new request for service gets new service instance
     };
 
-    QList<QServiceTypeIdent> types() const;
-    const QMetaObject* metaObject(const QServiceTypeIdent& ident) const;
+    QList<QRemoteServiceIdentifier> types() const;
+    const QMetaObject* metaObject(const QRemoteServiceIdentifier& ident) const;
 
     static bool registerType(const QMetaObject* meta, CreateServiceFunc, TypeIdentFunc, InstanceType instance = UniqueInstance);
-    template <class T> static bool registerType( QServiceTypeRegister::InstanceType instanceType = UniqueInstance) 
+    template <class T> static bool registerType( QRemoteServiceClassRegister::InstanceType instanceType = UniqueInstance) 
     {
-        return QServiceTypeRegister::registerType(
+        return QRemoteServiceClassRegister::registerType(
                 &T::staticMetaObject, &T::qt_sfw_create_instance, &T::qt_sfw_type_ident, instanceType);
     }
 };
@@ -79,9 +78,9 @@ public:\
     { \
         return new T;\
     } \
-    static QServiceTypeIdent qt_sfw_type_ident() \
+    static QRemoteServiceIdentifier qt_sfw_type_ident() \
     { \
-        return QServiceTypeIdent(interface, version); \
+        return QRemoteServiceIdentifier(interface, version); \
     } \
 private:
 
diff --git a/src/serviceframework/qservicecontrol.cpp b/src/serviceframework/qservicecontrol.cpp
index 7dfa855a0f..742c49de3b 100644
--- a/src/serviceframework/qservicecontrol.cpp
+++ b/src/serviceframework/qservicecontrol.cpp
@@ -55,11 +55,11 @@ QTM_BEGIN_NAMESPACE
     \brief The QServiceControl class manages instances of remote service objects.
 
     This class instanciates IPC based service objects which have been registered
-    via QServiceTypeRegister. It owns each created service object instance and
+    via QRemoteServiceClassRegister. It owns each created service object instance and
     ensures that the platform specific IPC mechanism publishes the required service
     object to other processes in the system.
  
-    \sa QServiceTypeRegister   
+    \sa QRemoteServiceClassRegister   
 */
 
 /*!
@@ -80,7 +80,7 @@ QServiceControl::~QServiceControl()
 
 /*!
     Publishes every service that has been registered using
-    \l QServiceTypeRegister::registerType(). \a ident is the service specific
+    \l QRemoteServiceClassRegister::registerType(). \a ident is the service specific
     IPC address under which the service can be reached. This address must match
     the address provide in the services xml descriptor (see <filepath> tag).
 */
diff --git a/src/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp
index b165619913..4b6a29fd86 100644
--- a/src/serviceframework/qservicemanager.cpp
+++ b/src/serviceframework/qservicemanager.cpp
@@ -411,7 +411,7 @@ QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descr
     if (qservicemanager_isIpcBasedService(location)) {
         const QByteArray version = QString("%1.%2").arg(descriptor.majorVersion())
                 .arg(descriptor.minorVersion()).toLatin1();
-        const QServiceTypeIdent ident(descriptor.interfaceName().toLatin1(), version);
+        const QRemoteServiceIdentifier ident(descriptor.interfaceName().toLatin1(), version);
         QObject* service = QServiceControlPrivate::proxyForService(ident, location);
         if (!service)
             d->setError(InvalidServiceLocation);
@@ -496,16 +496,6 @@ QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descr
 */
 
 /*!
-    \typedef QServiceTypeRegister::CreateServiceFunc
-    \internal
-*/
-
-/*!
-    \typedef QServiceTypeRegister::TypeIdentFunc
-    \internal
-*/
-
-/*!
     Registers the service defined by the XML file at \a xmlFilePath.
     Returns true if the registration succeeded, and false otherwise.
 
diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro
index 0c9ba42530..823fe1eca3 100644
--- a/src/serviceframework/serviceframework.pro
+++ b/src/serviceframework/serviceframework.pro
@@ -20,7 +20,7 @@ PUBLIC_HEADERS += \
             qserviceinterfacedescriptor.h \
             qservicefilter.h \
             qservicecontrol.h \
-            qservicetyperegister.h
+            qremoteserviceclassregister.h
 
 PRIVATE_HEADERS += servicemetadata_p.h \
             qserviceinterfacedescriptor_p.h \
@@ -35,7 +35,7 @@ SOURCES +=  servicemetadata.cpp \
             qservicefilter.cpp \
             dberror.cpp \
             qservicecontrol.cpp \
-            qservicetyperegister.cpp
+            qremoteserviceclassregister.cpp
 
 symbian {
     INCLUDEPATH +=  ./symbian
diff --git a/tests/auto/qservicemanager_ipc/service/main.cpp b/tests/auto/qservicemanager_ipc/service/main.cpp
index e15b577f5a..b360a7224a 100644
--- a/tests/auto/qservicemanager_ipc/service/main.cpp
+++ b/tests/auto/qservicemanager_ipc/service/main.cpp
@@ -1,6 +1,6 @@
 #include <QCoreApplication>
 #include <QTimer>
-#include <qservicetyperegister.h>
+#include <qremoteserviceclassregister.h>
 #include <qservicecontrol.h>
 #include "qservicemanager.h"
 #include <QDebug>
@@ -320,8 +320,8 @@ int main(int argc, char** argv)
 
     registerExampleService();
 
-    QServiceTypeRegister::registerType<SharedTestService>(QServiceTypeRegister::SharedInstance);
-    QServiceTypeRegister::registerType<UniqueTestService>(QServiceTypeRegister::UniqueInstance);
+    QRemoteServiceClassRegister::registerType<SharedTestService>(QRemoteServiceClassRegister::SharedInstance);
+    QRemoteServiceClassRegister::registerType<UniqueTestService>(QRemoteServiceClassRegister::UniqueInstance);
 
 
     //this only works