Rename QmlDebugServerPlugin -> QmlDebugService

8 files changed, 53 insertions, 53 deletions

diff --git a/src/declarative/canvas/qsimplecanvas.cpp b/src/declarative/canvas/qsimplecanvas.cpp
index a4998dc..3e586f7 100644
--- a/src/declarative/canvas/qsimplecanvas.cpp
+++ b/src/declarative/canvas/qsimplecanvas.cpp
@@ -573,7 +573,7 @@ void QSimpleCanvasPrivate::init(QSimpleCanvas::CanvasMode mode)
     if (continuousUpdate())
         qWarning("QSimpleCanvas: Continuous update enabled");
 
-    if (QmlDebugServerPlugin::isDebuggingEnabled()) {
+    if (QmlDebugService::isDebuggingEnabled()) {
         debugPlugin = new QSimpleCanvasDebugPlugin(q);
         new QSimpleCanvasSceneDebugPlugin(q);
     }
diff --git a/src/declarative/canvas/qsimplecanvasdebugplugin.cpp b/src/declarative/canvas/qsimplecanvasdebugplugin.cpp
index 12088c1..ffb3517 100644
--- a/src/declarative/canvas/qsimplecanvasdebugplugin.cpp
+++ b/src/declarative/canvas/qsimplecanvasdebugplugin.cpp
@@ -67,7 +67,7 @@ private:
 };
 
 QSimpleCanvasDebugPlugin::QSimpleCanvasDebugPlugin(QObject *parent)
-: QmlDebugServerPlugin(QLatin1String("CanvasFrameRate"), parent), _breaks(0)
+: QmlDebugService(QLatin1String("CanvasFrameRate"), parent), _breaks(0)
 {
     _time.start();
     new FrameBreakAnimation(this);
@@ -96,7 +96,7 @@ void QSimpleCanvasDebugPlugin::frameBreak()
 }
 
 QSimpleCanvasSceneDebugPlugin::QSimpleCanvasSceneDebugPlugin(QSimpleCanvas *parent)
-: QmlDebugServerPlugin(QLatin1String("CanvasScene"), parent), m_canvas(parent)
+: QmlDebugService(QLatin1String("CanvasScene"), parent), m_canvas(parent)
 {
 }
 
