Rename share/dumper to share/debugger and {l,g}bridge to {lldb,gdb}bridge

Change-Id: I56a09dd89d2ac086ee264432510fd39b5efe69c5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

25 files changed, 20 insertions, 20 deletions

diff --git a/share/qtcreator/dumper/LGPL_EXCEPTION.TXT b/share/qtcreator/debugger/LGPL_EXCEPTION.TXT
index add80b9318..add80b9318 100644
--- a/share/qtcreator/dumper/LGPL_EXCEPTION.TXT
+++ b/share/qtcreator/debugger/LGPL_EXCEPTION.TXT
diff --git a/share/qtcreator/dumper/LICENSE.LGPL b/share/qtcreator/debugger/LICENSE.LGPL
index 602bfc9463..602bfc9463 100644
--- a/share/qtcreator/dumper/LICENSE.LGPL
+++ b/share/qtcreator/debugger/LICENSE.LGPL
diff --git a/share/qtcreator/dumper/dumper.cpp b/share/qtcreator/debugger/dumper.cpp
index 0dd4208d3a..3c7a3da81f 100644
--- a/share/qtcreator/dumper/dumper.cpp
+++ b/share/qtcreator/debugger/dumper.cpp
@@ -202,8 +202,8 @@ int qtGhVersion = QT_VERSION;
 QT_BEGIN_NAMESPACE
 #endif
 
-const char *stdStringTypeC = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
-const char *stdWideStringTypeUShortC = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
+const char stdStringTypeC[] = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
+const char stdWideStringTypeUShortC[] = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
 
 #if defined(QT_BEGIN_NAMESPACE)
 QT_END_NAMESPACE
diff --git a/share/qtcreator/dumper/dumper.h b/share/qtcreator/debugger/dumper.h
index 0f2b254589..0f2b254589 100644
--- a/share/qtcreator/dumper/dumper.h
+++ b/share/qtcreator/debugger/dumper.h
diff --git a/share/qtcreator/dumper/dumper.pro b/share/qtcreator/debugger/dumper.pro
index f3176a1c04..f3176a1c04 100644
--- a/share/qtcreator/dumper/dumper.pro
+++ b/share/qtcreator/debugger/dumper.pro
diff --git a/share/qtcreator/dumper/dumper.py b/share/qtcreator/debugger/dumper.py
index 71c1682f4a..71c1682f4a 100644
--- a/share/qtcreator/dumper/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
diff --git a/share/qtcreator/dumper/dumper_p.h b/share/qtcreator/debugger/dumper_p.h
index bff736c329..bff736c329 100644
--- a/share/qtcreator/dumper/dumper_p.h
+++ b/share/qtcreator/debugger/dumper_p.h
diff --git a/share/qtcreator/dumper/gbridge.py b/share/qtcreator/debugger/gdbbridge.py
index a53961ca9f..a53961ca9f 100644
--- a/share/qtcreator/dumper/gbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
diff --git a/share/qtcreator/dumper/lbridge.py b/share/qtcreator/debugger/lldbbridge.py
index 0a0bb858b4..0b1e5ec512 100644
--- a/share/qtcreator/dumper/lbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -1517,7 +1517,7 @@ def testit1():
 
 
 # Used in dumper auto test.
-# Usage: python lbridge.py /path/to/testbinary comma-separated-inames
+# Usage: python lldbbridge.py /path/to/testbinary comma-separated-inames
 def testit():
 
     db = Dumper()
diff --git a/share/qtcreator/dumper/pdumper.py b/share/qtcreator/debugger/pdumper.py
index e0144490ab..e0144490ab 100644
--- a/share/qtcreator/dumper/pdumper.py
+++ b/share/qtcreator/debugger/pdumper.py
diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 91364a246a..91364a246a 100644
--- a/share/qtcreator/dumper/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
diff --git a/share/qtcreator/dumper/test/dumpertest.pro b/share/qtcreator/debugger/test/dumpertest.pro
index 95546a6f26..95546a6f26 100644
--- a/share/qtcreator/dumper/test/dumpertest.pro
+++ b/share/qtcreator/debugger/test/dumpertest.pro
diff --git a/share/qtcreator/dumper/test/main.cpp b/share/qtcreator/debugger/test/main.cpp
index 21d2a13a89..21d2a13a89 100644
--- a/share/qtcreator/dumper/test/main.cpp
+++ b/share/qtcreator/debugger/test/main.cpp
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index e9e51c3563..956659f605 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -32,7 +32,7 @@ DATA_DIRS = \
     schemes \
     styles \
     rss \
-    dumper \
+    debugger \
     qmldesigner \
     qmlicons \
     qml \
diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro
index df72e7e970..80898b06b5 100644
--- a/src/plugins/debugger/dumper.pro
+++ b/src/plugins/debugger/dumper.pro
@@ -20,5 +20,5 @@ true {
     QT = core gui
 }
 
-SOURCES += ../../../share/qtcreator/dumper/dumper.cpp
+SOURCES += ../../../share/qtcreator/debugger/dumper.cpp
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 27486410f6..ca5cfe27ea 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4987,10 +4987,10 @@ void GdbEngine::tryLoadPythonDumpers()
     m_pythonAttemptedToLoad = true;
 
     const QByteArray dumperSourcePath =
-        Core::ICore::resourcePath().toLocal8Bit() + "/dumper/";
+        Core::ICore::resourcePath().toLocal8Bit() + "/debugger/";
 
    postCommand("python sys.path.insert(1, '" + dumperSourcePath + "')", ConsoleCommand);
