From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 12 Mar 2021 14:23:17 +0000 (+0100)
Subject: qa: Resolve Qt deprecation warnings - default-construct QFlags
X-Git-Tag: 0.14-rc2~24
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a700bd999215313b075ced5a1e3ba4ea8917fbbc

qa: Resolve Qt deprecation warnings - default-construct QFlags

Empty QFlags should not be created by giving a nullptr to the ctor,
but by simply using the default ctor instead.

Resolves a deprecation warning that was introduced in Qt 5.15.
---

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index 006434c8..3e243a42 100644
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -45,7 +45,6 @@ private:
 AbstractTreeItem::AbstractTreeItem(AbstractTreeItem* parent)
     : QObject(parent)
     , _flags(Qt::ItemIsSelectable | Qt::ItemIsEnabled)
-    , _treeItemFlags(nullptr)
 {}
 
 bool AbstractTreeItem::newChild(AbstractTreeItem* item)
@@ -102,7 +101,7 @@ void AbstractTreeItem::removeAllChilds()
     childIter = _childItems.begin();
     while (childIter != _childItems.end()) {
         child = *childIter;
-        child->setTreeItemFlags(nullptr);  // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
+        child->setTreeItemFlags({});  // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
         child->removeAllChilds();
         ++childIter;
     }
diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 431f2b51..3c6ce912 100644
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -87,8 +87,8 @@ protected:
 
 private:
     QList<AbstractTreeItem*> _childItems;
-    Qt::ItemFlags _flags;
-    TreeItemFlags _treeItemFlags;
+    Qt::ItemFlags _flags{};
+    TreeItemFlags _treeItemFlags{};
 
     void removeChildLater(AbstractTreeItem* child);
     inline void checkForDeletion()
diff --git a/src/qtui/ircconnectionwizard.h b/src/qtui/ircconnectionwizard.h
index 2c67a06a..1db66ccb 100644
--- a/src/qtui/ircconnectionwizard.h
+++ b/src/qtui/ircconnectionwizard.h
@@ -30,7 +30,7 @@ class IrcConnectionWizard : public QWizard
     Q_OBJECT
 
 public:
-    IrcConnectionWizard(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr);
+    IrcConnectionWizard(QWidget* parent = nullptr, Qt::WindowFlags flags = {});
 
     static QWizardPage* createIntroductionPage(QWidget* parent = nullptr);
 
diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index 5ab410b3..aae32881 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -238,7 +238,7 @@ NickListDock::NickListDock(const QString& title, QWidget* parent)
 void NickListDock::setLocked(bool locked)
 {
     if (locked) {
-        setFeatures(nullptr);
+        setFeatures({});
     }
     else {
         setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
diff --git a/src/qtui/verticaldock.h b/src/qtui/verticaldock.h
index 0a6ba798..703b47c3 100644
--- a/src/qtui/verticaldock.h
+++ b/src/qtui/verticaldock.h
@@ -59,8 +59,8 @@ class VerticalDock : public QDockWidget
     Q_OBJECT
 
 public:
-    VerticalDock(const QString& title, QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr);
-    VerticalDock(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr);
+    VerticalDock(const QString& title, QWidget* parent = nullptr, Qt::WindowFlags flags = {});
+    VerticalDock(QWidget* parent = nullptr, Qt::WindowFlags flags = {});
 
     void showTitle(bool show);
     void setDefaultTitleWidget();
diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index f5db3e29..3a2be71a 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -728,7 +728,7 @@ BufferViewDock::BufferViewDock(BufferViewConfig* config, QWidget* parent)
 void BufferViewDock::setLocked(bool locked)
 {
     if (locked) {
-        setFeatures(nullptr);
+        setFeatures({});
     }
     else {
         setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);