[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-desktop] /: Use nullptr
From: Laurent Montel <null () kde ! org>
Date: 2018-02-03 9:14:53
Message-ID: E1ehtuP-0005q2-TO () code ! kde ! org
[Download RAW message or body]
Git commit a4649c9ef511199a9b00a13d85bb3906d735731e by Laurent Montel.
Committed on 03/02/2018 at 09:14.
Pushed by mlaurent into branch 'master'.
Use nullptr
M +1 -1 imports/activitymanager/switcherbackend.cpp
M +1 -1 kcms/activities/BlacklistedApplicationsModel.h
M +1 -1 kcms/activities/ExtraActivitiesInterface.h
M +2 -2 kcms/activities/PrivacyTab.cpp
M +1 -1 kcms/activities/SwitchingTab.cpp
M +1 -1 kcms/activities/common/dbus/common.h
M +1 -1 kcms/activities/imports/activitysettings.cpp
M +1 -1 kcms/activities/imports/activitysettings.h
M +1 -1 kcms/activities/imports/dialog.cpp
M +1 -1 kcms/activities/imports/dialog.h
M +1 -1 kcms/activities/imports/plugin.h
M +1 -1 kcms/activities/utils/dbusfuture_p.h
M +2 -2 kcms/activities/utils/optional_view.h
M +1 -1 kcms/colors/scmeditorcolors.h
M +2 -2 kcms/colors/scmeditordialog.h
M +1 -1 kcms/colors/scmeditoreffects.h
M +1 -1 kcms/colors/scmeditoroptions.h
M +2 -2 kcms/keyboard/udev_helper.cpp
M +1 -1 kcms/keyboard/udev_helper.h
M +1 -1 kcms/keyboard/xinput_helper.cpp
https://commits.kde.org/plasma-desktop/a4649c9ef511199a9b00a13d85bb3906d735731e
diff --git a/imports/activitymanager/switcherbackend.cpp \
b/imports/activitymanager/switcherbackend.cpp index 53f8eb93..34590738 100644
--- a/imports/activitymanager/switcherbackend.cpp
+++ b/imports/activitymanager/switcherbackend.cpp
@@ -336,7 +336,7 @@ void SwitcherBackend::showActivitySwitcherIfNeeded()
if (isPlatformX11()) {
if (!x11_areModKeysDepressed(m_actionShortcut[actionName])) {
- m_lastInvokedAction = Q_NULLPTR;
+ m_lastInvokedAction = nullptr;
setShouldShowSwitcher(false);
return;
}
diff --git a/kcms/activities/BlacklistedApplicationsModel.h \
b/kcms/activities/BlacklistedApplicationsModel.h index d1f867c9..757b18b7 100644
--- a/kcms/activities/BlacklistedApplicationsModel.h
+++ b/kcms/activities/BlacklistedApplicationsModel.h
@@ -34,7 +34,7 @@ class BlacklistedApplicationsModel : public QAbstractListModel {
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
public:
- BlacklistedApplicationsModel(QObject *parent = Q_NULLPTR);
+ BlacklistedApplicationsModel(QObject *parent = nullptr);
~BlacklistedApplicationsModel();
enum Roles {
diff --git a/kcms/activities/ExtraActivitiesInterface.h \
b/kcms/activities/ExtraActivitiesInterface.h index 8ee065f0..6667d085 100644
--- a/kcms/activities/ExtraActivitiesInterface.h
+++ b/kcms/activities/ExtraActivitiesInterface.h
@@ -32,7 +32,7 @@ class ExtraActivitiesInterface : public QObject {
Q_OBJECT
public:
- ExtraActivitiesInterface(QObject *parent = Q_NULLPTR);
+ ExtraActivitiesInterface(QObject *parent = nullptr);
~ExtraActivitiesInterface();
public Q_SLOTS:
diff --git a/kcms/activities/PrivacyTab.cpp b/kcms/activities/PrivacyTab.cpp
index 3519f8e9..670439d8 100644
--- a/kcms/activities/PrivacyTab.cpp
+++ b/kcms/activities/PrivacyTab.cpp
@@ -53,8 +53,8 @@ public:
std::unique_ptr<QQuickView> viewBlacklistedApplications;
Private()
- : viewBlacklistedApplicationsRoot(Q_NULLPTR)
- , viewBlacklistedApplications(Q_NULLPTR)
+ : viewBlacklistedApplicationsRoot(nullptr)
+ , viewBlacklistedApplications(nullptr)
{
}
};
diff --git a/kcms/activities/SwitchingTab.cpp b/kcms/activities/SwitchingTab.cpp
index 990ac690..7d0bcc0e 100644
--- a/kcms/activities/SwitchingTab.cpp
+++ b/kcms/activities/SwitchingTab.cpp
@@ -47,7 +47,7 @@ public:
}
Private()
- : mainActionCollection(Q_NULLPTR)
+ : mainActionCollection(nullptr)
{
}
};
diff --git a/kcms/activities/common/dbus/common.h \
b/kcms/activities/common/dbus/common.h index b0f88223..ed133a6b 100644
--- a/kcms/activities/common/dbus/common.h
+++ b/kcms/activities/common/dbus/common.h
@@ -46,7 +46,7 @@
KAMD_DBUS_OBJECT_PATH(OBJECT_PATH), \
KAMD_DBUS_OBJECT(OBJECT), \
QDBusConnection::sessionBus(), \
- Q_NULLPTR)
+ nullptr)
#define KAMD_DBUS_CLASS_INTERFACE(OBJECT_PATH, OBJECT, PARENT) \
org::kde::ActivityManager::OBJECT( \
diff --git a/kcms/activities/imports/activitysettings.cpp \
b/kcms/activities/imports/activitysettings.cpp index 014bee83..ff545d19 100644
--- a/kcms/activities/imports/activitysettings.cpp
+++ b/kcms/activities/imports/activitysettings.cpp
@@ -60,7 +60,7 @@ void ActivitySettings::deleteActivity(const QString &id)
{
KActivities::Info info(id);
- if (QMessageBox::question(Q_NULLPTR, i18nc("@title:window", "Delete Activity"),
+ if (QMessageBox::question(nullptr, i18nc("@title:window", "Delete Activity"),
i18n("Are you sure you want to delete '%1'?",
info.name())) == QMessageBox::Yes) {
KActivities::Controller().removeActivity(id);
diff --git a/kcms/activities/imports/activitysettings.h \
b/kcms/activities/imports/activitysettings.h index 2b329e51..e5ea263a 100644
--- a/kcms/activities/imports/activitysettings.h
+++ b/kcms/activities/imports/activitysettings.h
@@ -29,7 +29,7 @@ class ActivitySettings: public QObject {
Q_PROPERTY(bool newActivityAuthorized READ newActivityAuthorized CONSTANT)
public:
- ActivitySettings(QObject *parent = Q_NULLPTR);
+ explicit ActivitySettings(QObject *parent = nullptr);
~ActivitySettings();
bool newActivityAuthorized() const;
diff --git a/kcms/activities/imports/dialog.cpp b/kcms/activities/imports/dialog.cpp
index d87a1d86..d19292fa 100644
--- a/kcms/activities/imports/dialog.cpp
+++ b/kcms/activities/imports/dialog.cpp
@@ -291,7 +291,7 @@ void Dialog::saveChanges(const QString &activityId)
d->activities.setActivityIcon(activityId, activityIcon());
// setting the key shortcut
- QAction action(Q_NULLPTR);
+ QAction action(nullptr);
action.setProperty("isConfigurationAction", true);
action.setProperty("componentName", "ActivityManager");
action.setObjectName("switch-to-activity-" + activityId);
diff --git a/kcms/activities/imports/dialog.h b/kcms/activities/imports/dialog.h
index 9c12f00f..9fcb4685 100644
--- a/kcms/activities/imports/dialog.h
+++ b/kcms/activities/imports/dialog.h
@@ -66,7 +66,7 @@ protected:
void showEvent(QShowEvent *event) override;
private:
- Dialog(QObject *parent = Q_NULLPTR);
+ Dialog(QObject *parent = nullptr);
D_PTR;
diff --git a/kcms/activities/imports/plugin.h b/kcms/activities/imports/plugin.h
index b78b2783..b2536a0f 100644
--- a/kcms/activities/imports/plugin.h
+++ b/kcms/activities/imports/plugin.h
@@ -28,7 +28,7 @@ class ActivitiesSettingsPlugin : public QQmlExtensionPlugin {
Q_PLUGIN_METADATA(IID "org.kde.activities.settings")
public:
- ActivitiesSettingsPlugin(QObject *parent = Q_NULLPTR);
+ ActivitiesSettingsPlugin(QObject *parent = nullptr);
void registerTypes(const char *uri) override;
};
diff --git a/kcms/activities/utils/dbusfuture_p.h \
b/kcms/activities/utils/dbusfuture_p.h index 9e82f868..0fe120d2 100644
--- a/kcms/activities/utils/dbusfuture_p.h
+++ b/kcms/activities/utils/dbusfuture_p.h
@@ -39,7 +39,7 @@ class DBusCallFutureInterface : public QObject,
public:
DBusCallFutureInterface(QDBusPendingReply<_Result> reply)
: reply(reply),
- replyWatcher(Q_NULLPTR)
+ replyWatcher(nullptr)
{
}
diff --git a/kcms/activities/utils/optional_view.h \
b/kcms/activities/utils/optional_view.h index f4a680b2..72c61388 100644
--- a/kcms/activities/utils/optional_view.h
+++ b/kcms/activities/utils/optional_view.h
@@ -42,13 +42,13 @@ public:
}
optional_view(const none_t &)
- : m_value(Q_NULLPTR)
+ : m_value(nullptr)
{
}
bool is_initialized() const
{
- return m_value != Q_NULLPTR;
+ return m_value != nullptr;
}
const T &get() const
diff --git a/kcms/colors/scmeditorcolors.h b/kcms/colors/scmeditorcolors.h
index 5245c2ff..c53a11a5 100644
--- a/kcms/colors/scmeditorcolors.h
+++ b/kcms/colors/scmeditorcolors.h
@@ -36,7 +36,7 @@ class SchemeEditorColors : public QWidget, public \
Ui::ScmEditorColors Q_OBJECT
public:
- SchemeEditorColors(KSharedConfigPtr config, QWidget *parent = Q_NULLPTR);
+ SchemeEditorColors(KSharedConfigPtr config, QWidget *parent = nullptr);
void updateValues();
void updateFromColorSchemes();
diff --git a/kcms/colors/scmeditordialog.h b/kcms/colors/scmeditordialog.h
index af940944..5d46fa23 100644
--- a/kcms/colors/scmeditordialog.h
+++ b/kcms/colors/scmeditordialog.h
@@ -39,8 +39,8 @@ class SchemeEditorDialog : public QDialog, public \
Ui::ScmEditorDialog Q_OBJECT
public:
- SchemeEditorDialog(const QString &path, KColorCm *parent = Q_NULLPTR);
- SchemeEditorDialog(KSharedConfigPtr config, KColorCm *parent = Q_NULLPTR);
+ SchemeEditorDialog(const QString &path, KColorCm *parent = nullptr);
+ SchemeEditorDialog(KSharedConfigPtr config, KColorCm *parent = nullptr);
Q_SIGNALS:
void changed(bool);
diff --git a/kcms/colors/scmeditoreffects.h b/kcms/colors/scmeditoreffects.h
index c84e5b85..1fa16e76 100644
--- a/kcms/colors/scmeditoreffects.h
+++ b/kcms/colors/scmeditoreffects.h
@@ -35,7 +35,7 @@ class SchemeEditorEffects : public QWidget, public \
Ui::ScmEditorEffects Q_OBJECT
public:
- SchemeEditorEffects(KSharedConfigPtr config, QPalette::ColorGroup palette, \
QWidget *parent = Q_NULLPTR); + SchemeEditorEffects(KSharedConfigPtr config, \
QPalette::ColorGroup palette, QWidget *parent = nullptr); void updateValues();
void updateFromEffectsPage();
diff --git a/kcms/colors/scmeditoroptions.h b/kcms/colors/scmeditoroptions.h
index 72239937..cfd1d88d 100644
--- a/kcms/colors/scmeditoroptions.h
+++ b/kcms/colors/scmeditoroptions.h
@@ -34,7 +34,7 @@ class SchemeEditorOptions : public QWidget, public \
Ui::ScmEditorOptions Q_OBJECT
public:
- SchemeEditorOptions(KSharedConfigPtr config, QWidget *parent = Q_NULLPTR);
+ SchemeEditorOptions(KSharedConfigPtr config, QWidget *parent = nullptr);
void updateValues();
Q_SIGNALS:
diff --git a/kcms/keyboard/udev_helper.cpp b/kcms/keyboard/udev_helper.cpp
index 24b19398..77ab43ff 100644
--- a/kcms/keyboard/udev_helper.cpp
+++ b/kcms/keyboard/udev_helper.cpp
@@ -31,8 +31,8 @@
UdevDeviceNotifier::UdevDeviceNotifier(QObject *parent)
: QObject(parent)
- , m_udev(Q_NULLPTR)
- , m_monitor(Q_NULLPTR)
+ , m_udev(nullptr)
+ , m_monitor(nullptr)
{
init();
}
diff --git a/kcms/keyboard/udev_helper.h b/kcms/keyboard/udev_helper.h
index 636269e9..f0b49145 100644
--- a/kcms/keyboard/udev_helper.h
+++ b/kcms/keyboard/udev_helper.h
@@ -26,7 +26,7 @@ class UdevDeviceNotifier : public QObject
Q_OBJECT
public:
- explicit UdevDeviceNotifier(QObject *parent = Q_NULLPTR);
+ explicit UdevDeviceNotifier(QObject *parent = nullptr);
~UdevDeviceNotifier();
Q_SIGNALS:
diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
index dc3426f2..6d65300d 100644
--- a/kcms/keyboard/xinput_helper.cpp
+++ b/kcms/keyboard/xinput_helper.cpp
@@ -56,7 +56,7 @@ static const int DEVICE_POINTER = 2;
XInputEventNotifier::XInputEventNotifier(QWidget* parent):
XEventNotifier(), //TODO: destruct properly?
xinputEventType(-1),
- udevNotifier(Q_NULLPTR)
+ udevNotifier(nullptr)
{
Q_UNUSED(parent)
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic