diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-21 22:36:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-22 09:40:14 +0100 |
| commit | be443b8edb9822d09cee9a0d5997d1f952836a87 (patch) | |
| tree | 358eb747975dc8b2837f4096a3ca6a7840b86a9e /src/plugins/cpptools/cppcodestylesettingspage.cpp | |
| parent | f0ef96ef0c37b5903bda18e2af80c82f14f30181 (diff) | |
| download | qt-creator-be443b8edb9822d09cee9a0d5997d1f952836a87.tar.gz | |
CppTools: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I31a6117c2b4be3f8603c16a9f98b6937a0b9aeb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodestylesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettingspage.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 8029f64839..a3262d8015 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -216,9 +216,8 @@ CppCodeStylePreferencesWidget::CppCodeStylePreferencesWidget(QWidget *parent) m_previews << m_ui->previewTextEditGeneral << m_ui->previewTextEditContent << m_ui->previewTextEditBraces << m_ui->previewTextEditSwitch << m_ui->previewTextEditPadding; - for (int i = 0; i < m_previews.size(); ++i) { - m_previews[i]->setPlainText(defaultCodeStyleSnippets[i]); - } + for (int i = 0; i < m_previews.size(); ++i) + m_previews[i]->setPlainText(QLatin1String(defaultCodeStyleSnippets[i])); TextEditor::TextEditorSettings *textEditorSettings = TextEditorSettings::instance(); decorateEditors(textEditorSettings->fontSettings()); @@ -513,17 +512,17 @@ void CppCodeStyleSettingsPage::apply() if (originalCppCodeStylePreferences->codeStyleSettings() != m_pageCppCodeStylePreferences->codeStyleSettings()) { originalCppCodeStylePreferences->setCodeStyleSettings(m_pageCppCodeStylePreferences->codeStyleSettings()); if (s) - originalCppCodeStylePreferences->toSettings(CppTools::Constants::CPP_SETTINGS_ID, s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } if (originalCppCodeStylePreferences->tabSettings() != m_pageCppCodeStylePreferences->tabSettings()) { originalCppCodeStylePreferences->setTabSettings(m_pageCppCodeStylePreferences->tabSettings()); if (s) - originalCppCodeStylePreferences->toSettings(CppTools::Constants::CPP_SETTINGS_ID, s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } if (originalCppCodeStylePreferences->currentDelegate() != m_pageCppCodeStylePreferences->currentDelegate()) { originalCppCodeStylePreferences->setCurrentDelegate(m_pageCppCodeStylePreferences->currentDelegate()); if (s) - originalCppCodeStylePreferences->toSettings(CppTools::Constants::CPP_SETTINGS_ID, s); + originalCppCodeStylePreferences->toSettings(QLatin1String(CppTools::Constants::CPP_SETTINGS_ID), s); } } } |