feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangFormat: Fix GCC8 warnings

Browse Source 
* Missing return (false positive. All enum values are covered).
* Unused static function.

Amends commits 7f0589ef59 and
40fcc728b2.

Change-Id: I0e5c4ae09739a7ca9edbbbbe3f081d8a732245e7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Orgad Shaneh
2019-03-12 23:06:57 +02:00
committed by Orgad Shaneh
parent 335d277731
commit d0867955af
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/clangformat/clangformatutils.cpp
View File

@@ -143,27 +143,6 @@ static clang::format::FormatStyle qtcStyle()
return style;
}
static void applyTabSettings(clang::format::FormatStyle &style, const TabSettings &settings)
{
style.IndentWidth = static_cast<unsigned>(settings.m_indentSize);
style.TabWidth = static_cast<unsigned>(settings.m_tabSize);
if (settings.m_tabPolicy == TabSettings::TabsOnlyTabPolicy)
style.UseTab = FormatStyle::UT_Always;
else if (settings.m_tabPolicy == TabSettings::SpacesOnlyTabPolicy)
style.UseTab = FormatStyle::UT_Never;
else
style.UseTab = FormatStyle::UT_ForContinuationAndIndentation;
if (settings.m_continuationAlignBehavior == TabSettings::NoContinuationAlign) {
style.ContinuationIndentWidth = 0;
style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
} else {
style.ContinuationIndentWidth = style.IndentWidth;
style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
}
}
static bool useGlobalOverriddenSettings()
{
return ClangFormatSettings::instance().overrideDefaultFile();