aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-04-04 15:44:24 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-04-07 10:41:04 +0000
commit1fbbcf2126250c23afe7e4c7c19d64184fcd7249 (patch)
tree63f237c7ce63da938ec72fbbbafbc9591777b92b
parent961b298e309bdf5d6ad969edc369299f15450538 (diff)
clang-tidy: Fix 'bugprone-suspicious-enum-usage' warnings
Also, treat those as errors Change-Id: I239b0a0597f56b87bcfdc139545b98c119232fdf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--.clang-tidy2
-rw-r--r--src/app/config-ui/mainwindow.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/.clang-tidy b/.clang-tidy
index 81181c545..9ff9487d5 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,6 @@
---
Checks: '-*,bugprone-*,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-pro-type-cstyle-cast,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-slicing,fuchsia-virtual-inheritance,google-build-explicit-make-pair,google-build-namespaces,google-global-names-in-headers,google-objc-*,google-readability-casting,google-readability-namespace-comments,google-runtime-operator,misc-definitions-in-headers,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-redundant-expression,misc-static-assert,misc-unconventional-assign-operator,misc-uniqueptr-reset-release,misc-unused-*,modernize-avoid-bind,modernize-deprecated-headers,modernize-loop-convert,modernize-make-*,modernize-pass-by-value,modernize-redundant-void-arg,modernize-replace-*,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-emplace,modernize-use-equals-*,modernize-use-noexcept,modernize-use-override,modernize-use-transparent-functors,modernize-use-using,performance-*,readability-avoid-const-params-in-decls,readability-container-size-empty,readability-delete-null-pointer,readability-deleted-default,readability-identifier-naming,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-*,readability-simplify-boolean-expr,readability-static-definition-in-anonymous-namespace,readability-uniqueptr-delete-release'
-WarningsAsErrors: 'bugprone-*,-bugprone-suspicious-enum-usage,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,google-*,-google-readability-casting,misc-unused-*,modernize-make-*,modernize-pass-by-value,modernize-use-emplace,modernize-use-equals-default,modernize-use-override,performance-*'
+WarningsAsErrors: 'bugprone-*,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,google-*,-google-readability-casting,misc-unused-*,modernize-make-*,modernize-pass-by-value,modernize-use-emplace,modernize-use-equals-default,modernize-use-override,performance-*'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
CheckOptions:
diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp
index 2bf7fad5e..febf170a2 100644
--- a/src/app/config-ui/mainwindow.cpp
+++ b/src/app/config-ui/mainwindow.cpp
@@ -119,10 +119,10 @@ MainWindow::MainWindow(const QString &settingsDir, qbs::Settings::Scope scope, Q
saveAction->setShortcut(QKeySequence::Save);
connect(saveAction, &QAction::triggered, this, &MainWindow::saveSettings);
const auto expandAllAction = new QAction(tr("&Expand All"), this);
- expandAllAction->setShortcut(Qt::CTRL | Qt::Key_E);
+ expandAllAction->setShortcut(int(Qt::CTRL) | int(Qt::Key_E));
connect(expandAllAction, &QAction::triggered, this, &MainWindow::expandAll);
const auto collapseAllAction = new QAction(tr("C&ollapse All"), this);
- collapseAllAction->setShortcut(Qt::CTRL | Qt::Key_O);
+ collapseAllAction->setShortcut(int(Qt::CTRL) | int(Qt::Key_O));
connect(collapseAllAction, &QAction::triggered, this, &MainWindow::collapseAll);
const auto exitAction = new QAction(tr("E&xit"), this);
exitAction->setShortcut(QKeySequence::Quit);