-   postCommand("python from gbridge import *", ConsoleCommand, CB(handlePythonSetup));
+   postCommand("python from gdbbridge import *", ConsoleCommand, CB(handlePythonSetup));
 }
 
 void GdbEngine::reloadDebuggingHelpers()
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 38ea7fc645..8c2334c32c 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -148,7 +148,7 @@ void LldbEngine::setupEngine()
         SLOT(handleResponse(QByteArray)), Qt::QueuedConnection);
 
     m_lldbProc.start(_("python"), QStringList() << _("-i")
-        << (Core::ICore::resourcePath() + _("/dumper/lbridge.py")) << m_lldbCmd);
+        << (Core::ICore::resourcePath() + _("/debugger/lldbbridge.py")) << m_lldbCmd);
 
     if (!m_lldbProc.waitForStarted()) {
         const QString msg = tr("Unable to start lldb '%1': %2")
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index d244bd3739..702bd1cefa 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -211,7 +211,7 @@ void PdbEngine::runEngine()
     QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
     showStatusMessage(tr("Running requested..."), 5000);
     const QByteArray dumperSourcePath =
-        Core::ICore::resourcePath().toLocal8Bit() + "/dumper/";
+        Core::ICore::resourcePath().toLocal8Bit() + "/debugger/";
     QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
     postDirectCommand("import sys");
     postDirectCommand("sys.argv.append('" + fileName.toLocal8Bit() + "')");
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 93e42b9810..a4437385c4 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -422,13 +422,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QList<ProjectExplorer::Task>()
             << QString();
     QTest::newRow("note")
-            << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
+            << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
             << OutputParserTester::STDERR
             << QString() << QString()
             << ( QList<ProjectExplorer::Task>()
                  << Task(Task::Unknown,
                          QLatin1String("initialized from here"),
-                         Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/dumper/dumper.cpp")), 1079,
+                         Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/debugger/dumper.cpp")), 1079,
                          categoryCompile))
             << QString();
     QTest::newRow("static member function")
diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp
index 781da4842e..39be3acfb4 100644
--- a/src/plugins/projectexplorer/gnumakeparser.cpp
+++ b/src/plugins/projectexplorer/gnumakeparser.cpp
@@ -338,9 +338,9 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
             << QStringList();
     QTest::newRow("pass-trough note")
             << QStringList()
-            << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
+            << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
             << OutputParserTester::STDERR
-            << QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here\n")
+            << QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here\n")
             << QList<ProjectExplorer::Task>()
             << QString()
             << QStringList();
diff --git a/src/plugins/qtsupport/debugginghelper.cpp b/src/plugins/qtsupport/debugginghelper.cpp
index 3c0bebbbce..442b59cf88 100644
--- a/src/plugins/qtsupport/debugginghelper.cpp
+++ b/src/plugins/qtsupport/debugginghelper.cpp
@@ -61,7 +61,7 @@ QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QStr
 
 static QString sourcePath()
 {
-    return Core::ICore::resourcePath() + QLatin1String("/dumper/");
+    return Core::ICore::resourcePath() + QLatin1String("/debugger/");
 }
 
 static QStringList sourceFileNames()
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 65c6be9f39..0cba83242f 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -5,7 +5,7 @@ QT += network
 include(../qttest.pri)
 
 DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
-DUMPERDIR   = $$IDE_SOURCE_TREE/share/qtcreator/dumper
+DUMPERDIR   = $$IDE_SOURCE_TREE/share/qtcreator/debugger
 
 # To access the std::type rewriter
 DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs
index 68f2689171..816c4195a5 100644
--- a/tests/auto/debugger/dumpers.qbs
+++ b/tests/auto/debugger/dumpers.qbs
@@ -27,7 +27,7 @@ Autotest {
 
     cpp.defines: base.concat([
         'CDBEXT_PATH="' + buildDirectory + '\\\\lib"',
-        'DUMPERDIR="' + path + '/../../../share/qtcreator/dumper"',
+        'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"',
         'QT_NO_CAST_FROM_ASCII',
         'QT_DISABLE_DEPRECATED_BEFORE=0x040900'
     ])
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 589333064a..648bd9b7f5 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -837,7 +837,7 @@ void tst_Dumpers::dumper()
 
         if (m_usePython) {
             cmds += "python sys.path.insert(1, '" + dumperDir + "')\n"
-                    "python from gbridge import *\n"
+                    "python from gdbbridge import *\n"
                     "run " + nograb + "\n"
                     "up\n"
                     "python print('@%sS@%s@' % ('N', qtNamespace()))\n"
@@ -879,7 +879,7 @@ void tst_Dumpers::dumper()
         cmds += "q\n";
     } else if (m_debuggerEngine == DumpTestLldbEngine) {
         exe = "python";
-        args << QLatin1String(dumperDir + "/lbridge.py")
+        args << QLatin1String(dumperDir + "/lldbbridge.py")
              << QString::fromUtf8(m_debuggerBinary)
              << t->buildPath + QLatin1String("/doit")
              << QString::fromUtf8(expanded);
@@ -4306,7 +4306,7 @@ void tst_Dumpers::dumper_data()
 
 
 
-//    // This tests qdump__KRBase in dumpers/qttypes.py which uses
+//    // This tests qdump__KRBase in share/qtcreator/debugger/qttypes.py which uses
 //    // a static typeflag to dispatch to subclasses");
 
 //    QTest::newRow("KR")
diff --git a/tests/manual/debugger/helper/helper.pro b/tests/manual/debugger/helper/helper.pro
index 867eb3fa2c..42968d146f 100644
--- a/tests/manual/debugger/helper/helper.pro
+++ b/tests/manual/debugger/helper/helper.pro
@@ -3,5 +3,5 @@ TEMPLATE = app
 greaterThan(QT_MAJOR_VERSION, 4):QT *= widgets
 
 win32:DEFINES += _CRT_SECURE_NO_WARNINGS
-SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/dumper/dumper.cpp
+SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/debugger/dumper.cpp
 SOURCES += main.cpp