From 5cd4a73acab1ee3782747d5de55c0ae734bfba2f Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Mon, 10 Dec 2018 13:21:46 +0100 Subject: CppTools: Return proper tab settings We are always interested in currentTabSettings(). Fixes: QTCREATORBUG-21280 Change-Id: I5b739b516eb985074c27410113c244787dd8b52d Reviewed-by: Marco Bubke --- src/plugins/cpptools/cppcodestylesettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cppcodestylesettings.cpp') diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp index f634749164..565c969689 100644 --- a/src/plugins/cpptools/cppcodestylesettings.cpp +++ b/src/plugins/cpptools/cppcodestylesettings.cpp @@ -242,7 +242,7 @@ TextEditor::TabSettings CppCodeStyleSettings::currentProjectTabSettings() TextEditor::ICodeStylePreferences *codeStylePreferences = editorConfiguration->codeStyle(CppTools::Constants::CPP_SETTINGS_ID); QTC_ASSERT(codeStylePreferences, return currentGlobalTabSettings()); - return codeStylePreferences->tabSettings(); + return codeStylePreferences->currentTabSettings(); } TextEditor::TabSettings CppCodeStyleSettings::currentGlobalTabSettings() @@ -251,7 +251,7 @@ TextEditor::TabSettings CppCodeStyleSettings::currentGlobalTabSettings() = CppTools::CppToolsSettings::instance()->cppCodeStyle(); QTC_ASSERT(cppCodeStylePreferences, return TextEditor::TabSettings()); - return cppCodeStylePreferences->tabSettings(); + return cppCodeStylePreferences->currentTabSettings(); } -- cgit v1.2.1