From f9b6832edf57f167b00d131337aad7cbc9ad75ba Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 11 Feb 2010 13:21:38 +0100
Subject: [PATCH] debugger: code cosmetics
---
src/plugins/debugger/gdb/gdbengine.cpp | 24 +++++++-----------------
src/plugins/debugger/gdb/gdbengine.h | 3 ++-
src/plugins/debugger/watchhandler.cpp | 6 ++++--
3 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 543894e7cfb..3d458f8d924 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1704,9 +1704,11 @@ void GdbEngine::startDebugger(const DebuggerStartParametersPtr &sp)
unsigned GdbEngine::debuggerCapabilities() const
{
- return ReverseSteppingCapability | SnapshotCapability | AutoDerefPointersCapability
- | DisassemblerCapability | RegisterCapability | ShowMemoryCapability
- | JumpToLineCapability | ReloadModuleCapability | ReloadModuleSymbolsCapability;
+ return ReverseSteppingCapability | SnapshotCapability
+ | AutoDerefPointersCapability | DisassemblerCapability
+ | RegisterCapability | ShowMemoryCapability
+ | JumpToLineCapability | ReloadModuleCapability
+ | ReloadModuleSymbolsCapability;
}
void GdbEngine::continueInferiorInternal()
@@ -3465,24 +3467,12 @@ void GdbEngine::insertData(const WatchData &data0)
manager()->watchHandler()->insertData(data);
}
-
-#if 0
-void GdbEngine::handleChangedItem(QStandardItem *item)
-{
- // HACK: Just store the item for the slot
- // handleChangedItem(QWidget *widget) below.
- QModelIndex index = item->index().sibling(item->index().row(), 0);
- //WatchData data = m_currentSet.takeData(iname);
- //m_editedData = inameFromItem(m_model.itemFromIndex(index)).exp;
- //qDebug() << "HANDLE CHANGED EXPRESSION:" << m_editedData;
-}
-#endif
-
void GdbEngine::assignValueInDebugger(const QString &expression, const QString &value)
{
postCommand("-var-delete assign");
postCommand("-var-create assign * " + expression.toLatin1());
- postCommand("-var-assign assign " + value.toLatin1(), Discardable, CB(handleVarAssign));
+ postCommand("-var-assign assign " + value.toLatin1(),
+ Discardable, CB(handleVarAssign));
}
QString GdbEngine::qtDumperLibraryName() const
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index b8c6acffba3..59dc952e84a 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -421,7 +421,8 @@ private: ////////// View & Data Stuff //////////
//
// Watch specific stuff
//
- virtual void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos);
+ virtual void setToolTipExpression(const QPoint &mousePos,
+ TextEditor::ITextEditor *editor, int cursorPos);
virtual void assignValueInDebugger(const QString &expr, const QString &value);
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 35a9545c7b8..18b1757eb32 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1235,7 +1235,8 @@ void WatchHandler::insertData(const WatchData &data)
{
MODEL_DEBUG("INSERTDATA: " << data.toString());
if (!data.isValid()) {
- qWarning("%s:%d: Attempt to insert invalid watch item: %s", __FILE__, __LINE__, qPrintable(data.toString()));
+ qWarning("%s:%d: Attempt to insert invalid watch item: %s",
+ __FILE__, __LINE__, qPrintable(data.toString()));
return;
}
if (data.isSomethingNeeded() && data.iname.contains('.')) {
@@ -1280,7 +1281,8 @@ void WatchHandler::insertBulkData(const QList<WatchData> &list)
if (data.isValid()) {
hash[parentName(data.iname)].append(data);
} else {
- qWarning("%s:%d: Attempt to bulk-insert invalid watch item: %s", __FILE__, __LINE__, qPrintable(data.toString()));
+ qWarning("%s:%d: Attempt to bulk-insert invalid watch item: %s",
+ __FILE__, __LINE__, qPrintable(data.toString()));
}
}
foreach (const QByteArray &parentIName, hash.keys()) {
--
GitLab