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

QmlInspector: Fix compilation with latest changes of QDeclarative

Browse Source 
All files have been renamed from Qml to QDeclarative
This commit is contained in:
Kai Koehne
2010-02-26 14:42:11 +01:00
parent 299ea32ab0
commit 4ee19843d7
13 changed files with 174 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmlinspector/components/canvasframerate.cpp
View File

@@ -28,7 +28,7 @@
**************************************************************************/
#include "canvasframerate.h"
#include <private/qmldebugclient_p.h>
#include <private/qdeclarativedebugclient_p.h>
#include <QtCore/qdebug.h>
#include <QtCore/qstringlist.h>
@@ -393,11 +393,11 @@ QSize GraphWindow::sizeHint() const
}
class CanvasFrameRatePlugin : public QmlDebugClient
class CanvasFrameRatePlugin : public QDeclarativeDebugClient
{
Q_OBJECT
public:
CanvasFrameRatePlugin(QmlDebugConnection *client);
CanvasFrameRatePlugin(QDeclarativeDebugConnection *client);
signals:
void sample(int, int, int, bool);
@@ -410,8 +410,8 @@ private:
int ld;
};
CanvasFrameRatePlugin::CanvasFrameRatePlugin(QmlDebugConnection *client)
: QmlDebugClient(QLatin1String("CanvasFrameRate"), client), lb(-1)
CanvasFrameRatePlugin::CanvasFrameRatePlugin(QDeclarativeDebugConnection *client)
: QDeclarativeDebugClient(QLatin1String("CanvasFrameRate"), client), lb(-1)
{
}
@@ -476,7 +476,7 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
setLayout(layout);
}
void CanvasFrameRate::reset(QmlDebugConnection *conn)
void CanvasFrameRate::reset(QDeclarativeDebugConnection *conn)
{
delete m_plugin;
m_plugin = 0;
@@ -502,11 +502,11 @@ void CanvasFrameRate::connectionStateChanged(QAbstractSocket::SocketState state)
delete m_plugin;
m_plugin = 0;
} 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;
m_plugin = new CanvasFrameRatePlugin(conn);
@@ -561,7 +561,7 @@ void CanvasFrameRate::newTab()
void CanvasFrameRate::enabledToggled(bool checked)
{
if (m_plugin)
static_cast<QmlDebugClient *>(m_plugin)->setEnabled(checked);
static_cast<QDeclarativeDebugClient *>(m_plugin)->setEnabled(checked);
}
QT_END_NAMESPACE

6
src/plugins/qmlinspector/components/canvasframerate.h
View File

@@ -29,7 +29,7 @@
#ifndef CANVASFRAMERATE_H
#define CANVASFRAMERATE_H
#include <private/qmldebugclient_p.h>
#include <private/qdeclarativedebugclient_p.h>
#include <QtCore/qpointer.h>
#include <QtGui/qwidget.h>
@@ -52,7 +52,7 @@ class CanvasFrameRate : public QWidget
public:
CanvasFrameRate(QWidget *parent = 0);
void reset(QmlDebugConnection *conn);
void reset(QDeclarativeDebugConnection *conn);
void setSizeHint(const QSize &);
virtual QSize sizeHint() const;
@@ -64,7 +64,7 @@ private slots:
void connectionStateChanged(QAbstractSocket::SocketState state);
private:
void handleConnected(QmlDebugConnection *conn);
void handleConnected(QDeclarativeDebugConnection *conn);
QGroupBox *m_group;
QTabWidget *m_tabs;

8
src/plugins/qmlinspector/components/expressionquerywidget.cpp
View File

@@ -39,7 +39,7 @@
#include <QtGui/qtextobject.h>
#include <QtGui/qlayout.h>
ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QmlEngineDebug *client, QWidget *parent)
ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug *client, QWidget *parent)
: QWidget(parent),
m_mode(mode),
m_client(client),
@@ -74,7 +74,7 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QmlEngineDebug *client,
}
}
void ExpressionQueryWidget::setEngineDebug(QmlEngineDebug *client)
void ExpressionQueryWidget::setEngineDebug(QDeclarativeEngineDebug *client)
{
m_client = client;
}
@@ -113,7 +113,7 @@ void ExpressionQueryWidget::appendPrompt()
}
}
void ExpressionQueryWidget::setCurrentObject(const QmlDebugObjectReference &obj)
void ExpressionQueryWidget::setCurrentObject(const QDeclarativeDebugObjectReference &obj)
{
m_currObject = obj;
updateTitle();
@@ -161,7 +161,7 @@ void ExpressionQueryWidget::executeExpression()
if (!m_query->isWaiting())
showResult();
else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(showResult()));
m_lastExpr = m_expr;