@@ -120,7 +120,7 @@ void QSimpleCanvasSceneDebugPlugin::refresh()
 void QSimpleCanvasSceneDebugPlugin::refresh(QDataStream &ds, 
                                             QSimpleCanvasItem *item)
 {
-    ds << QmlDebugServerPlugin::objectToString(item) << item->x() << item->y() 
+    ds << QmlDebugService::objectToString(item) << item->x() << item->y() 
        << item->z() << item->width() << item->height() 
        << (int)item->transformOrigin() << item->scale() << (int)item->flip() 
 #ifdef QFX_RENDER_OPENGL
diff --git a/src/declarative/canvas/qsimplecanvasdebugplugin_p.h b/src/declarative/canvas/qsimplecanvasdebugplugin_p.h
index 270b78c..4c6af2c 100644
--- a/src/declarative/canvas/qsimplecanvasdebugplugin_p.h
+++ b/src/declarative/canvas/qsimplecanvasdebugplugin_p.h
@@ -46,10 +46,10 @@
 #include "qtcpserver.h"
 #include "qtcpsocket.h"
 #include "qdatetime.h"
-#include <QtDeclarative/qmldebugserver.h>
+#include <QtDeclarative/qmldebugservice.h>
 
 QT_BEGIN_NAMESPACE
-class QSimpleCanvasDebugPlugin : public QmlDebugServerPlugin
+class QSimpleCanvasDebugPlugin : public QmlDebugService
 {
 public:
     QSimpleCanvasDebugPlugin(QObject *parent = 0);
@@ -65,7 +65,7 @@ private:
 
 class QSimpleCanvas;
 class QSimpleCanvasItem;
-class QSimpleCanvasSceneDebugPlugin : public QmlDebugServerPlugin
+class QSimpleCanvasSceneDebugPlugin : public QmlDebugService
 {
 public:
     QSimpleCanvasSceneDebugPlugin(QSimpleCanvas *parent = 0);
diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index 33076ea..82746fc 100644
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -1,11 +1,11 @@
 SOURCES += debugger/qmldebuggerstatus.cpp \
            debugger/qpacketprotocol.cpp \
-           debugger/qmldebugserver.cpp \
+           debugger/qmldebugservice.cpp \
            debugger/qmldebugclient.cpp \
            debugger/qmldebug.cpp
 
 HEADERS += debugger/qmldebuggerstatus.h \
            debugger/qpacketprotocol.h \
-           debugger/qmldebugserver.h \
+           debugger/qmldebugservice.h \
            debugger/qmldebugclient.h \
            debugger/qmldebug.h
diff --git a/src/declarative/debugger/qmldebugserver.cpp b/src/declarative/debugger/qmldebugservice.cpp
index ddfb88a..9725494 100644
--- a/src/declarative/debugger/qmldebugserver.cpp
+++ b/src/declarative/debugger/qmldebugservice.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmldebugserver.h"
+#include "qmldebugservice.h"
 #include <QtCore/qdebug.h>
 #include <QtNetwork/qtcpserver.h>
 #include <QtNetwork/qtcpsocket.h>
@@ -62,8 +62,8 @@ private slots:
     void readyRead();
 
 private:
-    friend class QmlDebugServerPlugin;
-    friend class QmlDebugServerPluginPrivate;
+    friend class QmlDebugService;
+    friend class QmlDebugServicePrivate;
     QmlDebugServer(int); 
 };
 
@@ -76,15 +76,15 @@ public:
 
     QTcpSocket *connection;
     QPacketProtocol *protocol;
-    QHash<QString, QmlDebugServerPlugin *> plugins;
+    QHash<QString, QmlDebugService *> plugins;
     QStringList enabledPlugins;
 };
 
-class QmlDebugServerPluginPrivate : public QObjectPrivate
+class QmlDebugServicePrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QmlDebugServerPlugin)
+    Q_DECLARE_PUBLIC(QmlDebugService)
 public:
-    QmlDebugServerPluginPrivate();
+    QmlDebugServicePrivate();
 
     QString name;
     QmlDebugServer *server;
@@ -184,7 +184,7 @@ void QmlDebugServer::readyRead()
                 // Enable
                 if (!d->enabledPlugins.contains(plugin)) {
                     d->enabledPlugins.append(plugin);
-                    QHash<QString, QmlDebugServerPlugin *>::Iterator iter = 
+                    QHash<QString, QmlDebugService *>::Iterator iter = 
                         d->plugins.find(plugin);
                     if (iter != d->plugins.end())
                         (*iter)->enabledChanged(true);
@@ -194,7 +194,7 @@ void QmlDebugServer::readyRead()
                 // Disable
                 if (d->enabledPlugins.contains(plugin)) {
                     d->enabledPlugins.removeAll(plugin);
-                    QHash<QString, QmlDebugServerPlugin *>::Iterator iter = 
+                    QHash<QString, QmlDebugService *>::Iterator iter = 
                         d->plugins.find(plugin);
                     if (iter != d->plugins.end())
                         (*iter)->enabledChanged(false);
@@ -207,7 +207,7 @@ void QmlDebugServer::readyRead()
             QByteArray message;
             pack >> message;
 
-            QHash<QString, QmlDebugServerPlugin *>::Iterator iter = 
+            QHash<QString, QmlDebugService *>::Iterator iter = 
                 d->plugins.find(name);
             if (iter == d->plugins.end()) {
                 qWarning() << "QmlDebugServer: Message received for missing plugin" << name;
@@ -218,15 +218,15 @@ void QmlDebugServer::readyRead()
     }
 }
 
-QmlDebugServerPluginPrivate::QmlDebugServerPluginPrivate()
+QmlDebugServicePrivate::QmlDebugServicePrivate()
 : server(0)
 {
 }
 
-QmlDebugServerPlugin::QmlDebugServerPlugin(const QString &name, QObject *parent)
-: QObject(*(new QmlDebugServerPluginPrivate), parent)
+QmlDebugService::QmlDebugService(const QString &name, QObject *parent)
+: QObject(*(new QmlDebugServicePrivate), parent)
 {
-    Q_D(QmlDebugServerPlugin);
+    Q_D(QmlDebugService);
     d->name = name;
     d->server = QmlDebugServer::instance();
 
@@ -234,22 +234,22 @@ QmlDebugServerPlugin::QmlDebugServerPlugin(const QString &name, QObject *parent)
         return;
 
     if (d->server->d_func()->plugins.contains(name)) {
-        qWarning() << "QmlDebugServerPlugin: Conflicting plugin name" << name;
+        qWarning() << "QmlDebugService: Conflicting plugin name" << name;
         d->server = 0;
     } else {
         d->server->d_func()->plugins.insert(name, this);
     }
 }
 
-QString QmlDebugServerPlugin::name() const
+QString QmlDebugService::name() const
 {
-    Q_D(const QmlDebugServerPlugin);
+    Q_D(const QmlDebugService);
     return d->name;
 }
 
-bool QmlDebugServerPlugin::isEnabled() const
+bool QmlDebugService::isEnabled() const
 {
-    Q_D(const QmlDebugServerPlugin);
+    Q_D(const QmlDebugService);
     return (d->server && d->server->d_func()->enabledPlugins.contains(d->name));
 }
 
@@ -279,7 +279,7 @@ Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash);
     Returns a unique id for \a object.  Calling this method multiple times
     for the same object will return the same id.
 */
-int QmlDebugServerPlugin::idForObject(QObject *object)
+int QmlDebugService::idForObject(QObject *object)
 {
     if (!object)
         return -1;
@@ -312,7 +312,7 @@ int QmlDebugServerPlugin::idForObject(QObject *object)
     assigned an id, through idForObject(), then 0 is returned.  If the object
     has been destroyed, 0 is returned.
 */
-QObject *QmlDebugServerPlugin::objectForId(int id)
+QObject *QmlDebugService::objectForId(int id)
 {
     ObjectReferenceHash *hash = objectReferenceHash();
 
@@ -334,12 +334,12 @@ QObject *QmlDebugServerPlugin::objectForId(int id)
     }
 }
 
-bool QmlDebugServerPlugin::isDebuggingEnabled()
+bool QmlDebugService::isDebuggingEnabled()
 {
     return QmlDebugServer::instance() != 0;
 }
 
-QString QmlDebugServerPlugin::objectToString(QObject *obj)
+QString QmlDebugService::objectToString(QObject *obj)
 {
     if(!obj)
         return QLatin1String("NULL");
@@ -354,9 +354,9 @@ QString QmlDebugServerPlugin::objectToString(QObject *obj)
     return rv;
 }
 
-void QmlDebugServerPlugin::sendMessage(const QByteArray &message)
+void QmlDebugService::sendMessage(const QByteArray &message)
 {
-    Q_D(QmlDebugServerPlugin);
+    Q_D(QmlDebugService);
 
     if (!d->server || !d->server->d_func()->connection)
         return;
@@ -367,14 +367,14 @@ void QmlDebugServerPlugin::sendMessage(const QByteArray &message)
     d->server->d_func()->connection->flush();
 }
 
-void QmlDebugServerPlugin::enabledChanged(bool)
+void QmlDebugService::enabledChanged(bool)
 {
 }
 
-void QmlDebugServerPlugin::messageReceived(const QByteArray &)
+void QmlDebugService::messageReceived(const QByteArray &)
 {
 }
 
 QT_END_NAMESPACE
 
-#include "qmldebugserver.moc"
+#include "qmldebugservice.moc"
diff --git a/src/declarative/debugger/qmldebugserver.h b/src/declarative/debugger/qmldebugservice.h
index b15ee2e..b1344c4 100644
--- a/src/declarative/debugger/qmldebugserver.h
+++ b/src/declarative/debugger/qmldebugservice.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLDEBUGSERVER_H
-#define QMLDEBUGSERVER_H
+#ifndef QMLDEBUGSERVICE_H
+#define QMLDEBUGSERVICE_H
 
 #include <QtCore/qobject.h>
 
