diff --git a/src/app/main.cpp b/src/app/main.cpp index 72bdeeee0c416f5b819e6516f7f457c84a929255..994e37f1a8f4e690f7f82407895ff401569715b7 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 ed3319aeab0112a7bcf19bac9ba4d299a5807b6f..ab6d3c03171a1911a8ce50d2a2561a1237c9d740 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 eb17529f0adb1d9069430cd7e16856d06c3a6927..00abdc57040de5ec08629144b3546cda58c829d3 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 628df09b2d208cddde057549d91a1431f066695f..c7ce379b1671110e5eb7345d06bb44ae950c8e9b 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 e7ece0b859bd69216c0f84cc27e2b96a5b509dee..ff261b5c964c8b5152065f71bc6c4997024b8b78 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 47168746fd69a12df659eefb5931229f807307df..6864a25ae4d93c4c0c540aacbc8ce1ae7a13bb86 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 30fee8efe32ac08afa2067bfe2098d7fef48ce39..631b445be7ded65aef2d1027f45f5ffdbe1169a3 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 bb47642ba78020e93f261e0aa1f05d9e55b1b083..07ada0e46578ca2fb633f82d51b6bd0b83065dc7 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 3ff731241838ef05e20d85593fb1c5709a46966b..91c867ebdcf7b1cd5db97785009269cb9bbd74b7 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 b3b98ab6a4776d8a6dd8ecf8cb2dc6c7e8f517a1..4ec86aac9ec1f78ace101876a427c36d97961a34 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 6e2c9c240f9b02f521f9ddf67521bde07b67318a..02c496a7ae4ee54069ae9547c354b1fd991a6892 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