16
src/plugins/qmlinspector/components/expressionquerywidget.h
View File

@@ -29,7 +29,7 @@
#ifndef EXPRESSIONQUERYWIDGET_H
#define EXPRESSIONQUERYWIDGET_H
#include <private/qmldebug_p.h>
#include <private/qdeclarativedebug_p.h>
#include <QtGui/qwidget.h>
@@ -50,16 +50,16 @@ public:
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();
protected:
bool eventFilter(QObject *obj, QEvent *event);
public slots:
void setCurrentObject(const QmlDebugObjectReference &obj);
void setCurrentObject(const QDeclarativeDebugObjectReference &obj);
private slots:
void executeExpression();
@@ -73,8 +73,8 @@ private:
Mode m_mode;
QmlEngineDebug *m_client;
QmlDebugExpressionQuery *m_query;
QDeclarativeEngineDebug *m_client;
QDeclarativeDebugExpressionQuery *m_query;
QTextEdit *m_textEdit;
QLineEdit *m_lineEdit;
QPushButton *m_button;
@@ -84,8 +84,8 @@ private:
QString m_title;
QmlDebugObjectReference m_currObject;
QmlDebugObjectReference m_objectAtLastFocus;
QDeclarativeDebugObjectReference m_currObject;
QDeclarativeDebugObjectReference m_objectAtLastFocus;
};
QT_END_NAMESPACE

46
src/plugins/qmlinspector/components/objectpropertiesview.cpp
View File

@@ -28,9 +28,9 @@
**************************************************************************/
#include "objectpropertiesview.h"
#include <private/qmldebugservice_p.h>
#include <private/qmldebug_p.h>
#include <private/qmldebugclient_p.h>
#include <private/qdeclarativedebugservice_p.h>
#include <private/qdeclarativedebug_p.h>
#include <private/qdeclarativedebugclient_p.h>
#include <QtCore/qdebug.h>
@@ -53,7 +53,7 @@ public:
PropertiesViewItem(QTreeWidget *widget, Type type = OtherType);
PropertiesViewItem(QTreeWidgetItem *parent, Type type = OtherType);
QmlDebugPropertyReference property;
QDeclarativeDebugPropertyReference property;
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),
m_client(client),
m_query(0),
@@ -92,17 +92,17 @@ ObjectPropertiesView::ObjectPropertiesView(QmlEngineDebug *client, QWidget *pare
layout->addWidget(m_tree);
}
void ObjectPropertiesView::setEngineDebug(QmlEngineDebug *client)
void ObjectPropertiesView::setEngineDebug(QDeclarativeEngineDebug *client)
{
m_client = client;
}
void ObjectPropertiesView::clear()
{
setObject(QmlDebugObjectReference());
setObject(QDeclarativeDebugObjectReference());
}
void ObjectPropertiesView::reload(const QmlDebugObjectReference &obj)
void ObjectPropertiesView::reload(const QDeclarativeDebugObjectReference &obj)
{
if (!m_client)
return;
@@ -113,7 +113,7 @@ void ObjectPropertiesView::reload(const QmlDebugObjectReference &obj)
if (!m_query->isWaiting())
queryFinished();
else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(queryFinished()));
}
@@ -122,10 +122,10 @@ void ObjectPropertiesView::queryFinished()
if (!m_client || !m_query)
return;
QmlDebugObjectReference obj = m_query->object();
QDeclarativeDebugObjectReference obj = m_query->object();
QmlDebugWatch *watch = m_client->addWatch(obj, this);
if (watch->state() == QmlDebugWatch::Dead) {
QDeclarativeDebugWatch *watch = m_client->addWatch(obj, this);
if (watch->state() == QDeclarativeDebugWatch::Dead) {
delete watch;
watch = 0;
} else {
@@ -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_tree->clear();
QList<QmlDebugPropertyReference> properties = object.properties();
QList<QDeclarativeDebugPropertyReference> properties = object.properties();
for (int i=0; i<properties.count(); ++i) {
const QmlDebugPropertyReference &p = properties[i];
const QDeclarativeDebugPropertyReference &p = properties[i];
PropertiesViewItem *item = new PropertiesViewItem(m_tree);
item->property = p;
@@ -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()
&& qobject_cast<QmlDebugPropertyWatch*>(watch)) {
connect(watch, SIGNAL(stateChanged(QmlDebugWatch::State)), SLOT(watchStateChanged()));
setWatched(qobject_cast<QmlDebugPropertyWatch*>(watch)->name(), true);
&& qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)) {
connect(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State)), SLOT(watchStateChanged()));
setWatched(qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)->name(), true);
}
}
void ObjectPropertiesView::watchStateChanged()
{
QmlDebugWatch *watch = qobject_cast<QmlDebugWatch*>(sender());
QDeclarativeDebugWatch *watch = qobject_cast<QDeclarativeDebugWatch*>(sender());
if (watch->objectDebugId() == m_object.debugId()
&& qobject_cast<QmlDebugPropertyWatch*>(watch)
&& watch->state() == QmlDebugWatch::Inactive) {
setWatched(qobject_cast<QmlDebugPropertyWatch*>(watch)->name(), false);
&& qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)
&& watch->state() == QDeclarativeDebugWatch::Inactive) {
setWatched(qobject_cast<QDeclarativeDebugPropertyWatch*>(watch)->name(), false);
}
}

