Commit 6fb38f7a authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use nullptr, not 0

parent 784d09a6
......@@ -28,7 +28,7 @@
LocationListModel::LocationListModel(QObject *parent)
: QAbstractListModel(parent)
, m_dataengine(0)
, m_dataengine(nullptr)
, m_validatingInput(false)
, m_checkedInCount(0)
{
......
......@@ -26,7 +26,7 @@ class WeatherLocation::Private
public:
Private(WeatherLocation *location)
: q(location),
locationEngine(0)
locationEngine(nullptr)
{}
void validatorFinished(const QMap<QString, QString> &results)
......
......@@ -31,7 +31,7 @@ class WeatherLocation : public QObject
{
Q_OBJECT
public:
WeatherLocation(QObject *parent = 0);
explicit WeatherLocation(QObject *parent = nullptr);
virtual ~WeatherLocation();
/**
......
......@@ -40,11 +40,11 @@ public:
Private(WeatherPopupApplet *weatherapplet)
: q(weatherapplet)
, weatherConfig(0)
, weatherEngine(0)
, timeEngine(0)
, weatherEngine(nullptr)
, timeEngine(nullptr)
, updateInterval(0)
, location(0)
, timeoutNotification(0)
, location(nullptr)
, timeoutNotification(nullptr)
{
busyTimer = new QTimer(q);
busyTimer->setInterval(2*60*1000);
......@@ -96,7 +96,7 @@ public:
}
location->deleteLater();
location = 0;
location = nullptr;
}
void giveUpBeingBusy()
......@@ -120,7 +120,7 @@ public:
void onTimeoutNotificationClosed()
{
timeoutNotification = 0;
timeoutNotification = nullptr;
}
qreal tendency(const Value& pressure, const QString& tendency)
......@@ -230,7 +230,7 @@ void WeatherPopupApplet::connectToEngine()
{
if (d->timeoutNotification) {
QObject::disconnect(d->timeoutNotification, SIGNAL(close()), this, SLOT(onTimeoutNotificationClosed()));
d->timeoutNotification = 0;
d->timeoutNotification = nullptr;
}
emit newWeatherSource();
......@@ -252,7 +252,7 @@ void WeatherPopupApplet::connectToEngine()
}
} else {
delete d->location;
d->location = 0;
d->location = nullptr;
d->weatherEngine->connectSource(d->source, this, d->updateInterval * 60 * 1000);
QObject *graphicObject = property("_plasma_graphicObject").value<QObject *>();
if (graphicObject) {
......
......@@ -26,7 +26,7 @@ class WeatherValidator::Private
{
public:
Private()
: dataengine(0),
: dataengine(nullptr),
ion(QLatin1String( "bbcukmet" ))
{}
......
......@@ -33,7 +33,7 @@ class PLASMAWEATHER_EXPORT WeatherValidator : public QObject
{
Q_OBJECT
public:
WeatherValidator(QObject *parent = 0);
explicit WeatherValidator(QObject *parent = nullptr);
virtual ~WeatherValidator();
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment