forked from qt-creator/qt-creator
more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -48,10 +48,9 @@ using namespace CMakeProjectManager;
|
||||
using namespace Internal;
|
||||
|
||||
namespace {
|
||||
const char * const CMAKE_BC_ID("CMakeProjectManager.CMakeBuildConfiguration");
|
||||
|
||||
const char * const TOOLCHAIN_KEY("CMakeProjectManager.CMakeBuildConfiguration.ToolChain");
|
||||
const char * const BUILD_DIRECTORY_KEY("CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory");
|
||||
const char CMAKE_BC_ID[] = "CMakeProjectManager.CMakeBuildConfiguration";
|
||||
const char TOOLCHAIN_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.ToolChain";
|
||||
const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory";
|
||||
} // namespace
|
||||
|
||||
CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeTarget *parent) :
|
||||
|
||||
@@ -36,16 +36,16 @@
|
||||
namespace CMakeProjectManager {
|
||||
namespace Constants {
|
||||
|
||||
const char * const PROJECTCONTEXT = "CMakeProject.ProjectContext";
|
||||
const char * const CMAKEMIMETYPE = "text/x-cmake"; // TOOD check that this is correct
|
||||
const char * const CMAKE_EDITOR_ID = "CMakeProject.CMakeEditor";
|
||||
const char * const CMAKE_EDITOR_DISPLAY_NAME = "CMake Editor";
|
||||
const char * const C_CMAKEEDITOR = "CMakeProject.Context.CMakeEditor";
|
||||
const char * const RUNCMAKE = "CMakeProject.RunCMake";
|
||||
const char * const RUNCMAKECONTEXTMENU = "CMakeProject.RunCMakeContextMenu";
|
||||
const char PROJECTCONTEXT[] = "CMakeProject.ProjectContext";
|
||||
const char CMAKEMIMETYPE[] = "text/x-cmake"; // TODO check that this is correct
|
||||
const char CMAKE_EDITOR_ID[] = "CMakeProject.CMakeEditor";
|
||||
const char CMAKE_EDITOR_DISPLAY_NAME[] = "CMake Editor";
|
||||
const char C_CMAKEEDITOR[] = "CMakeProject.Context.CMakeEditor";
|
||||
const char RUNCMAKE[] = "CMakeProject.RunCMake";
|
||||
const char RUNCMAKECONTEXTMENU[] = "CMakeProject.RunCMakeContextMenu";
|
||||
|
||||
// Project
|
||||
const char * const CMAKEPROJECT_ID = "CMakeProjectManager.CMakeProject";
|
||||
const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject";
|
||||
|
||||
} // namespace Constants
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
@@ -61,15 +61,15 @@ using namespace CMakeProjectManager;
|
||||
using namespace CMakeProjectManager::Internal;
|
||||
|
||||
namespace {
|
||||
const char * const CMAKE_RC_ID("CMakeProjectManager.CMakeRunConfiguration");
|
||||
const char * const CMAKE_RC_PREFIX("CMakeProjectManager.CMakeRunConfiguration.");
|
||||
const char CMAKE_RC_ID[] = "CMakeProjectManager.CMakeRunConfiguration";
|
||||
const char CMAKE_RC_PREFIX[] = "CMakeProjectManager.CMakeRunConfiguration.";
|
||||
|
||||
const char * const USER_WORKING_DIRECTORY_KEY("CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory");
|
||||
const char * const USE_TERMINAL_KEY("CMakeProjectManager.CMakeRunConfiguration.UseTerminal");
|
||||
const char * const TITLE_KEY("CMakeProjectManager.CMakeRunConfiguation.Title");
|
||||
const char * const ARGUMENTS_KEY("CMakeProjectManager.CMakeRunConfiguration.Arguments");
|
||||
const char * const USER_ENVIRONMENT_CHANGES_KEY("CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges");
|
||||
const char * const BASE_ENVIRONMENT_BASE_KEY("CMakeProjectManager.BaseEnvironmentBase");
|
||||
const char USER_WORKING_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory";
|
||||
const char USE_TERMINAL_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UseTerminal";
|
||||
const char TITLE_KEY[] = "CMakeProjectManager.CMakeRunConfiguation.Title";
|
||||
const char ARGUMENTS_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.Arguments";
|
||||
const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges";
|
||||
const char BASE_ENVIRONMENT_BASE_KEY[] = "CMakeProjectManager.BaseEnvironmentBase";
|
||||
|
||||
QString buildTargetFromId(const QString &id)
|
||||
{
|
||||
|
||||
@@ -38,10 +38,9 @@
|
||||
#include <projectexplorer/target.h>
|
||||
|
||||
namespace CMakeProjectManager {
|
||||
|
||||
namespace Internal {
|
||||
|
||||
const char * const DEFAULT_CMAKE_TARGET_ID("CMakeProjectManager.DefaultCMakeTarget");
|
||||
const char DEFAULT_CMAKE_TARGET_ID[] = "CMakeProjectManager.DefaultCMakeTarget";
|
||||
|
||||
class CMakeBuildConfiguration;
|
||||
class CMakeBuildConfigurationFactory;
|
||||
@@ -96,7 +95,6 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
#endif // CMAKETARGET_H
|
||||
|
||||
Reference in New Issue
Block a user