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

Merge remote branch 'origin/1.3'

Browse Source 
Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ private:
void drawSample(QPainter *, int, const QRect &, QList<QRect> *);
void drawTime(QPainter *, const QRect &);
QRect findContainingRect(const QList<QRect> &rects, const QPoint &pos) const;
struct Sample {
struct Sample {
int sample[3];
bool isBreak;
};
@@ -106,7 +106,7 @@ QLineGraph::QLineGraph(QAbstractSlider *slider, QWidget *parent)
slider->setMaximum(0);
slider->setMinimum(0);
slider->setSingleStep(1);
connect(slider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
}
@@ -119,9 +119,9 @@ void QLineGraph::sliderChanged(int v)
position = -1;
else
position = v;
update();
// update highlightedRect
QPoint pos = mapFromGlobal(QCursor::pos());
if (geometry().contains(pos)) {
@@ -152,7 +152,7 @@ void QLineGraph::updateSlider()
slider->setValue(slider->maximum());
} else {
slider->setValue(position);
}
}
ignoreScroll = false;
}
@@ -331,7 +331,7 @@ QRect QLineGraph::findContainingRect(const QList<QRect> &rects, const QPoint &po
{
for (int i=0; i<rects.count(); ++i) {
if (rects[i].contains(pos))
return rects[i];
return rects[i];
}
return QRect();
}
@@ -391,7 +391,7 @@ QSize GraphWindow::sizeHint() const
{
return QSize(400, 220);
}
class CanvasFrameRatePlugin : public QmlDebugClient
{
@@ -457,7 +457,7 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
QPushButton *pb = new QPushButton(tr("New Graph"), this);
connect(pb, SIGNAL(clicked()), this, SLOT(newTab()));
bottom->addWidget(pb);
m_group = new QGroupBox(tr("Enabled"));
m_group->setCheckable(true);
m_group->setChecked(false);
@@ -468,7 +468,7 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
groupLayout->setSpacing(2);
groupLayout->addWidget(m_tabs);
groupLayout->addLayout(bottom);
QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(0, 10, 0, 0);
layout->setSpacing(0);
@@ -503,7 +503,7 @@ void CanvasFrameRate::connectionStateChanged(QAbstractSocket::SocketState state)
m_plugin = 0;
} else if (state == QAbstractSocket::ConnectedState) {
handleConnected(qobject_cast<QmlDebugConnection*>(sender()));
}
}
}
void CanvasFrameRate::handleConnected(QmlDebugConnection *conn)

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

@@ -51,7 +51,7 @@ class CanvasFrameRate : public QWidget
Q_OBJECT
public:
CanvasFrameRate(QWidget *parent = 0);
void reset(QmlDebugConnection *conn);
void setSizeHint(const QSize &);

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

@@ -115,17 +115,17 @@ EnginePane::EnginePane(QmlDebugConnection *conn, QWidget *parent)
connect(m_watchTableView, SIGNAL(objectActivated(int)),
m_objTree, SLOT(setCurrentObject(int)));
m_exprQueryWidget = new ExpressionQueryWidget(ExpressionQueryWidget::SeparateEntryMode, m_client);
connect(m_objTree, SIGNAL(currentObjectChanged(QmlDebugObjectReference)),
m_exprQueryWidget, SLOT(setCurrentObject(QmlDebugObjectReference)));
QSplitter *propertiesTab = new QSplitter(Qt::Vertical);
propertiesTab->addWidget(m_propertiesView);
propertiesTab->addWidget(m_exprQueryWidget);
propertiesTab->setStretchFactor(0, 2);
propertiesTab->setStretchFactor(1, 1);
m_tabs = new QTabWidget(this);
m_tabs->addTab(propertiesTab, tr("Properties"));
m_tabs->addTab(m_watchTableView, tr("Watched"));
@@ -176,7 +176,7 @@ void EnginePane::refreshEngines()
if (!m_engines->isWaiting())
enginesChanged();
else
QObject::connect(m_engines, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_engines, SIGNAL(stateChanged(QmlDebugQuery::State)),
this, SLOT(enginesChanged()));
}

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

