Skip to content
Snippets Groups Projects
Commit 4ee19843 authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlInspector: Fix compilation with latest changes of QDeclarative 

All files have been renamed from Qml to QDeclarative
parent 299ea32a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 174 additions and 174 deletions
src/plugins/qmlinspector/components/canvasframerate.cpp
+ 9
− 9
View file @ 4ee19843
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
**************************************************************************/ **************************************************************************/
#include "canvasframerate.h" #include "canvasframerate.h"
#include <private/qmldebugclient_p.h> #include <private/qdeclarativedebugclient_p.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
...@@ -393,11 +393,11 @@ QSize GraphWindow::sizeHint() const ...@@ -393,11 +393,11 @@ QSize GraphWindow::sizeHint() const
} }
class CanvasFrameRatePlugin : public QmlDebugClient class CanvasFrameRatePlugin : public QDeclarativeDebugClient
{ {
Q_OBJECT Q_OBJECT
public: public:
CanvasFrameRatePlugin(QmlDebugConnection *client); CanvasFrameRatePlugin(QDeclarativeDebugConnection *client);
signals: signals:
void sample(int, int, int, bool); void sample(int, int, int, bool);
...@@ -410,8 +410,8 @@ private: ...@@ -410,8 +410,8 @@ private:
int ld; int ld;
}; };
CanvasFrameRatePlugin::CanvasFrameRatePlugin(QmlDebugConnection *client) CanvasFrameRatePlugin::CanvasFrameRatePlugin(QDeclarativeDebugConnection *client)
: QmlDebugClient(QLatin1String("CanvasFrameRate"), client), lb(-1) : QDeclarativeDebugClient(QLatin1String("CanvasFrameRate"), client), lb(-1)
{ {
} }
...@@ -476,7 +476,7 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent) ...@@ -476,7 +476,7 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
setLayout(layout); setLayout(layout);
} }
void CanvasFrameRate::reset(QmlDebugConnection *conn) void CanvasFrameRate::reset(QDeclarativeDebugConnection *conn)
{ {
delete m_plugin; delete m_plugin;
m_plugin = 0; m_plugin = 0;
...@@ -502,11 +502,11 @@ void CanvasFrameRate::connectionStateChanged(QAbstractSocket::SocketState state) ...@@ -502,11 +502,11 @@ void CanvasFrameRate::connectionStateChanged(QAbstractSocket::SocketState state)
delete m_plugin; delete m_plugin;
m_plugin = 0; m_plugin = 0;
} else if (state == QAbstractSocket::ConnectedState) { } else if (state == QAbstractSocket::ConnectedState) {
handleConnected(qobject_cast<QmlDebugConnection*>(sender())); handleConnected(qobject_cast<QDeclarativeDebugConnection*>(sender()));
} }
} }
void CanvasFrameRate::handleConnected(QmlDebugConnection *conn) void CanvasFrameRate::handleConnected(QDeclarativeDebugConnection *conn)
{ {
delete m_plugin; delete m_plugin;
m_plugin = new CanvasFrameRatePlugin(conn); m_plugin = new CanvasFrameRatePlugin(conn);
...@@ -561,7 +561,7 @@ void CanvasFrameRate::newTab() ...@@ -561,7 +561,7 @@ void CanvasFrameRate::newTab()
void CanvasFrameRate::enabledToggled(bool checked) void CanvasFrameRate::enabledToggled(bool checked)
{ {
if (m_plugin) if (m_plugin)
static_cast<QmlDebugClient *>(m_plugin)->setEnabled(checked); static_cast<QDeclarativeDebugClient *>(m_plugin)->setEnabled(checked);
} }
QT_END_NAMESPACE QT_END_NAMESPACE
......
src/plugins/qmlinspector/components/canvasframerate.h
+ 3
− 3
View file @ 4ee19843
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef CANVASFRAMERATE_H #ifndef CANVASFRAMERATE_H
#define CANVASFRAMERATE_H #define CANVASFRAMERATE_H
#include <private/qmldebugclient_p.h> #include <private/qdeclarativedebugclient_p.h>
#include <QtCore/qpointer.h> #include <QtCore/qpointer.h>
#include <QtGui/qwidget.h> #include <QtGui/qwidget.h>
...@@ -52,7 +52,7 @@ class CanvasFrameRate : public QWidget ...@@ -52,7 +52,7 @@ class CanvasFrameRate : public QWidget
public: public:
CanvasFrameRate(QWidget *parent = 0); CanvasFrameRate(QWidget *parent = 0);
void reset(QmlDebugConnection *conn); void reset(QDeclarativeDebugConnection *conn);
void setSizeHint(const QSize &); void setSizeHint(const QSize &);
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
...@@ -64,7 +64,7 @@ private slots: ...@@ -64,7 +64,7 @@ private slots:
void connectionStateChanged(QAbstractSocket::SocketState state); void connectionStateChanged(QAbstractSocket::SocketState state);
private: private:
void handleConnected(QmlDebugConnection *conn); void handleConnected(QDeclarativeDebugConnection *conn);
QGroupBox *m_group; QGroupBox *m_group;
QTabWidget *m_tabs; QTabWidget *m_tabs;
......
src/plugins/qmlinspector/components/expressionquerywidget.cpp
+ 4
− 4
View file @ 4ee19843
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <QtGui/qtextobject.h> #include <QtGui/qtextobject.h>
#include <QtGui/qlayout.h> #include <QtGui/qlayout.h>
ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QmlEngineDebug *client, QWidget *parent) ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug *client, QWidget *parent)
: QWidget(parent), : QWidget(parent),
m_mode(mode), m_mode(mode),
m_client(client), m_client(client),
...@@ -74,7 +74,7 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QmlEngineDebug *client, ...@@ -74,7 +74,7 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QmlEngineDebug *client,
} }
} }
void ExpressionQueryWidget::setEngineDebug(QmlEngineDebug *client) void ExpressionQueryWidget::setEngineDebug(QDeclarativeEngineDebug *client)
{ {
m_client = client; m_client = client;
} }
...@@ -113,7 +113,7 @@ void ExpressionQueryWidget::appendPrompt() ...@@ -113,7 +113,7 @@ void ExpressionQueryWidget::appendPrompt()
} }
} }
void ExpressionQueryWidget::setCurrentObject(const QmlDebugObjectReference &obj) void ExpressionQueryWidget::setCurrentObject(const QDeclarativeDebugObjectReference &obj)
{ {
m_currObject = obj; m_currObject = obj;
updateTitle(); updateTitle();
...@@ -161,7 +161,7 @@ void ExpressionQueryWidget::executeExpression() ...@@ -161,7 +161,7 @@ void ExpressionQueryWidget::executeExpression()
if (!m_query->isWaiting()) if (!m_query->isWaiting())
showResult(); showResult();
else else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)), QObject::connect(m_query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(showResult())); this, SLOT(showResult()));
m_lastExpr = m_expr; m_lastExpr = m_expr;
......
src/plugins/qmlinspector/components/expressionquerywidget.h
+ 8
− 8
View file @ 4ee19843
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef EXPRESSIONQUERYWIDGET_H #ifndef EXPRESSIONQUERYWIDGET_H
#define EXPRESSIONQUERYWIDGET_H #define EXPRESSIONQUERYWIDGET_H
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <QtGui/qwidget.h> #include <QtGui/qwidget.h>
...@@ -50,16 +50,16 @@ public: ...@@ -50,16 +50,16 @@ public:
ShellMode ShellMode
}; };
ExpressionQueryWidget(Mode mode = SeparateEntryMode, QmlEngineDebug *client = 0, QWidget *parent = 0); ExpressionQueryWidget(Mode mode = SeparateEntryMode, QDeclarativeEngineDebug *client = 0, QWidget *parent = 0);
void setEngineDebug(QmlEngineDebug *client); void setEngineDebug(QDeclarativeEngineDebug *client);
void clear(); void clear();
protected: protected:
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event);
public slots: public slots:
void setCurrentObject(const QmlDebugObjectReference &obj); void setCurrentObject(const QDeclarativeDebugObjectReference &obj);
private slots: private slots:
void executeExpression(); void executeExpression();
...@@ -73,8 +73,8 @@ private: ...@@ -73,8 +73,8 @@ private:
Mode m_mode; Mode m_mode;
QmlEngineDebug *m_client; QDeclarativeEngineDebug *m_client;
QmlDebugExpressionQuery *m_query; QDeclarativeDebugExpressionQuery *m_query;
QTextEdit *m_textEdit; QTextEdit *m_textEdit;
QLineEdit *m_lineEdit; QLineEdit *m_lineEdit;
QPushButton *m_button; QPushButton *m_button;
...@@ -84,8 +84,8 @@ private: ...@@ -84,8 +84,8 @@ private:
QString m_title; QString m_title;
QmlDebugObjectReference m_currObject; QDeclarativeDebugObjectReference m_currObject;
QmlDebugObjectReference m_objectAtLastFocus; QDeclarativeDebugObjectReference m_objectAtLastFocus;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE
......
src/plugins/qmlinspector/components/objectpropertiesview.cpp
+ 23
− 23
View file @ 4ee19843
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
**************************************************************************/ **************************************************************************/
#include "objectpropertiesview.h" #include "objectpropertiesview.h"
#include <private/qmldebugservice_p.h> #include <private/qdeclarativedebugservice_p.h>
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <private/qmldebugclient_p.h> #include <private/qdeclarativedebugclient_p.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
PropertiesViewItem(QTreeWidget *widget, Type type = OtherType); PropertiesViewItem(QTreeWidget *widget, Type type = OtherType);
PropertiesViewItem(QTreeWidgetItem *parent, Type type = OtherType); PropertiesViewItem(QTreeWidgetItem *parent, Type type = OtherType);
QmlDebugPropertyReference property; QDeclarativeDebugPropertyReference property;
Type type; Type type;
}; };
...@@ -67,7 +67,7 @@ PropertiesViewItem::PropertiesViewItem(QTreeWidgetItem *parent, Type type) ...@@ -67,7 +67,7 @@ PropertiesViewItem::PropertiesViewItem(QTreeWidgetItem *parent, Type type)
{ {
} }
ObjectPropertiesView::ObjectPropertiesView(QmlEngineDebug *client, QWidget *parent) ObjectPropertiesView::ObjectPropertiesView(QDeclarativeEngineDebug *client, QWidget *parent)
: QWidget(parent), : QWidget(parent),
m_client(client), m_client(client),
m_query(0), m_query(0),
...@@ -92,17 +92,17 @@ ObjectPropertiesView::ObjectPropertiesView(QmlEngineDebug *client, QWidget *pare ...@@ -92,17 +92,17 @@ ObjectPropertiesView::ObjectPropertiesView(QmlEngineDebug *client, QWidget *pare
layout->addWidget(m_tree); layout->addWidget(m_tree);
} }
void ObjectPropertiesView::setEngineDebug(QmlEngineDebug *client) void ObjectPropertiesView::setEngineDebug(QDeclarativeEngineDebug *client)
{ {
m_client = client; m_client = client;
} }
void ObjectPropertiesView::clear() void ObjectPropertiesView::clear()
{ {
setObject(QmlDebugObjectReference()); setObject(QDeclarativeDebugObjectReference());
} }
void ObjectPropertiesView::reload(const QmlDebugObjectReference &obj) void ObjectPropertiesView::reload(const QDeclarativeDebugObjectReference &obj)
{ {
if (!m_client) if (!m_client)
return; return;
...@@ -113,7 +113,7 @@ void ObjectPropertiesView::reload(const QmlDebugObjectReference &obj) ...@@ -113,7 +113,7 @@ void ObjectPropertiesView::reload(const QmlDebugObjectReference &obj)
if (!m_query->isWaiting()) if (!m_query->isWaiting())
queryFinished(); queryFinished();
else else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)), QObject::connect(m_query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(queryFinished())); this, SLOT(queryFinished()));
} }
...@@ -122,10 +122,10 @@ void ObjectPropertiesView::queryFinished() ...@@ -122,10 +122,10 @@ void ObjectPropertiesView::queryFinished()
if (!m_client || !m_query) if (!m_client || !m_query)
return; return;
QmlDebugObjectReference obj = m_query->object(); QDeclarativeDebugObjectReference obj = m_query->object();
QmlDebugWatch *watch = m_client->addWatch(obj, this); QDeclarativeDebugWatch *watch = m_client->addWatch(obj, this);
if (watch->state() == QmlDebugWatch::Dead) { if (watch->state() == QDeclarativeDebugWatch::Dead) {
delete watch; delete watch;
watch = 0; watch = 0;
} else { } else {
...@@ -180,14 +180,14 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar ...@@ -180,14 +180,14 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar
} }
} }
void ObjectPropertiesView::setObject(const QmlDebugObjectReference &object) void ObjectPropertiesView::setObject(const QDeclarativeDebugObjectReference &object)
{ {
m_object = object; m_object = object;
m_tree->clear(); m_tree->clear();
QList<QmlDebugPropertyReference> properties = object.properties(); QList<QDeclarativeDebugPropertyReference> properties = object.properties();
for (int i=0; i<properties.count(); ++i) { for (int i=0; i<properties.count(); ++i) {
const QmlDebugPropertyReference &p = properties[i]; const QDeclarativeDebugPropertyReference &p = properties[i];
PropertiesViewItem *item = new PropertiesViewItem(m_tree); PropertiesViewItem *item = new PropertiesViewItem(m_tree);
item->property = p; item->property = p;
...@@ -208,23 +208,23 @@ void ObjectPropertiesView::setObject(const QmlDebugObjectReference &object) ...@@ -208,23 +208,23 @@ void ObjectPropertiesView::setObject(const QmlDebugObjectReference &object)
} }
} }
void ObjectPropertiesView::watchCreated(QmlDebugWatch *watch) void ObjectPropertiesView::watchCreated(QDeclarativeDebugWatch *watch)
{ {
if (watch->objectDebugId() == m_object.debugId() if (watch->objectDebugId() == m_object.debugId()
&& qobject_cast<QmlDebugPropertyWatch*>(watch)) { && qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)) {
connect(watch, SIGNAL(stateChanged(QmlDebugWatch::State)), SLOT(watchStateChanged())); connect(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State)), SLOT(watchStateChanged()));
setWatched(qobject_cast<QmlDebugPropertyWatch*>(watch)->name(), true); setWatched(qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)->name(), true);
} }
} }
void ObjectPropertiesView::watchStateChanged() void ObjectPropertiesView::watchStateChanged()
{ {
QmlDebugWatch *watch = qobject_cast<QmlDebugWatch*>(sender()); QDeclarativeDebugWatch *watch = qobject_cast<QDeclarativeDebugWatch*>(sender());
if (watch->objectDebugId() == m_object.debugId() if (watch->objectDebugId() == m_object.debugId()
&& qobject_cast<QmlDebugPropertyWatch*>(watch) && qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)
&& watch->state() == QmlDebugWatch::Inactive) { && watch->state() == QDeclarativeDebugWatch::Inactive) {
setWatched(qobject_cast<QmlDebugPropertyWatch*>(watch)->name(), false); setWatched(qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)->name(), false);
} }
} }
......
src/plugins/qmlinspector/components/objectpropertiesview.h
+ 12
− 12
View file @ 4ee19843
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef PROPERTIESTABLEMODEL_H #ifndef PROPERTIESTABLEMODEL_H
#define PROPERTIESTABLEMODEL_H #define PROPERTIESTABLEMODEL_H
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <QtGui/qwidget.h> #include <QtGui/qwidget.h>
...@@ -37,24 +37,24 @@ QT_BEGIN_NAMESPACE ...@@ -37,24 +37,24 @@ QT_BEGIN_NAMESPACE
class QTreeWidget; class QTreeWidget;
class QTreeWidgetItem; class QTreeWidgetItem;
class QmlDebugConnection; class QDeclarativeDebugConnection;
class PropertiesViewItem; class PropertiesViewItem;
class ObjectPropertiesView : public QWidget class ObjectPropertiesView : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
ObjectPropertiesView(QmlEngineDebug *client = 0, QWidget *parent = 0); ObjectPropertiesView(QDeclarativeEngineDebug *client = 0, QWidget *parent = 0);
void setEngineDebug(QmlEngineDebug *client); void setEngineDebug(QDeclarativeEngineDebug *client);
void clear(); void clear();
signals: signals:
void activated(const QmlDebugObjectReference &, const QmlDebugPropertyReference &); void activated(const QDeclarativeDebugObjectReference &, const QDeclarativeDebugPropertyReference &);
public slots: public slots:
void reload(const QmlDebugObjectReference &); void reload(const QDeclarativeDebugObjectReference &);
void watchCreated(QmlDebugWatch *); void watchCreated(QDeclarativeDebugWatch *);
private slots: private slots:
void queryFinished(); void queryFinished();
...@@ -63,16 +63,16 @@ private slots: ...@@ -63,16 +63,16 @@ private slots:
void itemActivated(QTreeWidgetItem *i); void itemActivated(QTreeWidgetItem *i);
private: private:
void setObject(const QmlDebugObjectReference &object); void setObject(const QDeclarativeDebugObjectReference &object);
void setWatched(const QString &property, bool watched); void setWatched(const QString &property, bool watched);
void setPropertyValue(PropertiesViewItem *item, const QVariant &value, bool makeGray); void setPropertyValue(PropertiesViewItem *item, const QVariant &value, bool makeGray);
QmlEngineDebug *m_client; QDeclarativeEngineDebug *m_client;
QmlDebugObjectQuery *m_query; QDeclarativeDebugObjectQuery *m_query;
QmlDebugWatch *m_watch; QDeclarativeDebugWatch *m_watch;
QTreeWidget *m_tree; QTreeWidget *m_tree;
QmlDebugObjectReference m_object; QDeclarativeDebugObjectReference m_object;
}; };
......
src/plugins/qmlinspector/components/objecttree.cpp
+ 18
− 18
View file @ 4ee19843
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
#include <QInputDialog> #include <QInputDialog>
#include <private/qmldebugservice_p.h> #include <private/qdeclarativedebugservice_p.h>
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <private/qmldebugclient_p.h> #include <private/qdeclarativedebugclient_p.h>
#include "objecttree.h" #include "objecttree.h"
//Q_DECLARE_METATYPE(QmlDebugObjectReference) //Q_DECLARE_METATYPE(QDeclarativeDebugObjectReference)
ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent) ObjectTree::ObjectTree(QDeclarativeEngineDebug *client, QWidget *parent)
: QTreeWidget(parent), : QTreeWidget(parent),
m_client(client), m_client(client),
m_query(0) m_query(0)
...@@ -55,7 +55,7 @@ ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent) ...@@ -55,7 +55,7 @@ ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent)
SLOT(activated(QTreeWidgetItem *))); SLOT(activated(QTreeWidgetItem *)));
} }
void ObjectTree::setEngineDebug(QmlEngineDebug *client) void ObjectTree::setEngineDebug(QDeclarativeEngineDebug *client)
{ {
m_client = client; m_client = client;
} }
...@@ -70,11 +70,11 @@ void ObjectTree::reload(int objectDebugId) ...@@ -70,11 +70,11 @@ void ObjectTree::reload(int objectDebugId)
m_query = 0; m_query = 0;
} }
m_query = m_client->queryObjectRecursive(QmlDebugObjectReference(objectDebugId), this); m_query = m_client->queryObjectRecursive(QDeclarativeDebugObjectReference(objectDebugId), this);
if (!m_query->isWaiting()) if (!m_query->isWaiting())
objectFetched(); objectFetched();
else else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)), QObject::connect(m_query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(objectFetched())); this, SLOT(objectFetched()));
} }
...@@ -103,7 +103,7 @@ void ObjectTree::currentItemChanged(QTreeWidgetItem *item) ...@@ -103,7 +103,7 @@ void ObjectTree::currentItemChanged(QTreeWidgetItem *item)
if (!item) if (!item)
return; return;
QmlDebugObjectReference obj = item->data(0, Qt::UserRole).value<QmlDebugObjectReference>(); QDeclarativeDebugObjectReference obj = item->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>();
if (obj.debugId() >= 0) if (obj.debugId() >= 0)
emit currentObjectChanged(obj); emit currentObjectChanged(obj);
} }
...@@ -113,12 +113,12 @@ void ObjectTree::activated(QTreeWidgetItem *item) ...@@ -113,12 +113,12 @@ void ObjectTree::activated(QTreeWidgetItem *item)
if (!item) if (!item)
return; return;
QmlDebugObjectReference obj = item->data(0, Qt::UserRole).value<QmlDebugObjectReference>(); QDeclarativeDebugObjectReference obj = item->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>();
if (obj.debugId() >= 0) if (obj.debugId() >= 0)
emit activated(obj); emit activated(obj);
} }
void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *parent) void ObjectTree::buildTree(const QDeclarativeDebugObjectReference &obj, QTreeWidgetItem *parent)
{ {
if (!parent) if (!parent)
clear(); clear();
...@@ -129,8 +129,8 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem * ...@@ -129,8 +129,8 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *
if (parent && obj.contextDebugId() >= 0 if (parent && obj.contextDebugId() >= 0
&& obj.contextDebugId() != parent->data(0, Qt::UserRole && obj.contextDebugId() != parent->data(0, Qt::UserRole
).value<QmlDebugObjectReference>().contextDebugId()) { ).value<QDeclarativeDebugObjectReference>().contextDebugId()) {
QmlDebugFileReference source = obj.source(); QDeclarativeDebugFileReference source = obj.source();
if (!source.url().isEmpty()) { if (!source.url().isEmpty()) {
QString toolTipString = QLatin1String("URL: ") + source.url().toString(); QString toolTipString = QLatin1String("URL: ") + source.url().toString();
item->setToolTip(0, toolTipString); item->setToolTip(0, toolTipString);
...@@ -147,7 +147,7 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem * ...@@ -147,7 +147,7 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *
buildTree(obj.children().at(ii), item); buildTree(obj.children().at(ii), item);
} }
void ObjectTree::dump(const QmlDebugContextReference &ctxt, int ind) void ObjectTree::dump(const QDeclarativeDebugContextReference &ctxt, int ind)
{ {
QByteArray indent(ind * 4, ' '); QByteArray indent(ind * 4, ' ');
qWarning().nospace() << indent.constData() << ctxt.debugId() << " " qWarning().nospace() << indent.constData() << ctxt.debugId() << " "
...@@ -160,7 +160,7 @@ void ObjectTree::dump(const QmlDebugContextReference &ctxt, int ind) ...@@ -160,7 +160,7 @@ void ObjectTree::dump(const QmlDebugContextReference &ctxt, int ind)
dump(ctxt.objects().at(ii), ind); dump(ctxt.objects().at(ii), ind);
} }
void ObjectTree::dump(const QmlDebugObjectReference &obj, int ind) void ObjectTree::dump(const QDeclarativeDebugObjectReference &obj, int ind)
{ {
QByteArray indent(ind * 4, ' '); QByteArray indent(ind * 4, ' ');
qWarning().nospace() << indent.constData() << qPrintable(obj.className()) qWarning().nospace() << indent.constData() << qPrintable(obj.className())
...@@ -184,7 +184,7 @@ QTreeWidgetItem *ObjectTree::findItemByObjectId(int debugId) const ...@@ -184,7 +184,7 @@ QTreeWidgetItem *ObjectTree::findItemByObjectId(int debugId) const
QTreeWidgetItem *ObjectTree::findItem(QTreeWidgetItem *item, int debugId) const QTreeWidgetItem *ObjectTree::findItem(QTreeWidgetItem *item, int debugId) const
{ {
if (item->data(0, Qt::UserRole).value<QmlDebugObjectReference>().debugId() == debugId) if (item->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>().debugId() == debugId)
return item; return item;
QTreeWidgetItem *child; QTreeWidgetItem *child;
...@@ -206,8 +206,8 @@ void ObjectTree::mousePressEvent(QMouseEvent *me) ...@@ -206,8 +206,8 @@ void ObjectTree::mousePressEvent(QMouseEvent *me)
QAction action(tr("Add watch..."), 0); QAction action(tr("Add watch..."), 0);
QList<QAction *> actions; QList<QAction *> actions;
actions << &action; actions << &action;
QmlDebugObjectReference obj = QDeclarativeDebugObjectReference obj =
currentItem()->data(0, Qt::UserRole).value<QmlDebugObjectReference>(); currentItem()->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>();
if (QMenu::exec(actions, me->globalPos())) { if (QMenu::exec(actions, me->globalPos())) {
bool ok = false; bool ok = false;
QString watch = QInputDialog::getText(this, tr("Watch expression"), QString watch = QInputDialog::getText(this, tr("Watch expression"),
......
src/plugins/qmlinspector/components/objecttree.h
+ 15
− 15
View file @ 4ee19843
...@@ -35,25 +35,25 @@ QT_BEGIN_NAMESPACE ...@@ -35,25 +35,25 @@ QT_BEGIN_NAMESPACE
class QTreeWidgetItem; class QTreeWidgetItem;
class QmlEngineDebug; class QDeclarativeEngineDebug;
class QmlDebugObjectReference; class QDeclarativeDebugObjectReference;
class QmlDebugObjectQuery; class QDeclarativeDebugObjectQuery;
class QmlDebugContextReference; class QDeclarativeDebugContextReference;
class QmlDebugConnection; class QDeclarativeDebugConnection;
class ObjectTree : public QTreeWidget class ObjectTree : public QTreeWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
ObjectTree(QmlEngineDebug *client = 0, QWidget *parent = 0); ObjectTree(QDeclarativeEngineDebug *client = 0, QWidget *parent = 0);
void setEngineDebug(QmlEngineDebug *client); void setEngineDebug(QDeclarativeEngineDebug *client);
signals: signals:
void currentObjectChanged(const QmlDebugObjectReference &); void currentObjectChanged(const QDeclarativeDebugObjectReference &);
void activated(const QmlDebugObjectReference &); void activated(const QDeclarativeDebugObjectReference &);
void expressionWatchRequested(const QmlDebugObjectReference &, const QString &); void expressionWatchRequested(const QDeclarativeDebugObjectReference &, const QString &);
public slots: public slots:
void reload(int objectDebugId); // set the root object void reload(int objectDebugId); // set the root object
...@@ -70,12 +70,12 @@ private slots: ...@@ -70,12 +70,12 @@ private slots:
private: private:
QTreeWidgetItem *findItemByObjectId(int debugId) const; QTreeWidgetItem *findItemByObjectId(int debugId) const;
QTreeWidgetItem *findItem(QTreeWidgetItem *item, int debugId) const; QTreeWidgetItem *findItem(QTreeWidgetItem *item, int debugId) const;
void dump(const QmlDebugContextReference &, int); void dump(const QDeclarativeDebugContextReference &, int);
void dump(const QmlDebugObjectReference &, int); void dump(const QDeclarativeDebugObjectReference &, int);
void buildTree(const QmlDebugObjectReference &, QTreeWidgetItem *parent); void buildTree(const QDeclarativeDebugObjectReference &, QTreeWidgetItem *parent);
QmlEngineDebug *m_client; QDeclarativeEngineDebug *m_client;
QmlDebugObjectQuery *m_query; QDeclarativeDebugObjectQuery *m_query;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE
......
src/plugins/qmlinspector/components/watchtable.cpp
+ 28
− 28
View file @ 4ee19843
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
#include <QtGui/qaction.h> #include <QtGui/qaction.h>
#include <QtGui/qmenu.h> #include <QtGui/qmenu.h>
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <QtDeclarative/qmlmetatype.h> #include <QtDeclarative/private/qdeclarativemetatype_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
WatchTableModel::WatchTableModel(QmlEngineDebug *client, QObject *parent) WatchTableModel::WatchTableModel(QDeclarativeEngineDebug *client, QObject *parent)
: QAbstractTableModel(parent), : QAbstractTableModel(parent),
m_client(client) m_client(client)
{ {
...@@ -51,21 +51,21 @@ WatchTableModel::~WatchTableModel() ...@@ -51,21 +51,21 @@ WatchTableModel::~WatchTableModel()
delete m_columns[i].watch; delete m_columns[i].watch;
} }
void WatchTableModel::setEngineDebug(QmlEngineDebug *client) void WatchTableModel::setEngineDebug(QDeclarativeEngineDebug *client)
{ {
m_client = client; m_client = client;
} }
void WatchTableModel::addWatch(QmlDebugWatch *watch, const QString &title) void WatchTableModel::addWatch(QDeclarativeDebugWatch *watch, const QString &title)
{ {
QString property; QString property;
if (qobject_cast<QmlDebugPropertyWatch *>(watch)) if (qobject_cast<QDeclarativeDebugPropertyWatch *>(watch))
property = qobject_cast<QmlDebugPropertyWatch *>(watch)->name(); property = qobject_cast<QDeclarativeDebugPropertyWatch *>(watch)->name();
connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)), connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
SLOT(watchedValueChanged(QByteArray,QVariant))); SLOT(watchedValueChanged(QByteArray,QVariant)));
connect(watch, SIGNAL(stateChanged(QmlDebugWatch::State)), SLOT(watchStateChanged())); connect(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State)), SLOT(watchStateChanged()));
int col = columnCount(QModelIndex()); int col = columnCount(QModelIndex());
beginInsertColumns(QModelIndex(), col, col); beginInsertColumns(QModelIndex(), col, col);
...@@ -80,7 +80,7 @@ void WatchTableModel::addWatch(QmlDebugWatch *watch, const QString &title) ...@@ -80,7 +80,7 @@ void WatchTableModel::addWatch(QmlDebugWatch *watch, const QString &title)
endInsertColumns(); endInsertColumns();
} }
void WatchTableModel::removeWatch(QmlDebugWatch *watch) void WatchTableModel::removeWatch(QDeclarativeDebugWatch *watch)
{ {
int column = columnForWatch(watch); int column = columnForWatch(watch);
if (column == -1) if (column == -1)
...@@ -101,7 +101,7 @@ void WatchTableModel::removeWatch(QmlDebugWatch *watch) ...@@ -101,7 +101,7 @@ void WatchTableModel::removeWatch(QmlDebugWatch *watch)
reset(); reset();
} }
void WatchTableModel::updateWatch(QmlDebugWatch *watch, const QVariant &value) void WatchTableModel::updateWatch(QDeclarativeDebugWatch *watch, const QVariant &value)
{ {
int column = columnForWatch(watch); int column = columnForWatch(watch);
if (column == -1) if (column == -1)
...@@ -115,14 +115,14 @@ void WatchTableModel::updateWatch(QmlDebugWatch *watch, const QVariant &value) ...@@ -115,14 +115,14 @@ void WatchTableModel::updateWatch(QmlDebugWatch *watch, const QVariant &value)
} }
} }
QmlDebugWatch *WatchTableModel::findWatch(int column) const QDeclarativeDebugWatch *WatchTableModel::findWatch(int column) const
{ {
if (column < m_columns.count()) if (column < m_columns.count())
return m_columns.at(column).watch; return m_columns.at(column).watch;
return 0; return 0;
} }
QmlDebugWatch *WatchTableModel::findWatch(int objectDebugId, const QString &property) const QDeclarativeDebugWatch *WatchTableModel::findWatch(int objectDebugId, const QString &property) const
{ {
for (int i=0; i<m_columns.count(); ++i) { for (int i=0; i<m_columns.count(); ++i) {
if (m_columns[i].watch->objectDebugId() == objectDebugId if (m_columns[i].watch->objectDebugId() == objectDebugId
...@@ -162,8 +162,8 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const ...@@ -162,8 +162,8 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const
const QVariant &value = m_values.at(idx.row()).variant; const QVariant &value = m_values.at(idx.row()).variant;
QString str = value.toString(); QString str = value.toString();
if (str.isEmpty() && QmlMetaType::isQObject(value.userType())) { if (str.isEmpty() && QDeclarativeMetaType::isQObject(value.userType())) {
QObject *o = QmlMetaType::toQObject(value); QObject *o = QDeclarativeMetaType::toQObject(value);
if(o) { if(o) {
QString objectName = o->objectName(); QString objectName = o->objectName();
if(objectName.isEmpty()) if(objectName.isEmpty())
...@@ -193,15 +193,15 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const ...@@ -193,15 +193,15 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const
void WatchTableModel::watchStateChanged() void WatchTableModel::watchStateChanged()
{ {
QmlDebugWatch *watch = qobject_cast<QmlDebugWatch*>(sender()); QDeclarativeDebugWatch *watch = qobject_cast<QDeclarativeDebugWatch*>(sender());
if (watch && watch->state() == QmlDebugWatch::Inactive) { if (watch && watch->state() == QDeclarativeDebugWatch::Inactive) {
removeWatch(watch); removeWatch(watch);
watch->deleteLater(); watch->deleteLater();
} }
} }
int WatchTableModel::columnForWatch(QmlDebugWatch *watch) const int WatchTableModel::columnForWatch(QDeclarativeDebugWatch *watch) const
{ {
for (int i=0; i<m_columns.count(); ++i) { for (int i=0; i<m_columns.count(); ++i) {
if (m_columns.at(i).watch == watch) if (m_columns.at(i).watch == watch)
...@@ -224,12 +224,12 @@ void WatchTableModel::addValue(int column, const QVariant &value) ...@@ -224,12 +224,12 @@ void WatchTableModel::addValue(int column, const QVariant &value)
endInsertRows(); endInsertRows();
} }
void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object, const QmlDebugPropertyReference &property) void WatchTableModel::togglePropertyWatch(const QDeclarativeDebugObjectReference &object, const QDeclarativeDebugPropertyReference &property)
{ {
if (!m_client || !property.hasNotifySignal()) if (!m_client || !property.hasNotifySignal())
return; return;
QmlDebugWatch *watch = findWatch(object.debugId(), property.name()); QDeclarativeDebugWatch *watch = findWatch(object.debugId(), property.name());
if (watch) { if (watch) {
// watch will be deleted in watchStateChanged() // watch will be deleted in watchStateChanged()
m_client->removeWatch(watch); m_client->removeWatch(watch);
...@@ -237,7 +237,7 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object, ...@@ -237,7 +237,7 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object,
} }
watch = m_client->addWatch(property, this); watch = m_client->addWatch(property, this);
if (watch->state() == QmlDebugWatch::Dead) { if (watch->state() == QDeclarativeDebugWatch::Dead) {
delete watch; delete watch;
watch = 0; watch = 0;
} else { } else {
...@@ -254,19 +254,19 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object, ...@@ -254,19 +254,19 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object,
void WatchTableModel::watchedValueChanged(const QByteArray &propertyName, const QVariant &value) void WatchTableModel::watchedValueChanged(const QByteArray &propertyName, const QVariant &value)
{ {
Q_UNUSED(propertyName); Q_UNUSED(propertyName);
QmlDebugWatch *watch = qobject_cast<QmlDebugWatch*>(sender()); QDeclarativeDebugWatch *watch = qobject_cast<QDeclarativeDebugWatch*>(sender());
if (watch) if (watch)
updateWatch(watch, value); updateWatch(watch, value);
} }
void WatchTableModel::expressionWatchRequested(const QmlDebugObjectReference &obj, const QString &expr) void WatchTableModel::expressionWatchRequested(const QDeclarativeDebugObjectReference &obj, const QString &expr)
{ {
if (!m_client) if (!m_client)
return; return;
QmlDebugWatch *watch = m_client->addWatch(obj, expr, this); QDeclarativeDebugWatch *watch = m_client->addWatch(obj, expr, this);
if (watch->state() == QmlDebugWatch::Dead) { if (watch->state() == QDeclarativeDebugWatch::Dead) {
delete watch; delete watch;
watch = 0; watch = 0;
} else { } else {
...@@ -280,7 +280,7 @@ void WatchTableModel::removeWatchAt(int column) ...@@ -280,7 +280,7 @@ void WatchTableModel::removeWatchAt(int column)
if (!m_client) if (!m_client)
return; return;
QmlDebugWatch *watch = findWatch(column); QDeclarativeDebugWatch *watch = findWatch(column);
if (watch) { if (watch) {
m_client->removeWatch(watch); m_client->removeWatch(watch);
delete watch; delete watch;
...@@ -334,18 +334,18 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent) ...@@ -334,18 +334,18 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent)
m_model(model) m_model(model)
{ {
setAlternatingRowColors(true); setAlternatingRowColors(true);
connect(model, SIGNAL(watchCreated(QmlDebugWatch*)), SLOT(watchCreated(QmlDebugWatch*))); connect(model, SIGNAL(watchCreated(QDeclarativeDebugWatch*)), SLOT(watchCreated(QDeclarativeDebugWatch*)));
connect(this, SIGNAL(activated(QModelIndex)), SLOT(indexActivated(QModelIndex))); connect(this, SIGNAL(activated(QModelIndex)), SLOT(indexActivated(QModelIndex)));
} }
void WatchTableView::indexActivated(const QModelIndex &index) void WatchTableView::indexActivated(const QModelIndex &index)
{ {
QmlDebugWatch *watch = m_model->findWatch(index.column()); QDeclarativeDebugWatch *watch = m_model->findWatch(index.column());
if (watch) if (watch)
emit objectActivated(watch->objectDebugId()); emit objectActivated(watch->objectDebugId());
} }
void WatchTableView::watchCreated(QmlDebugWatch *watch) void WatchTableView::watchCreated(QDeclarativeDebugWatch *watch)
{ {
int column = m_model->columnForWatch(watch); int column = m_model->columnForWatch(watch);
resizeColumnToContents(column); resizeColumnToContents(column);
......
src/plugins/qmlinspector/components/watchtable.h
+ 19
− 19
View file @ 4ee19843
...@@ -39,23 +39,23 @@ ...@@ -39,23 +39,23 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QmlDebugWatch; class QDeclarativeDebugWatch;
class QmlEngineDebug; class QDeclarativeEngineDebug;
class QmlDebugConnection; class QDeclarativeDebugConnection;
class QmlDebugPropertyReference; class QDeclarativeDebugPropertyReference;
class QmlDebugObjectReference; class QDeclarativeDebugObjectReference;
class WatchTableModel : public QAbstractTableModel class WatchTableModel : public QAbstractTableModel
{ {
Q_OBJECT Q_OBJECT
public: public:
WatchTableModel(QmlEngineDebug *client = 0, QObject *parent = 0); WatchTableModel(QDeclarativeEngineDebug *client = 0, QObject *parent = 0);
~WatchTableModel(); ~WatchTableModel();
void setEngineDebug(QmlEngineDebug *client); void setEngineDebug(QDeclarativeEngineDebug *client);
QmlDebugWatch *findWatch(int column) const; QDeclarativeDebugWatch *findWatch(int column) const;
int columnForWatch(QmlDebugWatch *watch) const; int columnForWatch(QDeclarativeDebugWatch *watch) const;
void removeWatchAt(int column); void removeWatchAt(int column);
void removeAllWatches(); void removeAllWatches();
...@@ -66,22 +66,22 @@ public: ...@@ -66,22 +66,22 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
signals: signals:
void watchCreated(QmlDebugWatch *watch); void watchCreated(QDeclarativeDebugWatch *watch);
public slots: public slots:
void togglePropertyWatch(const QmlDebugObjectReference &obj, const QmlDebugPropertyReference &prop); void togglePropertyWatch(const QDeclarativeDebugObjectReference &obj, const QDeclarativeDebugPropertyReference &prop);
void expressionWatchRequested(const QmlDebugObjectReference &, const QString &); void expressionWatchRequested(const QDeclarativeDebugObjectReference &, const QString &);
private slots: private slots:
void watchStateChanged(); void watchStateChanged();
void watchedValueChanged(const QByteArray &propertyName, const QVariant &value); void watchedValueChanged(const QByteArray &propertyName, const QVariant &value);
private: private:
void addWatch(QmlDebugWatch *watch, const QString &title); void addWatch(QDeclarativeDebugWatch *watch, const QString &title);
void removeWatch(QmlDebugWatch *watch); void removeWatch(QDeclarativeDebugWatch *watch);
void updateWatch(QmlDebugWatch *watch, const QVariant &value); void updateWatch(QDeclarativeDebugWatch *watch, const QVariant &value);
QmlDebugWatch *findWatch(int objectDebugId, const QString &property) const; QDeclarativeDebugWatch *findWatch(int objectDebugId, const QString &property) const;
void addValue(int column, const QVariant &value); void addValue(int column, const QVariant &value);
...@@ -90,7 +90,7 @@ private: ...@@ -90,7 +90,7 @@ private:
QString title; QString title;
bool hasFirstValue; bool hasFirstValue;
QString property; QString property;
QPointer<QmlDebugWatch> watch; QPointer<QDeclarativeDebugWatch> watch;
}; };
struct Value { struct Value {
...@@ -99,7 +99,7 @@ private: ...@@ -99,7 +99,7 @@ private:
bool first; bool first;
}; };
QmlEngineDebug *m_client; QDeclarativeEngineDebug *m_client;
QList<WatchedEntity> m_columns; QList<WatchedEntity> m_columns;
QList<Value> m_values; QList<Value> m_values;
}; };
...@@ -130,7 +130,7 @@ signals: ...@@ -130,7 +130,7 @@ signals:
private slots: private slots:
void indexActivated(const QModelIndex &index); void indexActivated(const QModelIndex &index);
void watchCreated(QmlDebugWatch *watch); void watchCreated(QDeclarativeDebugWatch *watch);
private: private:
WatchTableModel *m_model; WatchTableModel *m_model;
......
src/plugins/qmlinspector/qmlinspector.cpp
+ 23
− 23
View file @ 4ee19843
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "components/canvasframerate.h" #include "components/canvasframerate.h"
#include "components/expressionquerywidget.h" #include "components/expressionquerywidget.h"
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <private/qmldebugclient_p.h> #include <private/qdeclarativedebugclient_p.h>
#include <utils/styledbar.h> #include <utils/styledbar.h>
#include <utils/fancymainwindow.h> #include <utils/fancymainwindow.h>
...@@ -203,7 +203,7 @@ bool QmlInspector::connectToViewer() ...@@ -203,7 +203,7 @@ bool QmlInspector::connectToViewer()
QString host = config->debugServerAddress(); QString host = config->debugServerAddress();
quint16 port = quint16(config->debugServerPort()); quint16 port = quint16(config->debugServerPort());
m_conn = new QmlDebugConnection(this); m_conn = new QDeclarativeDebugConnection(this);
connect(m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)), connect(m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
SLOT(connectionStateChanged())); SLOT(connectionStateChanged()));
connect(m_conn, SIGNAL(error(QAbstractSocket::SocketError)), connect(m_conn, SIGNAL(error(QAbstractSocket::SocketError)),
...@@ -247,7 +247,7 @@ void QmlInspector::connectionStateChanged() ...@@ -247,7 +247,7 @@ void QmlInspector::connectionStateChanged()
emit statusMessage(tr("[Inspector] connected.\n")); emit statusMessage(tr("[Inspector] connected.\n"));
if (!m_client) { if (!m_client) {
m_client = new QmlEngineDebug(m_conn, this); m_client = new QDeclarativeEngineDebug(m_conn, this);
m_objectTreeWidget->setEngineDebug(m_client); m_objectTreeWidget->setEngineDebug(m_client);
m_propertiesWidget->setEngineDebug(m_client); m_propertiesWidget->setEngineDebug(m_client);
m_watchTableModel->setEngineDebug(m_client); m_watchTableModel->setEngineDebug(m_client);
...@@ -313,20 +313,20 @@ void QmlInspector::initWidgets() ...@@ -313,20 +313,20 @@ void QmlInspector::initWidgets()
WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel); WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel);
m_watchTableView->setHorizontalHeader(header); m_watchTableView->setHorizontalHeader(header);
connect(m_objectTreeWidget, SIGNAL(activated(QmlDebugObjectReference)), connect(m_objectTreeWidget, SIGNAL(activated(QDeclarativeDebugObjectReference)),
this, SLOT(treeObjectActivated(QmlDebugObjectReference))); this, SLOT(treeObjectActivated(QDeclarativeDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QmlDebugObjectReference)), connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QDeclarativeDebugObjectReference)),
m_propertiesWidget, SLOT(reload(QmlDebugObjectReference))); m_propertiesWidget, SLOT(reload(QDeclarativeDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(expressionWatchRequested(QmlDebugObjectReference,QString)), connect(m_objectTreeWidget, SIGNAL(expressionWatchRequested(QDeclarativeDebugObjectReference,QString)),
m_watchTableModel, SLOT(expressionWatchRequested(QmlDebugObjectReference,QString))); m_watchTableModel, SLOT(expressionWatchRequested(QDeclarativeDebugObjectReference,QString)));
connect(m_propertiesWidget, SIGNAL(activated(QmlDebugObjectReference,QmlDebugPropertyReference)), connect(m_propertiesWidget, SIGNAL(activated(QDeclarativeDebugObjectReference,QDeclarativeDebugPropertyReference)),
m_watchTableModel, SLOT(togglePropertyWatch(QmlDebugObjectReference,QmlDebugPropertyReference))); m_watchTableModel, SLOT(togglePropertyWatch(QDeclarativeDebugObjectReference,QDeclarativeDebugPropertyReference)));
connect(m_watchTableModel, SIGNAL(watchCreated(QmlDebugWatch*)), connect(m_watchTableModel, SIGNAL(watchCreated(QDeclarativeDebugWatch*)),
m_propertiesWidget, SLOT(watchCreated(QmlDebugWatch*))); m_propertiesWidget, SLOT(watchCreated(QDeclarativeDebugWatch*)));
connect(m_watchTableModel, SIGNAL(rowsInserted(QModelIndex,int,int)), connect(m_watchTableModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
m_watchTableView, SLOT(scrollToBottom())); m_watchTableView, SLOT(scrollToBottom()));
...@@ -334,8 +334,8 @@ void QmlInspector::initWidgets() ...@@ -334,8 +334,8 @@ void QmlInspector::initWidgets()
connect(m_watchTableView, SIGNAL(objectActivated(int)), connect(m_watchTableView, SIGNAL(objectActivated(int)),
m_objectTreeWidget, SLOT(setCurrentObject(int))); m_objectTreeWidget, SLOT(setCurrentObject(int)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QmlDebugObjectReference)), connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QDeclarativeDebugObjectReference)),
m_expressionWidget, SLOT(setCurrentObject(QmlDebugObjectReference))); m_expressionWidget, SLOT(setCurrentObject(QDeclarativeDebugObjectReference)));
Core::MiniSplitter *leftSplitter = new Core::MiniSplitter(Qt::Vertical); Core::MiniSplitter *leftSplitter = new Core::MiniSplitter(Qt::Vertical);
...@@ -411,7 +411,7 @@ void QmlInspector::reloadEngines() ...@@ -411,7 +411,7 @@ void QmlInspector::reloadEngines()
if (!m_engineQuery->isWaiting()) if (!m_engineQuery->isWaiting())
enginesChanged(); enginesChanged();
else else
QObject::connect(m_engineQuery, SIGNAL(stateChanged(QmlDebugQuery::State)), QObject::connect(m_engineQuery, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(enginesChanged())); this, SLOT(enginesChanged()));
} }
...@@ -419,7 +419,7 @@ void QmlInspector::enginesChanged() ...@@ -419,7 +419,7 @@ void QmlInspector::enginesChanged()
{ {
m_engineSpinBox->clearEngines(); m_engineSpinBox->clearEngines();
QList<QmlDebugEngineReference> engines = m_engineQuery->engines(); QList<QDeclarativeDebugEngineReference> engines = m_engineQuery->engines();
delete m_engineQuery; m_engineQuery = 0; delete m_engineQuery; m_engineQuery = 0;
if (engines.isEmpty()) if (engines.isEmpty())
...@@ -446,11 +446,11 @@ void QmlInspector::queryEngineContext(int id) ...@@ -446,11 +446,11 @@ void QmlInspector::queryEngineContext(int id)
m_contextQuery = 0; m_contextQuery = 0;
} }
m_contextQuery = m_client->queryRootContexts(QmlDebugEngineReference(id), this); m_contextQuery = m_client->queryRootContexts(QDeclarativeDebugEngineReference(id), this);
if (!m_contextQuery->isWaiting()) if (!m_contextQuery->isWaiting())
contextChanged(); contextChanged();
else else
QObject::connect(m_contextQuery, SIGNAL(stateChanged(QmlDebugQuery::State)), QObject::connect(m_contextQuery, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(contextChanged())); this, SLOT(contextChanged()));
} }
...@@ -458,15 +458,15 @@ void QmlInspector::contextChanged() ...@@ -458,15 +458,15 @@ void QmlInspector::contextChanged()
{ {
//dump(m_contextQuery->rootContext(), 0); //dump(m_contextQuery->rootContext(), 0);
foreach (const QmlDebugObjectReference &object, m_contextQuery->rootContext().objects()) foreach (const QDeclarativeDebugObjectReference &object, m_contextQuery->rootContext().objects())
m_objectTreeWidget->reload(object.debugId()); m_objectTreeWidget->reload(object.debugId());
delete m_contextQuery; m_contextQuery = 0; delete m_contextQuery; m_contextQuery = 0;
} }
void QmlInspector::treeObjectActivated(const QmlDebugObjectReference &obj) void QmlInspector::treeObjectActivated(const QDeclarativeDebugObjectReference &obj)
{ {
QmlDebugFileReference source = obj.source(); QDeclarativeDebugFileReference source = obj.source();
QString fileName = source.url().toLocalFile(); QString fileName = source.url().toLocalFile();
if (source.lineNumber() < 0 || !QFile::exists(fileName)) if (source.lineNumber() < 0 || !QFile::exists(fileName))
......
src/plugins/qmlinspector/qmlinspector.h
+ 10
− 10
View file @ 4ee19843
...@@ -43,11 +43,11 @@ class QLineEdit; ...@@ -43,11 +43,11 @@ class QLineEdit;
class QSpinBox; class QSpinBox;
class QLabel; class QLabel;
class QmlEngineDebug; class QDeclarativeEngineDebug;
class QmlDebugConnection; class QDeclarativeDebugConnection;
class QmlDebugEnginesQuery; class QDeclarativeDebugEnginesQuery;
class QmlDebugRootContextQuery; class QDeclarativeDebugRootContextQuery;
class QmlDebugObjectReference; class QDeclarativeDebugObjectReference;
class ObjectTree; class ObjectTree;
class WatchTableModel; class WatchTableModel;
class WatchTableView; class WatchTableView;
...@@ -83,17 +83,17 @@ private slots: ...@@ -83,17 +83,17 @@ private slots:
void enginesChanged(); void enginesChanged();
void queryEngineContext(int); void queryEngineContext(int);
void contextChanged(); void contextChanged();
void treeObjectActivated(const QmlDebugObjectReference &obj); void treeObjectActivated(const QDeclarativeDebugObjectReference &obj);
private: private:
void initWidgets(); void initWidgets();
QmlDebugConnection *m_conn; QDeclarativeDebugConnection *m_conn;
QmlEngineDebug *m_client; QDeclarativeEngineDebug *m_client;
QmlDebugEnginesQuery *m_engineQuery; QDeclarativeDebugEnginesQuery *m_engineQuery;
QmlDebugRootContextQuery *m_contextQuery; QDeclarativeDebugRootContextQuery *m_contextQuery;
ObjectTree *m_objectTreeWidget; ObjectTree *m_objectTreeWidget;
ObjectPropertiesView *m_propertiesWidget; ObjectPropertiesView *m_propertiesWidget;
......
src/plugins/qmlinspector/qmlinspectorplugin.cpp
+ 2
− 2
View file @ 4ee19843
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include <qmlprojectmanager/qmlproject.h> #include <qmlprojectmanager/qmlproject.h>
#include <qmljseditor/qmljseditorconstants.h> #include <qmljseditor/qmljseditorconstants.h>
#include <private/qmldebug_p.h> #include <private/qdeclarativedebug_p.h>
#include <private/qmldebugclient_p.h> #include <private/qdeclarativedebugclient_p.h>
#include <coreplugin/modemanager.h> #include <coreplugin/modemanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment