From 51a22cbe7c3375e4761474c69795a5330098b857 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 5 Oct 2009 14:02:58 +0200
Subject: [PATCH] centralize STRINGIFY definition

---
 src/plugins/debugger/debuggerstringutils.h    | 3 +++
 src/plugins/debugger/gdb/attachgdbadapter.cpp | 2 --
 src/plugins/debugger/gdb/coregdbadapter.cpp   | 2 --
 src/plugins/debugger/gdb/gdbengine.cpp        | 2 --
 src/plugins/debugger/gdb/plaingdbadapter.cpp  | 2 --
 src/plugins/debugger/gdb/remotegdbadapter.cpp | 2 --
 src/plugins/debugger/gdb/trkgdbadapter.cpp    | 2 --
 src/plugins/debugger/tcf/tcfengine.cpp        | 2 --
 8 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/plugins/debugger/debuggerstringutils.h b/src/plugins/debugger/debuggerstringutils.h
index bfa426c3472..6950836187e 100644
--- a/src/plugins/debugger/debuggerstringutils.h
+++ b/src/plugins/debugger/debuggerstringutils.h
@@ -40,6 +40,9 @@ typedef QLatin1String __;
 inline QString _(const char *s) { return QString::fromLatin1(s); }
 inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size()); }
 
+#define STRINGIFY_INTERNAL(x) #x
+#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
+
 } // namespace Internal
 } // namespace Debugger
 #endif // DEBUGGERSTRINGUTILS_H
diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index f70d5bcf05a..2e07e1a7b37 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -40,8 +40,6 @@
 namespace Debugger {
 namespace Internal {
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) \
     static_cast<GdbEngine::AdapterCallback>(&AttachGdbAdapter::callback), \
     STRINGIFY(callback)
diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp
index 26eaaf7fbf4..90747c1b544 100644
--- a/src/plugins/debugger/gdb/coregdbadapter.cpp
+++ b/src/plugins/debugger/gdb/coregdbadapter.cpp
@@ -40,8 +40,6 @@
 namespace Debugger {
 namespace Internal {
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) \
     static_cast<GdbEngine::AdapterCallback>(&CoreGdbAdapter::callback), \
     STRINGIFY(callback)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index a45e3208645..322284dedee 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -105,8 +105,6 @@ namespace Internal {
 #   define PENDING_DEBUG(s)
 #endif
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) &GdbEngine::callback, STRINGIFY(callback)
 
 static bool stateAcceptsGdbCommands(DebuggerState state)
diff --git a/src/plugins/debugger/gdb/plaingdbadapter.cpp b/src/plugins/debugger/gdb/plaingdbadapter.cpp
index c72b5ea7e4a..13f5b9e5eea 100644
--- a/src/plugins/debugger/gdb/plaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/plaingdbadapter.cpp
@@ -45,8 +45,6 @@
 namespace Debugger {
 namespace Internal {
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) \
     static_cast<GdbEngine::AdapterCallback>(&PlainGdbAdapter::callback), \
     STRINGIFY(callback)
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index e69478cb6e4..422eed5954e 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -41,8 +41,6 @@
 namespace Debugger {
 namespace Internal {
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) \
     static_cast<GdbEngine::AdapterCallback>(&RemoteGdbAdapter::callback), \
     STRINGIFY(callback)
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index f9953f0f2af..9ab1047713d 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -46,8 +46,6 @@
 #include <QtCore/QTimer>
 #include <QtCore/QDir>
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) \
     static_cast<GdbEngine::AdapterCallback>(&TrkGdbAdapter::callback), \
     STRINGIFY(callback)
diff --git a/src/plugins/debugger/tcf/tcfengine.cpp b/src/plugins/debugger/tcf/tcfengine.cpp
index 760bc49d9ce..595215ac7ad 100644
--- a/src/plugins/debugger/tcf/tcfengine.cpp
+++ b/src/plugins/debugger/tcf/tcfengine.cpp
@@ -66,8 +66,6 @@
 #endif
 # define XSDEBUG(s) qDebug() << s
 
-#define STRINGIFY_INTERNAL(x) #x
-#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define CB(callback) &TcfEngine::callback, STRINGIFY(callback)
 
 //#define USE_CONGESTION_CONTROL
-- 
GitLab