@@ -148,7 +148,7 @@ void ExpressionQueryWidget::executeExpression()
{
if (!m_client)
return;
if (m_mode == SeparateEntryMode)
m_expr = m_lineEdit->text().trimmed();
else
@@ -176,7 +176,7 @@ void ExpressionQueryWidget::showResult()
m_textEdit->moveCursor(QTextCursor::End);
QVariant value = m_query->result();
QString result;
if (value.type() == QVariant::List || value.type() == QVariant::StringList) {
result = tr("<%1 items>", "%1 = number of items").arg(value.toList().count());
} else if (value.isNull()) {

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

@@ -51,7 +51,7 @@ public:
};
ExpressionQueryWidget(Mode mode = SeparateEntryMode, QmlEngineDebug *client = 0, QWidget *parent = 0);
void setEngineDebug(QmlEngineDebug *client);
void clear();

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

@@ -49,7 +49,7 @@ public:
BindingType,
OtherType
};
PropertiesViewItem(QTreeWidget *widget, Type type = OtherType);
PropertiesViewItem(QTreeWidgetItem *parent, Type type = OtherType);
@@ -151,20 +151,20 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar
if (bindingItem && bindingItem->type != PropertiesViewItem::BindingType) {
delete bindingItem;
bindingItem = 0;
}
}
qDeleteAll(item->takeChildren());
QVariantList variants = value.toList();
item->setText(1, tr("<%1 items>", "%1 = number of items").arg(variants.count()));
item->setText(2, QString::fromUtf8(value.typeName()));
PropertiesViewItem *child;
for (int i=0; i<variants.count(); ++i) {
child = new PropertiesViewItem(item);
setPropertyValue(child, variants[i], makeGray);
}
if (bindingItem)
item->addChild(bindingItem);
@@ -173,11 +173,11 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar
item->setText(1, (value.isNull() ? QLatin1String("<no value>") : value.toString()));
item->setExpanded(true);
}
if (makeGray) {
for (int i=0; i<m_tree->columnCount(); ++i)
item->setForeground(i, Qt::gray);
}
}
}
void ObjectPropertiesView::setObject(const QmlDebugObjectReference &object)
@@ -194,7 +194,7 @@ void ObjectPropertiesView::setObject(const QmlDebugObjectReference &object)
item->setText(0, p.name());
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
setPropertyValue(item, p.value(), !p.hasNotifySignal());
item->setText(2, p.valueTypeName());

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

@@ -48,7 +48,7 @@ public:
void setEngineDebug(QmlEngineDebug *client);
void clear();
signals:
void activated(const QmlDebugObjectReference &, const QmlDebugPropertyReference &);

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

@@ -52,7 +52,7 @@ ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent)
connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
SLOT(currentItemChanged(QTreeWidgetItem *)));
connect(this, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
SLOT(activated(QTreeWidgetItem *)));
SLOT(activated(QTreeWidgetItem *)));
}
void ObjectTree::setEngineDebug(QmlEngineDebug *client)
@@ -64,7 +64,7 @@ void ObjectTree::reload(int objectDebugId)
{
if (!m_client)
return;
if (m_query) {
delete m_query;
m_query = 0;
@@ -74,7 +74,7 @@ void ObjectTree::reload(int objectDebugId)
if (!m_query->isWaiting())
objectFetched();
else
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
this, SLOT(objectFetched()));
}
@@ -150,7 +150,7 @@ void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *
void ObjectTree::dump(const QmlDebugContextReference &ctxt, int ind)
{
QByteArray indent(ind * 4, ' ');
qWarning().nospace() << indent.constData() << ctxt.debugId() << " "
qWarning().nospace() << indent.constData() << ctxt.debugId() << " "
<< qPrintable(ctxt.name());
for (int ii = 0; ii < ctxt.contexts().count(); ++ii)
@@ -164,7 +164,7 @@ void ObjectTree::dump(const QmlDebugObjectReference &obj, int ind)
{
QByteArray indent(ind * 4, ' ');
qWarning().nospace() << indent.constData() << qPrintable(obj.className())
<< " " << qPrintable(obj.name()) << " "
<< " " << qPrintable(obj.name()) << " "
<< obj.debugId();
for (int ii = 0; ii < obj.children().count(); ++ii)
@@ -212,8 +212,8 @@ void ObjectTree::mousePressEvent(QMouseEvent *me)
bool ok = false;
QString watch = QInputDialog::getText(this, tr("Watch expression"),
tr("Expression:"), QLineEdit::Normal, QString(), &ok);
if (ok && !watch.isEmpty())
if (ok && !watch.isEmpty())
emit expressionWatchRequested(obj, watch);
}
}
}
}

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

@@ -49,7 +49,7 @@ public:
ObjectTree(QmlEngineDebug *client = 0, QWidget *parent = 0);
void setEngineDebug(QmlEngineDebug *client);
signals:
void currentObjectChanged(const QmlDebugObjectReference &);
void activated(const QmlDebugObjectReference &);

2
src/plugins/qmlinspector/components/standalone.pro
View File

@@ -8,7 +8,7 @@ HEADERS += $$PWD/qmldebugger.h \
SOURCES += $$PWD/qmldebugger.cpp \
$$PWD/engine.cpp \
$$PWD/main.cpp
$$PWD/main.cpp
RESOURCES += $$PWD/qmldebugger.qrc
OTHER_FILES += $$PWD/engines.qml

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

