diff options
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpprefactoringchanges.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpprefactoringchanges.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 720110d845..e208ce88ef 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -214,7 +214,7 @@ QString CppFileSettings::licenseTemplate(const QString &fileName, const QString return QString(); } - QTextCodec *codec = Core::EditorManager::instance()->defaultTextEncoding(); + QTextCodec *codec = Core::EditorManager::instance()->defaultTextCodec(); QTextStream licenseStream(&file); licenseStream.setCodec(codec); licenseStream.setAutoDetectUnicode(true); diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index 638a3f3cbb..e7e8b2c229 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -39,6 +39,7 @@ #include <cpptools/cppmodelmanager.h> #include <texteditor/texteditorsettings.h> #include <texteditor/tabsettings.h> +#include <projectexplorer/editorconfiguration.h> #include <QtGui/QTextBlock> @@ -64,7 +65,9 @@ CppRefactoringFile CppRefactoringChanges::file(const QString &fileName) return CppRefactoringFile(fileName, this); } -void CppRefactoringChanges::indentSelection(const QTextCursor &selection) const +void CppRefactoringChanges::indentSelection(const QTextCursor &selection, + const QString &fileName, + const TextEditor::BaseTextEditor *textEditor) const { // ### shares code with CPPEditor::indent() QTextDocument *doc = selection.document(); @@ -72,7 +75,8 @@ void CppRefactoringChanges::indentSelection(const QTextCursor &selection) const QTextBlock block = doc->findBlock(selection.selectionStart()); const QTextBlock end = doc->findBlock(selection.selectionEnd()).next(); - const TextEditor::TabSettings &tabSettings(TextEditor::TextEditorSettings::instance()->tabSettings()); + const TextEditor::TabSettings &tabSettings = + ProjectExplorer::actualTabSettings(fileName, textEditor); CppTools::QtStyleCodeFormatter codeFormatter(tabSettings); codeFormatter.updateStateUntil(block); diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h index ee2ef4ae97..d59cd9ef5c 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.h +++ b/src/plugins/cpptools/cpprefactoringchanges.h @@ -92,7 +92,9 @@ public: CppRefactoringFile file(const QString &fileName); private: - virtual void indentSelection(const QTextCursor &selection) const; + virtual void indentSelection(const QTextCursor &selection, + const QString &fileName, + const TextEditor::BaseTextEditor *textEditor) const; virtual void fileChanged(const QString &fileName); private: |