debugger: rename gdbmacros* to dumper*

Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

5 files changed, 10 insertions, 9 deletions

diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 35d7a4d43f3..705a96360d7 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -3,11 +3,11 @@ include($$IDE_SOURCE_TREE/src/libs/symbianutils/symbianutils.pri)
 
 DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
 UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
-MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
+MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/dumper
 
 SOURCES += \
     $$DEBUGGERDIR/gdb/gdbmi.cpp \
-    $$MACROSDIR/gdbmacros.cpp \
+    $$MACROSDIR/dumper.cpp \
     tst_dumpers.cpp \
 
 DEFINES += MACROSDEBUG
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 36fa8a48ab3..0364e70b33a 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -35,8 +35,8 @@
 #undef private
 
 #include "gdb/gdbmi.h"
-#include "gdbmacros.h"
-#include "gdbmacros_p.h"
+#include "dumper.h"
+#include "dumper_p.h"
 
 #include "json.h"
 
@@ -2277,7 +2277,7 @@ void tst_Dumpers::dumpQSharedPointer()
     // Case 2: Composite type.
     // Case 1.1: Null pointer.
     QSharedPointer<QString> compositePtr;
-    // TODO: This case is not handled in gdbmacros.cpp (segfault!)
+    // TODO: This case is not handled in dumper.cpp (segfault!)
     //dumpQSharedPointerHelper(compoistePtr);
 
     // Case 1.2: Non-null pointer,
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 9c0aa92e9ea..1d2cca0016c 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -398,8 +398,9 @@ GdbWrapper::GdbWrapper(tst_Gdb *test) : m_test(test)
     connect(&m_proc, SIGNAL(readyReadStandardError()),
         this, SLOT(readStandardError()));
 
-    m_proc.write("python execfile('../../../share/qtcreator/gdbmacros/dumper.py')\n");
-    m_proc.write("python execfile('../../../share/qtcreator/gdbmacros/gdbmacros.py')\n");
+    m_proc.write("python execfile('../../../share/qtcreator/dumper/bridge.py')\n");
+    m_proc.write("python execfile('../../../share/qtcreator/dumper/dumper.py')\n");
+    m_proc.write("python execfile('../../../share/qtcreator/dumper/qttypes.py')\n");
     m_proc.write("bbsetup\n");
     m_proc.write("break breaker\n");
     m_proc.write("handle SIGSTOP stop pass\n");
diff --git a/tests/manual/gdbdebugger/helper/helper.pro b/tests/manual/gdbdebugger/helper/helper.pro
index 3812ecfa5e8..5ccf8f946d1 100644
--- a/tests/manual/gdbdebugger/helper/helper.pro
+++ b/tests/manual/gdbdebugger/helper/helper.pro
@@ -2,5 +2,5 @@ include(../../../../qtcreator.pri)
 TEMPLATE = app
 
 win32:DEFINES += _CRT_SECURE_NO_WARNINGS
-SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros/gdbmacros.cpp
+SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/dumper/dumper.cpp
 SOURCES += main.cpp
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
index e5de9fd16e6..7283d7e8f56 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -720,7 +720,7 @@ struct Function
 
 void testFunction()
 {
-    // In order to use this, switch on the 'qDump__Function' in gdbmacros.py
+    // In order to use this, switch on the 'qDump__Function' in dumper.py
     Function func("x", "sin(x)", 0, 1);
     func.max = 10;
     func.f = "cos(x)";