ScriptConsole: Refactor to QtMessageLogWindow

Move QML/JS independent classes to common Debugger
code. A Debugger Engine needs to override
evaluateScriptExpression() to provide engine
specific script evaluation.

Change-Id: I02b23b380a3eb1b12003b30ded0b7d075e44dfed
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Aurindam Jana
2012-02-15 12:35:43 +01:00
committed by hjk
parent a8ab1fd70f
commit 147396d764
31 changed files with 1123 additions and 1597 deletions

View File

@@ -34,7 +34,7 @@
#define DEBUGGER_QMLENGINE_H
#include "debuggerengine.h"
#include <qmljsdebugclient/qdeclarativeenginedebug.h>
#include <utils/outputformat.h>
#include <QAbstractSocket>
@@ -96,6 +96,8 @@ private slots:
void retryMessageBoxFinished(int result);
void wrongSetupMessageBox(const QString &errorMessage);
void wrongSetupMessageBoxFinished(int result);
void updateCurrentContext();
void appendDebugOutput(QtMsgType type, const QString &message);
private:
// DebuggerEngine implementation.
@@ -147,6 +149,7 @@ private:
void updateWatchData(const WatchData &data,
const WatchUpdateFlags &flags);
void executeDebuggerCommand(const QString &command);
bool evaluateScriptExpression(const QString &expression);
bool hasCapability(unsigned) const;
@@ -163,6 +166,8 @@ private slots:
void appendMessage(const QString &msg, Utils::OutputFormat);
void synchronizeWatchers();
void onDebugQueryStateChanged(
QmlJsDebugClient::QDeclarativeDebugQuery::State state);
private:
void closeConnection();
@@ -176,6 +181,7 @@ private:
QString qmlImportPath() const;
void updateEditor(Core::IEditor *editor, const QTextDocument *document);
bool canEvaluateScript(const QString &script);
private:
friend class QmlCppEngine;