feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSInspector: Fix line length

Browse Source 
Change-Id: I483a970551e1747d037c9e0e4ec9332fe68cb49c
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-17 08:43:27 +02:00
parent c40a16dda9
commit 2f60e4b504
16 changed files with 527 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/qmljsinspector/qmljsclientproxy.h
View File

@@ -45,7 +45,8 @@ class QmlAdapter;
namespace QmlJSInspector {
//map <filename, editorRevision> -> <lineNumber, columnNumber> -> debugIds
typedef QHash<QPair<QString, int>, QHash<QPair<int, int>, QList<int> > > DebugIdHash;
typedef
QHash<QPair<QString, int>, QHash<QPair<int, int>, QList<int> > > DebugIdHash;
namespace Internal {
@@ -67,8 +68,10 @@ public:
QString source,
int line);
quint32 setMethodBodyForObject(int objectDebugId, const QString &methodName, const QString &methodBody);
quint32 resetBindingForObject(int objectDebugId, const QString &propertyName);
quint32 setMethodBodyForObject(int objectDebugId, const QString &methodName,
const QString &methodBody);
quint32 resetBindingForObject(int objectDebugId,
const QString &propertyName);
quint32 queryExpressionResult(int objectDebugId, const QString &expr);
void clearComponentCache();
@@ -81,14 +84,16 @@ public:
QList<QmlDebugObjectReference> objectReferences() const;
QmlDebugObjectReference objectReferenceForId(int debugId) const;
QmlDebugObjectReference objectReferenceForId(const QString &objectId) const;
QmlDebugObjectReference objectReferenceForLocation(int line, int column) const;
QmlDebugObjectReference objectReferenceForLocation(int line,
int column) const;
QList<QmlDebugObjectReference> rootObjectReference() const;
DebugIdHash debugIdHash() const { return m_debugIdHash; }
bool isConnected() const;
void setSelectedItemsByDebugId(const QList<int> &debugIds);
void setSelectedItemsByObjectId(const QList<QmlDebugObjectReference> &objectRefs);
void setSelectedItemsByObjectId(
const QList<QmlDebugObjectReference> &objectRefs);
QList<QmlDebugEngineReference> engines() const;
@@ -108,7 +113,8 @@ signals:
void aboutToReloadEngines();
void enginesChanged();
void selectedItemsChanged(const QList<QmlDebugObjectReference> &selectedItems);
void selectedItemsChanged(
const QList<QmlDebugObjectReference> &selectedItems);
void connected();
void disconnected();
@@ -121,7 +127,8 @@ signals:
void designModeBehaviorChanged(bool inDesignMode);
void showAppOnTopChanged(bool showAppOnTop);
void serverReloaded();
void propertyChanged(int debugId, const QByteArray &propertyName, const QVariant &propertyValue);
void propertyChanged(int debugId, const QByteArray &propertyName,
const QVariant &propertyValue);
void result(quint32 queryId, const QVariant &result);
void rootContext(const QVariant &context);
@@ -139,7 +146,8 @@ public slots:
void changeToSelectMarqueeTool();
void showAppOnTop(bool showOnTop);
void createQmlObject(const QString &qmlText, int parentDebugId,
const QStringList &imports, const QString &filename = QString(), int order = 0);
const QStringList &imports,
const QString &filename = QString(), int order = 0);
void destroyQmlObject(int debugId);
void reparentQmlObject(int debugId, int newParent);
@@ -148,10 +156,13 @@ private slots:
void clientStatusChanged(QDeclarativeDebugClient::Status status);
void engineClientStatusChanged(QDeclarativeDebugClient::Status status);
void onCurrentObjectsChanged(const QList<int> &debugIds, bool requestIfNeeded = true);
void onCurrentObjectsChanged(const QList<int> &debugIds,
bool requestIfNeeded = true);
void newObjects();
void objectWatchTriggered(int debugId, const QByteArray &propertyName, const QVariant &propertyValue);
void onResult(quint32 queryId, const QVariant &value, const QByteArray &type);
void objectWatchTriggered(int debugId, const QByteArray &propertyName,
const QVariant &propertyValue);
void onResult(quint32 queryId, const QVariant &value,
const QByteArray &type);
void onCurrentObjectsFetched(quint32 queryId, const QVariant &result);
private:
@@ -162,8 +173,11 @@ private:
void reloadEngines();
bool getObjectHierarchy(const QmlDebugObjectReference &obj);
QList<QmlDebugObjectReference> objectReferences(const QmlDebugObjectReference &objectRef) const;
QmlDebugObjectReference objectReferenceForId(int debugId, const QmlDebugObjectReference &ref) const;
QList<QmlDebugObjectReference> objectReferences(
const QmlDebugObjectReference &objectRef) const;
QmlDebugObjectReference objectReferenceForId(
int debugId,
const QmlDebugObjectReference &ref) const;
enum LogDirection {
LogSend,