SDKtool: Consistently use const char X[] for constants in .cpp files

Change-Id: Iee70ddb526a1751120be40bfd8d2ae01b27b80b8
Reviewed-by: hjk <hjk121@nokiamail.com>

8 files changed, 58 insertions, 58 deletions

diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp
index 9ad94bf578..d01b39a1f1 100644
--- a/src/tools/sdktool/adddebuggeroperation.cpp
+++ b/src/tools/sdktool/adddebuggeroperation.cpp
@@ -39,17 +39,17 @@
 
 #include <iostream>
 
-static char VERSION[] = "Version";
-static char COUNT[] = "DebuggerItem.Count";
-static char PREFIX[] = "DebuggerItem.";
+const char VERSION[] = "Version";
+const char COUNT[] = "DebuggerItem.Count";
+const char PREFIX[] = "DebuggerItem.";
 
 // Debuggers:
-static char ID[] = "Id";
-static char DISPLAYNAME[] = "DisplayName";
-static char AUTODETECTED[] = "AutoDetected";
-static char ABIS[] = "Abis";
-static char BINARY[] = "Binary";
-static char ENGINE_TYPE[] = "EngineType";
+const char ID[] = "Id";
+const char DISPLAYNAME[] = "DisplayName";
+const char AUTODETECTED[] = "AutoDetected";
+const char ABIS[] = "Abis";
+const char BINARY[] = "Binary";
+const char ENGINE_TYPE[] = "EngineType";
 
 AddDebuggerOperation::AddDebuggerOperation()
     : m_engine(0)
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index 24691c900c..b86e343631 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -40,28 +40,28 @@
 #include <iostream>
 
 // Qt version file stuff:
-static char PREFIX[] = "Profile.";
-static char VERSION[] = "Version";
-static char COUNT[] = "Profile.Count";
-static char DEFAULT[] = "Profile.Default";
+const char PREFIX[] = "Profile.";
+const char VERSION[] = "Version";
+const char COUNT[] = "Profile.Count";
+const char DEFAULT[] = "Profile.Default";
 
 // Kit:
-static char ID[] = "PE.Profile.Id";
-static char DISPLAYNAME[] = "PE.Profile.Name";
-static char ICON[] = "PE.Profile.Icon";
-static char AUTODETECTED[] = "PE.Profile.Autodetected";
-static char SDK[] = "PE.Profile.SDK";
-static char DATA[] = "PE.Profile.Data";
+const char ID[] = "PE.Profile.Id";
+const char DISPLAYNAME[] = "PE.Profile.Name";
+const char ICON[] = "PE.Profile.Icon";
+const char AUTODETECTED[] = "PE.Profile.Autodetected";
+const char SDK[] = "PE.Profile.SDK";
+const char DATA[] = "PE.Profile.Data";
 
 // Standard KitInformation:
-static char DEBUGGER[] = "Debugger.Information";
-static char DEBUGGER_ENGINE[] = "EngineType";
-static char DEBUGGER_BINARY[] = "Binary";
-static char DEVICE_TYPE[] = "PE.Profile.DeviceType";
-static char SYSROOT[] = "PE.Profile.SysRoot";
-static char TOOLCHAIN[] = "PE.Profile.ToolChain";
-static char MKSPEC[] = "QtPM4.mkSpecInformation";
-static char QT[] = "QtSupport.QtInformation";
+const char DEBUGGER[] = "Debugger.Information";
+const char DEBUGGER_ENGINE[] = "EngineType";
+const char DEBUGGER_BINARY[] = "Binary";
+const char DEVICE_TYPE[] = "PE.Profile.DeviceType";
+const char SYSROOT[] = "PE.Profile.SysRoot";
+const char TOOLCHAIN[] = "PE.Profile.ToolChain";
+const char MKSPEC[] = "QtPM4.mkSpecInformation";
+const char QT[] = "QtSupport.QtInformation";
 
 AddKitOperation::AddKitOperation()
     : m_debuggerEngine(0)
diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp
index 43dfd534f0..692c46e68c 100644
--- a/src/tools/sdktool/addqtoperation.cpp
+++ b/src/tools/sdktool/addqtoperation.cpp
@@ -42,16 +42,16 @@
 #include <iostream>
 
 // Qt version file stuff:
-static char PREFIX[] = "QtVersion.";
-static char VERSION[] = "Version";
+const char PREFIX[] = "QtVersion.";
+const char VERSION[] = "Version";
 
 // BaseQtVersion:
-static char ID[] = "Id";
-static char DISPLAYNAME[] = "Name";
-static char AUTODETECTED[] = "isAutodetected";
-static char AUTODETECTION_SOURCE[] = "autodetectionSource";
-static char QMAKE[] = "QMakePath";
-static char TYPE[] = "QtVersion.Type";
+const char ID[] = "Id";
+const char DISPLAYNAME[] = "Name";
+const char AUTODETECTED[] = "isAutodetected";
+const char AUTODETECTION_SOURCE[] = "autodetectionSource";
+const char QMAKE[] = "QMakePath";
+const char TYPE[] = "QtVersion.Type";
 
 QString AddQtOperation::name() const
 {
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index 6bd4c5cdc1..bfafd54b57 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -40,19 +40,19 @@
 #include <iostream>
 
 // ToolChain file stuff:
-static char COUNT[] = "ToolChain.Count";
-static char PREFIX[] = "ToolChain.";
-static char VERSION[] = "Version";
+const char COUNT[] = "ToolChain.Count";
+const char PREFIX[] = "ToolChain.";
+const char VERSION[] = "Version";
 
 // ToolChain:
-static char ID[] = "ProjectExplorer.ToolChain.Id";
-static char DISPLAYNAME[] = "ProjectExplorer.ToolChain.DisplayName";
-static char AUTODETECTED[] = "ProjectExplorer.ToolChain.Autodetect";
+const char ID[] = "ProjectExplorer.ToolChain.Id";
+const char DISPLAYNAME[] = "ProjectExplorer.ToolChain.DisplayName";
+const char AUTODETECTED[] = "ProjectExplorer.ToolChain.Autodetect";
 
 // GCC ToolChain:
-static char PATH[] = "ProjectExplorer.GccToolChain.Path";
-static char TARGET_ABI[] = "ProjectExplorer.GccToolChain.TargetAbi";
-static char SUPPORTED_ABIS[] = "ProjectExplorer.GccToolChain.SupportedAbis";
+const char PATH[] = "ProjectExplorer.GccToolChain.Path";
+const char TARGET_ABI[] = "ProjectExplorer.GccToolChain.TargetAbi";
+const char SUPPORTED_ABIS[] = "ProjectExplorer.GccToolChain.SupportedAbis";
 
 QString AddToolChainOperation::name() const
 {
diff --git a/src/tools/sdktool/rmdebuggeroperation.cpp b/src/tools/sdktool/rmdebuggeroperation.cpp
index b65231de56..c87943ddf8 100644
--- a/src/tools/sdktool/rmdebuggeroperation.cpp
+++ b/src/tools/sdktool/rmdebuggeroperation.cpp
@@ -41,14 +41,14 @@
 #include <iostream>
 
 // Qt version file stuff:
-static char PREFIX[] = "DebuggerItem.";
-static char COUNT[] = "DebuggerItem.Count";
+const char PREFIX[] = "DebuggerItem.";
+const char COUNT[] = "DebuggerItem.Count";
 #ifdef WITH_TESTS
-static char VERSION[] = "Version";
+const char VERSION[] = "Version";
 #endif
 
 // Kit:
-static char ID[] = "Id";
+const char ID[] = "Id";
 
 QString RmDebuggerOperation::name() const
 {
diff --git a/src/tools/sdktool/rmkitoperation.cpp b/src/tools/sdktool/rmkitoperation.cpp
index ff94132f76..92bdf5cee6 100644
--- a/src/tools/sdktool/rmkitoperation.cpp
+++ b/src/tools/sdktool/rmkitoperation.cpp
@@ -41,15 +41,15 @@
 #include <iostream>
 
 // Qt version file stuff:
-static char PREFIX[] = "Profile.";
-static char COUNT[] = "Profile.Count";
-static char DEFAULT[] = "Profile.Default";
+const char PREFIX[] = "Profile.";
+const char COUNT[] = "Profile.Count";
+const char DEFAULT[] = "Profile.Default";
 #ifdef WITH_TESTS
-static char VERSION[] = "Version";
+const char VERSION[] = "Version";
 #endif
 
 // Kit:
-static char ID[] = "PE.Profile.Id";
+const char ID[] = "PE.Profile.Id";
 
 QString RmKitOperation::name() const
 {
diff --git a/src/tools/sdktool/rmqtoperation.cpp b/src/tools/sdktool/rmqtoperation.cpp
index d129300341..f3ffcb324b 100644
--- a/src/tools/sdktool/rmqtoperation.cpp
+++ b/src/tools/sdktool/rmqtoperation.cpp
@@ -39,10 +39,10 @@
 #include <iostream>
 
 // ToolChain file stuff:
-static char PREFIX[] = "QtVersion.";
+const char PREFIX[] = "QtVersion.";
 
 // ToolChain:
-static char AUTODETECTION_SOURCE[] = "autodetectionSource";
+const char AUTODETECTION_SOURCE[] = "autodetectionSource";
 
 QString RmQtOperation::name() const
 {
diff --git a/src/tools/sdktool/rmtoolchainoperation.cpp b/src/tools/sdktool/rmtoolchainoperation.cpp
index 72481990ca..2f7d532480 100644
--- a/src/tools/sdktool/rmtoolchainoperation.cpp
+++ b/src/tools/sdktool/rmtoolchainoperation.cpp
@@ -39,11 +39,11 @@
 #include <iostream>
 
 // ToolChain file stuff:
-static char COUNT[] = "ToolChain.Count";
-static char PREFIX[] = "ToolChain.";
+const char COUNT[] = "ToolChain.Count";
+const char PREFIX[] = "ToolChain.";
 
 // ToolChain:
-static char ID[] = "ProjectExplorer.ToolChain.Id";
+const char ID[] = "ProjectExplorer.ToolChain.Id";
 
 QString RmToolChainOperation::name() const
 {