From c9826c1b4e1ef84f475c67bf516eabac2e20a0b7 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 17 Feb 2011 15:21:35 +0100
Subject: [PATCH] debugger: merge a few #ifdef Q_OS_WIN's
---
src/plugins/debugger/gdb/abstractgdbadapter.cpp | 8 +++-----
src/plugins/debugger/gdb/abstractgdbadapter.h | 4 +---
src/plugins/debugger/gdb/localplaingdbadapter.cpp | 4 +---
src/plugins/debugger/gdb/termgdbadapter.cpp | 2 +-
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.cpp b/src/plugins/debugger/gdb/abstractgdbadapter.cpp
index d8d17b1b240..ab5023b6a34 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.cpp
@@ -37,9 +37,7 @@
#include "abstractgdbprocess.h"
#include <utils/qtcassert.h>
-#ifdef Q_OS_WIN
#include <utils/qtcprocess.h>
-#endif
#include <QtCore/QProcess>
@@ -82,9 +80,9 @@ bool AbstractGdbAdapter::isTrkAdapter() const
return false;
}
-#ifdef Q_OS_WIN
-bool AbstractGdbAdapter::prepareWinCommand()
+bool AbstractGdbAdapter::prepareCommand()
{
+#ifdef Q_OS_WIN
Utils::QtcProcess::SplitError perr;
startParameters().processArgs = Utils::QtcProcess::prepareArgs(
startParameters().processArgs, &perr,
@@ -96,9 +94,9 @@ bool AbstractGdbAdapter::prepareWinCommand()
"Debugging complex command lines is currently not supported under Windows"), QString());
return false;
}
+#endif
return true;
}
-#endif
QString AbstractGdbAdapter::msgGdbStopFailed(const QString &why)
{
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h
index 7eaa2dab53a..095bbaa5c87 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.h
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.h
@@ -102,9 +102,7 @@ protected:
const DebuggerStartParameters &startParameters() const;
DebuggerStartParameters &startParameters();
void showMessage(const QString &msg, int channel = LogDebug, int timeout = 1);
-#ifdef Q_OS_WIN
- bool prepareWinCommand();
-#endif
+ bool prepareCommand();
GdbEngine * const m_engine;
};
diff --git a/src/plugins/debugger/gdb/localplaingdbadapter.cpp b/src/plugins/debugger/gdb/localplaingdbadapter.cpp
index 6d57ba8b719..4c5418bd186 100644
--- a/src/plugins/debugger/gdb/localplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/localplaingdbadapter.cpp
@@ -77,10 +77,8 @@ void LocalPlainGdbAdapter::startAdapter()
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
showMessage(_("TRYING TO START ADAPTER"));
-#ifdef Q_OS_WIN
- if (!prepareWinCommand())
+ if (!prepareCommand())
return;
-#endif
QStringList gdbArgs;
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index 11479e17162..81abe5614de 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -103,7 +103,7 @@ void TermGdbAdapter::startAdapter()
// m_stubProc.blockSignals(false);
#ifdef Q_OS_WIN
- if (!prepareWinCommand())
+ if (!prepareCommand())
return;
#endif
--
GitLab