diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-12-10 13:21:46 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-12-12 06:39:50 +0000 |
| commit | 5cd4a73acab1ee3782747d5de55c0ae734bfba2f (patch) | |
| tree | 04571f3eb4675db33f293b54d0f169ce45f1dac9 /src | |
| parent | 4a693e91db2c16260577b9186ca458814f425012 (diff) | |
CppTools: Return proper tab settings
We are always interested in currentTabSettings().
Fixes: QTCREATORBUG-21280
Change-Id: I5b739b516eb985074c27410113c244787dd8b52d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |