summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2018-11-12 09:58:35 +0100
committerIvan Donchevskii <ivan.donchevskii@qt.io>2018-11-13 08:29:36 +0000
commit36f4ed54df7af4b5a2dd03fa61a25392c8f745fa (patch)
treea408dcb7070194c719c044b46af1903c686d4448
parentcf816448ce48f88ecc76b8fe19cc9408b6f86723 (diff)
downloadqt-creator-36f4ed54df7af4b5a2dd03fa61a25392c8f745fa.tar.gz
CppTools: Simplify the currentProjectCodeStyle code
Use alias to shorten the repeating default return value. Change-Id: I673fc1d293c1612c945c80d554c6667a756108de Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
-rw-r--r--src/plugins/cpptools/cppcodestylesettings.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp
index 379c32d0b3..f634749164 100644
--- a/src/plugins/cpptools/cppcodestylesettings.cpp
+++ b/src/plugins/cpptools/cppcodestylesettings.cpp
@@ -203,20 +203,21 @@ bool CppCodeStyleSettings::equals(const CppCodeStyleSettings &rhs) const
Utils::optional<CppCodeStyleSettings> CppCodeStyleSettings::currentProjectCodeStyle()
{
ProjectExplorer::Project *project = ProjectExplorer::ProjectTree::currentProject();
+ using OptSettings = Utils::optional<CppCodeStyleSettings>;
if (!project)
- return Utils::optional<CppCodeStyleSettings>();
+ return OptSettings();
ProjectExplorer::EditorConfiguration *editorConfiguration = project->editorConfiguration();
- QTC_ASSERT(editorConfiguration, return Utils::optional<CppCodeStyleSettings>());
+ QTC_ASSERT(editorConfiguration, return OptSettings());
TextEditor::ICodeStylePreferences *codeStylePreferences
= editorConfiguration->codeStyle(Constants::CPP_SETTINGS_ID);
- QTC_ASSERT(codeStylePreferences, return Utils::optional<CppCodeStyleSettings>());
+ QTC_ASSERT(codeStylePreferences, return OptSettings());
CppCodeStylePreferences *cppCodeStylePreferences
= dynamic_cast<CppCodeStylePreferences *>(codeStylePreferences);
if (!cppCodeStylePreferences)
- return Utils::optional<CppCodeStyleSettings>();
+ return OptSettings();
return cppCodeStylePreferences->currentCodeStyleSettings();
}