From 8dc566e902bc854108d2021652bdaec57ff919ed Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Thu, 8 Nov 2018 16:21:54 +0100 Subject: CppTools: Allow to check whether project code style exists The calling code can anyways fallback to the global style without extra help if no project style exists. It is useful when you want to get the project style if it exists and understand at the same time that it is not a global one. Change-Id: I265de3f436f90623385427fc8a1abad09c8c3577 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cppcodestylesettings.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cppcodestylesettings.h') diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h index 4af18fbdbc..4e39e05afc 100644 --- a/src/plugins/cpptools/cppcodestylesettings.h +++ b/src/plugins/cpptools/cppcodestylesettings.h @@ -27,6 +27,8 @@ #include "cpptools_global.h" +#include + #include QT_BEGIN_NAMESPACE @@ -93,7 +95,7 @@ public: bool operator==(const CppCodeStyleSettings &s) const { return equals(s); } bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); } - static CppCodeStyleSettings currentProjectCodeStyle(); + static Utils::optional currentProjectCodeStyle(); static CppCodeStyleSettings currentGlobalCodeStyle(); static TextEditor::TabSettings currentProjectTabSettings(); static TextEditor::TabSettings currentGlobalTabSettings(); -- cgit v1.2.1