From 36f4ed54df7af4b5a2dd03fa61a25392c8f745fa Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Mon, 12 Nov 2018 09:58:35 +0100
Subject: [PATCH] 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>
---
 src/plugins/cpptools/cppcodestylesettings.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp
index 379c32d0b3c..f6347491646 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();
 }