From 90c7427b15cc8bf71224c73f5830d8772f8541aa Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 6 Jun 2017 16:20:28 +0200 Subject: [PATCH] ProjectExplorer: Make settingsaccessor more clear Do not hide two strings getting concatenated inside long string lists, use nullptr instead of 0. Change-Id: I9b873295a24c1f5b0a9ce2c43ace050e3ff2329c Reviewed-by: Tim Jenssen --- .../projectexplorer/settingsaccessor.cpp | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 6d97e506fa8..49b24103f5a 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -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)