@@ -48,14 +48,14 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QmlDebugServerPluginPrivate;
-class QmlDebugServerPlugin : public QObject
+class QmlDebugServicePrivate;
+class QmlDebugService : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlDebugServerPlugin)
-    Q_DISABLE_COPY(QmlDebugServerPlugin)
+    Q_DECLARE_PRIVATE(QmlDebugService)
+    Q_DISABLE_COPY(QmlDebugService)
 public:
-    QmlDebugServerPlugin(const QString &, QObject *parent = 0);
+    QmlDebugService(const QString &, QObject *parent = 0);
 
     QString name() const;
 
@@ -82,5 +82,5 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QMLDEBUGSERVER_H
+#endif // QMLDEBUGSERVICE_H
 
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index b5e44e7..2b8aac3 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QList<QmlEngine *> QmlEngineDebugServer::m_engines;
 QmlEngineDebugServer::QmlEngineDebugServer(QObject *parent)
-: QmlDebugServerPlugin(QLatin1String("QmlEngine"), parent)
+: QmlDebugService(QLatin1String("QmlEngine"), parent)
 {
 }
 
@@ -135,7 +135,7 @@ void QmlEngineDebugServer::buildObjectList(QDataStream &message,
     QmlContextPrivate *p = (QmlContextPrivate *)QObjectPrivate::get(ctxt);
 
     QString ctxtName = ctxt->objectName();
-    int ctxtId = QmlDebugServerPlugin::idForObject(ctxt);
+    int ctxtId = QmlDebugService::idForObject(ctxt);
 
     message << ctxtName << ctxtId; 
     
@@ -182,7 +182,7 @@ QmlEngineDebugServer::objectData(QObject *object)
 
     rv.objectName = object->objectName();
     rv.objectType = object->metaObject()->className();
-    rv.objectId = QmlDebugServerPlugin::idForObject(object);
+    rv.objectId = QmlDebugService::idForObject(object);
 
     return rv;
 }
@@ -207,7 +207,7 @@ void QmlEngineDebugServer::messageReceived(const QByteArray &message)
             QmlEngine *engine = m_engines.at(ii);
 
             QString engineName = engine->objectName();
-            int engineId = QmlDebugServerPlugin::idForObject(engine);
+            int engineId = QmlDebugService::idForObject(engine);
 
             rs << engineName << engineId;
         }
@@ -219,7 +219,7 @@ void QmlEngineDebugServer::messageReceived(const QByteArray &message)
         ds >> queryId >> engineId;
 
         QmlEngine *engine = 
-            qobject_cast<QmlEngine *>(QmlDebugServerPlugin::objectForId(engineId));
+            qobject_cast<QmlEngine *>(QmlDebugService::objectForId(engineId));
 
         QByteArray reply;
         QDataStream rs(&reply, QIODevice::WriteOnly);
@@ -236,7 +236,7 @@ void QmlEngineDebugServer::messageReceived(const QByteArray &message)
 
         ds >> queryId >> objectId >> recurse;
 
-        QObject *object = QmlDebugServerPlugin::objectForId(objectId);
+        QObject *object = QmlDebugService::objectForId(objectId);
 
         QByteArray reply;
         QDataStream rs(&reply, QIODevice::WriteOnly);
diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h
index 634f55f..e85ab6f 100644
--- a/src/declarative/qml/qmlenginedebug_p.h
+++ b/src/declarative/qml/qmlenginedebug_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qmldebugserver.h>
+#include <QtDeclarative/qmldebugservice.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 class QmlEngine;
 class QmlContext;
 class QDataStream;
-class QmlEngineDebugServer : public QmlDebugServerPlugin
+class QmlEngineDebugServer : public QmlDebugService
 {
 public:
     QmlEngineDebugServer(QObject * = 0);