diff --git a/src/plugins/debugger/debuggerstringutils.h b/src/plugins/debugger/debuggerstringutils.h index bfa426c3472898fad80a39f8b661a371c239c9e6..6950836187ed560803eab2606a8f56d4234f786c 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 f70d5bcf05a26222a82c54e9ef58986f726cdf95..2e07e1a7b3780ec941667c107cd3f9d58e751b1f 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 26eaaf7fbf4a9079f26624b8fc0f18f98d8c5b47..90747c1b54415009ec35528614453a29fc5b1bb1 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 a45e32086454cd306296133b167974486329269d..322284dedeedbab7d4d566443ead6c4439070850 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 c72b5ea7e4ad3d9da47ead3b24f2cc4d2bac0b04..13f5b9e5eead13c15bad640d6a0ec988298fe119 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 e69478cb6e47a0e4a0ae2a467195737074858589..422eed5954ec55985196cefe0e8c1d51d93b95f1 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 f9953f0f2af6c65e09a897c22c7f0d8da6d33199..9ab1047713d29ef3c671ab162c21480a8a05fadb 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 760bc49d9ce71128fd5fdcdb78c6766906bb8f2d..595215ac7ad61df4455aca4a2519fa755d90b498 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