From b2a2a7cc18fc8415378aec31de477e4b58a13d71 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 10 May 2012 10:29:11 +0200
Subject: QmlDebug: Renaming

Move Status enum out of QmlDebugClient and drop "QmlDebug"
prefix for the different 'Reference' structs. Allows to
avoid 'using namespace in QmlDebug' in header files.

Change-Id: Id9857977300e86d637cf128ff3417d8b24c8e995
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
 src/plugins/debugger/qml/qmladapter.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/plugins/debugger/qml/qmladapter.h')

diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index 468fb668d2..34168d8eb0 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -42,8 +42,6 @@
 #include <QPointer>
 #include <QTimer>
 
-using namespace QmlDebug;
-
 namespace QmlDebug {
 class BaseEngineDebugClient;
 class QmlDebugConnection;
@@ -72,7 +70,7 @@ public:
 
     bool isConnected() const;
 
-    QmlDebugConnection *connection() const;
+    QmlDebug::QmlDebugConnection *connection() const;
     DebuggerEngine *debuggerEngine() const;
 
     bool disableJsDebugging(bool block);
@@ -80,12 +78,11 @@ public:
     BaseQmlDebuggerClient *activeDebuggerClient() const;
     QHash<QString, BaseQmlDebuggerClient*> debuggerClients() const;
 
-    BaseEngineDebugClient *engineDebugClient() const;
-    QDebugMessageClient *messageClient() const;
+    QmlDebug::QDebugMessageClient *messageClient() const;
 
 public slots:
     void logServiceStatusChange(const QString &service, float version,
-                                QmlDebugClient::Status newStatus);
+                                QmlDebug::ClientStatus newStatus);
     void logServiceActivity(const QString &service, const QString &logMessage);
 
 signals:
@@ -97,8 +94,8 @@ signals:
 
 private slots:
     void connectionErrorOccurred(QAbstractSocket::SocketError socketError);
-    void clientStatusChanged(QmlDebugClient::Status status);
-    void debugClientStatusChanged(QmlDebugClient::Status status);
+    void clientStatusChanged(QmlDebug::ClientStatus status);
+    void debugClientStatusChanged(QmlDebug::ClientStatus status);
     void connectionStateChanged();
     void checkConnectionState();
 
@@ -111,9 +108,9 @@ private:
     QPointer<DebuggerEngine> m_engine;
     BaseQmlDebuggerClient *m_qmlClient;
     QTimer m_connectionTimer;
-    QmlDebugConnection *m_conn;
+    QmlDebug::QmlDebugConnection *m_conn;
     QHash<QString, BaseQmlDebuggerClient*> m_debugClients;
-    QDebugMessageClient *m_msgClient;
+    QmlDebug::QDebugMessageClient *m_msgClient;
 };
 
 } // namespace Internal
-- 
cgit v1.2.1