diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp index ca29e08de24..bc2b60e790b 100644 --- a/src/libs/extensionsystem/pluginerroroverview.cpp +++ b/src/libs/extensionsystem/pluginerroroverview.cpp @@ -26,7 +26,7 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent) { QListWidget *pluginList = new QListWidget(this); - const auto showPluginDetails = [this, pluginList](QListWidgetItem *item) { + const auto showPluginDetails = [this](QListWidgetItem *item) { QTC_ASSERT(item, return); auto spec = item->data(Qt::UserRole).value(); QTC_ASSERT(spec, return); diff --git a/src/libs/glsl/glsllexer.h b/src/libs/glsl/glsllexer.h index b01c6a67a37..8c115144320 100644 --- a/src/libs/glsl/glsllexer.h +++ b/src/libs/glsl/glsllexer.h @@ -40,20 +40,17 @@ public: Lexer(Engine *engine, const char *source, unsigned size); ~Lexer(); - enum - { - // Extra flag bits added to tokens by Lexer::classify() that - // indicate which variant of GLSL the keyword belongs to. - Variant_GLSL_120 = 0x00010000, // 1.20 and higher - Variant_GLSL_150 = 0x00020000, // 1.50 and higher - Variant_GLSL_400 = 0x00040000, // 4.00 and higher - Variant_GLSL_ES_100 = 0x00080000, // ES 1.00 and higher - Variant_VertexShader = 0x00200000, - Variant_FragmentShader = 0x00400000, - Variant_Reserved = 0x80000000, - Variant_Mask = 0xFFFF0000, - Variant_All = 0xFFFF0000 - }; + // Extra flag bits added to tokens by Lexer::classify() that + // indicate which variant of GLSL the keyword belongs to. + static const int Variant_GLSL_120 = 0x00010000; // 1.20 and higher + static const int Variant_GLSL_150 = 0x00020000; // 1.50 and higher + static const int Variant_GLSL_400 = 0x00040000; // 4.00 and higher + static const int Variant_GLSL_ES_100 = 0x00080000; // ES 1.00 and higher + static const int Variant_VertexShader = 0x00200000; + static const int Variant_FragmentShader = 0x00400000; + static const int Variant_Reserved = 0x80000000; + static const int Variant_Mask = 0xFFFF0000; + static const int Variant_All = 0xFFFF0000; union Value { int i; diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h index 0aec7fe7f99..061eff9a474 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h @@ -16,15 +16,13 @@ class AlignButtonsItem : public QGraphicsItem class AlignButtonItem; public: - enum { - NormalPixmapWidth = 14, - NormalPixmapHeight = NormalPixmapWidth, - InnerBorder = 2, - NormalButtonWidth = NormalPixmapWidth + 2 * InnerBorder, - NormalButtonHeight = NormalPixmapHeight + 2 * InnerBorder, - HorizontalDistanceToObject = 4, - VerticalDistanceToObejct = HorizontalDistanceToObject - }; + static const int NormalPixmapWidth = 14; + static const int NormalPixmapHeight = NormalPixmapWidth; + static const int InnerBorder = 2; + static const int NormalButtonWidth = NormalPixmapWidth + 2 * InnerBorder; + static const int NormalButtonHeight = NormalPixmapHeight + 2 * InnerBorder; + static const int HorizontalDistanceToObject = 4; + static const int VerticalDistanceToObejct = HorizontalDistanceToObject; explicit AlignButtonsItem(IAlignable *alignable, QGraphicsItem *parent = nullptr); ~AlignButtonsItem() override; diff --git a/src/libs/solutions/terminal/keys.cpp b/src/libs/solutions/terminal/keys.cpp index adbcda10ea7..73773d2f270 100644 --- a/src/libs/solutions/terminal/keys.cpp +++ b/src/libs/solutions/terminal/keys.cpp @@ -29,7 +29,7 @@ VTermModifier qtModifierToVTerm(Qt::KeyboardModifiers mod) VTermKey qtKeyToVTerm(Qt::Key key, bool keypad) { if (key >= Qt::Key_F1 && key <= Qt::Key_F35) - return static_cast(VTERM_KEY_FUNCTION_0 + key - Qt::Key_F1 + 1); + return static_cast(int(VTERM_KEY_FUNCTION_0) + key - Qt::Key_F1 + 1); switch (key) { case Qt::Key_Return: diff --git a/src/libs/tracing/timelinemodel_p.h b/src/libs/tracing/timelinemodel_p.h index de9abad7da2..69c1d8e284e 100644 --- a/src/libs/tracing/timelinemodel_p.h +++ b/src/libs/tracing/timelinemodel_p.h @@ -21,13 +21,12 @@ public: static const HueLookupTable hueTable; static const int DefaultRowHeight = 30; - enum BoxColorProperties { - SelectionIdHueMultiplier = 25, - FractionHueMultiplier = 96, - FractionHueMininimum = 10, - Saturation = 150, - Lightness = 166 - }; + // BoxColorProperties + static const int SelectionIdHueMultiplier = 25; + static const int FractionHueMultiplier = 96; + static const int FractionHueMininimum = 10; + static const int Saturation = 150; + static const int Lightness = 166; struct Range { Range() : start(-1), duration(-1), selectionId(-1), parent(-1), endIndex(-1) {} diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp index 81db07183d0..fb2d35cb940 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp +++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp @@ -64,7 +64,6 @@ private: void updateButtonStateRemoveAll(); void removeSelected(); - QComboBox *m_globalCustomComboBox; QPushButton *m_restoreGlobal; RunSettingsWidget *m_runSettingsWidget; QTreeView *m_diagnosticsView; diff --git a/src/plugins/fossil/configuredialog.h b/src/plugins/fossil/configuredialog.h index 9fc0ea652db..eddc15d4757 100644 --- a/src/plugins/fossil/configuredialog.h +++ b/src/plugins/fossil/configuredialog.h @@ -11,7 +11,7 @@ namespace Internal { struct RepositorySettings; class ConfigureDialogPrivate; -class ConfigureDialog : public QDialog +class ConfigureDialog final : public QDialog { Q_OBJECT diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp index 103b202eab3..23a1edd9060 100644 --- a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp @@ -274,7 +274,7 @@ void QmlProfilerTraceFile::loadQzt(QIODevice *device) void QmlProfilerTraceFile::addEventsProgress(qint64 timestamp) { addProgressValue(static_cast(timestamp) / static_cast(traceEnd() - traceStart()) - * ProgressEvents); + * int(ProgressEvents)); } void QmlProfilerTraceFile::addStageProgress(QmlProfilerTraceFile::ProgressValues stage) diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.h b/src/plugins/qmlprofiler/qmlprofilertracefile.h index efc6735c127..b667c9b295c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertracefile.h +++ b/src/plugins/qmlprofiler/qmlprofilertracefile.h @@ -3,11 +3,6 @@ #pragma once -#include "qmleventlocation.h" -#include "qmlprofilereventtypes.h" -#include "qmlnote.h" -#include "qmleventtype.h" -#include "qmlevent.h" #include "qmlprofilermodelmanager.h" #include