Rename classes

7 files changed, 21 insertions, 21 deletions

diff --git a/tools/qmldebugger/canvasframerate.cpp b/tools/qmldebugger/canvasframerate.cpp
index f2a813d..d0be579 100644
--- a/tools/qmldebugger/canvasframerate.cpp
+++ b/tools/qmldebugger/canvasframerate.cpp
@@ -209,11 +209,11 @@ void QLineGraph::paintEvent(QPaintEvent *)
     drawTime(&p, r);
 }
 
-class CanvasFrameRatePlugin : public QmlDebugClientPlugin
+class CanvasFrameRatePlugin : public QmlDebugClient
 {
 Q_OBJECT
 public:
-    CanvasFrameRatePlugin(QmlDebugClient *client);
+    CanvasFrameRatePlugin(QmlDebugConnection *client);
 
 signals:
     void sample(int, int, int, int, bool);
@@ -227,8 +227,8 @@ private:
     int ld;
 };
 
-CanvasFrameRatePlugin::CanvasFrameRatePlugin(QmlDebugClient *client)
-: QmlDebugClientPlugin(QLatin1String("CanvasFrameRate"), client), la(-1)
+CanvasFrameRatePlugin::CanvasFrameRatePlugin(QmlDebugConnection *client)
+: QmlDebugClient(QLatin1String("CanvasFrameRate"), client), la(-1)
 {
 }
 
@@ -248,7 +248,7 @@ void CanvasFrameRatePlugin::messageReceived(const QByteArray &data)
     ld = d;
 }
 
-CanvasFrameRate::CanvasFrameRate(QmlDebugClient *client, QWidget *parent)
+CanvasFrameRate::CanvasFrameRate(QmlDebugConnection *client, QWidget *parent)
 : QWidget(parent)
 {
     m_plugin = new CanvasFrameRatePlugin(client);
@@ -300,7 +300,7 @@ void CanvasFrameRate::stateChanged(int s)
 {
     bool checked = s != 0;
 
-    static_cast<QmlDebugClientPlugin *>(m_plugin)->setEnabled(checked);
+    static_cast<QmlDebugClient *>(m_plugin)->setEnabled(checked);
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qmldebugger/canvasframerate.h b/tools/qmldebugger/canvasframerate.h
index cc40d4c..912412b 100644
--- a/tools/qmldebugger/canvasframerate.h
+++ b/tools/qmldebugger/canvasframerate.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlDebugClient;
+class QmlDebugConnection;
 class QTabWidget;
 class CanvasFrameRate : public QWidget
 {
     Q_OBJECT
 public:
-    CanvasFrameRate(QmlDebugClient *, QWidget *parent = 0);
+    CanvasFrameRate(QmlDebugConnection *, QWidget *parent = 0);
 
 private slots:
     void newTab();
diff --git a/tools/qmldebugger/canvasscene.cpp b/tools/qmldebugger/canvasscene.cpp
index 95f3098..65db9da 100644
--- a/tools/qmldebugger/canvasscene.cpp
+++ b/tools/qmldebugger/canvasscene.cpp
@@ -10,10 +10,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class CanvasSceneClientPlugin : public QmlDebugClientPlugin
+class CanvasSceneClientPlugin : public QmlDebugClient
 {
 public:
-   CanvasSceneClientPlugin(QmlDebugClient *, CanvasScene *s);
+   CanvasSceneClientPlugin(QmlDebugConnection *, CanvasScene *s);
 
 protected:
    void messageReceived(const QByteArray &);
@@ -40,9 +40,9 @@ public:
     QFxImage *img;
 };
 
-CanvasSceneClientPlugin::CanvasSceneClientPlugin(QmlDebugClient *c, 
+CanvasSceneClientPlugin::CanvasSceneClientPlugin(QmlDebugConnection *c, 
                                                  CanvasScene *s)
-: QmlDebugClientPlugin(QLatin1String("CanvasScene"), c), scene(s)
+: QmlDebugClient(QLatin1String("CanvasScene"), c), scene(s)
 {
 }
 
@@ -144,7 +144,7 @@ void CanvasSceneClientPlugin::dump(QDataStream &ds, int indent)
         dump(ds, indent + 1);
 }
 
-CanvasScene::CanvasScene(QmlDebugClient *c, QWidget *parent)
+CanvasScene::CanvasScene(QmlDebugConnection *c, QWidget *parent)
 : QWidget(parent)
 {
     client = new CanvasSceneClientPlugin(c, this);
diff --git a/tools/qmldebugger/canvasscene.h b/tools/qmldebugger/canvasscene.h
index 8b583e8..8c6b8d5 100644
--- a/tools/qmldebugger/canvasscene.h
+++ b/tools/qmldebugger/canvasscene.h
@@ -8,14 +8,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlDebugClient;
+class QmlDebugConnection;
 class CanvasSceneClient;
-class QmlDebugClientPlugin;
+class QmlDebugClient;
 class CanvasScene : public QWidget
 {
 Q_OBJECT
 public:
-    CanvasScene(QmlDebugClient *, QWidget *parent = 0);
+    CanvasScene(QmlDebugConnection *, QWidget *parent = 0);
 
     void message(QDataStream &);
 private slots:
@@ -29,7 +29,7 @@ private slots:
 private:
     void setOpacityRecur(QTreeWidgetItem *, qreal);
     void clone(QTreeWidgetItem *item, QSimpleCanvasItem *me, QDataStream &);
-    QmlDebugClientPlugin *client;
+    QmlDebugClient *client;
 
     QTreeWidget *m_tree;
     QSimpleCanvas *m_canvas;
diff --git a/tools/qmldebugger/engine.cpp b/tools/qmldebugger/engine.cpp
index 46d30c4..3b8c8b1 100644
--- a/tools/qmldebugger/engine.cpp
+++ b/tools/qmldebugger/engine.cpp
@@ -27,7 +27,7 @@ private:
     int m_engineId;
 };
 
-EnginePane::EnginePane(QmlDebugClient *client, QWidget *parent)
+EnginePane::EnginePane(QmlDebugConnection *client, QWidget *parent)
 : QWidget(parent), m_client(client), m_engines(0), m_context(0), m_object(0)
 {
     QVBoxLayout *layout = new QVBoxLayout;
diff --git a/tools/qmldebugger/engine.h b/tools/qmldebugger/engine.h
index 191cd1d..a713f25 100644
--- a/tools/qmldebugger/engine.h
+++ b/tools/qmldebugger/engine.h
@@ -9,14 +9,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlDebugClient;
+class QmlDebugConnection;
 class EngineClientPlugin;
 class QLineEdit;
 class EnginePane : public QWidget
 {
 Q_OBJECT
 public:
-    EnginePane(QmlDebugClient *, QWidget *parent = 0);
+    EnginePane(QmlDebugConnection *, QWidget *parent = 0);
 
 private slots:
     void queryEngines();
diff --git a/tools/qmldebugger/main.cpp b/tools/qmldebugger/main.cpp
index 4bed41d..500836f 100644
--- a/tools/qmldebugger/main.cpp
+++ b/tools/qmldebugger/main.cpp
@@ -29,7 +29,7 @@ private slots:
     void connectionStateChanged();
 
 private:
-    QmlDebugClient client;
+    QmlDebugConnection client;
 
     QLabel *m_connectionState;
     QLineEdit *m_host;