From: hjk <qtc-committer@nokia.com>
Date: Wed, 12 Jan 2011 12:51:26 +0000 (+0100)
Subject: debugger: code cosmetics QmlAdapter
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae46124a63d54664ac275acc2b754464f745596a;p=qt-creator-jp%2Fqt-creator-jp.git

debugger: code cosmetics QmlAdapter
---

diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index 5e1566ffff..b2591056d9 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -45,36 +45,38 @@
 #include <utils/qtcassert.h>
 
 namespace Debugger {
+namespace Internal {
 
-struct QmlAdapterPrivate {
-    explicit QmlAdapterPrivate(DebuggerEngine *engine, QmlAdapter *q);
+class QmlAdapterPrivate
+{
+public:
+    explicit QmlAdapterPrivate(DebuggerEngine *engine)
+        : m_engine(engine)
+        , m_qmlClient(0)
+        , m_mainClient(0)
+        , m_connectionAttempts(0)
+        , m_conn(0)
+    {
+        m_connectionTimer.setInterval(200);
+    }
 
     QWeakPointer<DebuggerEngine> m_engine;
     Internal::QmlDebuggerClient *m_qmlClient;
     QDeclarativeEngineDebug *m_mainClient;
 
-    QTimer *m_connectionTimer;
+    QTimer m_connectionTimer;
     int m_connectionAttempts;
     int m_maxConnectionAttempts;
     QDeclarativeDebugConnection *m_conn;
     QList<QByteArray> sendBuffer;
 };
 
-QmlAdapterPrivate::QmlAdapterPrivate(DebuggerEngine *engine, QmlAdapter *q) :
-  m_engine(engine)
-, m_qmlClient(0)
-, m_mainClient(0)
-, m_connectionTimer(new QTimer(q))
-, m_connectionAttempts(0)
-, m_conn(0)
-{
-}
+} // namespace Internal
 
 QmlAdapter::QmlAdapter(DebuggerEngine *engine, QObject *parent)
-    : QObject(parent), d(new QmlAdapterPrivate(engine, this))
+    : QObject(parent), d(new Internal::QmlAdapterPrivate(engine))
 {
-    d->m_connectionTimer->setInterval(200);
-    connect(d->m_connectionTimer, SIGNAL(timeout()), SLOT(pollInferior()));
+    connect(&d->m_connectionTimer, SIGNAL(timeout()), SLOT(pollInferior()));
 }
 
 QmlAdapter::~QmlAdapter()
@@ -84,18 +86,18 @@ QmlAdapter::~QmlAdapter()
 void QmlAdapter::beginConnection()
 {
     d->m_connectionAttempts = 0;
-    d->m_connectionTimer->start();
+    d->m_connectionTimer.start();
 }
 
 void QmlAdapter::pauseConnection()
 {
-    d->m_connectionTimer->stop();
+    d->m_connectionTimer.stop();
 }
 
 void QmlAdapter::closeConnection()
 {
-    if (d->m_connectionTimer->isActive()) {
-        d->m_connectionTimer->stop();
+    if (d->m_connectionTimer.isActive()) {
+        d->m_connectionTimer.stop();
     } else {
         if (d->m_conn) {
             d->m_conn->disconnectFromHost();
@@ -108,11 +110,11 @@ void QmlAdapter::pollInferior()
     ++d->m_connectionAttempts;
 
     if (connectToViewer()) {
-        d->m_connectionTimer->stop();
+        d->m_connectionTimer.stop();
         d->m_connectionAttempts = 0;
     } else if (d->m_connectionAttempts == d->m_maxConnectionAttempts) {
         emit connectionStartupFailed();
-        d->m_connectionTimer->stop();
+        d->m_connectionTimer.stop();
         d->m_connectionAttempts = 0;
     }
 }
@@ -268,7 +270,7 @@ void QmlAdapter::setMaxConnectionAttempts(int maxAttempts)
 }
 void QmlAdapter::setConnectionAttemptInterval(int interval)
 {
-    d->m_connectionTimer->setInterval(interval);
+    d->m_connectionTimer.setInterval(interval);
 }
 
 void QmlAdapter::logServiceStatusChange(const QString &service, QDeclarativeDebugClient::Status newStatus)
diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index cdba9c011a..a5e98d8786 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -31,16 +31,15 @@
 **
 **************************************************************************/
 
-#ifndef QMLADAPTER_H
-#define QMLADAPTER_H
-
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
+#ifndef DEBGUGGER_QMLADAPTER_H
+#define DEBGUGGER_QMLADAPTER_H
 
 #include "debugger_global.h"
+#include "qmldebuggerclient.h"
 
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
 #include <QtNetwork/QAbstractSocket>
-#include "qmldebuggerclient.h"
 
 namespace QmlJsDebugClient {
 class QDeclarativeEngineDebug;
@@ -53,9 +52,9 @@ class DebuggerEngine;
 
 namespace Internal {
 class QmlDebuggerClient;
+class QmlAdapterPrivate;
 } // namespace Internal
 
-struct QmlAdapterPrivate;
 class DEBUGGER_EXPORT QmlAdapter : public QObject
 {
     Q_OBJECT
@@ -103,9 +102,9 @@ private:
     void flushSendBuffer();
 
 private:
-    QScopedPointer<QmlAdapterPrivate> d;
+    QScopedPointer<Internal::QmlAdapterPrivate> d;
 };
 
 } // namespace Debugger
 
-#endif // QMLADAPTER_H
+#endif // DEBGUGGER_QMLADAPTER_H