Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

67 files changed, 235 insertions, 235 deletions

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index f7d6be752a..372ea133f4 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -130,7 +130,7 @@ public:
         //    return;
         if (m_data->markerLineNumber != lineNumber) {
             m_data->markerLineNumber = lineNumber;
-            // FIXME: should we tell gdb about the change? 
+            // FIXME: should we tell gdb about the change?
             // Ignore it for now, as we would require re-compilation
             // and debugger re-start anyway.
             if (0 && !m_data->bpLineNumber.isEmpty()) {
@@ -171,10 +171,10 @@ BreakpointData::BreakpointData(BreakHandler *handler)
     bpMultiple = false;
 //#if defined(Q_OS_MAC)
 //    // full names do not work on Mac/MI
-    useFullPath = false; 
+    useFullPath = false;
 //#else
 //    //where = m_manager->shortName(data->fileName);
-//    useFullPath = true; 
+//    useFullPath = true;
 //#endif
 }
 
@@ -512,7 +512,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
                 //    str = data->markerFileName;
                 str = str.isEmpty() ? empty : str;
                 if (data->useFullPath)
-                    str = "/.../" + str; 
+                    str = "/.../" + str;
                 return str;
             }
             if (role == Qt::UserRole)
@@ -595,7 +595,7 @@ bool BreakHandler::setData(const QModelIndex &mi, const QVariant &value, int rol
             }
             return true;
         }
-        default: { 
+        default: {
             return false;
         }
     }
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 35b6fdba66..05809ff593 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -318,7 +318,7 @@ void BreakWindow::resizeColumnsToContents()
 void BreakWindow::setAlwaysResizeColumnsToContents(bool on)
 {
     m_alwaysResizeColumnsToContents = on;
-    QHeaderView::ResizeMode mode = on 
+    QHeaderView::ResizeMode mode = on
         ? QHeaderView::ResizeToContents : QHeaderView::Interactive;
     for (int i = model()->columnCount(); --i >= 0; )
         header()->setResizeMode(i, mode);
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.cpp b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
index ba90e6a3a9..5c81b37151 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.cpp
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
@@ -105,7 +105,7 @@ void CDBBreakPoint::clear()
      ignoreCount = 0;
      oneShot = false;
      enabled = true;
-     clearExpressionData();     
+     clearExpressionData();
 }
 
 void CDBBreakPoint::clearExpressionData()
@@ -516,7 +516,7 @@ bool CDBBreakPoint::synchronizeBreakPoints(CIDebugControl* debugControl,
                                            CIDebugSymbols *syms,
                                            BreakHandler *handler,
                                            QString *errorMessage, QStringList *warnings)
