Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
hooks:
- id: clang-format
exclude: (.json)
- repo: https://github.com/PyCQA/pylint
rev: v4.0.4
rev: v4.0.6
hooks:
- id: pylint
exclude: ^(.cmake-format.py|conan/conanfile.py)
Expand All @@ -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
Expand All @@ -52,15 +52,15 @@ repos:
hooks:
- id: reuse
- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.12.0-2
rev: v3.13.1-1
hooks:
- id: shfmt
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.11.0.1
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]
Expand Down
4 changes: 2 additions & 2 deletions examples/dockwidgets/MyMainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions examples/dockwidgets/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion examples/mdi_with_docking/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
34 changes: 17 additions & 17 deletions src/LayoutSaver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ std::unordered_map<QString, CloseReason> 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);
Expand Down Expand Up @@ -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<FrameOption>::Int {});
f.options = jsonValue(json, "options", QFlags<FrameOption>::Int { });
f.currentTabIndex = jsonValue(json, "currentTabIndex", 0);
f.mainWindowUniqueName = jsonValue(json, "mainWindowUniqueName", QString());

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -862,7 +862,7 @@ Vector<QString> LayoutSaver::openedDockWidgetsInLayout(const QString &jsonFilena
const QByteArray data = Platform::instance()->readFile(jsonFilename, /*by-ref*/ ok);

if (!ok)
return {};
return { };

return openedDockWidgetsInLayout(data);
}
Expand All @@ -871,7 +871,7 @@ Vector<QString> LayoutSaver::openedDockWidgetsInLayout(const QByteArray &seriali
{
LayoutSaver::Layout layout;
if (!layout.fromJson(serialized))
return {};
return { };

Vector<QString> names;
names.reserve(layout.allDockWidgets.size()); // over-reserve so we have a single allocation
Expand All @@ -895,7 +895,7 @@ Vector<QString> LayoutSaver::sideBarDockWidgetsInLayout(const QString &jsonFilen
const QByteArray data = Platform::instance()->readFile(jsonFilename, /*by-ref*/ ok);

if (!ok)
return {};
return { };

return sideBarDockWidgetsInLayout(data);
}
Expand All @@ -904,7 +904,7 @@ Vector<QString> LayoutSaver::sideBarDockWidgetsInLayout(const QByteArray &serial
{
LayoutSaver::Layout layout;
if (!layout.fromJson(serialized))
return {};
return { };

Vector<QString> names;
names.reserve(layout.allDockWidgets.size()); // over-reserve so we have a single allocation
Expand Down Expand Up @@ -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();

Expand All @@ -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 { });
}
}

Expand Down Expand Up @@ -1021,15 +1021,15 @@ 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);
}

LayoutSaver::FloatingWindow LayoutSaver::Layout::floatingWindowForIndex(int index) const
{
if (index < 0 || index >= floatingWindows.size())
return {};
return { };

return floatingWindows.at(index);
}
Expand Down Expand Up @@ -1147,7 +1147,7 @@ bool LayoutSaver::Group::skipsRestore() const
LayoutSaver::DockWidget::Ptr LayoutSaver::Group::singleDockWidget() const
{
if (!hasSingleDockWidget())
return {};
return { };

return dockWidgets.first();
}
Expand Down Expand Up @@ -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();
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/QtCompat_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class HoverEvent : public Event

Point pos() const
{
return {};
return { };
}
};

Expand Down Expand Up @@ -218,7 +218,7 @@ class DropEvent : public Event

Point position() const
{
return {};
return { };
}

void setDropAction(Qt::DropAction)
Expand All @@ -245,7 +245,7 @@ class FocusEvent : public Event
public:
Qt::FocusReason reason() const
{
return {};
return { };
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/core/Controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/core/DockRegistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<QString> &affinities = {});
Q_INVOKABLE void clear(const QVector<QString> &affinities = { });

/**
* @brief clear Overload that only clears the specified dockWidgets and main windows.
Expand Down
4 changes: 2 additions & 2 deletions src/core/DockWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ Icon DockWidget::icon(IconPlace place) const
if (place == IconPlace::ToggleAction)
return d->toggleAction->icon();

return {};
return { };
}

void DockWidget::forceClose()
Expand Down Expand Up @@ -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();
}
Expand Down
8 changes: 4 additions & 4 deletions src/core/DockWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/core/DropArea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -278,7 +278,7 @@ Vector<QString> DropArea::affinities() const
return fw->affinities();
}

return {};
return { };
}

void DropArea::layoutParentContainerEqually(Core::DockWidget *dw)
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/core/DropArea.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions src/core/FloatingWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/core/FloatingWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading