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

Replace some const char * with const char[]

Browse Source 
Change-Id: I7657792d9ebfcaede7b719400d239f837074290b
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-22 10:29:58 +02:00
committed by Orgad Shaneh
parent 75a3728254
commit f0ef96ef0c
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppcodestylepreferences.cpp
View File

@@ -31,7 +31,7 @@
using namespace CppTools;
static const char *settingsSuffixKey = "CodeStyleSettings";
static const char settingsSuffixKey[] = "CodeStyleSettings";
CppCodeStylePreferences::CppCodeStylePreferences(QObject *parent) :
ICodeStylePreferences(parent)

34
src/plugins/cpptools/cppcodestylesettings.cpp
View File

@@ -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;

2
src/plugins/cpptools/cpptoolssettings.cpp
View File

@@ -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;

6
src/plugins/texteditor/codestylepool.cpp
View File

@@ -40,9 +40,9 @@
using namespace TextEditor;
static const char *codeStyleDataKey = "CodeStyleData";
static const char *displayNameKey = "DisplayName";
static const char *codeStyleDocKey = "QtCreatorCodeStyle";
static const char codeStyleDataKey[] = "CodeStyleData";
static const char displayNameKey[] = "DisplayName";
static const char codeStyleDocKey[] = "QtCreatorCodeStyle";
namespace TextEditor {
namespace Internal {

6
src/plugins/texteditor/fontsettings.cpp
View File

@@ -53,13 +53,13 @@ static const bool DEFAULT_ANTIALIAS = true;
#ifdef Q_OS_MAC
enum { DEFAULT_FONT_SIZE = 12 };
static const char *DEFAULT_FONT_FAMILY = "Monaco";
static const char DEFAULT_FONT_FAMILY[] = "Monaco";
#elif defined(Q_OS_UNIX)
enum { DEFAULT_FONT_SIZE = 9 };
static const char *DEFAULT_FONT_FAMILY = "Monospace";
static const char DEFAULT_FONT_FAMILY[] = "Monospace";
#else
enum { DEFAULT_FONT_SIZE = 10 };
static const char *DEFAULT_FONT_FAMILY = "Courier";
static const char DEFAULT_FONT_FAMILY[] = "Courier";
#endif
} // anonymous namespace

2
src/plugins/texteditor/icodestylepreferences.cpp
View File

@@ -39,7 +39,7 @@
using namespace TextEditor;
static const char *currentPreferencesKey = "CurrentPreferences";
static const char currentPreferencesKey[] = "CurrentPreferences";
namespace TextEditor {
namespace Internal {

10
src/plugins/texteditor/storagesettings.cpp
View File

@@ -36,11 +36,11 @@
namespace TextEditor {
static const char * const cleanWhitespaceKey = "cleanWhitespace";
static const char * const inEntireDocumentKey = "inEntireDocument";
static const char * const addFinalNewLineKey = "addFinalNewLine";
static const char * const cleanIndentationKey = "cleanIndentation";
static const char * const groupPostfix = "StorageSettings";
static const char cleanWhitespaceKey[] = "cleanWhitespace";
static const char inEntireDocumentKey[] = "inEntireDocument";
static const char addFinalNewLineKey[] = "addFinalNewLine";
static const char cleanIndentationKey[] = "cleanIndentation";
static const char groupPostfix[] = "StorageSettings";
StorageSettings::StorageSettings()
: m_cleanWhitespace(true),