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

CppEditor: Ensure utf8 encoded working copy from the preprocessor dialog

Browse Source 
Change-Id: Ifbc2adeff83cbef9841da872e15a5b9dd8379a3d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-11-12 10:08:59 +01:00
parent 25c21b3517
commit 18f38709d5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -709,7 +709,7 @@ void CPPEditorWidget::setMimeType(const QString &mt)
const QString &projectFile = ProjectExplorer::SessionManager::value( const QString &projectFile = ProjectExplorer::SessionManager::value(
QLatin1String(Constants::CPP_PREPROCESSOR_PROJECT_PREFIX) + filePath).toString(); QLatin1String(Constants::CPP_PREPROCESSOR_PROJECT_PREFIX) + filePath).toString();
const QByteArray &additionalDirectives = ProjectExplorer::SessionManager::value( const QByteArray &additionalDirectives = ProjectExplorer::SessionManager::value(
projectFile + QLatin1Char(',') + filePath).toByteArray(); projectFile + QLatin1Char(',') + filePath).toString().toUtf8();
QSharedPointer<SnapshotUpdater> updater QSharedPointer<SnapshotUpdater> updater
= m_modelManager->cppEditorSupport(editor())->snapshotUpdater(); = m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
@@ -1988,7 +1988,7 @@ void CPPEditorWidget::showPreProcessorWidget()
if (preProcessorDialog.exec() == QDialog::Accepted) { if (preProcessorDialog.exec() == QDialog::Accepted) {
QSharedPointer<SnapshotUpdater> updater QSharedPointer<SnapshotUpdater> updater
= m_modelManager->cppEditorSupport(editor())->snapshotUpdater(); = m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
updater->setEditorDefines(preProcessorDialog.additionalPreProcessorDirectives().toLatin1()); updater->setEditorDefines(preProcessorDialog.additionalPreProcessorDirectives().toUtf8());
updater->update(m_modelManager->workingCopy()); updater->update(m_modelManager->workingCopy());
} }
} }

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

@@ -1000,7 +1000,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor()
while (sup->lastSemanticInfoDocument().isNull()) while (sup->lastSemanticInfoDocument().isNull())
QCoreApplication::processEvents(); QCoreApplication::processEvents();
sup->snapshotUpdater()->setEditorDefines(editorDefines.toLatin1()); sup->snapshotUpdater()->setEditorDefines(editorDefines.toUtf8());
sup->snapshotUpdater()->update(mm->workingCopy()); sup->snapshotUpdater()->update(mm->workingCopy());
Document::Ptr doc = mm->snapshot().document(main1File); Document::Ptr doc = mm->snapshot().document(main1File);