]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't use nullptr/0 as flags (deprecated in qt5.15)
authorLaurent Montel <montel@kde.org>
Thu, 26 Dec 2019 13:23:45 +0000 (14:23 +0100)
committerLaurent Montel <montel@kde.org>
Thu, 26 Dec 2019 13:23:45 +0000 (14:23 +0100)
src/dolphindockwidget.h
src/kitemviews/kitemlistwidget.cpp
src/kitemviews/private/kitemlistselectiontoggle.cpp
src/settings/general/generalsettingspage.cpp
src/settings/kcm/kcmdolphingeneral.cpp
src/settings/kcm/kcmdolphinnavigation.cpp
src/settings/kcm/kcmdolphinservices.cpp
src/settings/kcm/kcmdolphinviewmodes.cpp

index 0b745f0836784a6d0597c984ec6f25988155fa28..fd38826122b1a95ffb4a2ecfc7e03604c2f8efd3 100644 (file)
@@ -30,7 +30,7 @@ class DolphinDockWidget : public QDockWidget
     Q_OBJECT
 
 public:
-    explicit DolphinDockWidget(const QString& title = QString(), QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr);
+    explicit DolphinDockWidget(const QString& title = QString(), QWidget* parent = nullptr, Qt::WindowFlags flags = {});
     ~DolphinDockWidget() override;
 
     /**
index c3c54a06c4f7df7f66de7904b167eb1998c85b1d..49a13f68fa096ef549a069d6d30147602f673bb9 100644 (file)
@@ -38,7 +38,7 @@ KItemListWidgetInformant::~KItemListWidgetInformant()
 }
 
 KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
-    QGraphicsWidget(parent, nullptr),
+    QGraphicsWidget(parent),
     m_informant(informant),
     m_index(-1),
     m_selected(false),
index 6bdd18da5306a7be3ec17edeebbf05e67e7493eb..48c6854aad94d6bf816a44eff15232a223a031ad 100644 (file)
@@ -25,7 +25,7 @@
 #include <QPainter>
 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
-    QGraphicsWidget(parent, nullptr),
+    QGraphicsWidget(parent),
     m_checked(false),
     m_hovered(false)
 {
index daa74aff1dd1e2d7f1231c99922a72aba7df0592..6e0a1d4743c16bc5e623b410871aa97de5657f93 100644 (file)
@@ -64,7 +64,7 @@ GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) :
     m_pages.append(confirmationsPage);
     m_pages.append(statusBarPage);
 
-    topLayout->addWidget(tabWidget, 0, nullptr);
+    topLayout->addWidget(tabWidget, 0, {});
 }
 
 GeneralSettingsPage::~GeneralSettingsPage()
index 00781f6570b2016e22f188c91bb6dcf6dce12a02..a82cb3858c409609fedb07b468ed34a7a427d39e 100644 (file)
@@ -76,7 +76,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV
     m_pages.append(previewsPage);
     m_pages.append(confirmationsPage);
 
-    topLayout->addWidget(tabWidget, 0, nullptr);
+    topLayout->addWidget(tabWidget, 0, {});
 }
 
 DolphinGeneralConfigModule::~DolphinGeneralConfigModule()
index 9bb3e99fcc45c75f6fefa5a5f924c6caca7c2bf8..2cdabdeee0e22d124cb65b58356f1c4328a59f18 100644 (file)
@@ -46,7 +46,7 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co
 #else
     connect(m_navigation, &NavigationSettingsPage::changed, this, &DolphinNavigationConfigModule::markAsChanged);
 #endif
-    topLayout->addWidget(m_navigation, 0, nullptr);
+    topLayout->addWidget(m_navigation, 0, {});
 }
 
 DolphinNavigationConfigModule::~DolphinNavigationConfigModule()
index be30663450ca3a2aa5a071026b1fab62beac03d7..e6a8867d7dde1754f0d9f88d368e308d0f098d14 100644 (file)
@@ -46,7 +46,7 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const
 #else
     connect(m_services, &ServicesSettingsPage::changed, this, &DolphinServicesConfigModule::markAsChanged);
 #endif
-    topLayout->addWidget(m_services, 0, nullptr);
+    topLayout->addWidget(m_services, 0, {});
 }
 
 DolphinServicesConfigModule::~DolphinServicesConfigModule()
index 12a2056c1edb3eaf14298220a3305861e5459182..4fac1160073a7128d47ee0258fcf06a33b8f3c2a 100644 (file)
@@ -65,7 +65,7 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons
     m_tabs.append(compactTab);
     m_tabs.append(detailsTab);
 
-    topLayout->addWidget(tabWidget, 0, nullptr);
+    topLayout->addWidget(tabWidget, 0, {});
 }
 
 DolphinViewModesConfigModule::~DolphinViewModesConfigModule()