@@ -46,7 +46,7 @@ WatchTableModel::WatchTableModel(QmlEngineDebug *client, QObject *parent)
}
WatchTableModel::~WatchTableModel()
{
{
for (int i=0; i<m_columns.count(); ++i)
delete m_columns[i].watch;
}
@@ -263,7 +263,7 @@ void WatchTableModel::expressionWatchRequested(const QmlDebugObjectReference &ob
{
if (!m_client)
return;
QmlDebugWatch *watch = m_client->addWatch(obj, expr, this);
if (watch->state() == QmlDebugWatch::Dead) {
@@ -279,7 +279,7 @@ void WatchTableModel::removeWatchAt(int column)
{
if (!m_client)
return;
QmlDebugWatch *watch = findWatch(column);
if (watch) {
m_client->removeWatch(watch);
@@ -293,7 +293,7 @@ void WatchTableModel::removeAllWatches()
for (int i=0; i<m_columns.count(); ++i) {
if (m_client)
m_client->removeWatch(m_columns[i].watch);
else
else
delete m_columns[i].watch;
}
m_columns.clear();
@@ -323,7 +323,7 @@ void WatchTableHeaderView::mousePressEvent(QMouseEvent *me)
if (QMenu::exec(actions, me->globalPos()))
m_model->removeWatchAt(col);
}
}
}
}

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

@@ -53,7 +53,7 @@ public:
~WatchTableModel();
void setEngineDebug(QmlEngineDebug *client);
QmlDebugWatch *findWatch(int column) const;
int columnForWatch(QmlDebugWatch *watch) const;

2
src/plugins/qmlinspector/inspectoroutputpane.h
View File

@@ -27,7 +27,7 @@
**
**************************************************************************/
#ifndef INSPECTOROUTPUTPANE_H
#define INSPECTOROUTPUTPANE_H
#define INSPECTOROUTPUTPANE_H
#include <coreplugin/ioutputpane.h>

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

@@ -38,13 +38,13 @@ namespace QmlInspector {
const char * const C_INSPECTOR = "QmlInspector";
};
class StartParameters
{
public:
StartParameters() : port(0) {}
~StartParameters() {}
QString address;
quint16 port;
};

38
src/plugins/qmlinspector/qmlinspectormode.cpp
View File

@@ -157,7 +157,7 @@ QmlInspectorMode::QmlInspectorMode(QObject *parent)
m_client(0),
m_engineQuery(0),
m_contextQuery(0)
{
{
m_watchTableModel = new WatchTableModel(0, this);
setWidget(createModeWindow());
@@ -240,7 +240,7 @@ void QmlInspectorMode::connectionStateChanged()
m_watchTableModel->setEngineDebug(m_client);
m_expressionWidget->setEngineDebug(m_client);
}
m_objectTreeWidget->clear();
m_propertiesWidget->clear();
m_expressionWidget->clear();
@@ -301,7 +301,7 @@ QWidget *QmlInspectorMode::createMainView()
treeWindowLayout->setMargin(0);
treeWindowLayout->setSpacing(0);
treeWindowLayout->addWidget(treeOptionBar);
treeWindowLayout->addWidget(m_objectTreeWidget);
treeWindowLayout->addWidget(m_objectTreeWidget);
Core::MiniSplitter *documentAndTree = new Core::MiniSplitter;
documentAndTree->addWidget(editorAndFindWidget);
@@ -317,26 +317,26 @@ QWidget *QmlInspectorMode::createMainView()
QHBoxLayout *configBarLayout = new QHBoxLayout(configBar);
configBarLayout->setMargin(0);
configBarLayout->setSpacing(5);
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = core->actionManager();
configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::DEBUG)->action()));
configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::STOP)->action()));
configBarLayout->addStretch();
QWidget *widgetAboveTabs = new QWidget;
QVBoxLayout *widgetAboveTabsLayout = new QVBoxLayout(widgetAboveTabs);
widgetAboveTabsLayout->setMargin(0);
widgetAboveTabsLayout->setSpacing(0);
widgetAboveTabsLayout->setSpacing(0);
widgetAboveTabsLayout->addWidget(documentAndTree);
widgetAboveTabsLayout->addWidget(configBar);
Core::MiniSplitter *mainSplitter = new Core::MiniSplitter(Qt::Vertical);
widgetAboveTabsLayout->addWidget(configBar);
Core::MiniSplitter *mainSplitter = new Core::MiniSplitter(Qt::Vertical);
mainSplitter->addWidget(widgetAboveTabs);
mainSplitter->addWidget(createBottomWindow());
mainSplitter->setStretchFactor(0, 3);
mainSplitter->setStretchFactor(1, 1);
mainSplitter->setStretchFactor(1, 1);
QWidget *centralWidget = new QWidget;
QVBoxLayout *centralLayout = new QVBoxLayout(centralWidget);
@@ -345,7 +345,7 @@ QWidget *QmlInspectorMode::createMainView()
centralLayout->addWidget(mainSplitter);
mainWindow->setCentralWidget(centralWidget);
return mainWindow;
}
@@ -356,13 +356,13 @@ QWidget *QmlInspectorMode::createBottomWindow()
win->setDocumentMode(true);
win->setTrackingEnabled(true);
Core::MiniSplitter *leftSplitter = new Core::MiniSplitter(Qt::Vertical);
Core::MiniSplitter *leftSplitter = new Core::MiniSplitter(Qt::Vertical);
leftSplitter->addWidget(m_propertiesWidget);
leftSplitter->addWidget(m_expressionWidget);
leftSplitter->setStretchFactor(0, 2);
leftSplitter->setStretchFactor(1, 1);
Core::MiniSplitter *propSplitter = new Core::MiniSplitter(Qt::Horizontal);
Core::MiniSplitter *propSplitter = new Core::MiniSplitter(Qt::Horizontal);
propSplitter->addWidget(leftSplitter);
propSplitter->addWidget(m_watchTableView);
propSplitter->setStretchFactor(0, 2);
@@ -411,7 +411,7 @@ void QmlInspectorMode::initWidgets()
// FancyMainWindow uses widgets' window titles for tab labels
m_objectTreeWidget->setWindowTitle(tr("Object Tree"));
m_frameRateWidget->setWindowTitle(tr("Frame rate"));
m_watchTableView->setModel(m_watchTableModel);
WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel);
m_watchTableView->setHorizontalHeader(header);
@@ -435,7 +435,7 @@ void QmlInspectorMode::initWidgets()
m_watchTableView, SLOT(scrollToBottom()));
connect(m_watchTableView, SIGNAL(objectActivated(int)),
m_objectTreeWidget, SLOT(setCurrentObject(int)));
m_objectTreeWidget, SLOT(setCurrentObject(int)));
connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QmlDebugObjectReference)),
m_expressionWidget, SLOT(setCurrentObject(QmlDebugObjectReference)));
@@ -443,7 +443,7 @@ void QmlInspectorMode::initWidgets()
m_engineSpinBox = new EngineSpinBox;
m_engineSpinBox->setEnabled(false);
connect(m_engineSpinBox, SIGNAL(valueChanged(int)),
SLOT(queryEngineContext(int)));
SLOT(queryEngineContext(int)));
}
void QmlInspectorMode::reloadEngines()
@@ -459,8 +459,8 @@ void QmlInspectorMode::reloadEngines()
if (!m_engineQuery->isWaiting())
enginesChanged();
else
QObject::connect(m_engineQuery, SIGNAL(stateChanged(QmlDebugQuery::State)),
this, SLOT(enginesChanged()));
QObject::connect(m_engineQuery, SIGNAL(stateChanged(QmlDebugQuery::State)),
this, SLOT(enginesChanged()));
}
void QmlInspectorMode::enginesChanged()

