From f4b1cacc03502568c052528ba83941c4a8069ca3 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 27 Jun 2014 15:21:16 +0200 Subject: [PATCH] Prefer nullptr over 0 for null pointers. --- src/calamares/CalamaresWindow.h | 2 +- src/calamares/Settings.cpp | 2 +- src/calamares/Settings.h | 2 +- src/calamares/ViewManager.cpp | 2 +- src/calamares/ViewManager.h | 2 +- src/calamares/modulesystem/ModuleManager.h | 2 +- src/calamares/viewpages/AbstractPage.h | 2 +- src/calamares/viewpages/ViewPlugin.h | 2 +- src/modules/greeting/GreetingPage.h | 2 +- src/modules/greeting/GreetingViewPlugin.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index 7fa297416..f7b792277 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -27,7 +27,7 @@ class CalamaresWindow : public QWidget, private Ui::Base { Q_OBJECT public: - CalamaresWindow( QWidget* parent = 0 ); + CalamaresWindow( QWidget* parent = nullptr ); virtual ~CalamaresWindow() {} }; diff --git a/src/calamares/Settings.cpp b/src/calamares/Settings.cpp index 7fd2bb008..f76798aa7 100644 --- a/src/calamares/Settings.cpp +++ b/src/calamares/Settings.cpp @@ -32,7 +32,7 @@ namespace Calamares { -Settings* Settings::s_instance = 0; +Settings* Settings::s_instance = nullptr; Settings* Settings::instance() diff --git a/src/calamares/Settings.h b/src/calamares/Settings.h index 2cbd17104..42731f102 100644 --- a/src/calamares/Settings.h +++ b/src/calamares/Settings.h @@ -30,7 +30,7 @@ class Settings : public QObject { Q_OBJECT public: - explicit Settings( QObject *parent = 0 ); + explicit Settings( QObject *parent = nullptr ); static Settings* instance(); //TODO: load from JSON then emit ready diff --git a/src/calamares/ViewManager.cpp b/src/calamares/ViewManager.cpp index 91192fa69..ec9b29fef 100644 --- a/src/calamares/ViewManager.cpp +++ b/src/calamares/ViewManager.cpp @@ -25,7 +25,7 @@ namespace Calamares { -ViewManager* ViewManager::s_instance = 0; +ViewManager* ViewManager::s_instance = nullptr; ViewManager* ViewManager::instance() diff --git a/src/calamares/ViewManager.h b/src/calamares/ViewManager.h index 99f586878..548beffcc 100644 --- a/src/calamares/ViewManager.h +++ b/src/calamares/ViewManager.h @@ -36,7 +36,7 @@ class UIDLLEXPORT ViewManager : public QObject public: static ViewManager* instance(); - explicit ViewManager( QObject* parent = 0 ); + explicit ViewManager( QObject* parent = nullptr ); virtual ~ViewManager(); QWidget* widget(); diff --git a/src/calamares/modulesystem/ModuleManager.h b/src/calamares/modulesystem/ModuleManager.h index 55788e892..e0865770d 100644 --- a/src/calamares/modulesystem/ModuleManager.h +++ b/src/calamares/modulesystem/ModuleManager.h @@ -34,7 +34,7 @@ class ModuleManager : public QObject { Q_OBJECT public: - explicit ModuleManager( const QStringList& paths, QObject* parent = 0 ); + explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); virtual ~ModuleManager(); void init(); diff --git a/src/calamares/viewpages/AbstractPage.h b/src/calamares/viewpages/AbstractPage.h index f94176bb1..8902a1785 100644 --- a/src/calamares/viewpages/AbstractPage.h +++ b/src/calamares/viewpages/AbstractPage.h @@ -30,7 +30,7 @@ class UIDLLEXPORT AbstractPage : public QWidget { Q_OBJECT public: - explicit AbstractPage(QWidget *parent = 0); + explicit AbstractPage(QWidget *parent = nullptr); virtual ~AbstractPage() {} diff --git a/src/calamares/viewpages/ViewPlugin.h b/src/calamares/viewpages/ViewPlugin.h index ec6bcdc57..e71141279 100644 --- a/src/calamares/viewpages/ViewPlugin.h +++ b/src/calamares/viewpages/ViewPlugin.h @@ -32,7 +32,7 @@ class UIDLLEXPORT ViewPlugin : public QObject { Q_OBJECT public: - explicit ViewPlugin( QObject *parent = 0 ); + explicit ViewPlugin( QObject *parent = nullptr ); virtual ~ViewPlugin() {} virtual QString prettyName() = 0; diff --git a/src/modules/greeting/GreetingPage.h b/src/modules/greeting/GreetingPage.h index fb5d6c5ec..d4697cd12 100644 --- a/src/modules/greeting/GreetingPage.h +++ b/src/modules/greeting/GreetingPage.h @@ -25,7 +25,7 @@ class GreetingPage : public Calamares::AbstractPage { Q_OBJECT public: - explicit GreetingPage( QWidget* parent = 0 ); + explicit GreetingPage( QWidget* parent = nullptr ); signals: diff --git a/src/modules/greeting/GreetingViewPlugin.h b/src/modules/greeting/GreetingViewPlugin.h index 345395b09..16b4391f7 100644 --- a/src/modules/greeting/GreetingViewPlugin.h +++ b/src/modules/greeting/GreetingViewPlugin.h @@ -32,7 +32,7 @@ class PLUGINDLLEXPORT GreetingViewPlugin : public Calamares::ViewPlugin Q_INTERFACES( Calamares::ViewPlugin ) public: - explicit GreetingViewPlugin(QObject *parent = 0); + explicit GreetingViewPlugin( QObject* parent = nullptr ); QString prettyName() override; };