forked from qt-creator/qt-creator
QML Debugger refactoring
Now, QmlEngine creates the connection to the inferior (debuggee), and notifies QmlInspector when a connection is established. Before, inspector created the debugger engin, which was wrong. QmlEngine's responsibilities are connecting to the debuggee and basic QML/JS debugging features like locals & watchers, breakpoints etc. QmlInspector takes care of Live Preview and other fancy inspection features. Reviewed-by: hjk
This commit is contained in:
98
src/plugins/debugger/qml/qmladapter.h
Normal file
98
src/plugins/debugger/qml/qmladapter.h
Normal file
@@ -0,0 +1,98 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
||||
**
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** Commercial Usage
|
||||
**
|
||||
** Licensees holding valid Qt Commercial licenses may use this file in
|
||||
** accordance with the Qt Commercial License Agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Nokia.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
**
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** If you are unsure which license is appropriate for your use, please
|
||||
** contact the sales department at http://qt.nokia.com/contact.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef QMLADAPTER_H
|
||||
#define QMLADAPTER_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QWeakPointer>
|
||||
|
||||
#include "qmljsprivateapi.h"
|
||||
#include "debugger_global.h"
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QTimer)
|
||||
|
||||
namespace Debugger {
|
||||
namespace Internal {
|
||||
class DebuggerEngine;
|
||||
class QmlDebuggerClient;
|
||||
|
||||
class DEBUGGER_EXPORT QmlAdapter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit QmlAdapter(DebuggerEngine *engine, QObject *parent = 0);
|
||||
void beginConnection();
|
||||
|
||||
bool isConnected() const;
|
||||
bool isUnconnected() const;
|
||||
|
||||
QDeclarativeEngineDebug *client() const;
|
||||
QDeclarativeDebugConnection *connection() const;
|
||||
|
||||
// TODO move to private API b/w engine and adapter
|
||||
void setMaxConnectionAttempts(int maxAttempts);
|
||||
void setConnectionAttemptInterval(int interval);
|
||||
|
||||
signals:
|
||||
void aboutToDisconnect();
|
||||
void connected();
|
||||
void disconnected();
|
||||
void connectionStartupFailed();
|
||||
void connectionError();
|
||||
|
||||
private slots:
|
||||
void connectionErrorOccurred();
|
||||
void connectionStateChanged();
|
||||
void pollInferior();
|
||||
|
||||
private:
|
||||
bool connectToViewer();
|
||||
void createDebuggerClient();
|
||||
void showConnectionStatusMessage(const QString &message);
|
||||
void showConnectionErrorMessage(const QString &message);
|
||||
|
||||
private:
|
||||
QWeakPointer<DebuggerEngine> m_engine;
|
||||
QmlDebuggerClient *m_qmlClient;
|
||||
QDeclarativeEngineDebug *m_mainClient;
|
||||
|
||||
QTimer *m_connectionTimer;
|
||||
int m_connectionAttempts;
|
||||
int m_maxConnectionAttempts;
|
||||
int m_connectionAttemptInterval;
|
||||
|
||||
QDeclarativeDebugConnection *m_conn;
|
||||
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Debugger
|
||||
|
||||
#endif // QMLADAPTER_H
|
||||
Reference in New Issue
Block a user