feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

more style fixes of string literal access

Browse Source 
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-02 16:45:13 +01:00
committed by hjk
parent 7efa115245
commit 29279ab8c7
52 changed files with 745 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h
+2 -2
View File
@@ -4,8 +4,8 @@
namespace %PluginName% { namespace %PluginName% {
namespace Constants { namespace Constants {
const char * const ACTION_ID = "%PluginName%.Action"; const char ACTION_ID[] = "%PluginName%.Action";
const char * const MENU_ID = "%PluginName%.Menu"; const char MENU_ID[] = "%PluginName%.Menu";
} // namespace %PluginName% } // namespace %PluginName%
} // namespace Constants } // namespace Constants
src/libs/extensionsystem/pluginspec.cpp
+22 -22
View File
@@ -439,28 +439,28 @@ QHash<PluginDependency, PluginSpec *> PluginSpec::dependencySpecs() const
//==========PluginSpecPrivate================== //==========PluginSpecPrivate==================
namespace { namespace {
const char * const PLUGIN = "plugin"; const char PLUGIN[] = "plugin";
const char * const PLUGIN_NAME = "name"; const char PLUGIN_NAME[] = "name";
const char * const PLUGIN_VERSION = "version"; const char PLUGIN_VERSION[] = "version";
const char * const PLUGIN_COMPATVERSION = "compatVersion"; const char PLUGIN_COMPATVERSION[] = "compatVersion";
const char * const PLUGIN_EXPERIMENTAL = "experimental"; const char PLUGIN_EXPERIMENTAL[] = "experimental";
const char * const VENDOR = "vendor"; const char VENDOR[] = "vendor";
const char * const COPYRIGHT = "copyright"; const char COPYRIGHT[] = "copyright";
const char * const LICENSE = "license"; const char LICENSE[] = "license";
const char * const DESCRIPTION = "description"; const char DESCRIPTION[] = "description";
const char * const URL = "url"; const char URL[] = "url";
const char * const CATEGORY = "category"; const char CATEGORY[] = "category";
const char * const DEPENDENCYLIST = "dependencyList"; const char DEPENDENCYLIST[] = "dependencyList";
const char * const DEPENDENCY = "dependency"; const char DEPENDENCY[] = "dependency";
const char * const DEPENDENCY_NAME = "name"; const char DEPENDENCY_NAME[] = "name";
const char * const DEPENDENCY_VERSION = "version"; const char DEPENDENCY_VERSION[] = "version";
const char * const DEPENDENCY_TYPE = "type"; const char DEPENDENCY_TYPE[] = "type";
const char * const DEPENDENCY_TYPE_SOFT = "optional"; const char DEPENDENCY_TYPE_SOFT[] = "optional";
const char * const DEPENDENCY_TYPE_HARD = "required"; const char DEPENDENCY_TYPE_HARD[] = "required";
const char * const ARGUMENTLIST = "argumentList"; const char ARGUMENTLIST[] = "argumentList";
const char * const ARGUMENT = "argument"; const char ARGUMENT[] = "argument";
const char * const ARGUMENT_NAME = "name"; const char ARGUMENT_NAME[] = "name";
const char * const ARGUMENT_PARAMETER = "parameter"; const char ARGUMENT_PARAMETER[] = "parameter";
} }
/*! /*!
\fn PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec) \fn PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec)
src/plugins/bazaar/constants.h
+53 -53
View File
@@ -36,69 +36,69 @@
namespace Bazaar { namespace Bazaar {
namespace Constants { namespace Constants {
const char * const BAZAAR = "bazaar"; const char BAZAAR[] = "bazaar";
const char * const BAZAARREPO = ".bzr"; const char BAZAARREPO[] = ".bzr";
const char * const BAZAARDEFAULT = "bzr"; const char BAZAARDEFAULT[] = "bzr";
//changeset identifiers // Changeset identifiers
const char * const CHANGESET_ID = "([0-9]+)"; // match and capture const char CHANGESET_ID[] = "([0-9]+)"; // match and capture
const char * const CHANGESET_ID_EXACT = "[0-9]+"; // match const char CHANGESET_ID_EXACT[] = "[0-9]+"; // match
//BaseEditorParameters // Base editor parameters
const char * const COMMANDLOG_ID = "Bazaar Command Log Editor"; const char COMMANDLOG_ID[] = "Bazaar Command Log Editor";
const char * const COMMANDLOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Command Log Editor"); const char COMMANDLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Command Log Editor");
const char * const COMMANDLOG = "Bazaar Command Log Editor"; const char COMMANDLOG[] = "Bazaar Command Log Editor";
const char * const COMMANDAPP = "application/vnd.nokia.text.scs_bazaar_commandlog"; const char COMMANDAPP[] = "application/vnd.nokia.text.scs_bazaar_commandlog";
const char * const COMMANDEXT = "vcsBazaarCommand"; const char COMMANDEXT[] = "vcsBazaarCommand";
const char * const FILELOG_ID = "Bazaar File Log Editor"; const char FILELOG_ID[] = "Bazaar File Log Editor";
const char * const FILELOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar File Log Editor"); const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar File Log Editor");
const char * const FILELOG = "Bazaar File Log Editor"; const char FILELOG[] = "Bazaar File Log Editor";
const char * const LOGAPP = "application/vnd.nokia.text.scs_bazaar_log"; const char LOGAPP[] = "application/vnd.nokia.text.scs_bazaar_log";
const char * const LOGEXT = "vcsBazaarLog"; const char LOGEXT[] = "vcsBazaarLog";
const char * const ANNOTATELOG_ID = "Bazaar Annotation Editor"; const char ANNOTATELOG_ID[] = "Bazaar Annotation Editor";
const char * const ANNOTATELOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Annotation Editor"); const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Annotation Editor");
const char * const ANNOTATELOG = "Bazaar Annotation Editor"; const char ANNOTATELOG[] = "Bazaar Annotation Editor";
const char * const ANNOTATEAPP = "application/vnd.nokia.text.scs_bazaar_annotatelog"; const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_bazaar_annotatelog";
const char * const ANNOTATEEXT = "vcsBazaarAnnotate"; const char ANNOTATEEXT[] = "vcsBazaarAnnotate";
const char * const DIFFLOG_ID = "Bazaar Diff Editor"; const char DIFFLOG_ID[] = "Bazaar Diff Editor";
const char * const DIFFLOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Diff Editor"); const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Diff Editor");
const char * const DIFFLOG = "Bazaar Diff Editor"; const char DIFFLOG[] = "Bazaar Diff Editor";
const char * const DIFFAPP = "text/x-patch"; const char DIFFAPP[] = "text/x-patch";
const char * const DIFFEXT = "diff"; const char DIFFEXT[] = "diff";
//SubmitEditorParameters // Submit editor parameters
const char * const COMMIT_ID = "Bazaar Commit Log Editor"; const char COMMIT_ID[] = "Bazaar Commit Log Editor";
const char * const COMMIT_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Bazaar Commit Log Editor"); const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Commit Log Editor");
const char * const COMMITMIMETYPE = "application/vnd.nokia.text.scs_bazaar_commitlog"; const char COMMITMIMETYPE[] = "application/vnd.nokia.text.scs_bazaar_commitlog";
//menu items // Menu items
//File menu actions // File menu actions
const char * const ADD = "Bazaar.AddSingleFile"; const char ADD[] = "Bazaar.AddSingleFile";
const char * const DELETE = "Bazaar.DeleteSingleFile"; const char DELETE[] = "Bazaar.DeleteSingleFile";
const char * const ANNOTATE = "Bazaar.Annotate"; const char ANNOTATE[] = "Bazaar.Annotate";
const char * const DIFF = "Bazaar.DiffSingleFile"; const char DIFF[] = "Bazaar.DiffSingleFile";
const char * const LOG = "Bazaar.LogSingleFile"; const char LOG[] = "Bazaar.LogSingleFile";
const char * const REVERT = "Bazaar.RevertSingleFile"; const char REVERT[] = "Bazaar.RevertSingleFile";
const char * const STATUS = "Bazaar.Status"; const char STATUS[] = "Bazaar.Status";
//directory menu Actions // Directory menu Actions
const char * const DIFFMULTI = "Bazaar.Action.DiffMulti"; const char DIFFMULTI[] = "Bazaar.Action.DiffMulti";
const char * const REVERTMULTI = "Bazaar.Action.RevertALL"; const char REVERTMULTI[] = "Bazaar.Action.RevertALL";
const char * const STATUSMULTI = "Bazaar.Action.StatusMulti"; const char STATUSMULTI[] = "Bazaar.Action.StatusMulti";
const char * const LOGMULTI = "Bazaar.Action.Logmulti"; const char LOGMULTI[] = "Bazaar.Action.Logmulti";
//repository menu actions // Repository menu actions
const char * const PULL = "Bazaar.Action.Pull"; const char PULL[] = "Bazaar.Action.Pull";
const char * const PUSH = "Bazaar.Action.Push"; const char PUSH[] = "Bazaar.Action.Push";
const char * const UPDATE = "Bazaar.Action.Update"; const char UPDATE[] = "Bazaar.Action.Update";
const char * const COMMIT = "Bazaar.Action.Commit"; const char COMMIT[] = "Bazaar.Action.Commit";
const char * const CREATE_REPOSITORY = "Bazaar.Action.CreateRepository"; const char CREATE_REPOSITORY[] = "Bazaar.Action.CreateRepository";
//submit editor actions // Submit editor actions
const char * const DIFFEDITOR = "Bazaar.Action.Editor.Diff"; const char DIFFEDITOR[] = "Bazaar.Action.Editor.Diff";
} // namespace Constants } // namespace Constants
} // namespace Bazaar } // namespace Bazaar
src/plugins/bineditor/bineditorconstants.h
+3 -3
View File
@@ -36,9 +36,9 @@
namespace BINEditor { namespace BINEditor {
namespace Constants { namespace Constants {
const char * const C_BINEDITOR = "BinEditor.BinaryEditor"; const char C_BINEDITOR[] = "BinEditor.BinaryEditor";
const char * const C_BINEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "Binary Editor"); const char C_BINEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Binary Editor");
const char * const C_BINEDITOR_MIMETYPE = "application/octet-stream"; const char C_BINEDITOR_MIMETYPE[] = "application/octet-stream";
} // namespace Constants } // namespace Constants
} // namespace BINEditor } // namespace BINEditor
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+3 -4
View File
@@ -48,10 +48,9 @@ using namespace CMakeProjectManager;
using namespace Internal; using namespace Internal;
namespace { namespace {
const char * const CMAKE_BC_ID("CMakeProjectManager.CMakeBuildConfiguration"); const char CMAKE_BC_ID[] = "CMakeProjectManager.CMakeBuildConfiguration";
const char TOOLCHAIN_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.ToolChain";
const char * const TOOLCHAIN_KEY("CMakeProjectManager.CMakeBuildConfiguration.ToolChain"); const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory";
const char * const BUILD_DIRECTORY_KEY("CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory");
} // namespace } // namespace
CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeTarget *parent) : CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeTarget *parent) :
src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
+8 -8
View File
@@ -36,16 +36,16 @@
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Constants { namespace Constants {
const char * const PROJECTCONTEXT = "CMakeProject.ProjectContext"; const char PROJECTCONTEXT[] = "CMakeProject.ProjectContext";
const char * const CMAKEMIMETYPE = "text/x-cmake"; // TOOD check that this is correct const char CMAKEMIMETYPE[] = "text/x-cmake"; // TODO check that this is correct
const char * const CMAKE_EDITOR_ID = "CMakeProject.CMakeEditor"; const char CMAKE_EDITOR_ID[] = "CMakeProject.CMakeEditor";
const char * const CMAKE_EDITOR_DISPLAY_NAME = "CMake Editor"; const char CMAKE_EDITOR_DISPLAY_NAME[] = "CMake Editor";
const char * const C_CMAKEEDITOR = "CMakeProject.Context.CMakeEditor"; const char C_CMAKEEDITOR[] = "CMakeProject.Context.CMakeEditor";
const char * const RUNCMAKE = "CMakeProject.RunCMake"; const char RUNCMAKE[] = "CMakeProject.RunCMake";
const char * const RUNCMAKECONTEXTMENU = "CMakeProject.RunCMakeContextMenu"; const char RUNCMAKECONTEXTMENU[] = "CMakeProject.RunCMakeContextMenu";
// Project // Project
const char * const CMAKEPROJECT_ID = "CMakeProjectManager.CMakeProject"; const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject";
} // namespace Constants } // namespace Constants
} // namespace CMakeProjectManager } // namespace CMakeProjectManager
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+8 -8
View File
@@ -61,15 +61,15 @@ using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal; using namespace CMakeProjectManager::Internal;
namespace { namespace {
const char * const CMAKE_RC_ID("CMakeProjectManager.CMakeRunConfiguration"); const char CMAKE_RC_ID[] = "CMakeProjectManager.CMakeRunConfiguration";
const char * const CMAKE_RC_PREFIX("CMakeProjectManager.CMakeRunConfiguration."); const char CMAKE_RC_PREFIX[] = "CMakeProjectManager.CMakeRunConfiguration.";
const char * const USER_WORKING_DIRECTORY_KEY("CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"); const char USER_WORKING_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory";
const char * const USE_TERMINAL_KEY("CMakeProjectManager.CMakeRunConfiguration.UseTerminal"); const char USE_TERMINAL_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UseTerminal";
const char * const TITLE_KEY("CMakeProjectManager.CMakeRunConfiguation.Title"); const char TITLE_KEY[] = "CMakeProjectManager.CMakeRunConfiguation.Title";
const char * const ARGUMENTS_KEY("CMakeProjectManager.CMakeRunConfiguration.Arguments"); const char ARGUMENTS_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.Arguments";
const char * const USER_ENVIRONMENT_CHANGES_KEY("CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges"); const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges";
const char * const BASE_ENVIRONMENT_BASE_KEY("CMakeProjectManager.BaseEnvironmentBase"); const char BASE_ENVIRONMENT_BASE_KEY[] = "CMakeProjectManager.BaseEnvironmentBase";
QString buildTargetFromId(const QString &id) QString buildTargetFromId(const QString &id)
{ {
src/plugins/cmakeprojectmanager/cmaketarget.h
+1 -3
View File
@@ -38,10 +38,9 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal { namespace Internal {
const char * const DEFAULT_CMAKE_TARGET_ID("CMakeProjectManager.DefaultCMakeTarget"); const char DEFAULT_CMAKE_TARGET_ID[] = "CMakeProjectManager.DefaultCMakeTarget";
class CMakeBuildConfiguration; class CMakeBuildConfiguration;
class CMakeBuildConfigurationFactory; class CMakeBuildConfigurationFactory;
@@ -96,7 +95,6 @@ public:
}; };
} // namespace Internal } // namespace Internal
} // namespace CMakeProjectManager } // namespace CMakeProjectManager
#endif // CMAKETARGET_H #endif // CMAKETARGET_H
src/plugins/coreplugin/externaltool.cpp
+23 -23
View File
@@ -64,31 +64,31 @@ using namespace Core;
using namespace Core::Internal; using namespace Core::Internal;
namespace { namespace {
const char * const kExternalTool = "externaltool"; const char kExternalTool[] = "externaltool";
const char * const kId = "id"; const char kId[] = "id";
const char * const kDescription = "description"; const char kDescription[] = "description";
const char * const kDisplayName = "displayname"; const char kDisplayName[] = "displayname";
const char * const kCategory = "category"; const char kCategory[] = "category";
const char * const kOrder = "order"; const char kOrder[] = "order";
const char * const kExecutable = "executable"; const char kExecutable[] = "executable";
const char * const kPath = "path"; const char kPath[] = "path";
const char * const kArguments = "arguments"; const char kArguments[] = "arguments";
const char * const kInput = "input"; const char kInput[] = "input";
const char * const kWorkingDirectory = "workingdirectory"; const char kWorkingDirectory[] = "workingdirectory";
const char * const kXmlLang = "xml:lang"; const char kXmlLang[] = "xml:lang";
const char * const kOutput = "output"; const char kOutput[] = "output";
const char * const kError = "error"; const char kError[] = "error";
const char * const kOutputShowInPane = "showinpane"; const char kOutputShowInPane[] = "showinpane";
const char * const kOutputReplaceSelection = "replaceselection"; const char kOutputReplaceSelection[] = "replaceselection";
const char * const kOutputIgnore = "ignore"; const char kOutputIgnore[] = "ignore";
const char * const kModifiesDocument = "modifiesdocument"; const char kModifiesDocument[] = "modifiesdocument";
const char * const kYes = "yes"; const char kYes[] = "yes";
const char * const kNo = "no"; const char kNo[] = "no";
const char * const kTrue= "true"; const char kTrue[] = "true";
const char * const kFalse = "false"; const char kFalse[] = "false";
const char * const kSpecialUncategorizedSetting = "SpecialEmptyCategoryForUncategorizedTools"; const char kSpecialUncategorizedSetting[] = "SpecialEmptyCategoryForUncategorizedTools";
} }
// #pragma mark -- ExternalTool // #pragma mark -- ExternalTool
src/plugins/cpaster/cpasterconstants.h
+7 -5
View File
@@ -37,10 +37,12 @@
namespace CodePaster { namespace CodePaster {
namespace Constants { 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 CPASTER_SETTINGS_CATEGORY[] = "X.CPaster";
const char * const SETTINGS_CATEGORY_CPASTER_ICON = ":/core/images/category_cpaster.png"; 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 #endif // CPASTERCONSTANTS_H
src/plugins/cppeditor/cppeditorconstants.h
+23 -23
View File
@@ -36,34 +36,34 @@
namespace CppEditor { namespace CppEditor {
namespace Constants { namespace Constants {
const char * const M_CONTEXT = "CppEditor.ContextMenu"; const char M_CONTEXT[] = "CppEditor.ContextMenu";
const char * const C_CPPEDITOR = "CppPlugin.C++Editor"; const char C_CPPEDITOR[] = "CppPlugin.C++Editor";
const char * const CPPEDITOR_ID = "CppPlugin.C++Editor"; const char CPPEDITOR_ID[] = "CppPlugin.C++Editor";
const char * const CPPEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "C++ Editor"); const char CPPEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "C++ Editor");
const char * const SWITCH_DECLARATION_DEFINITION = "CppEditor.SwitchDeclarationDefinition"; const char SWITCH_DECLARATION_DEFINITION[] = "CppEditor.SwitchDeclarationDefinition";
const char * const RENAME_SYMBOL_UNDER_CURSOR = "CppEditor.RenameSymbolUnderCursor"; const char RENAME_SYMBOL_UNDER_CURSOR[] = "CppEditor.RenameSymbolUnderCursor";
const char * const FIND_USAGES = "CppEditor.FindUsages"; const char FIND_USAGES[] = "CppEditor.FindUsages";
const char * const M_REFACTORING_MENU_INSERTION_POINT = "CppEditor.RefactorGroup"; const char M_REFACTORING_MENU_INSERTION_POINT[] = "CppEditor.RefactorGroup";
const char * const SEPARATOR = "CppEditor.Separator"; const char SEPARATOR[] = "CppEditor.Separator";
const char * const SEPARATOR2 = "CppEditor.Separator2"; const char SEPARATOR2[] = "CppEditor.Separator2";
const char * const SEPARATOR3 = "CppEditor.Separator3"; const char SEPARATOR3[] = "CppEditor.Separator3";
const char * const SEPARATOR4 = "CppEditor.Separator4"; const char SEPARATOR4[] = "CppEditor.Separator4";
const char * const JUMP_TO_DEFINITION = "CppEditor.JumpToDefinition"; const char JUMP_TO_DEFINITION[] = "CppEditor.JumpToDefinition";
const char * const UPDATE_CODEMODEL = "CppEditor.UpdateCodeModel"; const char UPDATE_CODEMODEL[] = "CppEditor.UpdateCodeModel";
const int TYPE_HIERARCHY_PRIORITY = 700; const int TYPE_HIERARCHY_PRIORITY = 700;
const char * const TYPE_HIERARCHY_ID = "CppEditor.TypeHierarchy"; const char TYPE_HIERARCHY_ID[] = "CppEditor.TypeHierarchy";
const char * const OPEN_TYPE_HIERARCHY = "CppEditor.OpenTypeHierarchy"; const char OPEN_TYPE_HIERARCHY[] = "CppEditor.OpenTypeHierarchy";
const char * const C_SOURCE_MIMETYPE = "text/x-csrc"; const char C_SOURCE_MIMETYPE[] = "text/x-csrc";
const char * const C_HEADER_MIMETYPE = "text/x-chdr"; const char C_HEADER_MIMETYPE[] = "text/x-chdr";
const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src"; const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr"; const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
const char * const WIZARD_CATEGORY = "O.C++"; const char WIZARD_CATEGORY[] = "O.C++";
const char * const WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("CppEditor", "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 Constants
} // namespace CppEditor } // namespace CppEditor
src/plugins/cpptools/cpptoolsconstants.h
+20 -20
View File
@@ -38,31 +38,31 @@
namespace CppTools { namespace CppTools {
namespace Constants { namespace Constants {
const char * const M_TOOLS_CPP = "CppTools.Tools.Menu"; const char M_TOOLS_CPP[] = "CppTools.Tools.Menu";
const char * const SWITCH_HEADER_SOURCE = "CppTools.SwitchHeaderSource"; const char SWITCH_HEADER_SOURCE[] = "CppTools.SwitchHeaderSource";
const char * const TASK_INDEX = "CppTools.Task.Index"; const char TASK_INDEX[] = "CppTools.Task.Index";
const char * const TASK_SEARCH = "CppTools.Task.Search"; const char TASK_SEARCH[] = "CppTools.Task.Search";
const char * const C_SOURCE_MIMETYPE = "text/x-csrc"; const char C_SOURCE_MIMETYPE[] = "text/x-csrc";
const char * const C_HEADER_MIMETYPE = "text/x-chdr"; const char C_HEADER_MIMETYPE[] = "text/x-chdr";
const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src"; const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
const char * const OBJECTIVE_CPP_SOURCE_MIMETYPE = "text/x-objcsrc"; const char OBJECTIVE_CPP_SOURCE_MIMETYPE[] = "text/x-objcsrc";
const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr"; const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
// QSettings keys for use by the "New Class" wizards. // QSettings keys for use by the "New Class" wizards.
const char * const CPPTOOLS_SETTINGSGROUP = "CppTools"; const char CPPTOOLS_SETTINGSGROUP[] = "CppTools";
const char * const LOWERCASE_CPPFILES_KEY = "LowerCaseFiles"; const char LOWERCASE_CPPFILES_KEY[] = "LowerCaseFiles";
enum { lowerCaseFilesDefault = 1 }; enum { lowerCaseFilesDefault = 1 };
const char * const CPP_CODE_STYLE_SETTINGS_ID = "A.Code Style"; const char CPP_CODE_STYLE_SETTINGS_ID[] = "A.Code Style";
const char * const CPP_CODE_STYLE_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "Code Style"); const char CPP_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "Code Style");
const char * const CPP_FILE_SETTINGS_ID = "B.File Naming"; const char CPP_FILE_SETTINGS_ID[] = "B.File Naming";
const char * const CPP_FILE_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "File Naming"); const char CPP_FILE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "File Naming");
const char * const CPP_SETTINGS_CATEGORY = "I.C++"; const char CPP_SETTINGS_CATEGORY[] = "I.C++";
const char * const CPP_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++"); const char CPP_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("CppTools", "C++");
const char * const SETTINGS_CATEGORY_CPP_ICON = ":/core/images/category_cpp.png"; const char SETTINGS_CATEGORY_CPP_ICON[] = ":/core/images/category_cpp.png";
const char * const CPP_SETTINGS_ID = "Cpp"; const char CPP_SETTINGS_ID[] = "Cpp";
const char * const CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "C++"); const char CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++");
} // namespace Constants } // namespace Constants
} // namespace CppTools } // namespace CppTools
src/plugins/cvs/cvsconstants.h
+7 -7
View File
@@ -36,15 +36,15 @@
namespace CVS { namespace CVS {
namespace Constants { namespace Constants {
const char * const CVS_SUBMIT_MIMETYPE = "application/vnd.nokia.text.cvs.submit"; const char CVS_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.cvs.submit";
const char * const CVSCOMMITEDITOR = "CVS Commit Editor"; const char CVSCOMMITEDITOR[] = "CVS Commit Editor";
const char * const CVSCOMMITEDITOR_ID = "CVS Commit Editor"; const char CVSCOMMITEDITOR_ID[] = "CVS Commit Editor";
const char * const CVSCOMMITEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor"); const char CVSCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "CVS Commit Editor");
const char * const SUBMIT_CURRENT = "CVS.SubmitCurrentLog"; const char SUBMIT_CURRENT[] = "CVS.SubmitCurrentLog";
const char * const DIFF_SELECTED = "CVS.DiffSelectedFilesInLog"; const char DIFF_SELECTED[] = "CVS.DiffSelectedFilesInLog";
enum { debug = 0 }; enum { debug = 0 };
} // namespace Constants } // namespace Constants
} // namespace SubVersion } // namespace CVS
#endif // CVS_CONSTANTS_H #endif // CVS_CONSTANTS_H
src/plugins/cvs/cvsplugin.cpp
+30 -29
View File
@@ -75,7 +75,7 @@
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
namespace CVS { namespace CVS {
namespace Internal { namespace Internal {
static inline QString msgCannotFindTopLevel(const QString &f) static inline QString msgCannotFindTopLevel(const QString &f)
{ {
@@ -88,32 +88,32 @@ static inline QString msgLogParsingFailed()
return CVSPlugin::tr("Parsing of the log output failed"); return CVSPlugin::tr("Parsing of the log output failed");
} }
static const char * const CMD_ID_CVS_MENU = "CVS.Menu"; static const char CMD_ID_CVS_MENU[] = "CVS.Menu";
static const char * const CMD_ID_ADD = "CVS.Add"; static const char CMD_ID_ADD[] = "CVS.Add";
static const char * const CMD_ID_DELETE_FILE = "CVS.Delete"; static const char CMD_ID_DELETE_FILE[] = "CVS.Delete";
static const char * const CMD_ID_EDIT_FILE = "CVS.EditFile"; static const char CMD_ID_EDIT_FILE[] = "CVS.EditFile";
static const char * const CMD_ID_UNEDIT_FILE = "CVS.UneditFile"; static const char CMD_ID_UNEDIT_FILE[] = "CVS.UneditFile";
static const char * const CMD_ID_UNEDIT_REPOSITORY = "CVS.UneditRepository"; static const char CMD_ID_UNEDIT_REPOSITORY[] = "CVS.UneditRepository";
static const char * const CMD_ID_REVERT = "CVS.Revert"; static const char CMD_ID_REVERT[] = "CVS.Revert";
static const char * const CMD_ID_SEPARATOR0 = "CVS.Separator0"; static const char CMD_ID_SEPARATOR0[] = "CVS.Separator0";
static const char * const CMD_ID_DIFF_PROJECT = "CVS.DiffAll"; static const char CMD_ID_DIFF_PROJECT[] = "CVS.DiffAll";
static const char * const CMD_ID_DIFF_CURRENT = "CVS.DiffCurrent"; static const char CMD_ID_DIFF_CURRENT[] = "CVS.DiffCurrent";
static const char * const CMD_ID_SEPARATOR1 = "CVS.Separator1"; static const char CMD_ID_SEPARATOR1[] = "CVS.Separator1";
static const char * const CMD_ID_COMMIT_ALL = "CVS.CommitAll"; static const char CMD_ID_COMMIT_ALL[] = "CVS.CommitAll";
static const char * const CMD_ID_REVERT_ALL = "CVS.RevertAll"; static const char CMD_ID_REVERT_ALL[] = "CVS.RevertAll";
static const char * const CMD_ID_COMMIT_CURRENT = "CVS.CommitCurrent"; static const char CMD_ID_COMMIT_CURRENT[] = "CVS.CommitCurrent";
static const char * const CMD_ID_SEPARATOR2 = "CVS.Separator2"; static const char CMD_ID_SEPARATOR2[] = "CVS.Separator2";
static const char * const CMD_ID_FILELOG_CURRENT = "CVS.FilelogCurrent"; static const char CMD_ID_FILELOG_CURRENT[] = "CVS.FilelogCurrent";
static const char * const CMD_ID_ANNOTATE_CURRENT = "CVS.AnnotateCurrent"; static const char CMD_ID_ANNOTATE_CURRENT[] = "CVS.AnnotateCurrent";
static const char * const CMD_ID_STATUS = "CVS.Status"; static const char CMD_ID_STATUS[] = "CVS.Status";
static const char * const CMD_ID_UPDATE = "CVS.Update"; static const char CMD_ID_UPDATE[] = "CVS.Update";
static const char * const CMD_ID_PROJECTLOG = "CVS.ProjectLog"; static const char CMD_ID_PROJECTLOG[] = "CVS.ProjectLog";
static const char * const CMD_ID_PROJECTCOMMIT = "CVS.ProjectCommit"; static const char CMD_ID_PROJECTCOMMIT[] = "CVS.ProjectCommit";
static const char * const CMD_ID_REPOSITORYLOG = "CVS.RepositoryLog"; static const char CMD_ID_REPOSITORYLOG[] = "CVS.RepositoryLog";
static const char * const CMD_ID_REPOSITORYDIFF = "CVS.RepositoryDiff"; static const char CMD_ID_REPOSITORYDIFF[] = "CVS.RepositoryDiff";
static const char * const CMD_ID_REPOSITORYSTATUS = "CVS.RepositoryStatus"; static const char CMD_ID_REPOSITORYSTATUS[] = "CVS.RepositoryStatus";
static const char * const CMD_ID_REPOSITORYUPDATE = "CVS.RepositoryUpdate"; static const char CMD_ID_REPOSITORYUPDATE[] = "CVS.RepositoryUpdate";
static const char * const CMD_ID_SEPARATOR3 = "CVS.Separator3"; static const char CMD_ID_SEPARATOR3[] = "CVS.Separator3";
static const VCSBase::VCSBaseEditorParameters editorParameters[] = { static const VCSBase::VCSBaseEditorParameters editorParameters[] = {
{ {
@@ -1392,8 +1392,9 @@ CVSControl *CVSPlugin::cvsVersionControl() const
return static_cast<CVSControl *>(versionControl()); return static_cast<CVSControl *>(versionControl());
} }
} } // namespace Internal
} } // namespace CVS
Q_EXPORT_PLUGIN(CVS::Internal::CVSPlugin) Q_EXPORT_PLUGIN(CVS::Internal::CVSPlugin)
#include "cvsplugin.moc" #include "cvsplugin.moc"
src/plugins/designer/designerconstants.h
+15 -15
View File
@@ -38,25 +38,25 @@
namespace Designer { namespace Designer {
namespace Constants { namespace Constants {
const char * const INFO_READ_ONLY = "DesignerXmlEditor.ReadOnly"; const char INFO_READ_ONLY[] = "DesignerXmlEditor.ReadOnly";
const char * const K_DESIGNER_XML_EDITOR_ID = "FormEditor.DesignerXmlEditor"; const char K_DESIGNER_XML_EDITOR_ID[] = "FormEditor.DesignerXmlEditor";
const char * const C_DESIGNER_XML_EDITOR = "Designer Xml Editor"; const char C_DESIGNER_XML_EDITOR[] = "Designer Xml Editor";
const char * const C_DESIGNER_XML_DISPLAY_NAME = QT_TRANSLATE_NOOP("Designer", "Form Editor"); const char C_DESIGNER_XML_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Designer", "Form Editor");
const char * const SETTINGS_CATEGORY = "P.Designer"; const char SETTINGS_CATEGORY[] = "P.Designer";
const char * const SETTINGS_CATEGORY_ICON = ":/core/images/category_design.png"; const char SETTINGS_CATEGORY_ICON[] = ":/core/images/category_design.png";
const char * const SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Designer", "Designer"); const char SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Designer", "Designer");
const char * const SETTINGS_CPP_SETTINGS_ID = "Class Generation"; const char SETTINGS_CPP_SETTINGS_ID[] = "Class Generation";
const char * const SETTINGS_CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("Designer", "Class Generation"); const char SETTINGS_CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("Designer", "Class Generation");
// context // Context
const char * const C_FORMEDITOR = "FormEditor.FormEditor"; const char C_FORMEDITOR[] = "FormEditor.FormEditor";
const char * const M_FORMEDITOR = "FormEditor.Menu"; const char M_FORMEDITOR[] = "FormEditor.Menu";
const char * const M_FORMEDITOR_PREVIEW = "FormEditor.Menu.Preview"; const char M_FORMEDITOR_PREVIEW[] = "FormEditor.Menu.Preview";
// Wizard type // Wizard type
const char * const FORM_FILE_TYPE = "Qt4FormFiles"; const char FORM_FILE_TYPE[] = "Qt4FormFiles";
const char * const FORM_MIMETYPE = "application/x-designer"; const char FORM_MIMETYPE[] = "application/x-designer";
enum DesignerSubWindows enum DesignerSubWindows
{ {
src/plugins/find/textfindconstants.h
+18 -18
View File
@@ -42,25 +42,25 @@
namespace Find { namespace Find {
namespace Constants { namespace Constants {
const char * const M_FIND = "Find.FindMenu"; const char M_FIND[] = "Find.FindMenu";
const char * const M_FIND_ADVANCED = "Find.FindAdvancedMenu"; const char M_FIND_ADVANCED[] = "Find.FindAdvancedMenu";
const char * const G_FIND_CURRENTDOCUMENT = "Find.FindMenu.CurrentDocument"; const char G_FIND_CURRENTDOCUMENT[] = "Find.FindMenu.CurrentDocument";
const char * const G_FIND_FILTERS = "Find.FindMenu.Filters"; const char G_FIND_FILTERS[] = "Find.FindMenu.Filters";
const char * const G_FIND_FLAGS = "Find.FindMenu.Flags"; const char G_FIND_FLAGS[] = "Find.FindMenu.Flags";
const char * const G_FIND_ACTIONS = "Find.FindMenu.Actions"; const char G_FIND_ACTIONS[] = "Find.FindMenu.Actions";
const char * const ADVANCED_FIND = "Find.Dialog"; const char ADVANCED_FIND[] = "Find.Dialog";
const char * const FIND_IN_DOCUMENT = "Find.FindInCurrentDocument"; const char FIND_IN_DOCUMENT[] = "Find.FindInCurrentDocument";
const char * const FIND_NEXT = "Find.FindNext"; const char FIND_NEXT[] = "Find.FindNext";
const char * const FIND_PREVIOUS = "Find.FindPrevious"; const char FIND_PREVIOUS[] = "Find.FindPrevious";
const char * const REPLACE = "Find.Replace"; const char REPLACE[] = "Find.Replace";
const char * const REPLACE_NEXT = "Find.ReplaceNext"; const char REPLACE_NEXT[] = "Find.ReplaceNext";
const char * const REPLACE_PREVIOUS = "Find.ReplacePrevious"; const char REPLACE_PREVIOUS[] = "Find.ReplacePrevious";
const char * const REPLACE_ALL = "Find.ReplaceAll"; const char REPLACE_ALL[] = "Find.ReplaceAll";
const char * const CASE_SENSITIVE = "Find.CaseSensitive"; const char CASE_SENSITIVE[] = "Find.CaseSensitive";
const char * const WHOLE_WORDS = "Find.WholeWords"; const char WHOLE_WORDS[] = "Find.WholeWords";
const char * const REGULAR_EXPRESSIONS="Find.RegularExpressions"; const char REGULAR_EXPRESSIONS[] = "Find.RegularExpressions";
const char * const TASK_SEARCH = "Find.Task.Search"; const char TASK_SEARCH[] = "Find.Task.Search";
} // namespace Constants } // namespace Constants
src/plugins/genericprojectmanager/generictarget.h
+1 -3
View File
@@ -45,10 +45,9 @@ class IBuildConfigurationFactory;
} // namespace ProjectExplorer } // namespace ProjectExplorer
namespace GenericProjectManager { namespace GenericProjectManager {
namespace Internal { namespace Internal {
const char * const GENERIC_DESKTOP_TARGET_ID("GenericProjectManager.GenericTarget"); const char GENERIC_DESKTOP_TARGET_ID[] = "GenericProjectManager.GenericTarget";
class GenericProject; class GenericProject;
class GenericRunConfiguration; class GenericRunConfiguration;
@@ -96,7 +95,6 @@ public:
}; };
} // namespace Internal } // namespace Internal
} // namespace GenericProjectManager } // namespace GenericProjectManager
#endif // GENERICTARGET_H #endif // GENERICTARGET_H
src/plugins/git/gitconstants.h
+18 -18
View File
@@ -38,25 +38,25 @@
namespace Git { namespace Git {
namespace Constants { namespace Constants {
const char * const GIT_COMMAND_LOG_EDITOR_ID = "Git Command Log Editor"; const char GIT_COMMAND_LOG_EDITOR_ID[] = "Git Command Log Editor";
const char * const GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Git Command Log Editor"); const char GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Command Log Editor");
const char * const C_GIT_COMMAND_LOG_EDITOR = "Git Command Log Editor"; const char C_GIT_COMMAND_LOG_EDITOR[] = "Git Command Log Editor";
const char * const GIT_LOG_EDITOR_ID = "Git File Log Editor"; const char GIT_LOG_EDITOR_ID[] = "Git File Log Editor";
const char * const GIT_LOG_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Git File Log Editor"); const char GIT_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git File Log Editor");
const char * const C_GIT_LOG_EDITOR = "Git File Log Editor"; const char C_GIT_LOG_EDITOR[] = "Git File Log Editor";
const char * const GIT_BLAME_EDITOR_ID = "Git Annotation Editor"; const char GIT_BLAME_EDITOR_ID[] = "Git Annotation Editor";
const char * const GIT_BLAME_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Git Annotation Editor"); const char GIT_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Annotation Editor");
const char * const C_GIT_BLAME_EDITOR = "Git Annotation Editor"; const char C_GIT_BLAME_EDITOR[] = "Git Annotation Editor";
const char * const GIT_DIFF_EDITOR_ID = "Git Diff Editor"; const char GIT_DIFF_EDITOR_ID[] = "Git Diff Editor";
const char * const GIT_DIFF_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Git Diff Editor"); const char GIT_DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Diff Editor");
const char * const C_GIT_DIFF_EDITOR = "Git Diff Editor"; const char C_GIT_DIFF_EDITOR[] = "Git Diff Editor";
const char * const C_GITSUBMITEDITOR = "Git Submit Editor"; const char C_GITSUBMITEDITOR[] = "Git Submit Editor";
const char * const GITSUBMITEDITOR_ID = "Git Submit Editor"; const char GITSUBMITEDITOR_ID[] = "Git Submit Editor";
const char * const GITSUBMITEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Git Submit Editor"); const char GITSUBMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Submit Editor");
const char * const SUBMIT_CURRENT = "Git.SubmitCurrentLog"; const char SUBMIT_CURRENT[] = "Git.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Git.DiffSelectedFilesInLog"; const char DIFF_SELECTED[] = "Git.DiffSelectedFilesInLog";
const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.git.submit"; const char SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.git.submit";
} // namespace Constants } // namespace Constants
} // namespace Git } // namespace Git
src/plugins/glsleditor/glsleditorconstants.h
+14 -14
View File
@@ -39,24 +39,24 @@ namespace GLSLEditor {
namespace Constants { namespace Constants {
// menus // menus
const char * const M_CONTEXT = "GLSL Editor.ContextMenu"; const char M_CONTEXT[] = "GLSL Editor.ContextMenu";
const char * const M_TOOLS_GLSL = "GLSLEditor.Tools.Menu"; const char M_TOOLS_GLSL[] = "GLSLEditor.Tools.Menu";
const char * const SEPARATOR1 = "GLSLEditor.Separator1"; const char SEPARATOR1[] = "GLSLEditor.Separator1";
const char * const SEPARATOR2 = "GLSLEditor.Separator2"; const char SEPARATOR2[] = "GLSLEditor.Separator2";
const char * const M_REFACTORING_MENU_INSERTION_POINT = "GLSLEditor.RefactorGroup"; const char M_REFACTORING_MENU_INSERTION_POINT[] = "GLSLEditor.RefactorGroup";
const char * const C_GLSLEDITOR_ID = "GLSLEditor.GLSLEditor"; const char C_GLSLEDITOR_ID[] = "GLSLEditor.GLSLEditor";
const char * const C_GLSLEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "GLSL Editor"); const char C_GLSLEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "GLSL Editor");
const char * const GLSL_MIMETYPE = "application/x-glsl"; const char GLSL_MIMETYPE[] = "application/x-glsl";
const char * const GLSL_MIMETYPE_VERT = "text/x-glsl-vert"; const char GLSL_MIMETYPE_VERT[] = "text/x-glsl-vert";
const char * const GLSL_MIMETYPE_FRAG = "text/x-glsl-frag"; const char GLSL_MIMETYPE_FRAG[] = "text/x-glsl-frag";
const char * const GLSL_MIMETYPE_VERT_ES = "text/x-glsl-es-vert"; const char GLSL_MIMETYPE_VERT_ES[] = "text/x-glsl-es-vert";
const char * const GLSL_MIMETYPE_FRAG_ES = "text/x-glsl-es-frag"; const char GLSL_MIMETYPE_FRAG_ES[] = "text/x-glsl-es-frag";
const char * const WIZARD_CATEGORY_GLSL = "U.GLSL"; const char WIZARD_CATEGORY_GLSL[] = "U.GLSL";
const char * const WIZARD_TR_CATEGORY_GLSL = QT_TRANSLATE_NOOP("GLSLEditor", "GLSL"); const char WIZARD_TR_CATEGORY_GLSL[] = QT_TRANSLATE_NOOP("GLSLEditor", "GLSL");
} // namespace Constants } // namespace Constants
} // namespace GLSLEditor } // namespace GLSLEditor
src/plugins/help/helpconstants.h
+10 -10
View File
@@ -37,7 +37,7 @@
#include <QtCore/QLatin1String> #include <QtCore/QLatin1String>
namespace Help { namespace Help {
namespace Constants { namespace Constants {
enum { enum {
ShowHomePage = 0, ShowHomePage = 0,
@@ -58,16 +58,16 @@ static const QLatin1String AboutBlank("about:blank");
static const QLatin1String WeAddedFilterKey("UnfilteredFilterInserted"); static const QLatin1String WeAddedFilterKey("UnfilteredFilterInserted");
static const QLatin1String PreviousFilterNameKey("UnfilteredFilterName"); static const QLatin1String PreviousFilterNameKey("UnfilteredFilterName");
const int P_MODE_HELP = 70; const int P_MODE_HELP = 70;
const char * const ID_MODE_HELP = "Help"; const char ID_MODE_HELP [] = "Help";
const char * const HELP_CATEGORY = "H.Help"; const char HELP_CATEGORY[] = "H.Help";
const char * const HELP_CATEGORY_ICON = ":/core/images/category_help.png"; const char HELP_CATEGORY_ICON[] = ":/core/images/category_help.png";
const char * const HELP_TR_CATEGORY = QT_TRANSLATE_NOOP("Help", "Help"); const char HELP_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Help", "Help");
const char * const C_MODE_HELP = "Help Mode"; const char C_MODE_HELP [] = "Help Mode";
const char * const C_HELP_SIDEBAR = "Help Sidebar"; const char C_HELP_SIDEBAR[] = "Help Sidebar";
} // Constants } // Constants
} // Help } // Help
#endif // HELPCONSTANTS_H #endif // HELPCONSTANTS_H
src/plugins/help/helpplugin.cpp
+5 -5
View File
@@ -98,12 +98,12 @@
using namespace Help::Internal; using namespace Help::Internal;
const char * const SB_INDEX = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Index"); const char SB_INDEX[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Index");
const char * const SB_CONTENTS = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Contents"); const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Contents");
const char * const SB_BOOKMARKS = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Bookmarks"); const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Bookmarks");
const char * const SB_SEARCH = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Search"); const char SB_SEARCH[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Search");
const char * const SB_OPENPAGES = "OpenPages"; const char SB_OPENPAGES[] = "OpenPages";
#define IMAGEPATH ":/help/images/" #define IMAGEPATH ":/help/images/"
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
src/plugins/locator/locatorconstants.h
+2 -2
View File
@@ -38,8 +38,8 @@
namespace Locator { namespace Locator {
namespace Constants { namespace Constants {
const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Locator"); const char FILTER_OPTIONS_PAGE[] = QT_TRANSLATE_NOOP("Locator", "Locator");
const char * const TASK_INDEX = "Locator.Task.Index"; const char TASK_INDEX[] = "Locator.Task.Index";
} // namespace Constants } // namespace Constants
} // namespace Locator } // namespace Locator
src/plugins/macros/macrosconstants.h
+10 -11
View File
@@ -36,21 +36,20 @@
namespace Macros { namespace Macros {
namespace Constants { namespace Constants {
const char * const M_TOOLS_MACRO = "Macros.Tools.Menu"; const char M_TOOLS_MACRO[] = "Macros.Tools.Menu";
const char * const START_MACRO = "Macros.StartMacro"; const char START_MACRO[] = "Macros.StartMacro";
const char * const END_MACRO = "Macros.EndMacro"; const char END_MACRO[] = "Macros.EndMacro";
const char * const EXECUTE_LAST_MACRO = "Macros.ExecuteLastMacro"; const char EXECUTE_LAST_MACRO[] = "Macros.ExecuteLastMacro";
const char * const SAVE_LAST_MACRO = "Macros.SaveLastMacro"; const char SAVE_LAST_MACRO[] = "Macros.SaveLastMacro";
const char * const PREFIX_MACRO = "Macros."; const char PREFIX_MACRO[] = "Macros.";
const char * const M_OPTIONS_PAGE = "Macros"; const char M_OPTIONS_PAGE[] = "Macros";
const char * const M_OPTIONS_TR_PAGE = const char M_OPTIONS_TR_PAGE[] = QT_TRANSLATE_NOOP("Macros", "Macros");
QT_TRANSLATE_NOOP("Macros", "Macros");
const char * const M_STATUS_BUFFER = "Macros.Status"; const char M_STATUS_BUFFER[] = "Macros.Status";
const char * const M_EXTENSION = "mac"; const char M_EXTENSION[] = "mac";
} // namespace Constants } // namespace Constants
} // namespace Macros } // namespace Macros
src/plugins/mercurial/constants.h
+50 -50
View File
@@ -37,74 +37,74 @@ namespace Mercurial {
namespace Constants { namespace Constants {
enum { debug = 0 }; enum { debug = 0 };
const char * const MECURIALREPO = ".hg"; const char MECURIALREPO[] = ".hg";
const char * const MERCURIALDEFAULT = "hg"; const char MERCURIALDEFAULT[] = "hg";
//changeset identifiers //changeset identifiers
const char * const CHANGESETID12 = " ([a-f0-9]{12,12}) "; //match 12 hex chars and capture const char CHANGESETID12[] = " ([a-f0-9]{12,12}) "; //match 12 hex chars and capture
const char * const CHANGESETID40 = " ([a-f0-9]{40,40}) "; const char CHANGESETID40[] = " ([a-f0-9]{40,40}) ";
const char * const CHANGEIDEXACT12 = "[a-f0-9]{12,12}"; //match 12 hex chars a const char CHANGEIDEXACT12[] = "[a-f0-9]{12,12}"; //match 12 hex chars a
const char * const CHANGEIDEXACT40 = "[a-f0-9]{40,40}"; const char CHANGEIDEXACT40[] = "[a-f0-9]{40,40}";
const char * const DIFFIDENTIFIER = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename const char DIFFIDENTIFIER[] = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename
//BaseEditorParameters //BaseEditorParameters
const char * const COMMANDLOG_ID = "Mercurial Command Log Editor"; const char COMMANDLOG_ID[] = "Mercurial Command Log Editor";
const char * const COMMANDLOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Mercurial Command Log Editor"); const char COMMANDLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Command Log Editor");
const char * const COMMANDLOG = "Mercurial Command Log Editor"; const char COMMANDLOG[] = "Mercurial Command Log Editor";
const char * const COMMANDAPP = "application/vnd.nokia.text.scs_mercurial_commandlog"; const char COMMANDAPP[] = "application/vnd.nokia.text.scs_mercurial_commandlog";
const char * const COMMANDEXT = "vcsMercurialCommand"; const char COMMANDEXT[] = "vcsMercurialCommand";
const char * const FILELOG_ID = "Mercurial File Log Editor"; const char FILELOG_ID[] = "Mercurial File Log Editor";
const char * const FILELOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Mercurial File Log Editor"); const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial File Log Editor");
const char * const FILELOG = "Mercurial File Log Editor"; const char FILELOG[] = "Mercurial File Log Editor";
const char * const LOGAPP = "application/vnd.nokia.text.scs_mercurial_log"; const char LOGAPP[] = "application/vnd.nokia.text.scs_mercurial_log";
const char * const LOGEXT = "vcsMercurialLog"; const char LOGEXT[] = "vcsMercurialLog";
const char * const ANNOTATELOG_ID = "Mercurial Annotation Editor"; const char ANNOTATELOG_ID[] = "Mercurial Annotation Editor";
const char * const ANNOTATELOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Mercurial Annotation Editor"); const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Annotation Editor");
const char * const ANNOTATELOG = "Mercurial Annotation Editor"; const char ANNOTATELOG[] = "Mercurial Annotation Editor";
const char * const ANNOTATEAPP = "application/vnd.nokia.text.scs_mercurial_annotatelog"; const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_mercurial_annotatelog";
const char * const ANNOTATEEXT = "vcsMercurialAnnotate"; const char ANNOTATEEXT[] = "vcsMercurialAnnotate";
const char * const DIFFLOG_ID = "Mercurial Diff Editor"; const char DIFFLOG_ID[] = "Mercurial Diff Editor";
const char * const DIFFLOG_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Mercurial Diff Editor"); const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Diff Editor");
const char * const DIFFLOG = "Mercurial Diff Editor"; const char DIFFLOG[] = "Mercurial Diff Editor";
const char * const DIFFAPP = "text/x-patch"; const char DIFFAPP[] = "text/x-patch";
const char * const DIFFEXT = "diff"; const char DIFFEXT[] = "diff";
//SubmitEditorParameters //SubmitEditorParameters
const char * const COMMIT_ID = "Mercurial Commit Log Editor"; const char COMMIT_ID[] = "Mercurial Commit Log Editor";
const char * const COMMIT_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Mercurial Commit Log Editor"); const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Commit Log Editor");
const char * const COMMITMIMETYPE = "application/vnd.nokia.text.scs_mercurial_commitlog"; const char COMMITMIMETYPE[] = "application/vnd.nokia.text.scs_mercurial_commitlog";
//menu items //menu items
//File menu actions //File menu actions
const char * const ADD = "Mercurial.AddSingleFile"; const char ADD[] = "Mercurial.AddSingleFile";
const char * const DELETE = "Mercurial.DeleteSingleFile"; const char DELETE[] = "Mercurial.DeleteSingleFile";
const char * const ANNOTATE = "Mercurial.Annotate"; const char ANNOTATE[] = "Mercurial.Annotate";
const char * const DIFF = "Mercurial.DiffSingleFile"; const char DIFF[] = "Mercurial.DiffSingleFile";
const char * const LOG = "Mercurial.LogSingleFile"; const char LOG[] = "Mercurial.LogSingleFile";
const char * const REVERT = "Mercurial.RevertSingleFile"; const char REVERT[] = "Mercurial.RevertSingleFile";
const char * const STATUS = "Mercurial.Status"; const char STATUS[] = "Mercurial.Status";
//directory menu Actions //directory menu Actions
const char * const DIFFMULTI = "Mercurial.Action.DiffMulti"; const char DIFFMULTI[] = "Mercurial.Action.DiffMulti";
const char * const REVERTMULTI = "Mercurial.Action.RevertMulti"; const char REVERTMULTI[] = "Mercurial.Action.RevertMulti";
const char * const STATUSMULTI = "Mercurial.Action.StatusMulti"; const char STATUSMULTI[] = "Mercurial.Action.StatusMulti";
const char * const LOGMULTI = "Mercurial.Action.Logmulti"; const char LOGMULTI[] = "Mercurial.Action.Logmulti";
//repository menu actions //repository menu actions
const char * const PULL = "Mercurial.Action.Pull"; const char PULL[] = "Mercurial.Action.Pull";
const char * const PUSH = "Mercurial.Action.Push"; const char PUSH[] = "Mercurial.Action.Push";
const char * const UPDATE = "Mercurial.Action.Update"; const char UPDATE[] = "Mercurial.Action.Update";
const char * const IMPORT = "Mercurial.Action.Import"; const char IMPORT[] = "Mercurial.Action.Import";
const char * const INCOMING = "Mercurial.Action.Incoming"; const char INCOMING[] = "Mercurial.Action.Incoming";
const char * const OUTGOING = "Mercurial.Action.Outgoing"; const char OUTGOING[] = "Mercurial.Action.Outgoing";
const char * const COMMIT = "Mercurial.Action.Commit"; const char COMMIT[] = "Mercurial.Action.Commit";
const char * const CREATE_REPOSITORY = "Mercurial.Action.CreateRepository"; const char CREATE_REPOSITORY[] = "Mercurial.Action.CreateRepository";
//submit editor actions //submit editor actions
const char * const DIFFEDITOR = "Mercurial.Action.Editor.Diff"; const char DIFFEDITOR[] = "Mercurial.Action.Editor.Diff";
} // namespace Constants } // namespace Constants
} // namespace mercurial } // namespace mercurial
src/plugins/perforce/perforceconstants.h
+19 -19
View File
@@ -38,33 +38,33 @@
namespace Perforce { namespace Perforce {
namespace Constants { namespace Constants {
const char * const PERFORCE_SUBMIT_EDITOR_ID = "Perforce.SubmitEditor"; const char PERFORCE_SUBMIT_EDITOR_ID[] = "Perforce.SubmitEditor";
const char * const PERFORCE_SUBMIT_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Perforce.SubmitEditor"); const char PERFORCE_SUBMIT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce.SubmitEditor");
const char * const PERFORCESUBMITEDITOR_CONTEXT = "Perforce Submit Editor"; const char PERFORCESUBMITEDITOR_CONTEXT[] = "Perforce Submit Editor";
const char * const PERFORCE_COMMANDLOG_EDITOR_ID = "Perfoirce.CommandLogEditor"; const char PERFORCE_COMMANDLOG_EDITOR_ID[] = "Perfoirce.CommandLogEditor";
const char * const PERFORCE_COMMANDLOG_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Perforce CommandLog Editor"); const char PERFORCE_COMMANDLOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce CommandLog Editor");
const char * const PERFORCE_COMMANDLOG_EDITOR_CONTEXT = "Perforce Command Log Editor"; const char PERFORCE_COMMANDLOG_EDITOR_CONTEXT[] = "Perforce Command Log Editor";
const char * const PERFORCE_LOG_EDITOR_ID = "Perforce.LogEditor"; const char PERFORCE_LOG_EDITOR_ID[] = "Perforce.LogEditor";
const char * const PERFORCE_LOG_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Perforce Log Editor"); const char PERFORCE_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce Log Editor");
const char * const PERFORCE_LOG_EDITOR_CONTEXT = "Perforce Log Editor"; const char PERFORCE_LOG_EDITOR_CONTEXT[] = "Perforce Log Editor";
const char * const PERFORCE_DIFF_EDITOR_ID = "Perforce.DiffEditor"; const char PERFORCE_DIFF_EDITOR_ID[] = "Perforce.DiffEditor";
const char * const PERFORCE_DIFF_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Perforce Diff Editor"); const char PERFORCE_DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce Diff Editor");
const char * const PERFORCE_DIFF_EDITOR_CONTEXT = "Perforce Diff Editor"; const char PERFORCE_DIFF_EDITOR_CONTEXT[] = "Perforce Diff Editor";
const char * const PERFORCE_ANNOTATION_EDITOR_ID = "Perforce.AnnotationEditor"; const char PERFORCE_ANNOTATION_EDITOR_ID[] = "Perforce.AnnotationEditor";
const char * const PERFORCE_ANNOTATION_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Perforce Annotation Editor"); const char PERFORCE_ANNOTATION_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce Annotation Editor");
const char * const PERFORCE_ANNOTATION_EDITOR_CONTEXT = "Perforce Annotation Editor"; const char PERFORCE_ANNOTATION_EDITOR_CONTEXT[] = "Perforce Annotation Editor";
const char * const SUBMIT_CURRENT = "Perforce.SubmitCurrentLog"; const char SUBMIT_CURRENT[] = "Perforce.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Perforce.DiffSelectedFilesInLog"; const char DIFF_SELECTED[] = "Perforce.DiffSelectedFilesInLog";
const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit"; const char SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.p4.submit";
enum { debug = 0 }; enum { debug = 0 };
} // Internal } // Constants
} // Perforce } // Perforce
#endif // PERFORCE_CONSTANTS_H #endif // PERFORCE_CONSTANTS_H
src/plugins/projectexplorer/codestylesettingspropertiespage.h
+1 -1
View File
@@ -42,7 +42,7 @@ class EditorConfiguration;
namespace Internal { namespace Internal {
const char * const CODESTYLESETTINGS_PANEL_ID("ProjectExplorer.CodeStyleSettingsPanel"); const char CODESTYLESETTINGS_PANEL_ID[] = "ProjectExplorer.CodeStyleSettingsPanel";
class CodeStyleSettingsPanelFactory : public IProjectPanelFactory class CodeStyleSettingsPanelFactory : public IProjectPanelFactory
{ {
src/plugins/projectexplorer/dependenciespanel.h
+1 -1
View File
@@ -50,7 +50,7 @@ class SessionManager;
namespace Internal { namespace Internal {
const char * const DEPENDENCIES_PANEL_ID("ProjectExplorer.DependenciesPanel"); const char DEPENDENCIES_PANEL_ID[] = "ProjectExplorer.DependenciesPanel";
class DependenciesWidget; class DependenciesWidget;
src/plugins/projectexplorer/editorsettingspropertiespage.h
+1 -1
View File
@@ -42,7 +42,7 @@ class EditorConfiguration;
namespace Internal { namespace Internal {
const char * const EDITORSETTINGS_PANEL_ID("ProjectExplorer.EditorSettingsPanel"); const char EDITORSETTINGS_PANEL_ID[] = "ProjectExplorer.EditorSettingsPanel";
class EditorSettingsPanelFactory : public IProjectPanelFactory class EditorSettingsPanelFactory : public IProjectPanelFactory
{ {
src/plugins/projectexplorer/processstep.cpp
+5 -6
View File
@@ -47,12 +47,11 @@ using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal; using namespace ProjectExplorer::Internal;
namespace { namespace {
const char * const PROCESS_STEP_ID("ProjectExplorer.ProcessStep"); const char PROCESS_STEP_ID[] = "ProjectExplorer.ProcessStep";
const char PROCESS_COMMAND_KEY[] = "ProjectExplorer.ProcessStep.Command";
const char * const PROCESS_COMMAND_KEY("ProjectExplorer.ProcessStep.Command"); const char PROCESS_WORKINGDIRECTORY_KEY[] = "ProjectExplorer.ProcessStep.WorkingDirectory";
const char * const PROCESS_WORKINGDIRECTORY_KEY("ProjectExplorer.ProcessStep.WorkingDirectory"); const char PROCESS_ARGUMENTS_KEY[] = "ProjectExplorer.ProcessStep.Arguments";
const char * const PROCESS_ARGUMENTS_KEY("ProjectExplorer.ProcessStep.Arguments"); const char PROCESS_ENABLED_KEY[] = "ProjectExplorer.ProcessStep.Enabled";
const char * const PROCESS_ENABLED_KEY("ProjectExplorer.ProcessStep.Enabled");
} }
ProcessStep::ProcessStep(BuildStepList *bsl) : ProcessStep::ProcessStep(BuildStepList *bsl) :
src/plugins/projectexplorer/target.cpp
+9 -9
View File
@@ -49,17 +49,17 @@
#include <QtGui/QIcon> #include <QtGui/QIcon>
namespace { namespace {
const char * const ACTIVE_BC_KEY = "ProjectExplorer.Target.ActiveBuildConfiguration"; const char ACTIVE_BC_KEY[] = "ProjectExplorer.Target.ActiveBuildConfiguration";
const char * const BC_KEY_PREFIX = "ProjectExplorer.Target.BuildConfiguration."; const char BC_KEY_PREFIX[] = "ProjectExplorer.Target.BuildConfiguration.";
const char * const BC_COUNT_KEY = "ProjectExplorer.Target.BuildConfigurationCount"; const char BC_COUNT_KEY[] = "ProjectExplorer.Target.BuildConfigurationCount";
const char * const ACTIVE_DC_KEY = "ProjectExplorer.Target.ActiveDeployConfiguration"; const char ACTIVE_DC_KEY[] = "ProjectExplorer.Target.ActiveDeployConfiguration";
const char * const DC_KEY_PREFIX = "ProjectExplorer.Target.DeployConfiguration."; const char DC_KEY_PREFIX[] = "ProjectExplorer.Target.DeployConfiguration.";
const char * const DC_COUNT_KEY = "ProjectExplorer.Target.DeployConfigurationCount"; const char DC_COUNT_KEY[] = "ProjectExplorer.Target.DeployConfigurationCount";
const char * const ACTIVE_RC_KEY = "ProjectExplorer.Target.ActiveRunConfiguration"; const char ACTIVE_RC_KEY[] = "ProjectExplorer.Target.ActiveRunConfiguration";
const char * const RC_KEY_PREFIX = "ProjectExplorer.Target.RunConfiguration."; const char RC_KEY_PREFIX[] = "ProjectExplorer.Target.RunConfiguration.";
const char * const RC_COUNT_KEY = "ProjectExplorer.Target.RunConfigurationCount"; const char RC_COUNT_KEY[] = "ProjectExplorer.Target.RunConfigurationCount";
} // namespace } // namespace
src/plugins/qmldesigner/designmodewidget.cpp
+6 -6
View File
@@ -86,12 +86,12 @@ enum {
debug = false debug = false
}; };
const char * const SB_NAVIGATOR = "Navigator"; const char SB_NAVIGATOR[] = "Navigator";
const char * const SB_LIBRARY = "Library"; const char SB_LIBRARY[] = "Library";
const char * const SB_PROPERTIES = "Properties"; const char SB_PROPERTIES[] = "Properties";
const char * const SB_PROJECTS = "Projects"; const char SB_PROJECTS[] = "Projects";
const char * const SB_FILESYSTEM = "FileSystem"; const char SB_FILESYSTEM[] = "FileSystem";
const char * const SB_OPENDOCUMENTS = "OpenDocuments"; const char SB_OPENDOCUMENTS[] = "OpenDocuments";
namespace QmlDesigner { namespace QmlDesigner {
namespace Internal { namespace Internal {
src/plugins/qmldesigner/qmldesignerconstants.h
+23 -23
View File
@@ -36,36 +36,36 @@
namespace QmlDesigner { namespace QmlDesigner {
namespace Constants { namespace Constants {
const char * const DELETE = "QmlDesigner.Delete"; const char DELETE[] = "QmlDesigner.Delete";
// context // Context
const char * const C_QMLDESIGNER = "QmlDesigner::QmlDesignerMain"; const char C_QMLDESIGNER[] = "QmlDesigner::QmlDesignerMain";
const char * const C_QMLFORMEDITOR = "QmlDesigner::FormEditor"; const char C_QMLFORMEDITOR[] = "QmlDesigner::FormEditor";
const char * const C_QMLNAVIGATOR = "QmlDesigner::Navigator"; const char C_QMLNAVIGATOR[] = "QmlDesigner::Navigator";
// special context for preview menu, shared b/w designer and text editor // Special context for preview menu, shared b/w designer and text editor
const char * const C_QT_QUICK_TOOLS_MENU = "QmlDesigner::ToolsMenu"; const char C_QT_QUICK_TOOLS_MENU[] = "QmlDesigner::ToolsMenu";
// actions // Actions
const char * const SWITCH_TEXT_DESIGN = "QmlDesigner.SwitchTextDesign"; const char SWITCH_TEXT_DESIGN[] = "QmlDesigner.SwitchTextDesign";
const char * const RESTORE_DEFAULT_VIEW = "QmlDesigner.RestoreDefaultView"; const char RESTORE_DEFAULT_VIEW[] = "QmlDesigner.RestoreDefaultView";
const char * const TOGGLE_LEFT_SIDEBAR = "QmlDesigner.ToggleLeftSideBar"; const char TOGGLE_LEFT_SIDEBAR[] = "QmlDesigner.ToggleLeftSideBar";
const char * const TOGGLE_RIGHT_SIDEBAR = "QmlDesigner.ToggleRightSideBar"; const char TOGGLE_RIGHT_SIDEBAR[] = "QmlDesigner.ToggleRightSideBar";
const char * const GO_INTO_COMPONENT = "QmlDesigner.GoIntoComponent"; const char GO_INTO_COMPONENT[] = "QmlDesigner.GoIntoComponent";
// This setting is also accessed by the QMlJsEditor. // This setting is also accessed by the QMlJsEditor.
const char * const QML_SETTINGS_GROUP = "QML"; const char QML_SETTINGS_GROUP[] = "QML";
const char * const QML_DESIGNER_SETTINGS_GROUP = "Designer"; const char QML_DESIGNER_SETTINGS_GROUP[] = "Designer";
const char * const QML_OPENDESIGNMODE_SETTINGS_KEY = "OpenDesignMode"; const char QML_OPENDESIGNMODE_SETTINGS_KEY[] = "OpenDesignMode";
const char * const QML_ITEMSPACING_KEY = "ItemSpacing"; const char QML_ITEMSPACING_KEY[] = "ItemSpacing";
const char * const QML_SNAPMARGIN_KEY = "SnapMargin"; const char QML_SNAPMARGIN_KEY[] = "SnapMargin";
const char * const QML_CANVASWIDTH_KEY = "CanvasWidth"; const char QML_CANVASWIDTH_KEY[] = "CanvasWidth";
const char * const QML_CANVASHEIGHT_KEY = "CanvasHeight"; const char QML_CANVASHEIGHT_KEY[] = "CanvasHeight";
const char * const QML_CONTEXTPANE_KEY = "ContextPaneEnabled"; const char QML_CONTEXTPANE_KEY[] = "ContextPaneEnabled";
const char * const QML_CONTEXTPANEPIN_KEY = "ContextPanePinned"; const char QML_CONTEXTPANEPIN_KEY[] = "ContextPanePinned";
enum { QML_OPENDESIGNMODE_DEFAULT = 0 }; // 0 for text mode, 1 for design mode enum { QML_OPENDESIGNMODE_DEFAULT = 0 }; // 0 for text mode, 1 for design mode
const char * const SETTINGS_CATEGORY_QML_ICON = ":/core/images/category_qml.png"; const char SETTINGS_CATEGORY_QML_ICON[] = ":/core/images/category_qml.png";
namespace Internal { namespace Internal {
enum { debug = 0 }; enum { debug = 0 };
src/plugins/qmljseditor/qmljseditorconstants.h
+20 -21
View File
@@ -38,33 +38,32 @@
namespace QmlJSEditor { namespace QmlJSEditor {
namespace Constants { namespace Constants {
// menus const char M_CONTEXT[] = "QML JS Editor.ContextMenu";
const char * const M_CONTEXT = "QML JS Editor.ContextMenu";
const char * const SEPARATOR1 = "QmlJSEditor.Separator1"; const char SEPARATOR1[] = "QmlJSEditor.Separator1";
const char * const SEPARATOR2 = "QmlJSEditor.Separator2"; const char SEPARATOR2[] = "QmlJSEditor.Separator2";
const char * const SEPARATOR3 = "QmlJSEditor.Separator3"; const char SEPARATOR3[] = "QmlJSEditor.Separator3";
const char * const M_REFACTORING_MENU_INSERTION_POINT = "QmlJSEditor.RefactorGroup"; const char M_REFACTORING_MENU_INSERTION_POINT[] = "QmlJSEditor.RefactorGroup";
const char * const C_QMLJSEDITOR_ID = "QMLProjectManager.QMLJSEditor"; const char C_QMLJSEDITOR_ID[] = "QMLProjectManager.QMLJSEditor";
const char * const C_QMLJSEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "QMLJS Editor"); const char C_QMLJSEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "QMLJS Editor");
const char * const TASK_SEARCH = "QmlJSEditor.TaskSearch"; const char TASK_SEARCH[] = "QmlJSEditor.TaskSearch";
const char * const SETTINGS_CATEGORY_QML = "J.QtQuick"; const char SETTINGS_CATEGORY_QML[] = "J.QtQuick";
const char * const SETTINGS_TR_CATEGORY_QML = QT_TRANSLATE_NOOP("QmlJSEditor", "Qt Quick"); const char SETTINGS_TR_CATEGORY_QML[] = QT_TRANSLATE_NOOP("QmlJSEditor", "Qt Quick");
const char * const FOLLOW_SYMBOL_UNDER_CURSOR = "QmlJSEditor.FollowSymbolUnderCursor"; const char FOLLOW_SYMBOL_UNDER_CURSOR[] = "QmlJSEditor.FollowSymbolUnderCursor";
const char * const FIND_USAGES = "QmlJSEditor.FindUsages"; const char FIND_USAGES[] = "QmlJSEditor.FindUsages";
const char * const RENAME_USAGES = "QmlJSEditor.RenameUsages"; const char RENAME_USAGES[] = "QmlJSEditor.RenameUsages";
const char * const RUN_SEMANTIC_SCAN = "QmlJSEditor.RunSemanticScan"; const char RUN_SEMANTIC_SCAN[] = "QmlJSEditor.RunSemanticScan";
const char * const SHOW_QT_QUICK_HELPER = "QmlJSEditor.ShowQtQuickHelper"; const char SHOW_QT_QUICK_HELPER[] = "QmlJSEditor.ShowQtQuickHelper";
const char *const TASK_CATEGORY_QML = "Task.Category.Qml"; const char TASK_CATEGORY_QML[] = "Task.Category.Qml";
const char *const TASK_CATEGORY_QML_ANALYSIS = "Task.Category.QmlAnalysis"; const char TASK_CATEGORY_QML_ANALYSIS[] = "Task.Category.QmlAnalysis";
const char * const WIZARD_CATEGORY_QML = "S.Qml"; const char WIZARD_CATEGORY_QML[] = "S.Qml";
const char * const WIZARD_TR_CATEGORY_QML = QT_TRANSLATE_NOOP("QmlJsEditor", "QML"); const char WIZARD_TR_CATEGORY_QML[] = QT_TRANSLATE_NOOP("QmlJsEditor", "QML");
const char * const QML_SNIPPETS_GROUP_ID = "QML"; const char QML_SNIPPETS_GROUP_ID[] = "QML";
} // namespace Constants } // namespace Constants
} // namespace QmlJSEditor } // namespace QmlJSEditor
src/plugins/qmljsinspector/qmljsinspectorconstants.h
+14 -13
View File
@@ -29,25 +29,26 @@
** Nokia at info@qt.nokia.com. ** Nokia at info@qt.nokia.com.
** **
**************************************************************************/ **************************************************************************/
#ifndef QMLJSINSPECTORCONSTANTS_H #ifndef QMLJSINSPECTORCONSTANTS_H
#define QMLJSINSPECTORCONSTANTS_H #define QMLJSINSPECTORCONSTANTS_H
namespace QmlJSInspector { namespace QmlJSInspector {
namespace Constants { namespace Constants {
const char * const INFO_EXPERIMENTAL = "QmlInspector.Experimental"; const char INFO_EXPERIMENTAL[] = "QmlInspector.Experimental";
const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning"; const char INFO_OUT_OF_SYNC[] = "QmlInspector.OutOfSyncWarning";
const char * const PLAY_ACTION = "QmlInspector.Play"; const char PLAY_ACTION[] = "QmlInspector.Play";
const char * const SELECT_ACTION = "QmlInspector.Select"; const char SELECT_ACTION[] = "QmlInspector.Select";
const char * const ZOOM_ACTION = "QmlInspector.Zoom"; const char ZOOM_ACTION[] = "QmlInspector.Zoom";
const char * const COLOR_PICKER_ACTION = "QmlInspector.ColorPicker"; const char COLOR_PICKER_ACTION[] = "QmlInspector.ColorPicker";
const char * const FROM_QML_ACTION = "QmlInspector.FromQml"; const char FROM_QML_ACTION[] = "QmlInspector.FromQml";
const char * const SHOW_APP_ON_TOP_ACTION = "QmlInspector.ShowAppOnTop"; const char SHOW_APP_ON_TOP_ACTION[] = "QmlInspector.ShowAppOnTop";
// settings // Settings
const char * const S_QML_INSPECTOR = "QML.Inspector"; const char S_QML_INSPECTOR [] = "QML.Inspector";
const char * const S_LIVE_PREVIEW_WARNING_KEY = "ShowLivePreview"; const char S_LIVE_PREVIEW_WARNING_KEY[] = "ShowLivePreview";
enum DesignTool { enum DesignTool {
NoTool = 0, NoTool = 0,
@@ -60,6 +61,6 @@ enum DesignTool {
}; };
} // namespace Constants } // namespace Constants
} // namespace Qml } // namespace QmlJSInspector
#endif #endif // QMLJSINSPECTORCONSTANTS_H
src/plugins/qmljstools/qmljstoolsconstants.h
+11 -11
View File
@@ -38,22 +38,22 @@
namespace QmlJSTools { namespace QmlJSTools {
namespace Constants { namespace Constants {
const char * const QML_MIMETYPE = "application/x-qml"; const char QML_MIMETYPE[] = "application/x-qml";
const char * const JS_MIMETYPE = "application/javascript"; const char JS_MIMETYPE[] = "application/javascript";
const char * const JSON_MIMETYPE = "application/json"; const char JSON_MIMETYPE[] = "application/json";
const char * const TASK_INDEX = "QmlJSEditor.TaskIndex"; const char TASK_INDEX[] = "QmlJSEditor.TaskIndex";
const char * const QML_JS_CODE_STYLE_SETTINGS_ID = "A.Code Style"; const char QML_JS_CODE_STYLE_SETTINGS_ID[] = "A.Code Style";
const char * const QML_JS_CODE_STYLE_SETTINGS_NAME = QT_TRANSLATE_NOOP("QmlJSTools", "Code Style"); const char QML_JS_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Code Style");
const char * const QML_JS_SETTINGS_ID = "QmlJS"; const char QML_JS_SETTINGS_ID[] = "QmlJS";
const char * const QML_JS_SETTINGS_NAME = QT_TRANSLATE_NOOP("QmlJSTools", "Qt Quick"); const char QML_JS_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Qt Quick");
const char * const M_TOOLS_QMLJS = "QmlJSTools.Tools.Menu"; const char M_TOOLS_QMLJS[] = "QmlJSTools.Tools.Menu";
const char * const RESET_CODEMODEL = "QmlJSTools.ResetCodeModel"; const char RESET_CODEMODEL[] = "QmlJSTools.ResetCodeModel";
} // namespace Constants } // namespace Constants
} // namespace QmlJSEditor } // namespace QmlJSTools
#endif // QMLJSTOOLS_CONSTANTS_H #endif // QMLJSTOOLS_CONSTANTS_H
src/plugins/qmlprofiler/qmlprofilerconstants.h
+1 -1
View File
@@ -36,7 +36,7 @@
namespace QmlProfiler { namespace QmlProfiler {
namespace Constants { namespace Constants {
const char * const ATTACH = "Menu.Analyzer.Attach"; const char ATTACH[] = "Menu.Analyzer.Attach";
} // namespace Constants } // namespace Constants
} // namespace QmlProfiler } // namespace QmlProfiler
src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
+7 -8
View File
@@ -35,14 +35,13 @@
namespace QmlProjectManager { namespace QmlProjectManager {
namespace Constants { namespace Constants {
const char * const QML_RC_ID = "QmlProjectManager.QmlRunConfiguration"; const char QML_RC_ID[] = "QmlProjectManager.QmlRunConfiguration";
const char * const QML_VIEWER_QT_KEY = "QmlProjectManager.QmlRunConfiguration.QtVersion"; const char QML_VIEWER_QT_KEY[] = "QmlProjectManager.QmlRunConfiguration.QtVersion";
const char * const QML_VIEWER_ARGUMENTS_KEY = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"; const char QML_VIEWER_ARGUMENTS_KEY[] = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments";
const char * const QML_VIEWER_TARGET_ID = "QmlProjectManager.QmlTarget"; const char QML_VIEWER_TARGET_ID[] = "QmlProjectManager.QmlTarget";
const char * const QML_VIEWER_TARGET_DISPLAY_NAME = "QML Viewer"; const char QML_VIEWER_TARGET_DISPLAY_NAME[] = "QML Viewer";
const char * const QML_MAINSCRIPT_KEY = "QmlProjectManager.QmlRunConfiguration.MainScript"; const char QML_MAINSCRIPT_KEY[] = "QmlProjectManager.QmlRunConfiguration.MainScript";
const char * const USER_ENVIRONMENT_CHANGES_KEY("QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"); const char USER_ENVIRONMENT_CHANGES_KEY[] = "QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges";
} // namespace Constants } // namespace Constants
} // namespace QmlProjectManager } // namespace QmlProjectManager
src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h
+1 -1
View File
@@ -50,7 +50,7 @@ class QmlProjectRunConfiguration;
namespace Internal { namespace Internal {
const char * const CURRENT_FILE = QT_TRANSLATE_NOOP("QmlManager", "<Current File>"); const char CURRENT_FILE[] = QT_TRANSLATE_NOOP("QmlManager", "<Current File>");
class QmlProjectRunConfigurationWidget : public QWidget class QmlProjectRunConfigurationWidget : public QWidget
{ {
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
+9 -9
View File
@@ -57,17 +57,17 @@ using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
namespace { namespace {
const char * const S60_DC_ID("Qt4ProjectManager.S60DeployConfiguration"); const char S60_DC_ID[] = "Qt4ProjectManager.S60DeployConfiguration";
const char * const S60_DC_PREFIX("Qt4ProjectManager.S60DeployConfiguration."); const char S60_DC_PREFIX[] = "Qt4ProjectManager.S60DeployConfiguration.";
const char * const SERIAL_PORT_NAME_KEY("Qt4ProjectManager.S60DeployConfiguration.SerialPortName"); const char SERIAL_PORT_NAME_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.SerialPortName";
const char * const INSTALLATION_DRIVE_LETTER_KEY("Qt4ProjectManager.S60DeployConfiguration.InstallationDriveLetter"); const char INSTALLATION_DRIVE_LETTER_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.InstallationDriveLetter";
const char * const SILENT_INSTALL_KEY("Qt4ProjectManager.S60DeployConfiguration.SilentInstall"); const char SILENT_INSTALL_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.SilentInstall";
const char * const DEVICE_ADDRESS_KEY("Qt4ProjectManager.S60DeployConfiguration.DeviceAddress"); const char DEVICE_ADDRESS_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.DeviceAddress";
const char * const DEVICE_PORT_KEY("Qt4ProjectManager.S60DeployConfiguration.DevicePort"); const char DEVICE_PORT_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.DevicePort";
const char * const COMMUNICATION_CHANNEL_KEY("Qt4ProjectManager.S60DeployConfiguration.CommunicationChannel"); const char COMMUNICATION_CHANNEL_KEY[] = "Qt4ProjectManager.S60DeployConfiguration.CommunicationChannel";
const char * const DEFAULT_CODA_TCP_PORT("65029"); const char DEFAULT_CODA_TCP_PORT[] = "65029";
QString pathFromId(const QString &id) QString pathFromId(const QString &id)
{ {
src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h
+11 -11
View File
@@ -55,18 +55,18 @@ class Qt4SymbianTarget;
class S60PublishStep; class S60PublishStep;
namespace Constants { namespace Constants {
const char * const REJECTED_VENDOR_NAMES_VENDOR = "Vendor"; const char REJECTED_VENDOR_NAMES_VENDOR[] = "Vendor";
const char * const REJECTED_VENDOR_NAMES_VENDOR_EN = "Vendor-EN"; const char REJECTED_VENDOR_NAMES_VENDOR_EN[] = "Vendor-EN";
const char * const REJECTED_VENDOR_NAMES_NOKIA = "Nokia"; const char REJECTED_VENDOR_NAMES_NOKIA[] = "Nokia";
const char * const REJECTED_VENDOR_NAMES_EMPTY = ""; const char REJECTED_VENDOR_NAMES_EMPTY[] = "";
const char * const CERTIFIED_SIGNED_CAPABILITY_NETWORK_CONTROL = "NetworkControl"; const char CERTIFIED_SIGNED_CAPABILITY_NETWORK_CONTROL[] = "NetworkControl";
const char * const CERTIFIED_SIGNED_CAPABILITY_MULTIMEDIA_DD = "MultimediaDD"; const char CERTIFIED_SIGNED_CAPABILITY_MULTIMEDIA_DD[] = "MultimediaDD";
const char * const CERTIFIED_SIGNED_CAPABILITY_COMM_DD = "CommDD"; const char CERTIFIED_SIGNED_CAPABILITY_COMM_DD[] = "CommDD";
const char * const CERTIFIED_SIGNED_CAPABILITY_DISK_ADMIN = "DiskAdmin"; const char CERTIFIED_SIGNED_CAPABILITY_DISK_ADMIN[] = "DiskAdmin";
const char * const MANUFACTURER_APPROVED_CAPABILITY_ALL_FILES = "AllFiles"; const char MANUFACTURER_APPROVED_CAPABILITY_ALL_FILES[] = "AllFiles";
const char * const MANUFACTURER_APPROVED_CAPABILITY_DRM = "DRM"; const char MANUFACTURER_APPROVED_CAPABILITY_DRM[] = "DRM";
const char * const MANUFACTURER_APPROVED_CAPABILITY_TCB = "TCB"; const char MANUFACTURER_APPROVED_CAPABILITY_TCB[] = "TCB";
} }
class S60PublisherOvi : public QObject class S60PublisherOvi : public QObject
src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp
+2 -2
View File
@@ -57,8 +57,8 @@ using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
namespace { namespace {
const char * const CERT_IMEI_FIELD_NAME = "1.2.826.0.1.1796587.1.1.1.1"; const char CERT_IMEI_FIELD_NAME[] = "1.2.826.0.1.1796587.1.1.1.1";
const char * const CERT_CAPABILITY_FIELD_NAME = "1.2.826.0.1.1796587.1.1.1.6"; const char CERT_CAPABILITY_FIELD_NAME[] = "1.2.826.0.1.1796587.1.1.1.6";
} }
// ======== S60CertificateExtension // ======== S60CertificateExtension
src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+54 -54
View File
@@ -38,84 +38,84 @@
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Constants { namespace Constants {
//contexts // Contexts
const char * const C_PROFILEEDITOR = ".pro File Editor"; const char C_PROFILEEDITOR[] = ".pro File Editor";
// menus // Menus
const char * const M_CONTEXT = "ProFileEditor.ContextMenu"; const char M_CONTEXT[] = "ProFileEditor.ContextMenu";
// kinds // Kinds
const char * const PROJECT_ID = "Qt4.Qt4Project"; const char PROJECT_ID[] = "Qt4.Qt4Project";
const char * const PROFILE_EDITOR_ID = "Qt4.proFileEditor"; const char PROFILE_EDITOR_ID[] = "Qt4.proFileEditor";
const char * const PROFILE_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor"); const char PROFILE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor");
const char * const PROFILE_MIMETYPE = "application/vnd.nokia.qt.qmakeprofile"; const char PROFILE_MIMETYPE [] = "application/vnd.nokia.qt.qmakeprofile";
const char * const PROINCLUDEFILE_MIMETYPE = "application/vnd.nokia.qt.qmakeproincludefile"; const char PROINCLUDEFILE_MIMETYPE [] = "application/vnd.nokia.qt.qmakeproincludefile";
const char * const PROFEATUREFILE_MIMETYPE = "application/vnd.nokia.qt.qmakeprofeaturefile"; const char PROFEATUREFILE_MIMETYPE [] = "application/vnd.nokia.qt.qmakeprofeaturefile";
const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src"; const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr"; const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
const char * const FORM_MIMETYPE = "application/x-designer"; const char FORM_MIMETYPE[] = "application/x-designer";
const char * const LINGUIST_MIMETYPE = "application/x-linguist"; const char LINGUIST_MIMETYPE[] = "application/x-linguist";
//actions // Actions
const char * const RUNQMAKE = "Qt4Builder.RunQMake"; const char RUNQMAKE[] = "Qt4Builder.RunQMake";
const char * const RUNQMAKECONTEXTMENU = "Qt4Builder.RunQMakeContextMenu"; const char RUNQMAKECONTEXTMENU[] = "Qt4Builder.RunQMakeContextMenu";
const char * const BUILDSUBDIR = "Qt4Builder.BuildSubDir"; const char BUILDSUBDIR[] = "Qt4Builder.BuildSubDir";
const char * const REBUILDSUBDIR = "Qt4Builder.RebuildSubDir"; const char REBUILDSUBDIR[] = "Qt4Builder.RebuildSubDir";
const char * const CLEANSUBDIR = "Qt4Builder.CleanSubDir"; const char CLEANSUBDIR[] = "Qt4Builder.CleanSubDir";
const char * const ADDLIBRARY = "Qt4.AddLibrary"; const char ADDLIBRARY[] = "Qt4.AddLibrary";
const char * const JUMP_TO_FILE = "Qt4.JumpToFile"; const char JUMP_TO_FILE[] = "Qt4.JumpToFile";
const char * const SEPARATOR = "Qt4.Separator"; const char SEPARATOR[] = "Qt4.Separator";
// C++ wizard categories // C++ wizard categories
const char * const QT_APP_WIZARD_CATEGORY = "F.QtApplicationProjects"; const char QT_APP_WIZARD_CATEGORY[] = "F.QtApplicationProjects";
const char * const QT_APP_WIZARD_TR_SCOPE = "Qt4ProjectManager"; const char QT_APP_WIZARD_TR_SCOPE[] = "Qt4ProjectManager";
const char * const QT_APP_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Widget Project"); const char QT_APP_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Widget Project");
// Html5 wizard categories // Html5 wizard categories
const char * const HTML5_WIZARD_CATEGORY = "I.Projects"; // (after Qt) const char HTML5_WIZARD_CATEGORY[] = "I.Projects"; // (after Qt)
const char * const HTML5_WIZARD_TR_SCOPE = QT_APP_WIZARD_TR_SCOPE; const char HTML5_WIZARD_TR_SCOPE[] = "Qt4ProjectManager";
const char * const HTML5_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("ProjectExplorer", "Other Project"); const char HTML5_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Other Project");
const char * const HTML5_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png"; const char HTML5_WIZARD_ICON[] = ":/qmlproject/images/qml_wizard.png";
// Tasks // Tasks
const char * const PROFILE_EVALUATE = "Qt4ProjectManager.ProFileEvaluate"; const char PROFILE_EVALUATE[] = "Qt4ProjectManager.ProFileEvaluate";
// Project // Project
const char * const QT4PROJECT_ID("Qt4ProjectManager.Qt4Project"); const char QT4PROJECT_ID[] = "Qt4ProjectManager.Qt4Project";
// Targets // Targets
const char * const DESKTOP_TARGET_ID = "Qt4ProjectManager.Target.DesktopTarget"; const char DESKTOP_TARGET_ID[] = "Qt4ProjectManager.Target.DesktopTarget";
const char * const S60_EMULATOR_TARGET_ID = "Qt4ProjectManager.Target.S60EmulatorTarget"; const char S60_EMULATOR_TARGET_ID[] = "Qt4ProjectManager.Target.S60EmulatorTarget";
const char * const S60_DEVICE_TARGET_ID = "Qt4ProjectManager.Target.S60DeviceTarget"; const char S60_DEVICE_TARGET_ID[] = "Qt4ProjectManager.Target.S60DeviceTarget";
const char * const MAEMO5_DEVICE_TARGET_ID = "Qt4ProjectManager.Target.MaemoDeviceTarget"; const char MAEMO5_DEVICE_TARGET_ID[] = "Qt4ProjectManager.Target.MaemoDeviceTarget";
const char * const HARMATTAN_DEVICE_TARGET_ID = "Qt4ProjectManager.Target.HarmattanDeviceTarget"; const char HARMATTAN_DEVICE_TARGET_ID[] = "Qt4ProjectManager.Target.HarmattanDeviceTarget";
const char * const MEEGO_DEVICE_TARGET_ID = "Qt4ProjectManager.Target.MeegoDeviceTarget"; const char MEEGO_DEVICE_TARGET_ID[] = "Qt4ProjectManager.Target.MeegoDeviceTarget";
const char * const QT_SIMULATOR_TARGET_ID = "Qt4ProjectManager.Target.QtSimulatorTarget"; const char QT_SIMULATOR_TARGET_ID[] = "Qt4ProjectManager.Target.QtSimulatorTarget";
// Target Features // Target Features
const char * const MOBILE_TARGETFEATURE_ID = "Qt4ProjectManager.TargetFeature.Mobile"; const char MOBILE_TARGETFEATURE_ID[] = "Qt4ProjectManager.TargetFeature.Mobile";
const char * const DESKTOP_TARGETFEATURE_ID = "Qt4ProjectManager.TargetFeature.Desktop"; const char DESKTOP_TARGETFEATURE_ID[] = "Qt4ProjectManager.TargetFeature.Desktop";
const char * const SHADOWBUILD_TARGETFEATURE_ID = "Qt4ProjectManager.TargetFeature.ShadowBuild"; const char SHADOWBUILD_TARGETFEATURE_ID[] = "Qt4ProjectManager.TargetFeature.ShadowBuild";
const char * const QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID const char QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID[]
= "Qt4ProjectManager.TargetFeature.QtQuickComponentsSymbian"; = "Qt4ProjectManager.TargetFeature.QtQuickComponentsSymbian";
const char * const QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID const char QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID[]
= "Qt4ProjectManager.TargetFeature.QtQuickComponentsMeego"; = "Qt4ProjectManager.TargetFeature.QtQuickComponentsMeego";
// Tool chains: // Tool chains:
const char * const GCCE_TOOLCHAIN_ID = "Qt4ProjectManager.ToolChain.GCCE"; const char GCCE_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.GCCE";
const char * const MAEMO_TOOLCHAIN_ID = "Qt4ProjectManager.ToolChain.Maemo"; const char MAEMO_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.Maemo";
const char * const RVCT_TOOLCHAIN_ID = "Qt4ProjectManager.ToolChain.RVCT"; const char RVCT_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.RVCT";
const char * const WINSCW_TOOLCHAIN_ID = "Qt4ProjectManager.ToolChain.WINSCW"; const char WINSCW_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.WINSCW";
// ICONS // ICONS
const char * const ICON_QT_PROJECT = ":/qt4projectmanager/images/qt_project.png"; const char ICON_QT_PROJECT[] = ":/qt4projectmanager/images/qt_project.png";
const char * const ICON_QTQUICK_APP = ":/wizards/images/qtquickapp.png"; const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png";
const char * const ICON_HTML5_APP = ":/wizards/images/html5app.png"; const char ICON_HTML5_APP[] = ":/wizards/images/html5app.png";
// Env variables // Env variables
const char * const QMAKEVAR_QMLJSDEBUGGER_PATH = "QMLJSDEBUGGER_PATH"; const char QMAKEVAR_QMLJSDEBUGGER_PATH[] = "QMLJSDEBUGGER_PATH";
const char * const QMAKEVAR_DECLARATIVE_DEBUG = "CONFIG+=declarative_debug"; const char QMAKEVAR_DECLARATIVE_DEBUG[] = "CONFIG+=declarative_debug";
} // namespace Constants } // namespace Constants
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager
src/plugins/qtsupport/qtsupportconstants.h
+16 -15
View File
@@ -36,26 +36,27 @@
namespace QtSupport { namespace QtSupport {
namespace Constants { namespace Constants {
//Qt4 settings pages // Qt4 settings pages
const char * const QT_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt4"); const char QT_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt4");
const char * const QTVERSION_SETTINGS_PAGE_ID = "B.Qt Versions"; const char QTVERSION_SETTINGS_PAGE_ID[] = "B.Qt Versions";
const char * const QTVERSION_SETTINGS_PAGE_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions"); const char QTVERSION_SETTINGS_PAGE_NAME[] = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions");
// QtVersions // QtVersions
const char * const SYMBIANQT = "Qt4ProjectManager.QtVersion.Symbian"; const char SYMBIANQT[] = "Qt4ProjectManager.QtVersion.Symbian";
const char * const MAEMOQT = "Qt4ProjectManager.QtVersion.Maemo"; const char MAEMOQT[] = "Qt4ProjectManager.QtVersion.Maemo";
const char * const DESKTOPQT = "Qt4ProjectManager.QtVersion.Desktop"; const char DESKTOPQT[] = "Qt4ProjectManager.QtVersion.Desktop";
const char * const SIMULATORQT = "Qt4ProjectManager.QtVersion.Simulator"; const char SIMULATORQT[] = "Qt4ProjectManager.QtVersion.Simulator";
const char * const WINCEQT = "Qt4ProjectManager.QtVersion.WinCE"; const char WINCEQT[] = "Qt4ProjectManager.QtVersion.WinCE";
// QML wizard categories // QML wizard categories
// both the qt4projectmanager and the qmlprojectmanager do have qt quick wizards // both the qt4projectmanager and the qmlprojectmanager do have qt quick wizards
// so we define the category here // so we define the category here
const char * const QML_WIZARD_CATEGORY = "C.Projects"; // (before Qt) const char QML_WIZARD_CATEGORY[] = "C.Projects"; // (before Qt)
const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager"; const char QML_WIZARD_TR_SCOPE[] = "QmlProjectManager";
const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project"); const char QML_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png"; const char QML_WIZARD_ICON[] = ":/qmlproject/images/qml_wizard.png";
} // namepsace Constants
} // namepsace QtSupport
}
}
#endif // QTSUPPORTCONSTANTS_H #endif // QTSUPPORTCONSTANTS_H
src/plugins/qttest/testsettingspropertiespage.h
+1 -2
View File
@@ -41,10 +41,9 @@
class TestConfig; class TestConfig;
namespace QtTest { namespace QtTest {
namespace Internal { namespace Internal {
const char * const TESTSETTINGS_PANEL_ID("QtTest.TestSettingsPanel"); const char TESTSETTINGS_PANEL_ID[] = "QtTest.TestSettingsPanel";
class TestSettingsPanelFactory : public ProjectExplorer::IProjectPanelFactory class TestSettingsPanelFactory : public ProjectExplorer::IProjectPanelFactory
{ {
src/plugins/resourceeditor/resourceeditorconstants.h
+4 -4
View File
@@ -36,11 +36,11 @@
namespace ResourceEditor { namespace ResourceEditor {
namespace Constants { namespace Constants {
const char * const C_RESOURCEEDITOR = "Qt4.ResourceEditor"; const char C_RESOURCEEDITOR[] = "Qt4.ResourceEditor";
const char * const RESOURCEEDITOR_ID = "Qt4.ResourceEditor"; const char RESOURCEEDITOR_ID[] = "Qt4.ResourceEditor";
const char * const C_RESOURCEEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "Resource Editor"); const char C_RESOURCEEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Resource Editor");
const char * const C_RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource"; const char C_RESOURCE_MIMETYPE[] = "application/vnd.nokia.xml.qt.resource";
} // namespace Constants } // namespace Constants
} // namespace ResourceEditor } // namespace ResourceEditor
src/plugins/subversion/subversionconstants.h
+6 -6
View File
@@ -38,12 +38,12 @@
namespace Subversion { namespace Subversion {
namespace Constants { namespace Constants {
const char * const SUBVERSION_SUBMIT_MIMETYPE = "application/vnd.nokia.text.subversion.submit"; const char SUBVERSION_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.subversion.submit";
const char * const SUBVERSIONCOMMITEDITOR = "Subversion Commit Editor"; const char SUBVERSIONCOMMITEDITOR[] = "Subversion Commit Editor";
const char * const SUBVERSIONCOMMITEDITOR_ID = "Subversion Commit Editor"; const char SUBVERSIONCOMMITEDITOR_ID[] = "Subversion Commit Editor";
const char * const SUBVERSIONCOMMITEDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("VCS", "Subversion Commit Editor"); const char SUBVERSIONCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Subversion Commit Editor");
const char * const SUBMIT_CURRENT = "Subversion.SubmitCurrentLog"; const char SUBMIT_CURRENT[] = "Subversion.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Subversion.DiffSelectedFilesInLog"; const char DIFF_SELECTED[] = "Subversion.DiffSelectedFilesInLog";
enum { debug = 0 }; enum { debug = 0 };
} // namespace Constants } // namespace Constants
src/plugins/subversion/subversionplugin.cpp
+26 -26
View File
@@ -84,33 +84,33 @@
namespace Subversion { namespace Subversion {
namespace Internal { namespace Internal {
static const char * const CMD_ID_SUBVERSION_MENU = "Subversion.Menu"; static const char CMD_ID_SUBVERSION_MENU[] = "Subversion.Menu";
static const char * const CMD_ID_ADD = "Subversion.Add"; static const char CMD_ID_ADD[] = "Subversion.Add";
static const char * const CMD_ID_DELETE_FILE = "Subversion.Delete"; static const char CMD_ID_DELETE_FILE[] = "Subversion.Delete";
static const char * const CMD_ID_REVERT = "Subversion.Revert"; static const char CMD_ID_REVERT[] = "Subversion.Revert";
static const char * const CMD_ID_SEPARATOR0 = "Subversion.Separator0"; static const char CMD_ID_SEPARATOR0[] = "Subversion.Separator0";
static const char * const CMD_ID_DIFF_PROJECT = "Subversion.DiffAll"; static const char CMD_ID_DIFF_PROJECT[] = "Subversion.DiffAll";
static const char * const CMD_ID_DIFF_CURRENT = "Subversion.DiffCurrent"; static const char CMD_ID_DIFF_CURRENT[] = "Subversion.DiffCurrent";
static const char * const CMD_ID_SEPARATOR1 = "Subversion.Separator1"; static const char CMD_ID_SEPARATOR1[] = "Subversion.Separator1";
static const char * const CMD_ID_COMMIT_ALL = "Subversion.CommitAll"; static const char CMD_ID_COMMIT_ALL[] = "Subversion.CommitAll";
static const char * const CMD_ID_REVERT_ALL = "Subversion.RevertAll"; static const char CMD_ID_REVERT_ALL[] = "Subversion.RevertAll";
static const char * const CMD_ID_COMMIT_CURRENT = "Subversion.CommitCurrent"; static const char CMD_ID_COMMIT_CURRENT[] = "Subversion.CommitCurrent";
static const char * const CMD_ID_SEPARATOR2 = "Subversion.Separator2"; static const char CMD_ID_SEPARATOR2[] = "Subversion.Separator2";
static const char * const CMD_ID_FILELOG_CURRENT = "Subversion.FilelogCurrent"; static const char CMD_ID_FILELOG_CURRENT[] = "Subversion.FilelogCurrent";
static const char * const CMD_ID_ANNOTATE_CURRENT = "Subversion.AnnotateCurrent"; static const char CMD_ID_ANNOTATE_CURRENT[] = "Subversion.AnnotateCurrent";
static const char * const CMD_ID_SEPARATOR3 = "Subversion.Separator3"; static const char CMD_ID_SEPARATOR3[] = "Subversion.Separator3";
static const char * const CMD_ID_SEPARATOR4 = "Subversion.Separator4"; static const char CMD_ID_SEPARATOR4[] = "Subversion.Separator4";
static const char * const CMD_ID_STATUS = "Subversion.Status"; static const char CMD_ID_STATUS[] = "Subversion.Status";
static const char * const CMD_ID_PROJECTLOG = "Subversion.ProjectLog"; static const char CMD_ID_PROJECTLOG[] = "Subversion.ProjectLog";
static const char * const CMD_ID_REPOSITORYLOG = "Subversion.RepositoryLog"; static const char CMD_ID_REPOSITORYLOG[] = "Subversion.RepositoryLog";
static const char * const CMD_ID_REPOSITORYUPDATE = "Subversion.RepositoryUpdate"; static const char CMD_ID_REPOSITORYUPDATE[] = "Subversion.RepositoryUpdate";
static const char * const CMD_ID_REPOSITORYDIFF = "Subversion.RepositoryDiff"; static const char CMD_ID_REPOSITORYDIFF[] = "Subversion.RepositoryDiff";
static const char * const CMD_ID_REPOSITORYSTATUS = "Subversion.RepositoryStatus"; static const char CMD_ID_REPOSITORYSTATUS[] = "Subversion.RepositoryStatus";
static const char * const CMD_ID_UPDATE = "Subversion.Update"; static const char CMD_ID_UPDATE[] = "Subversion.Update";
static const char * const CMD_ID_COMMIT_PROJECT = "Subversion.CommitProject"; static const char CMD_ID_COMMIT_PROJECT[] = "Subversion.CommitProject";
static const char * const CMD_ID_DESCRIBE = "Subversion.Describe"; static const char CMD_ID_DESCRIBE[] = "Subversion.Describe";
static const char *nonInteractiveOptionC = "--non-interactive"; static const char nonInteractiveOptionC[] = "--non-interactive";
src/plugins/tasklist/tasklistconstants.h
+1 -1
View File
@@ -36,7 +36,7 @@
namespace TaskList { namespace TaskList {
namespace Constants { namespace Constants {
const char * const TASKLISTTASK_ID = "TaskList.TaskListTaskId"; const char TASKLISTTASK_ID[] = "TaskList.TaskListTaskId";
} // namespace Constants } // namespace Constants
} // namespace TaskList } // namespace TaskList
src/plugins/texteditor/texteditorconstants.h
+117 -117
View File
@@ -38,133 +38,133 @@
namespace TextEditor { namespace TextEditor {
namespace Constants { namespace Constants {
const char * const C_TEXTEDITOR = "Text Editor"; const char C_TEXTEDITOR[] = "Text Editor";
const char * const COMPLETE_THIS = "TextEditor.CompleteThis"; const char COMPLETE_THIS[] = "TextEditor.CompleteThis";
const char * const QUICKFIX_THIS = "TextEditor.QuickFix"; const char QUICKFIX_THIS[] = "TextEditor.QuickFix";
const char * const VISUALIZE_WHITESPACE = "TextEditor.VisualizeWhitespace"; const char VISUALIZE_WHITESPACE[] = "TextEditor.VisualizeWhitespace";
const char * const CLEAN_WHITESPACE = "TextEditor.CleanWhitespace"; const char CLEAN_WHITESPACE[] = "TextEditor.CleanWhitespace";
const char * const TEXT_WRAPPING = "TextEditor.TextWrapping"; const char TEXT_WRAPPING[] = "TextEditor.TextWrapping";
const char * const UN_COMMENT_SELECTION = "TextEditor.UnCommentSelection"; const char UN_COMMENT_SELECTION[] = "TextEditor.UnCommentSelection";
const char * const FOLD = "TextEditor.Fold"; const char FOLD[] = "TextEditor.Fold";
const char * const UNFOLD = "TextEditor.Unfold"; const char UNFOLD[] = "TextEditor.Unfold";
const char * const UNFOLD_ALL = "TextEditor.UnFoldAll"; const char UNFOLD_ALL[] = "TextEditor.UnFoldAll";
const char * const AUTO_INDENT_SELECTION = "TextEditor.AutoIndentSelection"; const char AUTO_INDENT_SELECTION[] = "TextEditor.AutoIndentSelection";
const char * const INCREASE_FONT_SIZE = "TextEditor.IncreaseFontSize"; const char INCREASE_FONT_SIZE[] = "TextEditor.IncreaseFontSize";
const char * const DECREASE_FONT_SIZE = "TextEditor.DecreaseFontSize"; const char DECREASE_FONT_SIZE[] = "TextEditor.DecreaseFontSize";
const char * const RESET_FONT_SIZE = "TextEditor.ResetFontSize"; const char RESET_FONT_SIZE[] = "TextEditor.ResetFontSize";
const char * const GOTO_BLOCK_START = "TextEditor.GotoBlockStart"; const char GOTO_BLOCK_START[] = "TextEditor.GotoBlockStart";
const char * const GOTO_BLOCK_START_WITH_SELECTION = "TextEditor.GotoBlockStartWithSelection"; const char GOTO_BLOCK_START_WITH_SELECTION[] = "TextEditor.GotoBlockStartWithSelection";
const char * const GOTO_BLOCK_END = "TextEditor.GotoBlockEnd"; const char GOTO_BLOCK_END[] = "TextEditor.GotoBlockEnd";
const char * const GOTO_BLOCK_END_WITH_SELECTION = "TextEditor.GotoBlockEndWithSelection"; const char GOTO_BLOCK_END_WITH_SELECTION[] = "TextEditor.GotoBlockEndWithSelection";
const char * const SELECT_BLOCK_UP = "TextEditor.SelectBlockUp"; const char SELECT_BLOCK_UP[] = "TextEditor.SelectBlockUp";
const char * const SELECT_BLOCK_DOWN = "TextEditor.SelectBlockDown"; const char SELECT_BLOCK_DOWN[] = "TextEditor.SelectBlockDown";
const char * const MOVE_LINE_UP = "TextEditor.MoveLineUp"; const char MOVE_LINE_UP[] = "TextEditor.MoveLineUp";
const char * const MOVE_LINE_DOWN = "TextEditor.MoveLineDown"; const char MOVE_LINE_DOWN[] = "TextEditor.MoveLineDown";
const char * const COPY_LINE_UP = "TextEditor.CopyLineUp"; const char COPY_LINE_UP[] = "TextEditor.CopyLineUp";
const char * const COPY_LINE_DOWN = "TextEditor.CopyLineDown"; const char COPY_LINE_DOWN[] = "TextEditor.CopyLineDown";
const char * const JOIN_LINES = "TextEditor.JoinLines"; const char JOIN_LINES[] = "TextEditor.JoinLines";
const char * const INSERT_LINE_ABOVE = "TextEditor.InsertLineAboveCurrentLine"; const char INSERT_LINE_ABOVE[] = "TextEditor.InsertLineAboveCurrentLine";
const char * const INSERT_LINE_BELOW = "TextEditor.InsertLineBelowCurrentLine"; const char INSERT_LINE_BELOW[] = "TextEditor.InsertLineBelowCurrentLine";
const char * const UPPERCASE_SELECTION = "TextEditor.UppercaseSelection"; const char UPPERCASE_SELECTION[] = "TextEditor.UppercaseSelection";
const char * const LOWERCASE_SELECTION = "TextEditor.LowercaseSelection"; const char LOWERCASE_SELECTION[] = "TextEditor.LowercaseSelection";
const char * const CUT_LINE = "TextEditor.CutLine"; const char CUT_LINE[] = "TextEditor.CutLine";
const char * const COPY_LINE = "TextEditor.CopyLine"; const char COPY_LINE[] = "TextEditor.CopyLine";
const char * const DELETE_LINE = "TextEditor.DeleteLine"; const char DELETE_LINE[] = "TextEditor.DeleteLine";
const char * const DELETE_END_OF_WORD = "TextEditor.DeleteEndOfWord"; const char DELETE_END_OF_WORD[] = "TextEditor.DeleteEndOfWord";
const char * const DELETE_END_OF_WORD_CAMEL_CASE = "TextEditor.DeleteEndOfWordCamelCase"; const char DELETE_END_OF_WORD_CAMEL_CASE[] = "TextEditor.DeleteEndOfWordCamelCase";
const char * const DELETE_START_OF_WORD = "TextEditor.DeleteStartOfWord"; const char DELETE_START_OF_WORD[] = "TextEditor.DeleteStartOfWord";
const char * const DELETE_START_OF_WORD_CAMEL_CASE = "TextEditor.DeleteStartOfWordCamelCase"; const char DELETE_START_OF_WORD_CAMEL_CASE[] = "TextEditor.DeleteStartOfWordCamelCase";
const char * const SELECT_ENCODING = "TextEditor.SelectEncoding"; const char SELECT_ENCODING[] = "TextEditor.SelectEncoding";
const char * const REWRAP_PARAGRAPH = "TextEditor.RewrapParagraph"; const char REWRAP_PARAGRAPH[] = "TextEditor.RewrapParagraph";
const char * const GOTO_LINE_START = "TextEditor.GotoLineStart"; const char GOTO_LINE_START[] = "TextEditor.GotoLineStart";
const char * const GOTO_LINE_END = "TextEditor.GotoLineEnd"; const char GOTO_LINE_END[] = "TextEditor.GotoLineEnd";
const char * const GOTO_NEXT_LINE = "TextEditor.GotoNextLine"; const char GOTO_NEXT_LINE[] = "TextEditor.GotoNextLine";
const char * const GOTO_PREVIOUS_LINE = "TextEditor.GotoPreviousLine"; const char GOTO_PREVIOUS_LINE[] = "TextEditor.GotoPreviousLine";
const char * const GOTO_PREVIOUS_CHARACTER = "TextEditor.GotoPreviousCharacter"; const char GOTO_PREVIOUS_CHARACTER[] = "TextEditor.GotoPreviousCharacter";
const char * const GOTO_NEXT_CHARACTER = "TextEditor.GotoNextCharacter"; const char GOTO_NEXT_CHARACTER[] = "TextEditor.GotoNextCharacter";
const char * const GOTO_PREVIOUS_WORD = "TextEditor.GotoPreviousWord"; const char GOTO_PREVIOUS_WORD[] = "TextEditor.GotoPreviousWord";
const char * const GOTO_NEXT_WORD = "TextEditor.GotoNextWord"; const char GOTO_NEXT_WORD[] = "TextEditor.GotoNextWord";
const char * const GOTO_PREVIOUS_WORD_CAMEL_CASE = "TextEditor.GotoPreviousWordCamelCase"; const char GOTO_PREVIOUS_WORD_CAMEL_CASE[] = "TextEditor.GotoPreviousWordCamelCase";
const char * const GOTO_NEXT_WORD_CAMEL_CASE = "TextEditor.GotoNextWordCamelCase"; const char GOTO_NEXT_WORD_CAMEL_CASE[] = "TextEditor.GotoNextWordCamelCase";
const char * const GOTO_LINE_START_WITH_SELECTION = "TextEditor.GotoLineStartWithSelection"; const char GOTO_LINE_START_WITH_SELECTION[] = "TextEditor.GotoLineStartWithSelection";
const char * const GOTO_LINE_END_WITH_SELECTION = "TextEditor.GotoLineEndWithSelection"; const char GOTO_LINE_END_WITH_SELECTION[] = "TextEditor.GotoLineEndWithSelection";
const char * const GOTO_NEXT_LINE_WITH_SELECTION = "TextEditor.GotoNextLineWithSelection"; const char GOTO_NEXT_LINE_WITH_SELECTION[] = "TextEditor.GotoNextLineWithSelection";
const char * const GOTO_PREVIOUS_LINE_WITH_SELECTION = "TextEditor.GotoPreviousLineWithSelection"; const char GOTO_PREVIOUS_LINE_WITH_SELECTION[] = "TextEditor.GotoPreviousLineWithSelection";
const char * const GOTO_PREVIOUS_CHARACTER_WITH_SELECTION = "TextEditor.GotoPreviousCharacterWithSelection"; const char GOTO_PREVIOUS_CHARACTER_WITH_SELECTION[] = "TextEditor.GotoPreviousCharacterWithSelection";
const char * const GOTO_NEXT_CHARACTER_WITH_SELECTION = "TextEditor.GotoNextCharacterWithSelection"; const char GOTO_NEXT_CHARACTER_WITH_SELECTION[] = "TextEditor.GotoNextCharacterWithSelection";
const char * const GOTO_PREVIOUS_WORD_WITH_SELECTION = "TextEditor.GotoPreviousWordWithSelection"; const char GOTO_PREVIOUS_WORD_WITH_SELECTION[] = "TextEditor.GotoPreviousWordWithSelection";
const char * const GOTO_NEXT_WORD_WITH_SELECTION = "TextEditor.GotoNextWordWithSelection"; const char GOTO_NEXT_WORD_WITH_SELECTION[] = "TextEditor.GotoNextWordWithSelection";
const char * const GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION = "TextEditor.GotoPreviousWordCamelCaseWithSelection"; const char GOTO_PREVIOUS_WORD_CAMEL_CASE_WITH_SELECTION[] = "TextEditor.GotoPreviousWordCamelCaseWithSelection";
const char * const GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION = "TextEditor.GotoNextWordCamelCaseWithSelection"; const char GOTO_NEXT_WORD_CAMEL_CASE_WITH_SELECTION[] = "TextEditor.GotoNextWordCamelCaseWithSelection";
const char * const C_TEXTEDITOR_MIMETYPE_TEXT = "text/plain"; const char C_TEXTEDITOR_MIMETYPE_TEXT[] = "text/plain";
const char * const INFO_SYNTAX_DEFINITION = "TextEditor.InfoSyntaxDefinition"; const char INFO_SYNTAX_DEFINITION[] = "TextEditor.InfoSyntaxDefinition";
const char * const TASK_DOWNLOAD_DEFINITIONS = "TextEditor.Task.Download"; const char TASK_DOWNLOAD_DEFINITIONS[] = "TextEditor.Task.Download";
const char * const TASK_REGISTER_DEFINITIONS = "TextEditor.Task.Register"; const char TASK_REGISTER_DEFINITIONS[] = "TextEditor.Task.Register";
const char * const TASK_OPEN_FILE = "TextEditor.Task.OpenFile"; const char TASK_OPEN_FILE[] = "TextEditor.Task.OpenFile";
// Text color and style categories // Text color and style categories
const char * const C_TEXT = "Text"; const char C_TEXT[] = "Text";
const char * const C_LINK = "Link"; const char C_LINK[] = "Link";
const char * const C_SELECTION = "Selection"; const char C_SELECTION[] = "Selection";
const char * const C_LINE_NUMBER = "LineNumber"; const char C_LINE_NUMBER[] = "LineNumber";
const char * const C_SEARCH_RESULT = "SearchResult"; const char C_SEARCH_RESULT[] = "SearchResult";
const char * const C_SEARCH_SCOPE = "SearchScope"; const char C_SEARCH_SCOPE[] = "SearchScope";
const char * const C_PARENTHESES = "Parentheses"; const char C_PARENTHESES[] = "Parentheses";
const char * const C_CURRENT_LINE = "CurrentLine"; const char C_CURRENT_LINE[] = "CurrentLine";
const char * const C_CURRENT_LINE_NUMBER = "CurrentLineNumber"; const char C_CURRENT_LINE_NUMBER[] = "CurrentLineNumber";
const char * const C_OCCURRENCES = "Occurrences"; const char C_OCCURRENCES[] = "Occurrences";
const char * const C_OCCURRENCES_UNUSED = "Occurrences.Unused"; const char C_OCCURRENCES_UNUSED[] = "Occurrences.Unused";
const char * const C_OCCURRENCES_RENAME = "Occurrences.Rename"; const char C_OCCURRENCES_RENAME[] = "Occurrences.Rename";
const char * const C_NUMBER = "Number"; const char C_NUMBER[] = "Number";
const char * const C_STRING = "String"; const char C_STRING[] = "String";
const char * const C_TYPE = "Type"; const char C_TYPE[] = "Type";
const char * const C_LOCAL = "Local"; const char C_LOCAL[] = "Local";
const char * const C_FIELD = "Field"; const char C_FIELD[] = "Field";
const char * const C_STATIC = "Static"; const char C_STATIC[] = "Static";
const char * const C_VIRTUAL_METHOD = "VirtualMethod"; const char C_VIRTUAL_METHOD[] = "VirtualMethod";
const char * const C_KEYWORD = "Keyword"; const char C_KEYWORD[] = "Keyword";
const char * const C_OPERATOR = "Operator"; const char C_OPERATOR[] = "Operator";
const char * const C_PREPROCESSOR = "Preprocessor"; const char C_PREPROCESSOR[] = "Preprocessor";
const char * const C_LABEL = "Label"; const char C_LABEL[] = "Label";
const char * const C_COMMENT = "Comment"; const char C_COMMENT[] = "Comment";
const char * const C_DOXYGEN_COMMENT = "Doxygen.Comment"; const char C_DOXYGEN_COMMENT[] = "Doxygen.Comment";
const char * const C_DOXYGEN_TAG = "Doxygen.Tag"; const char C_DOXYGEN_TAG[] = "Doxygen.Tag";
const char * const C_VISUAL_WHITESPACE = "VisualWhitespace"; const char C_VISUAL_WHITESPACE[] = "VisualWhitespace";
const char * const C_QML_LOCAL_ID = "QmlLocalId"; const char C_QML_LOCAL_ID[] = "QmlLocalId";
const char * const C_QML_EXTERNAL_ID = "QmlExternalId"; const char C_QML_EXTERNAL_ID[] = "QmlExternalId";
const char * const C_QML_TYPE_ID = "QmlTypeId"; const char C_QML_TYPE_ID[] = "QmlTypeId";
const char * const C_QML_ROOT_OBJECT_PROPERTY = "QmlRootObjectProperty"; const char C_QML_ROOT_OBJECT_PROPERTY[] = "QmlRootObjectProperty";
const char * const C_QML_SCOPE_OBJECT_PROPERTY = "QmlScopeObjectProperty"; const char C_QML_SCOPE_OBJECT_PROPERTY[] = "QmlScopeObjectProperty";
const char * const C_QML_EXTERNAL_OBJECT_PROPERTY = "QmlExternalObjectProperty"; const char C_QML_EXTERNAL_OBJECT_PROPERTY[] = "QmlExternalObjectProperty";
const char * const C_JS_SCOPE_VAR = "JsScopeVar"; const char C_JS_SCOPE_VAR[] = "JsScopeVar";
const char * const C_JS_IMPORT_VAR = "JsImportVar"; const char C_JS_IMPORT_VAR[] = "JsImportVar";
const char * const C_JS_GLOBAL_VAR = "JsGlobalVar"; const char C_JS_GLOBAL_VAR[] = "JsGlobalVar";
const char * const C_QML_STATE_NAME = "QmlStateName"; const char C_QML_STATE_NAME[] = "QmlStateName";
const char * const C_BINDING = "Binding"; const char C_BINDING[] = "Binding";
const char * const C_DISABLED_CODE = "DisabledCode"; const char C_DISABLED_CODE[] = "DisabledCode";
const char * const C_ADDED_LINE = "AddedLine"; const char C_ADDED_LINE[] = "AddedLine";
const char * const C_REMOVED_LINE = "RemovedLine"; const char C_REMOVED_LINE[] = "RemovedLine";
const char * const C_DIFF_FILE = "DiffFile"; const char C_DIFF_FILE[] = "DiffFile";
const char * const C_DIFF_LOCATION = "DiffLocation"; const char C_DIFF_LOCATION[] = "DiffLocation";
const char * const TEXT_EDITOR_SETTINGS_CATEGORY = "C.TextEditor"; const char TEXT_EDITOR_SETTINGS_CATEGORY[] = "C.TextEditor";
const char * const TEXT_EDITOR_SETTINGS_CATEGORY_ICON = ":/core/images/category_texteditor.png"; const char TEXT_EDITOR_SETTINGS_CATEGORY_ICON[] = ":/core/images/category_texteditor.png";
const char * const TEXT_EDITOR_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("TextEditor", "Text Editor"); const char TEXT_EDITOR_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("TextEditor", "Text Editor");
const char * const TEXT_EDITOR_FONT_SETTINGS = "A.FontSettings"; const char TEXT_EDITOR_FONT_SETTINGS[] = "A.FontSettings";
const char * const TEXT_EDITOR_BEHAVIOR_SETTINGS = "B.BehaviourSettings"; const char TEXT_EDITOR_BEHAVIOR_SETTINGS[] = "B.BehaviourSettings";
const char * const TEXT_EDITOR_DISPLAY_SETTINGS = "D.DisplaySettings"; const char TEXT_EDITOR_DISPLAY_SETTINGS[] = "D.DisplaySettings";
const char * const TEXT_EDITOR_HIGHLIGHTER_SETTINGS = "E.HighlighterSettings"; const char TEXT_EDITOR_HIGHLIGHTER_SETTINGS[] = "E.HighlighterSettings";
const char * const TEXT_EDITOR_SNIPPETS_SETTINGS = "F.SnippetsSettings"; const char TEXT_EDITOR_SNIPPETS_SETTINGS[] = "F.SnippetsSettings";
const char * const SNIPPET_EDITOR_ID = "TextEditor.SnippetEditor"; const char SNIPPET_EDITOR_ID[] = "TextEditor.SnippetEditor";
const char * const TEXT_SNIPPET_GROUP_ID = "Text"; const char TEXT_SNIPPET_GROUP_ID[] = "Text";
const char * const GLOBAL_SETTINGS_ID = "Global"; const char GLOBAL_SETTINGS_ID[] = "Global";
} // namespace Constants } // namespace Constants
} // namespace TextEditor } // namespace TextEditor
src/plugins/vcsbase/vcsbaseconstants.h
+14 -14
View File
@@ -38,28 +38,28 @@
namespace VCSBase { namespace VCSBase {
namespace Constants { namespace Constants {
const char * const VCS_SETTINGS_CATEGORY = "V.Version Control"; const char VCS_SETTINGS_CATEGORY[] = "V.Version Control";
const char * const VCS_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("VCSBase", "Version Control"); const char VCS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("VCSBase", "Version Control");
const char * const SETTINGS_CATEGORY_VCS_ICON = ":/core/images/category_vcs.png"; const char SETTINGS_CATEGORY_VCS_ICON[] = ":/core/images/category_vcs.png";
const char * const VCS_COMMON_SETTINGS_ID = "A.Common"; const char VCS_COMMON_SETTINGS_ID[] = "A.Common";
const char * const VCS_COMMON_SETTINGS_NAME = QT_TRANSLATE_NOOP("VCSBase", "Common"); const char VCS_COMMON_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("VCSBase", "Common");
const char * const VCS_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("VCSBase", "Project from Version Control"); const char VCS_WIZARD_TR_CATEGORY[] = QT_TRANSLATE_NOOP("VCSBase", "Project from Version Control");
const char * const VCS_WIZARD_CATEGORY = "L.Version Control"; const char VCS_WIZARD_CATEGORY[] = "L.Version Control";
// Ids for sort order (wizards and preferences) // Ids for sort order (wizards and preferences)
const char * const VCS_ID_BAZAAR = "B.Bazaar"; const char VCS_ID_BAZAAR[] = "B.Bazaar";
const char * const VCS_ID_GIT = "G.Git"; const char VCS_ID_GIT[] = "G.Git";
const char * const VCS_ID_MERCURIAL = "H.Mercurial"; const char VCS_ID_MERCURIAL[] = "H.Mercurial";
const char * const VCS_ID_SUBVERSION = "J.Subversion"; const char VCS_ID_SUBVERSION[] = "J.Subversion";
const char * const VCS_ID_PERFORCE = "P.Perforce"; const char VCS_ID_PERFORCE[] = "P.Perforce";
const char * const VCS_ID_CVS = "Z.CVS"; const char VCS_ID_CVS[] = "Z.CVS";
namespace Internal { namespace Internal {
enum { debug = 0 }; enum { debug = 0 };
} // namespace Internal } // namespace Internal
} // namespace Constants } // namespace Constants
} // VCSBase } // namespace VCSBase
#endif // VCSBASE_CONSTANTS_H #endif // VCSBASE_CONSTANTS_H
src/tools/qmlprofilertool/constants.h
+8 -8
View File
@@ -35,16 +35,16 @@
namespace Constants { namespace Constants {
const char * const CMD_HELP ="help"; const char CMD_HELP[] ="help";
const char * const CMD_HELP2 = "h"; const char CMD_HELP2[] = "h";
const char * const CMD_HELP3 = "?"; const char CMD_HELP3[] = "?";
const char * const CMD_RECORD ="record"; const char CMD_RECORD[] ="record";
const char * const CMD_RECORD2 ="r"; const char CMD_RECORD2[] ="r";
const char * const CMD_QUIT ="quit"; const char CMD_QUIT[] ="quit";
const char * const CMD_QUIT2 = "q"; const char CMD_QUIT2[] = "q";
} } // Contants
#endif // CONSTANTS_H #endif // CONSTANTS_H
tests/auto/externaltool/tst_externaltooltest.cpp
+4 -4
View File
@@ -37,7 +37,7 @@
using namespace Core::Internal; using namespace Core::Internal;
static const char * const TEST_XML1 = static const char TEST_XML1[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<externaltool id=\"lupdate\">" "<externaltool id=\"lupdate\">"
" <description>Synchronizes translator's ts files with the program code</description>" " <description>Synchronizes translator's ts files with the program code</description>"
@@ -56,7 +56,7 @@ static const char * const TEST_XML1 =
"</externaltool>" "</externaltool>"
; ;
static const char * const TEST_XML2 = static const char TEST_XML2[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<externaltool id=\"sort\">" "<externaltool id=\"sort\">"
" <description>Sorts the selected text</description>" " <description>Sorts the selected text</description>"
@@ -72,7 +72,7 @@ static const char * const TEST_XML2 =
" </executable>" " </executable>"
"</externaltool>"; "</externaltool>";
static const char * const TEST_XML3 = static const char TEST_XML3[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<externaltool id=\"vi\">" "<externaltool id=\"vi\">"
" <description>Opens the current file in vi</description>" " <description>Opens the current file in vi</description>"
@@ -88,7 +88,7 @@ static const char * const TEST_XML3 =
" </executable>" " </executable>"
"</externaltool>"; "</externaltool>";
static const char * const TEST_XML_LANG = static const char TEST_XML_LANG[] =
"<?xml version=\"1.0\" encoding=\"Latin-1\"?>" "<?xml version=\"1.0\" encoding=\"Latin-1\"?>"
"<externaltool id=\"temp\">" "<externaltool id=\"temp\">"
" <description>Hi</description>" " <description>Hi</description>"