-{    
+{
     errorMessage->clear();
     warnings->clear();
     // Do an initial check whether we are in a state that allows
diff --git a/src/plugins/debugger/cdb/cdbcore.pri b/src/plugins/debugger/cdb/cdbcore.pri
index 1232f516b6..045b0c6382 100644
--- a/src/plugins/debugger/cdb/cdbcore.pri
+++ b/src/plugins/debugger/cdb/cdbcore.pri
@@ -1,5 +1,5 @@
 # Detect presence of "Debugging Tools For Windows"
-# in case VS compilers are used.      
+# in case VS compilers are used.
 
 win32 {
 contains(QMAKE_CXX, cl) {
@@ -27,7 +27,7 @@ HEADERS += \
     $$PWD/coreengine.h \
     $$PWD/debugoutputbase.h \
     $$PWD/debugeventcallbackbase.h
-SOURCES += \    
+SOURCES += \
     $$PWD/coreengine.cpp \
     $$PWD/debugoutputbase.cpp \
     $$PWD/debugeventcallbackbase.cpp
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index 26f269581e..b5c8c26086 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -126,7 +126,7 @@ CdbDebugEnginePrivate::CdbDebugEnginePrivate(DebuggerManager *manager,
     m_eventThreadId(-1),
     m_interruptArticifialThreadId(-1),
     m_ignoreInitialBreakPoint(false),
-    m_interrupted(false),    
+    m_interrupted(false),
     m_engine(engine),
     m_currentStackTrace(0),
     m_firstActivatedFrame(true),
@@ -454,7 +454,7 @@ bool CdbDebugEngine::startDebuggerWithExecutable(DebuggerStartMode sm, QString *
 }
 
 void CdbDebugEnginePrivate::processCreatedAttached(ULONG64 processHandle, ULONG64 initialThreadHandle)
-{   
+{
     m_engine->setState(InferiorRunningRequested, Q_FUNC_INFO, __LINE__);
     setDebuggeeHandles(reinterpret_cast<HANDLE>(processHandle), reinterpret_cast<HANDLE>(initialThreadHandle));
     ULONG currentThreadId;
@@ -747,7 +747,7 @@ bool CdbDebugEngine::step(unsigned long executionStatus)
             str << 'p';
             break;
         case DEBUG_STATUS_STEP_INTO:
-            str << 't';            
+            str << 't';
             break;
         case CdbExtendedExecutionStatusStepOut:
             str << "gu";
@@ -784,7 +784,7 @@ void CdbDebugEngine::nextExec()
 }
 
 void CdbDebugEngine::stepIExec()
-{      
+{
     stepExec(); // Step into by instruction (figured out by step)
 }
 
@@ -801,7 +801,7 @@ void CdbDebugEngine::stepOutExec()
 
 void CdbDebugEngine::continueInferior()
 {
-    QString errorMessage;    
+    QString errorMessage;
     if  (!m_d->continueInferior(&errorMessage))
         warning(msgFunctionFailed(Q_FUNC_INFO, errorMessage));
 }
@@ -979,7 +979,7 @@ void CdbDebugEngine::activateFrame(int frameIndex)
     QString errorMessage;
     bool success = false;
     StackHandler *stackHandler = manager()->stackHandler();
-    do {        
+    do {
         WatchHandler *watchHandler = manager()->watchHandler();
         const int oldIndex = stackHandler->currentIndex();
         if (frameIndex >= stackHandler->stackSize()) {
@@ -1091,7 +1091,7 @@ void CdbDebugEngine::fetchDisassembler(DisassemblerViewAgent *agent,
     bool ok = false;
     QString errorMessage;
     do {
-        // get address       
+        // get address
         QString address;
         if (!frame.file.isEmpty())
             address = frame.address;
@@ -1348,7 +1348,7 @@ bool CdbDebugEnginePrivate::setCDBThreadId(unsigned long threadId, QString *erro
         return false;
     }
     const QString msg = CdbDebugEngine::tr("Changing threads: %1 -> %2").arg(currentThreadId).arg(threadId);
-    m_engine->showStatusMessage(msg, 500);    
+    m_engine->showStatusMessage(msg, 500);
     return true;
 }
 
@@ -1423,7 +1423,7 @@ void CdbDebugEnginePrivate::updateStackTrace()
             break;
         }
     // Visibly warn the users about missing top frames/all frames, as they otherwise
-    // might think stepping is broken.    
+    // might think stepping is broken.
     if (!stackFrames.at(0).isUsable()) {
         const QString topFunction = count ? stackFrames.at(0).function : QString();
         const QString msg = current >= 0 ?
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.h b/src/plugins/debugger/cdb/cdbdebugengine.h
index 52fb70119d..0f900560d0 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine.h
@@ -73,8 +73,8 @@ public:
     virtual void nextExec();
     virtual void stepIExec();
     virtual void nextIExec();
-    
-    virtual void continueInferior();    
+
+    virtual void continueInferior();
     virtual void interruptInferior();
 
     virtual void runToLineExec(const QString &fileName, int lineNumber);
@@ -107,7 +107,7 @@ public slots:
 private slots:
     void slotConsoleStubStarted();
     void slotConsoleStubError(const QString &msg);
-    void slotConsoleStubTerminated();    
+    void slotConsoleStubTerminated();
     void slotBreakAttachToCrashed();
     void warning(const QString &w);
 
diff --git a/src/plugins/debugger/cdb/cdbdebugengine_p.h b/src/plugins/debugger/cdb/cdbdebugengine_p.h
index 55e7287723..fe6c2a5b61 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine_p.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine_p.h
@@ -109,7 +109,7 @@ public:
     const QSharedPointer<CdbOptions>  m_options;
     HANDLE                  m_hDebuggeeProcess;
     HANDLE                  m_hDebuggeeThread;
-    bool                    m_interrupted;    
+    bool                    m_interrupted;
     int                     m_currentThreadId;
     int                     m_eventThreadId;
     int                     m_interruptArticifialThreadId;
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index 10f9405e65..164b0ad3cc 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -286,7 +286,7 @@ void CdbDumperInitThread ::run()
     case CdbDumperHelper::Loaded: // Injection load succeeded, ideally
         break;
     }
-    // Perform remaining initialization    
+    // Perform remaining initialization
     emit statusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Initializing dumpers..."), 60000);
     m_ok = m_helper.initResolveSymbols(m_errorMessage) && m_helper.initKnownTypes(m_errorMessage);
 }
@@ -594,7 +594,7 @@ CdbDumperHelper::DumpResult CdbDumperHelper::dumpTypeI(const WatchData &wd, bool
 {
     errorMessage->clear();
     // Check failure cache and supported types
-    if (m_state == Disabled) {        
+    if (m_state == Disabled) {
         *errorMessage =m_msgDisabled;
         return DumpNotHandled;
     }
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.h b/src/plugins/debugger/cdb/cdbdumperhelper.h
index b4173b5664..00fedec121 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.h
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.h
@@ -85,7 +85,7 @@ public:
         Initialized, // List of types, etc. retrieved
     };
 
-    explicit CdbDumperHelper(DebuggerManager *manager,                             
+    explicit CdbDumperHelper(DebuggerManager *manager,
                              CdbCore::CoreEngine *coreEngine);
     ~CdbDumperHelper();
 
diff --git a/src/plugins/debugger/cdb/cdbexceptionutils.cpp b/src/plugins/debugger/cdb/cdbexceptionutils.cpp
index a68544f7bc..d0d61663cf 100644
--- a/src/plugins/debugger/cdb/cdbexceptionutils.cpp
+++ b/src/plugins/debugger/cdb/cdbexceptionutils.cpp
@@ -85,7 +85,7 @@ ExceptionBlocker::ExceptionBlocker(CIDebugControl *ctrl, ULONG code, Mode m) :
 {
     // Retrieve current state
     memset(&m_oldParameters, 0, sizeof(DEBUG_EXCEPTION_FILTER_PARAMETERS));
-    if (getExceptionParameters(ctrl, code, &m_oldParameters, &m_errorString)) {        
+    if (getExceptionParameters(ctrl, code, &m_oldParameters, &m_errorString)) {
         // Are we in a nested instantiation?
         const ULONG desiredExOption = m == IgnoreException ? DEBUG_FILTER_IGNORE : DEBUG_FILTER_OUTPUT;
         const bool isAlreadyBlocked = m_oldParameters.ExecutionOption == desiredExOption
diff --git a/src/plugins/debugger/cdb/cdbmodules.cpp b/src/plugins/debugger/cdb/cdbmodules.cpp
index dbb12f7f0c..902410d08f 100644
--- a/src/plugins/debugger/cdb/cdbmodules.cpp
+++ b/src/plugins/debugger/cdb/cdbmodules.cpp
@@ -64,7 +64,7 @@ bool getModuleNameList(CIDebugSymbols *syms, QStringList *modules, QString *erro
 }
 
 bool getModuleList(CIDebugSymbols *syms, QList<Module> *modules, QString *errorMessage)
-{    
+{
     ULONG count;
     modules->clear();
     if (!getModuleCount(syms, &count, errorMessage))
@@ -105,7 +105,7 @@ bool getModuleList(CIDebugSymbols *syms, QList<Module> *modules, QString *errorM
 bool searchSymbols(CIDebugSymbols *syms, const QString &pattern,
                    QStringList *matches, QString *errorMessage)
 {
-    matches->clear();    
+    matches->clear();
     ULONG64 handle = 0;
     // E_NOINTERFACE means "no match". Apparently, it does not always
     // set handle.
diff --git a/src/plugins/debugger/cdb/cdbstackframecontext.cpp b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
index 90d0e3e4e8..7aceaae910 100644
--- a/src/plugins/debugger/cdb/cdbstackframecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
@@ -131,7 +131,7 @@ WatchHandleDumperInserter::WatchHandleDumperInserter(WatchHandler *wh,
 
 // Prevent recursion of the model by setting value and type
 static inline bool fixDumperType(WatchData *wd, const WatchData *source = 0)
-{    
+{
     const bool missing = wd->isTypeNeeded() || wd->type.isEmpty();
     if (missing) {
         static const QString unknownType = QCoreApplication::translate("CdbStackFrameContext", "<Unknown Type>");
diff --git a/src/plugins/debugger/cdb/cdbstackframecontext.h b/src/plugins/debugger/cdb/cdbstackframecontext.h
index 61f77a91a4..99f1464f02 100644
--- a/src/plugins/debugger/cdb/cdbstackframecontext.h
+++ b/src/plugins/debugger/cdb/cdbstackframecontext.h
@@ -54,7 +54,7 @@ public:
 
     explicit CdbStackFrameContext(const QSharedPointer<CdbDumperHelper> &dumper,
                                   CdbSymbolGroupContext *symbolContext);
-    ~CdbStackFrameContext();   
+    ~CdbStackFrameContext();
 
     bool assignValue(const QString &iname, const QString &value,
                      QString *newValue /* = 0 */, QString *errorMessage);
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
index bc9143032a..b79b7fe824 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
@@ -59,7 +59,7 @@ CdbStackTraceContext::CdbStackTraceContext(const QSharedPointer<CdbDumperHelper>
 CdbStackTraceContext *CdbStackTraceContext::create(const QSharedPointer<CdbDumperHelper> &dumper,
                                                    unsigned long threadId,
                                                    QString *errorMessage)
-{    
+{
     if (debugCDB)
         qDebug() << Q_FUNC_INFO << threadId;
     // fill the DEBUG_STACK_FRAME array
@@ -125,7 +125,7 @@ bool CdbStackTraceContext::init(unsigned long frameCount, QString * /*errorMessa
 }
 
 int CdbStackTraceContext::indexOf(const QString &function) const
-{    
+{
 
     const QChar exclamationMark = QLatin1Char('!');
     const int count = m_frames.size();
@@ -171,7 +171,7 @@ CdbStackFrameContext *CdbStackTraceContext::frameContextAt(int index, QString *e
     }
     // Exclude uninitialized variables if desired
     QStringList uninitializedVariables;
-    if (theDebuggerAction(UseCodeModel)->isChecked()) {        
+    if (theDebuggerAction(UseCodeModel)->isChecked()) {
         const StackFrame &frame = m_frames.at(index);
         getUninitializedVariables(DebuggerManager::instance()->cppCodeModelSnapshot(), frame.function, frame.file, frame.line, &uninitializedVariables);
     }
@@ -268,7 +268,7 @@ static inline bool getStoppedThreadState(const CdbCore::ComInterfaces &cif,
     }
     ULONG frameCount;
     // Ignore the top frame if it is "ntdll!KiFastSystemCallRet", which is
-    // not interesting for display.    
+    // not interesting for display.
     DEBUG_STACK_FRAME frames[MaxFrames];
     hr = cif.debugControl->GetStackTrace(0, 0, 0, frames, MaxFrames, &frameCount);
     if (FAILED(hr)) {
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.h b/src/plugins/debugger/cdb/cdbstacktracecontext.h
index 873fa7404a..1e3a65a0da 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.h
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.h
@@ -58,7 +58,7 @@ struct ThreadData;
  * Maintains an on-demand constructed list of CdbStackFrameContext
  * containining the local variables of the stack. */
 
-class CdbStackTraceContext        
+class CdbStackTraceContext
 {
     Q_DISABLE_COPY(CdbStackTraceContext)
 
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index 2547918b38..e8c25bd90b 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -413,7 +413,7 @@ static bool inline getUnsignedHexValue(QString stringValue, quint64 *value)
         return false;
     stringValue.remove(0, 2);
     // Remove 64bit separator
-    if (stringValue.size() > 9) {       
+    if (stringValue.size() > 9) {
         const int sepPos = stringValue.size() - 9;
         if (stringValue.at(sepPos) == QLatin1Char('`'))
             stringValue.remove(sepPos, 1);
@@ -489,8 +489,8 @@ WatchData CdbSymbolGroupContext::watchDataAt(unsigned long index) const
     const QString fullShadowedName = WatchData::shadowedName(name, shadowedNumber);
     wd.name = WatchData::shadowedName(removeInnerTemplateType(name), shadowedNumber);
     wd.addr = hexSymbolOffset(m_symbolGroup, index);
-    const QString type = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);    
-    wd.setType(type);    
+    const QString type = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);
+    wd.setType(type);
     // Check for uninitialized variables at level 0 only.
     const DEBUG_SYMBOL_PARAMETERS &p = m_symbolParameters.at(index);
     if (p.ParentSymbol == DEBUG_ANY_ID && m_uninitializedVariables.contains(fullShadowedName)) {
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
index b99cbf1549..d3f63b282b 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
@@ -74,7 +74,7 @@ class CdbSymbolGroupContext
 
 public:
     ~CdbSymbolGroupContext();
-    static CdbSymbolGroupContext *create(const QString &prefix,                                         
+    static CdbSymbolGroupContext *create(const QString &prefix,
                                          CIDebugSymbolGroup *symbolGroup,
                                          const QStringList &uninitializedVariables,
                                          QString *errorMessage);
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index da2dd21175..ae9f94bdce 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -77,7 +77,7 @@ FORMS += attachexternaldialog.ui \
     startexternaldialog.ui \
     startremotedialog.ui
 RESOURCES += debugger.qrc
-false { 
+false {
     SOURCES += $$PWD/modeltest.cpp
     HEADERS += $$PWD/modeltest.h
     DEFINES += USE_MODEL_TEST=1
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 57bbe853bf..2f05b16231 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -60,7 +60,7 @@ DebuggerSettings::~DebuggerSettings()
 {
     qDeleteAll(m_items);
 }
-    
+
 void DebuggerSettings::insertItem(int code, SavedAction *item)
 {
     QTC_ASSERT(!m_items.contains(code),
@@ -81,7 +81,7 @@ void DebuggerSettings::writeSettings(QSettings *settings) const
     foreach (SavedAction *item, m_items)
         item->writeSettings(settings);
 }
-   
+
 SavedAction *DebuggerSettings::item(int code) const
 {
     QTC_ASSERT(m_items.value(code, 0), qDebug() << "CODE: " << code; return 0);
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index b8519994b7..36a3271caf 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -60,7 +60,7 @@ public slots:
     void writeSettings(QSettings *settings) const;
 
 private:
-    QHash<int, Utils::SavedAction *> m_items; 
+    QHash<int, Utils::SavedAction *> m_items;
 };
 
 
@@ -88,7 +88,7 @@ enum DebuggerActionCode
     DebugDebuggingHelpers,
 
     UseCodeModel,
-    
+
     UseToolTipsInMainEditor,
     UseToolTipsInLocalsView,
     UseToolTipsInBreakpointsView,
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index 317dd15008..820b48c949 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -76,7 +76,7 @@ MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, quint64 addr)
 }
 
 MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, const QString &addr)
-    : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager) 
+    : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager)
 {
     bool ok = true;
     init(addr.toULongLong(&ok, 0));
@@ -242,7 +242,7 @@ void DisassemblerViewAgent::setFrame(const StackFrame &frame)
             setContents(*it);
             return;
         }
-    } 
+    }
     IDebuggerEngine *engine = d->manager->currentEngine();
     QTC_ASSERT(engine, return);
     engine->fetchDisassembler(this, frame);
@@ -296,7 +296,7 @@ void DisassemblerViewAgent::setContents(const QString &contents)
 bool DisassemblerViewAgent::contentsCoversAddress(const QString &contents) const
 {
     QTC_ASSERT(d, return false);
-    for (int pos = 0, line = 0; ; ++line, ++pos) { 
+    for (int pos = 0, line = 0; ; ++line, ++pos) {
         if (contents.midRef(pos, d->frame.address.size()) == d->frame.address)
             return true;
         pos = contents.indexOf('\n', pos + 1);
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index a556054e48..381ea9cf95 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -118,7 +118,7 @@ enum LogChannel
     LogStatus,              // Used for status changed messages
     LogTime,                // Used for time stamp messages
     LogDebug,
-    LogMisc    
+    LogMisc
 };
 
 } // namespace Debugger
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 3666b848aa..b3f1f9e0f0 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -391,9 +391,9 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent)
     m_ui->serverStartScript->setExpectedKind(Utils::PathChooser::File);
     m_ui->serverStartScript->setPromptDialogTitle(tr("Select Start Script"));
 
-    connect(m_ui->useServerStartScriptCheckBox, SIGNAL(toggled(bool)), 
+    connect(m_ui->useServerStartScriptCheckBox, SIGNAL(toggled(bool)),
         this, SLOT(updateState()));
-    
+
     connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index ee3e910e65..4b013f53b7 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -659,7 +659,7 @@ void DebuggerManager::setSimpleDockWidgetArrangement()
     }
 
     foreach (QDockWidget *dockWidget, dockWidgets) {
-        if (dockWidget == d->m_outputDock) 
+        if (dockWidget == d->m_outputDock)
             d->m_mainWindow->addDockWidget(Qt::TopDockWidgetArea, dockWidget);
         else
             d->m_mainWindow->addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
@@ -985,7 +985,7 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
             d->m_startParameters->toolChainType, &errorMessage);
         break;
     default:
-        d->m_engine = determineDebuggerEngine(d->m_startParameters->executable, 
+        d->m_engine = determineDebuggerEngine(d->m_startParameters->executable,
             d->m_startParameters->toolChainType, &errorMessage, &settingsIdHint);
         break;
     }
@@ -1439,7 +1439,7 @@ void DebuggerManager::showDebuggerInput(int channel, const QString &msg)
 {
     if (d->m_outputWindow)
         emit emitShowInput(channel, msg);
-    else 
+    else
         qDebug() << "INPUT: " << channel << msg;
 }
 
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index bda0111543..7332dec37f 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -140,8 +140,8 @@ enum DebuggerEngineTypeFlags
     ScriptEngineType  = 0x02,
     CdbEngineType     = 0x04,
     AllEngineTypes = GdbEngineType
-        | ScriptEngineType 
-        | CdbEngineType 
+        | ScriptEngineType
+        | CdbEngineType
 };
 
 QDebug operator<<(QDebug d, DebuggerState state);
@@ -283,7 +283,7 @@ private:
     Internal::ThreadsHandler *threadsHandler() const;
     Internal::WatchHandler *watchHandler() const;
     Internal::SourceFilesWindow *sourceFileWindow() const;
-    QWidget *threadsWindow() const;        
+    QWidget *threadsWindow() const;
 
     Internal::DebuggerManagerActions debuggerManagerActions() const;
 
diff --git a/src/plugins/debugger/debuggeroutputwindow.h b/src/plugins/debugger/debuggeroutputwindow.h
index c67719a4bd..696d5454fb 100644
--- a/src/plugins/debugger/debuggeroutputwindow.h
+++ b/src/plugins/debugger/debuggeroutputwindow.h
@@ -53,7 +53,7 @@ public:
 
     void bringPaneToForeground() { emit showPage(); }
     void setCursor(const QCursor &cursor);
-    
+
     QString combinedContents() const;
     QString inputContents() const;
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f65a4c6e5d..79bf69ae6c 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -352,16 +352,16 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
         m_ui.checkBoxUseMessageBoxForSignals);
     m_group.insert(theDebuggerAction(SkipKnownFrames),
         m_ui.checkBoxSkipKnownFrames);
-    m_group.insert(theDebuggerAction(UseToolTipsInMainEditor), 
+    m_group.insert(theDebuggerAction(UseToolTipsInMainEditor),
         m_ui.checkBoxUseToolTipsInMainEditor);
     m_group.insert(theDebuggerAction(AutoDerefPointers), 0);
     m_group.insert(theDebuggerAction(UseToolTipsInLocalsView), 0);
     m_group.insert(theDebuggerAction(UseToolTipsInBreakpointsView), 0);
     m_group.insert(theDebuggerAction(UseAddressInBreakpointsView), 0);
     m_group.insert(theDebuggerAction(UseAddressInStackView), 0);
-    m_group.insert(theDebuggerAction(EnableReverseDebugging), 
+    m_group.insert(theDebuggerAction(EnableReverseDebugging),
         m_ui.checkBoxEnableReverseDebugging);
-    m_group.insert(theDebuggerAction(MaximalStackDepth), 
+    m_group.insert(theDebuggerAction(MaximalStackDepth),
         m_ui.spinBoxMaximalStackDepth);
     m_group.insert(theDebuggerAction(GdbWatchdogTimeout), 0);
     m_group.insert(theDebuggerAction(ShowStdNamespace), 0);
@@ -432,7 +432,7 @@ public:
     virtual bool matches(const QString &s) const;
 
 private:
-    Ui::DebuggingHelperOptionPage m_ui;    
+    Ui::DebuggingHelperOptionPage m_ui;
     Utils::SavedActionSet m_group;
     QString m_searchKeywords;
 };
diff --git a/src/plugins/debugger/debuggertooltip.cpp b/src/plugins/debugger/debuggertooltip.cpp
index c26ba6a727..2ec8d86b40 100644
--- a/src/plugins/debugger/debuggertooltip.cpp
+++ b/src/plugins/debugger/debuggertooltip.cpp
@@ -125,7 +125,7 @@ int ToolTipWidget::computeHeight(const QModelIndex &index) const
     return s;
 }
 
-Q_SLOT void ToolTipWidget::computeSize() 
+Q_SLOT void ToolTipWidget::computeSize()
 {
     int columns = 0;
     for (int i = 0; i < 3; ++i) {
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h
index 8685e98a81..c36be54684 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.h
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.h
@@ -92,7 +92,7 @@ signals:
 
     // The adapter is still running just fine, but it failed to acquire a debuggee.
     void inferiorStartFailed(const QString &msg);
-    
+
 protected:
     DebuggerState state() const
         { return m_engine->state(); }
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 0de85f1525..f7fbb06722 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -160,7 +160,7 @@ void GdbEngine::runDebuggingHelperClassic(const WatchData &data0, bool dumpChild
         data.setValue(_("<unavailable>"));
         data.setHasChildren(false);
         insertData(data);
-        return; 
+        return;
     }
     m_processedNames.insert(processedName);
 
@@ -258,7 +258,7 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
         #if DEBUG_SUBITEM
         qDebug() << "IT'S A POINTER";
         #endif
-    
+
         if (theDebuggerBoolSetting(AutoDerefPointers)) {
             // Try automatic dereferentiation
             data.exp = "(*(" + data.exp + "))";
@@ -496,7 +496,7 @@ void GdbEngine::tryLoadDebuggingHelpersClassic()
         // Load at least gdb macro based dumpers.
         QFile file(_(":/gdb/gdbmacros.txt"));
         file.open(QIODevice::ReadOnly);
-        QByteArray contents = file.readAll(); 
+        QByteArray contents = file.readAll();
         m_debuggingHelperState = DebuggingHelperLoadTried;
         postCommand(contents);
         return;
@@ -574,7 +574,7 @@ void GdbEngine::updateAllClassic()
     if (supportsThreads())
         postCommand("-thread-list-ids", WatchUpdate, CB(handleStackListThreads), 0);
     manager()->reloadRegisters();
-    updateLocals(); 
+    updateLocals();
 }
 
 void GdbEngine::setDebugDebuggingHelpersClassic(const QVariant &on)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 02d03eab3d..3213b0830f 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -196,7 +196,7 @@ void GdbEngine::connectDebuggingHelperActions()
     connect(theDebuggerAction(RecheckDebuggingHelpers), SIGNAL(triggered()),
             this, SLOT(recheckDebuggingHelperAvailabilityClassic()));
 }
-   
+
 void GdbEngine::disconnectDebuggingHelperActions()
 {
     disconnect(theDebuggerAction(UseDebuggingHelpers), 0, this, 0);
@@ -395,8 +395,8 @@ void GdbEngine::handleResponse(const QByteArray &buff)
             while (from != to) {
                 GdbMi data;
                 if (*from != ',') {
-                    // happens on archer where we get 
-                    // 23^running <NL> *running,thread-id="all" <NL> (gdb) 
+                    // happens on archer where we get
+                    // 23^running <NL> *running,thread-id="all" <NL> (gdb)
                     result.m_type = GdbMi::Tuple;
                     break;
                 }
@@ -431,22 +431,22 @@ void GdbEngine::handleResponse(const QByteArray &buff)
                 showStatusMessage(tr("Library %1 unloaded.").arg(_(id)));
                 invalidateSourcesList();
             } else if (asyncClass == "thread-group-created") {
-                // Archer has "{id="28902"}" 
+                // Archer has "{id="28902"}"
                 QByteArray id = result.findChild("id").data();
                 showStatusMessage(tr("Thread group %1 created.").arg(_(id)));
                 int pid = id.toInt();
                 if (pid != inferiorPid())
                     handleInferiorPidChanged(pid);
             } else if (asyncClass == "thread-created") {
-                //"{id="1",group-id="28902"}" 
+                //"{id="1",group-id="28902"}"
                 QByteArray id = result.findChild("id").data();
                 showStatusMessage(tr("Thread %1 created.").arg(_(id)));
             } else if (asyncClass == "thread-group-exited") {
-                // Archer has "{id="28902"}" 
+                // Archer has "{id="28902"}"
                 QByteArray id = result.findChild("id").data();
                 showStatusMessage(tr("Thread group %1 exited.").arg(_(id)));
             } else if (asyncClass == "thread-exited") {
-                //"{id="1",group-id="28902"}" 
+                //"{id="1",group-id="28902"}"
                 QByteArray id = result.findChild("id").data();
                 QByteArray groupid = result.findChild("group-id").data();
                 showStatusMessage(tr("Thread %1 in group %2 exited.")
@@ -454,7 +454,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
             } else if (asyncClass == "thread-selected") {
                 QByteArray id = result.findChild("id").data();
                 showStatusMessage(tr("Thread %1 selected.").arg(_(id)));
-                //"{id="2"}" 
+                //"{id="2"}"
             #if defined(Q_OS_MAC)
             } else if (asyncClass == "shlibs-updated") {
                 // MAC announces updated libs
@@ -598,7 +598,7 @@ void GdbEngine::readGdbStandardError()
 
 void GdbEngine::readGdbStandardOutput()
 {
-    if (m_commandTimer->isActive()) 
+    if (m_commandTimer->isActive())
         m_commandTimer->start(); // Retrigger
 
     int newstart = 0;
@@ -665,7 +665,7 @@ void GdbEngine::maybeHandleInferiorPidChanged(const QString &pid0)
     }
     if (pid == inferiorPid())
         return;
-    debugMessage(_("FOUND PID %1").arg(pid));    
+    debugMessage(_("FOUND PID %1").arg(pid));
 
     handleInferiorPidChanged(pid);
 }
@@ -828,7 +828,7 @@ void GdbEngine::commandTimeout()
             "the operation.\nYou can choose between waiting "
             "longer or abort debugging.").arg(timeOut / 1000);
         QMessageBox *mb = showMessageBox(QMessageBox::Critical,
-            tr("Gdb not responding"), msg, 
+            tr("Gdb not responding"), msg,
             QMessageBox::Ok | QMessageBox::Cancel);
         mb->button(QMessageBox::Cancel)->setText(tr("Give gdb more time"));
         mb->button(QMessageBox::Ok)->setText(tr("Stop debugging"));
@@ -873,7 +873,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
                     tr("Executable failed"), QString::fromLocal8Bit(msg));
                 showStatusMessage(tr("Process failed to start."));
                 shutdown();
-            } else if (msg == "\"finish\" not meaningful in the outermost frame.") { 
+            } else if (msg == "\"finish\" not meaningful in the outermost frame.") {
                 // Handle a case known to appear on gdb 6.4 symbianelf when
                 // the stack is cut due to access to protected memory.
                 debugMessage(_("APPLYING WORKAROUND #2"));
@@ -1678,7 +1678,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter(const DebuggerStartParametersPtr &s
 void GdbEngine::startDebugger(const DebuggerStartParametersPtr &sp)
 {
     QTC_ASSERT(state() == EngineStarting, qDebug() << state());
-    // This should be set by the constructor or in exitDebugger() 
+    // This should be set by the constructor or in exitDebugger()
     // via initializeVariables()
     //QTC_ASSERT(m_debuggingHelperState == DebuggingHelperUninitialized,
     //    initializeVariables());
@@ -1967,7 +1967,7 @@ void GdbEngine::sendInsertBreakpoint(int index)
 
 void GdbEngine::reloadBreakListInternal()
 {
-    m_breakListUpdating = true; 
+    m_breakListUpdating = true;
     // "Discardable" as long as we do in each step
     postCommand("-break-list", NeedsStop | Discardable, CB(handleBreakList));
 }
@@ -2457,7 +2457,7 @@ void GdbEngine::handleStackSelectThread(const GdbResponse &)
     showStatusMessage(tr("Retrieving data for stack view..."), 3000);
     manager()->reloadRegisters();
     reloadStack(true);
-    updateLocals(); 
+    updateLocals();
 }
 
 void GdbEngine::reloadFullStack()
@@ -2555,7 +2555,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
             targetFrame = i;
     }
 
-    bool canExpand = !cookie.isFull 
+    bool canExpand = !cookie.isFull
         && (n >= theDebuggerAction(MaximalStackDepth)->value().toInt());
     theDebuggerAction(ExpandStack)->setEnabled(canExpand);
     manager()->stackHandler()->setFrames(stackFrames, canExpand);
@@ -2581,7 +2581,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
     // For targetFrame == 0 we already issued a 'gotoLocation'
     // when reading the *stopped message.
     bool jump = (m_isMacGdb || targetFrame != 0);
-  
+
     manager()->stackHandler()->setCurrentIndex(targetFrame);
     if (jump || cookie.gotoLocation) {
         const StackFrame &frame = manager()->stackHandler()->currentFrame();
@@ -2978,7 +2978,7 @@ void GdbEngine::updateWatchData(const WatchData &data)
             data1.setValue(_("<unavailable>"));
             data1.setHasChildren(false);
             insertData(data1);
-            return; 
+            return;
         }
         m_processedNames.insert(processedName);
 
@@ -3207,7 +3207,7 @@ void GdbEngine::updateLocals(const QVariant &cookie)
     m_pendingRequests = 0;
     if (hasPython())
         updateLocalsPython(QByteArray());
-    else 
+    else
         updateLocalsClassic(cookie);
 }
 
@@ -3246,10 +3246,10 @@ WatchData GdbEngine::localVariable(const GdbMi &item,
             data.setError(WatchData::msgNotInScope());
             return data;
         }
-        //: Type of local variable or parameter shadowed by another        
+        //: Type of local variable or parameter shadowed by another
         //: variable of the same name in a nested block.
         setWatchDataValue(data, item.findChild("value"));
-        data.setType(GdbEngine::tr("<shadowed>"));        
+        data.setType(GdbEngine::tr("<shadowed>"));
         data.setHasChildren(false);
         return data;
     }
@@ -3431,7 +3431,7 @@ void GdbEngine::fetchDisassemblerByAddress(DisassemblerViewAgent *agent,
     QByteArray end = QByteArray::number(address + 100, 16);
     // -data-disassemble [ -s start-addr -e end-addr ]
     //  | [ -f filename -l linenum [ -n lines ] ] -- mode
-    if (useMixedMode) 
+    if (useMixedMode)
         postCommand("-data-disassemble -s 0x" + start + " -e 0x" + end + " -- 1",
             Discardable, CB(handleFetchDisassemblerByAddress1),
             QVariant::fromValue(DisassemblerAgentCookie(agent)));
@@ -3491,7 +3491,7 @@ QString GdbEngine::parseDisassembler(const GdbMi &lines)
             if (line >= 0 && line < fileContents.size())
                 ba += "    " + fileContents.at(line) + '\n';
             GdbMi insn = child.findChild("line_asm_insn");
-            foreach (const GdbMi &line, insn.children()) 
+            foreach (const GdbMi &line, insn.children())
                 ba += parseLine(line);
         } else {
             // the non-mixed version
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index d9f44a3264..6fd2c5e2cf 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -454,7 +454,7 @@ private: ////////// View & Data Stuff //////////
         void updateLocalsClassic(const QVariant &cookie);
         void updateLocalsPython(const QByteArray &varList);
             void handleStackFramePython(const GdbResponse &response);
-        
+
     void handleStackListLocalsClassic(const GdbResponse &response);
     void handleStackListLocalsPython(const GdbResponse &response);
 
diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp
index 639e698d36..b5a5774a83 100644
--- a/src/plugins/debugger/gdb/gdbmi.cpp
+++ b/src/plugins/debugger/gdb/gdbmi.cpp
@@ -306,7 +306,7 @@ QByteArray GdbMi::toString(bool multiline, int indent) const
             else
                 result += "Invalid";
             break;
-        case Const: 
+        case Const:
             if (!m_name.isEmpty())
                 result += m_name + "=";
             result += "\"" + escapeCString(m_data) + "\"";
diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h
index a4ce837503..4cc3773ed6 100644
--- a/src/plugins/debugger/gdb/gdbmi.h
+++ b/src/plugins/debugger/gdb/gdbmi.h
@@ -39,50 +39,50 @@ namespace Internal {
 
 /*
 
-output ==> 
-    ( out-of-band-record )* [ result-record ] "(gdb)" nl 
-result-record ==> 
-     [ token ] "^" result-class ( "," result )* nl 
-out-of-band-record ==> 
-    async-record | stream-record 
-async-record ==> 
-    exec-async-output | status-async-output | notify-async-output 
-exec-async-output ==> 
-    [ token ] "*" async-output 
-status-async-output ==> 
-    [ token ] "+" async-output 
-notify-async-output ==> 
-    [ token ] "=" async-output 
-async-output ==> 
-    async-class ( "," result )* nl 
-result-class ==> 
-    "done" | "running" | "connected" | "error" | "exit" 
-async-class ==> 
-    "stopped" | others (where others will be added depending on the needs--this is still in development). 
-result ==> 
-     variable "=" value 
-variable ==> 
-     string  
-value ==> 
-     const | tuple | list  
-const ==> 
-    c-string 
-tuple ==> 
-     "{}" | "{" result ( "," result )* "}"  
-list ==> 
-     "[]" | "[" value ( "," value )* "]" | "[" result ( "," result )* "]"  
-stream-record ==> 
-    console-stream-output | target-stream-output | log-stream-output 
-console-stream-output ==> 
-    "~" c-string 
-target-stream-output ==> 
-    "@" c-string 
-log-stream-output ==> 
-    "&" c-string 
-nl ==> 
-    CR | CR-LF 
-token ==> 
-    any sequence of digits.  
+output ==>
+    ( out-of-band-record )* [ result-record ] "(gdb)" nl
+result-record ==>
+     [ token ] "^" result-class ( "," result )* nl
+out-of-band-record ==>
+    async-record | stream-record
+async-record ==>
+    exec-async-output | status-async-output | notify-async-output
+exec-async-output ==>
+    [ token ] "*" async-output
+status-async-output ==>
+    [ token ] "+" async-output
+notify-async-output ==>
+    [ token ] "=" async-output
+async-output ==>
+    async-class ( "," result )* nl
+result-class ==>
+    "done" | "running" | "connected" | "error" | "exit"
+async-class ==>
+    "stopped" | others (where others will be added depending on the needs--this is still in development).
+result ==>
+     variable "=" value
+variable ==>
+     string
+value ==>
+     const | tuple | list
+const ==>
+    c-string
+tuple ==>
+     "{}" | "{" result ( "," result )* "}"
+list ==>
+     "[]" | "[" value ( "," value )* "]" | "[" result ( "," result )* "]"
+stream-record ==>
+    console-stream-output | target-stream-output | log-stream-output
+console-stream-output ==>
+    "~" c-string
+target-stream-output ==>
+    "@" c-string
+log-stream-output ==>
+    "&" c-string
+nl ==>
+    CR | CR-LF
+token ==>
+    any sequence of digits.
 
  */
 
@@ -119,7 +119,7 @@ public:
     inline const QList<GdbMi> &children() const { return m_children; }
     inline int childCount() const { return m_children.size(); }
 
-    const GdbMi &childAt(int index) const { return m_children[index]; } 
+    const GdbMi &childAt(int index) const { return m_children[index]; }
     GdbMi &childAt(int index) { return m_children[index]; }
     GdbMi findChild(const char *name) const;
 
@@ -146,7 +146,7 @@ private:
 
 enum GdbResultClass
 {
-    // "done" | "running" | "connected" | "error" | "exit" 
+    // "done" | "running" | "connected" | "error" | "exit"
     GdbResultUnknown,
     GdbResultDone,
     GdbResultRunning,
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index ebca806a12..4773fbac11 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -78,9 +78,9 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
         m_ui.scriptFileChooser);
     m_group.insert(theDebuggerAction(GdbEnvironment),
         m_ui.environmentEdit);
-    m_group.insert(theDebuggerAction(UsePreciseBreakpoints), 
+    m_group.insert(theDebuggerAction(UsePreciseBreakpoints),
         m_ui.checkBoxUsePreciseBreakpoints);
-    m_group.insert(theDebuggerAction(GdbWatchdogTimeout), 
+    m_group.insert(theDebuggerAction(GdbWatchdogTimeout),
         m_ui.spinBoxGdbWatchdogTimeout);
 
 
diff --git a/src/plugins/debugger/gdb/gdboptionspage.h b/src/plugins/debugger/gdb/gdboptionspage.h
index a710acb0ed..87fa702c7f 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.h
+++ b/src/plugins/debugger/gdb/gdboptionspage.h
@@ -56,7 +56,7 @@ public:
 
     static QString settingsId();
 
-private:    
+private:
     Ui::GdbOptionsPage m_ui;
     Utils::SavedActionSet m_group;
     QString m_searchKeywords;
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 764936db74..d68e8a1eef 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -127,7 +127,7 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
         GdbMi all;
         all.fromStringMultiple(out);
         //qDebug() << "ALL: " << all.toString();
-        
+
         GdbMi data = all.findChild("data");
         QList<WatchData> list;
         foreach (const GdbMi &child, data.children()) {
@@ -166,7 +166,7 @@ void GdbEngine::updateAllPython()
     if (supportsThreads())
         postCommand("-thread-list-ids", WatchUpdate, CB(handleStackListThreads), 0);
     manager()->reloadRegisters();
-    updateLocals(); 
+    updateLocals();
 }
 
 } // namespace Internal
diff --git a/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h b/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h
index 234afa2c2c..1fbf16a9c8 100644
--- a/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h
+++ b/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h
@@ -43,7 +43,7 @@ namespace Internal {
  * Provides a static convenience to prompt for both connection types.  */
 
 class S60DebuggerBluetoothStarter : public trk::AbstractBluetoothStarter
-{    
+{
 public:
     static trk::PromptStartCommunicationResult
         startCommunication(const TrkDevicePtr &trkDevice,
@@ -52,7 +52,7 @@ public:
                            QWidget *msgBoxParent,
                            QString *errorMessage);
 
-protected:    
+protected:
     virtual trk::BluetoothListener *createListener();
 
 private:
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index b3e0a79ff7..16ff672c59 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -172,7 +172,7 @@ void Snapshot::insertMemory(const MemoryRange &range, const QByteArray &ba)
 {
     QTC_ASSERT(range.size() == uint(ba.size()),
         qDebug() << "RANGE: " << range << " BA SIZE: " << ba.size(); return);
-    
+
     MEMORY_DEBUG("INSERT: " << range);
     // Try to combine with existing chunk.
     Snapshot::Memory::iterator it = memory.begin();
@@ -700,7 +700,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
         // Kill inferior process
         logMessage(msgGdbPacket(QLatin1String("kill")));
         sendTrkMessage(0x41, TrkCB(handleDeleteProcess),
-            trkDeleteProcessMessage(), "Delete process"); 
+            trkDeleteProcessMessage(), "Delete process");
     }
 
     else if (cmd.startsWith("m")) {
@@ -1015,7 +1015,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
         if (data.startsWith("auxv:read::")) {
             const int offsetPos = data.lastIndexOf(':') + 1;
             const int commaPos = data.lastIndexOf(',');
-            if (commaPos != -1) {                
+            if (commaPos != -1) {
                 bool ok1 = false, ok2 = false;
                 const int offset = data.mid(offsetPos,  commaPos - offsetPos)
                     .toUInt(&ok1, 16);
@@ -1282,7 +1282,7 @@ void TrkGdbAdapter::handleReadRegisters(const TrkResult &result)
     for (int i = 0; i < RegisterCount; ++i)
         m_snapshot.registers[i] = extractInt(data + 4 * i);
     m_snapshot.registerValid = true;
-} 
+}
 
 void TrkGdbAdapter::handleWriteRegister(const TrkResult &result)
 {
@@ -1293,7 +1293,7 @@ void TrkGdbAdapter::handleWriteRegister(const TrkResult &result)
         return;
     }
     sendGdbServerMessage("OK");
-} 
+}
 
 void TrkGdbAdapter::reportRegisters()
 {
@@ -1446,7 +1446,7 @@ void TrkGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
     Snapshot::Memory::const_iterator et = m_snapshot.memory.end();
     for ( ; it != et; ++it) {
         MEMORY_DEBUG("   NEEDED STEP: " << needed);
-        needed -= it.key(); 
+        needed -= it.key();
     }
     MEMORY_DEBUG("NEEDED FINAL: " << needed);
 
@@ -1621,7 +1621,7 @@ void TrkGdbAdapter::handleClearBreakpoint(const TrkResult &result)
     if (result.errorCode()) {
         logMessage("ERROR: " + result.errorString());
         //return;
-    } 
+    }
     sendGdbServerMessage("OK");
 }
 
@@ -1716,7 +1716,7 @@ void TrkGdbAdapter::startAdapter()
     logMessage(QLatin1String("### Starting TrkGdbAdapter"));
     m_trkDevice->setSerialFrame(effectiveTrkDeviceType() != TrkOptions::BlueTooth);
     // Prompt the user to start communication
-    QString message;        
+    QString message;
     const trk::PromptStartCommunicationResult src =
             S60DebuggerBluetoothStarter::startCommunication(m_trkDevice,
                                                             effectiveTrkDevice(),
@@ -1807,8 +1807,8 @@ void TrkGdbAdapter::handleCreateProcess(const TrkResult &result)
     m_engine->postCommand("set breakpoint always-inserted on");
     m_engine->postCommand("set trust-readonly-sections"); // No difference?
     m_engine->postCommand("set displaced-stepping on"); // No difference?
-    m_engine->postCommand("mem 0x00400000 0x00800000 cache"); 
-    m_engine->postCommand("mem 0x78000000 0x88000000 cache ro"); 
+    m_engine->postCommand("mem 0x00400000 0x00800000 cache");
+    m_engine->postCommand("mem 0x78000000 0x88000000 cache ro");
     // FIXME: replace with  stack-cache for newer gdb?
     m_engine->postCommand("set remotecache on");  // "info dcache" to check
     m_engine->postCommand("target remote " + gdbServerName().toLatin1(),
@@ -1900,16 +1900,16 @@ void TrkGdbAdapter::handleDirectWrite1(const TrkResult &response)
         appendByte(&ba, 0xe5);
 #else
         // Thumb:
-        // subs  r0, #16  
+        // subs  r0, #16
         appendByte(&ba, 0x08);
         appendByte(&ba, 0x3b);
-        // subs  r0, #16  
+        // subs  r0, #16
         appendByte(&ba, 0x08);
         appendByte(&ba, 0x3b);
         //
         appendByte(&ba, 0x08);
         appendByte(&ba, 0x3b);
-        // subs  r0, #16  
+        // subs  r0, #16
         appendByte(&ba, 0x08);
         appendByte(&ba, 0x3b);
 #endif
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.h b/src/plugins/debugger/gdb/trkgdbadapter.h
index 2aeb696c72..84756dc388 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.h
+++ b/src/plugins/debugger/gdb/trkgdbadapter.h
@@ -250,7 +250,7 @@ private:
     QByteArray trkWriteMemoryMessage(uint addr, const QByteArray &date);
     QByteArray trkBreakpointMessage(uint addr, uint len, bool armMode = true);
     QByteArray trkStepRangeMessage(byte option);
-    QByteArray trkDeleteProcessMessage();    
+    QByteArray trkDeleteProcessMessage();
     QByteArray trkInterruptMessage();
 
     QSharedPointer<trk::TrkDevice> m_trkDevice;
diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h
index b47a6d1547..2c72aa845b 100644
--- a/src/plugins/debugger/idebuggerengine.h
+++ b/src/plugins/debugger/idebuggerengine.h
@@ -83,7 +83,7 @@ public:
     virtual void nextExec() = 0;
     virtual void stepIExec() = 0;
     virtual void nextIExec() = 0;
-    
+
     virtual void continueInferior() = 0;
     virtual void interruptInferior() = 0;
 
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index e57ed94193..0a75475032 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/src/plugins/debugger/moduleshandler.cpp
@@ -84,7 +84,7 @@ QVariant ModulesModel::headerData(int section,
 {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
         static QString headers[] = {
-            tr("Module name") + "        ", 
+            tr("Module name") + "        ",
             tr("Symbols read") + "        ",
             tr("Start address") + "        ",
             tr("End address") + "        "
@@ -115,7 +115,7 @@ QVariant ModulesModel::data(const QModelIndex &index, int role) const
             break;
         case 1:
             if (role == Qt::DisplayRole)
-                return module.symbolsRead ? "yes" : "no"; 
+                return module.symbolsRead ? "yes" : "no";
             break;
         case 2:
             if (role == Qt::DisplayRole)
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 6d46dda03c..95229f10bb 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -175,7 +175,7 @@ void ModulesWindow::resizeColumnsToContents()
 void ModulesWindow::setAlwaysResizeColumnsToContents(bool on)
 {
     m_alwaysResizeColumnsToContents = on;
-    QHeaderView::ResizeMode mode = on 
+    QHeaderView::ResizeMode mode = on
         ? QHeaderView::ResizeToContents : QHeaderView::Interactive;
     header()->setResizeMode(0, mode);
     header()->setResizeMode(1, mode);
@@ -189,7 +189,7 @@ void ModulesWindow::setModel(QAbstractItemModel *model)
     QTreeView::setModel(model);
     setAlwaysResizeColumnsToContents(true);
 }
-    
+
 void ModulesWindow::showSymbols(const QString &name)
 {
     if (name.isEmpty())
diff --git a/src/plugins/debugger/name_demangler.cpp b/src/plugins/debugger/name_demangler.cpp
index 8c6fc5e5f1..4e3cf92cdb 100644
--- a/src/plugins/debugger/name_demangler.cpp
+++ b/src/plugins/debugger/name_demangler.cpp
@@ -51,7 +51,7 @@
 #endif // DO_TRACE
 
 namespace Debugger {
-namespace Internal {    
+namespace Internal {
 
 class NameDemanglerPrivate
 {
@@ -138,7 +138,7 @@ private:
                                             QLatin1String(""))
         {
         }
-        
+
         const QString makeExpr(const QStringList &exprs) const
         {
             Q_ASSERT(exprs.size() == 2);
@@ -166,7 +166,7 @@ private:
                                                QLatin1String(""))
         {
         }
-        
+
         const QString makeExpr(const QStringList &exprs) const
         {
             Q_ASSERT(exprs.size() == 2);
@@ -182,7 +182,7 @@ private:
                                           QLatin1String(""))
         {
         }
-        
+
         virtual const QString makeExpr(const QStringList &exprs) const
         {
             Q_ASSERT(exprs.size() == 3);
diff --git a/src/plugins/debugger/name_demangler.h b/src/plugins/debugger/name_demangler.h
index 2a13f1e2a8..461324efe9 100644
--- a/src/plugins/debugger/name_demangler.h
+++ b/src/plugins/debugger/name_demangler.h
@@ -54,7 +54,7 @@ public:
     bool demangle(const QString &mangledName);
 
     /*
-     * A textual description of the error encountered, if there was one. 
+     * A textual description of the error encountered, if there was one.
      * Only valid if demangle() returned false.
      */
     const QString &errorString() const;
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index cbff586239..9b6cb4e015 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -100,7 +100,7 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
 
     if (role == RegisterChangedRole)
         return reg.changed;
-    
+
     return QVariant();
 }
 
diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h
index de3b8a3df8..cc4e271600 100644
--- a/src/plugins/debugger/registerhandler.h
+++ b/src/plugins/debugger/registerhandler.h
@@ -39,7 +39,7 @@ enum RegisterRole
 {
     RegisterNumberBaseRole = Qt::UserRole, // Currently used number base
     RegisterAddressRole,                   // Start value for opening memory view
-    RegisterChangedRole                    // Used for painting changed values 
+    RegisterChangedRole                    // Used for painting changed values
 };
 
 class Register
@@ -76,7 +76,7 @@ private:
     QVariant headerData(int section, Qt::Orientation orientation,
         int role = Qt::DisplayRole) const;
     Qt::ItemFlags flags(const QModelIndex &idx) const;
-    
+
     QList<Register> m_registers;
     int m_base;
     int m_strlen; // approximate width of an value in chars
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index ddaedbd808..092efb445e 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -205,7 +205,7 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
     menu.addAction(theDebuggerAction(SettingsDialog));
 
     QAction *act = menu.exec(ev->globalPos());
- 
+
     if (act == actAdjust)
         resizeColumnsToContents();
     else if (act == actAlwaysAdjust)
diff --git a/src/plugins/debugger/script/script.pri b/src/plugins/debugger/script/script.pri
index 99a1d14703..48d9460aa5 100644
--- a/src/plugins/debugger/script/script.pri
+++ b/src/plugins/debugger/script/script.pri
@@ -4,6 +4,6 @@ HEADERS += \
 SOURCES += \
     $$PWD/scriptengine.cpp \
 
-FORMS += 
+FORMS +=
 
-RESOURCES += 
+RESOURCES +=
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index f5197a6439..5b5f5043f7 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -104,7 +104,7 @@ public:
 private:
     void maybeBreakNow(bool byFunction);
 
-    ScriptEngine *q; 
+    ScriptEngine *q;
 };
 
 ScriptAgent::ScriptAgent(ScriptEngine *debugger, QScriptEngine *script)
@@ -208,7 +208,7 @@ void ScriptEngine::executeDebuggerCommand(const QString &command)
 
 void ScriptEngine::shutdown()
 {
-    exitDebugger(); 
+    exitDebugger();
 }
 
 void ScriptEngine::exitDebugger()
@@ -618,7 +618,7 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction)
     showStatusMessage(tr("Stopped at %1:%2.").arg(fileName).arg(lineNumber), 5000);
 
     StackFrame frame;
-    frame.file = fileName;      
+    frame.file = fileName;
     frame.line = lineNumber;
     manager()->gotoLocation(frame, true);
     updateLocals();
@@ -633,7 +633,7 @@ void ScriptEngine::updateLocals()
 
     //
     // Build stack
-    //  
+    //
     QList<StackFrame> stackFrames;
     int i = 0;
     for (QScriptContext *c = context; c; c = c->parentContext(), ++i) {
diff --git a/src/plugins/debugger/shared/backtrace.cpp b/src/plugins/debugger/shared/backtrace.cpp
index 6b81e9339e..c535b023f9 100644
--- a/src/plugins/debugger/shared/backtrace.cpp
+++ b/src/plugins/debugger/shared/backtrace.cpp
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <execinfo.h>
-#endif 
+#endif
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h
index 771ec2a3d1..88d80bb08e 100644
--- a/src/plugins/debugger/shared/backtrace.h
+++ b/src/plugins/debugger/shared/backtrace.h
@@ -37,7 +37,7 @@ namespace Internal {
 
 void dumpBacktrace(int maxdepth = -1);
 
-} // namespace Internal 
+} // namespace Internal
 } // namespace Debugger
 
 #endif // DEBUGGER_BACKTRACE_H
diff --git a/src/plugins/debugger/shared/dbgwinutils.cpp b/src/plugins/debugger/shared/dbgwinutils.cpp
index 842c9631b2..09ab75fd83 100644
--- a/src/plugins/debugger/shared/dbgwinutils.cpp
+++ b/src/plugins/debugger/shared/dbgwinutils.cpp
@@ -37,7 +37,7 @@
 
 namespace Debugger {
 namespace Internal {
-   
+
 #ifdef USE_PSAPI
 static inline QString imageName(DWORD processId)
 {
diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp
index 0fb5350fbb..6c9fd3e717 100644
--- a/src/plugins/debugger/shared/peutils.cpp
+++ b/src/plugins/debugger/shared/peutils.cpp
@@ -160,7 +160,7 @@ static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders,
 #endif
     // Empty. This is the case for MinGW binaries
     if (debugDirSize == 0)
-        return true;    
+        return true;
     // Look up in  file
     DWORD debugDirOffset;
     if (!getFileOffsetFromRVA(ntHeaders, debugDirRva, &debugDirOffset)) {
@@ -221,7 +221,7 @@ static void collectPDBfiles(void *fileMemory, IMAGE_DEBUG_DIRECTORY *directoryBa
 
 namespace Debugger {
 namespace Internal {
-   
+
 bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage)
 {
     HANDLE hFile = NULL;
diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h
index c2deef4a51..5a6fadaf58 100644
--- a/src/plugins/debugger/shared/peutils.h
+++ b/src/plugins/debugger/shared/peutils.h
@@ -45,7 +45,7 @@ namespace Internal {
 // Return a list of Program-Database (*.pdb) files a PE executable refers to. */
 bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage);
 
-} // namespace Internal 
+} // namespace Internal
 } // namespace Debugger
 
 #endif // DEBUGGER_PEUTILS_H
diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri
index bd69e956ce..760b012a44 100644
--- a/src/plugins/debugger/shared/shared.pri
+++ b/src/plugins/debugger/shared/shared.pri
@@ -1,7 +1,7 @@
 
 
 SOURCES += $$PWD/backtrace.cpp
-HEADERS += $$PWD/backtrace.h 
+HEADERS += $$PWD/backtrace.h
 
 win32 {
 
@@ -19,6 +19,6 @@ contains(QMAKE_CXX, cl) {
 #   For the Privilege manipulation functions in sharedlibraryinjector.cpp.
 #   Not required for MinGW.
     LIBS += advapi32.lib
-}       
+}
 
 }
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index 52341c6285..f429320fe1 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -95,7 +95,7 @@ QVariant SourceFilesModel::headerData(int section,
 {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
         static QString headers[] = {
-            tr("Internal name") + "        ", 
+            tr("Internal name") + "        ",
             tr("Full name") + "        ",
         };
         return headers[section];
@@ -178,7 +178,7 @@ SourceFilesWindow::SourceFilesWindow(QWidget *parent)
     setRootIsDecorated(false);
     setIconSize(QSize(10, 10));
     //header()->setDefaultAlignment(Qt::AlignLeft);
-    
+
     connect(this, SIGNAL(activated(QModelIndex)),
         this, SLOT(sourceFileActivated(QModelIndex)));
     connect(act, SIGNAL(toggled(bool)),
@@ -210,7 +210,7 @@ void SourceFilesWindow::contextMenuEvent(QContextMenuEvent *ev)
         act2 = new QAction(tr("Open file \"%1\"'").arg(name), &menu);
         act2->setEnabled(true);
     }
-    
+
     menu.addAction(act1);
     menu.addAction(act2);
     menu.addSeparator();
@@ -235,5 +235,5 @@ void SourceFilesWindow::removeAll()
     m_model->setSourceFiles(QMap<QString, QString>());
     header()->setResizeMode(0, QHeaderView::ResizeToContents);
 }
-    
+
 #include "sourcefileswindow.moc"
diff --git a/src/plugins/debugger/sourcefileswindow.h b/src/plugins/debugger/sourcefileswindow.h
index 9a003eab30..d5be1b6741 100644
--- a/src/plugins/debugger/sourcefileswindow.h
+++ b/src/plugins/debugger/sourcefileswindow.h
@@ -43,7 +43,7 @@ namespace Debugger {
 namespace Internal {
 
 class SourceFilesModel;
-    
+
 class SourceFilesWindow : public QTreeView
 {
     Q_OBJECT
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index d2b146b913..08985110d6 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -139,9 +139,9 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
         return QVariant();
 
     if (index.row() == m_stackFrames.size()) {
-        if (role == Qt::DisplayRole && index.column() == 0) 
+        if (role == Qt::DisplayRole && index.column() == 0)
             return tr("...");
-        if (role == Qt::DisplayRole && index.column() == 1) 
+        if (role == Qt::DisplayRole && index.column() == 1)
             return tr("<More>");
         if (role == Qt::DecorationRole && index.column() == 0)
             return m_emptyIcon;
@@ -209,7 +209,7 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const
 }
 
 StackFrame StackHandler::currentFrame() const
-{       
+{
     QTC_ASSERT(m_currentIndex >= 0, return StackFrame());
     QTC_ASSERT(m_currentIndex < m_stackFrames.size(), return StackFrame());
     return m_stackFrames.at(m_currentIndex);
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index afc5d25729..d39172f1ea 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -93,7 +93,7 @@ void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
     QModelIndex idx = indexAt(ev->pos());
     StackFrame frame = model()->data(idx, Qt::UserRole).value<StackFrame>();
     QString address = frame.address;
-    
+
     QMenu menu;
 
     menu.addAction(theDebuggerAction(ExpandStack));
@@ -107,7 +107,7 @@ void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
         actShowMemory->setEnabled(false);
     } else {
         actShowMemory->setText(tr("Open memory editor at %1").arg(address));
-    }    
+    }
 
     QAction *actShowDisassembler = menu.addAction(QString());
     if (address.isEmpty()) {
diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h
index 7ea221d6fe..c8e847b08a 100644
--- a/src/plugins/debugger/stackwindow.h
+++ b/src/plugins/debugger/stackwindow.h
@@ -43,7 +43,7 @@ class DebuggerManager;
 
 namespace Internal {
 class DisassemblerViewAgent;
-    
+
 class StackWindow : public QTreeView
 {
     Q_OBJECT
diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h
index 0d47e3687c..bc1a252be2 100644
--- a/src/plugins/debugger/threadswindow.h
+++ b/src/plugins/debugger/threadswindow.h
@@ -34,7 +34,7 @@
 
 namespace Debugger {
 namespace Internal {
-    
+
 class ThreadsWindow : public QTreeView
 {
     Q_OBJECT
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 982965f42d..a1d61cabb7 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -61,7 +61,7 @@
 #if DEBUG_MODEL
 #   define MODEL_DEBUG(s) qDebug() << s
 #else
-#   define MODEL_DEBUG(s) 
+#   define MODEL_DEBUG(s)
 #endif
 #define MODEL_DEBUGX(s) qDebug() << s
 
@@ -100,7 +100,7 @@ public:
 // WatchData
 //
 ////////////////////////////////////////////////////////////////////
-   
+
 WatchData::WatchData() :
     hasChildren(false),
     generation(-1),
@@ -173,7 +173,7 @@ void WatchData::setValue(const QString &value0)
     // column. No need to duplicate it here.
     if (value.startsWith("(" + type + ") 0x"))
         value = value.section(" ", -1, -1);
-    
+
     setValueUnneeded();
 }
 
@@ -515,7 +515,7 @@ static QString niceTypeHelper(const QString typeIn)
     for (int i = 0; i < 10; ++i) {
         int start = type.indexOf("std::allocator<");
         if (start == -1)
-            break; 
+            break;
         // search for matching '>'
         int pos;
         int level = 0;
@@ -738,7 +738,7 @@ bool WatchModel::hasChildren(const QModelIndex &parent) const
 
 WatchItem *WatchModel::watchItem(const QModelIndex &idx) const
 {
-    return idx.isValid() 
+    return idx.isValid()
         ? static_cast<WatchItem*>(idx.internalPointer()) : m_root;
 }
 
@@ -747,7 +747,7 @@ QModelIndex WatchModel::watchIndex(const WatchItem *item) const
     return watchIndexHelper(item, m_root, QModelIndex());
 }
 
-QModelIndex WatchModel::watchIndexHelper(const WatchItem *needle, 
+QModelIndex WatchModel::watchIndexHelper(const WatchItem *needle,
     const WatchItem *parentItem, const QModelIndex &parentIndex) const
 {
     if (needle == parentItem)
@@ -762,7 +762,7 @@ QModelIndex WatchModel::watchIndexHelper(const WatchItem *needle,
     return QModelIndex();
 }
 
-void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex) 
+void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
 {
     QModelIndex idx1 = index(0, column, parentIndex);
     QModelIndex idx2 = index(rowCount(parentIndex) - 1, column, parentIndex);
@@ -841,7 +841,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
         case ActiveDataRole:
             qDebug() << "ASK FOR" << data.iname;
             return true;
-   
+
         case TypeFormatListRole:
             if (isIntType(data.type))
                 return QStringList() << tr("decimal") << tr("hexadecimal")
@@ -872,7 +872,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
         }
 
         default:
-            break; 
+            break;
     }
     return QVariant();
 }
@@ -890,7 +890,7 @@ bool WatchModel::setData(const QModelIndex &index, const QVariant &value, int ro
         }
     } else if (role == TypeFormatRole) {
         m_handler->setFormat(data.type, value.toInt());
-    } else if (role == IndividualFormatRole) {        
+    } else if (role == IndividualFormatRole) {
         const int format = value.toInt();
         if (format == -1) {
             m_handler->m_individualFormats.remove(data.iname);
@@ -944,7 +944,7 @@ QVariant WatchModel::headerData(int section, Qt::Orientation orientation, int ro
             case 2: return QString(tr("Type")  + QLatin1String("     "));
         }
     }
-    return QVariant(); 
+    return QVariant();
 }
 
 struct IName : public QByteArray
@@ -964,7 +964,7 @@ bool iNameLess(const QString &iname1, const QString &iname2)
                 return i1 < i2;
         }
     }
-    return name1 < name2; 
+    return name1 < name2;
 }
 
 bool operator<(const IName &iname1, const IName &iname2)
@@ -981,7 +981,7 @@ static int findInsertPosition(const QList<WatchItem *> &list, const WatchItem *i
 {
     QList<WatchItem *>::const_iterator it =
         qLowerBound(list.begin(), list.end(), item, iNameSorter);
-    return it - list.begin(); 
+    return it - list.begin();
 }
 
 void WatchModel::insertData(const WatchData &data)
@@ -1032,7 +1032,7 @@ void WatchModel::insertData(const WatchData &data)
 void WatchModel::insertBulkData(const QList<WatchData> &list)
 {
 #if 0
-    for (int i = 0; i != list.size(); ++i) 
+    for (int i = 0; i != list.size(); ++i)
         insertData(list.at(i));
     return;
 #endif
@@ -1524,7 +1524,7 @@ WatchModel *WatchHandler::model(WatchType type) const
     QTC_ASSERT(false, /**/);
     return 0;
 }
-    
+
 WatchModel *WatchHandler::modelForIName(const QByteArray &iname) const
 {
     if (iname.startsWith("local"))
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index f401cf9b6e..c033965f01 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -112,7 +112,7 @@ public:
     bool isLocal() const { return iname.startsWith("local."); }
     bool isWatcher() const { return iname.startsWith("watch."); }
     bool isValid() const { return !iname.isEmpty(); }
-    
+
     bool isEqual(const WatchData &other) const;
 
     static QString msgNotInScope();
@@ -181,7 +181,7 @@ enum PointerFomat
 enum DumpableFormat
 {
     PrettyFormat = 0, // keep that at 0 as default
-    PlainFomat, 
+    PlainFomat,
 };
 
 class WatchModel : public QAbstractItemModel
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 1aabf139f9..d0dfcd888e 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -329,7 +329,7 @@ static void blockRecursion(const CPlusPlus::Overview &overview,
                 it = seenHash->insert(name, 0);
             } else {
                 ++(it.value());
-            }            
+            }
             // Is the declaration on or past the current line, that is,
             // the variable not initialized.
             if (symbol->line() >= line)
@@ -1396,7 +1396,7 @@ static void gbdMiToWatchData(const GdbMi &root,
 {
     if (debug > 1)
         qDebug() << Q_FUNC_INFO << '\n' << root.toString(false, 0);
-    WatchData w;    
+    WatchData w;
     QString v;
     QByteArray b;
     // Check for name/iname and use as expression default
@@ -1438,7 +1438,7 @@ static void gbdMiToWatchData(const GdbMi &root,
         w.exp = b;
     gdbMiGetByteArrayValue(&w.addr, root, "addr");
     gdbMiGetByteArrayValue(&w.saddr, root, "saddr");
-    gdbMiGetBoolValue(&w.valueEnabled, root, "valueenabled");    
+    gdbMiGetBoolValue(&w.valueEnabled, root, "valueenabled");
     gdbMiGetBoolValue(&w.valueEditable, root, "valueeditable");
     if (gdbMiGetStringValue(&v, root, "valuetooltip", "valuetooltipencoded"))
         w.setValue(v);
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index d763c84ffd..b259c4c22e 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -76,7 +76,7 @@ public:
     {
         QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor);
         QTC_ASSERT(lineEdit, return);
-        if (index.column() == 1) 
+        if (index.column() == 1)
             lineEdit->setText(index.model()->data(index, Qt::DisplayRole).toString());
         else
             lineEdit->setText(index.model()->data(index, ExpressionRole).toString());
@@ -140,15 +140,15 @@ WatchWindow::WatchWindow(Type type, DebuggerManager *manager, QWidget *parent)
         this, SLOT(expandNode(QModelIndex)));
     connect(this, SIGNAL(collapsed(QModelIndex)),
         this, SLOT(collapseNode(QModelIndex)));
-} 
- 
-void WatchWindow::expandNode(const QModelIndex &idx) 
-{ 
+}
+
+void WatchWindow::expandNode(const QModelIndex &idx)
+{
     model()->setData(idx, true, ExpandedRole);
-} 
- 
-void WatchWindow::collapseNode(const QModelIndex &idx) 
-{ 
+}
+
+void WatchWindow::collapseNode(const QModelIndex &idx)
+{
     model()->setData(idx, false, ExpandedRole);
 }
 
@@ -208,7 +208,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
     QString exp = model()->data(mi0, ExpressionRole).toString();
     QString type = model()->data(mi2).toString();
 
-    QStringList alternativeFormats = 
+    QStringList alternativeFormats =
         model()->data(mi0, TypeFormatListRole).toStringList();
     const int typeFormat =
         qMax(int(DecimalFormat), model()->data(mi0, TypeFormatRole).toInt());
@@ -271,7 +271,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
     menu.addSeparator();
 
     QAction *actWatchOrRemove;
-    if (m_type == LocalsType) { 
+    if (m_type == LocalsType) {
         actWatchOrRemove = theDebuggerAction(WatchExpression)->updatedAction(exp);
     } else {
         actWatchOrRemove = theDebuggerAction(RemoveWatchExpression)->updatedAction(exp);
@@ -296,7 +296,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
     menu.addAction(actClearCodeModelSnapshot);
     menu.addSeparator();
     menu.addAction(theDebuggerAction(UseToolTipsInLocalsView));
-    
+
     menu.addAction(theDebuggerAction(AutoDerefPointers));
     menu.addAction(theDebuggerAction(ShowStdNamespace));
     menu.addAction(theDebuggerAction(ShowQtNamespace));
@@ -334,7 +334,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
         m_manager->clearCppCodeModelSnapshot();
     } else if (clearIndividualFormatAction && act == clearIndividualFormatAction) {
         model()->setData(mi1, -1, IndividualFormatRole);
-    } else { 
+    } else {
         for (int i = 0; i != alternativeFormats.size(); ++i) {
             if (act == typeFormatActions.at(i))
                 model()->setData(mi1, i, TypeFormatRole);
@@ -355,7 +355,7 @@ void WatchWindow::setAlwaysResizeColumnsToContents(bool on)
     if (!header())
         return;
     m_alwaysResizeColumnsToContents = on;
-    QHeaderView::ResizeMode mode = on 
+    QHeaderView::ResizeMode mode = on
         ? QHeaderView::ResizeToContents : QHeaderView::Interactive;
     header()->setResizeMode(0, mode);
     header()->setResizeMode(1, mode);
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 3e497e6895..916e2254dd 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -53,7 +53,7 @@ public:
     WatchWindow(Type type, DebuggerManager *manager, QWidget *parent = 0);
     void setType(Type type) { m_type = type; }
     Type type() const { return m_type; }
-    
+
 public slots:
     void resizeColumnsToContents();
     void setAlwaysResizeColumnsToContents(bool on = true);