From a6598d4607543f33d4736b7a1cfd1f7ab7faf926 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Fri, 6 Jan 2023 17:14:58 +0000 Subject: [PATCH] Fixed build with -Wextra-semi --- src/DockWidgetBase.h | 2 +- src/KDDockWidgets.h | 2 +- src/private/DragController_p.h | 4 +++- src/private/DropIndicatorOverlayInterface_p.h | 4 +++- src/private/TabWidget_p.h | 4 +++- src/private/Utils_p.h | 2 +- src/private/WidgetResizeHandler_p.h | 2 +- src/private/indicators/NullIndicators_p.h | 2 +- src/private/multisplitter/MultiSplitterConfig.h | 4 ++-- tests/utils.cpp | 4 ++-- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/DockWidgetBase.h b/src/DockWidgetBase.h index aaa95333..229d07c5 100644 --- a/src/DockWidgetBase.h +++ b/src/DockWidgetBase.h @@ -81,7 +81,7 @@ public: /// Run "kddockwidgets_mdi_with_docking_example -n" to see it in action }; Q_DECLARE_FLAGS(Options, Option) - Q_ENUM(Options); + Q_ENUM(Options) /// @brief Options which will affect LayoutSaver save/restore enum class LayoutSaverOption { diff --git a/src/KDDockWidgets.h b/src/KDDockWidgets.h index 67d62409..bc506c37 100644 --- a/src/KDDockWidgets.h +++ b/src/KDDockWidgets.h @@ -302,7 +302,7 @@ enum class FloatingWindowFlag { UseQtWindow = 256, UseQtTool = 512, }; -Q_DECLARE_FLAGS(FloatingWindowFlags, FloatingWindowFlag); +Q_DECLARE_FLAGS(FloatingWindowFlags, FloatingWindowFlag) ///@internal inline QString locationStr(Location loc) diff --git a/src/private/DragController_p.h b/src/private/DragController_p.h index 3f414ded..02c9e4cc 100644 --- a/src/private/DragController_p.h +++ b/src/private/DragController_p.h @@ -45,7 +45,9 @@ public: bool isCurrentState() const; virtual void onEntry() = 0; - virtual void onExit() {}; + virtual void onExit() + { + } private: MinimalStateMachine *const m_machine; diff --git a/src/private/DropIndicatorOverlayInterface_p.h b/src/private/DropIndicatorOverlayInterface_p.h index 66e0d4d5..75ee5283 100644 --- a/src/private/DropIndicatorOverlayInterface_p.h +++ b/src/private/DropIndicatorOverlayInterface_p.h @@ -67,7 +67,9 @@ private: protected: virtual DropLocation hover_impl(QPoint globalPos) = 0; virtual void onHoveredFrameChanged(Frame *); - virtual void updateVisibility() {}; + virtual void updateVisibility() + { + } Frame *m_hoveredFrame = nullptr; DropArea *const m_dropArea; diff --git a/src/private/TabWidget_p.h b/src/private/TabWidget_p.h index 7db59ab5..138d7315 100644 --- a/src/private/TabWidget_p.h +++ b/src/private/TabWidget_p.h @@ -187,7 +187,9 @@ public: // Q_SIGNALS: // Not a OQbject virtual void currentTabChanged(int index) = 0; virtual void currentDockWidgetChanged(KDDockWidgets::DockWidgetBase *) = 0; - virtual void countChanged() {}; + virtual void countChanged() + { + } protected: void onTabInserted(); diff --git a/src/private/Utils_p.h b/src/private/Utils_p.h index 3ff73866..f82927c5 100644 --- a/src/private/Utils_p.h +++ b/src/private/Utils_p.h @@ -411,6 +411,6 @@ inline T *lastParentOfType(const QObject *child) return result; } -}; +} #endif diff --git a/src/private/WidgetResizeHandler_p.h b/src/private/WidgetResizeHandler_p.h index 164c3316..998e205b 100644 --- a/src/private/WidgetResizeHandler_p.h +++ b/src/private/WidgetResizeHandler_p.h @@ -45,7 +45,7 @@ public: Feature_All = Feature_NativeShadow | Feature_NativeResize | Feature_NativeDrag | Feature_NativeMaximize }; - Q_DECLARE_FLAGS(Features, Feature); + Q_DECLARE_FLAGS(Features, Feature) struct NativeFeatures { diff --git a/src/private/indicators/NullIndicators_p.h b/src/private/indicators/NullIndicators_p.h index 2c4dea03..a2d6d3cb 100644 --- a/src/private/indicators/NullIndicators_p.h +++ b/src/private/indicators/NullIndicators_p.h @@ -30,7 +30,7 @@ public: DropLocation hover_impl(QPoint) override { return {}; - }; + } DropLocation dropLocationForPos(QPoint) const { diff --git a/src/private/multisplitter/MultiSplitterConfig.h b/src/private/multisplitter/MultiSplitterConfig.h index 8f3a37bd..86f68a8f 100644 --- a/src/private/multisplitter/MultiSplitterConfig.h +++ b/src/private/multisplitter/MultiSplitterConfig.h @@ -29,7 +29,7 @@ public: None = 0, LazyResize = 1 }; - Q_DECLARE_FLAGS(Flags, Flag); + Q_DECLARE_FLAGS(Flags, Flag) ///@brief returns the singleton Config instance static Config &self(); @@ -72,7 +72,7 @@ private: SeparatorFactoryFunc m_separatorFactoryFunc = nullptr; Flags m_flags = Flag::None; - Q_DISABLE_COPY(Config); + Q_DISABLE_COPY(Config) }; } diff --git a/tests/utils.cpp b/tests/utils.cpp index d6e8ce0b..8aaac60c 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -94,12 +94,12 @@ DockWidgetBase *KDDockWidgets::Tests::createDockWidget(const QString &name, QWid } else { return dock; } -}; +} DockWidgetBase *KDDockWidgets::Tests::createDockWidget(const QString &name, QColor color) { return createDockWidget(name, new MyWidget(name, color)); -}; +} static QWidgetOrQuick *createGuestWidget(int i) {