diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-22 10:29:58 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-11-22 09:36:09 +0100 |
| commit | f0ef96ef0c37b5903bda18e2af80c82f14f30181 (patch) | |
| tree | 755da2a91de4b40cd822a3198d6717e3ebb53010 /src/plugins/cpptools | |
| parent | 75a3728254bc4016451038d519e7d078304e585a (diff) | |
| download | qt-creator-f0ef96ef0c37b5903bda18e2af80c82f14f30181.tar.gz | |
Replace some const char * with const char[]
Change-Id: I7657792d9ebfcaede7b719400d239f837074290b
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylepreferences.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettings.cpp | 34 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpptoolssettings.cpp | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/cpptools/cppcodestylepreferences.cpp b/src/plugins/cpptools/cppcodestylepreferences.cpp index 7ebe2e109c..b80bae5744 100644 --- a/src/plugins/cpptools/cppcodestylepreferences.cpp +++ b/src/plugins/cpptools/cppcodestylepreferences.cpp @@ -31,7 +31,7 @@ using namespace CppTools; -static const char *settingsSuffixKey = "CodeStyleSettings"; +static const char settingsSuffixKey[] = "CodeStyleSettings"; CppCodeStylePreferences::CppCodeStylePreferences(QObject *parent) : ICodeStylePreferences(parent) diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp index c2e7703d21..6295a9f22d 100644 --- a/src/plugins/cpptools/cppcodestylesettings.cpp +++ b/src/plugins/cpptools/cppcodestylesettings.cpp @@ -31,23 +31,23 @@ #include <utils/settingsutils.h> -static const char *groupPostfix = "IndentSettings"; -static const char *indentBlockBracesKey = "IndentBlockBraces"; -static const char *indentBlockBodyKey = "IndentBlockBody"; -static const char *indentClassBracesKey = "IndentClassBraces"; -static const char *indentEnumBracesKey = "IndentEnumBraces"; -static const char *indentNamespaceBracesKey = "IndentNamespaceBraces"; -static const char *indentNamespaceBodyKey = "IndentNamespaceBody"; -static const char *indentAccessSpecifiersKey = "IndentAccessSpecifiers"; -static const char *indentDeclarationsRelativeToAccessSpecifiersKey = "IndentDeclarationsRelativeToAccessSpecifiers"; -static const char *indentFunctionBodyKey = "IndentFunctionBody"; -static const char *indentFunctionBracesKey = "IndentFunctionBraces"; -static const char *indentSwitchLabelsKey = "IndentSwitchLabels"; -static const char *indentStatementsRelativeToSwitchLabelsKey = "IndentStatementsRelativeToSwitchLabels"; -static const char *indentBlocksRelativeToSwitchLabelsKey = "IndentBlocksRelativeToSwitchLabels"; -static const char *indentControlFlowRelativeToSwitchLabelsKey = "IndentControlFlowRelativeToSwitchLabels"; -static const char *extraPaddingForConditionsIfConfusingAlignKey = "ExtraPaddingForConditionsIfConfusingAlign"; -static const char *alignAssignmentsKey = "AlignAssignments"; +static const char groupPostfix[] = "IndentSettings"; +static const char indentBlockBracesKey[] = "IndentBlockBraces"; +static const char indentBlockBodyKey[] = "IndentBlockBody"; +static const char indentClassBracesKey[] = "IndentClassBraces"; +static const char indentEnumBracesKey[] = "IndentEnumBraces"; +static const char indentNamespaceBracesKey[] = "IndentNamespaceBraces"; +static const char indentNamespaceBodyKey[] = "IndentNamespaceBody"; +static const char indentAccessSpecifiersKey[] = "IndentAccessSpecifiers"; +static const char indentDeclarationsRelativeToAccessSpecifiersKey[] = "IndentDeclarationsRelativeToAccessSpecifiers"; +static const char indentFunctionBodyKey[] = "IndentFunctionBody"; +static const char indentFunctionBracesKey[] = "IndentFunctionBraces"; +static const char indentSwitchLabelsKey[] = "IndentSwitchLabels"; +static const char indentStatementsRelativeToSwitchLabelsKey[] = "IndentStatementsRelativeToSwitchLabels"; +static const char indentBlocksRelativeToSwitchLabelsKey[] = "IndentBlocksRelativeToSwitchLabels"; +static const char indentControlFlowRelativeToSwitchLabelsKey[] = "IndentControlFlowRelativeToSwitchLabels"; +static const char extraPaddingForConditionsIfConfusingAlignKey[] = "ExtraPaddingForConditionsIfConfusingAlign"; +static const char alignAssignmentsKey[] = "AlignAssignments"; using namespace CppTools; diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp index dbf94e760a..3494c16b8b 100644 --- a/src/plugins/cpptools/cpptoolssettings.cpp +++ b/src/plugins/cpptools/cpptoolssettings.cpp @@ -45,7 +45,7 @@ #include <coreplugin/icore.h> #include <QSettings> -static const char *idKey = "CppGlobal"; +static const char idKey[] = "CppGlobal"; using namespace CppTools; using namespace CppTools::Internal; |