diff --git a/.clang-format b/.clang-format index a681ad303..f9d001612 100644 --- a/.clang-format +++ b/.clang-format @@ -69,4 +69,5 @@ SpaceInEmptyParentheses: false SpacesInAngles: false SpacesInCStyleCastParentheses: true SpacesInParentheses: false +StatementAttributeLikeMacros: [emit,KDDW_CO_AWAIT] ... diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e420db04a..4da163552 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,13 @@ # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks ci: - skip: [pylint,clang-format] + skip: [pylint] autoupdate_schedule: monthly exclude: ^(cmake/ECM|cmake/KDAB/|src/3rdparty/|code.dev.code-workspace) repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -21,12 +21,12 @@ repos: - id: destroyed-symlinks - id: check-executables-have-shebangs - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v17.0.6 + rev: v19.1.1 hooks: - id: clang-format exclude: (.json) - repo: https://github.com/PyCQA/pylint - rev: v3.2.4 + rev: v3.3.1 hooks: - id: pylint exclude: ^(.cmake-format.py|conan/conanfile.py) @@ -53,12 +53,12 @@ repos: files: \.(md|mdown|markdown)$ exclude: (docs/book/) - repo: https://github.com/fsfe/reuse-tool - rev: v3.1.0a1 + rev: v4.0.3 hooks: - id: reuse args: [--suppress-deprecation] - repo: https://github.com/scop/pre-commit-shfmt - rev: v3.8.0-1 + rev: v3.9.0-1 hooks: - id: shfmt - repo: https://github.com/shellcheck-py/shellcheck-py diff --git a/src/core/Position.cpp b/src/core/Position.cpp index ece7fb249..d367e36e5 100644 --- a/src/core/Position.cpp +++ b/src/core/Position.cpp @@ -198,7 +198,7 @@ LayoutSaver::Position Position::serialize() const p.indexOfFloatingWindow = fw->beingDeleted() ? -1 : DockRegistry::self()->floatingWindows().indexOf( - fw); + fw); } else { p.mainWindowUniqueName = mainWindow->uniqueName(); assert(!p.mainWindowUniqueName.isEmpty()); diff --git a/src/core/Separator.cpp b/src/core/Separator.cpp index 93ccd5005..bc74b32b8 100644 --- a/src/core/Separator.cpp +++ b/src/core/Separator.cpp @@ -106,7 +106,7 @@ Separator::Separator(LayoutingHost *host, Qt::Orientation orientation, Core::Ite view()->show(); view()->init(); d->lazyResizeRubberBand = d->usesLazyResize ? Config::self().viewFactory()->createRubberBand( - rubberBandIsTopLevel() ? nullptr : view()) + rubberBandIsTopLevel() ? nullptr : view()) : nullptr; setVisible(true); } diff --git a/src/core/TitleBar.cpp b/src/core/TitleBar.cpp index 22be2a4bb..d7f27e20a 100644 --- a/src/core/TitleBar.cpp +++ b/src/core/TitleBar.cpp @@ -41,8 +41,8 @@ using namespace KDDockWidgets::Core; TitleBar::TitleBar(Group *parent) : Controller( - ViewType::TitleBar, - Config::self().viewFactory()->createTitleBar(this, parent ? parent->view() : nullptr)) + ViewType::TitleBar, + Config::self().viewFactory()->createTitleBar(this, parent ? parent->view() : nullptr)) , Draggable(view()) , d(new Private()) , m_group(parent) @@ -67,8 +67,8 @@ TitleBar::TitleBar(Group *parent) TitleBar::TitleBar(FloatingWindow *parent) : Controller( - ViewType::TitleBar, - Config::self().viewFactory()->createTitleBar(this, parent ? parent->view() : nullptr)) + ViewType::TitleBar, + Config::self().viewFactory()->createTitleBar(this, parent ? parent->view() : nullptr)) , Draggable(view()) , d(new Private()) , m_group(nullptr) diff --git a/src/flutter/Platform.h b/src/flutter/Platform.h index 06958ddac..8426947eb 100644 --- a/src/flutter/Platform.h +++ b/src/flutter/Platform.h @@ -114,7 +114,7 @@ class DOCKS_EXPORT Platform : public Core::Platform void pauseForDebugger() override; /// Pauses execution, so we can attach Dart's debugger - virtual void pauseForDartDebugger() {}; + virtual void pauseForDartDebugger() { }; // Called by unit-test's main.dart. Runs the tests. // The tests are in C++, as they are the same ones for QtWidgets and QtQuick diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index d838b5449..76bb51c82 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -6206,174 +6206,173 @@ KDDW_QCORO_TASK tst_rect() KDDW_TEST_RETURN(true); } -static const auto s_tests = std::vector -{ +static const auto s_tests = std::vector { TEST(tst_simple1), - TEST(tst_simple2), - TEST(tst_resizeWindow2), - TEST(tst_hasPreviousDockedLocation), - TEST(tst_hasPreviousDockedLocation2), - TEST(tst_LayoutSaverOpenedDocks), - TEST(tst_ghostSeparator), - TEST(tst_detachFromMainWindow), - TEST(tst_floatingWindowSize), - TEST(tst_tabbingWithAffinities), - TEST(tst_floatingWindowTitleBug), - TEST(tst_setFloatingSimple), - TEST(tst_dragOverTitleBar), - TEST(tst_setFloatingGeometry), - TEST(tst_restoreEmpty), - TEST(tst_restoreCentralFrame), - TEST(tst_restoreNonExistingDockWidget), - TEST(tst_shutdown), - TEST(tst_closeDockWidgets), - TEST(tst_closeReason), - TEST(tst_layoutEqually), - TEST(tst_doubleClose), - TEST(tst_maximizeAndRestore), - TEST(tst_restoreWithNonClosableWidget), - TEST(tst_restoreCrash), - TEST(tst_restoreSideBySide), - TEST(tst_restoreWithCentralFrameWithTabs), - TEST(tst_restoreGroupOptions), - TEST(tst_restoreWithAffinity), - TEST(tst_marginsAfterRestore), - TEST(tst_restoreWithNewDockWidgets), - TEST(tst_restoreWithDockFactory), - TEST(tst_restoreWithDockFactory2), - TEST(tst_dontCloseDockWidgetBeforeRestore), - TEST(tst_dontCloseDockWidgetBeforeRestore3), - TEST(tst_dontCloseDockWidgetBeforeRestore4), - TEST(tst_skipRestoreInsideMainWindow), - TEST(tst_restoreWithNativeTitleBar), - TEST(tst_closeOnlyCurrentTab), - TEST(tst_tabWidgetCurrentIndex), - TEST(tst_propagateResize2), - TEST(tst_startClosed), - TEST(tst_closeReparentsToNull), - TEST(tst_invalidAnchorGroup), - TEST(tst_addAsPlaceholder), - TEST(tst_repeatedShowHide), - TEST(tst_removeItem), - TEST(tst_clear), - TEST(tst_crash), - TEST(tst_refUnrefItem), - TEST(tst_placeholderCount), - TEST(tst_availableLengthForOrientation), - TEST(tst_closeTabOfCentralFrame), - TEST(tst_centralGroupAffinity), - TEST(tst_setAsCurrentTab), - TEST(tst_placeholderDisappearsOnReadd), - TEST(tst_placeholdersAreRemovedProperly), - TEST(tst_preferredInitialSize), - TEST(tst_preferredInitialSizeVsMinSize), - TEST(tst_closeAllDockWidgets), - TEST(tst_toggleMiddleDockCrash), - TEST(tst_stealFrame), - TEST(tst_setFloatingWhenWasTabbed), - TEST(tst_setWidget), - TEST(tst_floatingLastPosAfterDoubleClose), - TEST(tst_registry), - TEST(tst_honourGeometryOfHiddenWindow), - TEST(tst_posAfterLeftDetach), - TEST(tst_propagateMinSize), - TEST(tst_createFloatingWindow), - TEST(tst_fairResizeAfterRemoveWidget), - TEST(tst_unfloatTabbedFloatingWidgets), - TEST(tst_unfloatTabbedFloatingWidgets2), - TEST(tst_resizeViaAnchorsAfterPlaceholderCreation), - TEST(tst_rectForDropCrash), - TEST(tst_addDockWidgetToMainWindow), - TEST(tst_addDockWidgetToContainingWindow), - TEST(tst_setFloatingAfterDraggedFromTabToSideBySide), - TEST(tst_setFloatingAFrameWithTabs), - TEST(tst_toggleDockWidgetWithHiddenTitleBar), - TEST(tst_anchorFollowingItselfAssert), - TEST(tst_isInMainWindow), - TEST(tst_sizeConstraintWarning), - TEST(tst_stuckSeparator), - TEST(tst_dockNotFillingSpace), - TEST(tst_titlebar_getter), - TEST(tst_addingOptionHiddenTabbed), - TEST(tst_maxSizedHonouredAfterRemoved), - TEST(tst_addDockWidgetAsTabToDockWidget), - TEST(tst_closeTabHidesDockWidget), - TEST(tst_propagateSizeHonoursMinSize), - TEST(tst_floatingAction), - TEST(tst_constraintsPropagateUp), - TEST(tst_addToSmallMainWindow4), - TEST(tst_addToSmallMainWindow5), - TEST(tst_dragBySingleTab), - TEST(tst_deleteOnClose), - TEST(tst_toggleAction), - TEST(tst_redocksToPreviousTabIndex), - TEST(tst_toggleTabbed2), - TEST(tst_resizePropagatesEvenly), - TEST(tst_persistentCentralWidget), - TEST(tst_titlebarNumDockWidgetsChanged), - TEST(tst_closed), - TEST(tst_restoreFlagsFromVersion16), - TEST(tst_map), - TEST(tst_childViewAt), - TEST(tst_detachPos), - TEST(tst_floatMaintainsSize), - TEST(tst_scopedValueRollback), - TEST(tst_size), - TEST(tst_point), - TEST(tst_rect), - TEST(tst_resizeInLayout), - TEST(tst_mainWindowToggle), - TEST(tst_startDragging), + TEST(tst_simple2), + TEST(tst_resizeWindow2), + TEST(tst_hasPreviousDockedLocation), + TEST(tst_hasPreviousDockedLocation2), + TEST(tst_LayoutSaverOpenedDocks), + TEST(tst_ghostSeparator), + TEST(tst_detachFromMainWindow), + TEST(tst_floatingWindowSize), + TEST(tst_tabbingWithAffinities), + TEST(tst_floatingWindowTitleBug), + TEST(tst_setFloatingSimple), + TEST(tst_dragOverTitleBar), + TEST(tst_setFloatingGeometry), + TEST(tst_restoreEmpty), + TEST(tst_restoreCentralFrame), + TEST(tst_restoreNonExistingDockWidget), + TEST(tst_shutdown), + TEST(tst_closeDockWidgets), + TEST(tst_closeReason), + TEST(tst_layoutEqually), + TEST(tst_doubleClose), + TEST(tst_maximizeAndRestore), + TEST(tst_restoreWithNonClosableWidget), + TEST(tst_restoreCrash), + TEST(tst_restoreSideBySide), + TEST(tst_restoreWithCentralFrameWithTabs), + TEST(tst_restoreGroupOptions), + TEST(tst_restoreWithAffinity), + TEST(tst_marginsAfterRestore), + TEST(tst_restoreWithNewDockWidgets), + TEST(tst_restoreWithDockFactory), + TEST(tst_restoreWithDockFactory2), + TEST(tst_dontCloseDockWidgetBeforeRestore), + TEST(tst_dontCloseDockWidgetBeforeRestore3), + TEST(tst_dontCloseDockWidgetBeforeRestore4), + TEST(tst_skipRestoreInsideMainWindow), + TEST(tst_restoreWithNativeTitleBar), + TEST(tst_closeOnlyCurrentTab), + TEST(tst_tabWidgetCurrentIndex), + TEST(tst_propagateResize2), + TEST(tst_startClosed), + TEST(tst_closeReparentsToNull), + TEST(tst_invalidAnchorGroup), + TEST(tst_addAsPlaceholder), + TEST(tst_repeatedShowHide), + TEST(tst_removeItem), + TEST(tst_clear), + TEST(tst_crash), + TEST(tst_refUnrefItem), + TEST(tst_placeholderCount), + TEST(tst_availableLengthForOrientation), + TEST(tst_closeTabOfCentralFrame), + TEST(tst_centralGroupAffinity), + TEST(tst_setAsCurrentTab), + TEST(tst_placeholderDisappearsOnReadd), + TEST(tst_placeholdersAreRemovedProperly), + TEST(tst_preferredInitialSize), + TEST(tst_preferredInitialSizeVsMinSize), + TEST(tst_closeAllDockWidgets), + TEST(tst_toggleMiddleDockCrash), + TEST(tst_stealFrame), + TEST(tst_setFloatingWhenWasTabbed), + TEST(tst_setWidget), + TEST(tst_floatingLastPosAfterDoubleClose), + TEST(tst_registry), + TEST(tst_honourGeometryOfHiddenWindow), + TEST(tst_posAfterLeftDetach), + TEST(tst_propagateMinSize), + TEST(tst_createFloatingWindow), + TEST(tst_fairResizeAfterRemoveWidget), + TEST(tst_unfloatTabbedFloatingWidgets), + TEST(tst_unfloatTabbedFloatingWidgets2), + TEST(tst_resizeViaAnchorsAfterPlaceholderCreation), + TEST(tst_rectForDropCrash), + TEST(tst_addDockWidgetToMainWindow), + TEST(tst_addDockWidgetToContainingWindow), + TEST(tst_setFloatingAfterDraggedFromTabToSideBySide), + TEST(tst_setFloatingAFrameWithTabs), + TEST(tst_toggleDockWidgetWithHiddenTitleBar), + TEST(tst_anchorFollowingItselfAssert), + TEST(tst_isInMainWindow), + TEST(tst_sizeConstraintWarning), + TEST(tst_stuckSeparator), + TEST(tst_dockNotFillingSpace), + TEST(tst_titlebar_getter), + TEST(tst_addingOptionHiddenTabbed), + TEST(tst_maxSizedHonouredAfterRemoved), + TEST(tst_addDockWidgetAsTabToDockWidget), + TEST(tst_closeTabHidesDockWidget), + TEST(tst_propagateSizeHonoursMinSize), + TEST(tst_floatingAction), + TEST(tst_constraintsPropagateUp), + TEST(tst_addToSmallMainWindow4), + TEST(tst_addToSmallMainWindow5), + TEST(tst_dragBySingleTab), + TEST(tst_deleteOnClose), + TEST(tst_toggleAction), + TEST(tst_redocksToPreviousTabIndex), + TEST(tst_toggleTabbed2), + TEST(tst_resizePropagatesEvenly), + TEST(tst_persistentCentralWidget), + TEST(tst_titlebarNumDockWidgetsChanged), + TEST(tst_closed), + TEST(tst_restoreFlagsFromVersion16), + TEST(tst_map), + TEST(tst_childViewAt), + TEST(tst_detachPos), + TEST(tst_floatMaintainsSize), + TEST(tst_scopedValueRollback), + TEST(tst_size), + TEST(tst_point), + TEST(tst_rect), + TEST(tst_resizeInLayout), + TEST(tst_mainWindowToggle), + TEST(tst_startDragging), #if !defined(KDDW_FRONTEND_FLUTTER) - TEST(tst_minMaxGuest), - TEST(tst_doesntHaveNativeTitleBar), - TEST(tst_sizeAfterRedock), - TEST(tst_honourUserGeometry), - TEST(tst_restoreMaximizedState), - TEST(tst_restoreFloatingMinimizedState), - TEST(tst_dockInternal), - TEST(tst_samePositionAfterHideRestore), - TEST(tst_restoreTwice), - TEST(tst_restoreAfterResize), - TEST(tst_restoreNestedAndTabbed), - TEST(tst_restoreWithPlaceholder), - TEST(tst_restoreAfterMinSizeChanges), - TEST(tst_lastFloatingPositionIsRestored), - TEST(tst_restoreNonClosable), - TEST(tst_restoreNlohmanException), - TEST(tst_restoreWithInvalidCurrentTab), - TEST(tst_restoreRestoresMainWindowPosition), - TEST(tst_dontCloseDockWidgetBeforeRestore2), - TEST(tst_doubleClickTabToDetach), - TEST(tst_tabTitleChanges), - TEST(tst_preventClose), - TEST(tst_addAndReadd), - TEST(tst_notClosable), - TEST(tst_availableSizeWithPlaceholders), - TEST(tst_moreTitleBarCornerCases), - TEST(tst_raise), - TEST(tst_nonDockable), - TEST(tst_flagDoubleClick), - TEST(tst_constraintsAfterPlaceholder), - TEST(tst_addToSmallMainWindow1), - TEST(tst_addToSmallMainWindow2), - TEST(tst_addToSmallMainWindow3), - TEST(tst_titleBarFocusedWhenTabsChange), - TEST(tst_toggleTabbed), - TEST(tst_currentTabMatchesDockWidget), - TEST(tst_addMDIDockWidget), - TEST(tst_mdiZorder), - TEST(tst_mdiCrash), - TEST(tst_mdiZorder2), - TEST(tst_mdiSetSize), - TEST(tst_mixedMDIRestoreToArea), - TEST(tst_redockToMDIRestoresPosition), - TEST(tst_maximizeButton), - TEST(tst_restoreAfterUnminimized), - TEST(tst_doubleScheduleDelete), - TEST(tst_minimizeRestoreBug), + TEST(tst_minMaxGuest), + TEST(tst_doesntHaveNativeTitleBar), + TEST(tst_sizeAfterRedock), + TEST(tst_honourUserGeometry), + TEST(tst_restoreMaximizedState), + TEST(tst_restoreFloatingMinimizedState), + TEST(tst_dockInternal), + TEST(tst_samePositionAfterHideRestore), + TEST(tst_restoreTwice), + TEST(tst_restoreAfterResize), + TEST(tst_restoreNestedAndTabbed), + TEST(tst_restoreWithPlaceholder), + TEST(tst_restoreAfterMinSizeChanges), + TEST(tst_lastFloatingPositionIsRestored), + TEST(tst_restoreNonClosable), + TEST(tst_restoreNlohmanException), + TEST(tst_restoreWithInvalidCurrentTab), + TEST(tst_restoreRestoresMainWindowPosition), + TEST(tst_dontCloseDockWidgetBeforeRestore2), + TEST(tst_doubleClickTabToDetach), + TEST(tst_tabTitleChanges), + TEST(tst_preventClose), + TEST(tst_addAndReadd), + TEST(tst_notClosable), + TEST(tst_availableSizeWithPlaceholders), + TEST(tst_moreTitleBarCornerCases), + TEST(tst_raise), + TEST(tst_nonDockable), + TEST(tst_flagDoubleClick), + TEST(tst_constraintsAfterPlaceholder), + TEST(tst_addToSmallMainWindow1), + TEST(tst_addToSmallMainWindow2), + TEST(tst_addToSmallMainWindow3), + TEST(tst_titleBarFocusedWhenTabsChange), + TEST(tst_toggleTabbed), + TEST(tst_currentTabMatchesDockWidget), + TEST(tst_addMDIDockWidget), + TEST(tst_mdiZorder), + TEST(tst_mdiCrash), + TEST(tst_mdiZorder2), + TEST(tst_mdiSetSize), + TEST(tst_mixedMDIRestoreToArea), + TEST(tst_redockToMDIRestoresPosition), + TEST(tst_maximizeButton), + TEST(tst_restoreAfterUnminimized), + TEST(tst_doubleScheduleDelete), + TEST(tst_minimizeRestoreBug), #endif - TEST(tst_keepLast) + TEST(tst_keepLast) }; #include "tests_main.h" diff --git a/tests/tst_docks_slow5.cpp b/tests/tst_docks_slow5.cpp index 75b09d8ab..11f5d6808 100644 --- a/tests/tst_docks_slow5.cpp +++ b/tests/tst_docks_slow5.cpp @@ -354,8 +354,7 @@ KDDW_QCORO_TASK tst_28NestedWidgets() KDDW_TEST_RETURN(true); } -static const auto s_tests = std::vector -{ +static const auto s_tests = std::vector { #if !defined(KDDW_FRONTEND_FLUTTER) TEST(tst_28NestedWidgets) #endif diff --git a/tests/tst_docks_slow6.cpp b/tests/tst_docks_slow6.cpp index 67d7f65dc..1585186dc 100644 --- a/tests/tst_docks_slow6.cpp +++ b/tests/tst_docks_slow6.cpp @@ -112,8 +112,7 @@ KDDW_QCORO_TASK tst_isFocused() KDDW_CO_RETURN(true); } -static const auto s_tests = std::vector -{ +static const auto s_tests = std::vector { #if !defined(KDDW_FRONTEND_FLUTTER) TEST(tst_isFocused) #endif