24
src/plugins/qmlinspector/components/objectpropertiesview.h
View File

@@ -29,7 +29,7 @@
#ifndef PROPERTIESTABLEMODEL_H
#define PROPERTIESTABLEMODEL_H
#include <private/qmldebug_p.h>
#include <private/qdeclarativedebug_p.h>
#include <QtGui/qwidget.h>
@@ -37,24 +37,24 @@ QT_BEGIN_NAMESPACE
class QTreeWidget;
class QTreeWidgetItem;
class QmlDebugConnection;
class QDeclarativeDebugConnection;
class PropertiesViewItem;
class ObjectPropertiesView : public QWidget
{
Q_OBJECT
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();
signals:
void activated(const QmlDebugObjectReference &, const QmlDebugPropertyReference &);
void activated(const QDeclarativeDebugObjectReference &, const QDeclarativeDebugPropertyReference &);
public slots:
void reload(const QmlDebugObjectReference &);
void watchCreated(QmlDebugWatch *);
void reload(const QDeclarativeDebugObjectReference &);
void watchCreated(QDeclarativeDebugWatch *);
private slots:
void queryFinished();
@@ -63,16 +63,16 @@ private slots:
void itemActivated(QTreeWidgetItem *i);
private:
void setObject(const QmlDebugObjectReference &object);
void setObject(const QDeclarativeDebugObjectReference &object);
void setWatched(const QString &property, bool watched);
void setPropertyValue(PropertiesViewItem *item, const QVariant &value, bool makeGray);
QmlEngineDebug *m_client;
QmlDebugObjectQuery *m_query;
QmlDebugWatch *m_watch;
QDeclarativeEngineDebug *m_client;
QDeclarativeDebugObjectQuery *m_query;
QDeclarativeDebugWatch *m_watch;
QTreeWidget *m_tree;
QmlDebugObjectReference m_object;
QDeclarativeDebugObjectReference m_object;
};

36
src/plugins/qmlinspector/components/objecttree.cpp
View File

