more style fixes of string literal access

Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>

share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h

@@ -4,8 +4,8 @@
 namespace %PluginName% {
 namespace Constants {
 
-    const char * const ACTION_ID = "%PluginName%.Action";
-    const char * const MENU_ID = "%PluginName%.Menu";
+const char ACTION_ID[] = "%PluginName%.Action";
+const char MENU_ID[] = "%PluginName%.Menu";
 
 } // namespace %PluginName%
 } // namespace Constants

src/libs/extensionsystem/pluginspec.cpp

@@ -439,28 +439,28 @@ QHash<PluginDependency, PluginSpec *> PluginSpec::dependencySpecs() const
 //==========PluginSpecPrivate==================
 
 namespace {
-    const char * const PLUGIN = "plugin";
-    const char * const PLUGIN_NAME = "name";
-    const char * const PLUGIN_VERSION = "version";
-    const char * const PLUGIN_COMPATVERSION = "compatVersion";
-    const char * const PLUGIN_EXPERIMENTAL = "experimental";
-    const char * const VENDOR = "vendor";
-    const char * const COPYRIGHT = "copyright";
-    const char * const LICENSE = "license";
-    const char * const DESCRIPTION = "description";
-    const char * const URL = "url";
-    const char * const CATEGORY = "category";
-    const char * const DEPENDENCYLIST = "dependencyList";
-    const char * const DEPENDENCY = "dependency";
-    const char * const DEPENDENCY_NAME = "name";
-    const char * const DEPENDENCY_VERSION = "version";
-    const char * const DEPENDENCY_TYPE = "type";
-    const char * const DEPENDENCY_TYPE_SOFT = "optional";
-    const char * const DEPENDENCY_TYPE_HARD = "required";
-    const char * const ARGUMENTLIST = "argumentList";
-    const char * const ARGUMENT = "argument";
-    const char * const ARGUMENT_NAME = "name";
-    const char * const ARGUMENT_PARAMETER = "parameter";
+    const char PLUGIN[] = "plugin";
+    const char PLUGIN_NAME[] = "name";
+    const char PLUGIN_VERSION[] = "version";
+    const char PLUGIN_COMPATVERSION[] = "compatVersion";
+    const char PLUGIN_EXPERIMENTAL[] = "experimental";
+    const char VENDOR[] = "vendor";
+    const char COPYRIGHT[] = "copyright";
+    const char LICENSE[] = "license";
+    const char DESCRIPTION[] = "description";
+    const char URL[] = "url";
+    const char CATEGORY[] = "category";
+    const char DEPENDENCYLIST[] = "dependencyList";
+    const char DEPENDENCY[] = "dependency";
+    const char DEPENDENCY_NAME[] = "name";
+    const char DEPENDENCY_VERSION[] = "version";
+    const char DEPENDENCY_TYPE[] = "type";
+    const char DEPENDENCY_TYPE_SOFT[] = "optional";
+    const char DEPENDENCY_TYPE_HARD[] = "required";
+    const char ARGUMENTLIST[] = "argumentList";
+    const char ARGUMENT[] = "argument";
+    const char ARGUMENT_NAME[] = "name";
+    const char ARGUMENT_PARAMETER[] = "parameter";
 }
 /*!
     \fn PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec)

src/plugins/bazaar/constants.h

@@ -36,69 +36,69 @@
 namespace Bazaar {
 namespace Constants {
 
-const char * const BAZAAR = "bazaar";
-const char * const BAZAARREPO = ".bzr";
-const char * const BAZAARDEFAULT = "bzr";
+const char BAZAAR[] = "bazaar";
+const char BAZAARREPO[] = ".bzr";
+const char BAZAARDEFAULT[] = "bzr";
 
-//changeset identifiers
-const char * const CHANGESET_ID = "([0-9]+)"; // match and capture
-const char * const CHANGESET_ID_EXACT = "[0-9]+"; // match
+// Changeset identifiers
+const char CHANGESET_ID[] = "([0-9]+)"; // match and capture
+const char CHANGESET_ID_EXACT[] = "[0-9]+"; // match
 
-//BaseEditorParameters
-const char * const COMMANDLOG_ID = "Bazaar Command Log Editor";
-const char * const COMMANDLOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Command Log Editor");
-const char * const COMMANDLOG = "Bazaar Command Log Editor";
-const char * const COMMANDAPP = "application/vnd.nokia.text.scs_bazaar_commandlog";
-const char * const COMMANDEXT = "vcsBazaarCommand";
+// Base editor parameters
+const char COMMANDLOG_ID[] = "Bazaar Command Log Editor";
+const char COMMANDLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Command Log Editor");
+const char COMMANDLOG[] = "Bazaar Command Log Editor";
+const char COMMANDAPP[] = "application/vnd.nokia.text.scs_bazaar_commandlog";
+const char COMMANDEXT[] = "vcsBazaarCommand";
 
-const char * const FILELOG_ID = "Bazaar File Log Editor";
-const char * const FILELOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar File Log Editor");
-const char * const FILELOG = "Bazaar File Log Editor";
-const char * const LOGAPP = "application/vnd.nokia.text.scs_bazaar_log";
-const char * const LOGEXT = "vcsBazaarLog";
+const char FILELOG_ID[] = "Bazaar File Log Editor";
+const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar File Log Editor");
+const char FILELOG[] = "Bazaar File Log Editor";
+const char LOGAPP[] = "application/vnd.nokia.text.scs_bazaar_log";
+const char LOGEXT[] = "vcsBazaarLog";
 
-const char * const ANNOTATELOG_ID = "Bazaar Annotation Editor";
-const char * const ANNOTATELOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Annotation Editor");
-const char * const ANNOTATELOG = "Bazaar Annotation Editor";
-const char * const ANNOTATEAPP = "application/vnd.nokia.text.scs_bazaar_annotatelog";
-const char * const ANNOTATEEXT = "vcsBazaarAnnotate";
+const char ANNOTATELOG_ID[] = "Bazaar Annotation Editor";
+const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Annotation Editor");
+const char ANNOTATELOG[] = "Bazaar Annotation Editor";
+const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_bazaar_annotatelog";
+const char ANNOTATEEXT[] = "vcsBazaarAnnotate";
 
-const char * const DIFFLOG_ID = "Bazaar Diff Editor";
-const char * const DIFFLOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Diff Editor");
-const char * const DIFFLOG = "Bazaar Diff Editor";
-const char * const DIFFAPP = "text/x-patch";
-const char * const DIFFEXT = "diff";
+const char DIFFLOG_ID[] = "Bazaar Diff Editor";
+const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Diff Editor");
+const char DIFFLOG[] = "Bazaar Diff Editor";
+const char DIFFAPP[] = "text/x-patch";
+const char DIFFEXT[] = "diff";
 
-//SubmitEditorParameters
-const char * const COMMIT_ID = "Bazaar Commit Log Editor";
-const char * const COMMIT_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Commit Log Editor");
-const char * const COMMITMIMETYPE = "application/vnd.nokia.text.scs_bazaar_commitlog";
+// Submit editor parameters
+const char COMMIT_ID[] = "Bazaar Commit Log Editor";
+const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Commit Log Editor");
+const char COMMITMIMETYPE[] = "application/vnd.nokia.text.scs_bazaar_commitlog";
 
-//menu items
-//File menu actions
-const char * const ADD = "Bazaar.AddSingleFile";
-const char * const DELETE = "Bazaar.DeleteSingleFile";
-const char * const ANNOTATE = "Bazaar.Annotate";
-const char * const DIFF = "Bazaar.DiffSingleFile";
-const char * const LOG = "Bazaar.LogSingleFile";
-const char * const REVERT = "Bazaar.RevertSingleFile";
-const char * const STATUS = "Bazaar.Status";
+// Menu items
+// File menu actions
+const char ADD[] = "Bazaar.AddSingleFile";
+const char DELETE[] = "Bazaar.DeleteSingleFile";
+const char ANNOTATE[] = "Bazaar.Annotate";
+const char DIFF[] = "Bazaar.DiffSingleFile";
+const char LOG[] = "Bazaar.LogSingleFile";
+const char REVERT[] = "Bazaar.RevertSingleFile";
+const char STATUS[] = "Bazaar.Status";
 
-//directory menu Actions
-const char * const DIFFMULTI = "Bazaar.Action.DiffMulti";
-const char * const REVERTMULTI = "Bazaar.Action.RevertALL";
-const char * const STATUSMULTI = "Bazaar.Action.StatusMulti";
-const char * const LOGMULTI = "Bazaar.Action.Logmulti";
+// Directory menu Actions
+const char DIFFMULTI[] = "Bazaar.Action.DiffMulti";
+const char REVERTMULTI[] = "Bazaar.Action.RevertALL";
+const char STATUSMULTI[] = "Bazaar.Action.StatusMulti";
+const char LOGMULTI[] = "Bazaar.Action.Logmulti";
 
-//repository menu actions
-const char * const PULL = "Bazaar.Action.Pull";
-const char * const PUSH = "Bazaar.Action.Push";
-const char * const UPDATE = "Bazaar.Action.Update";
-const char * const COMMIT = "Bazaar.Action.Commit";
-const char * const CREATE_REPOSITORY = "Bazaar.Action.CreateRepository";
+// Repository menu actions
+const char PULL[] = "Bazaar.Action.Pull";
+const char PUSH[] = "Bazaar.Action.Push";
+const char UPDATE[] = "Bazaar.Action.Update";
+const char COMMIT[] = "Bazaar.Action.Commit";
+const char CREATE_REPOSITORY[] = "Bazaar.Action.CreateRepository";
 
-//submit editor actions
-const char * const DIFFEDITOR = "Bazaar.Action.Editor.Diff";
+// Submit editor actions
+const char DIFFEDITOR[] = "Bazaar.Action.Editor.Diff";
 
 } // namespace Constants
 } // namespace Bazaar

src/plugins/bineditor/bineditorconstants.h

@@ -36,9 +36,9 @@
 namespace BINEditor {
 namespace Constants {
 
-const char * const C_BINEDITOR       = "BinEditor.BinaryEditor";
-const char * const C_BINEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "Binary Editor");
-const char * const C_BINEDITOR_MIMETYPE = "application/octet-stream";
+const char C_BINEDITOR[] = "BinEditor.BinaryEditor";
+const char C_BINEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Binary Editor");
+const char C_BINEDITOR_MIMETYPE[] = "application/octet-stream";
 
 } // namespace Constants
 } // namespace BINEditor

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -48,10 +48,9 @@ using namespace CMakeProjectManager;
 using namespace Internal;
 
 namespace {
-const char * const CMAKE_BC_ID("CMakeProjectManager.CMakeBuildConfiguration");
-
-const char * const TOOLCHAIN_KEY("CMakeProjectManager.CMakeBuildConfiguration.ToolChain");
-const char * const BUILD_DIRECTORY_KEY("CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory");
+const char CMAKE_BC_ID[] = "CMakeProjectManager.CMakeBuildConfiguration";
+const char TOOLCHAIN_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.ToolChain";
+const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory";
 } // namespace
 
 CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeTarget *parent) :

src/plugins/cmakeprojectmanager/cmakeprojectconstants.h

@@ -36,16 +36,16 @@
 namespace CMakeProjectManager {
 namespace Constants {
 
-const char * const PROJECTCONTEXT = "CMakeProject.ProjectContext";
-const char * const CMAKEMIMETYPE  = "text/x-cmake"; // TOOD check that this is correct
-const char * const CMAKE_EDITOR_ID = "CMakeProject.CMakeEditor";
-const char * const CMAKE_EDITOR_DISPLAY_NAME = "CMake Editor";
-const char * const C_CMAKEEDITOR = "CMakeProject.Context.CMakeEditor";
-const char * const RUNCMAKE            = "CMakeProject.RunCMake";
-const char * const RUNCMAKECONTEXTMENU = "CMakeProject.RunCMakeContextMenu";
+const char PROJECTCONTEXT[] = "CMakeProject.ProjectContext";
+const char CMAKEMIMETYPE[]  = "text/x-cmake"; // TODO check that this is correct
+const char CMAKE_EDITOR_ID[] = "CMakeProject.CMakeEditor";
+const char CMAKE_EDITOR_DISPLAY_NAME[] = "CMake Editor";
+const char C_CMAKEEDITOR[] = "CMakeProject.Context.CMakeEditor";
+const char RUNCMAKE[] = "CMakeProject.RunCMake";
+const char RUNCMAKECONTEXTMENU[] = "CMakeProject.RunCMakeContextMenu";
 
 // Project
-const char * const CMAKEPROJECT_ID = "CMakeProjectManager.CMakeProject";
+const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject";
 
 } // namespace Constants
 } // namespace CMakeProjectManager

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -61,15 +61,15 @@ using namespace CMakeProjectManager;
 using namespace CMakeProjectManager::Internal;
 
 namespace {
-const char * const CMAKE_RC_ID("CMakeProjectManager.CMakeRunConfiguration");
-const char * const CMAKE_RC_PREFIX("CMakeProjectManager.CMakeRunConfiguration.");
-
-const char * const USER_WORKING_DIRECTORY_KEY("CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory");
-const char * const USE_TERMINAL_KEY("CMakeProjectManager.CMakeRunConfiguration.UseTerminal");
-const char * const TITLE_KEY("CMakeProjectManager.CMakeRunConfiguation.Title");
-const char * const ARGUMENTS_KEY("CMakeProjectManager.CMakeRunConfiguration.Arguments");
-const char * const USER_ENVIRONMENT_CHANGES_KEY("CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges");
-const char * const BASE_ENVIRONMENT_BASE_KEY("CMakeProjectManager.BaseEnvironmentBase");
+const char CMAKE_RC_ID[] = "CMakeProjectManager.CMakeRunConfiguration";
+const char CMAKE_RC_PREFIX[] = "CMakeProjectManager.CMakeRunConfiguration.";
+
+const char USER_WORKING_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory";
+const char USE_TERMINAL_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UseTerminal";
+const char TITLE_KEY[] = "CMakeProjectManager.CMakeRunConfiguation.Title";
+const char ARGUMENTS_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.Arguments";
+const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges";
+const char BASE_ENVIRONMENT_BASE_KEY[] = "CMakeProjectManager.BaseEnvironmentBase";
 
 QString buildTargetFromId(const QString &id)
 {

src/plugins/cmakeprojectmanager/cmaketarget.h

@@ -38,10 +38,9 @@
 #include <projectexplorer/target.h>
 
 namespace CMakeProjectManager {
-
 namespace Internal {
 
-const char * const DEFAULT_CMAKE_TARGET_ID("CMakeProjectManager.DefaultCMakeTarget");
+const char DEFAULT_CMAKE_TARGET_ID[] = "CMakeProjectManager.DefaultCMakeTarget";
 
 class CMakeBuildConfiguration;
 class CMakeBuildConfigurationFactory;
@@ -96,7 +95,6 @@ public:
 };
 
 } // namespace Internal
-
 } // namespace CMakeProjectManager
 
 #endif // CMAKETARGET_H

src/plugins/coreplugin/externaltool.cpp

@@ -64,31 +64,31 @@ using namespace Core;
 using namespace Core::Internal;
 
 namespace {
-    const char * const kExternalTool = "externaltool";
-    const char * const kId = "id";
-    const char * const kDescription = "description";
-    const char * const kDisplayName = "displayname";
-    const char * const kCategory = "category";
-    const char * const kOrder = "order";
-    const char * const kExecutable = "executable";
-    const char * const kPath = "path";
-    const char * const kArguments = "arguments";
-    const char * const kInput = "input";
-    const char * const kWorkingDirectory = "workingdirectory";
-
-    const char * const kXmlLang = "xml:lang";
-    const char * const kOutput = "output";
-    const char * const kError = "error";
-    const char * const kOutputShowInPane = "showinpane";
-    const char * const kOutputReplaceSelection = "replaceselection";
-    const char * const kOutputIgnore = "ignore";
-    const char * const kModifiesDocument = "modifiesdocument";
-    const char * const kYes = "yes";
-    const char * const kNo = "no";
-    const char * const kTrue= "true";
-    const char * const kFalse = "false";
-
-    const char * const kSpecialUncategorizedSetting = "SpecialEmptyCategoryForUncategorizedTools";
+    const char kExternalTool[] = "externaltool";
+    const char kId[] = "id";
+    const char kDescription[] = "description";
+    const char kDisplayName[] = "displayname";
+    const char kCategory[] = "category";
+    const char kOrder[] = "order";
+    const char kExecutable[] = "executable";
+    const char kPath[] = "path";
+    const char kArguments[] = "arguments";
+    const char kInput[] = "input";
+    const char kWorkingDirectory[] = "workingdirectory";
+
+    const char kXmlLang[] = "xml:lang";
+    const char kOutput[] = "output";
+    const char kError[] = "error";
+    const char kOutputShowInPane[] = "showinpane";
+    const char kOutputReplaceSelection[] = "replaceselection";
+    const char kOutputIgnore[] = "ignore";
+    const char kModifiesDocument[] = "modifiesdocument";
+    const char kYes[] = "yes";
+    const char kNo[] = "no";
+    const char kTrue[] = "true";
+    const char kFalse[] = "false";
+
+    const char kSpecialUncategorizedSetting[] = "SpecialEmptyCategoryForUncategorizedTools";
 }
 
 // #pragma mark -- ExternalTool

src/plugins/cpaster/cpasterconstants.h

@@ -37,10 +37,12 @@
 
 namespace CodePaster {
 namespace Constants {
-const char * const CPASTER_SETTINGS_CATEGORY = "X.CPaster";
-const char * const CPASTER_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CodePaster", "Code Pasting");
-const char * const SETTINGS_CATEGORY_CPASTER_ICON = ":/core/images/category_cpaster.png";
-}
-}
+
+const char CPASTER_SETTINGS_CATEGORY[] = "X.CPaster";
+const char CPASTER_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CodePaster", "Code Pasting");
+const char SETTINGS_CATEGORY_CPASTER_ICON[] = ":/core/images/category_cpaster.png";
+
+} // namespace Constants
+} // namespace CodePaster
 
 #endif // CPASTERCONSTANTS_H

src/plugins/cppeditor/cppeditorconstants.h

@@ -36,34 +36,34 @@
 namespace CppEditor {
 namespace Constants {
 
-const char * const M_CONTEXT    = "CppEditor.ContextMenu";
-const char * const C_CPPEDITOR  = "CppPlugin.C++Editor";
-const char * const CPPEDITOR_ID = "CppPlugin.C++Editor";
-const char * const CPPEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "C++ Editor");
-const char * const SWITCH_DECLARATION_DEFINITION = "CppEditor.SwitchDeclarationDefinition";
-const char * const RENAME_SYMBOL_UNDER_CURSOR = "CppEditor.RenameSymbolUnderCursor";
-const char * const FIND_USAGES = "CppEditor.FindUsages";
-const char * const M_REFACTORING_MENU_INSERTION_POINT = "CppEditor.RefactorGroup";
-const char * const SEPARATOR = "CppEditor.Separator";
-const char * const SEPARATOR2 = "CppEditor.Separator2";
-const char * const SEPARATOR3 = "CppEditor.Separator3";
-const char * const SEPARATOR4 = "CppEditor.Separator4";
-const char * const JUMP_TO_DEFINITION = "CppEditor.JumpToDefinition";
-const char * const UPDATE_CODEMODEL = "CppEditor.UpdateCodeModel";
+const char M_CONTEXT[] = "CppEditor.ContextMenu";
+const char C_CPPEDITOR[] = "CppPlugin.C++Editor";
+const char CPPEDITOR_ID[] = "CppPlugin.C++Editor";
+const char CPPEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "C++ Editor");
+const char SWITCH_DECLARATION_DEFINITION[] = "CppEditor.SwitchDeclarationDefinition";
+const char RENAME_SYMBOL_UNDER_CURSOR[] = "CppEditor.RenameSymbolUnderCursor";
+const char FIND_USAGES[] = "CppEditor.FindUsages";
+const char M_REFACTORING_MENU_INSERTION_POINT[] = "CppEditor.RefactorGroup";
+const char SEPARATOR[] = "CppEditor.Separator";
+const char SEPARATOR2[] = "CppEditor.Separator2";
+const char SEPARATOR3[] = "CppEditor.Separator3";
+const char SEPARATOR4[] = "CppEditor.Separator4";
+const char JUMP_TO_DEFINITION[] = "CppEditor.JumpToDefinition";
+const char UPDATE_CODEMODEL[] = "CppEditor.UpdateCodeModel";
 
 const int TYPE_HIERARCHY_PRIORITY = 700;
-const char * const TYPE_HIERARCHY_ID = "CppEditor.TypeHierarchy";
-const char * const OPEN_TYPE_HIERARCHY = "CppEditor.OpenTypeHierarchy";
+const char TYPE_HIERARCHY_ID[] = "CppEditor.TypeHierarchy";
+const char OPEN_TYPE_HIERARCHY[] = "CppEditor.OpenTypeHierarchy";
 
-const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
-const char * const C_HEADER_MIMETYPE = "text/x-chdr";
-const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
-const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
+const char C_SOURCE_MIMETYPE[] = "text/x-csrc";
+const char C_HEADER_MIMETYPE[] = "text/x-chdr";
+const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
+const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
 
-const char * const WIZARD_CATEGORY = "O.C++";
-const char * const WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("CppEditor", "C++");
+const char WIZARD_CATEGORY[] = "O.C++";
+const char WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CppEditor", "C++");
 
-const char * const CPP_SNIPPETS_GROUP_ID = "C++";
+const char CPP_SNIPPETS_GROUP_ID[] = "C++";
 
 } // namespace Constants
 } // namespace CppEditor

src/plugins/cpptools/cpptoolsconstants.h

@@ -38,31 +38,31 @@
 namespace CppTools {
 namespace Constants {
 
-const char * const M_TOOLS_CPP              = "CppTools.Tools.Menu";
-const char * const SWITCH_HEADER_SOURCE     = "CppTools.SwitchHeaderSource";
-const char * const TASK_INDEX               = "CppTools.Task.Index";
-const char * const TASK_SEARCH              = "CppTools.Task.Search";
-const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
-const char * const C_HEADER_MIMETYPE = "text/x-chdr";
-const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
-const char * const OBJECTIVE_CPP_SOURCE_MIMETYPE = "text/x-objcsrc";
-const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
+const char M_TOOLS_CPP[]              = "CppTools.Tools.Menu";
+const char SWITCH_HEADER_SOURCE[]     = "CppTools.SwitchHeaderSource";
+const char TASK_INDEX[]               = "CppTools.Task.Index";
+const char TASK_SEARCH[]              = "CppTools.Task.Search";
+const char C_SOURCE_MIMETYPE[] = "text/x-csrc";
+const char C_HEADER_MIMETYPE[] = "text/x-chdr";
+const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
+const char OBJECTIVE_CPP_SOURCE_MIMETYPE[] = "text/x-objcsrc";
+const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
 
 // QSettings keys for use by the "New Class" wizards.
-const char * const CPPTOOLS_SETTINGSGROUP = "CppTools";
-const char * const LOWERCASE_CPPFILES_KEY = "LowerCaseFiles";
+const char CPPTOOLS_SETTINGSGROUP[] = "CppTools";
+const char LOWERCASE_CPPFILES_KEY[] = "LowerCaseFiles";
 enum { lowerCaseFilesDefault = 1 };
 
-const char * const CPP_CODE_STYLE_SETTINGS_ID = "A.Code Style";
-const char * const CPP_CODE_STYLE_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "Code Style");
-const char * const CPP_FILE_SETTINGS_ID = "B.File Naming";
-const char * const CPP_FILE_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "File Naming");
-const char * const CPP_SETTINGS_CATEGORY = "I.C++";
-const char * const CPP_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");
-const char * const SETTINGS_CATEGORY_CPP_ICON = ":/core/images/category_cpp.png";
+const char CPP_CODE_STYLE_SETTINGS_ID[] = "A.Code Style";
+const char CPP_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "Code Style");
+const char CPP_FILE_SETTINGS_ID[] = "B.File Naming";
+const char CPP_FILE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "File Naming");
+const char CPP_SETTINGS_CATEGORY[] = "I.C++";
+const char CPP_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CppTools", "C++");
+const char SETTINGS_CATEGORY_CPP_ICON[] = ":/core/images/category_cpp.png";
 
-const char * const CPP_SETTINGS_ID = "Cpp";
-const char * const CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "C++");
+const char CPP_SETTINGS_ID[] = "Cpp";
+const char CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++");
 
 } // namespace Constants
 } // namespace CppTools

src/plugins/cvs/cvsconstants.h

@@ -36,15 +36,15 @@
 namespace CVS {
 namespace Constants {
 
-const char * const CVS_SUBMIT_MIMETYPE = "application/vnd.nokia.text.cvs.submit";
-const char * const CVSCOMMITEDITOR  = "CVS Commit Editor";
-const char * const CVSCOMMITEDITOR_ID  = "CVS Commit Editor";
-const char * const CVSCOMMITEDITOR_DISPLAY_NAME  = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor");
-const char * const SUBMIT_CURRENT = "CVS.SubmitCurrentLog";
-const char * const DIFF_SELECTED = "CVS.DiffSelectedFilesInLog";
+const char CVS_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.cvs.submit";
+const char CVSCOMMITEDITOR[]  = "CVS Commit Editor";
+const char CVSCOMMITEDITOR_ID[]  = "CVS Commit Editor";
+const char CVSCOMMITEDITOR_DISPLAY_NAME[]  = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor");
+const char SUBMIT_CURRENT[] = "CVS.SubmitCurrentLog";
+const char DIFF_SELECTED[] = "CVS.DiffSelectedFilesInLog";
 enum { debug = 0 };
 
 } // namespace Constants
-} // namespace SubVersion
+} // namespace CVS
 
 #endif // CVS_CONSTANTS_H

src/plugins/cvs/cvsplugin.cpp

@@ -75,7 +75,7 @@
 #include <QtGui/QMessageBox>
 
 namespace CVS {
-    namespace Internal {
+namespace Internal {
 
 static inline QString msgCannotFindTopLevel(const QString &f)
 {
@@ -88,32 +88,32 @@ static inline QString msgLogParsingFailed()
     return CVSPlugin::tr("Parsing of the log output failed");
 }
 
-static const char * const CMD_ID_CVS_MENU    = "CVS.Menu";
-static const char * const CMD_ID_ADD                = "CVS.Add";
-static const char * const CMD_ID_DELETE_FILE        = "CVS.Delete";
-static const char * const CMD_ID_EDIT_FILE          = "CVS.EditFile";
-static const char * const CMD_ID_UNEDIT_FILE        = "CVS.UneditFile";
-static const char * const CMD_ID_UNEDIT_REPOSITORY  = "CVS.UneditRepository";
-static const char * const CMD_ID_REVERT             = "CVS.Revert";
-static const char * const CMD_ID_SEPARATOR0         = "CVS.Separator0";
-static const char * const CMD_ID_DIFF_PROJECT       = "CVS.DiffAll";
-static const char * const CMD_ID_DIFF_CURRENT       = "CVS.DiffCurrent";
-static const char * const CMD_ID_SEPARATOR1         = "CVS.Separator1";
-static const char * const CMD_ID_COMMIT_ALL         = "CVS.CommitAll";
-static const char * const CMD_ID_REVERT_ALL         = "CVS.RevertAll";
-static const char * const CMD_ID_COMMIT_CURRENT     = "CVS.CommitCurrent";
-static const char * const CMD_ID_SEPARATOR2         = "CVS.Separator2";
-static const char * const CMD_ID_FILELOG_CURRENT    = "CVS.FilelogCurrent";
-static const char * const CMD_ID_ANNOTATE_CURRENT   = "CVS.AnnotateCurrent";
-static const char * const CMD_ID_STATUS             = "CVS.Status";
-static const char * const CMD_ID_UPDATE             = "CVS.Update";
-static const char * const CMD_ID_PROJECTLOG         = "CVS.ProjectLog";
-static const char * const CMD_ID_PROJECTCOMMIT      = "CVS.ProjectCommit";
-static const char * const CMD_ID_REPOSITORYLOG      = "CVS.RepositoryLog";
-static const char * const CMD_ID_REPOSITORYDIFF     = "CVS.RepositoryDiff";
-static const char * const CMD_ID_REPOSITORYSTATUS   = "CVS.RepositoryStatus";
-static const char * const CMD_ID_REPOSITORYUPDATE   = "CVS.RepositoryUpdate";
-static const char * const CMD_ID_SEPARATOR3         = "CVS.Separator3";
+static const char CMD_ID_CVS_MENU[]           = "CVS.Menu";
+static const char CMD_ID_ADD[]                = "CVS.Add";
+static const char CMD_ID_DELETE_FILE[]        = "CVS.Delete";
+static const char CMD_ID_EDIT_FILE[]          = "CVS.EditFile";
+static const char CMD_ID_UNEDIT_FILE[]        = "CVS.UneditFile";
+static const char CMD_ID_UNEDIT_REPOSITORY[]  = "CVS.UneditRepository";
+static const char CMD_ID_REVERT[]             = "CVS.Revert";
+static const char CMD_ID_SEPARATOR0[]         = "CVS.Separator0";
+static const char CMD_ID_DIFF_PROJECT[]       = "CVS.DiffAll";
+static const char CMD_ID_DIFF_CURRENT[]       = "CVS.DiffCurrent";
+static const char CMD_ID_SEPARATOR1[]         = "CVS.Separator1";
+static const char CMD_ID_COMMIT_ALL[]         = "CVS.CommitAll";
+static const char CMD_ID_REVERT_ALL[]         = "CVS.RevertAll";
+static const char CMD_ID_COMMIT_CURRENT[]     = "CVS.CommitCurrent";
+static const char CMD_ID_SEPARATOR2[]         = "CVS.Separator2";
+static const char CMD_ID_FILELOG_CURRENT[]    = "CVS.FilelogCurrent";
+static const char CMD_ID_ANNOTATE_CURRENT[]   = "CVS.AnnotateCurrent";
+