From b8e8b2aca89633eb4eb9edaf17ee4585e83440a3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 11 Oct 2023 18:47:34 +0200 Subject: [PATCH] Gui: remove trailing whitespaces (thanks luzpaz) --- src/Gui/MainWindow.cpp | 2 +- src/Gui/OverlayParams.cpp | 1 - src/Gui/OverlayWidgets.h | 10 +++++----- src/Gui/PreferencePages/DlgSettingsTheme.cpp | 2 +- src/Gui/Stylesheets/CMakeLists.txt | 6 +++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 59d38cc3c4..83f8c66bbc 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1263,7 +1263,7 @@ void MainWindow::onWindowActivated(QMdiSubWindow* w) d->activeView = view; Application::Instance->viewActivated(view); } - + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); bool saveWB = hGrp->GetBool("SaveWBbyTab", false); if (saveWB) { diff --git a/src/Gui/OverlayParams.cpp b/src/Gui/OverlayParams.cpp index ae92fd6e1e..6b928f2465 100644 --- a/src/Gui/OverlayParams.cpp +++ b/src/Gui/OverlayParams.cpp @@ -146,7 +146,6 @@ public: if(it == funcs.end()) return; it->second(this); - } diff --git a/src/Gui/OverlayWidgets.h b/src/Gui/OverlayWidgets.h index 9f71ced9c3..e6bc7d370a 100644 --- a/src/Gui/OverlayWidgets.h +++ b/src/Gui/OverlayWidgets.h @@ -21,7 +21,7 @@ ****************************************************************************/ #ifndef FC_OVERLAYWIDGETS_H -#define FC_OVERLAYWIDGETS_H +#define FC_OVERLAYWIDGETS_H #include #include @@ -149,7 +149,7 @@ public: /// Get the geometry of this tab widget const QRect &getRect(); - /// Overlay query option + /// Overlay query option enum class QueryOption { /// Report the current overlay status QueryOverlay, @@ -170,7 +170,7 @@ public: * hide in non 3D view. */ bool checkAutoHide() const; - /** Obtain geometry of auto hiding tab widget + /** Obtain geometry of auto hiding tab widget * @param rect: output geometry of the tab widget * @return Return true if the tab widget should be auto hiding */ @@ -522,7 +522,7 @@ public: }; /** Class for handling visual hint for bringing back hidden overlay dock widget - * + * * The proxy widget is transparent except a customizable rectangle area with a * selectable color shown as the visual hint. The hint is normally hidden, and * is shown only if the mouse hovers within the widget. When the hint area is @@ -614,7 +614,7 @@ public: inline QColor color() const { return _color; } inline bool enabled() const {return _enabled;} - inline void setEnabled(bool enabled) + inline void setEnabled(bool enabled) { if(_enabled!=enabled) {_enabled = enabled; updateBoundingRect();} } private: diff --git a/src/Gui/PreferencePages/DlgSettingsTheme.cpp b/src/Gui/PreferencePages/DlgSettingsTheme.cpp index be59dcb476..bb0a6bb330 100644 --- a/src/Gui/PreferencePages/DlgSettingsTheme.cpp +++ b/src/Gui/PreferencePages/DlgSettingsTheme.cpp @@ -166,7 +166,7 @@ void DlgSettingsTheme::attachObserver() auto handler = handlers.addDelayedHandler("BaseApp/Preferences/MainWindow", {"StyleSheet", "TiledBackground"}, applyStyleSheet); - handlers.addHandler("BaseApp/Preferences/Themes", + handlers.addHandler("BaseApp/Preferences/Themes", {"ThemeAccentColor1", "ThemeAccentColor2", "ThemeAccentColor2"}, handler); } diff --git a/src/Gui/Stylesheets/CMakeLists.txt b/src/Gui/Stylesheets/CMakeLists.txt index 6e5de676a7..0d1b5e031f 100644 --- a/src/Gui/Stylesheets/CMakeLists.txt +++ b/src/Gui/Stylesheets/CMakeLists.txt @@ -33,12 +33,12 @@ FILE(GLOB Images_Files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" SOURCE_GROUP("images_dark-light" FILES ${Images_Files}) ADD_CUSTOM_TARGET(Stylesheets_data ALL - SOURCES ${Stylesheets_Files} ${Images_Files} ${Overlay_Stylesheets_Files} + SOURCES ${Stylesheets_Files} ${Images_Files} ${Overlay_Stylesheets_Files} ) fc_copy_sources(Stylesheets_data "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Gui/Stylesheets" - ${Stylesheets_Files} - ${Images_Files} + ${Stylesheets_Files} + ${Images_Files} ${Overlay_Stylesheets_Files}) INSTALL(