From 09a90021fdd5c4678ca445445c2c63e23bb9e760 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 20:47:29 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-clang-format: v21.1.6 → v22.1.2](https://github.com/pre-commit/mirrors-clang-format/compare/v21.1.6...v22.1.2) - [github.com/PyCQA/pylint: v4.0.4 → v4.0.5](https://github.com/PyCQA/pylint/compare/v4.0.4...v4.0.5) - [github.com/codespell-project/codespell: v2.4.1 → v2.4.2](https://github.com/codespell-project/codespell/compare/v2.4.1...v2.4.2) - [github.com/scop/pre-commit-shfmt: v3.12.0-2 → v3.13.0-1](https://github.com/scop/pre-commit-shfmt/compare/v3.12.0-2...v3.13.0-1) - [github.com/compilerla/conventional-pre-commit: v4.3.0 → v4.4.0](https://github.com/compilerla/conventional-pre-commit/compare/v4.3.0...v4.4.0) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fc50e61a3..6bac86b05 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,12 +21,12 @@ repos: - id: destroyed-symlinks - id: check-executables-have-shebangs - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v21.1.6 + rev: v22.1.2 hooks: - id: clang-format exclude: (.json) - repo: https://github.com/PyCQA/pylint - rev: v4.0.4 + rev: v4.0.5 hooks: - id: pylint exclude: ^(.cmake-format.py|conan/conanfile.py) @@ -36,7 +36,7 @@ repos: hooks: - id: autopep8 - repo: https://github.com/codespell-project/codespell - rev: v2.4.1 + rev: v2.4.2 hooks: - id: codespell - repo: https://github.com/cheshirekow/cmake-format-precommit @@ -52,7 +52,7 @@ repos: hooks: - id: reuse - repo: https://github.com/scop/pre-commit-shfmt - rev: v3.12.0-2 + rev: v3.13.0-1 hooks: - id: shfmt - repo: https://github.com/shellcheck-py/shellcheck-py @@ -60,7 +60,7 @@ repos: hooks: - id: shellcheck - repo: https://github.com/compilerla/conventional-pre-commit - rev: v4.3.0 + rev: v4.4.0 hooks: - id: conventional-pre-commit stages: [commit-msg] From 769b211d21b24dcdd1dba84e203f83b86494b16a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 20:56:10 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- examples/dockwidgets/MyMainWindow.h | 4 +- examples/dockwidgets/main.cpp | 4 +- .../flutter/windows/runner/win32_window.cpp | 2 +- examples/mdi_with_docking/main.cpp | 2 +- src/LayoutSaver.cpp | 34 +-- src/QtCompat_p.h | 6 +- src/core/Controller.cpp | 2 +- src/core/DockRegistry.h | 4 +- src/core/DockWidget.cpp | 4 +- src/core/DockWidget.h | 8 +- src/core/DropArea.cpp | 6 +- src/core/DropArea.h | 2 +- src/core/FloatingWindow.cpp | 6 +- src/core/FloatingWindow.h | 2 +- src/core/Group.cpp | 8 +- src/core/Group.h | 8 +- src/core/Layout.cpp | 2 +- src/core/LayoutSaver_p.h | 2 +- src/core/MDILayout.h | 2 +- src/core/MainWindow.cpp | 4 +- src/core/MainWindow.h | 4 +- src/core/Platform.cpp | 2 +- src/core/Platform.h | 4 +- src/core/Position_p.h | 2 +- src/core/Stack.cpp | 2 +- src/core/Stack_p.h | 2 +- src/core/TabBar.cpp | 10 +- src/core/TitleBar.cpp | 10 +- src/core/TitleBar_p.h | 4 +- src/core/View.cpp | 8 +- src/core/ViewFactory.h | 8 +- src/core/WidgetResizeHandler.cpp | 4 +- src/core/WindowBeingDragged.cpp | 18 +- src/core/WindowZOrder_x11_p.h | 4 +- .../indicators/NullDropIndicatorOverlay.h | 6 +- .../SegmentedDropIndicatorOverlay.cpp | 2 +- .../SegmentedDropIndicatorOverlay.h | 2 +- src/core/layouting/Item.cpp | 32 +-- src/core/layouting/Item_p.h | 2 +- src/core/layouting/LayoutingGuest_p.h | 2 +- src/core/layouting/LayoutingHost_p.h | 4 +- src/core/views/DockWidgetViewInterface.h | 4 +- src/core/views/GroupViewInterface.cpp | 2 +- src/core/views/MainWindowMDIViewInterface.h | 4 +- src/core/views/MainWindowViewInterface.h | 4 +- src/layoutlinter_main.cpp | 14 +- src/qtcommon/Platform.cpp | 2 +- src/qtcommon/ViewWrapper.cpp | 10 +- src/qtquick/Action.cpp | 2 +- src/qtquick/DockWidgetInstantiator.h | 6 +- src/qtquick/MainWindowInstantiator.h | 4 +- src/qtquick/MainWindowMDIInstantiator.h | 2 +- src/qtquick/Platform.cpp | 4 +- src/qtquick/Platform.h | 2 +- src/qtquick/ViewFactory.cpp | 4 +- src/qtquick/ViewFactory.h | 14 +- src/qtquick/Window.cpp | 4 +- src/qtquick/views/ClassicIndicatorsWindow.cpp | 2 +- src/qtquick/views/DockWidget.h | 4 +- src/qtquick/views/FloatingWindow.cpp | 2 +- src/qtquick/views/FloatingWindow.h | 2 +- src/qtquick/views/Group.cpp | 2 +- src/qtquick/views/MainWindow.cpp | 4 +- src/qtquick/views/MainWindow.h | 8 +- src/qtquick/views/TabBar.cpp | 10 +- src/qtquick/views/TabBar.h | 2 +- src/qtquick/views/View.cpp | 6 +- src/qtquick/views/View.h | 2 +- src/qtquick/views/ViewWrapper.cpp | 8 +- src/qtwidgets/DebugWidgetViewer_p.h | 6 +- src/qtwidgets/Platform.cpp | 4 +- src/qtwidgets/Platform.h | 2 +- src/qtwidgets/ViewFactory.cpp | 2 +- src/qtwidgets/ViewFactory.h | 6 +- src/qtwidgets/Window.cpp | 2 +- src/qtwidgets/views/DockWidget.h | 4 +- src/qtwidgets/views/FloatingWindow.h | 2 +- src/qtwidgets/views/Group.cpp | 2 +- src/qtwidgets/views/MDIArea.cpp | 2 +- src/qtwidgets/views/MDIArea.h | 4 +- src/qtwidgets/views/MainWindow.cpp | 8 +- src/qtwidgets/views/MainWindow.h | 2 +- src/qtwidgets/views/View.cpp | 8 +- src/qtwidgets/views/View.h | 2 +- src/qtwidgets/views/ViewWrapper.cpp | 8 +- tests/core/tst_droparea.cpp | 6 +- tests/core/tst_group.cpp | 4 +- tests/core/tst_stack.cpp | 4 +- tests/core/tst_tabbar.cpp | 32 +-- tests/core/tst_titlebar.cpp | 2 +- tests/flutter/windows/runner/win32_window.cpp | 2 +- tests/qtquick/tst_qtquick.cpp | 16 +- tests/qtwidgets/tst_qtwidgets.cpp | 76 +++---- tests/tst_docks.cpp | 202 +++++++++--------- tests/tst_docks_slow1.cpp | 22 +- tests/tst_docks_slow2.cpp | 2 +- tests/tst_docks_slow5.cpp | 8 +- tests/tst_docks_slow7.cpp | 32 +-- tests/tst_docks_slow8.cpp | 6 +- tests/tst_multisplitter.cpp | 4 +- tests/tst_view.cpp | 32 +-- tests/tst_viewguard.cpp | 4 +- tests/tst_window.cpp | 2 +- tests/utils.cpp | 6 +- tests/utils.h | 16 +- 105 files changed, 460 insertions(+), 460 deletions(-) diff --git a/examples/dockwidgets/MyMainWindow.h b/examples/dockwidgets/MyMainWindow.h index 8b349ad13..21f596133 100644 --- a/examples/dockwidgets/MyMainWindow.h +++ b/examples/dockwidgets/MyMainWindow.h @@ -33,8 +33,8 @@ class MyMainWindow : public KDDockWidgets::QtWidgets::MainWindow explicit MyMainWindow(const QString &uniqueName, KDDockWidgets::MainWindowOptions options, ExampleOptions exampleOptions, - const QString &affinityName = {}, // Usually not needed. Just here to show - // the feature. + const QString &affinityName = { }, // Usually not needed. Just here to show + // the feature. QWidget *parent = nullptr); ~MyMainWindow() override; diff --git a/examples/dockwidgets/main.cpp b/examples/dockwidgets/main.cpp index b4feb665a..148dd36ce 100644 --- a/examples/dockwidgets/main.cpp +++ b/examples/dockwidgets/main.cpp @@ -407,7 +407,7 @@ int main(int argc, char **argv) KDDockWidgets::Config::self().setFlags(flags); - MyMainWindow::ExampleOptions exampleOptions = {}; + MyMainWindow::ExampleOptions exampleOptions = { }; if (parser.isSet(ctrlTogglesDropIndicators)) exampleOptions |= MyMainWindow::ExampleOption::CtrlKeyFiltersDropIndicators; @@ -498,7 +498,7 @@ int main(int argc, char **argv) new KDDockWidgets::QtWidgets::DockWidget(QStringLiteral("MyMainWindow-2-DW")); const QString affinity = QStringLiteral("Inner-DockWidgets-2"); - MyMainWindow::ExampleOptions exampleOptions2 = {}; + MyMainWindow::ExampleOptions exampleOptions2 = { }; if (parser.isSet(relativeRestore)) exampleOptions2 |= MyMainWindow::ExampleOption::RestoreIsRelative; auto dockableMainWindow = diff --git a/examples/flutter/windows/runner/win32_window.cpp b/examples/flutter/windows/runner/win32_window.cpp index 6911d4738..f6ae4a02a 100644 --- a/examples/flutter/windows/runner/win32_window.cpp +++ b/examples/flutter/windows/runner/win32_window.cpp @@ -101,7 +101,7 @@ WindowClassRegistrar *WindowClassRegistrar::instance_ = nullptr; const wchar_t *WindowClassRegistrar::GetWindowClass() { if (!class_registered_) { - WNDCLASS window_class {}; + WNDCLASS window_class { }; window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); window_class.lpszClassName = kWindowClassName; window_class.style = CS_HREDRAW | CS_VREDRAW; diff --git a/examples/mdi_with_docking/main.cpp b/examples/mdi_with_docking/main.cpp index a670ba9e3..e1f4377c0 100644 --- a/examples/mdi_with_docking/main.cpp +++ b/examples/mdi_with_docking/main.cpp @@ -72,7 +72,7 @@ int main(int argc, char **argv) mainWindow.addDockWidget(dock2, KDDockWidgets::Location_OnBottom, nullptr, KDDockWidgets::InitialOption(QSize(0, 300))); - KDDockWidgets::DockWidgetOptions options = {}; + KDDockWidgets::DockWidgetOptions options = { }; if (parser.isSet(nestedDocking)) { options |= KDDockWidgets::DockWidgetOption_MDINestable; } diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp index 7f5485b16..19c86f2dc 100644 --- a/src/LayoutSaver.cpp +++ b/src/LayoutSaver.cpp @@ -73,7 +73,7 @@ std::unordered_map LayoutSaver::Private::s_unrestoredPrope static InternalRestoreOptions internalRestoreOptions(RestoreOptions options) { - InternalRestoreOptions ret = {}; + InternalRestoreOptions ret = { }; if (options.testFlag(RestoreOption_RelativeToMainWindow)) { ret.setFlag(InternalRestoreOption::SkipMainWindowGeometry); ret.setFlag(InternalRestoreOption::RelativeFloatingWindowGeometry); @@ -132,7 +132,7 @@ static void from_json(const nlohmann::json &json, LayoutSaver::Group &f) f.isNull = jsonValue(json, "isNull", true); f.objectName = jsonValue(json, "objectName", QString()); f.geometry = jsonValue(json, "geometry", Rect()); - f.options = jsonValue(json, "options", QFlags::Int {}); + f.options = jsonValue(json, "options", QFlags::Int { }); f.currentTabIndex = jsonValue(json, "currentTabIndex", 0); f.mainWindowUniqueName = jsonValue(json, "mainWindowUniqueName", QString()); @@ -431,7 +431,7 @@ QByteArray LayoutSaver::serializeLayout() const { if (!d->m_dockRegistry->isSane()) { KDDW_ERROR("Refusing to serialize this layout. Check previous warnings."); - return {}; + return { }; } LayoutSaver::Layout layout; @@ -631,7 +631,7 @@ bool LayoutSaver::restoreLayout(const QByteArray &data) flags.setFlag(FloatingWindowFlag::StartsMinimized, int(fw.windowState) & int(WindowState::Minimized)); auto floatingWindow = - new Core::FloatingWindow({}, parent, flags); + new Core::FloatingWindow({ }, parent, flags); fw.floatingWindowInstance = floatingWindow; d->deserializeWindowGeometry(fw, floatingWindow->view()->window()); if (!floatingWindow->deserialize(fw)) { @@ -862,7 +862,7 @@ Vector LayoutSaver::openedDockWidgetsInLayout(const QString &jsonFilena const QByteArray data = Platform::instance()->readFile(jsonFilename, /*by-ref*/ ok); if (!ok) - return {}; + return { }; return openedDockWidgetsInLayout(data); } @@ -871,7 +871,7 @@ Vector LayoutSaver::openedDockWidgetsInLayout(const QByteArray &seriali { LayoutSaver::Layout layout; if (!layout.fromJson(serialized)) - return {}; + return { }; Vector names; names.reserve(layout.allDockWidgets.size()); // over-reserve so we have a single allocation @@ -895,7 +895,7 @@ Vector LayoutSaver::sideBarDockWidgetsInLayout(const QString &jsonFilen const QByteArray data = Platform::instance()->readFile(jsonFilename, /*by-ref*/ ok); if (!ok) - return {}; + return { }; return sideBarDockWidgetsInLayout(data); } @@ -904,7 +904,7 @@ Vector LayoutSaver::sideBarDockWidgetsInLayout(const QByteArray &serial { LayoutSaver::Layout layout; if (!layout.fromJson(serialized)) - return {}; + return { }; Vector names; names.reserve(layout.allDockWidgets.size()); // over-reserve so we have a single allocation @@ -933,8 +933,8 @@ static void to_json(nlohmann::json &j, const LayoutSaver::Layout &layout) static void from_json(const nlohmann::json &j, LayoutSaver::Layout &layout) { layout.serializationVersion = j.value("serializationVersion", 0); - layout.mainWindows = j.value("mainWindows", LayoutSaver::MainWindow::List {}); - layout.allDockWidgets = j.value("allDockWidgets", LayoutSaver::DockWidget::List {}); + layout.mainWindows = j.value("mainWindows", LayoutSaver::MainWindow::List { }); + layout.allDockWidgets = j.value("allDockWidgets", LayoutSaver::DockWidget::List { }); layout.closedDockWidgets.clear(); @@ -944,8 +944,8 @@ static void from_json(const nlohmann::json &j, LayoutSaver::Layout &layout) LayoutSaver::DockWidget::dockWidgetForName(name)); } - layout.floatingWindows = j.value("floatingWindows", LayoutSaver::FloatingWindow::List {}); - layout.screenInfo = j.value("screenInfo", LayoutSaver::ScreenInfo::List {}); + layout.floatingWindows = j.value("floatingWindows", LayoutSaver::FloatingWindow::List { }); + layout.screenInfo = j.value("screenInfo", LayoutSaver::ScreenInfo::List { }); } } @@ -1021,7 +1021,7 @@ void LayoutSaver::Layout::scaleSizes(InternalRestoreOptions options) LayoutSaver::MainWindow LayoutSaver::Layout::mainWindowForIndex(int index) const { if (index < 0 || index >= mainWindows.size()) - return {}; + return { }; return mainWindows.at(index); } @@ -1029,7 +1029,7 @@ LayoutSaver::MainWindow LayoutSaver::Layout::mainWindowForIndex(int index) const LayoutSaver::FloatingWindow LayoutSaver::Layout::floatingWindowForIndex(int index) const { if (index < 0 || index >= floatingWindows.size()) - return {}; + return { }; return floatingWindows.at(index); } @@ -1147,7 +1147,7 @@ bool LayoutSaver::Group::skipsRestore() const LayoutSaver::DockWidget::Ptr LayoutSaver::Group::singleDockWidget() const { if (!hasSingleDockWidget()) - return {}; + return { }; return dockWidgets.first(); } @@ -1238,7 +1238,7 @@ bool LayoutSaver::MultiSplitter::hasSingleDockWidget() const LayoutSaver::DockWidget::Ptr LayoutSaver::MultiSplitter::singleDockWidget() const { if (!hasSingleDockWidget()) - return {}; + return { }; const auto &group = groups.begin()->second; return group.singleDockWidget(); @@ -1256,7 +1256,7 @@ LayoutSaver::Group LayoutSaver::MultiSplitter::centralGroup() const if (group.options & FrameOption_IsCentralFrame) return group; } - return {}; + return { }; } void LayoutSaver::Position::scaleSizes(const ScalingInfo &scalingInfo) diff --git a/src/QtCompat_p.h b/src/QtCompat_p.h index c7f88878b..30ba65bbb 100644 --- a/src/QtCompat_p.h +++ b/src/QtCompat_p.h @@ -166,7 +166,7 @@ class HoverEvent : public Event Point pos() const { - return {}; + return { }; } }; @@ -218,7 +218,7 @@ class DropEvent : public Event Point position() const { - return {}; + return { }; } void setDropAction(Qt::DropAction) @@ -245,7 +245,7 @@ class FocusEvent : public Event public: Qt::FocusReason reason() const { - return {}; + return { }; } }; diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 248c70daa..001ec5f40 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -75,7 +75,7 @@ Rect Controller::rect() const if (d->m_view) return d->m_view->rect(); - return {}; + return { }; } Point Controller::mapToGlobal(Point localPt) const diff --git a/src/core/DockRegistry.h b/src/core/DockRegistry.h index f6aca2efb..f61ee72bd 100644 --- a/src/core/DockRegistry.h +++ b/src/core/DockRegistry.h @@ -92,7 +92,7 @@ class DOCKS_EXPORT DockRegistry : public QObject, public Core::EventFilterInterf Q_INVOKABLE bool containsMainWindow(const QString &uniqueName) const; Q_INVOKABLE KDDockWidgets::Core::DockWidget * - dockByName(const QString &, KDDockWidgets::DockRegistry::DockByNameFlags = {}) const; + dockByName(const QString &, KDDockWidgets::DockRegistry::DockByNameFlags = { }) const; Q_INVOKABLE KDDockWidgets::Core::MainWindow *mainWindowByName(const QString &) const; bool isSane() const; @@ -162,7 +162,7 @@ class DOCKS_EXPORT DockRegistry : public QObject, public Core::EventFilterInterf * @param affinities if specified only closes dock widgets and main windows with the specified * affinities */ - Q_INVOKABLE void clear(const QVector &affinities = {}); + Q_INVOKABLE void clear(const QVector &affinities = { }); /** * @brief clear Overload that only clears the specified dockWidgets and main windows. diff --git a/src/core/DockWidget.cpp b/src/core/DockWidget.cpp index 2f75f6280..2d2900952 100644 --- a/src/core/DockWidget.cpp +++ b/src/core/DockWidget.cpp @@ -406,7 +406,7 @@ Icon DockWidget::icon(IconPlace place) const if (place == IconPlace::ToggleAction) return d->toggleAction->icon(); - return {}; + return { }; } void DockWidget::forceClose() @@ -722,7 +722,7 @@ Point DockWidget::Private::defaultCenterPosForFloating() // main than the others MainWindow *mw = mainWindows.isEmpty() ? nullptr : mainWindows.constFirst(); if (!mw || !q->isFloating()) - return {}; + return { }; return mw->geometry().center(); } diff --git a/src/core/DockWidget.h b/src/core/DockWidget.h index 0093e1c26..efa3120ab 100644 --- a/src/core/DockWidget.h +++ b/src/core/DockWidget.h @@ -72,8 +72,8 @@ class DOCKS_EXPORT DockWidget : public Controller * There's no parent argument. The DockWidget is either parented to FloatingWindow or MainWindow * when visible, or stays without a parent when hidden. */ - explicit DockWidget(View *view, const QString &uniqueName, DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}); + explicit DockWidget(View *view, const QString &uniqueName, DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }); ///@brief destructor ~DockWidget() override; @@ -89,7 +89,7 @@ class DOCKS_EXPORT DockWidget : public Controller * @sa MainWindow::addDockWidget(), DockWidget::addDockWidgetToContainingWindow() */ void addDockWidgetAsTab(KDDockWidgets::Core::DockWidget *other, - const KDDockWidgets::InitialOption &initialOption = {}); + const KDDockWidgets::InitialOption &initialOption = { }); /** * @brief docks @p other widget into the window that contains this one. @@ -108,7 +108,7 @@ class DOCKS_EXPORT DockWidget : public Controller addDockWidgetToContainingWindow(KDDockWidgets::Core::DockWidget *other, KDDockWidgets::Location location, KDDockWidgets::Core::DockWidget *relativeTo = nullptr, - const KDDockWidgets::InitialOption &initialOption = {}); + const KDDockWidgets::InitialOption &initialOption = { }); /** * @brief sets the widget which this dock widget hosts. diff --git a/src/core/DropArea.cpp b/src/core/DropArea.cpp index 950ca9d71..1f6f0279c 100644 --- a/src/core/DropArea.cpp +++ b/src/core/DropArea.cpp @@ -118,7 +118,7 @@ DropArea::DropArea(View *parent, MainWindowOptions options, bool isMDIWrapper) } if (d->m_centralGroup) - addWidget(d->m_centralGroup->view(), KDDockWidgets::Location_OnTop, {}); + addWidget(d->m_centralGroup->view(), KDDockWidgets::Location_OnTop, { }); } DropArea::~DropArea() @@ -278,7 +278,7 @@ Vector DropArea::affinities() const return fw->affinities(); } - return {}; + return { }; } void DropArea::layoutParentContainerEqually(Core::DockWidget *dw) @@ -707,7 +707,7 @@ Rect DropArea::rectForDrop(const WindowBeingDragged *wbd, Location location, { Core::Item item(nullptr); if (!wbd) - return {}; + return { }; item.setSize(wbd->size().boundedTo(wbd->maxSize())); item.setMinSize(wbd->minSize()); diff --git a/src/core/DropArea.h b/src/core/DropArea.h index f64cf9b47..fa625e78f 100644 --- a/src/core/DropArea.h +++ b/src/core/DropArea.h @@ -67,7 +67,7 @@ class DOCKS_EXPORT DropArea : public Layout Core::Item *centralFrame() const; DropIndicatorOverlay *dropIndicatorOverlay() const; void addDockWidget(DockWidget *dw, KDDockWidgets::Location location, DockWidget *relativeTo, - const InitialOption &initialOption = {}); + const InitialOption &initialOption = { }); void _addDockWidget(DockWidget *dw, KDDockWidgets::Location location, Item *relativeTo, const InitialOption &initialOption); diff --git a/src/core/FloatingWindow.cpp b/src/core/FloatingWindow.cpp index ebcf5e27c..384dc1b42 100644 --- a/src/core/FloatingWindow.cpp +++ b/src/core/FloatingWindow.cpp @@ -63,7 +63,7 @@ static FloatingWindowFlags floatingWindowFlagsForGroup(Group *group) } /** static */ -Qt::WindowFlags FloatingWindow::s_windowFlagsOverride = {}; +Qt::WindowFlags FloatingWindow::s_windowFlagsOverride = { }; static Qt::WindowFlags windowFlagsToUse(FloatingWindowFlags requestedFlags) { @@ -257,7 +257,7 @@ FloatingWindow::FloatingWindow(Core::Group *group, Rect suggestedGeometry, // Adding a widget will trigger onFrameCountChanged, which triggers a setVisible(true). // The problem with setVisible(true) will forget about or requested geometry and place the // window at 0,0 So disable the setVisible(true) call while in the ctor. - d->m_dropArea->addWidget(group->view(), KDDockWidgets::Location_OnTop, {}); + d->m_dropArea->addWidget(group->view(), KDDockWidgets::Location_OnTop, { }); } if (!suggestedGeometry.isNull()) @@ -823,7 +823,7 @@ static FloatingWindowFlags flagsForFloatingWindow(FloatingWindowFlags requestedF // Use from KDDockWidgets::Config instead. This is app-wide and not per window. - FloatingWindowFlags flags = {}; + FloatingWindowFlags flags = { }; if ((Config::self().flags() & Config::Flag_TitleBarHasMinimizeButton) == Config::Flag_TitleBarHasMinimizeButton) diff --git a/src/core/FloatingWindow.h b/src/core/FloatingWindow.h index 6c9598560..e84737a53 100644 --- a/src/core/FloatingWindow.h +++ b/src/core/FloatingWindow.h @@ -169,7 +169,7 @@ class DOCKS_EXPORT FloatingWindow : public Controller, public Draggable /// @brief Adds the dock widget to the specified location void addDockWidget(DockWidget *, KDDockWidgets::Location location, DockWidget *relativeTo, - const InitialOption & = {}); + const InitialOption & = { }); /// @brief Returns the MainWindow which is the transient parent of this FloatingWindow /// Can be nullptr if you create dock widgets before the main window. Can also be some diff --git a/src/core/Group.cpp b/src/core/Group.cpp index f271fed22..7f09c38ea 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -329,7 +329,7 @@ FloatingWindow *Group::detachTab(DockWidget *dockWidget) // We're potentially already dead at this point, as groups with 0 tabs auto-destruct. Don't // access members from this point. - auto floatingWindow = new FloatingWindow(newGroup, {}); + auto floatingWindow = new FloatingWindow(newGroup, { }); r.moveTopLeft(globalPoint); floatingWindow->setSuggestedGeometry(r, SuggestedGeometryHint_GeometryIsFromDocked); floatingWindow->view()->show(); @@ -527,7 +527,7 @@ Icon Group::icon() const Core::DockWidget::List Group::dockWidgets() const { if (m_inCtor || m_inDtor) - return {}; + return { }; DockWidget::List dockWidgets; const int count = dockWidgetCount(); @@ -687,7 +687,7 @@ Vector Group::affinities() const if (isEmpty()) { if (auto m = mainWindow()) return m->affinities(); - return {}; + return { }; } else { return dockWidgetAt(0)->affinities(); } @@ -892,7 +892,7 @@ Rect Group::dragRect() const if (auto gvi = dynamic_cast(view())) return gvi->dragRect(); - return {}; + return { }; } MainWindow *Group::mainWindow() const diff --git a/src/core/Group.h b/src/core/Group.h index cc3bb8ac6..a274234ef 100644 --- a/src/core/Group.h +++ b/src/core/Group.h @@ -52,14 +52,14 @@ class DOCKS_EXPORT Group : public Controller, public FocusScope LayoutSaver::Group serialize(const Vector &affinityNames) const; ///@brief Adds a widget into the Group's Stack - void addTab(DockWidget *, const InitialOption & = {}); + void addTab(DockWidget *, const InitialOption & = { }); ///@overload - void addTab(Group *, const InitialOption & = {}); + void addTab(Group *, const InitialOption & = { }); ///@overload - void addTab(FloatingWindow *floatingWindow, const InitialOption & = {}); + void addTab(FloatingWindow *floatingWindow, const InitialOption & = { }); ///@brief Inserts a widget into the Group's TabWidget at @p index - void insertWidget(DockWidget *, int index, const InitialOption & = {}); + void insertWidget(DockWidget *, int index, const InitialOption & = { }); ///@brief removes a dockwidget from the group void removeWidget(DockWidget *); diff --git a/src/core/Layout.cpp b/src/core/Layout.cpp index 25293ab0c..910779436 100644 --- a/src/core/Layout.cpp +++ b/src/core/Layout.cpp @@ -259,7 +259,7 @@ Core::Group::List Layout::groupsFrom(View *groupOrMultiSplitter) const if (auto msw = groupOrMultiSplitter->asDropAreaController()) return msw->groups(); - return {}; + return { }; } Core::Group::List Layout::groups() const diff --git a/src/core/LayoutSaver_p.h b/src/core/LayoutSaver_p.h index d60f06ff9..0dd3be012 100644 --- a/src/core/LayoutSaver_p.h +++ b/src/core/LayoutSaver_p.h @@ -343,7 +343,7 @@ class DOCKS_EXPORT LayoutSaver::Private void clearRestoredProperty(); DockRegistry *const m_dockRegistry; - InternalRestoreOptions m_restoreOptions = {}; + InternalRestoreOptions m_restoreOptions = { }; Vector m_affinityNames; /// If a layout is restored but the dock widget doesn't exist, we store its last position here diff --git a/src/core/MDILayout.h b/src/core/MDILayout.h index 19990f00e..a00248847 100644 --- a/src/core/MDILayout.h +++ b/src/core/MDILayout.h @@ -38,7 +38,7 @@ class DOCKS_EXPORT MDILayout : public Layout /// @brief docks the dock widgets into this MDI area, at the specified position void addDockWidget(Core::DockWidget *dw, Point localPt, - const InitialOption &addingOption = {}); + const InitialOption &addingOption = { }); /// @brief Moves a dock widget @p dw to point @p pos void moveDockWidget(Core::DockWidget *dw, Point pos); diff --git a/src/core/MainWindow.cpp b/src/core/MainWindow.cpp index eb37a4c6e..de89f079e 100644 --- a/src/core/MainWindow.cpp +++ b/src/core/MainWindow.cpp @@ -282,7 +282,7 @@ Rect MainWindow::Private::rectForOverlay(Core::Group *group, SideBarLocation loc { Core::SideBar *sb = q->sideBar(location); if (!sb) - return {}; + return { }; const Rect centralAreaGeo = q->centralAreaGeometry(); const Margins centerWidgetMargins = q->centerWidgetMargins(); @@ -835,7 +835,7 @@ std::shared_ptr MainWindow::persistentCentralView() const if (auto dw = d->m_persistentCentralDockWidget) return dw->guestView(); - return {}; + return { }; } void MainWindow::setContentsMargins(int left, int top, int right, int bottom) diff --git a/src/core/MainWindow.h b/src/core/MainWindow.h index 3460e08d1..97d0382d1 100644 --- a/src/core/MainWindow.h +++ b/src/core/MainWindow.h @@ -90,7 +90,7 @@ class DOCKS_EXPORT MainWindow : public Controller void addDockWidget(KDDockWidgets::Core::DockWidget *dockWidget, KDDockWidgets::Location location, KDDockWidgets::Core::DockWidget *relativeTo = nullptr, - const KDDockWidgets::InitialOption &initialOption = {}); + const KDDockWidgets::InitialOption &initialOption = { }); // dev mode only for now, as it still has bugs. // We need to be able to dock to relativeTo=hidden dock @@ -113,7 +113,7 @@ class DOCKS_EXPORT MainWindow : public Controller * which is actually equivalent to addDockWidget(D2, Location_onBottom, /relativeTo=/D1); */ void addDockWidgetToSide(KDDockWidgets::Core::DockWidget *dockWidget, - KDDockWidgets::Location location, const KDDockWidgets::InitialOption &initialOption = {}); + KDDockWidgets::Location location, const KDDockWidgets::InitialOption &initialOption = { }); /** * @brief Sets a persistent central widget. It can't be detached. * diff --git a/src/core/Platform.cpp b/src/core/Platform.cpp index 949a80cc0..d7db17211 100644 --- a/src/core/Platform.cpp +++ b/src/core/Platform.cpp @@ -291,7 +291,7 @@ QByteArray Platform::readFile(const QString &fileName, bool &ok) const if (!file.is_open()) { KDDW_ERROR("Failed to open {}", fileName); ok = false; - return {}; + return { }; } QByteArray data; diff --git a/src/core/Platform.h b/src/core/Platform.h index 061046873..8ff8e979f 100644 --- a/src/core/Platform.h +++ b/src/core/Platform.h @@ -291,7 +291,7 @@ class DOCKS_EXPORT Platform virtual Core::MainWindow * createMainWindow(const QString &uniqueName, CreateViewOptions, MainWindowOptions options = MainWindowOption_HasCentralGroup, - View *parent = nullptr, Qt::WindowFlags = {}) const = 0; + View *parent = nullptr, Qt::WindowFlags = { }) const = 0; virtual void pauseForDebugger(); @@ -351,7 +351,7 @@ struct SetExpectedWarning struct CreateViewOptions { bool isVisible = false; - Size sizeHint = {}; + Size sizeHint = { }; Size minSize = { 0, 0 }; Size maxSize = Size(16777215, 16777215); Size size = { 1000, 1000 }; diff --git a/src/core/Position_p.h b/src/core/Position_p.h index 90ea85291..932f0996d 100644 --- a/src/core/Position_p.h +++ b/src/core/Position_p.h @@ -58,7 +58,7 @@ class DOCKS_EXPORT_FOR_UNIT_TESTS Positions ~Positions(); void deserialize(const LayoutSaver::Position &); - LayoutSaver::Position serialize(const Vector &affinityNames = {}) const; + LayoutSaver::Position serialize(const Vector &affinityNames = { }) const; ///@brief The tab index in case the dock widget was in a TabWidget, -1 otherwise. int m_tabIndex = -1; diff --git a/src/core/Stack.cpp b/src/core/Stack.cpp index 5a9985435..b6c99fba7 100644 --- a/src/core/Stack.cpp +++ b/src/core/Stack.cpp @@ -125,7 +125,7 @@ std::unique_ptr Stack::makeWindow() const Point globalPoint = view()->mapToGlobal(Point(0, 0)); - auto floatingWindow = new FloatingWindow(d->m_group, {}); + auto floatingWindow = new FloatingWindow(d->m_group, { }); r.moveTopLeft(globalPoint); floatingWindow->setSuggestedGeometry(r, SuggestedGeometryHint_GeometryIsFromDocked); floatingWindow->view()->show(); diff --git a/src/core/Stack_p.h b/src/core/Stack_p.h index 76b4108a6..c1ce837be 100644 --- a/src/core/Stack_p.h +++ b/src/core/Stack_p.h @@ -47,7 +47,7 @@ class Stack::Private Group *const m_group; bool m_tabBarAutoHide = true; const StackOptions m_options; - TitleBarButtonTypes m_buttonsToHideIfDisabled = {}; + TitleBarButtonTypes m_buttonsToHideIfDisabled = { }; }; } diff --git a/src/core/TabBar.cpp b/src/core/TabBar.cpp index 76f3d44aa..6c028e76a 100644 --- a/src/core/TabBar.cpp +++ b/src/core/TabBar.cpp @@ -188,16 +188,16 @@ std::unique_ptr Core::TabBar::makeWindow() if (dock && hasSingleDockWidget() && alwaysShowTabs) { // Case #3. window with title bar and single tab, no detaching should happen, just use // the title bar. - return {}; + return { }; } } if (!dock) - return {}; + return { }; FloatingWindow *floatingWindow = group()->detachTab(dock); if (!floatingWindow) - return {}; + return { }; auto draggable = KDDockWidgets::usesNativeTitleBar() ? static_cast(floatingWindow) : static_cast(this); @@ -287,7 +287,7 @@ QString Core::TabBar::text(int index) const if (auto tvi = dynamic_cast(view())) return tvi->text(index); - return {}; + return { }; } Rect Core::TabBar::rectForTab(int index) const @@ -295,7 +295,7 @@ Rect Core::TabBar::rectForTab(int index) const if (auto tvi = dynamic_cast(view())) return tvi->rectForTab(index); - return {}; + return { }; } DockWidget *TabBar::currentDockWidget() const diff --git a/src/core/TitleBar.cpp b/src/core/TitleBar.cpp index 7752e54ab..6b037185f 100644 --- a/src/core/TitleBar.cpp +++ b/src/core/TitleBar.cpp @@ -579,7 +579,7 @@ bool TitleBar::closeButtonEnabled() const std::unique_ptr TitleBar::makeWindow() { if (m_isStandalone) - return {}; // not applicable + return { }; // not applicable if (!isVisible() && view()->rootView()->controller()->isVisible() && !(Config::self().flags() & Config::Flag_ShowButtonsOnTabBarIfTitleBarHidden)) { @@ -595,7 +595,7 @@ std::unique_ptr TitleBar::makeWindow() } assert(false); - return {}; + return { }; } if (m_floatingWindow) { @@ -614,7 +614,7 @@ std::unique_ptr TitleBar::makeWindow() Rect r = m_group->view()->geometry(); r.moveTopLeft(m_group->mapToGlobal(Point(0, 0))); - auto floatingWindow = new Core::FloatingWindow(m_group, {}); + auto floatingWindow = new Core::FloatingWindow(m_group, { }); floatingWindow->setSuggestedGeometry(r, SuggestedGeometryHint_GeometryIsFromDocked); floatingWindow->view()->show(); @@ -643,10 +643,10 @@ Core::DockWidget::List TitleBar::dockWidgets() const return m_group->dockWidgets(); if (m_isStandalone) - return {}; // not applicable + return { }; // not applicable KDDW_ERROR("TitleBar::dockWidget: shouldn't happen"); - return {}; + return { }; } Core::DockWidget *TitleBar::singleDockWidget() const diff --git a/src/core/TitleBar_p.h b/src/core/TitleBar_p.h index 76404b0bf..dc900f310 100644 --- a/src/core/TitleBar_p.h +++ b/src/core/TitleBar_p.h @@ -48,8 +48,8 @@ class TitleBar::Private KDBindings::ScopedConnection numDockWidgetsChangedConnection; /// Buttons which are forcibly hidden by the user's requirements (overriding kddw's default business logic) - TitleBarButtonTypes m_userHiddenButtonTypes = {}; - TitleBarButtonTypes m_buttonsToHideIfDisabled = {}; + TitleBarButtonTypes m_userHiddenButtonTypes = { }; + TitleBarButtonTypes m_buttonsToHideIfDisabled = { }; }; } diff --git a/src/core/View.cpp b/src/core/View.cpp index 8a95b2e8e..7adff4ddc 100644 --- a/src/core/View.cpp +++ b/src/core/View.cpp @@ -193,7 +193,7 @@ Size View::screenSize() const if (auto screen = d->screen()) return screen->size(); - return {}; + return { }; } Controller *View::controller() const @@ -330,7 +330,7 @@ Size View::Private::parentSize() const { if (auto p = q->parentView()) return p->size(); - return {}; + return { }; } Rect View::Private::windowGeometry() const @@ -338,7 +338,7 @@ Rect View::Private::windowGeometry() const if (Core::Window::Ptr window = q->window()) return window->geometry(); - return {}; + return { }; } void View::Private::closeRootView() @@ -433,7 +433,7 @@ std::shared_ptr View::Private::transientWindow() const if (auto w = q->window()) return w->transientParent(); - return {}; + return { }; } bool View::onResize(int w, int h) diff --git a/src/core/ViewFactory.h b/src/core/ViewFactory.h index 539513f6a..76d4ca032 100644 --- a/src/core/ViewFactory.h +++ b/src/core/ViewFactory.h @@ -65,9 +65,9 @@ class DOCKS_EXPORT ViewFactory : public Core::Object /// @brief Creates a dock widget. This is only used by MainWindow's persistent widget feature. /// In all other cases users will instantiate DockWidget directly - virtual View *createDockWidget(const QString &uniqueName, DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}, - Qt::WindowFlags windowFlags = {}) const = 0; + virtual View *createDockWidget(const QString &uniqueName, DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }, + Qt::WindowFlags windowFlags = { }) const = 0; ///@brief Called by the framework to create a Frame view @@ -103,7 +103,7 @@ class DOCKS_EXPORT ViewFactory : public Core::Object ///@param parent Just forward to FloatingWindow's constructor. virtual View *createFloatingWindow(Core::FloatingWindow *controller, Core::MainWindow *parent = nullptr, - Qt::WindowFlags windowFlags = {}) const = 0; + Qt::WindowFlags windowFlags = { }) const = 0; /// @brief Creates the window that will show the actual drop indicators. They need a higher diff --git a/src/core/WidgetResizeHandler.cpp b/src/core/WidgetResizeHandler.cpp index 95377ad70..25802f7ed 100644 --- a/src/core/WidgetResizeHandler.cpp +++ b/src/core/WidgetResizeHandler.cpp @@ -383,7 +383,7 @@ bool WidgetResizeHandler::handleWindowsNativeEvent(Core::FloatingWindow *fw, return ret; } else if (msg->message == WM_NCLBUTTONDBLCLK) { if ((Config::self().flags() & Config::Flag_DoubleClickMaximizes)) { - return handleWindowsNativeEvent(fw->view()->window(), msg, result, {}); + return handleWindowsNativeEvent(fw->view()->window(), msg, result, { }); } else { // Let the title bar handle it. It will re-dock the window. if (Core::TitleBar *titleBar = fw->titleBar()) { @@ -396,7 +396,7 @@ bool WidgetResizeHandler::handleWindowsNativeEvent(Core::FloatingWindow *fw, } } - return handleWindowsNativeEvent(fw->view()->window(), msg, result, {}); + return handleWindowsNativeEvent(fw->view()->window(), msg, result, { }); } bool WidgetResizeHandler::handleWindowsNativeEvent(Core::Window::Ptr w, MSG *msg, diff --git a/src/core/WindowBeingDragged.cpp b/src/core/WindowBeingDragged.cpp index bbd23bf6d..550daa9aa 100644 --- a/src/core/WindowBeingDragged.cpp +++ b/src/core/WindowBeingDragged.cpp @@ -165,7 +165,7 @@ Size WindowBeingDragged::minSize() const if (m_floatingWindow) return m_floatingWindow->layout()->layoutMinimumSize(); - return {}; + return { }; } Size WindowBeingDragged::maxSize() const @@ -173,7 +173,7 @@ Size WindowBeingDragged::maxSize() const if (m_floatingWindow) return m_floatingWindow->layout()->layoutMaximumSizeHint(); - return {}; + return { }; } bool WindowBeingDragged::contains(Layout *layout) const @@ -198,7 +198,7 @@ Vector WindowBeingDragged::dockWidgets() const if (m_floatingWindow) return m_floatingWindow->dockWidgets(); - return {}; + return { }; } Draggable *WindowBeingDragged::draggable() const @@ -208,7 +208,7 @@ Draggable *WindowBeingDragged::draggable() const Pixmap WindowBeingDragged::pixmap() const { - return {}; + return { }; } FloatingWindow *WindowBeingDragged::floatingWindow() const @@ -281,7 +281,7 @@ Pixmap WindowBeingDraggedWayland::pixmap() const return pixmap; #else // Wayland not support on our flutter frontend yet - return {}; + return { }; #endif } @@ -294,7 +294,7 @@ Vector WindowBeingDraggedWayland::affinities() const else if (m_dockWidget) return { m_dockWidget->affinities() }; - return {}; + return { }; } Vector WindowBeingDraggedWayland::dockWidgets() const @@ -306,7 +306,7 @@ Vector WindowBeingDraggedWayland::dockWidgets() const else if (m_dockWidget) return { m_dockWidget }; - return {}; + return { }; } bool WindowBeingDraggedWayland::isInWaylandDrag(Group *group) const @@ -341,7 +341,7 @@ Size WindowBeingDraggedWayland::minSize() const } KDDW_ERROR("Unknown minSize, shouldn't happen"); - return {}; + return { }; } Size WindowBeingDraggedWayland::maxSize() const @@ -355,5 +355,5 @@ Size WindowBeingDraggedWayland::maxSize() const } KDDW_ERROR("Unknown maxSize, shouldn't happen"); - return {}; + return { }; } diff --git a/src/core/WindowZOrder_x11_p.h b/src/core/WindowZOrder_x11_p.h index 386bcd02a..1b9386898 100644 --- a/src/core/WindowZOrder_x11_p.h +++ b/src/core/WindowZOrder_x11_p.h @@ -71,7 +71,7 @@ static Window::List orderedWindows(bool &ok) ok = true; Window::List windows = DockRegistry::self()->topLevels(); if (windows.isEmpty()) - return {}; + return { }; for (Core::FloatingWindow *fw : DockRegistry::self()->floatingWindows()) { if (fw->anyNoDrops()) { @@ -98,7 +98,7 @@ static Core::Window::List orderedWindows(bool &ok) { KDDW_UNUSED(ok); Q_UNREACHABLE(); - return {}; + return { }; } } diff --git a/src/core/indicators/NullDropIndicatorOverlay.h b/src/core/indicators/NullDropIndicatorOverlay.h index b4089f31c..0caf01f92 100644 --- a/src/core/indicators/NullDropIndicatorOverlay.h +++ b/src/core/indicators/NullDropIndicatorOverlay.h @@ -30,18 +30,18 @@ class DOCKS_EXPORT NullDropIndicatorOverlay : public DropIndicatorOverlay ~NullDropIndicatorOverlay() override; DropLocation hover_impl(Point) override { - return {}; + return { }; } DropLocation dropLocationForPos(Point) const { - return {}; + return { }; } protected: Point posForIndicator(DropLocation) const override { - return {}; + return { }; } }; diff --git a/src/core/indicators/SegmentedDropIndicatorOverlay.cpp b/src/core/indicators/SegmentedDropIndicatorOverlay.cpp index c43bcd378..43430d65d 100644 --- a/src/core/indicators/SegmentedDropIndicatorOverlay.cpp +++ b/src/core/indicators/SegmentedDropIndicatorOverlay.cpp @@ -161,7 +161,7 @@ void SegmentedDropIndicatorOverlay::updateSegments() Point SegmentedDropIndicatorOverlay::posForIndicator(DropLocation) const { /// Doesn't apply to segmented indicators, completely different concept - return {}; + return { }; } Point SegmentedDropIndicatorOverlay::hoveredPt() const diff --git a/src/core/indicators/SegmentedDropIndicatorOverlay.h b/src/core/indicators/SegmentedDropIndicatorOverlay.h index e723e88d5..f26000e50 100644 --- a/src/core/indicators/SegmentedDropIndicatorOverlay.h +++ b/src/core/indicators/SegmentedDropIndicatorOverlay.h @@ -44,7 +44,7 @@ class DOCKS_EXPORT SegmentedDropIndicatorOverlay : public DropIndicatorOverlay private: std::unordered_map segmentsForRect(Rect, bool inner, bool useOffset = false) const; void updateSegments(); - Point m_hoveredPt = {}; + Point m_hoveredPt = { }; std::unordered_map m_segments; }; diff --git a/src/core/layouting/Item.cpp b/src/core/layouting/Item.cpp index 94d80cbfc..fad0c734a 100644 --- a/src/core/layouting/Item.cpp +++ b/src/core/layouting/Item.cpp @@ -438,7 +438,7 @@ void Item::setParentContainer(ItemContainer *parent) if (ceasingToBeRoot && !c->hasVisibleChildren()) { // Was root but is not root anymore. So, if empty, then it has an empty rect too. // Only root can have a non-empty rect without having children - c->setGeometry({}); + c->setGeometry({ }); } } @@ -1580,7 +1580,7 @@ void ItemBoxContainer::insertItem(Item *item, Location loc, m_children.clear(); setOrientation(oppositeOrientation(d->m_orientation)); - insertItem(container, 0, {}); + insertItem(container, 0, { }); // Now we have the correct orientation, we can insert insertItem(item, loc, initialOption); @@ -1664,22 +1664,22 @@ Rect ItemBoxContainer::suggestedDropRect(const Item *item, const Item *relativeT if (relativeTo && !relativeTo->parentContainer()) { KDDW_ERROR("No parent container"); - return {}; + return { }; } if (relativeTo && relativeTo->parentContainer() != this) { KDDW_ERROR("Called on the wrong container"); - return {}; + return { }; } if (relativeTo && !relativeTo->isVisible()) { KDDW_ERROR("relative to isn't visible"); - return {}; + return { }; } if (loc == Location_None) { KDDW_ERROR("Invalid location"); - return {}; + return { }; } const Size availableSize = root()->availableSize(); @@ -1697,7 +1697,7 @@ Rect ItemBoxContainer::suggestedDropRect(const Item *item, const Item *relativeT root()->to_json(rootSerialized); ItemBoxContainer rootCopy(nullptr); - rootCopy.fillFromJson(rootSerialized, {}); + rootCopy.fillFromJson(rootSerialized, { }); if (relativeTo) relativeTo = rootCopy.d->itemFromPath(relativeTo->pathFromRoot()); @@ -1705,7 +1705,7 @@ Rect ItemBoxContainer::suggestedDropRect(const Item *item, const Item *relativeT nlohmann::json itemSerialized; item->to_json(itemSerialized); auto itemCopy = new Item(nullptr); - itemCopy->fillFromJson(itemSerialized, {}); + itemCopy->fillFromJson(itemSerialized, { }); const InitialOption opt = DefaultSizeMode::FairButFloor; if (relativeTo) { @@ -1782,7 +1782,7 @@ Rect ItemBoxContainer::suggestedDropRectFallback(const Item *item, const Item *r rect.adjust(0, rect.bottom() - suggestedLength, 0, 0); break; case Location_None: - return {}; + return { }; } return rect; @@ -1791,7 +1791,7 @@ Rect ItemBoxContainer::suggestedDropRectFallback(const Item *item, const Item *r KDDW_ERROR("Shouldn't happen"); } - return {}; + return { }; } void ItemBoxContainer::positionItems() @@ -2837,11 +2837,11 @@ LengthOnSide ItemBoxContainer::lengthOnSide(const SizingInfo::List &sizes, int f Qt::Orientation o) const { if (fromIndex < 0) - return {}; + return { }; const auto count = sizes.count(); if (fromIndex >= count) - return {}; + return { }; int start = 0; int end = -1; @@ -3270,7 +3270,7 @@ Vector ItemBoxContainer::calculateSqueezes( if (numDonors == 0) { root()->dumpLayout(); assert(false); - return {}; + return { }; } int toTake = missing / numDonors; @@ -3606,10 +3606,10 @@ void ItemBoxContainer::fillFromJson(const nlohmann::json &j, ScopedValueRollback deserializing(d->m_isDeserializing, true); Item::fillFromJson(j, widgets); - d->m_orientation = Qt::Orientation(j.value("orientation", {})); + d->m_orientation = Qt::Orientation(j.value("orientation", { })); for (const auto &child : j.value("children", nlohmann::json::array())) { - const bool isContainer = child.value("isContainer", {}); + const bool isContainer = child.value("isContainer", { }); Item *childItem = isContainer ? new ItemBoxContainer(host(), this) : new Item(host(), this); childItem->fillFromJson(child, widgets); @@ -3984,7 +3984,7 @@ void Core::from_json(const nlohmann::json &j, SizingInfo &info) info.geometry = j.value("geometry", Rect()); info.minSize = j.value("minSize", Size()); info.maxSizeHint = j.value("maxSizeHint", Size()); - info.percentageWithinParent = j.value("percentageWithinParent", {}); + info.percentageWithinParent = j.value("percentageWithinParent", { }); } void Core::to_json(nlohmann::json &j, Item *item) diff --git a/src/core/layouting/Item_p.h b/src/core/layouting/Item_p.h index 3d0d20e3b..eb2c9aec6 100644 --- a/src/core/layouting/Item_p.h +++ b/src/core/layouting/Item_p.h @@ -424,7 +424,7 @@ class DOCKS_EXPORT ItemBoxContainer : public ItemContainer ~ItemBoxContainer(); void insertItem(Item *item, int index, const KDDockWidgets::InitialOption &option = KDDockWidgets::DefaultSizeMode::Fair); - void insertItem(Item *item, KDDockWidgets::Location, const KDDockWidgets::InitialOption & = {}); + void insertItem(Item *item, KDDockWidgets::Location, const KDDockWidgets::InitialOption & = { }); static void insertItemRelativeTo(Item *item, Item *relativeTo, KDDockWidgets::Location, diff --git a/src/core/layouting/LayoutingGuest_p.h b/src/core/layouting/LayoutingGuest_p.h index 93de1c962..22c864740 100644 --- a/src/core/layouting/LayoutingGuest_p.h +++ b/src/core/layouting/LayoutingGuest_p.h @@ -66,7 +66,7 @@ class DOCKS_EXPORT LayoutingGuest virtual std::string toDebugString() const { - return {}; + return { }; } KDBindings::Signal hostChanged; diff --git a/src/core/layouting/LayoutingHost_p.h b/src/core/layouting/LayoutingHost_p.h index 5a37e4005..516857877 100644 --- a/src/core/layouting/LayoutingHost_p.h +++ b/src/core/layouting/LayoutingHost_p.h @@ -40,10 +40,10 @@ class DOCKS_EXPORT LayoutingHost virtual bool supportsHonouringLayoutMinSize() const = 0; void insertItem(Core::LayoutingGuest *guest, KDDockWidgets::Location loc, - const InitialOption &initialOption = {}); + const InitialOption &initialOption = { }); void insertItemRelativeTo(Core::LayoutingGuest *guest, Core::LayoutingGuest *relativeTo, Location loc, - const InitialOption &initialOption = {}); + const InitialOption &initialOption = { }); Core::ItemContainer *m_rootItem = nullptr; diff --git a/src/core/views/DockWidgetViewInterface.h b/src/core/views/DockWidgetViewInterface.h index eabb03e3f..f1e41b708 100644 --- a/src/core/views/DockWidgetViewInterface.h +++ b/src/core/views/DockWidgetViewInterface.h @@ -53,12 +53,12 @@ class DOCKS_EXPORT DockWidgetViewInterface Vector affinities() const; void addDockWidgetAsTab(DockWidgetViewInterface *other, - const KDDockWidgets::InitialOption &initialOption = {}); + const KDDockWidgets::InitialOption &initialOption = { }); void addDockWidgetToContainingWindow(DockWidgetViewInterface *other, KDDockWidgets::Location location, DockWidgetViewInterface *relativeTo = nullptr, - const KDDockWidgets::InitialOption &initialOption = {}); + const KDDockWidgets::InitialOption &initialOption = { }); DockWidgetOptions options() const; void setOptions(DockWidgetOptions); diff --git a/src/core/views/GroupViewInterface.cpp b/src/core/views/GroupViewInterface.cpp index 0705cafb4..428e59a9a 100644 --- a/src/core/views/GroupViewInterface.cpp +++ b/src/core/views/GroupViewInterface.cpp @@ -35,7 +35,7 @@ Group *GroupViewInterface::group() const Rect GroupViewInterface::dragRect() const { - return {}; + return { }; } void GroupViewInterface::removeDockWidget(DockWidget *dw) diff --git a/src/core/views/MainWindowMDIViewInterface.h b/src/core/views/MainWindowMDIViewInterface.h index 1eb584b07..096d33e29 100644 --- a/src/core/views/MainWindowMDIViewInterface.h +++ b/src/core/views/MainWindowMDIViewInterface.h @@ -33,12 +33,12 @@ class DOCKS_EXPORT MainWindowMDIViewInterface ///@brief Docks @p dockWidget /// The widget will be placed at the specified position void addDockWidget(DockWidgetViewInterface *dockWidget, Point localPos, - const InitialOption &addingOption = {}); + const InitialOption &addingOption = { }); #ifdef KDDW_FRONTEND_QT ///@brief Convenience overload void addDockWidget(DockWidgetViewInterface *dockWidget, QPointF localPos, - const InitialOption &addingOption = {}); + const InitialOption &addingOption = { }); #endif private: diff --git a/src/core/views/MainWindowViewInterface.h b/src/core/views/MainWindowViewInterface.h index 4bb1ed5d6..173bb542f 100644 --- a/src/core/views/MainWindowViewInterface.h +++ b/src/core/views/MainWindowViewInterface.h @@ -52,7 +52,7 @@ class DOCKS_EXPORT MainWindowViewInterface void addDockWidgetAsTab(DockWidgetViewInterface *dockwidget); void addDockWidget(DockWidgetViewInterface *dockWidget, KDDockWidgets::Location location, DockWidgetViewInterface *relativeTo = nullptr, - const KDDockWidgets::InitialOption &initialOption = {}); + const KDDockWidgets::InitialOption &initialOption = { }); void moveToSideBar(DockWidgetViewInterface *); void moveToSideBar(DockWidgetViewInterface *, KDDockWidgets::SideBarLocation); @@ -69,7 +69,7 @@ class DOCKS_EXPORT MainWindowViewInterface void layoutParentContainerEqually(const QString &dockId); void addDockWidgetAsTab(const QString &dockId); void addDockWidget(const QString &dockId, KDDockWidgets::Location, - const QString &relativeToDockId = {}, const KDDockWidgets::InitialOption & = {}); + const QString &relativeToDockId = { }, const KDDockWidgets::InitialOption & = { }); void setPersistentCentralView(std::shared_ptr); diff --git a/src/layoutlinter_main.cpp b/src/layoutlinter_main.cpp index 0d9a45cad..0d482a2cc 100644 --- a/src/layoutlinter_main.cpp +++ b/src/layoutlinter_main.cpp @@ -36,11 +36,11 @@ struct LinterConfig struct MainWindow { std::string name; - MainWindowOptions options = {}; + MainWindowOptions options = { }; bool maximize = false; }; - RestoreOptions restoreOptions = {}; + RestoreOptions restoreOptions = { }; std::vector filesToLint; std::vector mainWindows; @@ -71,10 +71,10 @@ LinterConfig requestedLinterConfig(const QCommandLineParser &parser, const QStri const auto positionalArguments = parser.positionalArguments(); if (configFile.isEmpty() && positionalArguments.isEmpty()) { qWarning() << "Expected either a config file or positional arguments"; - return {}; + return { }; } else if (!configFile.isEmpty() && !positionalArguments.isEmpty()) { qWarning() << "Expected either a config file or positional arguments, not both"; - return {}; + return { }; } else if (!positionalArguments.isEmpty()) { std::transform(positionalArguments.begin(), positionalArguments.end(), std::back_inserter(c.filesToLint), [](const QString &str) { @@ -84,7 +84,7 @@ LinterConfig requestedLinterConfig(const QCommandLineParser &parser, const QStri QFile f(configFile); if (!f.open(QIODevice::ReadOnly)) { qWarning() << "Failed to open" << configFile; - return {}; + return { }; } const QByteArray jsonData = f.readAll(); QDir::setCurrent(QFileInfo(configFile).path()); @@ -107,7 +107,7 @@ static bool lint(const QString &filename, LinterConfig config, bool isVerbose) /// MainWindow factory for the easy cases. MainWindowFactoryFunc mwFunc = [](const QString &mwName, MainWindowOptions mainWindowOptions) { - return Platform::instance()->createMainWindow(mwName, {}, mainWindowOptions); + return Platform::instance()->createMainWindow(mwName, { }, mainWindowOptions); }; KDDockWidgets::Config::self().setDockWidgetFactoryFunc(dwFunc); @@ -119,7 +119,7 @@ static bool lint(const QString &filename, LinterConfig config, bool isVerbose) if (isVerbose) qDebug() << "Pre-creating main window" << name << "with options" << mw.options; - auto mainWindow = Platform::instance()->createMainWindow(name, {}, mw.options); + auto mainWindow = Platform::instance()->createMainWindow(name, { }, mw.options); if (mw.maximize) mainWindow->view()->showMaximized(); else diff --git a/src/qtcommon/Platform.cpp b/src/qtcommon/Platform.cpp index f47aed722..66d3bf534 100644 --- a/src/qtcommon/Platform.cpp +++ b/src/qtcommon/Platform.cpp @@ -333,7 +333,7 @@ QByteArray Platform_qt::readFile(const QString &fileName, bool &ok) const ok = f.open(QIODevice::ReadOnly); if (!ok) { KDDW_ERROR("Failed to open {}, error={}", fileName, f.errorString()); - return {}; + return { }; } return f.readAll(); diff --git a/src/qtcommon/ViewWrapper.cpp b/src/qtcommon/ViewWrapper.cpp index 4444060d8..733808bcf 100644 --- a/src/qtcommon/ViewWrapper.cpp +++ b/src/qtcommon/ViewWrapper.cpp @@ -40,13 +40,13 @@ void ViewWrapper::setMinimumSize(QSize) QSize ViewWrapper::maxSizeHint() const { qFatal("Not implemented"); - return {}; + return { }; } QRect ViewWrapper::normalGeometry() const { qFatal("Not implemented"); - return {}; + return { }; } void ViewWrapper::setWidth(int) @@ -97,7 +97,7 @@ void ViewWrapper::enableAttribute(Qt::WidgetAttribute, bool) Qt::WindowFlags ViewWrapper::flags() const { qFatal("Not implemented"); - return {}; + return { }; } void ViewWrapper::setWindowIcon(const QIcon &) @@ -140,7 +140,7 @@ void ViewWrapper::setMaximumSize(QSize) bool ViewWrapper::isActiveWindow() const { qFatal("Not implemented"); - return {}; + return { }; } void ViewWrapper::setFixedWidth(int) @@ -179,5 +179,5 @@ std::shared_ptr ViewWrapper::asWrapper() return sharedptr; qFatal("No shared ptr. Shouldn't happen."); - return {}; + return { }; } diff --git a/src/qtquick/Action.cpp b/src/qtquick/Action.cpp index 985b5e1da..b4722ef64 100644 --- a/src/qtquick/Action.cpp +++ b/src/qtquick/Action.cpp @@ -34,7 +34,7 @@ void Action::setIcon(const KDDockWidgets::Icon &) KDDockWidgets::Icon Action::icon() const { KDDW_ERROR("Not implemented for QtQuick"); - return {}; + return { }; } bool Action::blockSignals(bool b) diff --git a/src/qtquick/DockWidgetInstantiator.h b/src/qtquick/DockWidgetInstantiator.h index c9c25db74..daf3418d6 100644 --- a/src/qtquick/DockWidgetInstantiator.h +++ b/src/qtquick/DockWidgetInstantiator.h @@ -84,13 +84,13 @@ class DockWidgetInstantiator : public QQuickItem #endif Q_INVOKABLE void addDockWidgetAsTab(QQuickItem *other, - KDDockWidgets::InitialVisibilityOption = {}); + KDDockWidgets::InitialVisibilityOption = { }); Q_INVOKABLE void addDockWidgetToContainingWindow(QQuickItem *other, KDDockWidgets::Location location, QQuickItem *relativeTo = nullptr, - QSize initialSize = {}, - KDDockWidgets::InitialVisibilityOption = {}); + QSize initialSize = { }, + KDDockWidgets::InitialVisibilityOption = { }); Q_INVOKABLE void setAsCurrentTab(); Q_INVOKABLE void forceClose(); diff --git a/src/qtquick/MainWindowInstantiator.h b/src/qtquick/MainWindowInstantiator.h index eb89814cd..fc880095e 100644 --- a/src/qtquick/MainWindowInstantiator.h +++ b/src/qtquick/MainWindowInstantiator.h @@ -67,8 +67,8 @@ class DOCKS_EXPORT MainWindowInstantiator : public QQuickItem /// @brief See KDDockWidgets::Core::MainWindow::addDockWidget() Q_INVOKABLE void addDockWidget(QQuickItem *dockWidget, KDDockWidgets::Location location, - QQuickItem *relativeTo = nullptr, QSize initialSize = {}, - KDDockWidgets::InitialVisibilityOption = {}); + QQuickItem *relativeTo = nullptr, QSize initialSize = { }, + KDDockWidgets::InitialVisibilityOption = { }); /// @brief See KDDockWidgets::Core::MainWindow::addDockWidgetAsTab() Q_INVOKABLE void addDockWidgetAsTab(QQuickItem *dockWidget); diff --git a/src/qtquick/MainWindowMDIInstantiator.h b/src/qtquick/MainWindowMDIInstantiator.h index c7d9a9063..e3fb50fc0 100644 --- a/src/qtquick/MainWindowMDIInstantiator.h +++ b/src/qtquick/MainWindowMDIInstantiator.h @@ -44,7 +44,7 @@ class DOCKS_EXPORT MainWindowMDIInstantiator : public QQuickItem QVector affinities() const; Q_INVOKABLE void addDockWidget(QQuickItem *dockWidget, QPoint localPos, - const KDDockWidgets::InitialOption &addingOption = {}); + const KDDockWidgets::InitialOption &addingOption = { }); Q_INVOKABLE bool closeDockWidgets(bool force = false); diff --git a/src/qtquick/Platform.cpp b/src/qtquick/Platform.cpp index 504c43f21..a7febd4c8 100644 --- a/src/qtquick/Platform.cpp +++ b/src/qtquick/Platform.cpp @@ -138,7 +138,7 @@ Core::Window::Ptr Platform::windowAt(QPoint globalPos) const return Core::Window::Ptr(window); } - return {}; + return { }; } int Platform::screenNumberForView(Core::View *view) const @@ -159,7 +159,7 @@ QSize Platform::screenSizeFor(Core::View *view) const return screen->size(); } - return {}; + return { }; } QQmlEngine *Platform::qmlEngine(bool silent) const diff --git a/src/qtquick/Platform.h b/src/qtquick/Platform.h index 2f73887dc..fbcd2238d 100644 --- a/src/qtquick/Platform.h +++ b/src/qtquick/Platform.h @@ -74,7 +74,7 @@ class DOCKS_EXPORT Platform : public QtCommon::Platform_qt Core::MainWindow * createMainWindow(const QString &uniqueName, Core::CreateViewOptions, MainWindowOptions options = MainWindowOption_HasCentralGroup, - Core::View *parent = nullptr, Qt::WindowFlags = {}) const override; + Core::View *parent = nullptr, Qt::WindowFlags = { }) const override; #endif private: void init(); diff --git a/src/qtquick/ViewFactory.cpp b/src/qtquick/ViewFactory.cpp index 4e3eebef9..17695af00 100644 --- a/src/qtquick/ViewFactory.cpp +++ b/src/qtquick/ViewFactory.cpp @@ -122,7 +122,7 @@ Core::View *ViewFactory::createRubberBand(Core::View *parent) const Core::View *ViewFactory::createSideBar(Core::SideBar *, Core::View *) const { - return {}; + return { }; } // iconForButtonType impl is the same for QtQuick and QtWidgets @@ -157,7 +157,7 @@ QIcon ViewFactory::iconForButtonType(TitleBarButtonType type, qreal dpr) const } if (iconName.isEmpty()) - return {}; + return { }; QIcon icon(QStringLiteral(":/img/%1.png").arg(iconName)); if (!scalingFactorIsSupported(dpr)) diff --git a/src/qtquick/ViewFactory.h b/src/qtquick/ViewFactory.h index 60966b63c..7ed7679f5 100644 --- a/src/qtquick/ViewFactory.h +++ b/src/qtquick/ViewFactory.h @@ -56,13 +56,13 @@ class DOCKS_EXPORT ViewFactory : public Core::ViewFactory public: ViewFactory() = default; ~ViewFactory() override; - Core::View *createDockWidget(const QString &uniqueName, DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}, - Qt::WindowFlags windowFlags = {}) const override; + Core::View *createDockWidget(const QString &uniqueName, DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }, + Qt::WindowFlags windowFlags = { }) const override; virtual Core::View *createDockWidget(const QString &uniqueName, QQmlEngine *, - DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}, - Qt::WindowFlags windowFlags = {}) const; + DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }, + Qt::WindowFlags windowFlags = { }) const; Core::View *createGroup(Core::Group *, Core::View *parent) const override; Core::View *createTitleBar(Core::TitleBar *, Core::View *parent) const override; Core::View *createStack(Core::Stack *, Core::View *parent) const override; @@ -70,7 +70,7 @@ class DOCKS_EXPORT ViewFactory : public Core::ViewFactory Core::View *createSeparator(Core::Separator *, Core::View *parent = nullptr) const override; Core::View *createFloatingWindow(Core::FloatingWindow *, Core::MainWindow *parent = nullptr, - Qt::WindowFlags windowFlags = {}) const override; + Qt::WindowFlags windowFlags = { }) const override; Core::View *createRubberBand(Core::View *parent) const override; Core::View *createSideBar(Core::SideBar *, Core::View *parent) const override; Core::View *createDropArea(Core::DropArea *, Core::View *parent) const override; diff --git a/src/qtquick/Window.cpp b/src/qtquick/Window.cpp index 9129d16e7..0928227e3 100644 --- a/src/qtquick/Window.cpp +++ b/src/qtquick/Window.cpp @@ -26,7 +26,7 @@ Window::~Window() static Core::View *topMostKDDWView(QQuickItem *parent) { if (!parent) - return {}; + return { }; if (auto v = qobject_cast(parent)) return v; @@ -57,7 +57,7 @@ std::shared_ptr Window::rootView(bool v1Workaround) const } qWarning() << Q_FUNC_INFO << "Window does not have a root"; - return {}; + return { }; } Core::Window::Ptr Window::transientParent() const diff --git a/src/qtquick/views/ClassicIndicatorsWindow.cpp b/src/qtquick/views/ClassicIndicatorsWindow.cpp index fa78c22ee..16ac82f49 100644 --- a/src/qtquick/views/ClassicIndicatorsWindow.cpp +++ b/src/qtquick/views/ClassicIndicatorsWindow.cpp @@ -23,7 +23,7 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::QtQuick; -IndicatorWindowCreationCallback KDDockWidgets::QtQuick::IndicatorWindow::s_quickWindowCreationCallback = {}; +IndicatorWindowCreationCallback KDDockWidgets::QtQuick::IndicatorWindow::s_quickWindowCreationCallback = { }; namespace KDDockWidgets { diff --git a/src/qtquick/views/DockWidget.h b/src/qtquick/views/DockWidget.h index a8981fcb3..00e6b9d28 100644 --- a/src/qtquick/views/DockWidget.h +++ b/src/qtquick/views/DockWidget.h @@ -68,8 +68,8 @@ class DOCKS_EXPORT DockWidget : public QtQuick::View, * There's no parent argument. The DockWidget is either parented to FloatingWindow or MainWindow * when visible, or stays without a parent when hidden. */ - explicit DockWidget(const QString &uniqueName, DockWidgetOptions = {}, - LayoutSaverOptions = {}, Qt::WindowFlags = Qt::Tool, + explicit DockWidget(const QString &uniqueName, DockWidgetOptions = { }, + LayoutSaverOptions = { }, Qt::WindowFlags = Qt::Tool, QQmlEngine *engine = nullptr); ///@brief destructor diff --git a/src/qtquick/views/FloatingWindow.cpp b/src/qtquick/views/FloatingWindow.cpp index d0c3626af..05bf36591 100644 --- a/src/qtquick/views/FloatingWindow.cpp +++ b/src/qtquick/views/FloatingWindow.cpp @@ -38,7 +38,7 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::QtQuick; -QuickWindowCreationCallback KDDockWidgets::QtQuick::FloatingWindow::s_quickWindowCreationCallback = {}; +QuickWindowCreationCallback KDDockWidgets::QtQuick::FloatingWindow::s_quickWindowCreationCallback = { }; namespace KDDockWidgets { diff --git a/src/qtquick/views/FloatingWindow.h b/src/qtquick/views/FloatingWindow.h index 7e93e0dc8..0f4776b7f 100644 --- a/src/qtquick/views/FloatingWindow.h +++ b/src/qtquick/views/FloatingWindow.h @@ -45,7 +45,7 @@ class DOCKS_EXPORT FloatingWindow : public QtQuick::View public: explicit FloatingWindow(Core::FloatingWindow *controller, QtQuick::MainWindow *parent = nullptr, - Qt::WindowFlags flags = {}); + Qt::WindowFlags flags = { }); ~FloatingWindow(); QSize minSize() const override; diff --git a/src/qtquick/views/Group.cpp b/src/qtquick/views/Group.cpp index 5e553e690..f6f717245 100644 --- a/src/qtquick/views/Group.cpp +++ b/src/qtquick/views/Group.cpp @@ -144,7 +144,7 @@ int Group::currentIndex() const void Group::insertDockWidget(Core::DockWidget *dw, int index) { QPointer oldFrame = dw->d->group(); - m_group->tabBar()->insertDockWidget(index, dw, {}, {}); + m_group->tabBar()->insertDockWidget(index, dw, { }, { }); dw->setParentView(ViewWrapper::create(m_stackLayout).get()); makeItemFillParent(View::asQQuickItem(dw->view())); diff --git a/src/qtquick/views/MainWindow.cpp b/src/qtquick/views/MainWindow.cpp index 08207b2ef..1dbe676a3 100644 --- a/src/qtquick/views/MainWindow.cpp +++ b/src/qtquick/views/MainWindow.cpp @@ -117,13 +117,13 @@ QSize MainWindow::maxSizeHint() const QMargins MainWindow::centerWidgetMargins() const { qDebug() << Q_FUNC_INFO << "SideBar hasn't been implemented yet"; - return {}; + return { }; } QRect MainWindow::centralAreaGeometry() const { qFatal("Not implemented"); - return {}; + return { }; } // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) diff --git a/src/qtquick/views/MainWindow.h b/src/qtquick/views/MainWindow.h index cd652d850..257ad821c 100644 --- a/src/qtquick/views/MainWindow.h +++ b/src/qtquick/views/MainWindow.h @@ -47,8 +47,8 @@ class DOCKS_EXPORT MainWindow : public QtQuick::View, public Core::MainWindowVie ///@param options optional MainWindowOptions to use ///@param parent Visual parent item. ///@param flags Window flags to pass to top-level window, in case we're constructing it too - explicit MainWindow(const QString &uniqueName, MainWindowOptions options = {}, - QQuickItem *parent = nullptr, Qt::WindowFlags flags = {}); + explicit MainWindow(const QString &uniqueName, MainWindowOptions options = { }, + QQuickItem *parent = nullptr, Qt::WindowFlags flags = { }); ~MainWindow() override; @@ -77,8 +77,8 @@ class DOCKS_EXPORT MainWindow : public QtQuick::View, public Core::MainWindowVie Q_INVOKABLE void layoutParentContainerEqually(const QString &dockId); Q_INVOKABLE void addDockWidgetAsTab(const QString &dockId); Q_INVOKABLE void addDockWidget(const QString &dockId, KDDockWidgets::Location, - const QString &relativeToDockId = {}, - KDDockWidgets::InitialOption = {}); + const QString &relativeToDockId = { }, + KDDockWidgets::InitialOption = { }); #endif diff --git a/src/qtquick/views/TabBar.cpp b/src/qtquick/views/TabBar.cpp index 6e543bcc7..a328d4c03 100644 --- a/src/qtquick/views/TabBar.cpp +++ b/src/qtquick/views/TabBar.cpp @@ -139,7 +139,7 @@ QString TabBar::text(int index) const if (QQuickItem *item = tabAt(index)) return item->property("text").toString(); - return {}; + return { }; } QRect TabBar::rectForTab(int index) const @@ -147,7 +147,7 @@ QRect TabBar::rectForTab(int index) const if (QQuickItem *item = tabAt(index)) return item->boundingRect().toRect(); - return {}; + return { }; } QRect TabBar::globalRectForTab(int index) const @@ -158,7 +158,7 @@ QRect TabBar::globalRectForTab(int index) const return r; } - return {}; + return { }; } bool TabBar::event(QEvent *ev) @@ -357,14 +357,14 @@ QVariant DockWidgetModel::data(const QModelIndex &index, int role) const { const int row = index.row(); if (row < 0 || row >= d->m_dockWidgets.size()) - return {}; + return { }; if (role == Role_Title) { Core::DockWidget *dw = d->m_dockWidgets.at(row); return dw->title(); } - return {}; + return { }; } Core::DockWidget *DockWidgetModel::dockWidgetAt(int index) const diff --git a/src/qtquick/views/TabBar.h b/src/qtquick/views/TabBar.h index 6988df09e..dcab18764 100644 --- a/src/qtquick/views/TabBar.h +++ b/src/qtquick/views/TabBar.h @@ -90,7 +90,7 @@ class DOCKS_EXPORT TabBar : public QtQuick::View, public Core::TabBarViewInterfa int hoveredTabIndex() const; Q_INVOKABLE void addDockWidgetAsTab(QQuickItem *other, - KDDockWidgets::InitialVisibilityOption = {}); + KDDockWidgets::InitialVisibilityOption = { }); Q_SIGNALS: void tabBarQmlItemChanged(); diff --git a/src/qtquick/views/View.cpp b/src/qtquick/views/View.cpp index d4378730e..6c8587415 100644 --- a/src/qtquick/views/View.cpp +++ b/src/qtquick/views/View.cpp @@ -110,7 +110,7 @@ class MouseEventRedirector : public QObject static QHash s_mouseEventRedirectors; }; -QHash MouseEventRedirector::s_mouseEventRedirectors = {}; +QHash MouseEventRedirector::s_mouseEventRedirectors = { }; MouseEventRedirector::~MouseEventRedirector() { @@ -642,7 +642,7 @@ QPoint View::mapFromGlobal(QPoint globalPt) const QPoint View::mapTo(Core::View *parent, QPoint pos) const { if (!parent) - return {}; + return { }; auto parentItem = asQQuickItem(parent); return parentItem->mapFromGlobal(QQuickItem::mapToGlobal(pos)).toPoint(); @@ -727,7 +727,7 @@ std::shared_ptr View::window() const return std::shared_ptr(windowqtquick); } - return {}; + return { }; } std::shared_ptr View::childViewAt(QPoint localPos) const diff --git a/src/qtquick/views/View.h b/src/qtquick/views/View.h index b7b92ca6c..245ba8b8f 100644 --- a/src/qtquick/views/View.h +++ b/src/qtquick/views/View.h @@ -62,7 +62,7 @@ class DOCKS_EXPORT View : public QQuickItem, public QtCommon::View_qt using Core::View::width; explicit View(Core::Controller *controller, Core::ViewType type, - QQuickItem *parent = nullptr, Qt::WindowFlags windowFlags = {}); + QQuickItem *parent = nullptr, Qt::WindowFlags windowFlags = { }); ~View() override = default; diff --git a/src/qtquick/views/ViewWrapper.cpp b/src/qtquick/views/ViewWrapper.cpp index eb0e28904..99d738b59 100644 --- a/src/qtquick/views/ViewWrapper.cpp +++ b/src/qtquick/views/ViewWrapper.cpp @@ -164,7 +164,7 @@ std::shared_ptr ViewWrapper::window() const return std::shared_ptr(windowqtquick); } - return {}; + return { }; } bool ViewWrapper::isRootView() const @@ -310,7 +310,7 @@ std::shared_ptr ViewWrapper::rootView() const return window->rootView(); qWarning() << Q_FUNC_INFO << "No window present"; - return {}; + return { }; } std::shared_ptr ViewWrapper::parentView() const @@ -378,7 +378,7 @@ void ViewWrapper::setWindowTitle(const QString &title) QPoint ViewWrapper::mapTo(View *parent, QPoint pos) const { if (!parent) - return {}; + return { }; auto parentItem = asQQuickItem(parent); return parentItem->mapFromGlobal(m_item->mapToGlobal(pos)).toPoint(); @@ -466,7 +466,7 @@ std::shared_ptr ViewWrapper::create(QObject *item) std::shared_ptr ViewWrapper::create(QQuickItem *item) { if (!item) - return {}; + return { }; auto wrapper = new ViewWrapper(item); auto sharedptr = std::shared_ptr(wrapper); diff --git a/src/qtwidgets/DebugWidgetViewer_p.h b/src/qtwidgets/DebugWidgetViewer_p.h index 54dabf9fd..7555c43b5 100644 --- a/src/qtwidgets/DebugWidgetViewer_p.h +++ b/src/qtwidgets/DebugWidgetViewer_p.h @@ -170,7 +170,7 @@ class DebugWidgetViewer : public QWidget if (widget) { const QPoint offset = widget->mapTo(rootWidget, QPoint(0, 0)); - widget->render(&m_previewPx, offset, {}, DrawWindowBackground); + widget->render(&m_previewPx, offset, { }, DrawWindowBackground); } const int count = node->rowCount(); @@ -182,7 +182,7 @@ class DebugWidgetViewer : public QWidget QPixmap pixmapForWidget(QWidget *w) { QPixmap px(w->size()); - w->render(&px, {}, {}, DrawWindowBackground); + w->render(&px, { }, { }, DrawWindowBackground); return px; } @@ -230,7 +230,7 @@ class DebugWidgetViewer : public QWidget auto widget = index.data(WidgetRole).value(); Q_ASSERT(widget); QPixmap px(widget->size()); - widget->render(&px, {}, {}, DrawWindowBackground); + widget->render(&px, { }, { }, DrawWindowBackground); px.save(QStringLiteral("widget.png")); }); menu.exec(m_tree.mapToGlobal(pos)); diff --git a/src/qtwidgets/Platform.cpp b/src/qtwidgets/Platform.cpp index a96f724db..e82ebe88b 100644 --- a/src/qtwidgets/Platform.cpp +++ b/src/qtwidgets/Platform.cpp @@ -140,7 +140,7 @@ Core::Window::Ptr Platform::windowAt(QPoint globalPos) const return Core::Window::Ptr(window); } - return {}; + return { }; } int Platform::screenNumberForView(Core::View *view) const @@ -161,7 +161,7 @@ QSize Platform::screenSizeFor(Core::View *view) const } } - return {}; + return { }; } int Platform::startDragDistance_impl() const diff --git a/src/qtwidgets/Platform.h b/src/qtwidgets/Platform.h index 305d4de4d..988422e7d 100644 --- a/src/qtwidgets/Platform.h +++ b/src/qtwidgets/Platform.h @@ -57,7 +57,7 @@ class DOCKS_EXPORT Platform : public QtCommon::Platform_qt Core::MainWindow * createMainWindow(const QString &uniqueName, Core::CreateViewOptions, MainWindowOptions options = MainWindowOption_HasCentralGroup, - Core::View *parent = nullptr, Qt::WindowFlags = {}) const override; + Core::View *parent = nullptr, Qt::WindowFlags = { }) const override; #endif protected: void init(); diff --git a/src/qtwidgets/ViewFactory.cpp b/src/qtwidgets/ViewFactory.cpp index 5b4f18cd6..88a4cbf77 100644 --- a/src/qtwidgets/ViewFactory.cpp +++ b/src/qtwidgets/ViewFactory.cpp @@ -161,7 +161,7 @@ QIcon ViewFactory::iconForButtonType(TitleBarButtonType type, qreal dpr) const } if (iconName.isEmpty()) - return {}; + return { }; QIcon icon(QStringLiteral(":/img/%1.png").arg(iconName)); if (!scalingFactorIsSupported(dpr)) { diff --git a/src/qtwidgets/ViewFactory.h b/src/qtwidgets/ViewFactory.h index 0f23afb1d..0eac591d5 100644 --- a/src/qtwidgets/ViewFactory.h +++ b/src/qtwidgets/ViewFactory.h @@ -57,8 +57,8 @@ class DOCKS_EXPORT ViewFactory : public Core::ViewFactory ViewFactory() = default; ~ViewFactory() override; - Core::View *createDockWidget(const QString &uniqueName, DockWidgetOptions = {}, - LayoutSaverOptions = {}, Qt::WindowFlags = {}) const override; + Core::View *createDockWidget(const QString &uniqueName, DockWidgetOptions = { }, + LayoutSaverOptions = { }, Qt::WindowFlags = { }) const override; Core::View *createGroup(Core::Group *, Core::View *parent) const override; Core::View *createTitleBar(Core::TitleBar *, Core::View *parent) const override; @@ -67,7 +67,7 @@ class DOCKS_EXPORT ViewFactory : public Core::ViewFactory Core::View *createSeparator(Core::Separator *, Core::View *parent = nullptr) const override; Core::View *createFloatingWindow(Core::FloatingWindow *, Core::MainWindow *parent = nullptr, - Qt::WindowFlags windowFlags = {}) const override; + Qt::WindowFlags windowFlags = { }) const override; Core::View *createRubberBand(Core::View *parent) const override; Core::View *createSideBar(Core::SideBar *, Core::View *parent) const override; Core::View *createDropArea(Core::DropArea *, Core::View *parent) const override; diff --git a/src/qtwidgets/Window.cpp b/src/qtwidgets/Window.cpp index f219b58f5..189fea82b 100644 --- a/src/qtwidgets/Window.cpp +++ b/src/qtwidgets/Window.cpp @@ -43,7 +43,7 @@ std::shared_ptr Window::rootView(bool v1Workaround) const { Q_UNUSED(v1Workaround); if (!m_window) - return {}; + return { }; if (auto widget = m_window->property("kddockwidgets_qwidget").value()) return QtWidgets::ViewWrapper::create(widget); diff --git a/src/qtwidgets/views/DockWidget.h b/src/qtwidgets/views/DockWidget.h index 1269bac67..7359aa86c 100644 --- a/src/qtwidgets/views/DockWidget.h +++ b/src/qtwidgets/views/DockWidget.h @@ -58,8 +58,8 @@ class DOCKS_EXPORT DockWidget : public QtWidgets::View, * when visible, or stays without a parent when hidden. This allows to support docking * to different main windows. */ - explicit DockWidget(const QString &uniqueName, DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}, + explicit DockWidget(const QString &uniqueName, DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }, Qt::WindowFlags windowFlags = Qt::Tool); ///@brief destructor diff --git a/src/qtwidgets/views/FloatingWindow.h b/src/qtwidgets/views/FloatingWindow.h index 2f3dfecbc..20aabdb53 100644 --- a/src/qtwidgets/views/FloatingWindow.h +++ b/src/qtwidgets/views/FloatingWindow.h @@ -35,7 +35,7 @@ class DOCKS_EXPORT FloatingWindow : public View public: explicit FloatingWindow(Core::FloatingWindow *controller, QMainWindow *parent = nullptr, - Qt::WindowFlags windowFlags = {}); + Qt::WindowFlags windowFlags = { }); ~FloatingWindow() override; diff --git a/src/qtwidgets/views/Group.cpp b/src/qtwidgets/views/Group.cpp index f6a1b5ea9..3a16dc71c 100644 --- a/src/qtwidgets/views/Group.cpp +++ b/src/qtwidgets/views/Group.cpp @@ -141,7 +141,7 @@ void Group::paintEvent(QPaintEvent *) QSize Group::maxSizeHint() const { if (d->freed()) - return {}; + return { }; // waste due to QTabWidget margins, tabbar etc. const QSize waste = minSize() - m_group->dockWidgetsMinSize(); diff --git a/src/qtwidgets/views/MDIArea.cpp b/src/qtwidgets/views/MDIArea.cpp index 279193ca0..7ba9ecb5f 100644 --- a/src/qtwidgets/views/MDIArea.cpp +++ b/src/qtwidgets/views/MDIArea.cpp @@ -74,7 +74,7 @@ void MDIArea::addDockWidget(Core::DockWidget *dw, QPoint localPt, ->createDockWidget(QStringLiteral("%1-mdiWrapper").arg(dw->uniqueName())) ->asDockWidgetController(); - auto dropAreaWrapper = new DropArea(wrapperDW->view(), {}, /*isMDIWrapper= */ true); + auto dropAreaWrapper = new DropArea(wrapperDW->view(), { }, /*isMDIWrapper= */ true); dropAreaWrapper->addDockWidget(dw, Location_OnBottom, nullptr); wrapperDW->setGuestView(dropAreaWrapper->view()->asWrapper()); diff --git a/src/qtwidgets/views/MDIArea.h b/src/qtwidgets/views/MDIArea.h index 915bf8878..61ee5f2e8 100644 --- a/src/qtwidgets/views/MDIArea.h +++ b/src/qtwidgets/views/MDIArea.h @@ -45,7 +45,7 @@ class DOCKS_EXPORT MDIArea : public QtWidgets::View /// @brief docks the dock widgets into this MDI area, at the specified position void addDockWidget(Core::DockWidget *dw, QPoint localPt, - const InitialOption &addingOption = {}); + const InitialOption &addingOption = { }); /// @brief Moves a dock widget @p dw to point @p pos void moveDockWidget(Core::DockWidget *dw, QPoint pos); @@ -55,7 +55,7 @@ class DOCKS_EXPORT MDIArea : public QtWidgets::View /// @brief overloads void addDockWidget(Core::DockWidgetViewInterface *, QPoint localPt, - const InitialOption &addingOption = {}); + const InitialOption &addingOption = { }); void moveDockWidget(Core::DockWidgetViewInterface *, QPoint pos); void resizeDockWidget(Core::DockWidgetViewInterface *, QSize size); diff --git a/src/qtwidgets/views/MainWindow.cpp b/src/qtwidgets/views/MainWindow.cpp index 7817a4236..4660d05fa 100644 --- a/src/qtwidgets/views/MainWindow.cpp +++ b/src/qtwidgets/views/MainWindow.cpp @@ -151,7 +151,7 @@ MainWindow::MainWindow(const QString &uniqueName, MainWindowOptions options, // Disable QWidgetAnimator. We don't use QDockWidget, but QWidgetAnimator will appear in stack traces // which is unneeded. - QMainWindow::setDockOptions({}); + QMainWindow::setDockOptions({ }); m_mainWindow->init(uniqueName); @@ -276,7 +276,7 @@ bool MainWindow::restoreDockWidget_legacy(QDockWidget *dockwidget) return QMainWindow::restoreDockWidget(dockwidget); } else { qFatal("MainWindow::restoreDockWidget_legacy: Legacy QDockWidgets are not supported without MainWindowOption_QDockWidgets"); - return {}; + return { }; } } @@ -295,7 +295,7 @@ Qt::DockWidgetArea MainWindow::dockWidgetArea_legacy(QDockWidget *dockwidget) co return QMainWindow::dockWidgetArea(dockwidget); } else { qFatal("MainWindow::dockWidgetArea_legacy: Legacy QDockWidgets are not supported without MainWindowOption_QDockWidgets"); - return {}; + return { }; } } @@ -324,7 +324,7 @@ QList MainWindow::tabifiedDockWidgets_legacy(QDockWidget *dockwid return QMainWindow::tabifiedDockWidgets(dockwidget); } else { qFatal("MainWindow::tabifiedDockWidgets_legacy: Legacy QDockWidgets are not supported without MainWindowOption_QDockWidgets"); - return {}; + return { }; } } diff --git a/src/qtwidgets/views/MainWindow.h b/src/qtwidgets/views/MainWindow.h index 018a551ea..79d1360dd 100644 --- a/src/qtwidgets/views/MainWindow.h +++ b/src/qtwidgets/views/MainWindow.h @@ -60,7 +60,7 @@ class DOCKS_EXPORT MainWindow : public View, ///@param options optional MainWindowOptions to use ///@param parent QObject *parent to pass to QMainWindow constructor. ///@param flags Window flags to pass to QMainWindow constructor. - explicit MainWindow(const QString &uniqueName, MainWindowOptions options = {}, + explicit MainWindow(const QString &uniqueName, MainWindowOptions options = { }, QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); diff --git a/src/qtwidgets/views/View.cpp b/src/qtwidgets/views/View.cpp index 234b9f1d7..54e8312f0 100644 --- a/src/qtwidgets/views/View.cpp +++ b/src/qtwidgets/views/View.cpp @@ -83,7 +83,7 @@ std::shared_ptr View::window() const } } - return {}; + return { }; } template @@ -127,7 +127,7 @@ std::shared_ptr View::childViewAt(QPoint localPos) const if (QWidget *child = QWidget::childAt(localPos)) return ViewWrapper::create(child); - return {}; + return { }; } template @@ -137,7 +137,7 @@ std::shared_ptr View::rootView() const return ViewWrapper::create(w); } - return {}; + return { }; } template @@ -147,7 +147,7 @@ std::shared_ptr View::parentView() const return ViewWrapper::create(p); } - return {}; + return { }; } template diff --git a/src/qtwidgets/views/View.h b/src/qtwidgets/views/View.h index b2c9871e1..1515a0030 100644 --- a/src/qtwidgets/views/View.h +++ b/src/qtwidgets/views/View.h @@ -51,7 +51,7 @@ class DOCKS_EXPORT View : public Base, public QtCommon::View_qt using Core::View::y; explicit View(Core::Controller *controller, Core::ViewType type, - QWidget *parent = nullptr, Qt::WindowFlags windowFlags = {}); + QWidget *parent = nullptr, Qt::WindowFlags windowFlags = { }); ~View() override = default; diff --git a/src/qtwidgets/views/ViewWrapper.cpp b/src/qtwidgets/views/ViewWrapper.cpp index d0771147d..f3b072458 100644 --- a/src/qtwidgets/views/ViewWrapper.cpp +++ b/src/qtwidgets/views/ViewWrapper.cpp @@ -114,7 +114,7 @@ std::shared_ptr ViewWrapper::create(QObject *widget) std::shared_ptr ViewWrapper::create(QWidget *widget) { if (!widget) - return {}; + return { }; auto wrapper = new ViewWrapper(widget); auto sharedptr = std::shared_ptr(wrapper); @@ -252,7 +252,7 @@ std::shared_ptr ViewWrapper::rootView() const if (auto w = m_widget->window()) return std::shared_ptr(new ViewWrapper(w)); - return {}; + return { }; } std::shared_ptr ViewWrapper::parentView() const @@ -260,7 +260,7 @@ std::shared_ptr ViewWrapper::parentView() const if (auto p = m_widget->parentWidget()) return std::shared_ptr(new ViewWrapper(p)); - return {}; + return { }; } std::shared_ptr ViewWrapper::childViewAt(QPoint localPos) const @@ -268,7 +268,7 @@ std::shared_ptr ViewWrapper::childViewAt(QPoint localPos) const if (QWidget *child = m_widget->childAt(localPos)) return std::shared_ptr(new ViewWrapper(child)); - return {}; + return { }; } void ViewWrapper::grabMouse() diff --git a/tests/core/tst_droparea.cpp b/tests/core/tst_droparea.cpp index 943f81173..00a124cd2 100644 --- a/tests/core/tst_droparea.cpp +++ b/tests/core/tst_droparea.cpp @@ -34,13 +34,13 @@ private Q_SLOTS: void TestDropArea::tst_dropAreaCtor() { // Tests that ctor runs and doesn't leak - Core::DropArea da(nullptr, {}); + Core::DropArea da(nullptr, { }); } void TestDropArea::tst_addWidget() { auto group = new Core::Group(); - Core::DropArea da(nullptr, {}); + Core::DropArea da(nullptr, { }); da.addWidget(group->view(), KDDockWidgets::Location_OnLeft); } @@ -49,7 +49,7 @@ void TestDropArea::tst_addWidgetHidden() // Test adding a widget that starts hidden auto dw = Config::self().viewFactory()->createDockWidget("dw1")->asDockWidgetController(); - Core::DropArea da(nullptr, {}); + Core::DropArea da(nullptr, { }); da.addDockWidget(dw, KDDockWidgets::Location_OnLeft, nullptr, InitialVisibilityOption::StartHidden); diff --git a/tests/core/tst_group.cpp b/tests/core/tst_group.cpp index 02de4c0ae..c35f6618f 100644 --- a/tests/core/tst_group.cpp +++ b/tests/core/tst_group.cpp @@ -29,7 +29,7 @@ private Q_SLOTS: void TestGroup::tst_groupCtor() { - auto group = new Core::Group(nullptr, {}); + auto group = new Core::Group(nullptr, { }); QVERIFY(group->view()->is(Core::ViewType::Group)); QVERIFY(group->view()->asWrapper()->is(Core::ViewType::Group)); delete group; @@ -37,7 +37,7 @@ void TestGroup::tst_groupCtor() void TestGroup::tst_dragRect() { - auto group = new Core::Group(nullptr, {}); + auto group = new Core::Group(nullptr, { }); // This used to crash. Test that it doesn't. group->dragRect(); delete group; diff --git a/tests/core/tst_stack.cpp b/tests/core/tst_stack.cpp index 678de596f..4686d3be1 100644 --- a/tests/core/tst_stack.cpp +++ b/tests/core/tst_stack.cpp @@ -26,8 +26,8 @@ private Q_SLOTS: void TestStack::tst_stackCtor() { - Core::Group group(nullptr, {}); - Core::Stack stack(&group, {}); + Core::Group group(nullptr, { }); + Core::Stack stack(&group, { }); QVERIFY(stack.view()->is(Core::ViewType::Stack)); QVERIFY(stack.view()->asWrapper()->is(Core::ViewType::Stack)); } diff --git a/tests/core/tst_tabbar.cpp b/tests/core/tst_tabbar.cpp index e9fe3df1f..88440161d 100644 --- a/tests/core/tst_tabbar.cpp +++ b/tests/core/tst_tabbar.cpp @@ -33,8 +33,8 @@ private Q_SLOTS: void TestTabBar::tst_tabBarCtor() { - Core::Group group(nullptr, {}); - Core::Stack stack(&group, {}); + Core::Group group(nullptr, { }); + Core::Stack stack(&group, { }); Core::TabBar tabBar(&stack); QVERIFY(tabBar.view()->is(ViewType::TabBar)); QVERIFY(tabBar.view()->asWrapper()->is(ViewType::TabBar)); @@ -42,7 +42,7 @@ void TestTabBar::tst_tabBarCtor() void TestTabBar::tst_tabBarIndexes() { - Core::Group group(nullptr, {}); + Core::Group group(nullptr, { }); Core::TabBar *tabBar = group.tabBar(); // Starts empty: @@ -55,9 +55,9 @@ void TestTabBar::tst_tabBarIndexes() auto dw0 = Config::self().viewFactory()->createDockWidget("dw0")->asDockWidgetController(); auto dw1 = Config::self().viewFactory()->createDockWidget("dw1")->asDockWidgetController(); auto dw2 = Config::self().viewFactory()->createDockWidget("dw2")->asDockWidgetController(); - tabBar->insertDockWidget(0, dw0, {}, {}); - tabBar->insertDockWidget(1, dw1, {}, {}); - tabBar->insertDockWidget(2, dw2, {}, {}); + tabBar->insertDockWidget(0, dw0, { }, { }); + tabBar->insertDockWidget(1, dw1, { }, { }); + tabBar->insertDockWidget(2, dw2, { }, { }); QCOMPARE(tabBar->indexOfDockWidget(dw0), 0); QCOMPARE(tabBar->indexOfDockWidget(dw2), 2); @@ -68,7 +68,7 @@ void TestTabBar::tst_tabBarIndexes() // Prepend: [dw3, dw0, dw1, dw2] // Doesn't change the current dockwidget, but the index did shift auto dw3 = Config::self().viewFactory()->createDockWidget("dw3")->asDockWidgetController(); - tabBar->insertDockWidget(0, dw3, {}, {}); + tabBar->insertDockWidget(0, dw3, { }, { }); QCOMPARE(tabBar->numDockWidgets(), 4); QCOMPARE(tabBar->currentIndex(), 1); QCOMPARE(tabBar->currentDockWidget(), dw0); @@ -83,7 +83,7 @@ void TestTabBar::tst_tabBarIndexes() // Append: [dw3, dw0, dw1, dw2, dw4] // Doesn't change the current dock widget auto dw4 = Config::self().viewFactory()->createDockWidget("dw4")->asDockWidgetController(); - tabBar->insertDockWidget(4, dw4, {}, {}); + tabBar->insertDockWidget(4, dw4, { }, { }); QCOMPARE(tabBar->numDockWidgets(), 5); QCOMPARE(tabBar->currentIndex(), 2); QCOMPARE(tabBar->currentDockWidget(), dw1); @@ -130,16 +130,16 @@ void TestTabBar::tst_tabBarIndexes() void TestTabBar::tst_tabBarDWDestroyed() { /// Tests if indexes are correct if dock widget destroyed itself - Core::Group group(nullptr, {}); + Core::Group group(nullptr, { }); Core::TabBar *tabBar = group.tabBar(); // Add 3: [dw0, dw1, dw2] auto dw0 = Config::self().viewFactory()->createDockWidget("dock0")->asDockWidgetController(); auto dw1 = Config::self().viewFactory()->createDockWidget("dock1")->asDockWidgetController(); auto dw2 = Config::self().viewFactory()->createDockWidget("dock2")->asDockWidgetController(); - tabBar->insertDockWidget(0, dw0, {}, {}); - tabBar->insertDockWidget(1, dw1, {}, {}); - tabBar->insertDockWidget(2, dw2, {}, {}); + tabBar->insertDockWidget(0, dw0, { }, { }); + tabBar->insertDockWidget(1, dw1, { }, { }); + tabBar->insertDockWidget(2, dw2, { }, { }); QCOMPARE(tabBar->numDockWidgets(), 3); QCOMPARE(tabBar->currentIndex(), 0); @@ -169,16 +169,16 @@ void TestTabBar::tst_tabBarDWClosed() { /// Tests if indexes are correct if dock widget are closed (but not destroyed) /// Tests if indexes are correct if dock widget destroyed itself - Core::Group group(nullptr, {}); + Core::Group group(nullptr, { }); Core::TabBar *tabBar = group.tabBar(); // Add 3: [dw0, dw1, dw2] auto dw0 = Config::self().viewFactory()->createDockWidget("dock0")->asDockWidgetController(); auto dw1 = Config::self().viewFactory()->createDockWidget("dock1")->asDockWidgetController(); auto dw2 = Config::self().viewFactory()->createDockWidget("dock2")->asDockWidgetController(); - tabBar->insertDockWidget(0, dw0, {}, {}); - tabBar->insertDockWidget(1, dw1, {}, {}); - tabBar->insertDockWidget(2, dw2, {}, {}); + tabBar->insertDockWidget(0, dw0, { }, { }); + tabBar->insertDockWidget(1, dw1, { }, { }); + tabBar->insertDockWidget(2, dw2, { }, { }); QCOMPARE(tabBar->numDockWidgets(), 3); QCOMPARE(tabBar->currentIndex(), 0); diff --git a/tests/core/tst_titlebar.cpp b/tests/core/tst_titlebar.cpp index 70c001e89..a18dde1fb 100644 --- a/tests/core/tst_titlebar.cpp +++ b/tests/core/tst_titlebar.cpp @@ -26,7 +26,7 @@ private Q_SLOTS: void TestTitleBar::tst_titleBarCtor() { - auto group = new Core::Group(nullptr, {}); + auto group = new Core::Group(nullptr, { }); auto tb = new Core::TitleBar(group); QVERIFY(tb->view()->is(Core::ViewType::TitleBar)); QVERIFY(tb->view()->asWrapper()->is(Core::ViewType::TitleBar)); diff --git a/tests/flutter/windows/runner/win32_window.cpp b/tests/flutter/windows/runner/win32_window.cpp index 6911d4738..f6ae4a02a 100644 --- a/tests/flutter/windows/runner/win32_window.cpp +++ b/tests/flutter/windows/runner/win32_window.cpp @@ -101,7 +101,7 @@ WindowClassRegistrar *WindowClassRegistrar::instance_ = nullptr; const wchar_t *WindowClassRegistrar::GetWindowClass() { if (!class_registered_) { - WNDCLASS window_class {}; + WNDCLASS window_class { }; window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); window_class.lpszClassName = kWindowClassName; window_class.style = CS_HREDRAW | CS_VREDRAW; diff --git a/tests/qtquick/tst_qtquick.cpp b/tests/qtquick/tst_qtquick.cpp index ac0f21eb0..4ecab160d 100644 --- a/tests/qtquick/tst_qtquick.cpp +++ b/tests/qtquick/tst_qtquick.cpp @@ -128,11 +128,11 @@ void TestQtQuick::tst_hoverShowsDropIndicators() m->window()->window()->setFramePosition(QPoint(500, 800)); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, QSize(400, 400) })); auto floatingDockWidget = createDockWidget("floatingDockWidget", - Platform::instance()->tests_createView({ true, {}, QSize(400, 400) })); + Platform::instance()->tests_createView({ true, { }, QSize(400, 400) })); m->addDockWidget(dock0, Location_OnLeft); @@ -152,7 +152,7 @@ void TestQtQuick::tst_titlebarNumDockWidgetsChanged() QQmlApplicationEngine engine(":/main2.qml"); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, QSize(400, 400) })); const auto mainWindows = DockRegistry::self()->mainwindows(); MainWindow *m = mainWindows.first(); m->window()->window()->setFramePosition(QPoint(500, 800)); @@ -166,7 +166,7 @@ void TestQtQuick::tst_titlebarNumDockWidgetsChanged() [&numSignalEmittions] { numSignalEmittions++; }); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, QSize(400, 400) })); dock0->addDockWidgetAsTab(dock1); @@ -435,9 +435,9 @@ void TestQtQuick::tst_mdiFixedSize() auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); const int fixedWidth = 201; auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(fixedWidth, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(fixedWidth, 400) })); dock0->view()->setFixedWidth(fixedWidth); - m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), {}); + m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), { }); m->view()->resize(1000, 1000); QCOMPARE(dock0->view()->minimumWidth(), fixedWidth); @@ -480,7 +480,7 @@ void TestQtQuick::tst_deleteDockWidget() QQmlApplicationEngine engine(":/main465.qml"); // or any other main.qml auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({})); + "dock0", Platform::instance()->tests_createView({ })); dock0->show(); delete dock0->view(); @@ -550,7 +550,7 @@ void TestQtQuick::tst_quickWindowCreationCallback() QtQuick::FloatingWindow::setQuickWindowCreationCallback(onWindowCreated); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, QSize(400, 400) })); dock0->setFloating(true); QCOMPARE(callCount, 1); diff --git a/tests/qtwidgets/tst_qtwidgets.cpp b/tests/qtwidgets/tst_qtwidgets.cpp index 8bf50c0cb..7d5a3d7a6 100644 --- a/tests/qtwidgets/tst_qtwidgets.cpp +++ b/tests/qtwidgets/tst_qtwidgets.cpp @@ -87,9 +87,9 @@ class NonClosableDockWidget : public QtWidgets::DockWidget } inline Core::DockWidget *createDockWidget(const QString &name, QWidget *w, - DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}, - bool show = true, const QString &affinityName = {}) + DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }, + bool show = true, const QString &affinityName = { }) { w->setFocusPolicy(Qt::StrongFocus); auto dock = newDockWidget(name, options, layoutSaverOptions); @@ -712,7 +712,7 @@ void TestQtWidgets::tst_addToSmallMainWindow6() QWidget container; auto lay = new QVBoxLayout(&container); - auto m = Platform::instance()->createMainWindow("MyMainWindow_tst_addToSmallMainWindow8", {}, + auto m = Platform::instance()->createMainWindow("MyMainWindow_tst_addToSmallMainWindow8", { }, MainWindowOption_None); auto qmainwindow = dynamic_cast(m->view()); lay->addWidget(qmainwindow); @@ -721,9 +721,9 @@ void TestQtWidgets::tst_addToSmallMainWindow6() container.show(); Platform::instance()->tests_waitForResize(m); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, QSize(50, 240) })); + "dock1", Platform::instance()->tests_createView({ true, { }, QSize(50, 240) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, QSize(50, 240) })); + "dock2", Platform::instance()->tests_createView({ true, { }, QSize(50, 240) })); m->addDockWidget(dock1, KDDockWidgets::Location_OnBottom); m->addDockWidget(dock2, KDDockWidgets::Location_OnBottom); Platform::instance()->tests_waitForResize(m); @@ -1030,7 +1030,7 @@ void TestQtWidgets::tst_deleteOnCloseWhenOnSideBar() KDDockWidgets::Config::self().setFlags(KDDockWidgets::Config::Flag_AutoHideSupport); auto m = createMainWindow(QSize(800, 500), MainWindowOption_None); ObjectGuard dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }), + "dock1", Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }), DockWidgetOption_DeleteOnClose); m->addDockWidget(dock1, Location_OnLeft); @@ -1443,8 +1443,8 @@ void TestQtWidgets::tst_negativeAnchorPositionWhenEmbedded() } auto layout = m->multiSplitter(); - auto w1 = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); - auto w2 = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); auto d1 = createDockWidget("1", w1); auto d2 = createDockWidget("2", w2); auto d3 = createDockWidget("3", w2); @@ -1518,7 +1518,7 @@ void TestQtWidgets::tst_restoreNonRelativeFloatingWindowGeometry() auto dock1 = createDockWidget("1", new QPushButton("1")); // Also test that invisible dock doesn't change size - auto dock2 = createDockWidget("2", new QPushButton("2"), {}, {}, /*show=*/false); + auto dock2 = createDockWidget("2", new QPushButton("2"), { }, { }, /*show=*/false); LayoutSaver saver(RestoreOption_RelativeToMainWindow); saver.dptr()->m_restoreOptions.setFlag(InternalRestoreOption::RelativeFloatingWindowGeometry, @@ -1587,8 +1587,8 @@ void TestQtWidgets::tst_minSizeChanges() EnsureTopLevelsDeleted e; auto m = createMainWindow(QSize(600, 600), MainWindowOption_None); m->show(); - auto w1 = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); - auto w2 = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); auto d1 = newDockWidget("1"); d1->setGuestView(w1->asWrapper()); @@ -1622,7 +1622,7 @@ void TestQtWidgets::tst_minSizeChanges() QVERIFY(m->height() >= 1600); // add a small one to the middle - auto w3 = Platform::instance()->tests_createView({ true, {}, QSize(100, 100) }); + auto w3 = Platform::instance()->tests_createView({ true, { }, QSize(100, 100) }); auto d3 = newDockWidget("3"); d3->setGuestView(w3->asWrapper()); m->addDockWidget(d3, Location_OnTop, d1); @@ -1634,7 +1634,7 @@ void TestQtWidgets::tst_maxSizePropagates() EnsureTopLevelsDeleted e; auto dock1 = newDockWidget("dock1"); - auto w = Platform::instance()->tests_createView({ true, {}, QSize(200, 200) }); + auto w = Platform::instance()->tests_createView({ true, { }, QSize(200, 200) }); w->setMinimumSize(QSize(120, 120)); w->setMaximumSize(QSize(500, 500)); dock1->setGuestView(w->asWrapper()); @@ -1716,7 +1716,7 @@ void TestQtWidgets::tst_maxSizeHonouredWhenAnotherDropped() auto m1 = createMainWindow(QSize(1000, 1000), MainWindowOption_None); auto dock1 = newDockWidget("dock1"); - auto w = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); + auto w = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); w->setMinimumSize(QSize(120, 100)); w->setMaximumSize(QSize(300, 150)); dock1->setGuestView(w->asWrapper()); @@ -1742,9 +1742,9 @@ void TestQtWidgets::tst_maxSizeHonouredWhenAnotherDropped() void TestQtWidgets::tst_addToHiddenMainWindow() { EnsureTopLevelsDeleted e; - auto m = createMainWindow(QSize(1000, 1000), MainWindowOption_HasCentralGroup, {}, false); - auto w1 = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); - auto w2 = Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }); + auto m = createMainWindow(QSize(1000, 1000), MainWindowOption_HasCentralGroup, { }, false); + auto w1 = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }); auto d1 = createDockWidget("1", w1); auto d2 = createDockWidget("2", w2); @@ -1763,7 +1763,7 @@ void TestQtWidgets::tst_maxSizePropagates2() auto m1 = createMainWindow(QSize(1000, 1000), MainWindowOption_None); auto dock1 = newDockWidget("dock1"); - auto w = Platform::instance()->tests_createView({ true, {}, QSize(200, 200) }); + auto w = Platform::instance()->tests_createView({ true, { }, QSize(200, 200) }); w->setMinimumSize(QSize(120, 120)); w->setMaximumSize(QSize(300, 500)); dock1->setGuestView(w->asWrapper()); @@ -1808,7 +1808,7 @@ void TestQtWidgets::tst_maxSizeHonouredWhenDropped() m1->addDockWidget(dock1, Location_OnTop); m1->view()->resize(QSize(2000, 2000)); - auto w2 = Platform::instance()->tests_createView({ true, {}, { 0, 0 } }); + auto w2 = Platform::instance()->tests_createView({ true, { }, { 0, 0 } }); dock2->setGuestView(w2->asWrapper()); const int maxWidth = 200; w2->setMaximumSize(QSize(maxWidth, 200)); @@ -1920,7 +1920,7 @@ void TestQtWidgets::tst_complex() const int num = 21; for (int i = 0; i < num; ++i) { - auto widget = Platform::instance()->tests_createView({ true, {}, minSizes.at(i) }); + auto widget = Platform::instance()->tests_createView({ true, { }, minSizes.at(i) }); auto dw = newDockWidget(QString::number(i)); dw->setGuestView(widget->asWrapper()); docks << dw; @@ -1950,13 +1950,13 @@ void TestQtWidgets::tst_deleteOnClose() KDDockWidgets::Config::self().setFlags(KDDockWidgets::Config::Flag_AutoHideSupport); KDDockWidgets::Config::self().setDockWidgetFactoryFunc([](const QString &name) { return createDockWidget( - name, Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }), + name, Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }), DockWidgetOption_DeleteOnClose); }); auto m = createMainWindow(QSize(800, 500), MainWindowOption_None); ObjectGuard dock1 = - createDockWidget("1", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }), + createDockWidget("1", Platform::instance()->tests_createView({ true, { }, QSize(400, 400) }), DockWidgetOption_DeleteOnClose); m->addDockWidget(dock1, Location_OnLeft); m->moveToSideBar(dock1); @@ -1986,7 +1986,7 @@ void TestQtWidgets::tstCloseNestedMdi() auto dock1 = new QtWidgets::DockWidget(QStringLiteral("MyDock1")); dock1->setWidget(new QPushButton("1")); - mdi->addDockWidget(dock1, {}); + mdi->addDockWidget(dock1, { }); dock1->dockWidget()->titleBar()->onCloseClicked(); QVERIFY(p); @@ -2004,7 +2004,7 @@ void TestQtWidgets::tstCloseNestedMDIPropagates() auto dock1 = new KDDockWidgets::QtWidgets::DockWidget(QStringLiteral("MyDock1")); auto nonClosableWidget = Platform::instance()->tests_createNonClosableView(); dock1->dockWidget()->setGuestView(nonClosableWidget->asWrapper()); - mdi->addDockWidget(dock1, {}); + mdi->addDockWidget(dock1, { }); auto dock2 = new KDDockWidgets::QtWidgets::DockWidget(QStringLiteral("MyDock2")); auto nonClosableWidget2 = Platform::instance()->tests_createNonClosableView(); @@ -2072,7 +2072,7 @@ void TestQtWidgets::tst_crash326() { EnsureTopLevelsDeleted e; auto m = createMainWindow(QSize(500, 500), MainWindowOption_HasCentralWidget); - auto dock1 = createDockWidget("1", new QPushButton("1"), {}, {}, false); + auto dock1 = createDockWidget("1", new QPushButton("1"), { }, { }, false); m->addDockWidget(dock1, KDDockWidgets::Location_OnBottom); ObjectGuard originalGroup = dock1->d->group(); dock1->close(); @@ -2096,7 +2096,7 @@ void TestQtWidgets::tst_crash661() KDDockWidgets::Config::self().setFlags(flags); auto m = createMainWindow(QSize(800, 600), MainWindowOption_HasCentralWidget); - auto dock1 = createDockWidget("DockWidget1", new QWidget(), {}, {}, false); + auto dock1 = createDockWidget("DockWidget1", new QWidget(), { }, { }, false); m->addDockWidget(dock1, KDDockWidgets::Location_OnLeft); QVERIFY(dock1->isOpen()); @@ -2110,10 +2110,10 @@ void TestQtWidgets::tst_crash661() QVERIFY(it != buttons.cend()); QVERIFY((*it)->isVisible()); - QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(5, 5), {}, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(5, 5), { }, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); QCoreApplication::sendEvent(*it, &pressEvent); - QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(5, 5), {}, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(5, 5), { }, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); QCoreApplication::sendEvent(*it, &releaseEvent); } #endif @@ -2202,7 +2202,7 @@ void TestQtWidgets::tst_userData() { EnsureTopLevelsDeleted e; - auto m = createMainWindow({}, {}, "mw1"); + auto m = createMainWindow({ }, { }, "mw1"); auto dock1 = createDockWidget("dock1"); dock1->setUserData(userData1); @@ -2221,7 +2221,7 @@ void TestQtWidgets::tst_userData() QVERIFY(!saved.isEmpty()); - auto m = createMainWindow({}, {}, "mw1"); + auto m = createMainWindow({ }, { }, "mw1"); auto dock1 = createDockWidget("dock1"); auto dock2 = createDockWidget("dock2"); @@ -2912,7 +2912,7 @@ void TestQtWidgets::tst_neighbourSqueezeStrategy() { EnsureTopLevelsDeleted e; InitialOption::s_defaultNeighbourSqueezeStrategy = NeighbourSqueezeStrategy::ImmediateNeighboursFirst; - auto m1 = createMainWindow(QSize(1000, 500), {}, "mw1"); + auto m1 = createMainWindow(QSize(1000, 500), { }, "mw1"); auto d1 = new QtWidgets::DockWidget("d1"); auto d2 = new QtWidgets::DockWidget("d2"); @@ -2971,7 +2971,7 @@ void TestQtWidgets::tst_addDockWidgetToContainingWindowNested() { EnsureTopLevelsDeleted e; - auto m1 = createMainWindow(QSize(1000, 500), {}, "mw1"); + auto m1 = createMainWindow(QSize(1000, 500), { }, "mw1"); auto d1 = new QtWidgets::DockWidget("d1"); auto d2 = new QtWidgets::DockWidget("d2"); @@ -2986,8 +2986,8 @@ void TestQtWidgets::tst_addDockWidgetToContainingWindowNested() // Tests using addDockWidgetToContainingWindow when dock is nested EnsureTopLevelsDeleted e; - auto m1 = createMainWindow(QSize(1000, 500), {}, "mw1"); - auto nestedMainWindow = createMainWindow(QSize(1000, 500), {}, "mw2"); + auto m1 = createMainWindow(QSize(1000, 500), { }, "mw1"); + auto nestedMainWindow = createMainWindow(QSize(1000, 500), { }, "mw2"); auto d1 = new KDDockWidgets::QtWidgets::DockWidget(QStringLiteral("Nested MainWindow Dock container")); auto nestedMainWindowQWidget = static_cast(QtCommon::View_qt::asQWidget(nestedMainWindow->view())); @@ -3069,8 +3069,8 @@ void TestQtWidgets::tst_indicatorsNotShowing() const Point globalPos = { 600, 300 }; QCursor::setPos(globalPos); - auto m1 = createMainWindow(QSize(1000, 500), {}, "mw1"); - auto m2 = createMainWindow(QSize(1000, 500), {}, "mw2"); + auto m1 = createMainWindow(QSize(1000, 500), { }, "mw1"); + auto m2 = createMainWindow(QSize(1000, 500), { }, "mw2"); // m2->setAffinities({ "m2" }); auto d2 = new QtWidgets::DockWidget("d2"); // d2->setAffinities({ "m2" }); @@ -3214,7 +3214,7 @@ void TestQtWidgets::tst_affinityFloatingWindowIndexMismatch() { EnsureTopLevelsDeleted e; - auto m = createMainWindow(QSize(1000, 800), {}, "mw1"); + auto m = createMainWindow(QSize(1000, 800), { }, "mw1"); auto floatA = new QtWidgets::DockWidget("floatA"); floatA->asDockWidgetController()->setAffinities({ "a1" }); diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index 0a22d62d6..6fc205167 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -259,7 +259,7 @@ void TestDocks::tst_simple2() EnsureTopLevelsDeleted e; auto m = createMainWindow(); auto dw = createDockWidget( - "dw", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dw", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); auto fw = dw->floatingWindow(); m->addDockWidget(dw, KDDockWidgets::Location_OnTop); m->layout()->checkSanity(); @@ -429,7 +429,7 @@ void TestDocks::tst_hasPreviousDockedLocation2() { EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(501, 500), MainWindowOption_None, "mainWindow2"); - auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true, {}, { 100, 100 } }), {}, {}, false); + auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true, { }, { 100, 100 } }), { }, { }, false); QVERIFY(dock2->isFloating()); m->addDockWidget(dock2, Location_OnBottom, nullptr, InitialVisibilityOption::StartHidden); QVERIFY(dock2->hasPreviousDockedLocation()); @@ -442,7 +442,7 @@ void TestDocks::tst_hasPreviousDockedLocation2() { EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(501, 500), MainWindowOption_None, "mainWindow2"); - auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true, {}, { 100, 100 } }), {}, {}, false); + auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true, { }, { 100, 100 } }), { }, { }, false); LayoutSaver saver2; saver2.restoreLayout(saved2); @@ -547,12 +547,12 @@ void TestDocks::tst_detachPos() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(501, 500), MainWindowOption_None); auto dock1 = createDockWidget( - "1", Platform::instance()->tests_createView({ true, {}, Size(100, 100) }), {}, {}, + "1", Platform::instance()->tests_createView({ true, { }, Size(100, 100) }), { }, { }, /** show = */ false); // we're creating the dock widgets without showing them as floating // initially, so it doesn't record the previous floating position auto dock2 = - createDockWidget("2", Platform::instance()->tests_createView({ true, {}, Size(100, 100) }), - {}, {}, /** show = */ false); + createDockWidget("2", Platform::instance()->tests_createView({ true, { }, Size(100, 100) }), + { }, { }, /** show = */ false); QVERIFY(!dock1->isVisible()); QVERIFY(!dock2->isVisible()); @@ -630,7 +630,7 @@ void TestDocks::tst_sizeAfterRedock() auto dw1 = newDockWidget(QStringLiteral("1")); auto dw2 = newDockWidget(QStringLiteral("2")); dw2->setGuestView( - Platform::instance()->tests_createView({ true, {}, Size(100, 100) })->asWrapper()); + Platform::instance()->tests_createView({ true, { }, Size(100, 100) })->asWrapper()); dw1->addDockWidgetToContainingWindow(dw2, Location_OnBottom); const int height2 = dw2->dptr()->group()->height(); @@ -742,7 +742,7 @@ void TestDocks::tst_restoreWithInvalidCurrentTab() /// MainWindow factory for the easy cases. MainWindowFactoryFunc mwFunc = [](const QString &mwName, MainWindowOptions mainWindowOptions) { - return Platform::instance()->createMainWindow(mwName, {}, mainWindowOptions); + return Platform::instance()->createMainWindow(mwName, { }, mainWindowOptions); }; KDDockWidgets::Config::self().setDockWidgetFactoryFunc(dwFunc); @@ -850,7 +850,7 @@ void TestDocks::tst_minimizeRestoreBug() // Tests a bug where an unminimized window would have StartsMinimized in its serialization EnsureTopLevelsDeleted e; - auto m = Platform::instance()->createMainWindow("MyMainLayout", {}, {}); + auto m = Platform::instance()->createMainWindow("MyMainLayout", { }, { }); auto d1 = createDockWidget("Dock #1"); createDockWidget("Dock #2"); @@ -874,7 +874,7 @@ void TestDocks::tst_restoreFloatingMinimizedState() { EnsureTopLevelsDeleted e; auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); dock1->floatingWindow()->view()->showMinimized(); QCOMPARE(dock1->floatingWindow()->view()->window()->windowState(), WindowState::Minimized); @@ -913,7 +913,7 @@ void TestDocks::tst_restoreNonExistingDockWidget() EnsureTopLevelsDeleted e; auto m = createMainWindow(defaultMainWindowSize, MainWindowOption_None, "mainwindow1"); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); m->addDockWidget(dock2, Location_OnBottom); LayoutSaver restorer; SetExpectedWarning sew("Couldn't find dock widget"); @@ -931,7 +931,7 @@ void TestDocks::tst_setFloatingSimple() EnsureTopLevelsDeleted e; auto m = createMainWindow(); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); m->addDockWidget(dock1, Location_OnTop); auto l = m->multiSplitter(); dock1->setFloating(true); @@ -1043,11 +1043,11 @@ void TestDocks::tst_layoutEqually() m->setAffinities({ mainWindowId }); auto dock1 = createDockWidget( - "Favorite-481", Platform::instance()->tests_createView({ true, {}, Size(536, 438) })); + "Favorite-481", Platform::instance()->tests_createView({ true, { }, Size(536, 438) })); auto dock2 = createDockWidget( - "Favorite-482", Platform::instance()->tests_createView({ true, {}, Size(229, 118) })); + "Favorite-482", Platform::instance()->tests_createView({ true, { }, Size(229, 118) })); auto dock3 = createDockWidget( - "Favorite-483", Platform::instance()->tests_createView({ true, {}, Size(356, 90) })); + "Favorite-483", Platform::instance()->tests_createView({ true, { }, Size(356, 90) })); dock1->setAffinities({ mainWindowId }); dock2->setAffinities({ mainWindowId }); dock3->setAffinities({ mainWindowId }); @@ -1236,7 +1236,7 @@ void TestDocks::tst_doubleScheduleDelete() { EnsureTopLevelsDeleted e; auto dock1 = - createDockWidget("dock1", Platform::instance()->tests_createView({ true }), {}, {}, false); + createDockWidget("dock1", Platform::instance()->tests_createView({ true }), { }, { }, false); dock1->show(); dock1->dptr()->group()->scheduleDeleteLater(); @@ -1251,7 +1251,7 @@ void TestDocks::tst_repeatedShowHide() auto m = createMainWindow(Size(800, 500), MainWindowOption_None); auto dock1 = - createDockWidget("dock1", Platform::instance()->tests_createView({ true }), {}, {}, false); + createDockWidget("dock1", Platform::instance()->tests_createView({ true }), { }, { }, false); m->addDockWidget(dock1, Location_OnBottom); dock1->close(); dock1->show(); @@ -1266,9 +1266,9 @@ void TestDocks::tst_addAsPlaceholder() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(800, 500), MainWindowOption_None); auto dock1 = - createDockWidget("dock1", Platform::instance()->tests_createView({ true }), {}, {}, false); + createDockWidget("dock1", Platform::instance()->tests_createView({ true }), { }, { }, false); auto dock2 = - createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, {}, false); + createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, { }, false); m->addDockWidget(dock1, Location_OnBottom); m->addDockWidget(dock2, Location_OnTop, nullptr, InitialVisibilityOption::StartHidden); @@ -1301,7 +1301,7 @@ void TestDocks::tst_removeItem() auto m = createMainWindow(Size(800, 500), MainWindowOption_None); auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true })); auto dock2 = - createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, {}, false); + createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, { }, false); auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnBottom); @@ -1913,7 +1913,7 @@ void TestDocks::tst_preferredInitialSizeVsMinSize() auto createDw = [](const QString &name, Size min) -> Core::DockWidget * { auto dw = newDockWidget(name); - dw->setGuestView(Platform::instance()->tests_createView({ true, {}, min })->asWrapper()); + dw->setGuestView(Platform::instance()->tests_createView({ true, { }, min })->asWrapper()); return dw; }; @@ -2409,7 +2409,7 @@ void TestDocks::tst_registry() QCOMPARE(dr->dockwidgets().size(), 0); auto dw = newDockWidget(QStringLiteral("dw1")); - auto guest = Platform::instance()->tests_createView({}); + auto guest = Platform::instance()->tests_createView({ }); dw->setGuestView(guest->asWrapper()); delete dw; } @@ -2614,9 +2614,9 @@ void TestDocks::tst_addToSmallMainWindow2() auto m = createMainWindow(); auto dropArea = m->dropArea(); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); m->addDockWidgetAsTab(dock1); m->view()->window()->resize(osWindowMinWidth(), 200); @@ -2644,9 +2644,9 @@ void TestDocks::tst_addToSmallMainWindow3() auto m = createMainWindow(); auto dropArea = m->dropArea(); auto dock1 = - createDockWidget("dock1", Platform::instance()->tests_createView({ true, {}, { 0, 0 } })); + createDockWidget("dock1", Platform::instance()->tests_createView({ true, { }, { 0, 0 } })); auto dock2 = - createDockWidget("dock2", Platform::instance()->tests_createView({ true, {}, { 0, 0 } })); + createDockWidget("dock2", Platform::instance()->tests_createView({ true, { }, { 0, 0 } })); m->addDockWidgetAsTab(dock1); m->view()->window()->resize(osWindowMinWidth(), 200); QTest::qWait(200); @@ -2672,9 +2672,9 @@ void TestDocks::tst_addToSmallMainWindow4() auto dropArea = m->dropArea(); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(50, 50) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(50, 50) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(50, 50) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(50, 50) })); Core::DropArea *layout = dropArea; m->addDockWidget(dock1, KDDockWidgets::Location_OnBottom); WAIT_FOR_RESIZE(m->view()); @@ -2696,9 +2696,9 @@ void TestDocks::tst_addToSmallMainWindow5() auto m = createMainWindow(Size(100, 100), MainWindowOption_None); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(50, 240) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(50, 240) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(50, 240) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(50, 240) })); m->addDockWidget(dock1, KDDockWidgets::Location_OnBottom); m->addDockWidget(dock2, KDDockWidgets::Location_OnBottom); QVERIFY(m->dropArea()->checkSanity()); @@ -2907,8 +2907,8 @@ void TestDocks::tst_rectForDropCrash() auto layout = m->multiSplitter(); - auto w1 = Platform::instance()->tests_createView({ true, {}, Size(400, 400) }); - auto w2 = Platform::instance()->tests_createView({ true, {}, Size(400, 400) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, Size(400, 400) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, Size(400, 400) }); auto d1 = createDockWidget("1", w1); auto d2 = createDockWidget("2", w2); @@ -2927,7 +2927,7 @@ void TestDocks::tst_restoreAfterResize() // Tests a crash I got when the layout received a resize event *while* restoring EnsureTopLevelsDeleted e; - auto m = createMainWindow(Size(500, 500), {}, "tst_restoreAfterResize"); + auto m = createMainWindow(Size(500, 500), { }, "tst_restoreAfterResize"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnLeft); auto layout = m->multiSplitter(); @@ -2951,7 +2951,7 @@ void TestDocks::tst_restoreAfterResize() void TestDocks::tst_restoreWithNonClosableWidget() { EnsureTopLevelsDeleted e; - auto m = createMainWindow(Size(500, 500), {}, "tst_restoreWithNonClosableWidget"); + auto m = createMainWindow(Size(500, 500), { }, "tst_restoreWithNonClosableWidget"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createNonClosableView(), DockWidgetOption_NotClosable); m->addDockWidget(dock1, Location_OnLeft); @@ -3037,7 +3037,7 @@ void TestDocks::tst_restoreCrash() { // Create a main window, with a left dock, save it to disk. - auto m = createMainWindow({}, {}, "tst_restoreCrash"); + auto m = createMainWindow({ }, { }, "tst_restoreCrash"); auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnLeft); LayoutSaver saver; @@ -3045,7 +3045,7 @@ void TestDocks::tst_restoreCrash() } // Restore - auto m = createMainWindow({}, {}, "tst_restoreCrash"); + auto m = createMainWindow({ }, { }, "tst_restoreCrash"); auto layout = m->multiSplitter(); auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true })); QVERIFY(dock1->isFloating()); @@ -3111,7 +3111,7 @@ void TestDocks::tst_restoreGroupOptions() KDDockWidgets::Config::self().setFlags(KDDockWidgets::Config::Flag_HideTitleBarWhenTabsVisible | KDDockWidgets::Config::Flag_AlwaysShowTabs); - auto m = createMainWindow({ 500, 500 }, {}, "mw1"); + auto m = createMainWindow({ 500, 500 }, { }, "mw1"); auto d1 = createDockWidget("1", Platform::instance()->tests_createFocusableView({ true })); m->addDockWidget(d1, Location_OnTop); @@ -3120,7 +3120,7 @@ void TestDocks::tst_restoreGroupOptions() saved = saver.serializeLayout(); } // flags are reset at end of scope - auto m = createMainWindow({ 500, 500 }, {}, "mw1"); + auto m = createMainWindow({ 500, 500 }, { }, "mw1"); auto d1 = createDockWidget("1", Platform::instance()->tests_createFocusableView({ true })); LayoutSaver saver; @@ -3253,7 +3253,7 @@ void TestDocks::tst_restoreAfterMinSizeChanges() { { EnsureTopLevelsDeleted e; - auto m = createMainWindow(Size(1000, 1000), {}, "tst_restoreWithPlaceholder"); + auto m = createMainWindow(Size(1000, 1000), { }, "tst_restoreWithPlaceholder"); auto guest = Platform::instance()->tests_createView({ true }); auto dockA = createDockWidget("A", guest); @@ -3302,7 +3302,7 @@ void TestDocks::tst_restoreWithPlaceholder() EnsureTopLevelsDeleted e; { - auto m = createMainWindow(Size(500, 500), {}, "tst_restoreWithPlaceholder"); + auto m = createMainWindow(Size(500, 500), { }, "tst_restoreWithPlaceholder"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnLeft); @@ -3332,7 +3332,7 @@ void TestDocks::tst_restoreWithPlaceholder() } // Try again, but on a different main window - auto m = createMainWindow(Size(500, 500), {}, "tst_restoreWithPlaceholder"); + auto m = createMainWindow(Size(500, 500), { }, "tst_restoreWithPlaceholder"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); auto layout = m->multiSplitter(); @@ -3363,11 +3363,11 @@ void TestDocks::tst_restoreWithAffinity() m2->setAffinities({ "a2" }); auto dock1 = - createDockWidget("1", Platform::instance()->tests_createView({ true }), {}, {}, true, "a1"); + createDockWidget("1", Platform::instance()->tests_createView({ true }), { }, { }, true, "a1"); m1->addDockWidget(dock1, Location_OnLeft); auto dock2 = - createDockWidget("2", Platform::instance()->tests_createView({ true }), {}, {}, true, "a2"); + createDockWidget("2", Platform::instance()->tests_createView({ true }), { }, { }, true, "a2"); dock2->setFloating(true); dock2->open(); @@ -3403,7 +3403,7 @@ void TestDocks::tst_marginsAfterRestore() { EnsureTopLevelsDeleted e1; // MainWindow: - auto m = createMainWindow(Size(500, 500), {}, "tst_marginsAfterRestore"); + auto m = createMainWindow(Size(500, 500), { }, "tst_marginsAfterRestore"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnLeft); auto layout = m->multiSplitter(); @@ -3426,7 +3426,7 @@ void TestDocks::tst_marginsAfterRestore() void TestDocks::tst_mainWindowToggle() { EnsureTopLevelsDeleted e; - auto m = createMainWindow(Size(500, 500), {}, "tst_marginsAfterRestore"); + auto m = createMainWindow(Size(500, 500), { }, "tst_marginsAfterRestore"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnLeft); QVERIFY(dock1->isOpen()); @@ -3449,7 +3449,7 @@ void TestDocks::tst_startDragging() { EnsureTopLevelsDeleted e; - auto m = createMainWindow(Size(500, 500), {}, "tst_marginsAfterRestore"); + auto m = createMainWindow(Size(500, 500), { }, "tst_marginsAfterRestore"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); m->addDockWidget(dock1, Location_OnLeft); @@ -3516,7 +3516,7 @@ void TestDocks::tst_restoreWithDockFactory() // Now try with a factory func DockWidgetFactoryFunc func = [](const QString &) { - return createDockWidget("1", Platform::instance()->tests_createView({ true }), {}, {}, + return createDockWidget("1", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); }; @@ -3545,7 +3545,7 @@ void TestDocks::tst_restoreWithDockFactory2() DockWidgetFactoryFunc func = [](const QString &) { // A factory func which does id remapping - return createDockWidget("dw2", Platform::instance()->tests_createView({ true }), {}, {}, + return createDockWidget("dw2", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); }; @@ -3686,7 +3686,7 @@ void TestDocks::tst_setFloatingGeometry() { EnsureTopLevelsDeleted e; auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); QVERIFY(dock1->isVisible()); const Rect requestedGeo = Rect(70, 70, 400, 400); @@ -4228,7 +4228,7 @@ void TestDocks::tst_titlebar_getter() m->view()->resize(Size(500, 500)); m->show(); - auto w1 = Platform::instance()->tests_createView({ true, {}, Size(400, 400) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, Size(400, 400) }); auto d1 = createDockWidget("1", w1); m->addDockWidget(d1, Location_OnTop); @@ -4675,11 +4675,11 @@ void TestDocks::tst_dontCloseDockWidgetBeforeRestore() EnsureTopLevelsDeleted e; auto m = createMainWindow(); auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true })); - auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, + auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); - auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true }), {}, + auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); - auto dock4 = createDockWidget("4", Platform::instance()->tests_createView({ true }), {}, {}, + auto dock4 = createDockWidget("4", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); m->addDockWidget(dock1, Location_OnBottom); @@ -4704,7 +4704,7 @@ void TestDocks::tst_dontCloseDockWidgetBeforeRestore() QVERIFY(!dock3->isOpen()); QVERIFY(!dock3->isInMainWindow()); - auto dock5 = createDockWidget("5", Platform::instance()->tests_createView({ true }), {}, + auto dock5 = createDockWidget("5", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); dock4->open(); @@ -4721,9 +4721,9 @@ void TestDocks::tst_dontCloseDockWidgetBeforeRestore2() // LayoutSaverOption::Skip Meaning the whole window should be skipped EnsureTopLevelsDeleted e; - auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, + auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); - auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true }), {}, + auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); dock2->close(); @@ -4757,7 +4757,7 @@ void TestDocks::tst_dontCloseDockWidgetBeforeRestore3() EnsureTopLevelsDeleted e; auto m = createMainWindow(); auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true })); - auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, + auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); dock1->close(); dock2->close(); @@ -4781,9 +4781,9 @@ void TestDocks::tst_dontCloseDockWidgetBeforeRestore4() // Widgets which skip layout restore were be skipping LayoutSaver::onResize() EnsureTopLevelsDeleted e; - auto m = createMainWindow({ 1000, 1000 }, {}); + auto m = createMainWindow({ 1000, 1000 }, { }); auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true })); - auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, + auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); m->addDockWidget(dock1, Location_OnBottom); @@ -4814,8 +4814,8 @@ void TestDocks::tst_skipRestoreInsideMainWindow() { // Tests that a docked widget doesn't get redocked when restoring if it has LayoutSaverOption::Skip EnsureTopLevelsDeleted e; - auto m = createMainWindow({ 1000, 1000 }, {}); - auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true }), {}, + auto m = createMainWindow({ 1000, 1000 }, { }); + auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true }), { }, LayoutSaverOption::Skip); m->addDockWidget(dock1, Location_OnBottom); @@ -5077,7 +5077,7 @@ void TestDocks::tst_maxSizedHonouredAfterRemoved() auto dock1 = newDockWidget("dock1"); dock1->open(); - auto w = Platform::instance()->tests_createView({ true, {}, Size(100, 100) }); + auto w = Platform::instance()->tests_createView({ true, { }, Size(100, 100) }); w->setMinimumSize(Size(120, 100)); w->setMaximumSize(Size(300, 150)); dock1->setGuestView(w->asWrapper()); @@ -5311,10 +5311,10 @@ void TestDocks::tst_constraintsPropagateUp() const int minHeight = 400; const Size minSz = { minWidth, minHeight }; auto guestWidget = - Platform::instance()->tests_createView({ true, {}, Size(minWidth, minHeight) }); + Platform::instance()->tests_createView({ true, { }, Size(minWidth, minHeight) }); auto dock1 = createDockWidget("dock1", guestWidget); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(minWidth, minHeight) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(minWidth, minHeight) })); QCOMPARE(widgetMinLength(guestWidget, Qt::Vertical), minHeight); QCOMPARE(widgetMinLength(guestWidget, Qt::Horizontal), minWidth); @@ -5342,11 +5342,11 @@ void TestDocks::tst_constraintsAfterPlaceholder() auto m = createMainWindow(Size(500, 500), MainWindowOption_None); const int minHeight = 400; auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, minHeight) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, minHeight) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(400, minHeight) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(400, minHeight) })); auto dock3 = createDockWidget( - "dock3", Platform::instance()->tests_createView({ true, {}, Size(400, minHeight) })); + "dock3", Platform::instance()->tests_createView({ true, { }, Size(400, minHeight) })); auto dropArea = m->dropArea(); Core::DropArea *layout = dropArea; @@ -5384,7 +5384,7 @@ void TestDocks::tst_dragBySingleTab() EnsureTopLevelsDeleted e; KDDockWidgets::Config::self().setFlags(KDDockWidgets::Config::Flag_AlwaysShowTabs); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); dock1->open(); auto group1 = dock1->dptr()->group(); @@ -5406,7 +5406,7 @@ void TestDocks::tst_deleteOnClose() EnsureTopLevelsDeleted e; // Tests that DockWidget::close() deletes itself if Option_DeleteOnClose is set ObjectGuard dock1 = createDockWidget( - "1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) }), + "1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) }), DockWidgetOption_DeleteOnClose); dock1->open(); dock1->close(); @@ -5420,10 +5420,10 @@ void TestDocks::tst_deleteOnClose() EnsureTopLevelsDeleted e; ObjectGuard dock1 = createDockWidget( - "1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) }), - DockWidgetOption_DeleteOnClose, {}, /*show=*/false); + "1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) }), + DockWidgetOption_DeleteOnClose, { }, /*show=*/false); ObjectGuard dock2 = createDockWidget( - "2", Platform::instance()->tests_createView({ true, {}, Size(400, 400) }), {}, {}, + "2", Platform::instance()->tests_createView({ true, { }, Size(400, 400) }), { }, { }, /*show=*/false); LayoutSaver saver; const QByteArray saved = saver.serializeLayout(); @@ -5447,11 +5447,11 @@ void TestDocks::tst_toggleAction() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(800, 500), MainWindowOption_None); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock3 = createDockWidget( - "dock3", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock3", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); m->addDockWidget(dock1, Location_OnLeft); m->addDockWidget(dock2, Location_OnRight); @@ -5481,9 +5481,9 @@ void TestDocks::tst_redocksToPreviousTabIndex() auto m = createMainWindow(Size(800, 500), MainWindowOption_None); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); m->addDockWidget(dock0, Location_OnLeft); dock0->addDockWidgetAsTab(dock1); @@ -5526,9 +5526,9 @@ void TestDocks::tst_toggleTabbed() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(800, 500), MainWindowOption_None); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); m->addDockWidget(dock0, Location_OnBottom); dock0->addDockWidgetAsTab(dock1); @@ -5563,9 +5563,9 @@ void TestDocks::tst_toggleTabbed2() // Testing the weird bugs reported in #215 EnsureTopLevelsDeleted e; auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); dock0->addDockWidgetAsTab(dock1); dock0->setAsCurrentTab(); @@ -5616,8 +5616,8 @@ void TestDocks::tst_addMDIDockWidget() // Test that adding a MDI dock widget doesn't produce any warning auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); - m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), {}); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); + m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), { }); // MDI doesn't support LayoutSaver yet, but it was crashing, so add a test // to catch further crashes @@ -5633,7 +5633,7 @@ void TestDocks::tst_mdiSetSize() auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({}), {}, {}, false); + "dock0", Platform::instance()->tests_createView({ }), { }, { }, false); const Size size = { 501, 502 }; dock0->view()->setSize(size); @@ -5641,7 +5641,7 @@ void TestDocks::tst_mdiSetSize() m->layout() ->asMDILayout() - ->addDockWidget(dock0, Point(10, 10), {}); + ->addDockWidget(dock0, Point(10, 10), { }); auto group = dock0->dptr()->group(); QCOMPARE(group->pos(), Point(10, 10)); @@ -5655,11 +5655,11 @@ void TestDocks::tst_mdiCrash() auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); auto dock2 = createDockWidget( - "dock", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); - m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), {}); - m->layout()->asMDILayout()->addDockWidget(dock2, Point(0, 0), {}); + "dock", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); + m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), { }); + m->layout()->asMDILayout()->addDockWidget(dock2, Point(0, 0), { }); Platform::instance()->tests_wait(1000); delete dock0; @@ -5685,13 +5685,13 @@ void TestDocks::tst_mdiZorder() auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); - m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), {}); - m->layout()->asMDILayout()->addDockWidget(dock1, Point(100, 100), {}); + m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), { }); + m->layout()->asMDILayout()->addDockWidget(dock1, Point(100, 100), { }); dock0->setMDISize({ 200, 200 }); dock1->setMDISize({ 200, 200 }); @@ -5721,13 +5721,13 @@ void TestDocks::tst_mdiZorder2() auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); - m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), {}); - m->layout()->asMDILayout()->addDockWidget(dock1, Point(100, 100), {}); + m->layout()->asMDILayout()->addDockWidget(dock0, Point(0, 0), { }); + m->layout()->asMDILayout()->addDockWidget(dock1, Point(100, 100), { }); dock0->setMDISize({ 200, 200 }); dock1->setMDISize({ 200, 200 }); @@ -5752,7 +5752,7 @@ void TestDocks::tst_mixedMDIRestoreToArea() m->setPersistentCentralView(mdiLayout->view()->asWrapper()); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(200, 200) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(200, 200) })); mdiLayout->addDockWidget(dock0, { 10, 10 }); QVERIFY(!mdiLayout->layoutSize().isEmpty()); @@ -5772,11 +5772,11 @@ void TestDocks::tst_redockToMDIRestoresPosition() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(800, 500), MainWindowOption_MDI); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto layout = m->layout()->asMDILayout(); const Point initialPoint = Point(500, 500); - layout->addDockWidget(dock0, initialPoint, {}); + layout->addDockWidget(dock0, initialPoint, { }); Core::Group *group = dock0->DockWidget::d->group(); QCOMPARE(group->view()->pos(), initialPoint); @@ -5815,7 +5815,7 @@ void TestDocks::tst_restoreWithNativeTitleBar() KDDockWidgets::Config::self().setFlags(KDDockWidgets::Config::Flag_NativeTitleBar); auto dock0 = createDockWidget( - "dock0", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock0", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); dock0->window()->move(100, 100); QVERIFY(!dock0->titleBar()->isVisible()); diff --git a/tests/tst_docks_slow1.cpp b/tests/tst_docks_slow1.cpp index 16c3cda49..65dbf312c 100644 --- a/tests/tst_docks_slow1.cpp +++ b/tests/tst_docks_slow1.cpp @@ -122,7 +122,7 @@ void TestDocks::tst_startHidden() // A really simple test for InitialVisibilityOption::StartHidden EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(800, 500), MainWindowOption_None); - auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true }), {}, {}, + auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); m->addDockWidget(dock1, Location_OnRight, nullptr, InitialVisibilityOption::StartHidden); delete dock1; @@ -133,10 +133,10 @@ void TestDocks::tst_startHidden2() EnsureTopLevelsDeleted e; { auto m = createMainWindow(Size(800, 500), MainWindowOption_None); - auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true }), {}, - {}, false); - auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, - {}, false); + auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true }), { }, + { }, false); + auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, + { }, false); auto dropArea = m->dropArea(); Core::DropArea *layout = dropArea; @@ -163,12 +163,12 @@ void TestDocks::tst_startHidden2() { auto m = createMainWindow(Size(800, 500), MainWindowOption_None); - auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true }), {}, - {}, false); - auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), {}, - {}, false); - auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true }), {}, - {}, false); + auto dock1 = createDockWidget("dock1", Platform::instance()->tests_createView({ true }), { }, + { }, false); + auto dock2 = createDockWidget("dock2", Platform::instance()->tests_createView({ true }), { }, + { }, false); + auto dock3 = createDockWidget("dock3", Platform::instance()->tests_createView({ true }), { }, + { }, false); auto dropArea = m->dropArea(); Core::DropArea *layout = dropArea; diff --git a/tests/tst_docks_slow2.cpp b/tests/tst_docks_slow2.cpp index b87c7cd22..828c8b37b 100644 --- a/tests/tst_docks_slow2.cpp +++ b/tests/tst_docks_slow2.cpp @@ -160,7 +160,7 @@ void TestDocks::tst_dockWindowWithTwoSideBySideFramesIntoCenter() { EnsureTopLevelsDeleted e; KDDockWidgets::Config::self().setInternalFlags(KDDockWidgets::Config::InternalFlag_NoAeroSnap); - KDDockWidgets::Config::self().setFlags({}); + KDDockWidgets::Config::self().setFlags({ }); auto m = createMainWindow(); auto fw = createFloatingWindow(); diff --git a/tests/tst_docks_slow5.cpp b/tests/tst_docks_slow5.cpp index c00234517..a8a971f33 100644 --- a/tests/tst_docks_slow5.cpp +++ b/tests/tst_docks_slow5.cpp @@ -44,7 +44,7 @@ void TestDocks::tst_28NestedWidgets() int i = 0; for (DockDescriptor &desc : docksToCreate) { desc.createdDock = createDockWidget( - QString::number(i), Platform::instance()->tests_createView({ true }), {}, {}, false); + QString::number(i), Platform::instance()->tests_createView({ true }), { }, { }, false); Core::DockWidget *relativeTo = nullptr; if (desc.relativeToIndex != -1) @@ -161,7 +161,7 @@ void TestDocks::tst_28NestedWidgets() }; if (Platform::instance()->isQtWidgets()) { // 2. Produced valgrind invalid reads while adding - func(docks, {}); + func(docks, { }); } docks = { @@ -172,7 +172,7 @@ void TestDocks::tst_28NestedWidgets() }; if (Platform::instance()->isQtWidgets()) { - func(docks, {}); + func(docks, { }); } docks = { @@ -185,7 +185,7 @@ void TestDocks::tst_28NestedWidgets() if (Platform::instance()->isQtWidgets()) { // Tests for void KDDockWidgets::Anchor::setPosition(int, // KDDockWidgets::Anchor::SetPositionOptions) Negative position -69 - func(docks, {}); + func(docks, { }); } docks = { diff --git a/tests/tst_docks_slow7.cpp b/tests/tst_docks_slow7.cpp index 2cd575c35..03ca14c7e 100644 --- a/tests/tst_docks_slow7.cpp +++ b/tests/tst_docks_slow7.cpp @@ -63,12 +63,12 @@ void TestDocks::tst_dragByTabBar() auto dropArea = m->dropArea(); auto dock1 = createDockWidget( - "dock1", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock1", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock2 = createDockWidget( - "dock2", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock2", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); auto dock3 = createDockWidget( - "dock3", Platform::instance()->tests_createView({ true, {}, Size(400, 400) })); + "dock3", Platform::instance()->tests_createView({ true, { }, Size(400, 400) })); m->addDockWidgetAsTab(dock1); m->view()->resize(Size(osWindowMinWidth(), 200)); @@ -99,11 +99,11 @@ void TestDocks::tst_negativeAnchorPosition() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(1002, 806)); - auto w1 = Platform::instance()->tests_createView({ true, {}, Size(104, 104) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, Size(104, 104) }); w1->resize(994, 718); - auto w2 = Platform::instance()->tests_createView({ true, {}, Size(133, 343) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, Size(133, 343) }); w2->resize(392, 362); - auto w3 = Platform::instance()->tests_createView({ true, {}, Size(133, 343) }); + auto w3 = Platform::instance()->tests_createView({ true, { }, Size(133, 343) }); w3->resize(392, 362); Core::DropArea *layout = m->multiSplitter(); @@ -150,11 +150,11 @@ void TestDocks::tst_negativeAnchorPosition2() auto dropArea = m->dropArea(); Core::DropArea *layout = dropArea; - auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true }), {}, {}, + auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); - auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true }), {}, {}, + auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); - auto dock3 = createDockWidget("3", Platform::instance()->tests_createView({ true }), {}, {}, + auto dock3 = createDockWidget("3", Platform::instance()->tests_createView({ true }), { }, { }, /*show=*/false); m->addDockWidget(dock1, Location_OnLeft); @@ -269,10 +269,10 @@ void TestDocks::tst_negativeAnchorPosition6() auto layout = m->multiSplitter(); - auto w1 = Platform::instance()->tests_createView({ true, {}, Size(400, 100) }); - auto w2 = Platform::instance()->tests_createView({ true, {}, Size(400, 100) }); - auto w3 = Platform::instance()->tests_createView({ true, {}, Size(400, 100) }); - auto w4 = Platform::instance()->tests_createView({ true, {}, Size(400, 900) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, Size(400, 100) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, Size(400, 100) }); + auto w3 = Platform::instance()->tests_createView({ true, { }, Size(400, 100) }); + auto w4 = Platform::instance()->tests_createView({ true, { }, Size(400, 900) }); auto d1 = createDockWidget("1", w1); auto d2 = createDockWidget("2", w2); @@ -300,15 +300,15 @@ void TestDocks::tst_negativeAnchorPosition7() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(501, 500), MainWindowOption_None); m->show(); - auto w1 = Platform::instance()->tests_createView({ true, {}, Size(400, 400) }); - auto w2 = Platform::instance()->tests_createView({ true, {}, Size(400, 400) }); + auto w1 = Platform::instance()->tests_createView({ true, { }, Size(400, 400) }); + auto w2 = Platform::instance()->tests_createView({ true, { }, Size(400, 400) }); auto d1 = newDockWidget("1"); d1->setGuestView(w1->asWrapper()); auto d2 = newDockWidget("2"); d2->setGuestView(w2->asWrapper()); - auto w3 = Platform::instance()->tests_createView({ true, {}, Size(100, 100) }); + auto w3 = Platform::instance()->tests_createView({ true, { }, Size(100, 100) }); auto d3 = newDockWidget("3"); d3->setGuestView(w3->asWrapper()); diff --git a/tests/tst_docks_slow8.cpp b/tests/tst_docks_slow8.cpp index a36b0866b..db8c25c49 100644 --- a/tests/tst_docks_slow8.cpp +++ b/tests/tst_docks_slow8.cpp @@ -88,9 +88,9 @@ void TestDocks::tst_resizeWindow() EnsureTopLevelsDeleted e; auto m = createMainWindow(Size(501, 500), MainWindowOption_None); auto dock1 = createDockWidget( - "1", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "1", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); auto dock2 = createDockWidget( - "2", Platform::instance()->tests_createView({ true, {}, Size(100, 100) })); + "2", Platform::instance()->tests_createView({ true, { }, Size(100, 100) })); ObjectGuard fw1 = dock1->floatingWindow(); ObjectGuard fw2 = dock2->floatingWindow(); m->addDockWidget(dock1, Location_OnLeft); @@ -174,7 +174,7 @@ void TestDocks::tst_tabTitleUpdatesWhenUnFloating() // setTitle() is changing title bar title but not tabbar EnsureTopLevelsDeleted e; - auto m = createMainWindow(Size(500, 500), {}, "tst_marginsAfterRestore"); + auto m = createMainWindow(Size(500, 500), { }, "tst_marginsAfterRestore"); auto dock1 = createDockWidget("1", Platform::instance()->tests_createView({ true })); auto dock2 = createDockWidget("2", Platform::instance()->tests_createView({ true })); diff --git a/tests/tst_multisplitter.cpp b/tests/tst_multisplitter.cpp index 0884df554..afb51544d 100644 --- a/tests/tst_multisplitter.cpp +++ b/tests/tst_multisplitter.cpp @@ -207,7 +207,7 @@ static std::unique_ptr createRoot() return std::unique_ptr(root); } -static Item *createItem(Size minSz = {}, Size maxSz = {}) +static Item *createItem(Size minSz = { }, Size maxSz = { }) { static int count = 0; count++; @@ -1691,7 +1691,7 @@ void TestLayouting::tst_separatorMoveHonoursMax() const int maxWidth = 250; auto root = createRoot(); auto item1 = createItem(); - auto item2 = createItem({}, Size(maxWidth, 250)); + auto item2 = createItem({ }, Size(maxWidth, 250)); auto item3 = createItem(); root->insertItem(item1, Location_OnLeft); root->insertItem(item2, Location_OnRight); diff --git a/tests/tst_view.cpp b/tests/tst_view.cpp index 126e147d1..b5c24c1af 100644 --- a/tests/tst_view.cpp +++ b/tests/tst_view.cpp @@ -46,12 +46,12 @@ private Q_SLOTS: void TestView::tst_viewSetParent() { - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); QVERIFY(rootView); QVERIFY(!rootView->isNull()); QVERIFY(rootView->childViews().isEmpty()); - auto childView = createViewAndWindow({}, rootView); + auto childView = createViewAndWindow({ }, rootView); QVERIFY(!rootView->parentView()); QVERIFY(childView); @@ -62,7 +62,7 @@ void TestView::tst_viewSetParent() QCOMPARE(children.size(), 1); QVERIFY(children[0]->equals(childView)); - auto rootView2 = createViewAndWindow({}); + auto rootView2 = createViewAndWindow({ }); childView->setParent(rootView2); QVERIFY(childView->parentView()->equals(rootView2)); QVERIFY(rootView->childViews().isEmpty()); @@ -78,7 +78,7 @@ void TestView::tst_viewSetParent() void TestView::tst_viewRoot() { - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); auto childView = createViewAndWindow({ true }, rootView); auto window = rootView->window(); @@ -103,14 +103,14 @@ void TestView::tst_viewRoot() void TestView::tst_viewIsVisible() { - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); QVERIFY(!rootView->controller()->isVisible()); rootView->controller()->setVisible(true); QVERIFY(rootView->controller()->isVisible()); // Hiding the parent should hide the children - auto view2 = createViewAndWindow({}); + auto view2 = createViewAndWindow({ }); view2->setParent(rootView); view2->controller()->setVisible(true); QVERIFY(view2->controller()->isVisible()); @@ -135,7 +135,7 @@ void TestView::tst_viewIsVisible() void TestView::tst_viewGeometry() { // Test with a top-level view first - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); rootView->show(); const auto initialGeo = Rect(200, 201, 500, 501); @@ -170,7 +170,7 @@ void TestView::tst_viewGeometry() void TestView::tst_viewMinSize() { - const Size sizeHint = {}; + const Size sizeHint = { }; const Size minSize = { 201, 202 }; auto rootView = createViewAndWindow({ true, sizeHint, minSize }); QCOMPARE(rootView->minSize(), minSize); @@ -182,7 +182,7 @@ void TestView::tst_viewMinSize() void TestView::tst_viewMaxSize() { - const Size sizeHint = {}; + const Size sizeHint = { }; const Size minSize = { 201, 202 }; const Size maxSize = { 500, 501 }; auto rootView = createViewAndWindow({ true, sizeHint, minSize, maxSize }); @@ -195,7 +195,7 @@ void TestView::tst_viewMaxSize() void TestView::tst_viewObjectName() { - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); QCOMPARE(rootView->viewName(), QString()); const QString newName = QStringLiteral("name1"); @@ -207,7 +207,7 @@ void TestView::tst_viewCloseRequested() { // Tests that the closeRequested signal is emitted - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); bool signalArrived = false; KDBindings::ScopedConnection connection = rootView->d->closeRequested.connect([&signalArrived](CloseEvent *ev) { @@ -222,13 +222,13 @@ void TestView::tst_viewCloseRequested() void TestView::tst_viewFocusPolicy() { - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); QCOMPARE(rootView->focusPolicy(), Qt::NoFocus); } void TestView::tst_hasFocus() { - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); rootView->show(); rootView->activateWindow(); @@ -241,7 +241,7 @@ void TestView::tst_hasFocus() QVERIFY(rootView->hasFocus()); QVERIFY(rootView->equals(Platform::instance()->focusedView())); - auto child1 = createViewAndWindow({}, rootView); + auto child1 = createViewAndWindow({ }, rootView); QVERIFY(rootView->hasFocus()); QVERIFY(rootView->equals(Platform::instance()->focusedView())); child1->controller()->setVisible(true); @@ -255,12 +255,12 @@ void TestView::tst_parentDeletesChildViews() { // Tests that deleting a parent view also deletes its children - auto rootView = createViewAndWindow({}); + auto rootView = createViewAndWindow({ }); rootView->show(); rootView->activateWindow(); QVERIFY(rootView->controller()->isVisible()); QTest::qWait(0); - auto child = createViewAndWindow({}, rootView); + auto child = createViewAndWindow({ }, rootView); child->show(); QVERIFY(child->isVisible()); QVERIFY(child->controller()); diff --git a/tests/tst_viewguard.cpp b/tests/tst_viewguard.cpp index 20b0fa33d..f067ad0ef 100644 --- a/tests/tst_viewguard.cpp +++ b/tests/tst_viewguard.cpp @@ -32,7 +32,7 @@ void TestGuards::tst_viewGuard() QVERIFY(g.isNull()); { - auto view = Platform::instance()->tests_createView({}); + auto view = Platform::instance()->tests_createView({ }); g = view; QVERIFY(!g.isNull()); delete view; @@ -42,7 +42,7 @@ void TestGuards::tst_viewGuard() // Test when ViewGuard is destroyed before view // May not crash without ASAN - auto view = Platform::instance()->tests_createView({}); + auto view = Platform::instance()->tests_createView({ }); { ViewGuard gg(view); QVERIFY(!gg.isNull()); diff --git a/tests/tst_window.cpp b/tests/tst_window.cpp index 208225bd0..c9cd2531b 100644 --- a/tests/tst_window.cpp +++ b/tests/tst_window.cpp @@ -97,7 +97,7 @@ void TestWindow::tst_equals() QVERIFY(window1->equals(window1)); QVERIFY(!window1->equals(window2)); - QVERIFY(!window1->equals({})); + QVERIFY(!window1->equals({ })); window1->destroy(); window2->destroy(); diff --git a/tests/utils.cpp b/tests/utils.cpp index e65ae9be5..e662b9569 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -93,7 +93,7 @@ KDDockWidgets::Tests::createDockWidget(const QString &name, View *guest, DockWid Core::DockWidget *KDDockWidgets::Tests::createDockWidget(const QString &name, LayoutSaverOptions layoutSaverOptions) { return createDockWidget(name, - Platform::instance()->tests_createView({ true, {}, { 100, 100 } }), {}, layoutSaverOptions); + Platform::instance()->tests_createView({ true, { }, { 100, 100 } }), { }, layoutSaverOptions); } std::unique_ptr KDDockWidgets::Tests::createMainWindow(std::vector &docks) @@ -114,9 +114,9 @@ std::unique_ptr KDDockWidgets::Tests::createMainWindow(std::vectortests_createView({ true, {}, { 100, 100 } }); + auto guest = Platform::instance()->tests_createView({ true, { }, { 100, 100 } }); desc.createdDock = - createDockWidget((QString::number(i) + QString::number(count)), guest, {}, {}, false); + createDockWidget((QString::number(i) + QString::number(count)), guest, { }, { }, false); Core::DockWidget *relativeTo = nullptr; if (desc.relativeToIndex != -1) relativeTo = docks.at(desc.relativeToIndex).createdDock; diff --git a/tests/utils.h b/tests/utils.h index 3c2903dd8..63d7ca7a8 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -131,23 +131,23 @@ struct EnsureTopLevelsDeleted const int m_originalSeparatorThickness; }; -bool shouldBlacklistWarning(const QString &msg, const QString &category = {}); +bool shouldBlacklistWarning(const QString &msg, const QString &category = { }); std::unique_ptr createMainWindow(Size sz = { 1000, 1000 }, KDDockWidgets::MainWindowOptions options = MainWindowOption_HasCentralGroup, - const QString &name = {}, bool show = true); + const QString &name = { }, bool show = true); std::unique_ptr createMainWindow(std::vector &docks); Core::DockWidget *createDockWidget(const QString &name, Core::View *guest, - DockWidgetOptions options = {}, - LayoutSaverOptions layoutSaverOptions = {}, - bool show = true, const QString &affinityName = {}); + DockWidgetOptions options = { }, + LayoutSaverOptions layoutSaverOptions = { }, + bool show = true, const QString &affinityName = { }); -Core::DockWidget *createDockWidget(const QString &name, LayoutSaverOptions layoutSaverOptions = {}); +Core::DockWidget *createDockWidget(const QString &name, LayoutSaverOptions layoutSaverOptions = { }); void nestDockWidget(Core::DockWidget *dock, Core::DropArea *dropArea, Core::Group *relativeTo, KDDockWidgets::Location location); @@ -276,8 +276,8 @@ inline int osWindowMinWidth() /// Helper function so we don't write such a big line everywhere inline Core::DockWidget *newDockWidget(const QString &uniqueName, - DockWidgetOptions opts = {}, - LayoutSaverOptions layoutSaverOptions = {}) + DockWidgetOptions opts = { }, + LayoutSaverOptions layoutSaverOptions = { }) { return Config::self() .viewFactory()