From cce1c7f78e29a498db034cdb2854ae2aba5e3387 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 19 May 2009 15:45:58 +0200
Subject: [PATCH] debugger: rename 'win' subdir to 'shared'

---
 src/plugins/debugger/cdb/cdbdumperhelper.cpp               | 2 +-
 src/plugins/debugger/debugger.pro                          | 7 ++++---
 src/plugins/debugger/debuggerdialogs.cpp                   | 2 +-
 src/plugins/debugger/debuggermanager.cpp                   | 2 +-
 src/plugins/debugger/gdb/gdbengine.cpp                     | 2 +-
 src/plugins/debugger/{win => shared}/dbgwinutils.cpp       | 0
 src/plugins/debugger/{win => shared}/dbgwinutils.h         | 0
 src/plugins/debugger/{win => shared}/peutils.cpp           | 0
 src/plugins/debugger/{win => shared}/peutils.h             | 0
 .../debugger/{win => shared}/sharedlibraryinjector.cpp     | 0
 .../debugger/{win => shared}/sharedlibraryinjector.h       | 0
 src/plugins/debugger/{win => shared}/win.pri               | 0
 12 files changed, 8 insertions(+), 7 deletions(-)
 rename src/plugins/debugger/{win => shared}/dbgwinutils.cpp (100%)
 rename src/plugins/debugger/{win => shared}/dbgwinutils.h (100%)
 rename src/plugins/debugger/{win => shared}/peutils.cpp (100%)
 rename src/plugins/debugger/{win => shared}/peutils.h (100%)
 rename src/plugins/debugger/{win => shared}/sharedlibraryinjector.cpp (100%)
 rename src/plugins/debugger/{win => shared}/sharedlibraryinjector.h (100%)
 rename src/plugins/debugger/{win => shared}/win.pri (100%)

diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index 7a9c2efd7b5..a0cac62c6c6 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -35,7 +35,7 @@
 #include "cdbsymbolgroupcontext.h"
 #include "watchhandler.h"
 
-#include "sharedlibraryinjector.h"
+#include "shared/sharedlibraryinjector.h"
 
 #include <QtCore/QRegExp>
 #include <QtCore/QCoreApplication>
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 77f6f88177f..b66a6a911d8 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -86,10 +86,11 @@ HEADERS += $$PWD/modeltest.h
 DEFINES += USE_MODEL_TEST=1
 }
 
-include(gdb/gdb.pri)
-include(tcf/tcf.pri)
-include(win/win.pri)
 include(cdb/cdb.pri)
+include(gdb/gdb.pri)
 include(script/script.pri)
+include(tcf/tcf.pri)
+
+include(shared/shared.pri)
 
 OTHER_FILES += Debugger.pluginspec
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 6b43214def2..316d4fbf081 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -36,7 +36,7 @@
 #include "ui_startremotedialog.h"
 
 #ifdef Q_OS_WIN
-#  include "dbgwinutils.h"
+#  include "shared/dbgwinutils.h"
 #endif
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index f00d100c709..842fe92479d 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -55,7 +55,7 @@
 
 #include "debuggerdialogs.h"
 #ifdef Q_OS_WIN
-#  include "peutils.h"
+#  include "shared/peutils.h"
 #endif
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 29307601490..98e1b9b9a07 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -69,7 +69,7 @@
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QPushButton>
 #ifdef Q_OS_WIN
-#    include "sharedlibraryinjector.h"
+#    include "shared/sharedlibraryinjector.h"
 #endif
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
diff --git a/src/plugins/debugger/win/dbgwinutils.cpp b/src/plugins/debugger/shared/dbgwinutils.cpp
similarity index 100%
rename from src/plugins/debugger/win/dbgwinutils.cpp
rename to src/plugins/debugger/shared/dbgwinutils.cpp
diff --git a/src/plugins/debugger/win/dbgwinutils.h b/src/plugins/debugger/shared/dbgwinutils.h
similarity index 100%
rename from src/plugins/debugger/win/dbgwinutils.h
rename to src/plugins/debugger/shared/dbgwinutils.h
diff --git a/src/plugins/debugger/win/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp
similarity index 100%
rename from src/plugins/debugger/win/peutils.cpp
rename to src/plugins/debugger/shared/peutils.cpp
diff --git a/src/plugins/debugger/win/peutils.h b/src/plugins/debugger/shared/peutils.h
similarity index 100%
rename from src/plugins/debugger/win/peutils.h
rename to src/plugins/debugger/shared/peutils.h
diff --git a/src/plugins/debugger/win/sharedlibraryinjector.cpp b/src/plugins/debugger/shared/sharedlibraryinjector.cpp
similarity index 100%
rename from src/plugins/debugger/win/sharedlibraryinjector.cpp
rename to src/plugins/debugger/shared/sharedlibraryinjector.cpp
diff --git a/src/plugins/debugger/win/sharedlibraryinjector.h b/src/plugins/debugger/shared/sharedlibraryinjector.h
similarity index 100%
rename from src/plugins/debugger/win/sharedlibraryinjector.h
rename to src/plugins/debugger/shared/sharedlibraryinjector.h
diff --git a/src/plugins/debugger/win/win.pri b/src/plugins/debugger/shared/win.pri
similarity index 100%
rename from src/plugins/debugger/win/win.pri
rename to src/plugins/debugger/shared/win.pri
-- 
GitLab