debugger: move Q_OS_WIN to dbgwinutils.h

Change-Id: Ic84179e34d7ef79016d7646b6502f188c00b0bac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

src/libs/utils/winutils.h

@@ -69,7 +69,6 @@ QTCREATOR_UTILS_EXPORT bool winIs64BitSystem();
 // Check for a 64bit binary.
 QTCREATOR_UTILS_EXPORT bool winIs64BitBinary(const QString &binary);
 
-
-
 } // namespace Utils
+
 #endif // WINUTILS_H

src/plugins/debugger/cdb/cdbengine.cpp

@@ -31,30 +31,32 @@
 **************************************************************************/
 
 #include "cdbengine.h"
-#include "debuggerstartparameters.h"
+
-#include "disassemblerlines.h"
+#include "breakhandler.h"
+#include "breakpoint.h"
+#include "bytearrayinputstream.h"
 #include "cdboptions.h"
 #include "cdboptionspage.h"
-#include "bytearrayinputstream.h"
+#include "cdbparsehelpers.h"
-#include "breakpoint.h"
+#include "debuggeractions.h"
-#include "breakhandler.h"
+#include "debuggercore.h"
+#include "debuggerinternalconstants.h"
+#include "debuggerrunner.h"
+#include "debuggerstartparameters.h"
+#include "debuggertooltipmanager.h"
+#include "disassembleragent.h"
+#include "disassemblerlines.h"
+#include "memoryagent.h"
+#include "moduleshandler.h"
+#include "registerhandler.h"
 #include "stackframe.h"
 #include "stackhandler.h"
-#include "watchhandler.h"
 #include "threadshandler.h"
-#include "moduleshandler.h"
+#include "watchhandler.h"
-#include "debuggeractions.h"
-#include "debuggerinternalconstants.h"
-#include "debuggercore.h"
-#include "registerhandler.h"
-#include "disassembleragent.h"
-#include "memoryagent.h"
-#include "debuggerrunner.h"
-#include "debuggertooltipmanager.h"
-#include "cdbparsehelpers.h"
 #include "watchutils.h"
 #include "gdb/gdbmi.h"
 #include "shared/cdbsymbolpathlisteditor.h"
+#include "shared/dbgwinutils.h"
 
 #include <TranslationUnit.h>
 
@@ -84,11 +86,6 @@
 #include <QtGui/QMainWindow>
 #include <QtGui/QMessageBox>
 
-#ifdef Q_OS_WIN
-#    include <utils/winutils.h>
-#    include "dbgwinutils.h"
-#endif
-
 #include <cctype>
 
 Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerAgent*)

src/plugins/debugger/cdb/cdbparsehelpers.cpp

@@ -37,9 +37,8 @@
 #include "bytearrayinputstream.h"
 #include "gdb/gdbmi.h"
 #include "disassemblerlines.h"
-#ifdef Q_OS_WIN
 #include "shared/dbgwinutils.h"
-#endif
+
 #include <utils/qtcassert.h>
 
 #include <QtCore/QByteArray>

src/plugins/debugger/debuggerdialogs.cpp

@@ -34,6 +34,7 @@
 
 #include "debuggerconstants.h"
 #include "cdb/cdbengine.h"
+#include "shared/dbgwinutils.h"
 
 #include "ui_attachcoredialog.h"
 #include "ui_attachexternaldialog.h"
@@ -42,10 +43,6 @@
 #include "ui_startremoteenginedialog.h"
 #include "ui_attachtoqmlportdialog.h"
 
-#ifdef Q_OS_WIN
-#  include "shared/dbgwinutils.h"
-#endif
-
 #include <coreplugin/icore.h>
 #include <projectexplorer/abi.h>
 #include <utils/synchronousprocess.h>

src/plugins/debugger/gdb/codagdbadapter.cpp

@@ -57,9 +57,9 @@
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QTcpSocket>
 
-#ifdef Q_OS_WIN
 #include "dbgwinutils.h"
-#else
+
+#ifndef Q_OS_WIN
 #  include <sys/types.h>
 #  include <unistd.h>
 #endif

src/plugins/debugger/gdb/gdbengine.cpp

@@ -67,10 +67,7 @@
 #include "threadshandler.h"
 #include "watchhandler.h"
 #include "debuggersourcepathmappingwidget.h"
-
-#ifdef Q_OS_WIN
 #include "dbgwinutils.h"
-#endif
 #include "logwindow.h"
 
 #include <coreplugin/icore.h>

src/plugins/debugger/gdb/termgdbadapter.cpp

@@ -38,17 +38,13 @@
 #include "procinterrupt.h"
 #include "debuggerstringutils.h"
 #include "debuggercore.h"
+#include "dbgwinutils.h"
 
 #include <utils/qtcassert.h>
 #include <coreplugin/icore.h>
 
 #include <QtGui/QMessageBox>
 
-#ifdef Q_OS_WIN
-#    include "dbgwinutils.h"
-#    include "dbgwinutils.h"
-#endif
-
 namespace Debugger {
 namespace Internal {
 

src/plugins/debugger/shared/dbgwinutils.h

@@ -35,8 +35,12 @@
 
 #include <QtCore/QList>
 
-QT_FORWARD_DECLARE_CLASS(QString)
+#ifdef Q_OS_WIN
-QT_FORWARD_DECLARE_CLASS(QTextStream)
+
+QT_BEGIN_NAMESPACE
+class QString;
+class QTextStream;
+QT_END_NAMESPACE
 
 namespace Debugger {
 namespace Internal {
@@ -84,4 +88,6 @@ bool isDebuggerWinException(long code);
 } // namespace Internal
 } // namespace Debugger
 
+#endif // defined(Q_OS_WIN)
+
 #endif // DEBUGGER_DBG_WINUTILS_H

src/plugins/debugger/shared/shared.pri

@@ -2,7 +2,8 @@ SOURCES += $$PWD/backtrace.cpp \
            $$PWD/cdbsymbolpathlisteditor.cpp
 
 HEADERS += $$PWD/backtrace.h \
-           $$PWD/cdbsymbolpathlisteditor.h
+           $$PWD/cdbsymbolpathlisteditor.h \
+           $$PWD/dbgwinutils.h
 
 INCLUDEPATH+=$$PWD
 
@@ -10,8 +11,7 @@ win32 {
 SOURCES += $$PWD/peutils.cpp \
            $$PWD/dbgwinutils.cpp
 
-HEADERS += $$PWD/peutils.h \
+HEADERS += $$PWD/peutils.h
-           $$PWD/dbgwinutils.h
 
 win32-msvc* {
 #   For the Privilege manipulation functions in sharedlibraryinjector.cpp.