@@ -32,15 +32,15 @@
#include <QInputDialog>
#include <private/qmldebugservice_p.h>
#include <private/qmldebug_p.h>
#include <private/qmldebugclient_p.h>
#include <private/qdeclarativedebugservice_p.h>
#include <private/qdeclarativedebug_p.h>
#include <private/qdeclarativedebugclient_p.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),
m_client(client),
m_query(0)
@@ -55,7 +55,7 @@ ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent)
SLOT(activated(QTreeWidgetItem *)));
}
void ObjectTree::setEngineDebug(QmlEngineDebug *client)
void ObjectTree::setEngineDebug(QDeclarativeEngineDebug *client)
{
m_client = client;
}
@@ -70,11 +70,11 @@ void ObjectTree::reload(int objectDebugId)
m_query = 0;
}
m_query = m_client->queryObjectRecursive(QmlDebugObjectReference(objectDebugId), this);
m_query = m_client->queryObjectRecursive(QDeclarativeDebugObjectReference(objectDebugId), this);
if (!m_query->isWaiting())
objectFetched();
else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(objectFetched()));
}
@@ -103,7 +103,7 @@ void ObjectTree::currentItemChanged(QTreeWidgetItem *item)
if (!item)
return;
QmlDebugObjectReference obj = item->data(0, Qt::UserRole).value<QmlDebugObjectReference>();
QDeclarativeDebugObjectReference obj = item->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>();
if (obj.debugId() >= 0)
emit currentObjectChanged(obj);
}
@@ -113,12 +113,12 @@ void ObjectTree::activated(QTreeWidgetItem *item)
if (!item)
return;
QmlDebugObjectReference obj = item->data(0, Qt::UserRole).value<QmlDebugObjectReference>();
QDeclarativeDebugObjectReference obj = item->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>();
if (obj.debugId() >= 0)
emit activated(obj);
}
void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *parent)
void ObjectTree::buildTree(const QDeclarativeDebugObjectReference &obj, QTreeWidgetItem *parent)
{
if (!parent)
clear();
@@ -129,8 +129,8 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *
if (parent && obj.contextDebugId() >= 0
&& obj.contextDebugId() != parent->data(0, Qt::UserRole
).value<QmlDebugObjectReference>().contextDebugId()) {
QmlDebugFileReference source = obj.source();
).value<QDeclarativeDebugObjectReference>().contextDebugId()) {
QDeclarativeDebugFileReference source = obj.source();
if (!source.url().isEmpty()) {
QString toolTipString = QLatin1String("URL: ") + source.url().toString();
item->setToolTip(0, toolTipString);
@@ -147,7 +147,7 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *
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, ' ');
qWarning().nospace() << indent.constData() << ctxt.debugId() << " "
@@ -160,7 +160,7 @@ void ObjectTree::dump(const QmlDebugContextReference &ctxt, int 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, ' ');
qWarning().nospace() << indent.constData() << qPrintable(obj.className())
@@ -184,7 +184,7 @@ QTreeWidgetItem *ObjectTree::findItemByObjectId(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;
QTreeWidgetItem *child;
@@ -206,8 +206,8 @@ void ObjectTree::mousePressEvent(QMouseEvent *me)
QAction action(tr("Add watch..."), 0);
QList<QAction *> actions;
actions << &action;
QmlDebugObjectReference obj =
currentItem()->data(0, Qt::UserRole).value<QmlDebugObjectReference>();
QDeclarativeDebugObjectReference obj =
currentItem()->data(0, Qt::UserRole).value<QDeclarativeDebugObjectReference>();
if (QMenu::exec(actions, me->globalPos())) {
bool ok = false;
QString watch = QInputDialog::getText(this, tr("Watch expression"),

30
src/plugins/qmlinspector/components/objecttree.h
View File

@@ -35,25 +35,25 @@ QT_BEGIN_NAMESPACE
class QTreeWidgetItem;
class QmlEngineDebug;
class QmlDebugObjectReference;
class QmlDebugObjectQuery;
class QmlDebugContextReference;
class QmlDebugConnection;
class QDeclarativeEngineDebug;
class QDeclarativeDebugObjectReference;
class QDeclarativeDebugObjectQuery;
class QDeclarativeDebugContextReference;
class QDeclarativeDebugConnection;
class ObjectTree : public QTreeWidget
{
Q_OBJECT
public:
ObjectTree(QmlEngineDebug *client = 0, QWidget *parent = 0);
ObjectTree(QDeclarativeEngineDebug *client = 0, QWidget *parent = 0);
void setEngineDebug(QmlEngineDebug *client);
void setEngineDebug(QDeclarativeEngineDebug *client);
signals:
void currentObjectChanged(const QmlDebugObjectReference &);
void activated(const QmlDebugObjectReference &);
void expressionWatchRequested(const QmlDebugObjectReference &, const QString &);
void currentObjectChanged(const QDeclarativeDebugObjectReference &);
void activated(const QDeclarativeDebugObjectReference &);
void expressionWatchRequested(const QDeclarativeDebugObjectReference &, const QString &);
public slots:
void reload(int objectDebugId); // set the root object
@@ -70,12 +70,12 @@ private slots:
private:
QTreeWidgetItem *findItemByObjectId(int debugId) const;
QTreeWidgetItem *findItem(QTreeWidgetItem *item, int debugId) const;
void dump(const QmlDebugContextReference &, int);
void dump(const QmlDebugObjectReference &, int);
void buildTree(const QmlDebugObjectReference &, QTreeWidgetItem *parent);
void dump(const QDeclarativeDebugContextReference &, int);
void dump(const QDeclarativeDebugObjectReference &, int);
void buildTree(const QDeclarativeDebugObjectReference &, QTreeWidgetItem *parent);
QmlEngineDebug *m_client;
QmlDebugObjectQuery *m_query;
QDeclarativeEngineDebug *m_client;
QDeclarativeDebugObjectQuery *m_query;
};
QT_END_NAMESPACE

56
src/plugins/qmlinspector/components/watchtable.cpp
View File

@@ -33,13 +33,13 @@
#include <QtGui/qaction.h>
#include <QtGui/qmenu.h>
#include <private/qmldebug_p.h>
#include <QtDeclarative/qmlmetatype.h>
#include <private/qdeclarativedebug_p.h>
#include <QtDeclarative/private/qdeclarativemetatype_p.h>
QT_BEGIN_NAMESPACE
WatchTableModel::WatchTableModel(QmlEngineDebug *client, QObject *parent)
WatchTableModel::WatchTableModel(QDeclarativeEngineDebug *client, QObject *parent)
: QAbstractTableModel(parent),
m_client(client)
{
@@ -51,21 +51,21 @@ WatchTableModel::~WatchTableModel()
delete m_columns[i].watch;
}
void WatchTableModel::setEngineDebug(QmlEngineDebug *client)
void WatchTableModel::setEngineDebug(QDeclarativeEngineDebug *client)
{
m_client = client;
}
void WatchTableModel::addWatch(QmlDebugWatch *watch, const QString &title)
void WatchTableModel::addWatch(QDeclarativeDebugWatch *watch, const QString &title)
{
QString property;
if (qobject_cast<QmlDebugPropertyWatch *>(watch))
property = qobject_cast<QmlDebugPropertyWatch *>(watch)->name();
if (qobject_cast<QDeclarativeDebugPropertyWatch *>(watch))
property = qobject_cast<QDeclarativeDebugPropertyWatch *>(watch)->name();
connect(watch, SIGNAL(valueChanged(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());
beginInsertColumns(QModelIndex(), col, col);
@@ -80,7 +80,7 @@ void WatchTableModel::addWatch(QmlDebugWatch *watch, const QString &title)
endInsertColumns();
}
void WatchTableModel::removeWatch(QmlDebugWatch *watch)
void WatchTableModel::removeWatch(QDeclarativeDebugWatch *watch)
{
int column = columnForWatch(watch);
if (column == -1)
@@ -101,7 +101,7 @@ void WatchTableModel::removeWatch(QmlDebugWatch *watch)
reset();
}
void WatchTableModel::updateWatch(QmlDebugWatch *watch, const QVariant &value)
void WatchTableModel::updateWatch(QDeclarativeDebugWatch *watch, const QVariant &value)
{
int column = columnForWatch(watch);
if (column == -1)
@@ -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())
return m_columns.at(column).watch;
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) {
if (m_columns[i].watch->objectDebugId() == objectDebugId
@@ -162,8 +162,8 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const
const QVariant &value = m_values.at(idx.row()).variant;
QString str = value.toString();
if (str.isEmpty() && QmlMetaType::isQObject(value.userType())) {
QObject *o = QmlMetaType::toQObject(value);
if (str.isEmpty() && QDeclarativeMetaType::isQObject(value.userType())) {
QObject *o = QDeclarativeMetaType::toQObject(value);
if(o) {
QString objectName = o->objectName();
if(objectName.isEmpty())
@@ -193,15 +193,15 @@ QVariant WatchTableModel::data(const QModelIndex &idx, int role) const
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);
watch->deleteLater();
}
}
int WatchTableModel::columnForWatch(QmlDebugWatch *watch) const
int WatchTableModel::columnForWatch(QDeclarativeDebugWatch *watch) const
{
for (int i=0; i<m_columns.count(); ++i) {
if (m_columns.at(i).watch == watch)
@@ -224,12 +224,12 @@ void WatchTableModel::addValue(int column, const QVariant &value)
endInsertRows();
}
void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object, const QmlDebugPropertyReference &property)
void WatchTableModel::togglePropertyWatch(const QDeclarativeDebugObjectReference &object, const QDeclarativeDebugPropertyReference &property)
{
if (!m_client || !property.hasNotifySignal())
return;
QmlDebugWatch *watch = findWatch(object.debugId(), property.name());
QDeclarativeDebugWatch *watch = findWatch(object.debugId(), property.name());
if (watch) {
// watch will be deleted in watchStateChanged()
m_client->removeWatch(watch);
@@ -237,7 +237,7 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object,
}
watch = m_client->addWatch(property, this);
if (watch->state() == QmlDebugWatch::Dead) {
if (watch->state() == QDeclarativeDebugWatch::Dead) {
delete watch;
watch = 0;
} else {
@@ -254,19 +254,19 @@ void WatchTableModel::togglePropertyWatch(const QmlDebugObjectReference &object,
void WatchTableModel::watchedValueChanged(const QByteArray &propertyName, const QVariant &value)
{
Q_UNUSED(propertyName);
QmlDebugWatch *watch = qobject_cast<QmlDebugWatch*>(sender());
QDeclarativeDebugWatch *watch = qobject_cast<QDeclarativeDebugWatch*>(sender());
if (watch)
updateWatch(watch, value);
}
void WatchTableModel::expressionWatchRequested(const QmlDebugObjectReference &obj, const QString &expr)
void WatchTableModel::expressionWatchRequested(const QDeclarativeDebugObjectReference &obj, const QString &expr)
{
if (!m_client)
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;
watch = 0;
} else {
@@ -280,7 +280,7 @@ void WatchTableModel::removeWatchAt(int column)
if (!m_client)
return;
QmlDebugWatch *watch = findWatch(column);
QDeclarativeDebugWatch *watch = findWatch(column);
if (watch) {
m_client->removeWatch(watch);
delete watch;
@@ -334,18 +334,18 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent)
m_model(model)
{
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)));
}
void WatchTableView::indexActivated(const QModelIndex &index)
{
QmlDebugWatch *watch = m_model->findWatch(index.column());
QDeclarativeDebugWatch *watch = m_model->findWatch(index.column());
if (watch)
emit objectActivated(watch->objectDebugId());
}
void WatchTableView::watchCreated(QmlDebugWatch *watch)
void WatchTableView::watchCreated(QDeclarativeDebugWatch *watch)
{
int column = m_model->columnForWatch(watch);
resizeColumnToContents(column);

38
src/plugins/qmlinspector/components/watchtable.h
View File

@@ -39,23 +39,23 @@
QT_BEGIN_NAMESPACE
class QmlDebugWatch;
class QmlEngineDebug;
class QmlDebugConnection;
class QmlDebugPropertyReference;
class QmlDebugObjectReference;
class QDeclarativeDebugWatch;
class QDeclarativeEngineDebug;
class QDeclarativeDebugConnection;
class QDeclarativeDebugPropertyReference;
class QDeclarativeDebugObjectReference;
class WatchTableModel : public QAbstractTableModel
{
Q_OBJECT
public:
WatchTableModel(QmlEngineDebug *client = 0, QObject *parent = 0);
WatchTableModel(QDeclarativeEngineDebug *client = 0, QObject *parent = 0);
~WatchTableModel();
void setEngineDebug(QmlEngineDebug *client);
void setEngineDebug(QDeclarativeEngineDebug *client);
QmlDebugWatch *findWatch(int column) const;
int columnForWatch(QmlDebugWatch *watch) const;
QDeclarativeDebugWatch *findWatch(int column) const;
int columnForWatch(QDeclarativeDebugWatch *watch) const;
void removeWatchAt(int column);
void removeAllWatches();
@@ -66,22 +66,22 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
signals:
void watchCreated(QmlDebugWatch *watch);
void watchCreated(QDeclarativeDebugWatch *watch);
public slots:
void togglePropertyWatch(const QmlDebugObjectReference &obj, const QmlDebugPropertyReference &prop);
void expressionWatchRequested(const QmlDebugObjectReference &, const QString &);
void togglePropertyWatch(const QDeclarativeDebugObjectReference &obj, const QDeclarativeDebugPropertyReference &prop);
void expressionWatchRequested(const QDeclarativeDebugObjectReference &, const QString &);
private slots:
void watchStateChanged();
void watchedValueChanged(const QByteArray &propertyName, const QVariant &value);
private:
void addWatch(QmlDebugWatch *watch, const QString &title);
void removeWatch(QmlDebugWatch *watch);
void updateWatch(QmlDebugWatch *watch, const QVariant &value);
void addWatch(QDeclarativeDebugWatch *watch, const QString &title);
void removeWatch(QDeclarativeDebugWatch *watch);
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);
@@ -90,7 +90,7 @@ private:
QString title;
bool hasFirstValue;
QString property;
QPointer<QmlDebugWatch> watch;
QPointer<QDeclarativeDebugWatch> watch;
};
struct Value {
@@ -99,7 +99,7 @@ private:
bool first;
};
QmlEngineDebug *m_client;
QDeclarativeEngineDebug *m_client;
QList<WatchedEntity> m_columns;
QList<Value> m_values;
};
@@ -130,7 +130,7 @@ signals:
private slots:
void indexActivated(const QModelIndex &index);
void watchCreated(QmlDebugWatch *watch);
void watchCreated(QDeclarativeDebugWatch *watch);
private:
WatchTableModel *m_model;

46
src/plugins/qmlinspector/qmlinspector.cpp
View File

@@ -39,8 +39,8 @@
#include "components/canvasframerate.h"
#include "components/expressionquerywidget.h"
#include <private/qmldebug_p.h>
#include <private/qmldebugclient_p.h>
#include <private/qdeclarativedebug_p.h>
#include <private/qdeclarativedebugclient_p.h>
#include <utils/styledbar.h>
#include <utils/fancymainwindow.h>
@@ -203,7 +203,7 @@ bool QmlInspector::connectToViewer()
QString host = config->debugServerAddress();
quint16 port = quint16(config->debugServerPort());
m_conn = new QmlDebugConnection(this);
m_conn = new QDeclarativeDebugConnection(this);
connect(m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
SLOT(connectionStateChanged()));
connect(m_conn, SIGNAL(error(QAbstractSocket::SocketError)),
@@ -247,7 +247,7 @@ void QmlInspector::connectionStateChanged()
emit statusMessage(tr("[Inspector] connected.\n"));
if (!m_client) {
m_client = new QmlEngineDebug(m_conn, this);
m_client = new QDeclarativeEngineDebug(m_conn, this);
m_objectTreeWidget->setEngineDebug(m_client);
m_propertiesWidget->setEngineDebug(m_client);
m_watchTableModel->setEngineDebug(m_client);
@@ -313,20 +313,20 @@ void QmlInspector::initWidgets()
WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel);
m_watchTableView->setHorizontalHeader(header);
connect(m_objectTreeWidget, SIGNAL(activated(QmlDebugObjectReference)),
this, SLOT(treeObjectActivated(QmlDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(activated(QDeclarativeDebugObjectReference)),
this, SLOT(treeObjectActivated(QDeclarativeDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QmlDebugObjectReference)),
m_propertiesWidget, SLOT(reload(QmlDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QDeclarativeDebugObjectReference)),
m_propertiesWidget, SLOT(reload(QDeclarativeDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(expressionWatchRequested(QmlDebugObjectReference,QString)),
m_watchTableModel, SLOT(expressionWatchRequested(QmlDebugObjectReference,QString)));
connect(m_objectTreeWidget, SIGNAL(expressionWatchRequested(QDeclarativeDebugObjectReference,QString)),
m_watchTableModel, SLOT(expressionWatchRequested(QDeclarativeDebugObjectReference,QString)));
connect(m_propertiesWidget, SIGNAL(activated(QmlDebugObjectReference,QmlDebugPropertyReference)),
m_watchTableModel, SLOT(togglePropertyWatch(QmlDebugObjectReference,QmlDebugPropertyReference)));
connect(m_propertiesWidget, SIGNAL(activated(QDeclarativeDebugObjectReference,QDeclarativeDebugPropertyReference)),
m_watchTableModel, SLOT(togglePropertyWatch(QDeclarativeDebugObjectReference,QDeclarativeDebugPropertyReference)));
connect(m_watchTableModel, SIGNAL(watchCreated(QmlDebugWatch*)),
m_propertiesWidget, SLOT(watchCreated(QmlDebugWatch*)));
connect(m_watchTableModel, SIGNAL(watchCreated(QDeclarativeDebugWatch*)),
m_propertiesWidget, SLOT(watchCreated(QDeclarativeDebugWatch*)));
connect(m_watchTableModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
m_watchTableView, SLOT(scrollToBottom()));
@@ -334,8 +334,8 @@ void QmlInspector::initWidgets()
connect(m_watchTableView, SIGNAL(objectActivated(int)),
m_objectTreeWidget, SLOT(setCurrentObject(int)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QmlDebugObjectReference)),
m_expressionWidget, SLOT(setCurrentObject(QmlDebugObjectReference)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QDeclarativeDebugObjectReference)),
m_expressionWidget, SLOT(setCurrentObject(QDeclarativeDebugObjectReference)));
Core::MiniSplitter *leftSplitter = new Core::MiniSplitter(Qt::Vertical);
@@ -411,7 +411,7 @@ void QmlInspector::reloadEngines()
if (!m_engineQuery->isWaiting())
enginesChanged();
else
QObject::connect(m_engineQuery, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_engineQuery, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(enginesChanged()));
}
@@ -419,7 +419,7 @@ void QmlInspector::enginesChanged()
{
m_engineSpinBox->clearEngines();
QList<QmlDebugEngineReference> engines = m_engineQuery->engines();
QList<QDeclarativeDebugEngineReference> engines = m_engineQuery->engines();
delete m_engineQuery; m_engineQuery = 0;
if (engines.isEmpty())
@@ -446,11 +446,11 @@ void QmlInspector::queryEngineContext(int id)
m_contextQuery = 0;
}
m_contextQuery = m_client->queryRootContexts(QmlDebugEngineReference(id), this);
m_contextQuery = m_client->queryRootContexts(QDeclarativeDebugEngineReference(id), this);
if (!m_contextQuery->isWaiting())
contextChanged();
else
QObject::connect(m_contextQuery, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_contextQuery, SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),
this, SLOT(contextChanged()));
}
@@ -458,15 +458,15 @@ void QmlInspector::contextChanged()
{
//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());
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();
if (source.lineNumber() < 0 || !QFile::exists(fileName))

20
src/plugins/qmlinspector/qmlinspector.h
View File

@@ -43,11 +43,11 @@ class QLineEdit;
class QSpinBox;
class QLabel;
class QmlEngineDebug;
class QmlDebugConnection;
class QmlDebugEnginesQuery;
class QmlDebugRootContextQuery;
class QmlDebugObjectReference;
class QDeclarativeEngineDebug;
class QDeclarativeDebugConnection;
class QDeclarativeDebugEnginesQuery;
class QDeclarativeDebugRootContextQuery;
class QDeclarativeDebugObjectReference;
class ObjectTree;
class WatchTableModel;
class WatchTableView;
@@ -83,17 +83,17 @@ private slots:
void enginesChanged();
void queryEngineContext(int);
void contextChanged();
void treeObjectActivated(const QmlDebugObjectReference &obj);
void treeObjectActivated(const QDeclarativeDebugObjectReference &obj);
private:
void initWidgets();
QmlDebugConnection *m_conn;
QmlEngineDebug *m_client;
QDeclarativeDebugConnection *m_conn;
QDeclarativeEngineDebug *m_client;
QmlDebugEnginesQuery *m_engineQuery;
QmlDebugRootContextQuery *m_contextQuery;
QDeclarativeDebugEnginesQuery *m_engineQuery;
QDeclarativeDebugRootContextQuery *m_contextQuery;
ObjectTree *m_objectTreeWidget;
ObjectPropertiesView *m_propertiesWidget;

4
src/plugins/qmlinspector/qmlinspectorplugin.cpp
View File

@@ -36,8 +36,8 @@
#include <qmlprojectmanager/qmlproject.h>
#include <qmljseditor/qmljseditorconstants.h>
#include <private/qmldebug_p.h>
#include <private/qmldebugclient_p.h>
#include <private/qdeclarativedebug_p.h>
#include <private/qdeclarativedebugclient_p.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/editormanager/ieditor.h>