From f17d9f01dc42bd064e8d7b045ff66f19c408fab4 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Thu, 26 Sep 2013 13:01:29 +0200
Subject: [PATCH] Use the canonical version of defining string literals
Change-Id: If36658de6f68f552f93830ba4f1cfa9994a2e44c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/app/main.cpp | 28 +++++++++----------
src/libs/3rdparty/cplusplus/Token.cpp | 2 +-
src/libs/extensionsystem/optionsparser.cpp | 2 +-
src/libs/extensionsystem/pluginmanager.cpp | 6 ++--
src/libs/qtcreatorcdbext/eventcallback.cpp | 2 +-
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 6 ++--
.../cmakeprojectmanager/cmakeparser.cpp | 6 ++--
src/plugins/projectexplorer/buildsteplist.cpp | 4 +--
.../projectexplorer/deployconfiguration.cpp | 8 ++----
.../qmlprojectmanager/qmlprojectconstants.h | 4 +--
.../qt4projectmanager/addlibrarywizard.cpp | 2 +-
11 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 72bdeeee0c4..994e37f1a8f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -62,9 +62,9 @@ using namespace ExtensionSystem;
enum { OptionIndent = 4, DescriptionIndent = 34 };
-static const char appNameC[] = "Qt Creator";
-static const char corePluginNameC[] = "Core";
-static const char fixedOptionsC[] =
+const char appNameC[] = "Qt Creator";
+const char corePluginNameC[] = "Core";
+const char fixedOptionsC[] =
" [OPTION]... [FILE]...\n"
"Options:\n"
" -help Display this help\n"
@@ -75,17 +75,17 @@ static const char fixedOptionsC[] =
" -block Block until editor is closed\n"
" -pluginpath <path> Add a custom search path for plugins\n";
-static const char HELP_OPTION1[] = "-h";
-static const char HELP_OPTION2[] = "-help";
-static const char HELP_OPTION3[] = "/h";
-static const char HELP_OPTION4[] = "--help";
-static const char VERSION_OPTION[] = "-version";
-static const char CLIENT_OPTION[] = "-client";
-static const char SETTINGS_OPTION[] = "-settingspath";
-static const char TEST_OPTION[] = "-test";
-static const char PID_OPTION[] = "-pid";
-static const char BLOCK_OPTION[] = "-block";
-static const char PLUGINPATH_OPTION[] = "-pluginpath";
+const char HELP_OPTION1[] = "-h";
+const char HELP_OPTION2[] = "-help";
+const char HELP_OPTION3[] = "/h";
+const char HELP_OPTION4[] = "--help";
+const char VERSION_OPTION[] = "-version";
+const char CLIENT_OPTION[] = "-client";
+const char SETTINGS_OPTION[] = "-settingspath";
+const char TEST_OPTION[] = "-test";
+const char PID_OPTION[] = "-pid";
+const char BLOCK_OPTION[] = "-block";
+const char PLUGINPATH_OPTION[] = "-pluginpath";
typedef QList<PluginSpec *> PluginSpecSet;
diff --git a/src/libs/3rdparty/cplusplus/Token.cpp b/src/libs/3rdparty/cplusplus/Token.cpp
index ed3319aeab0..ab6d3c03171 100644
--- a/src/libs/3rdparty/cplusplus/Token.cpp
+++ b/src/libs/3rdparty/cplusplus/Token.cpp
@@ -23,7 +23,7 @@
using namespace CPlusPlus;
-static const char *token_names[] = {
+const char *token_names[] = {
(""), ("<error>"),
("<C++ comment>"), ("<C++ doxy comment>"),
diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp
index eb17529f0ad..00abdc57040 100644
--- a/src/libs/extensionsystem/optionsparser.cpp
+++ b/src/libs/extensionsystem/optionsparser.cpp
@@ -34,7 +34,7 @@
using namespace ExtensionSystem;
using namespace ExtensionSystem::Internal;
-static const char END_OF_OPTIONS[] = "--";
+const char END_OF_OPTIONS[] = "--";
const char *OptionsParser::NO_LOAD_OPTION = "-noload";
const char *OptionsParser::LOAD_OPTION = "-load";
const char *OptionsParser::TEST_OPTION = "-test";
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 628df09b2d2..c7ce379b167 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -52,9 +52,9 @@
#include <QTest>
#endif
-static const char C_IGNORED_PLUGINS[] = "Plugins/Ignored";
-static const char C_FORCEENABLED_PLUGINS[] = "Plugins/ForceEnabled";
-static const int DELAYED_INITIALIZE_INTERVAL = 20; // ms
+const char C_IGNORED_PLUGINS[] = "Plugins/Ignored";
+const char C_FORCEENABLED_PLUGINS[] = "Plugins/ForceEnabled";
+const int DELAYED_INITIALIZE_INTERVAL = 20; // ms
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;
diff --git a/src/libs/qtcreatorcdbext/eventcallback.cpp b/src/libs/qtcreatorcdbext/eventcallback.cpp
index e7ece0b859b..ff261b5c964 100644
--- a/src/libs/qtcreatorcdbext/eventcallback.cpp
+++ b/src/libs/qtcreatorcdbext/eventcallback.cpp
@@ -32,7 +32,7 @@
#include "stringutils.h"
#include "gdbmihelpers.h"
-static const char eventContextC[] = "event";
+const char eventContextC[] = "event";
const static int winExceptionCppException = 0xe06d7363;
diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index 47168746fd6..6864a25ae4d 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -980,10 +980,10 @@ static inline void getDateFromJulianDay(unsigned julianDay, int *year, int *mont
*day = d;
}
-const char *stdStringTypeC = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
-const char *stdWStringTypeC = "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 stdWStringTypeC[] = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
// Compiler option: -Zc:wchar_t-:
-const char *stdWStringWCharTypeC = "std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> >";
+const char stdWStringWCharTypeC[] = "std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> >";
static KnownType knownPODTypeHelper(const std::string &type, std::string::size_type endPos)
{
diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.cpp b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
index 30fee8efe32..631b445be7d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeparser.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
@@ -38,10 +38,8 @@ using namespace CMakeProjectManager;
using namespace Internal;
using namespace ProjectExplorer;
-namespace {
-const char * const COMMON_ERROR_PATTERN = "^CMake Error at (.*):([0-9]*) \\((.*)\\):";
-const char * const NEXT_SUBERROR_PATTERN = "^CMake Error in (.*):";
-}
+const char COMMON_ERROR_PATTERN[] = "^CMake Error at (.*):([0-9]*) \\((.*)\\):";
+const char NEXT_SUBERROR_PATTERN[] = "^CMake Error in (.*):";
CMakeParser::CMakeParser() :
m_skippedFirstEmptyLine(false)
diff --git a/src/plugins/projectexplorer/buildsteplist.cpp b/src/plugins/projectexplorer/buildsteplist.cpp
index bb47642ba78..07ada0e4657 100644
--- a/src/plugins/projectexplorer/buildsteplist.cpp
+++ b/src/plugins/projectexplorer/buildsteplist.cpp
@@ -60,8 +60,8 @@ IBuildStepFactory *findRestoreFactory(BuildStepList *parent, const QVariantMap &
return 0;
}
-const char * const STEPS_COUNT_KEY("ProjectExplorer.BuildStepList.StepsCount");
-const char * const STEPS_PREFIX("ProjectExplorer.BuildStepList.Step.");
+const char STEPS_COUNT_KEY[] = "ProjectExplorer.BuildStepList.StepsCount";
+const char STEPS_PREFIX[] = "ProjectExplorer.BuildStepList.Step.";
} // namespace
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index 3ff73124183..91c867ebdcf 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -39,12 +39,8 @@
using namespace ProjectExplorer;
-namespace {
-
-const char * const BUILD_STEP_LIST_COUNT("ProjectExplorer.BuildConfiguration.BuildStepListCount");
-const char * const BUILD_STEP_LIST_PREFIX("ProjectExplorer.BuildConfiguration.BuildStepList.");
-
-} // namespace
+const char BUILD_STEP_LIST_COUNT[] = "ProjectExplorer.BuildConfiguration.BuildStepListCount";
+const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildStepList.";
DeployConfiguration::DeployConfiguration(Target *target, const Core::Id id) :
ProjectConfiguration(target, id),
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index b3b98ab6a47..4ec86aac9ec 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -35,8 +35,8 @@
namespace QmlProjectManager {
namespace Constants {
-const char *const PROJECTCONTEXT = "QmlProject.ProjectContext";
-const char *const QMLPROJECT_MIMETYPE = QmlJSTools::Constants::QMLPROJECT_MIMETYPE;
+const char PROJECTCONTEXT[] = "QmlProject.ProjectContext";
+const char QMLPROJECT_MIMETYPE[] = QmlJSTools::Constants::QMLPROJECT_MIMETYPE;
} // namespace Constants
} // namespace QmlProjectManager
diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.cpp b/src/plugins/qt4projectmanager/addlibrarywizard.cpp
index 6e2c9c240f9..02c496a7ae4 100644
--- a/src/plugins/qt4projectmanager/addlibrarywizard.cpp
+++ b/src/plugins/qt4projectmanager/addlibrarywizard.cpp
@@ -44,7 +44,7 @@ using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
-const char *qt_file_dialog_filter_reg_exp =
+const char qt_file_dialog_filter_reg_exp[] =
"^(.*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
// taken from qfiledialog.cpp
--
GitLab