Prefer nullptr over 0 for null pointers.
This commit is contained in:
parent
c3fe6026f2
commit
f4b1cacc03
@ -27,7 +27,7 @@ class CalamaresWindow : public QWidget, private Ui::Base
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
CalamaresWindow( QWidget* parent = 0 );
|
CalamaresWindow( QWidget* parent = nullptr );
|
||||||
virtual ~CalamaresWindow() {}
|
virtual ~CalamaresWindow() {}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
namespace Calamares
|
namespace Calamares
|
||||||
{
|
{
|
||||||
|
|
||||||
Settings* Settings::s_instance = 0;
|
Settings* Settings::s_instance = nullptr;
|
||||||
|
|
||||||
Settings*
|
Settings*
|
||||||
Settings::instance()
|
Settings::instance()
|
||||||
|
@ -30,7 +30,7 @@ class Settings : public QObject
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit Settings( QObject *parent = 0 );
|
explicit Settings( QObject *parent = nullptr );
|
||||||
|
|
||||||
static Settings* instance();
|
static Settings* instance();
|
||||||
//TODO: load from JSON then emit ready
|
//TODO: load from JSON then emit ready
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
namespace Calamares
|
namespace Calamares
|
||||||
{
|
{
|
||||||
|
|
||||||
ViewManager* ViewManager::s_instance = 0;
|
ViewManager* ViewManager::s_instance = nullptr;
|
||||||
|
|
||||||
ViewManager*
|
ViewManager*
|
||||||
ViewManager::instance()
|
ViewManager::instance()
|
||||||
|
@ -36,7 +36,7 @@ class UIDLLEXPORT ViewManager : public QObject
|
|||||||
public:
|
public:
|
||||||
static ViewManager* instance();
|
static ViewManager* instance();
|
||||||
|
|
||||||
explicit ViewManager( QObject* parent = 0 );
|
explicit ViewManager( QObject* parent = nullptr );
|
||||||
virtual ~ViewManager();
|
virtual ~ViewManager();
|
||||||
|
|
||||||
QWidget* widget();
|
QWidget* widget();
|
||||||
|
@ -34,7 +34,7 @@ class ModuleManager : public QObject
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit ModuleManager( const QStringList& paths, QObject* parent = 0 );
|
explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr );
|
||||||
virtual ~ModuleManager();
|
virtual ~ModuleManager();
|
||||||
|
|
||||||
void init();
|
void init();
|
||||||
|
@ -30,7 +30,7 @@ class UIDLLEXPORT AbstractPage : public QWidget
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit AbstractPage(QWidget *parent = 0);
|
explicit AbstractPage(QWidget *parent = nullptr);
|
||||||
virtual ~AbstractPage() {}
|
virtual ~AbstractPage() {}
|
||||||
|
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ class UIDLLEXPORT ViewPlugin : public QObject
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit ViewPlugin( QObject *parent = 0 );
|
explicit ViewPlugin( QObject *parent = nullptr );
|
||||||
virtual ~ViewPlugin() {}
|
virtual ~ViewPlugin() {}
|
||||||
|
|
||||||
virtual QString prettyName() = 0;
|
virtual QString prettyName() = 0;
|
||||||
|
@ -25,7 +25,7 @@ class GreetingPage : public Calamares::AbstractPage
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit GreetingPage( QWidget* parent = 0 );
|
explicit GreetingPage( QWidget* parent = nullptr );
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ class PLUGINDLLEXPORT GreetingViewPlugin : public Calamares::ViewPlugin
|
|||||||
Q_INTERFACES( Calamares::ViewPlugin )
|
Q_INTERFACES( Calamares::ViewPlugin )
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit GreetingViewPlugin(QObject *parent = 0);
|
explicit GreetingViewPlugin( QObject* parent = nullptr );
|
||||||
|
|
||||||
QString prettyName() override;
|
QString prettyName() override;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user