14
src/plugins/qmlinspector/qmlinspectormode.h
View File

@@ -53,7 +53,7 @@ class ObjectPropertiesView;
class CanvasFrameRate;
class ExpressionQueryWidget;
class EngineSpinBox;
class QmlInspectorMode : public Core::BaseMode
{
@@ -61,13 +61,13 @@ class QmlInspectorMode : public Core::BaseMode
public:
QmlInspectorMode(QObject *parent = 0);
signals:
void statusMessage(const QString &text);
public slots:
public slots:
void connectToViewer(); // using host, port from widgets
void disconnectFromViewer();
void disconnectFromViewer();
private slots:
void connectionStateChanged();
@@ -84,13 +84,13 @@ private:
void initWidgets();
QWidget *createBottomWindow();
QToolButton *createToolButton(QAction *action);
QmlDebugConnection *m_conn;
QmlEngineDebug *m_client;
QmlDebugEnginesQuery *m_engineQuery;
QmlDebugRootContextQuery *m_contextQuery;
ObjectTree *m_objectTreeWidget;
ObjectPropertiesView *m_propertiesWidget;
WatchTableModel *m_watchTableModel;

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

@@ -109,7 +109,7 @@ void QmlInspectorPlugin::extensionsInitialized()
void QmlInspectorPlugin::currentModeChanged(Core::IMode *mode)
{
if (mode == m_inspectMode)
if (mode == m_inspectMode)
m_inspectMode->connectToViewer();
}