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

ProjectExplorer: Make settingsaccessor more clear

Browse Source 
Do not hide two strings getting concatenated inside long string lists,
use nullptr instead of 0.

Change-Id: I9b873295a24c1f5b0a9ce2c43ace050e3ff2329c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-06-06 16:20:28 +02:00
parent 623a9fc694
commit 90c7427b15
1 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -1623,43 +1623,41 @@ QVariantMap UserFileVersion7Upgrader::upgrade(const QVariantMap &map)
static const char * const argListKeys[] = {
"ProjectExplorer.Project.Target.",
"ProjectExplorer.Target.BuildConfiguration."
"|ProjectExplorer.Target.DeployConfiguration.",
"ProjectExplorer.BuildConfiguration.BuildStepList.",
"ProjectExplorer.BuildStepList.Step.",
"GenericProjectManager.GenericMakeStep.MakeArguments",
"QtProjectManager.QMakeBuildStep.QMakeArguments",
"Qt4ProjectManager.MakeStep.MakeArguments",
"CMakeProjectManager.MakeStep.AdditionalArguments",
0,
0,
0,
"ProjectExplorer.Target.RunConfiguration.",
"ProjectExplorer.CustomExecutableRunConfiguration.Arguments",
"Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments",
"CMakeProjectManager.CMakeRunConfiguration.Arguments",
0,
0,
0
"ProjectExplorer.Target.BuildConfiguration.|ProjectExplorer.Target.DeployConfiguration.",
"ProjectExplorer.BuildConfiguration.BuildStepList.",
"ProjectExplorer.BuildStepList.Step.",
"GenericProjectManager.GenericMakeStep.MakeArguments",
"QtProjectManager.QMakeBuildStep.QMakeArguments",
"Qt4ProjectManager.MakeStep.MakeArguments",
"CMakeProjectManager.MakeStep.AdditionalArguments",
nullptr,
nullptr,
nullptr,
"ProjectExplorer.Target.RunConfiguration.",
"ProjectExplorer.CustomExecutableRunConfiguration.Arguments",
"Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments",
"CMakeProjectManager.CMakeRunConfiguration.Arguments",
nullptr,
nullptr,
nullptr
};
static const char * const lameArgListKeys[] = {
"ProjectExplorer.Project.Target.",
"ProjectExplorer.Target.BuildConfiguration."
"|ProjectExplorer.Target.DeployConfiguration.",
"ProjectExplorer.BuildConfiguration.BuildStepList.",
"ProjectExplorer.BuildStepList.Step.",
"ProjectExplorer.ProcessStep.Arguments",
0,
0,
0,
"ProjectExplorer.Target.RunConfiguration.",
"Qt4ProjectManager.MaemoRunConfiguration.Arguments",
"Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments",
"QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments",
0,
0,
0
"ProjectExplorer.Target.BuildConfiguration.|ProjectExplorer.Target.DeployConfiguration.",
"ProjectExplorer.BuildConfiguration.BuildStepList.",
"ProjectExplorer.BuildStepList.Step.",
"ProjectExplorer.ProcessStep.Arguments",
nullptr,
nullptr,
nullptr,
"ProjectExplorer.Target.RunConfiguration.",
"Qt4ProjectManager.MaemoRunConfiguration.Arguments",
"Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments",
"QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments",
nullptr,
nullptr,
nullptr
};
inline static bool isSpecialChar(ushort c)