[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-workspace] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-03-10 0:25:58
Message-ID: E1euSKk-0004m0-JS () code ! kde ! org
[Download RAW message or body]
Git commit 2608ccce817fab4fe85e69f0cac3980bfcc8417e by Friedrich W. H. Kossebau.
Committed on 10/03/2018 at 00:14.
Pushed by kossebau into branch 'master'.
Use nullptr
M +3 -3 applets/appmenu/plugin/appmenumodel.cpp
M +2 -2 applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp
M +1 -1 applets/systemtray/tests/statusnotifier/statusnotifiertest.h
M +2 -2 appmenu/appmenu.cpp
M +2 -2 appmenu/verticalmenu.cpp
M +1 -1 appmenu/verticalmenu.h
M +2 -2 components/keyboardlayout/keyboardlayout.cpp
M +6 -6 components/shellprivate/interactiveconsole/interactiveconsole.cpp
M +3 -3 components/shellprivate/interactiveconsole/interactiveconsole.h
M +2 -2 components/shellprivate/widgetexplorer/openwidgetassistant.cpp
M +2 -2 components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp
M +1 -1 components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h
M +4 -4 components/shellprivate/widgetexplorer/widgetexplorer.cpp
M +2 -2 containmentactions/applauncher/launch.cpp
M +9 -9 containmentactions/contextmenu/menu.cpp
M +1 -1 containmentactions/switchwindow/switch.cpp
M +1 -1 dataengines/applicationjobs/jobaction.h
M +1 -1 dataengines/apps/appjob.cpp
M +1 -1 dataengines/devicenotifications/ksolidnotify.cpp
M +3 -3 dataengines/dict/dictengine.cpp
M +2 -2 dataengines/executable/executable.cpp
M +1 -1 dataengines/filebrowser/filebrowserengine.cpp
M +1 -1 dataengines/geolocation/geolocation.cpp
M +2 -2 dataengines/geolocation/geolocationprovider.cpp
M +1 -1 dataengines/geolocation/geolocationprovider.h
M +3 -3 dataengines/geolocation/location_gps.cpp
M +1 -1 dataengines/geolocation/location_gps.h
M +1 -1 dataengines/geolocation/location_ip.h
M +1 -1 dataengines/hotplug/hotplugjob.h
M +1 -1 dataengines/keystate/keyservice.cpp
M +1 -1 dataengines/mouse/mouseengine.cpp
M +1 -1 dataengines/mpris2/multiplexedservice.cpp
M +2 -2 dataengines/mpris2/multiplexer.cpp
M +1 -1 dataengines/mpris2/playercontainer.h
M +2 -2 dataengines/mpris2/playercontrol.cpp
M +1 -1 dataengines/notifications/notificationaction.h
M +1 -1 dataengines/notifications/notificationsengine.cpp
M +1 -1 dataengines/packagekit/packagekitjob.h
M +3 -3 dataengines/places/jobs.h
M +2 -2 dataengines/places/placeservice.cpp
M +1 -1 dataengines/places/setupdevicejob.h
M +1 -1 dataengines/powermanagement/powermanagementengine.cpp
M +3 -3 dataengines/powermanagement/powermanagementjob.cpp
M +1 -1 dataengines/share/packagestructure/share_package.h
M +1 -1 dataengines/share/shareservice.cpp
M +2 -2 dataengines/soliddevice/devicesignalmapmanager.cpp
M +5 -5 dataengines/soliddevice/soliddeviceengine.cpp
M +1 -1 dataengines/soliddevice/soliddevicejob.h
M +1 -1 dataengines/soliddevice/soliddeviceservice.cpp
M +3 -3 dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
M +1 -1 dataengines/statusnotifieritem/statusnotifieritemjob.h
M +3 -3 dataengines/statusnotifieritem/statusnotifieritemsource.cpp
M +1 -1 dataengines/time/timeengine.cpp
M +2 -2 dataengines/time/timesource.cpp
M +1 -1 freespacenotifier/freespacenotifier.h
M +2 -2 gmenu-dbusmenu-proxy/menuproxy.cpp
M +1 -1 kioslave/applications/kio_applications.cpp
M +2 -2 kioslave/desktop/tests/kio_desktop_test.cpp
M +1 -1 klipper/autotests/modeltest.h
M +1 -1 klipper/clipcommandprocess.h
M +1 -1 klipper/configdialog.cpp
M +2 -2 klipper/editactiondialog.cpp
M +1 -1 klipper/klipper.cpp
M +6 -6 klipper/klipperpopup.cpp
M +1 -1 klipper/popupproxy.cpp
M +2 -2 klipper/urlgrabber.cpp
M +2 -2 krunner/view.cpp
M +1 -1 krunner/view.h
M +6 -6 ksmserver/client.cpp
M +1 -1 ksmserver/client.h
M +2 -2 ksmserver/kcheckrunning.cpp
M +7 -7 ksmserver/legacy.cpp
M +5 -5 ksmserver/main.cpp
M +22 -22 ksmserver/server.cpp
M +5 -5 ksmserver/shutdown.cpp
M +2 -2 ksmserver/shutdowndlg.cpp
M +3 -3 ksmserver/startup.cpp
M +1 -1 kuiserver/progresslistdelegate.cpp
M +1 -1 kuiserver/progresslistdelegate.h
M +1 -1 kuiserver/progresslistdelegate_p.h
M +2 -2 kuiserver/progresslistmodel.cpp
M +1 -1 kuiserver/uiserver.cpp
M +4 -4 libdbusmenuqt/dbusmenuimporter.cpp
M +2 -2 libdbusmenuqt/dbusmenushortcut_p.cpp
M +3 -3 libkworkspace/kdisplaymanager.cpp
M +14 -14 libkworkspace/kworkspace.cpp
M +2 -1 libtaskmanager/launchertasksmodel.cpp
M +2 -2 libtaskmanager/tasktools.cpp
M +12 -12 libtaskmanager/xwindowtasksmodel.cpp
M +2 -2 libtaskmanager/xwindowtasksmodel.h
M +2 -2 phonon/platform_kde/kdeplatformplugin.cpp
M +2 -2 phonon/platform_kde/kiomediastream.cpp
M +2 -2 phonon/platform_kde/kiomediastream_p.h
M +2 -2 plasma-windowed/plasmawindowedview.cpp
M +1 -1 runners/baloo/baloosearchrunner.cpp
M +2 -2 runners/bookmarks/tests/testchromebookmarks.cpp
M +1 -1 runners/calculator/qalculate_engine.cpp
M +1 -1 runners/kill/killrunner.cpp
M +2 -2 runners/locations/locationrunner.cpp
M +1 -1 runners/places/placesrunner.cpp
M +2 -2 runners/powerdevil/PowerDevilRunner.cpp
M +1 -1 runners/services/servicerunner.cpp
M +1 -1 runners/shell/shell_config.h
M +1 -1 runners/shell/shellrunner.cpp
M +1 -1 runners/solid/devicewrapper.cpp
M +1 -1 shell/alternativeshelper.cpp
M +2 -2 shell/containmentconfigview.cpp
M +1 -1 shell/desktopview.h
M +1 -1 shell/packageplugins/wallpaperimages/wallpaperpackage.h
M +1 -1 shell/panelconfigview.h
M +5 -5 shell/panelshadows.cpp
M +1 -1 shell/panelshadows_p.h
M +2 -2 shell/panelview.cpp
M +1 -1 shell/panelview.h
M +1 -1 shell/scripting/applet.cpp
M +5 -5 shell/scripting/configgroup.cpp
M +1 -1 shell/scripting/configgroup.h
M +1 -1 shell/scripting/panel.cpp
M +1 -1 shell/scripting/scriptengine.cpp
M +1 -1 shell/scripting/scriptengine_v1.cpp
M +6 -6 shell/shellcorona.cpp
M +4 -4 shell/shellmanager.cpp
M +2 -2 shell/standaloneappcorona.cpp
M +1 -1 shell/standaloneappcorona.h
M +1 -1 soliduiserver/deviceactionsdialog.h
M +1 -1 soliduiserver/deviceserviceaction.cpp
M +1 -1 soliduiserver/soliduiserver.cpp
M +5 -5 startkde/kstartupconfig/kstartupconfig.cpp
M +1 -1 systemmonitor/ksystemactivitydialog.cpp
M +1 -1 systemmonitor/ksystemactivitydialog.h
M +5 -5 wallpapers/image/image.cpp
M +1 -1 xembed-sni-proxy/fdoselectionmanager.cpp
M +5 -5 xembed-sni-proxy/sniproxy.cpp
https://commits.kde.org/plasma-workspace/2608ccce817fab4fe85e69f0cac3980bfcc8417e
diff --git a/applets/appmenu/plugin/appmenumodel.cpp \
b/applets/appmenu/plugin/appmenumodel.cpp index 388915ca..97cd2890 100644
--- a/applets/appmenu/plugin/appmenumodel.cpp
+++ b/applets/appmenu/plugin/appmenumodel.cpp
@@ -143,7 +143,7 @@ void AppMenuModel::onActiveWindowChanged(WId id)
QByteArray value;
if (!s_atoms.contains(name)) {
const xcb_intern_atom_cookie_t atomCookie = xcb_intern_atom(c, \
false, name.length(), name.constData());
- QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
atomReply(xcb_intern_atom_reply(c, atomCookie, Q_NULLPTR)); + \
QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
atomReply(xcb_intern_atom_reply(c, atomCookie, nullptr)); if (atomReply.isNull()) {
return value;
}
@@ -156,7 +156,7 @@ void AppMenuModel::onActiveWindowChanged(WId id)
static const long MAX_PROP_SIZE = 10000;
auto propertyCookie = xcb_get_property(c, false, id, s_atoms[name], \
XCB_ATOM_STRING, 0, MAX_PROP_SIZE);
- QScopedPointer<xcb_get_property_reply_t, QScopedPointerPodDeleter> \
propertyReply(xcb_get_property_reply(c, propertyCookie, NULL)); + \
QScopedPointer<xcb_get_property_reply_t, QScopedPointerPodDeleter> \
propertyReply(xcb_get_property_reply(c, propertyCookie, nullptr)); if \
(propertyReply.isNull()) { return value;
}
@@ -196,7 +196,7 @@ void AppMenuModel::onActiveWindowChanged(WId id)
if (updateMenuFromWindowIfHasMenu(transientId)) {
return;
}
- transientId = KWindowInfo(transientId, 0, \
NET::WM2TransientFor).transientFor(); + transientId = \
KWindowInfo(transientId, nullptr, NET::WM2TransientFor).transientFor(); }
if (updateMenuFromWindowIfHasMenu(id)) {
diff --git a/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp \
b/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp index \
6fa7baba..0110ba6f 100644
--- a/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp
+++ b/applets/systemtray/tests/statusnotifier/statusnotifiertest.cpp
@@ -55,7 +55,7 @@ StatusNotifierTest::StatusNotifierTest(QWidget* parent) :
QDialog(parent)
{
d = new StatusNotifierTestPrivate;
- d->job = 0;
+ d->job = nullptr;
init();
@@ -137,7 +137,7 @@ void StatusNotifierTest::updateNotifier()
//log("update");
if (!enabledCheck->isChecked()) {
delete d->systemNotifier;
- d->systemNotifier = 0;
+ d->systemNotifier = nullptr;
return;
} else {
if (!d->systemNotifier) {
diff --git a/applets/systemtray/tests/statusnotifier/statusnotifiertest.h \
b/applets/systemtray/tests/statusnotifier/statusnotifiertest.h index \
b349df81..35dc0f11 100644
--- a/applets/systemtray/tests/statusnotifier/statusnotifiertest.h
+++ b/applets/systemtray/tests/statusnotifier/statusnotifiertest.h
@@ -34,7 +34,7 @@ class StatusNotifierTest : public QDialog, public \
Ui_StatusNotifierTest Q_OBJECT
public:
- StatusNotifierTest(QWidget* parent = 0);
+ StatusNotifierTest(QWidget* parent = nullptr);
~StatusNotifierTest() override;
void init();
diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp
index fd643be8..7c956c6e 100644
--- a/appmenu/appmenu.cpp
+++ b/appmenu/appmenu.cpp
@@ -116,7 +116,7 @@ void AppMenuModule::slotWindowRegistered(WId id, const QString \
&serviceName, con
auto setWindowProperty = [c](WId id, xcb_atom_t &atom, const QByteArray \
&name, const QByteArray &value) { if (atom == XCB_ATOM_NONE) {
const xcb_intern_atom_cookie_t cookie = xcb_intern_atom(c, false, \
name.length(), name.constData());
- QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
reply(xcb_intern_atom_reply(c, cookie, Q_NULLPTR)); + \
QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
reply(xcb_intern_atom_reply(c, cookie, nullptr)); if (reply.isNull()) {
return;
}
@@ -159,7 +159,7 @@ void AppMenuModule::slotShowMenu(int x, int y, const QString \
&serviceName, const
auto *importer = new KDBusMenuImporter(serviceName, menuObjectPath.path(), \
this);
QMetaObject::invokeMethod(importer, "updateMenu", Qt::QueuedConnection);
- disconnect(importer, 0, this, 0); // ensure we don't popup multiple times in \
case the menu updates again later + disconnect(importer, nullptr, this, nullptr); \
// ensure we don't popup multiple times in case the menu updates again later
connect(importer, &KDBusMenuImporter::menuUpdated, this, [=](QMenu *m) {
QMenu *menu = importer->menu();
diff --git a/appmenu/verticalmenu.cpp b/appmenu/verticalmenu.cpp
index fc1094a8..0d01bdb8 100644
--- a/appmenu/verticalmenu.cpp
+++ b/appmenu/verticalmenu.cpp
@@ -48,9 +48,9 @@ QMenu *VerticalMenu::leafMenu()
leaf = act->menu();
continue;
}
- return leaf == this ? 0 : leaf;
+ return leaf == this ? nullptr : leaf;
}
- return 0; // make gcc happy
+ return nullptr; // make gcc happy
}
void VerticalMenu::paintEvent(QPaintEvent *pe)
diff --git a/appmenu/verticalmenu.h b/appmenu/verticalmenu.h
index ffcb3a11..142ee03e 100644
--- a/appmenu/verticalmenu.h
+++ b/appmenu/verticalmenu.h
@@ -33,7 +33,7 @@ class VerticalMenu : public QMenu
{
Q_OBJECT
public:
- VerticalMenu(QWidget * parent = 0);
+ VerticalMenu(QWidget * parent = nullptr);
~VerticalMenu() override;
QString serviceName() const { return m_serviceName; }
diff --git a/components/keyboardlayout/keyboardlayout.cpp \
b/components/keyboardlayout/keyboardlayout.cpp index 4a649569..5dea4d6d 100644
--- a/components/keyboardlayout/keyboardlayout.cpp
+++ b/components/keyboardlayout/keyboardlayout.cpp
@@ -27,7 +27,7 @@
KeyboardLayout::KeyboardLayout(QObject* parent)
: QObject(parent)
- , mIface(0)
+ , mIface(nullptr)
{
mIface = new QDBusInterface(QStringLiteral("org.kde.keyboard"),
QStringLiteral("/Layouts"),
@@ -36,7 +36,7 @@ KeyboardLayout::KeyboardLayout(QObject* parent)
this);
if (!mIface->isValid()) {
delete mIface;
- mIface = 0;
+ mIface = nullptr;
return;
}
diff --git a/components/shellprivate/interactiveconsole/interactiveconsole.cpp \
b/components/shellprivate/interactiveconsole/interactiveconsole.cpp index \
dcacf1ec..5c60336c 100644
--- a/components/shellprivate/interactiveconsole/interactiveconsole.cpp
+++ b/components/shellprivate/interactiveconsole/interactiveconsole.cpp
@@ -62,9 +62,9 @@ static const QString s_kwinService = \
QStringLiteral("org.kde.KWin"); InteractiveConsole::InteractiveConsole(QWidget \
*parent) : QDialog(parent),
m_splitter(new QSplitter(Qt::Vertical, this)),
- m_editorPart(0),
- m_editor(0),
- m_output(0),
+ m_editorPart(nullptr),
+ m_editor(nullptr),
+ m_output(nullptr),
m_loadAction(KStandardAction::open(this, SLOT(openScriptFile()), this)),
m_saveAction(KStandardAction::saveAs(this, SLOT(saveScript()), this)),
m_clearAction(KStandardAction::clear(this, SLOT(clearEditor()), this)),
@@ -72,7 +72,7 @@ InteractiveConsole::InteractiveConsole(QWidget *parent)
m_plasmaAction(new QAction(QIcon::fromTheme(QStringLiteral("plasma")), \
i18nc("Toolbar Button to switch to Plasma Scripting Mode", "Plasma"), \
this)),
m_kwinAction(new QAction(QIcon::fromTheme(QStringLiteral("kwin")), \
i18nc("Toolbar Button to switch to KWin Scripting Mode", "KWin"), this)), \
m_snippetsMenu(new QMenu(i18n("Templates"), this)),
- m_fileDialog(0),
+ m_fileDialog(nullptr),
m_closeWhenCompleted(false),
m_mode(PlasmaConsole)
{
@@ -237,7 +237,7 @@ void InteractiveConsole::setScriptInterface(QObject *obj)
{
if (m_scriptEngine != obj) {
if (m_scriptEngine) {
- disconnect(m_scriptEngine, 0, this, 0);
+ disconnect(m_scriptEngine, nullptr, this, nullptr);
}
m_scriptEngine = obj;
@@ -476,7 +476,7 @@ void InteractiveConsole::saveScriptUrlSelected(int result)
}
m_fileDialog->deleteLater();
- m_fileDialog = 0;
+ m_fileDialog = nullptr;
}
void InteractiveConsole::saveScript(const QUrl &url)
diff --git a/components/shellprivate/interactiveconsole/interactiveconsole.h \
b/components/shellprivate/interactiveconsole/interactiveconsole.h index \
24f501ea..aac4c061 100644
--- a/components/shellprivate/interactiveconsole/interactiveconsole.h
+++ b/components/shellprivate/interactiveconsole/interactiveconsole.h
@@ -53,7 +53,7 @@ class InteractiveConsole : public QDialog
Q_OBJECT
public:
- InteractiveConsole(QWidget *parent = 0);
+ InteractiveConsole(QWidget *parent = nullptr);
~InteractiveConsole() override;
enum ConsoleMode {
@@ -132,8 +132,8 @@ class InteractiveConsoleItem : public QObject
public:
InteractiveConsoleItem()
- : QObject(0),
- m_dialog(new InteractiveConsole(0))
+ : QObject(nullptr),
+ m_dialog(new InteractiveConsole(nullptr))
{
connect(m_dialog, &InteractiveConsole::scriptEngineChanged,
this, &InteractiveConsoleItem::scriptEngineChanged);
diff --git a/components/shellprivate/widgetexplorer/openwidgetassistant.cpp \
b/components/shellprivate/widgetexplorer/openwidgetassistant.cpp index \
61bc1f59..82a151cf 100644
--- a/components/shellprivate/widgetexplorer/openwidgetassistant.cpp
+++ b/components/shellprivate/widgetexplorer/openwidgetassistant.cpp
@@ -39,8 +39,8 @@ namespace Plasma
OpenWidgetAssistant::OpenWidgetAssistant(QWidget *parent)
: KAssistantDialog(parent),
- m_fileWidget(0),
- m_filePageWidget(0)
+ m_fileWidget(nullptr),
+ m_filePageWidget(nullptr)
{
m_filePageWidget = new QWidget(this);
diff --git a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp \
b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp index \
a83f265b..a161a076 100644
--- a/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp
+++ b/components/shellprivate/widgetexplorer/plasmaappletitemmodel.cpp
@@ -355,13 +355,13 @@ QMimeData *PlasmaAppletItemModel::mimeData(const \
QModelIndexList &indexes) const {
//qDebug() << "GETTING MIME DATA\n";
if (indexes.count() <= 0) {
- return 0;
+ return nullptr;
}
QStringList types = mimeTypes();
if (types.isEmpty()) {
- return 0;
+ return nullptr;
}
QMimeData *data = new QMimeData();
diff --git a/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h \
b/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h index \
f1172df2..0f935e48 100644
--- a/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h
+++ b/components/shellprivate/widgetexplorer/plasmaappletitemmodel_p.h
@@ -83,7 +83,7 @@ public:
ScreenshotRole = Qt::UserRole+12
};
- explicit PlasmaAppletItemModel(QObject * parent = 0);
+ explicit PlasmaAppletItemModel(QObject * parent = nullptr);
QStringList mimeTypes() const override;
QSet<QString> categories() const;
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp \
b/components/shellprivate/widgetexplorer/widgetexplorer.cpp index 373d004c..a3185b05 \
100644
--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
@@ -68,7 +68,7 @@ class WidgetExplorerPrivate
public:
WidgetExplorerPrivate(WidgetExplorer *w)
: q(w),
- containment(0),
+ containment(nullptr),
itemModel(w),
filterModel(w),
activitiesConsumer(new KActivities::Consumer())
@@ -293,7 +293,7 @@ void WidgetExplorerPrivate::addContainment(Containment \
*containment)
void WidgetExplorerPrivate::containmentDestroyed()
{
- containment = 0;
+ containment = nullptr;
}
void WidgetExplorerPrivate::appletAdded(Plasma::Applet *applet)
@@ -410,7 +410,7 @@ Plasma::Corona *WidgetExplorer::corona() const
return d->containment->corona();
}
- return 0;
+ return nullptr;
}
void WidgetExplorer::addApplet(const QString &pluginName)
@@ -457,7 +457,7 @@ void WidgetExplorer::openWidgetFile()
Plasma::OpenWidgetAssistant *assistant = d->openAssistant.data();
if (!assistant) {
- assistant = new Plasma::OpenWidgetAssistant(0);
+ assistant = new Plasma::OpenWidgetAssistant(nullptr);
d->openAssistant = assistant;
}
diff --git a/containmentactions/applauncher/launch.cpp \
b/containmentactions/applauncher/launch.cpp index 7ea8ae8a..4f70337a 100644
--- a/containmentactions/applauncher/launch.cpp
+++ b/containmentactions/applauncher/launch.cpp
@@ -42,7 +42,7 @@ QList<QAction*> AppLauncher::contextualActions()
{
qDeleteAll(m_actions);
m_actions.clear();
- makeMenu(0, m_group);
+ makeMenu(nullptr, m_group);
return m_actions;
}
@@ -61,7 +61,7 @@ void AppLauncher::makeMenu(QMenu *menu, const KServiceGroup::Ptr \
group)
QAction *action = new QAction(QIcon::fromTheme(service->icon()), text, \
this); connect(action, &QAction::triggered, [action](){
KService::Ptr service = \
KService::serviceByStorageId(action->data().toString());
- new KRun(QUrl("file://"+service->entryPath()), 0);
+ new KRun(QUrl("file://"+service->entryPath()), nullptr);
});
action->setData(service->storageId());
if (menu) {
diff --git a/containmentactions/contextmenu/menu.cpp \
b/containmentactions/contextmenu/menu.cpp index 924d088d..de7c8fd0 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -46,13 +46,13 @@
ContextMenu::ContextMenu(QObject *parent, const QVariantList &args)
: Plasma::ContainmentActions(parent, args),
- m_runCommandAction(0),
- m_lockScreenAction(0),
- m_logoutAction(0),
- m_separator1(0),
- m_separator2(0),
- m_separator3(0),
- m_buttons(0)
+ m_runCommandAction(nullptr),
+ m_lockScreenAction(nullptr),
+ m_logoutAction(nullptr),
+ m_separator1(nullptr),
+ m_separator2(nullptr),
+ m_separator3(nullptr),
+ m_buttons(nullptr)
{
}
@@ -189,7 +189,7 @@ QAction *ContextMenu::action(const QString &name)
//FIXME: remove action: make removal of current activity possible
return c->actions()->action(name);
}
- return 0;
+ return nullptr;
}
void ContextMenu::runCommand()
@@ -256,7 +256,7 @@ QWidget* ContextMenu::createConfigurationInterface(QWidget* \
parent) m_buttons->setExclusive(false);
foreach (const QString &name, m_actionOrder) {
- QCheckBox *item = 0;
+ QCheckBox *item = nullptr;
if (name == QLatin1String("_context")) {
item = new QCheckBox(widget);
diff --git a/containmentactions/switchwindow/switch.cpp \
b/containmentactions/switchwindow/switch.cpp index 8002a0cd..a0267cb7 100644
--- a/containmentactions/switchwindow/switch.cpp
+++ b/containmentactions/switchwindow/switch.cpp
@@ -35,7 +35,7 @@ SwitchWindow::SwitchWindow(QObject *parent, const QVariantList \
&args) m_activityInfo(new TaskManager::ActivityInfo(this)),
m_tasksModel(new TaskManager::TasksModel(this)),
m_mode(AllFlat),
- m_clearOrderTimer(0)
+ m_clearOrderTimer(nullptr)
{
m_tasksModel->setGroupMode(TaskManager::TasksModel::GroupDisabled);
diff --git a/dataengines/applicationjobs/jobaction.h \
b/dataengines/applicationjobs/jobaction.h index b838922c..02f9169c 100644
--- a/dataengines/applicationjobs/jobaction.h
+++ b/dataengines/applicationjobs/jobaction.h
@@ -31,7 +31,7 @@ class JobAction : public Plasma::ServiceJob
JobAction(JobView *jobView,
const QString& operation,
QMap<QString,QVariant>& parameters,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ServiceJob(jobView->objectName(), operation, parameters, parent),
m_jobView(jobView)
{
diff --git a/dataengines/apps/appjob.cpp b/dataengines/apps/appjob.cpp
index b864321a..6fb53fa4 100644
--- a/dataengines/apps/appjob.cpp
+++ b/dataengines/apps/appjob.cpp
@@ -35,7 +35,7 @@ void AppJob::start()
const QString operation = operationName();
if (operation == QLatin1String("launch")) {
QString path = m_source->getApp()->entryPath();
- new KRun(QUrl(path), 0);
+ new KRun(QUrl(path), nullptr);
setResult(true);
return;
}
diff --git a/dataengines/devicenotifications/ksolidnotify.cpp \
b/dataengines/devicenotifications/ksolidnotify.cpp index 02820ff3..6e9119db 100644
--- a/dataengines/devicenotifications/ksolidnotify.cpp
+++ b/dataengines/devicenotifications/ksolidnotify.cpp
@@ -68,7 +68,7 @@ void KSolidNotify::onDeviceRemoved(const QString &udi)
if (m_devices[udi].is<Solid::StorageVolume>()) {
Solid::StorageAccess *access = m_devices[udi].as<Solid::StorageAccess>();
if (access) {
- disconnect(access, 0, this, 0);
+ disconnect(access, nullptr, this, nullptr);
}
}
m_devices.remove(udi);
diff --git a/dataengines/dict/dictengine.cpp b/dataengines/dict/dictengine.cpp
index 86ddfe8a..7e9b79e0 100644
--- a/dataengines/dict/dictengine.cpp
+++ b/dataengines/dict/dictengine.cpp
@@ -29,7 +29,7 @@
DictEngine::DictEngine(QObject* parent, const QVariantList& args)
: Plasma::DataEngine(parent, args)
- , m_tcpSocket(0)
+ , m_tcpSocket(nullptr)
{
Q_UNUSED(args)
m_serverName = QLatin1String("dict.org"); //In case we need to switch it later
@@ -190,7 +190,7 @@ void DictEngine::socketClosed()
if (m_tcpSocket) {
m_tcpSocket->deleteLater();
}
- m_tcpSocket = 0;
+ m_tcpSocket = nullptr;
}
bool DictEngine::sourceRequestEvent(const QString &query)
@@ -200,7 +200,7 @@ bool DictEngine::sourceRequestEvent(const QString &query)
if (m_tcpSocket) {
m_tcpSocket->abort(); //stop if lookup is in progress and new query is \
requested m_tcpSocket->deleteLater();
- m_tcpSocket = 0;
+ m_tcpSocket = nullptr;
}
QStringList queryParts = query.split(':', QString::SkipEmptyParts);
diff --git a/dataengines/executable/executable.cpp \
b/dataengines/executable/executable.cpp index 3194e5d9..5cd97031 100644
--- a/dataengines/executable/executable.cpp
+++ b/dataengines/executable/executable.cpp
@@ -20,7 +20,7 @@
#include <QDebug>
#include <KProcess>
ExecutableContainer::ExecutableContainer(const QString& command, QObject* parent)
- : Plasma::DataContainer(parent), m_process(0)
+ : Plasma::DataContainer(parent), m_process(nullptr)
{
setObjectName(command);
connect(this, &Plasma::DataContainer::updateRequested, this, \
&ExecutableContainer::exec); @@ -30,7 +30,7 @@ \
ExecutableContainer::ExecutableContainer(const QString& command, QObject* parent \
ExecutableContainer::~ExecutableContainer() {
if (m_process) {
- disconnect(m_process, 0, this, 0);
+ disconnect(m_process, nullptr, this, nullptr);
}
delete m_process;
}
diff --git a/dataengines/filebrowser/filebrowserengine.cpp \
b/dataengines/filebrowser/filebrowserengine.cpp index 7268e827..d2d861eb 100644
--- a/dataengines/filebrowser/filebrowserengine.cpp
+++ b/dataengines/filebrowser/filebrowserengine.cpp
@@ -31,7 +31,7 @@
if (dir == QDir(it.key()))
FileBrowserEngine::FileBrowserEngine(QObject* parent, const QVariantList& args) :
- Plasma::DataEngine(parent, args), m_dirWatch(NULL)
+ Plasma::DataEngine(parent, args), m_dirWatch(nullptr)
{
Q_UNUSED(args)
diff --git a/dataengines/geolocation/geolocation.cpp \
b/dataengines/geolocation/geolocation.cpp index a1d2db9e..f924472e 100644
--- a/dataengines/geolocation/geolocation.cpp
+++ b/dataengines/geolocation/geolocation.cpp
@@ -54,7 +54,7 @@ void Geolocation::init()
Q_FOREACH (const KService::Ptr &service, offers) {
QString error;
- GeolocationProvider *plugin = \
service->createInstance<GeolocationProvider>(0, args, &error); + \
GeolocationProvider *plugin = service->createInstance<GeolocationProvider>(nullptr, \
args, &error); if (plugin) {
m_plugins << plugin;
plugin->init(&m_data, &m_accuracy);
diff --git a/dataengines/geolocation/geolocationprovider.cpp \
b/dataengines/geolocation/geolocationprovider.cpp index f8f438b5..e1e32bb0 100644
--- a/dataengines/geolocation/geolocationprovider.cpp
+++ b/dataengines/geolocation/geolocationprovider.cpp
@@ -19,8 +19,8 @@
GeolocationProvider::GeolocationProvider(QObject *parent, const QVariantList &args)
: QObject(parent),
- m_sharedData(0),
- m_sharedAccuracies(0),
+ m_sharedData(nullptr),
+ m_sharedAccuracies(nullptr),
m_accuracy(1000),
m_updateTriggers(SourceEvent),
m_available(true),
diff --git a/dataengines/geolocation/geolocationprovider.h \
b/dataengines/geolocation/geolocationprovider.h index d7aff85a..6aca3202 100644
--- a/dataengines/geolocation/geolocationprovider.h
+++ b/dataengines/geolocation/geolocationprovider.h
@@ -36,7 +36,7 @@ public:
enum UpdateTrigger { ForcedUpdate = 0, SourceEvent = 1, NetworkConnected = 2 };
Q_DECLARE_FLAGS(UpdateTriggers, UpdateTrigger)
- GeolocationProvider(QObject *parent = 0, const QVariantList &args = \
QVariantList()); + GeolocationProvider(QObject *parent = nullptr, const \
QVariantList &args = QVariantList()); void init(Plasma::DataEngine::Data *data, \
EntryAccuracy *accuracies);
UpdateTriggers updateTriggers() const;
diff --git a/dataengines/geolocation/location_gps.cpp \
b/dataengines/geolocation/location_gps.cpp index 6cd38856..22f6b279 100644
--- a/dataengines/geolocation/location_gps.cpp
+++ b/dataengines/geolocation/location_gps.cpp
@@ -43,7 +43,7 @@ void Gpsd::update()
void Gpsd::run()
{
#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( \
WATCH_ENABLE )
- gps_stream(m_gpsdata, WATCH_ENABLE, NULL);
+ gps_stream(m_gpsdata, WATCH_ENABLE, nullptr);
#else
gps_query(m_gpsdata, "w+x\n");
#endif
@@ -76,9 +76,9 @@ void Gpsd::run()
Gps::Gps(QObject* parent, const QVariantList& args)
: GeolocationProvider(parent, args),
- m_gpsd(0)
+ m_gpsd(nullptr)
#if GPSD_API_MAJOR_VERSION >= 5
- , m_gpsdata(0)
+ , m_gpsdata(nullptr)
#endif
{
#if GPSD_API_MAJOR_VERSION >= 5
diff --git a/dataengines/geolocation/location_gps.h \
b/dataengines/geolocation/location_gps.h index 6703435b..1d19cd0a 100644
--- a/dataengines/geolocation/location_gps.h
+++ b/dataengines/geolocation/location_gps.h
@@ -51,7 +51,7 @@ class Gps : public GeolocationProvider
{
Q_OBJECT
public:
- explicit Gps(QObject *parent = 0, const QVariantList &args = QVariantList());
+ explicit Gps(QObject *parent = nullptr, const QVariantList &args = \
QVariantList()); ~Gps() override;
void update() override;
diff --git a/dataengines/geolocation/location_ip.h \
b/dataengines/geolocation/location_ip.h index 119eeb98..d980bc18 100644
--- a/dataengines/geolocation/location_ip.h
+++ b/dataengines/geolocation/location_ip.h
@@ -29,7 +29,7 @@ class Ip : public GeolocationProvider
{
Q_OBJECT
public:
- explicit Ip(QObject *parent = 0, const QVariantList &args = QVariantList());
+ explicit Ip(QObject *parent = nullptr, const QVariantList &args = \
QVariantList()); ~Ip() override;
void update() override;
diff --git a/dataengines/hotplug/hotplugjob.h b/dataengines/hotplug/hotplugjob.h
index d1f47fa4..c537ecd3 100644
--- a/dataengines/hotplug/hotplugjob.h
+++ b/dataengines/hotplug/hotplugjob.h
@@ -32,7 +32,7 @@ public:
const QString& destination,
const QString& operation,
QMap<QString, QVariant>& parameters,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ServiceJob (destination, operation, parameters, parent),
m_engine (engine),
m_dest (destination)
diff --git a/dataengines/keystate/keyservice.cpp \
b/dataengines/keystate/keyservice.cpp index f0787609..ad4b1282 100644
--- a/dataengines/keystate/keyservice.cpp
+++ b/dataengines/keystate/keyservice.cpp
@@ -38,7 +38,7 @@ Plasma::ServiceJob* KeyService::createJob(const QString& operation, \
QMap<QString return new LatchKeyJob(this, parameters);
}
- return 0;
+ return nullptr;
}
void KeyService::lock(bool lock)
diff --git a/dataengines/mouse/mouseengine.cpp b/dataengines/mouse/mouseengine.cpp
index 0cf9bb87..a15c4d31 100644
--- a/dataengines/mouse/mouseengine.cpp
+++ b/dataengines/mouse/mouseengine.cpp
@@ -28,7 +28,7 @@
MouseEngine::MouseEngine(QObject* parent, const QVariantList& args)
: Plasma::DataEngine(parent, args), timerId(0)
#ifdef HAVE_XFIXES
-, handler(0)
+, handler(nullptr)
#endif
{
Q_UNUSED(args)
diff --git a/dataengines/mpris2/multiplexedservice.cpp \
b/dataengines/mpris2/multiplexedservice.cpp index 131a079c..75fe1ee8 100644
--- a/dataengines/mpris2/multiplexedservice.cpp
+++ b/dataengines/mpris2/multiplexedservice.cpp
@@ -46,7 +46,7 @@ Plasma::ServiceJob* MultiplexedService::createJob(const QString& \
operation, if (m_control) {
return m_control.data()->createJob(operation, parameters);
}
- return 0;
+ return nullptr;
}
void MultiplexedService::updateEnabledOperations()
diff --git a/dataengines/mpris2/multiplexer.cpp b/dataengines/mpris2/multiplexer.cpp
index 660ef54c..ed701845 100644
--- a/dataengines/mpris2/multiplexer.cpp
+++ b/dataengines/mpris2/multiplexer.cpp
@@ -86,7 +86,7 @@ void Multiplexer::removePlayer(const QString &name)
PlayerContainer *Multiplexer::activePlayer() const
{
if (m_activeName.isEmpty()) {
- return 0;
+ return nullptr;
}
PlayerContainer *container = m_playing.value(m_activeName);
@@ -182,7 +182,7 @@ void Multiplexer::setBestActive()
} else {
m_activeName = QString();
removeAllData();
- emit activePlayerChanged(0);
+ emit activePlayerChanged(nullptr);
}
}
}
diff --git a/dataengines/mpris2/playercontainer.h \
b/dataengines/mpris2/playercontainer.h index 36062876..0478bac6 100644
--- a/dataengines/mpris2/playercontainer.h
+++ b/dataengines/mpris2/playercontainer.h
@@ -33,7 +33,7 @@ class PlayerContainer : public Plasma::DataContainer
Q_OBJECT
public:
- explicit PlayerContainer(const QString& busAddress, QObject* parent = 0);
+ explicit PlayerContainer(const QString& busAddress, QObject* parent = nullptr);
QString dbusAddress() const { return m_dbusAddress; }
OrgFreedesktopDBusPropertiesInterface* propertiesInterface() const { return \
m_propsIface; }
diff --git a/dataengines/mpris2/playercontrol.cpp \
b/dataengines/mpris2/playercontrol.cpp index 3f28b45d..2adad62b 100644
--- a/dataengines/mpris2/playercontrol.cpp
+++ b/dataengines/mpris2/playercontrol.cpp
@@ -86,14 +86,14 @@ QDBusObjectPath PlayerControl::trackId() const
void PlayerControl::containerDestroyed()
{
- m_container = 0;
+ m_container = nullptr;
}
Plasma::ServiceJob* PlayerControl::createJob(const QString& operation,
QMap<QString,QVariant>& parameters)
{
if (!m_container)
- return 0;
+ return nullptr;
return new PlayerActionJob(operation, parameters, this);
}
diff --git a/dataengines/notifications/notificationaction.h \
b/dataengines/notifications/notificationaction.h index 1895e259..af142fbc 100644
--- a/dataengines/notifications/notificationaction.h
+++ b/dataengines/notifications/notificationaction.h
@@ -32,7 +32,7 @@ class NotificationAction : public Plasma::ServiceJob
const QString& destination,
const QString& operation,
QMap<QString,QVariant>& parameters,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ServiceJob(destination, operation, parameters, parent),
m_engine(engine)
{
diff --git a/dataengines/notifications/notificationsengine.cpp \
b/dataengines/notifications/notificationsengine.cpp index a14d75dd..f6a42c4f 100644
--- a/dataengines/notifications/notificationsengine.cpp
+++ b/dataengines/notifications/notificationsengine.cpp
@@ -149,7 +149,7 @@ static QImage decodeNotificationSpecImageHint(const \
QDBusArgument& arg) #undef SANITY_CHECK
QImage::Format format = QImage::Format_Invalid;
- void (*fcn)(QRgb*, const char*, int) = 0;
+ void (*fcn)(QRgb*, const char*, int) = nullptr;
if (bitsPerSample == 8) {
if (channels == 4) {
format = QImage::Format_ARGB32;
diff --git a/dataengines/packagekit/packagekitjob.h \
b/dataengines/packagekit/packagekitjob.h index 8a3ab476..209c5475 100644
--- a/dataengines/packagekit/packagekitjob.h
+++ b/dataengines/packagekit/packagekitjob.h
@@ -27,7 +27,7 @@ class PackagekitJob : public Plasma::ServiceJob
{
Q_OBJECT
public:
- PackagekitJob(const QString& destination, const QString& operation, const QMap< \
QString, QVariant >& parameters, QObject* parent = 0); + PackagekitJob(const \
QString& destination, const QString& operation, const QMap< QString, QVariant >& \
parameters, QObject* parent = nullptr); ~PackagekitJob() override;
protected:
diff --git a/dataengines/places/jobs.h b/dataengines/places/jobs.h
index 9d6ac5b8..4c27316a 100644
--- a/dataengines/places/jobs.h
+++ b/dataengines/places/jobs.h
@@ -29,7 +29,7 @@ public:
AddEditPlaceJob(KFilePlacesModel* model,
QModelIndex index,
const QVariantMap& parameters,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ModelJob(parent, model, index, (index.isValid() ? "Edit" : "Add"), \
parameters) , m_text(parameters[QStringLiteral("Name")].toString())
, m_url(parameters[QStringLiteral("Url")].toUrl())
@@ -69,7 +69,7 @@ class ShowPlaceJob : public ModelJob
{
public:
ShowPlaceJob(KFilePlacesModel* model, const QModelIndex& index,
- bool show = true, QObject* parent = 0)
+ bool show = true, QObject* parent = nullptr)
: ModelJob(parent, model, index, (show ? "Show" : "Hide"))
, m_show(show)
{}
@@ -87,7 +87,7 @@ class TeardownDeviceJob : public ModelJob
{
public:
TeardownDeviceJob(KFilePlacesModel* model, const QModelIndex& index,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ModelJob(parent, model, index, QStringLiteral("Teardown Device"))
{}
diff --git a/dataengines/places/placeservice.cpp \
b/dataengines/places/placeservice.cpp index 6a606977..567ead77 100644
--- a/dataengines/places/placeservice.cpp
+++ b/dataengines/places/placeservice.cpp
@@ -39,7 +39,7 @@ Plasma::ServiceJob* PlaceService::createJob(const QString& \
operation,
QModelIndex index = \
m_model->index(parameters.value(QStringLiteral("placeIndex")).toInt(), 0);
if (!index.isValid()) {
- return 0;
+ return nullptr;
}
qDebug() << "Job" << operation << "with arguments" << parameters << "requested";
@@ -59,7 +59,7 @@ Plasma::ServiceJob* PlaceService::createJob(const QString& \
operation, return new TeardownDeviceJob(m_model, index, this);
} else {
// FIXME: BAD! No!
- return 0;
+ return nullptr;
}
}
diff --git a/dataengines/places/setupdevicejob.h \
b/dataengines/places/setupdevicejob.h index 5a2c2306..a56785b3 100644
--- a/dataengines/places/setupdevicejob.h
+++ b/dataengines/places/setupdevicejob.h
@@ -27,7 +27,7 @@ class SetupDeviceJob : public ModelJob
public:
SetupDeviceJob(KFilePlacesModel* model, QModelIndex index,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ModelJob(parent, model, index, QStringLiteral("Setup Device"))
{
connect(model, &KFilePlacesModel::setupDone,
diff --git a/dataengines/powermanagement/powermanagementengine.cpp \
b/dataengines/powermanagement/powermanagementengine.cpp index d4e862f3..29bf0dde \
100644
--- a/dataengines/powermanagement/powermanagementengine.cpp
+++ b/dataengines/powermanagement/powermanagementengine.cpp
@@ -379,7 +379,7 @@ Plasma::Service* PowermanagementEngine::serviceForSource(const \
QString &source) return new PowerManagementService(this);
}
- return 0;
+ return nullptr;
}
QString PowermanagementEngine::batteryStateToString(int newState) const
diff --git a/dataengines/powermanagement/powermanagementjob.cpp \
b/dataengines/powermanagement/powermanagementjob.cpp index 2209bb36..0e3618c8 100644
--- a/dataengines/powermanagement/powermanagementjob.cpp
+++ b/dataengines/powermanagement/powermanagementjob.cpp
@@ -58,15 +58,15 @@ void PowerManagementJob::start()
setResult(false);
return;
} else if (operation == QLatin1String("suspend") || operation == \
QLatin1String("suspendToRam")) {
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, \
0, 0); + Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, \
nullptr, nullptr);
setResult(Solid::PowerManagement::supportedSleepStates().contains(Solid::PowerManagement::SuspendState));
return;
} else if (operation == QLatin1String("suspendToDisk")) {
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, \
0, 0); + Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, \
nullptr, nullptr);
setResult(Solid::PowerManagement::supportedSleepStates().contains(Solid::PowerManagement::HibernateState));
return;
} else if (operation == QLatin1String("suspendHybrid")) {
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::HybridSuspendState, \
0, 0); + Solid::PowerManagement::requestSleep(Solid::PowerManagement::HybridSuspendState, \
nullptr, nullptr);
setResult(Solid::PowerManagement::supportedSleepStates().contains(Solid::PowerManagement::HybridSuspendState));
return;
} else if (operation == QLatin1String("requestShutDown")) {
diff --git a/dataengines/share/packagestructure/share_package.h \
b/dataengines/share/packagestructure/share_package.h index eb6936b0..ecf76dd4 100644
--- a/dataengines/share/packagestructure/share_package.h
+++ b/dataengines/share/packagestructure/share_package.h
@@ -25,7 +25,7 @@
class SharePackage : public KPackage::PackageStructure
{
public:
- SharePackage(QObject *parent = 0, QVariantList args = QVariantList());
+ SharePackage(QObject *parent = nullptr, QVariantList args = QVariantList());
void initPackage(KPackage::Package *package) override;
};
diff --git a/dataengines/share/shareservice.cpp b/dataengines/share/shareservice.cpp
index 5032f85b..41478cf5 100644
--- a/dataengines/share/shareservice.cpp
+++ b/dataengines/share/shareservice.cpp
@@ -46,7 +46,7 @@ Plasma::ServiceJob *ShareService::createJob(const QString \
&operation, ShareJob::ShareJob(const QString &destination, const QString &operation,
QMap<QString, QVariant> ¶meters, QObject *parent)
: Plasma::ServiceJob(destination, operation, parameters, parent),
- m_engine(new KJSEmbed::Engine()), m_provider(0)
+ m_engine(new KJSEmbed::Engine()), m_provider(nullptr)
{
}
diff --git a/dataengines/soliddevice/devicesignalmapmanager.cpp \
b/dataengines/soliddevice/devicesignalmapmanager.cpp index 2d03b218..eb2bb1b3 100644
--- a/dataengines/soliddevice/devicesignalmapmanager.cpp
+++ b/dataengines/soliddevice/devicesignalmapmanager.cpp
@@ -29,7 +29,7 @@ DeviceSignalMapManager::~DeviceSignalMapManager()
void DeviceSignalMapManager::mapDevice(Solid::Battery *battery, const QString &udi)
{
- BatterySignalMapper *map=0;
+ BatterySignalMapper *map = nullptr;
if (!signalmap.contains(Solid::DeviceInterface::Battery)) {
map = new BatterySignalMapper(this);
signalmap[Solid::DeviceInterface::Battery] = map;
@@ -46,7 +46,7 @@ void DeviceSignalMapManager::mapDevice(Solid::Battery *battery, \
const QString &u
void DeviceSignalMapManager::mapDevice(Solid::StorageAccess *storageaccess, const \
QString &udi) {
- StorageAccessSignalMapper *map=0;
+ StorageAccessSignalMapper *map = nullptr;
if (!signalmap.contains(Solid::DeviceInterface::StorageAccess)) {
map = new StorageAccessSignalMapper(this);
signalmap[Solid::DeviceInterface::StorageAccess] = map;
diff --git a/dataengines/soliddevice/soliddeviceengine.cpp \
b/dataengines/soliddevice/soliddeviceengine.cpp index 370c08c4..d32de582 100644
--- a/dataengines/soliddevice/soliddeviceengine.cpp
+++ b/dataengines/soliddevice/soliddeviceengine.cpp
@@ -42,14 +42,14 @@ namespace
return parent.as<DevIface>();
}
}
- return Q_NULLPTR;
+ return nullptr;
}
}
SolidDeviceEngine::SolidDeviceEngine(QObject* parent, const QVariantList& args)
: Plasma::DataEngine(parent, args),
- m_temperature(Q_NULLPTR),
- m_notifier(Q_NULLPTR)
+ m_temperature(nullptr),
+ m_notifier(nullptr)
{
Q_UNUSED(args)
m_signalmanager = new DeviceSignalMapManager(this);
@@ -657,13 +657,13 @@ void SolidDeviceEngine::deviceRemoved(const QString& udi)
if (device.is<Solid::StorageVolume>()) {
Solid::StorageAccess *access = device.as<Solid::StorageAccess>();
if (access) {
- disconnect(access, 0, this, 0);
+ disconnect(access, nullptr, this, nullptr);
}
}
else if (device.is<Solid::OpticalDisc>()) {
Solid::OpticalDrive *drive = getAncestorAs<Solid::OpticalDrive>(device);
if (drive) {
- disconnect(drive, 0, this, 0);
+ disconnect(drive, nullptr, this, nullptr);
}
}
diff --git a/dataengines/soliddevice/soliddevicejob.h \
b/dataengines/soliddevice/soliddevicejob.h index 68849b63..dfe91a98 100644
--- a/dataengines/soliddevice/soliddevicejob.h
+++ b/dataengines/soliddevice/soliddevicejob.h
@@ -32,7 +32,7 @@ public:
const QString& destination,
const QString& operation,
QMap<QString, QVariant>& parameters,
- QObject* parent = 0)
+ QObject* parent = nullptr)
: ServiceJob (destination, operation, parameters, parent),
m_engine (engine),
m_dest (destination)
diff --git a/dataengines/soliddevice/soliddeviceservice.cpp \
b/dataengines/soliddevice/soliddeviceservice.cpp index 61d5cd74..0c731176 100644
--- a/dataengines/soliddevice/soliddeviceservice.cpp
+++ b/dataengines/soliddevice/soliddeviceservice.cpp
@@ -33,7 +33,7 @@ Plasma::ServiceJob* SolidDeviceService::createJob (const QString& \
operation, {
if (operation == QLatin1String("updateFreespace")) {
m_engine->updateStorageSpace(destination());
- return 0;
+ return nullptr;
}
return new SolidDeviceJob (m_engine, destination(), operation, parameters);
diff --git a/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp \
b/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp index \
ae99a80f..71e5c9cd 100644
--- a/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp
@@ -32,7 +32,7 @@ static const QString \
s_watcherServiceName(QStringLiteral("org.kde.StatusNotifier
StatusNotifierItemEngine::StatusNotifierItemEngine(QObject *parent, const \
QVariantList& args) : Plasma::DataEngine(parent, args),
- m_statusNotifierWatcher(0)
+ m_statusNotifierWatcher(nullptr)
{
Q_UNUSED(args);
init();
@@ -114,7 +114,7 @@ void StatusNotifierItemEngine::registerWatcher(const QString& \
service)
} else {
delete m_statusNotifierWatcher;
- m_statusNotifierWatcher = 0;
+ m_statusNotifierWatcher = nullptr;
qDebug()<<"System tray daemon not reachable";
}
}
@@ -131,7 +131,7 @@ void StatusNotifierItemEngine::unregisterWatcher(const QString& \
service) removeAllSources();
delete m_statusNotifierWatcher;
- m_statusNotifierWatcher = 0;
+ m_statusNotifierWatcher = nullptr;
}
}
diff --git a/dataengines/statusnotifieritem/statusnotifieritemjob.h \
b/dataengines/statusnotifieritem/statusnotifieritemjob.h index 080aefb6..26d0d148 \
100644
--- a/dataengines/statusnotifieritem/statusnotifieritemjob.h
+++ b/dataengines/statusnotifieritem/statusnotifieritemjob.h
@@ -37,7 +37,7 @@ class StatusNotifierItemJob : public Plasma::ServiceJob
Q_OBJECT
public:
- StatusNotifierItemJob(StatusNotifierItemSource *source, const QString \
&operation, QMap<QString, QVariant> ¶meters, QObject *parent = NULL); + \
StatusNotifierItemJob(StatusNotifierItemSource *source, const QString &operation, \
QMap<QString, QVariant> ¶meters, QObject *parent = nullptr); \
~StatusNotifierItemJob() override;
protected:
diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp \
b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp index \
58dc64eb..0d099743 100644
--- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
@@ -62,8 +62,8 @@ private:
StatusNotifierItemSource::StatusNotifierItemSource(const QString ¬ifierItemId, \
QObject *parent) : Plasma::DataContainer(parent),
- m_customIconLoader(0),
- m_menuImporter(0),
+ m_customIconLoader(nullptr),
+ m_menuImporter(nullptr),
m_refreshing(false),
m_needsReRefreshing(false),
m_titleUpdate(true),
@@ -112,7 +112,7 @@ StatusNotifierItemSource::StatusNotifierItemSource(const QString \
¬ifierItemId if (slash == -1) {
qWarning() << "Invalid notifierItemId:" << notifierItemId;
m_valid = false;
- m_statusNotifierItemInterface = 0;
+ m_statusNotifierItemInterface = nullptr;
return;
}
QString service = notifierItemId.left(slash);
diff --git a/dataengines/time/timeengine.cpp b/dataengines/time/timeengine.cpp
index 404bf11b..2b407fab 100644
--- a/dataengines/time/timeengine.cpp
+++ b/dataengines/time/timeengine.cpp
@@ -70,7 +70,7 @@ void TimeEngine::init()
itimerspec timespec;
memset(×pec, 0, sizeof(timespec)); //set all timers to 0 seconds, which \
creates a timer that won't do anything
- int err = timerfd_settime(timeChangedFd, 3, ×pec, 0); //monitor for the \
time changing + int err = timerfd_settime(timeChangedFd, 3, ×pec, nullptr); \
//monitor for the time changing
//(flags == TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET). However these are not \
exposed in glibc so value is hardcoded if (err) {
qWarning() << "Could not create timer with TFD_TIMER_CANCEL_ON_SET. Clock \
skews will not be detected. Error:" << qPrintable(strerror(err));
diff --git a/dataengines/time/timesource.cpp b/dataengines/time/timesource.cpp
index 201ca165..56da0e0d 100644
--- a/dataengines/time/timesource.cpp
+++ b/dataengines/time/timesource.cpp
@@ -42,8 +42,8 @@ TimeSource::TimeSource(const QString &name, QObject *parent)
m_offset(0),
m_latitude(0),
m_longitude(0),
- m_sun(0),
- m_moon(0),
+ m_sun(nullptr),
+ m_moon(nullptr),
m_moonPosition(false),
m_solarPosition(false),
m_local(false)
diff --git a/freespacenotifier/freespacenotifier.h \
b/freespacenotifier/freespacenotifier.h index eb803408..4a222960 100644
--- a/freespacenotifier/freespacenotifier.h
+++ b/freespacenotifier/freespacenotifier.h
@@ -31,7 +31,7 @@ class FreeSpaceNotifier : public QObject
Q_OBJECT
public:
- explicit FreeSpaceNotifier(QObject *parent = NULL);
+ explicit FreeSpaceNotifier(QObject *parent = nullptr);
~FreeSpaceNotifier() override;
private Q_SLOTS:
diff --git a/gmenu-dbusmenu-proxy/menuproxy.cpp b/gmenu-dbusmenu-proxy/menuproxy.cpp
index faef40a9..ecc1ce25 100644
--- a/gmenu-dbusmenu-proxy/menuproxy.cpp
+++ b/gmenu-dbusmenu-proxy/menuproxy.cpp
@@ -239,7 +239,7 @@ QByteArray MenuProxy::getWindowPropertyString(WId id, const \
QByteArray &name)
static const long MAX_PROP_SIZE = 10000;
auto propertyCookie = xcb_get_property(m_xConnection, false, id, atom, \
utf8StringAtom, 0, MAX_PROP_SIZE);
- QScopedPointer<xcb_get_property_reply_t, QScopedPointerPodDeleter> \
propertyReply(xcb_get_property_reply(m_xConnection, propertyCookie, NULL)); + \
QScopedPointer<xcb_get_property_reply_t, QScopedPointerPodDeleter> \
propertyReply(xcb_get_property_reply(m_xConnection, propertyCookie, nullptr)); if \
(propertyReply.isNull()) {
qCWarning(DBUSMENUPROXY) << "XCB property reply for atom" << name << "on" << \
id << "was null"; return value;
@@ -278,7 +278,7 @@ xcb_atom_t MenuProxy::getAtom(const QByteArray &name)
auto atom = s_atoms.value(name, XCB_ATOM_NONE);
if (atom == XCB_ATOM_NONE) {
const xcb_intern_atom_cookie_t atomCookie = xcb_intern_atom(m_xConnection, \
false, name.length(), name.constData());
- QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
atomReply(xcb_intern_atom_reply(m_xConnection, atomCookie, Q_NULLPTR)); + \
QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
atomReply(xcb_intern_atom_reply(m_xConnection, atomCookie, nullptr)); if \
(!atomReply.isNull()) { atom = atomReply->atom;
if (atom != XCB_ATOM_NONE) {
diff --git a/kioslave/applications/kio_applications.cpp \
b/kioslave/applications/kio_applications.cpp index 9b9c37a8..849f39f5 100644
--- a/kioslave/applications/kio_applications.cpp
+++ b/kioslave/applications/kio_applications.cpp
@@ -66,7 +66,7 @@ static void createFileEntry(KIO::UDSEntry& entry, const \
KService::Ptr& service, entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
const QString localPath = \
QStandardPaths::locate(QStandardPaths::ApplicationsLocation, \
QStringLiteral("%1.desktop").arg(service->desktopEntryName())); \
entry.insert(KIO::UDSEntry::UDS_LOCAL_PATH, localPath);
- entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, time(0));
+ entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, time(nullptr));
entry.insert(KIO::UDSEntry::UDS_ICON_NAME, service->icon());
}
diff --git a/kioslave/desktop/tests/kio_desktop_test.cpp \
b/kioslave/desktop/tests/kio_desktop_test.cpp index 7d903361..040c42b5 100644
--- a/kioslave/desktop/tests/kio_desktop_test.cpp
+++ b/kioslave/desktop/tests/kio_desktop_test.cpp
@@ -63,7 +63,7 @@ private Q_SLOTS:
QString fileName = tempFile.fileName();
tempFile.close();
KIO::Job* job = KIO::file_copy(QUrl::fromLocalFile(fileName), \
QUrl("desktop:/" + m_testFileName), -1, KIO::HideProgressInfo);
- job->setUiDelegate(0);
+ job->setUiDelegate(nullptr);
QVERIFY(job->exec());
QVERIFY(QFile::exists(m_desktopPath + '/' + m_testFileName));
}
@@ -146,7 +146,7 @@ private Q_SLOTS:
QVERIFY(!QFile::exists(destFilePath));
KIO::Job* job = KIO::rename(srcUrl, destUrl, KIO::HideProgressInfo);
- job->setUiDelegate(0);
+ job->setUiDelegate(nullptr);
QVERIFY(job);
bool ok = job->exec();
QVERIFY(ok);
diff --git a/klipper/autotests/modeltest.h b/klipper/autotests/modeltest.h
index 45c68f4b..a02f9905 100644
--- a/klipper/autotests/modeltest.h
+++ b/klipper/autotests/modeltest.h
@@ -52,7 +52,7 @@ class ModelTest : public QObject
Q_OBJECT
public:
- ModelTest( QAbstractItemModel *model, QObject *parent = 0 );
+ ModelTest( QAbstractItemModel *model, QObject *parent = nullptr );
private Q_SLOTS:
void nonDestructiveBasicTest();
diff --git a/klipper/clipcommandprocess.h b/klipper/clipcommandprocess.h
index d8b73b95..976c49f1 100644
--- a/klipper/clipcommandprocess.h
+++ b/klipper/clipcommandprocess.h
@@ -32,7 +32,7 @@ class ClipCommandProcess : public KProcess
{
Q_OBJECT
public:
- ClipCommandProcess(const ClipAction& action, const ClipCommand& command, const \
QString& clip, History* history = 0L, QSharedPointer<const HistoryItem> original_item \
= QSharedPointer<const HistoryItem>()); + ClipCommandProcess(const ClipAction& \
action, const ClipCommand& command, const QString& clip, History* history = nullptr, \
QSharedPointer<const HistoryItem> original_item = QSharedPointer<const \
HistoryItem>()); public Q_SLOTS:
void slotStdOutputAvailable();
void slotFinished(int exitCode, QProcess::ExitStatus newState);
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index b7a66c55..cffd11ce 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -51,7 +51,7 @@ void GeneralWidget::updateWidgets()
}
ActionsWidget::ActionsWidget(QWidget* parent)
- : QWidget(parent), m_editActDlg(0)
+ : QWidget(parent), m_editActDlg(nullptr)
{
m_ui.setupUi(this);
diff --git a/klipper/editactiondialog.cpp b/klipper/editactiondialog.cpp
index ccece962..0982e856 100644
--- a/klipper/editactiondialog.cpp
+++ b/klipper/editactiondialog.cpp
@@ -83,7 +83,7 @@ class ActionOutputDelegate : public QItemDelegate {
class ActionDetailModel : public QAbstractTableModel {
public:
- ActionDetailModel(ClipAction* action, QObject* parent = 0);
+ ActionDetailModel(ClipAction* action, QObject* parent = nullptr);
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const \
override;
bool setData(const QModelIndex& index, const QVariant& value, int role = \
Qt::EditRole) override; Qt::ItemFlags flags(const QModelIndex& index) const \
override; @@ -132,7 +132,7 @@ void ActionDetailModel::setIconForCommand(ClipCommand& \
cmd) QPixmap iconPix = KIconLoader::global()->loadIcon(
command, KIconLoader::Small, 0,
KIconLoader::DefaultState,
- QStringList(), 0, true /* canReturnNull */ \
); + QStringList(), nullptr, true /* \
canReturnNull */ );
if ( !iconPix.isNull() ) {
cmd.icon = command;
diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index 412b472b..4f828279 100644
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -502,7 +502,7 @@ void Klipper::saveSession()
void Klipper::disableURLGrabber()
{
- KMessageBox::information( 0L,
+ KMessageBox::information( nullptr,
i18n( "You can enable URL actions later by \
left-clicking on the "
"Klipper icon and selecting 'Enable Clipboard \
Actions'" ) );
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index e0d35e56..92b2bdbc 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -71,12 +71,12 @@ KlipperPopup::KlipperPopup( History* history )
m_textForNoMatch( i18n( "<no matches>" ) ),
m_history( history ),
m_helpMenu( new KHelpMenu( this, i18n("KDE cut & paste history utility"), \
false ) ),
- m_popupProxy( 0 ),
- m_filterWidget( 0 ),
- m_filterWidgetAction( 0 ),
+ m_popupProxy( nullptr ),
+ m_filterWidget( nullptr ),
+ m_filterWidgetAction( nullptr ),
m_nHistoryItems( 0 ),
m_showHelp(true),
- m_lastEvent(NULL)
+ m_lastEvent(nullptr)
{
ensurePolished();
KWindowInfo windowInfo( winId(), NET::WMGeometry );
@@ -194,7 +194,7 @@ void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
// come back to this method. Remembering the last event stops
// the infinite event loop
if (m_lastEvent == e) {
- m_lastEvent= NULL;
+ m_lastEvent= nullptr;
return;
}
m_lastEvent= e;
@@ -267,7 +267,7 @@ void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
break;
} //default:
} //case
- m_lastEvent= NULL;
+ m_lastEvent= nullptr;
}
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index e6bca0ad..316d50c7 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -142,7 +142,7 @@ int PopupProxy::insertFromSpill( int index ) {
const History* history = parent()->history();
// This menu is going to be filled, so we don't need the aboutToShow()
// signal anymore
- disconnect( m_proxy_for_menu, 0, this, 0 );
+ disconnect( m_proxy_for_menu, nullptr, this, nullptr );
// Insert history items into the current m_proxy_for_menu,
// discarding any that doesn't match the current filter.
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 2c529ff9..03a9b8c4 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -300,7 +300,7 @@ void URLGrabber::execute( const ClipAction* action, int cmdIdx ) \
const
ClipCommandProcess* proc = new ClipCommandProcess(*action, command, \
text, m_history, m_myClipItem); if (proc->program().isEmpty()) {
delete proc;
- proc = 0L;
+ proc = nullptr;
} else {
proc->start();
}
@@ -396,7 +396,7 @@ ClipCommand::ClipCommand(const QString&_command, const QString& \
_description, QPixmap iconPix = KIconLoader::global()->loadIcon(
appName, KIconLoader::Small, 0,
KIconLoader::DefaultState,
- QStringList(), 0, true /* canReturnNull */ \
); + QStringList(), nullptr, true /* \
canReturnNull */ ); if ( !iconPix.isNull() )
icon = appName;
else
diff --git a/krunner/view.cpp b/krunner/view.cpp
index f75c76aa..aedbde90 100644
--- a/krunner/view.cpp
+++ b/krunner/view.cpp
@@ -70,7 +70,7 @@ View::View(QWindow *)
new AppAdaptor(this);
QDBusConnection::sessionBus().registerObject(QStringLiteral("/App"), this);
- QAction *a = new QAction(0);
+ QAction *a = new QAction(nullptr);
QObject::connect(a, &QAction::triggered, this, &View::displayOrHide);
a->setText(i18n("Run Command"));
a->setObjectName(QStringLiteral("run command"));
@@ -78,7 +78,7 @@ View::View(QWindow *)
KGlobalAccel::self()->setDefaultShortcut(a, QList<QKeySequence>() << \
QKeySequence(Qt::ALT + Qt::Key_Space), KGlobalAccel::NoAutoloading);
KGlobalAccel::self()->setShortcut(a, QList<QKeySequence>() << \
QKeySequence(Qt::ALT + Qt::Key_Space) << QKeySequence(Qt::ALT + Qt::Key_F2) << \
Qt::Key_Search);
- a = new QAction(0);
+ a = new QAction(nullptr);
QObject::connect(a, &QAction::triggered, this, \
&View::displayWithClipboardContents); a->setText(i18n("Run Command on clipboard \
contents"));
a->setObjectName(QStringLiteral("run command on clipboard contents"));
diff --git a/krunner/view.h b/krunner/view.h
index 0011cecc..03fa17e4 100644
--- a/krunner/view.h
+++ b/krunner/view.h
@@ -50,7 +50,7 @@ class View : public PlasmaQuick::Dialog
Q_PROPERTY(QStringList history READ history NOTIFY historyChanged)
public:
- explicit View(QWindow *parent = 0);
+ explicit View(QWindow *parent = nullptr);
~View() override;
void positionOnScreen();
diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp
index cf06a4ed..078cf886 100644
--- a/ksmserver/client.cpp
+++ b/ksmserver/client.cpp
@@ -48,7 +48,7 @@ extern KSMServer* the_server;
KSMClient::KSMClient( SmsConn conn)
{
smsConn = conn;
- id = 0;
+ id = nullptr;
resetState();
}
@@ -65,7 +65,7 @@ SmProp* KSMClient::property( const char* name ) const
if ( !qstrcmp( prop->name, name ) )
return prop;
}
- return 0;
+ return nullptr;
}
void KSMClient::resetState()
@@ -86,7 +86,7 @@ char * safeSmsGenerateClientID( SmsConn /*c*/ )
{
// Causes delays with misconfigured network :-/.
// char *ret = SmsGenerateClientID(c);
- char* ret = NULL;
+ char* ret = nullptr;
if (!ret) {
if (my_addr->isEmpty()) {
// qCWarning(KSMSERVER, "Can't get own host name. Your system is severely \
misconfigured\n"); @@ -115,10 +115,10 @@ char * safeSmsGenerateClientID( SmsConn \
/*c*/ )
ret = (char *)malloc(1+my_addr->length()+13+10+4+1 + /*safeness*/ 10);
static int sequence = 0;
- if (ret == NULL)
- return NULL;
+ if (ret == nullptr)
+ return nullptr;
- sprintf(ret, "1%s%.13ld%.10d%.4d", my_addr->toLatin1().constData(), \
(long)time(NULL), + sprintf(ret, "1%s%.13ld%.10d%.4d", \
my_addr->toLatin1().constData(), (long)time(nullptr), getpid(), sequence);
sequence = (sequence + 1) % 10000;
}
diff --git a/ksmserver/client.h b/ksmserver/client.h
index 3f41d586..fd8a0864 100644
--- a/ksmserver/client.h
+++ b/ksmserver/client.h
@@ -39,7 +39,7 @@ public:
explicit KSMClient( SmsConn );
~KSMClient();
- void registerClient( const char* previousId = 0 );
+ void registerClient( const char* previousId = nullptr );
SmsConn connection() const { return smsConn; }
void resetState();
diff --git a/ksmserver/kcheckrunning.cpp b/ksmserver/kcheckrunning.cpp
index f0648fc2..cb61c12a 100644
--- a/ksmserver/kcheckrunning.cpp
+++ b/ksmserver/kcheckrunning.cpp
@@ -25,8 +25,8 @@
*/
int main()
{
- Display* dpy = XOpenDisplay( NULL );
- if( dpy == NULL )
+ Display* dpy = XOpenDisplay( nullptr );
+ if( dpy == nullptr )
return 2;
Atom atom = XInternAtom( dpy, "_KDE_RUNNING", False );
return XGetSelectionOwner( dpy, atom ) != None ? 0 : 1;
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 22f75b09..c8982520 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE \
SOFTWARE.
*/
#ifndef NO_LEGACY_SESSION_MANAGEMENT
-static WindowMap* windowMapPtr = 0;
+static WindowMap* windowMapPtr = nullptr;
static Atom wm_save_yourself = XNone;
static Atom wm_protocols = XNone;
@@ -113,7 +113,7 @@ void KSMServer::performLegacySessionSave()
if (!legacyWindows.contains(leader) && windowSessionId( *it, leader \
).isEmpty()) { SMType wtype = SM_WMCOMMAND;
int nprotocols = 0;
- Atom *protocols = 0;
+ Atom *protocols = nullptr;
if( XGetWMProtocols(QX11Info::display(), leader, &protocols, \
&nprotocols)) { for (int i=0; i<nprotocols; i++)
if (protocols[i] == wm_save_yourself) {
@@ -138,7 +138,7 @@ void KSMServer::performLegacySessionSave()
XSync(QX11Info::display(), False);
Display *newdisplay = XOpenDisplay(DisplayString(QX11Info::display()));
if (!newdisplay) {
- windowMapPtr = NULL;
+ windowMapPtr = nullptr;
XSetErrorHandler(oldHandler);
return;
}
@@ -197,7 +197,7 @@ void KSMServer::performLegacySessionSave()
struct timeval tmwait;
tmwait.tv_sec = (wmSaveYourselfTimeout - msecs) / 1000;
tmwait.tv_usec = ((wmSaveYourselfTimeout - msecs) % 1000) * 1000;
- ::select(fd+1, &fds, NULL, &fds, &tmwait);
+ ::select(fd+1, &fds, nullptr, &fds, &tmwait);
}
}
// Terminate work in new display
@@ -303,7 +303,7 @@ static QByteArray getQCStringProperty(WId w, Atom prop)
int format, status;
unsigned long nitems = 0;
unsigned long extra = 0;
- unsigned char *data = 0;
+ unsigned char *data = nullptr;
QByteArray result = "";
status = XGetWindowProperty( QX11Info::display(), w, prop, 0, 10000,
false, XA_STRING, &type, &format,
@@ -322,7 +322,7 @@ static QStringList getQStringListProperty(WId w, Atom prop)
int format, status;
unsigned long nitems = 0;
unsigned long extra = 0;
- unsigned char *data = 0;
+ unsigned char *data = nullptr;
QStringList result;
status = XGetWindowProperty( QX11Info::display(), w, prop, 0, 10000,
@@ -391,7 +391,7 @@ WId KSMServer::windowWmClientLeader(WId w)
int format, status;
unsigned long nitems = 0;
unsigned long extra = 0;
- unsigned char *data = 0;
+ unsigned char *data = nullptr;
Window result = w;
status = XGetWindowProperty( QX11Info::display(), w, wm_client_leader, 0, 10000,
false, XA_WINDOW, &type, &format,
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 667a7c00..4b3fcf0b 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -51,9 +51,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE \
SOFTWARE. static const char version[] = "0.4";
static const char description[] = I18N_NOOP( "The reliable KDE session manager that \
talks the standard X11R6 \nsession management protocol (XSMP)." );
-Display* dpy = 0;
+Display* dpy = nullptr;
Colormap colormap = 0;
-Visual *visual = 0;
+Visual *visual = nullptr;
extern KSMServer* the_server;
@@ -87,7 +87,7 @@ void checkComposite()
return;
// thanks to zack rusin and frederik for pointing me in the right direction
// for the following bits of X11 code
- dpy = XOpenDisplay(0); // open default display
+ dpy = XOpenDisplay(nullptr); // open default display
if (!dpy)
{
qCCritical(KSMSERVER) << "Cannot connect to the X server";
@@ -127,7 +127,7 @@ void checkComposite()
}
XCloseDisplay( dpy );
- dpy = NULL;
+ dpy = nullptr;
}
void sanity_check( int argc, char* argv[] )
@@ -222,7 +222,7 @@ void sanity_check( int argc, char* argv[] )
QApplication a(argc, argv);
const QString qmsg = msg_pre + msg + msg_post;
- KMessageBox::error(0, qmsg, i18n("Plasma Workspace installation problem!"));
+ KMessageBox::error(nullptr, qmsg, i18n("Plasma Workspace installation \
problem!")); exit(255);
}
}
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 208248e6..65578765 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -93,7 +93,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE \
SOFTWARE.
#include "switchuserdialog.h"
-KSMServer* the_server = 0;
+KSMServer* the_server = nullptr;
KSMServer* KSMServer::self()
{
@@ -108,10 +108,10 @@ KProcess* KSMServer::startApplication( const QStringList& cmd, \
const QString& cl {
QStringList command = cmd;
if ( command.isEmpty() )
- return NULL;
+ return nullptr;
if ( !userId.isEmpty()) {
struct passwd* pw = getpwuid( getuid());
- if( pw != NULL && userId != QString::fromLocal8Bit( pw->pw_name )) {
+ if( pw != nullptr && userId != QString::fromLocal8Bit( pw->pw_name )) {
command.prepend( QStringLiteral("--") );
command.prepend( userId );
command.prepend( QStringLiteral("-u") );
@@ -144,7 +144,7 @@ KProcess* KSMServer::startApplication( const QStringList& cmd, \
const QString& cl for ( int i=1; i < n; i++)
argList.append( command[i]);
klauncher.exec_blind(app, argList );
- return NULL;
+ return nullptr;
}
}
@@ -159,11 +159,11 @@ void KSMServer::executeCommand( const QStringList& command )
KProcess::execute( command );
}
-IceAuthDataEntry *authDataEntries = 0;
+IceAuthDataEntry *authDataEntries = nullptr;
-static QTemporaryFile *remTempFile = 0;
+static QTemporaryFile *remTempFile = nullptr;
-static IceListenObj *listenObjs = 0;
+static IceListenObj *listenObjs = nullptr;
int numTransports = 0;
static bool only_local = 0;
@@ -389,7 +389,7 @@ Status SetAuthentication_local (int count, IceListenObj \
*listenObjs) char *prot = IceGetListenConnectionString(listenObjs[i]);
if (!prot) continue;
char *host = strchr(prot, '/');
- char *sock = 0;
+ char *sock = nullptr;
if (host) {
*host=0;
host++;
@@ -419,7 +419,7 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
return 0;
if ((*authDataEntries = (IceAuthDataEntry *) malloc (
- count * 2 * sizeof (IceAuthDataEntry))) == NULL)
+ count * 2 * sizeof (IceAuthDataEntry))) == nullptr)
return 0;
FILE *addAuthFile = fopen(QFile::encodeName(addTempFile.fileName()).constData(), \
"r+"); @@ -499,7 +499,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry \
*authDataEntries) }
delete remTempFile;
- remTempFile = 0;
+ remTempFile = nullptr;
}
static int Xio_ErrorHandler( Display * )
@@ -510,7 +510,7 @@ static int Xio_ErrorHandler( Display * )
if (the_server)
{
KSMServer *server = the_server;
- the_server = 0;
+ the_server = nullptr;
server->cleanUp();
// Don't delete server!!
}
@@ -534,7 +534,7 @@ static void sighandler(int sig)
if (the_server)
{
KSMServer *server = the_server;
- the_server = 0;
+ the_server = nullptr;
server->cleanUp();
delete server;
}
@@ -560,7 +560,7 @@ void KSMWatchProc ( IceConn iceConn, IcePointer client_data, Bool \
opening, IcePo static Status KSMNewClientProc ( SmsConn conn, SmPointer \
manager_data,
unsigned long* mask_ret, SmsCallbacks* cb, char** \
failure_reason_ret) {
- *failure_reason_ret = 0;
+ *failure_reason_ret = nullptr;
void* client = ((KSMServer*) manager_data )->newClient( conn );
@@ -604,9 +604,9 @@ extern "C" int _IceTransNoListen(const char * protocol);
#endif
KSMServer::KSMServer( const QString& windowManager, InitFlags flags )
- : wmProcess( NULL )
+ : wmProcess( nullptr )
, sessionGroup( QStringLiteral( "" ) )
- , logoutEffectWidget( NULL )
+ , logoutEffectWidget( nullptr )
{
if (!flags.testFlag(InitFlag::NoLockScreen)) {
ScreenLocker::KSldApp::self()->initialize();
@@ -617,7 +617,7 @@ KSMServer::KSMServer( const QString& windowManager, InitFlags \
flags )
new KSMServerInterfaceAdaptor( this );
QDBusConnection::sessionBus().registerObject(QStringLiteral("/KSMServer"), \
this);
- kcminitSignals = NULL;
+ kcminitSignals = nullptr;
the_server = this;
clean = false;
@@ -628,7 +628,7 @@ KSMServer::KSMServer( const QString& windowManager, InitFlags \
flags ) saveSession = false;
wmPhase1WaitingCount = 0;
KConfigGroup config(KSharedConfig::openConfig(), "General");
- clientInteracting = 0;
+ clientInteracting = nullptr;
xonCommand = config.readEntry( "xonCommand", "xon" );
selectWm( windowManager );
@@ -728,7 +728,7 @@ KSMServer::KSMServer( const QString& windowManager, InitFlags \
flags ) KSMServer::~KSMServer()
{
qDeleteAll( listener );
- the_server = 0;
+ the_server = nullptr;
cleanUp();
}
@@ -785,7 +785,7 @@ void KSMServer::ioError( IceConn /*iceConn*/ )
void KSMServer::processData( int /*socket*/ )
{
IceConn iceConn = ((KSMConnection*)sender())->iceConn;
- IceProcessMessagesStatus status = IceProcessMessages( iceConn, 0, 0 );
+ IceProcessMessagesStatus status = IceProcessMessages( iceConn, nullptr, nullptr \
); if ( status == IceProcessMessagesIOError ) {
IceSetShutdownNegotiation( iceConn, False );
QList<KSMClient*>::iterator it = clients.begin();
@@ -816,7 +816,7 @@ void KSMServer::deleteClient( KSMClient* client )
clientsToKill.removeAll( client );
clientsToSave.removeAll( client );
if ( client == clientInteracting ) {
- clientInteracting = 0;
+ clientInteracting = nullptr;
handlePendingInteractions();
}
delete client;
@@ -834,12 +834,12 @@ void KSMServer::newConnection( int /*socket*/ )
{
IceAcceptStatus status;
IceConn iceConn = IceAcceptConnection( ((KSMListener*)sender())->listenObj, \
&status);
- if( iceConn == NULL )
+ if( iceConn == nullptr )
return;
IceSetShutdownNegotiation( iceConn, False );
IceConnectStatus cstatus;
while ((cstatus = IceConnectionStatus (iceConn))==IceConnectPending) {
- (void) IceProcessMessages( iceConn, 0, 0 );
+ (void) IceProcessMessages( iceConn, nullptr, nullptr );
}
if (cstatus != IceConnectAccepted) {
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index aaefa8b5..615d40dd 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -422,7 +422,7 @@ void KSMServer::interactDone( KSMClient* client, bool \
cancelShutdown_ ) {
if ( client != clientInteracting )
return; // should not happen
- clientInteracting = 0;
+ clientInteracting = nullptr;
if ( cancelShutdown_ )
cancelShutdown( client );
else
@@ -471,7 +471,7 @@ void KSMServer::handlePendingInteractions()
void KSMServer::cancelShutdown( KSMClient* c )
{
- clientInteracting = 0;
+ clientInteracting = nullptr;
qCDebug(KSMSERVER) << state;
if ( state == ClosingSubSession ) {
clientsToKill.clear();
@@ -482,7 +482,7 @@ void KSMServer::cancelShutdown( KSMClient* c )
qCDebug(KSMSERVER) << "Client " << c->program() << " (" << c->clientId() << \
") canceled shutdown."; KNotification::event( QStringLiteral( "cancellogout" ),
i18n( "Logout canceled by '%1'", c->program()),
- QPixmap() , 0l , KNotification::DefaultEvent );
+ QPixmap() , nullptr , KNotification::DefaultEvent );
foreach( KSMClient* c, clients ) {
SmsShutdownCancelled( c->connection() );
if( c->saveYourselfDone ) {
@@ -568,7 +568,7 @@ void KSMServer::completeShutdownOrCheckpoint()
qCDebug(KSMSERVER) << "state is " << state;
if ( state == Shutdown ) {
- KNotification *n = KNotification::event(QStringLiteral("exitkde"), \
QString(), QPixmap(), 0l, KNotification::DefaultEvent); // Plasma says good bye + \
KNotification *n = KNotification::event(QStringLiteral("exitkde"), QString(), \
QPixmap(), nullptr, KNotification::DefaultEvent); // Plasma says \
good bye
connect(n, &KNotification::closed, this, &KSMServer::startKilling);
state = WaitingForKNotify;
// https://bugs.kde.org/show_bug.cgi?id=228005
@@ -695,7 +695,7 @@ void KSMServer::createLogoutEffectWidget()
// Ok, this is rather a hack. In order to fade the whole desktop when playing the \
logout // sound, killing applications and leaving KDE, create a dummy window that \
triggers // the logout fade effect again.
- logoutEffectWidget = new QWidget( NULL, Qt::X11BypassWindowManagerHint );
+ logoutEffectWidget = new QWidget( nullptr, Qt::X11BypassWindowManagerHint );
logoutEffectWidget->winId(); // workaround for Qt4.3 setWindowRole() assert
logoutEffectWidget->setWindowRole( QStringLiteral( "logouteffect" ) );
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 03733b83..7fcaf861 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -300,10 +300,10 @@ void KSMShutdownDlg::slotSuspend(int spdMethod)
switch (spdMethod) {
case Solid::PowerManagement::StandbyState:
case Solid::PowerManagement::SuspendState:
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, \
0, 0); + Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, \
nullptr, nullptr); break;
case Solid::PowerManagement::HibernateState:
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, \
0, 0); + Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, \
nullptr, nullptr); break;
}
reject();
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 1039f2de..d5c5a170 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -220,7 +220,7 @@ void KSMServer::wmProcessChange()
{
if( state != LaunchingWM )
{ // don't care about the process when not in the wm-launching state anymore
- wmProcess = NULL;
+ wmProcess = nullptr;
return;
}
if( wmProcess->state() == QProcess::NotRunning )
@@ -270,7 +270,7 @@ void KSMServer::autoStart0Done()
if( !kcminitSignals->isValid()) {
qCWarning(KSMSERVER) << "kcminit not running? If we are running with mobile \
profile or in another platform other than X11 this is normal."; delete \
kcminitSignals;
- kcminitSignals = 0;
+ kcminitSignals = nullptr;
QTimer::singleShot(0, this, &KSMServer::kcmPhase1Done);
return;
}
@@ -536,7 +536,7 @@ void KSMServer::kcmPhase2Done()
if (kcminitSignals) {
disconnect( kcminitSignals, SIGNAL(phase2Done()), this, \
SLOT(kcmPhase2Done())); delete kcminitSignals;
- kcminitSignals = 0;
+ kcminitSignals = nullptr;
}
waitKcmInit2 = false;
finishStartup();
diff --git a/kuiserver/progresslistdelegate.cpp b/kuiserver/progresslistdelegate.cpp
index 5070a81b..b897ad5e 100644
--- a/kuiserver/progresslistdelegate.cpp
+++ b/kuiserver/progresslistdelegate.cpp
@@ -91,7 +91,7 @@ ProgressListDelegate::~ProgressListDelegate()
void ProgressListDelegate::paint(QPainter *painter, const QStyleOptionViewItem \
&option, const QModelIndex &index) const {
- QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, \
painter, 0); + QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, \
&option, painter, nullptr); if (!index.isValid()) {
return;
}
diff --git a/kuiserver/progresslistdelegate.h b/kuiserver/progresslistdelegate.h
index a075ee62..ec255f1c 100644
--- a/kuiserver/progresslistdelegate.h
+++ b/kuiserver/progresslistdelegate.h
@@ -32,7 +32,7 @@ class ProgressListDelegate
Q_OBJECT
public:
- explicit ProgressListDelegate(QObject *parent = 0, QListView *listView = 0);
+ explicit ProgressListDelegate(QObject *parent = nullptr, QListView *listView = \
nullptr); ~ProgressListDelegate() override;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const \
QModelIndex &index) const override;
diff --git a/kuiserver/progresslistdelegate_p.h b/kuiserver/progresslistdelegate_p.h
index fb44d5c3..946016d9 100644
--- a/kuiserver/progresslistdelegate_p.h
+++ b/kuiserver/progresslistdelegate_p.h
@@ -43,7 +43,7 @@ public:
editorHeight(0),
iconWidth(0),
listView(listView),
- progressBar(new QProgressBar(0))
+ progressBar(new QProgressBar(nullptr))
{
}
diff --git a/kuiserver/progresslistmodel.cpp b/kuiserver/progresslistmodel.cpp
index 6525e86b..adb075cd 100644
--- a/kuiserver/progresslistmodel.cpp
+++ b/kuiserver/progresslistmodel.cpp
@@ -31,7 +31,7 @@
ProgressListModel::ProgressListModel(QObject *parent)
: QAbstractItemModel(parent), QDBusContext(), m_jobId(1),
- m_uiServer(0)
+ m_uiServer(nullptr)
{
m_serviceWatcher = new QDBusServiceWatcher(this);
m_serviceWatcher->setConnection(QDBusConnection::sessionBus());
@@ -273,7 +273,7 @@ void ProgressListModel::registerService(const QString \
&serviceName, const QStrin if (client->isValid()) {
delete m_uiServer;
- m_uiServer = 0;
+ m_uiServer = nullptr;
m_serviceWatcher->addWatchedService(serviceName);
m_registeredServices.insert(serviceName, client);
diff --git a/kuiserver/uiserver.cpp b/kuiserver/uiserver.cpp
index ea967fdd..68d569d6 100644
--- a/kuiserver/uiserver.cpp
+++ b/kuiserver/uiserver.cpp
@@ -120,7 +120,7 @@ void UiServer::showConfigurationDialog()
KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("configuration"),
Configuration::self());
- UIConfigurationDialog *configurationUI = new UIConfigurationDialog(0);
+ UIConfigurationDialog *configurationUI = new UIConfigurationDialog(nullptr);
dialog->addPage(configurationUI, i18n("Behavior"), QStringLiteral("configure"));
diff --git a/libdbusmenuqt/dbusmenuimporter.cpp b/libdbusmenuqt/dbusmenuimporter.cpp
index aab5a043..120d86f9 100644
--- a/libdbusmenuqt/dbusmenuimporter.cpp
+++ b/libdbusmenuqt/dbusmenuimporter.cpp
@@ -61,7 +61,7 @@ static const char *DBUSMENU_PROPERTY_ICON_DATA_HASH = \
"_dbusmenu_icon_data_hash"
static QAction *createKdeTitle(QAction *action, QWidget *parent)
{
- QToolButton *titleWidget = new QToolButton(0);
+ QToolButton *titleWidget = new QToolButton(nullptr);
QFont font = titleWidget->font();
font.setBold(true);
titleWidget->setFont(font);
@@ -258,7 +258,7 @@ public:
}
QAction *action = m_actionForId.value(id);
if (!action) {
- return 0;
+ return nullptr;
}
return action->menu();
}
@@ -279,7 +279,7 @@ DBusMenuImporter::DBusMenuImporter(const QString &service, const \
QString &path,
d->q = this;
d->m_interface = new DBusMenuInterface(service, path, \
QDBusConnection::sessionBus(), this);
- d->m_menu = 0;
+ d->m_menu = nullptr;
d->m_pendingLayoutUpdateTimer = new QTimer(this);
d->m_pendingLayoutUpdateTimer->setSingleShot(true);
@@ -327,7 +327,7 @@ void DBusMenuImporter::processPendingLayoutUpdates()
QMenu *DBusMenuImporter::menu() const
{
if (!d->m_menu) {
- d->m_menu = d->createMenu(0);
+ d->m_menu = d->createMenu(nullptr);
}
return d->m_menu;
}
diff --git a/libdbusmenuqt/dbusmenushortcut_p.cpp \
b/libdbusmenuqt/dbusmenushortcut_p.cpp index abe1abbe..a0534724 100644
--- a/libdbusmenuqt/dbusmenushortcut_p.cpp
+++ b/libdbusmenuqt/dbusmenushortcut_p.cpp
@@ -41,11 +41,11 @@ static void processKeyTokens(QStringList* tokens, int srcCol, int \
dstCol) // cf https://bugs.launchpad.net/libdbusmenu-qt/+bug/712565
{"+", "plus"},
{"-", "minus"},
- {0, 0}
+ {nullptr, nullptr}
};
const Row* ptr = table;
- for (; ptr->zero != 0; ++ptr) {
+ for (; ptr->zero != nullptr; ++ptr) {
const char* from = (*ptr)[srcCol];
const char* to = (*ptr)[dstCol];
tokens->replaceInStrings(from, to);
diff --git a/libkworkspace/kdisplaymanager.cpp b/libkworkspace/kdisplaymanager.cpp
index e2bb61d0..3e73f9d9 100644
--- a/libkworkspace/kdisplaymanager.cpp
+++ b/libkworkspace/kdisplaymanager.cpp
@@ -504,7 +504,7 @@ KDisplayManager::canShutdown()
}
if (DMType == OldKDM)
- return strstr(ctl, ",maysd") != 0;
+ return strstr(ctl, ",maysd") != nullptr;
QByteArray re;
@@ -611,7 +611,7 @@ KDisplayManager::isSwitchable()
{
if (DMType == NewGDM || DMType == LightDM) {
QDBusObjectPath currentSeat;
- if (getCurrentSeat(0, ¤tSeat)) {
+ if (getCurrentSeat(nullptr, ¤tSeat)) {
SystemdSeat SDseat(currentSeat);
if (SDseat.isValid()) {
QVariant prop = SDseat.property("CanMultiSession");
@@ -811,7 +811,7 @@ KDisplayManager::switchVT(int vt)
{
if (DMType == NewGDM || DMType == LightDM) {
QDBusObjectPath currentSeat;
- if (getCurrentSeat(0, ¤tSeat)) {
+ if (getCurrentSeat(nullptr, ¤tSeat)) {
// systemd part // preferred
if (QDBusConnection::systemBus().interface()->isServiceRegistered(SYSTEMD_SERVICE)) \
{
foreach (const QDBusObjectPath &sp, getSessionsForSeat(currentSeat)) \
{
diff --git a/libkworkspace/kworkspace.cpp b/libkworkspace/kworkspace.cpp
index 3077d6e8..ceb96998 100644
--- a/libkworkspace/kworkspace.cpp
+++ b/libkworkspace/kworkspace.cpp
@@ -75,14 +75,14 @@ KRequestShutdownHelper::KRequestShutdownHelper()
calls.die.callback = dummy_callback;
calls.save_complete.callback = dummy_callback;
calls.shutdown_cancelled.callback = dummy_callback;
- char* id = NULL;
+ char* id = nullptr;
char err[ 11 ];
- conn = SmcOpenConnection( NULL, NULL, 1, 0,
+ conn = SmcOpenConnection( nullptr, nullptr, 1, 0,
SmcSaveYourselfProcMask | SmcDieProcMask | SmcSaveCompleteProcMask
- | SmcShutdownCancelledProcMask, &calls, NULL, &id, 10, err );
- if( id != NULL )
+ | SmcShutdownCancelledProcMask, &calls, nullptr, &id, 10, err );
+ if( id != nullptr )
free( id );
- if( conn == NULL )
+ if( conn == nullptr )
return; // no SM
// set the required properties, mostly dummy values
SmPropValue propvalue[ 5 ];
@@ -95,8 +95,8 @@ KRequestShutdownHelper::KRequestShutdownHelper()
props[ 0 ].num_vals = 1;
props[ 0 ].vals = &propvalue[ 0 ];
struct passwd* entry = getpwuid( geteuid() );
- propvalue[ 1 ].length = entry != NULL ? strlen( entry->pw_name ) : 0;
- propvalue[ 1 ].value = (SmPointer)( entry != NULL ? entry->pw_name : "" );
+ propvalue[ 1 ].length = entry != nullptr ? strlen( entry->pw_name ) : 0;
+ propvalue[ 1 ].value = (SmPointer)( entry != nullptr ? entry->pw_name : "" );
props[ 1 ].name = const_cast< char* >( SmUserID );
props[ 1 ].type = const_cast< char* >( SmARRAY8 );
props[ 1 ].num_vals = 1;
@@ -130,10 +130,10 @@ KRequestShutdownHelper::KRequestShutdownHelper()
KRequestShutdownHelper::~KRequestShutdownHelper()
{
#if HAVE_X11
- if( conn != NULL )
+ if( conn != nullptr )
{
delete notifier;
- SmcCloseConnection( conn, 0, NULL );
+ SmcCloseConnection( conn, 0, nullptr );
}
#endif
}
@@ -141,15 +141,15 @@ KRequestShutdownHelper::~KRequestShutdownHelper()
void KRequestShutdownHelper::processData()
{
#if HAVE_X11
- if( conn != NULL )
- IceProcessMessages( SmcGetIceConnection( conn ), 0, 0 );
+ if( conn != nullptr )
+ IceProcessMessages( SmcGetIceConnection( conn ), nullptr, nullptr );
#endif
}
bool KRequestShutdownHelper::requestShutdown( ShutdownConfirm confirm )
{
#if HAVE_X11
- if( conn == NULL )
+ if( conn == nullptr )
return false;
SmcRequestSaveYourself( conn, SmSaveBoth, True, SmInteractStyleAny,
confirm == ShutdownConfirmNo, True );
@@ -159,7 +159,7 @@ bool KRequestShutdownHelper::requestShutdown( ShutdownConfirm \
confirm ) return true;
}
#if HAVE_X11
-static KRequestShutdownHelper* helper = NULL;
+static KRequestShutdownHelper* helper = nullptr;
static void cleanup_sm()
{
@@ -180,7 +180,7 @@ void requestShutDown(ShutdownConfirm confirm, ShutdownType \
sdtype, ShutdownMode return;
}
- if( helper == NULL )
+ if( helper == nullptr )
{
helper = new KRequestShutdownHelper();
qAddPostRoutine(cleanup_sm);
diff --git a/libtaskmanager/launchertasksmodel.cpp \
b/libtaskmanager/launchertasksmodel.cpp index 46159db8..eafcfdb2 100644
--- a/libtaskmanager/launchertasksmodel.cpp
+++ b/libtaskmanager/launchertasksmodel.cpp
@@ -596,7 +596,8 @@ void LauncherTasksModel::requestOpenUrls(const QModelIndex \
&index, const QList<Q return;
}
- KRun::runApplication(*service, urls, nullptr, 0, {}, \
KStartupInfo::createNewStartupIdForTimestamp(timeStamp)); + \
KRun::runApplication(*service, urls, nullptr, KRun::RunFlags(), QString(), + \
KStartupInfo::createNewStartupIdForTimestamp(timeStamp));
KActivities::ResourceInstance::notifyAccessed(QUrl(QStringLiteral("applications:") \
+ service->storageId()), QStringLiteral("org.kde.libtaskmanager"));
diff --git a/libtaskmanager/tasktools.cpp b/libtaskmanager/tasktools.cpp
index de806efc..c7d408cc 100644
--- a/libtaskmanager/tasktools.cpp
+++ b/libtaskmanager/tasktools.cpp
@@ -725,13 +725,13 @@ void runApp(const AppData &appData, const QList<QUrl> &urls)
}
if (service && service->isApplication()) {
- KRun::runApplication(*service, urls, nullptr, 0, {},
+ KRun::runApplication(*service, urls, nullptr, KRun::RunFlags(), \
QString(), KStartupInfo::createNewStartupIdForTimestamp(timeStamp));
KActivities::ResourceInstance::notifyAccessed(QUrl(QStringLiteral("applications:") \
+ service->storageId()), QStringLiteral("org.kde.libtaskmanager"));
} else {
- new KRun(appData.url, 0, false, \
KStartupInfo::createNewStartupIdForTimestamp(timeStamp)); + new \
KRun(appData.url, nullptr, false, \
KStartupInfo::createNewStartupIdForTimestamp(timeStamp));
if (!appData.id.isEmpty()) {
KActivities::ResourceInstance::notifyAccessed(QUrl(QStringLiteral("applications:") \
+ appData.id),
diff --git a/libtaskmanager/xwindowtasksmodel.cpp \
b/libtaskmanager/xwindowtasksmodel.cpp index 3ed82b87..ba1ddfce 100644
--- a/libtaskmanager/xwindowtasksmodel.cpp
+++ b/libtaskmanager/xwindowtasksmodel.cpp
@@ -510,7 +510,7 @@ QUrl XWindowTasksModel::Private::windowUrl(WId window)
}
return windowUrlFromMetadata(info->windowClassClass(),
- NETWinInfo(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::WMPid, 0).pid(), + NETWinInfo(QX11Info::connection(), window, \
QX11Info::appRootWindow(), NET::WMPid, NET::Properties2()).pid(), rulesConfig, \
info->windowClassName()); }
@@ -820,10 +820,10 @@ void XWindowTasksModel::requestToggleMaximized(const \
QModelIndex &index) KWindowSystem::unminimizeWindow(window);
}
- NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::WMState, 0); + NETWinInfo ni(QX11Info::connection(), window, \
QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
if (restore) {
- ni.setState(0, NET::Max);
+ ni.setState(NET::States(), NET::Max);
} else {
ni.setState(NET::Max, NET::Max);
}
@@ -842,10 +842,10 @@ void XWindowTasksModel::requestToggleKeepAbove(const \
QModelIndex &index) const WId window = d->windows.at(index.row());
const KWindowInfo *info = d->windowInfo(window);
- NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::WMState, 0); + NETWinInfo ni(QX11Info::connection(), window, \
QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
if (info->hasState(NET::StaysOnTop)) {
- ni.setState(0, NET::StaysOnTop);
+ ni.setState(NET::States(), NET::StaysOnTop);
} else {
ni.setState(NET::StaysOnTop, NET::StaysOnTop);
}
@@ -860,10 +860,10 @@ void XWindowTasksModel::requestToggleKeepBelow(const \
QModelIndex &index) const WId window = d->windows.at(index.row());
const KWindowInfo *info = d->windowInfo(window);
- NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::WMState, 0); + NETWinInfo ni(QX11Info::connection(), window, \
QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
if (info->hasState(NET::KeepBelow)) {
- ni.setState(0, NET::KeepBelow);
+ ni.setState(NET::States(), NET::KeepBelow);
} else {
ni.setState(NET::KeepBelow, NET::KeepBelow);
}
@@ -878,10 +878,10 @@ void XWindowTasksModel::requestToggleFullScreen(const \
QModelIndex &index) const WId window = d->windows.at(index.row());
const KWindowInfo *info = d->windowInfo(window);
- NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::WMState, 0); + NETWinInfo ni(QX11Info::connection(), window, \
QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
if (info->hasState(NET::FullScreen)) {
- ni.setState(0, NET::FullScreen);
+ ni.setState(NET::States(), NET::FullScreen);
} else {
ni.setState(NET::FullScreen, NET::FullScreen);
}
@@ -896,10 +896,10 @@ void XWindowTasksModel::requestToggleShaded(const QModelIndex \
&index) const WId window = d->windows.at(index.row());
const KWindowInfo *info = d->windowInfo(window);
- NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::WMState, 0); + NETWinInfo ni(QX11Info::connection(), window, \
QX11Info::appRootWindow(), NET::WMState, NET::Properties2());
if (info->hasState(NET::Shaded)) {
- ni.setState(0, NET::Shaded);
+ ni.setState(NET::States(), NET::Shaded);
} else {
ni.setState(NET::Shaded, NET::Shaded);
}
@@ -970,7 +970,7 @@ void XWindowTasksModel::requestPublishDelegateGeometry(const \
QModelIndex &index, return;
}
- NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), 0, 0);
+ NETWinInfo ni(QX11Info::connection(), window, QX11Info::appRootWindow(), \
NET::Properties(), NET::Properties2()); NETRect rect;
if (geometry.isValid()) {
diff --git a/libtaskmanager/xwindowtasksmodel.h b/libtaskmanager/xwindowtasksmodel.h
index 17372c75..ef46fd34 100644
--- a/libtaskmanager/xwindowtasksmodel.h
+++ b/libtaskmanager/xwindowtasksmodel.h
@@ -219,7 +219,7 @@ public:
* @param mimeData Some mime data.
* @param @ok Set to true or false on success or failure.
*/
- static WId winIdFromMimeData(const QMimeData *mimeData, bool *ok = 0);
+ static WId winIdFromMimeData(const QMimeData *mimeData, bool *ok = nullptr);
/**
* Tries to extract X11 window ids from supplied mime data.
@@ -227,7 +227,7 @@ public:
* @param mimeData Some mime data.
* @param @ok Set to true or false on success or failure.
*/
- static QList<WId> winIdsFromMimeData(const QMimeData *mimeData, bool *ok = 0);
+ static QList<WId> winIdsFromMimeData(const QMimeData *mimeData, bool *ok = \
nullptr);
private:
class Private;
diff --git a/phonon/platform_kde/kdeplatformplugin.cpp \
b/phonon/platform_kde/kdeplatformplugin.cpp index daf5d286..cee4c8ad 100644
--- a/phonon/platform_kde/kdeplatformplugin.cpp
+++ b/phonon/platform_kde/kdeplatformplugin.cpp
@@ -91,12 +91,12 @@ QString KdePlatformPlugin::applicationName() const
QObject *KdePlatformPlugin::createBackend()
{
- return 0;
+ return nullptr;
}
QObject *KdePlatformPlugin::createBackend(const QString &/*library*/, const QString \
&/*version*/) {
- return 0;
+ return nullptr;
}
bool KdePlatformPlugin::isMimeTypeAvailable(const QString &/*mimeType*/) const
diff --git a/phonon/platform_kde/kiomediastream.cpp \
b/phonon/platform_kde/kiomediastream.cpp index 59823477..dbec716b 100644
--- a/phonon/platform_kde/kiomediastream.cpp
+++ b/phonon/platform_kde/kiomediastream.cpp
@@ -203,14 +203,14 @@ void KioMediaStreamPrivate::_k_bytestreamResult(KJob *job)
q->error(NormalError, kioErrorString);
} else if (seeking) {
open = false;
- kiojob = 0;
+ kiojob = nullptr;
endOfDataSent = false;
reading = false;
q->reset();
return;
}
open = false;
- kiojob = 0;
+ kiojob = nullptr;
qCDebug(PLATFORM) << "KIO Job is done (will delete itself) and d->kiojob reset \
to 0"; endOfDataSent = true;
q->endOfData();
diff --git a/phonon/platform_kde/kiomediastream_p.h \
b/phonon/platform_kde/kiomediastream_p.h index 8146656f..14930d73 100644
--- a/phonon/platform_kde/kiomediastream_p.h
+++ b/phonon/platform_kde/kiomediastream_p.h
@@ -38,7 +38,7 @@ protected:
reading(false),
open(false),
seekPosition(0),
- kiojob(0)
+ kiojob(nullptr)
{
}
@@ -46,7 +46,7 @@ protected:
{
if (kiojob) {
kiojob->kill();
- kiojob = 0;
+ kiojob = nullptr;
}
}
diff --git a/plasma-windowed/plasmawindowedview.cpp \
b/plasma-windowed/plasmawindowedview.cpp index e6890c83..696153dd 100644
--- a/plasma-windowed/plasmawindowedview.cpp
+++ b/plasma-windowed/plasmawindowedview.cpp
@@ -39,8 +39,8 @@
PlasmaWindowedView::PlasmaWindowedView(QWindow *parent)
: QQuickView(parent),
- m_applet(0),
- m_statusNotifier(0),
+ m_applet(nullptr),
+ m_statusNotifier(nullptr),
m_withStatusNotifier(false)
{
engine()->rootContext()->setContextProperty(QStringLiteral("root"), \
contentItem());
diff --git a/runners/baloo/baloosearchrunner.cpp \
b/runners/baloo/baloosearchrunner.cpp index ccb93c42..de70fcc0 100644
--- a/runners/baloo/baloosearchrunner.cpp
+++ b/runners/baloo/baloosearchrunner.cpp
@@ -188,5 +188,5 @@ void SearchRunner::Run(const QString& id, const QString& \
actionId) return;
}
- new KRun(url, 0);
+ new KRun(url, nullptr);
}
diff --git a/runners/bookmarks/tests/testchromebookmarks.cpp \
b/runners/bookmarks/tests/testchromebookmarks.cpp index da6733b9..53af5409 100644
--- a/runners/bookmarks/tests/testchromebookmarks.cpp
+++ b/runners/bookmarks/tests/testchromebookmarks.cpp
@@ -60,7 +60,7 @@ void \
TestChromeBookmarks::itShouldFindNothingWhenPrepareIsNotCalled()
void TestChromeBookmarks::itShouldGracefullyExitWhenFileIsNotFound()
{
- FakeFindProfile finder(QList<Profile>() << Profile("FileNotExisting.json", \
NULL)); + FakeFindProfile finder(QList<Profile>() << \
Profile("FileNotExisting.json", nullptr)); Chrome *chrome = new Chrome(&finder, \
this); chrome->prepare();
QCOMPARE(chrome->match("any", true).size(), 0);
@@ -68,7 +68,7 @@ void \
TestChromeBookmarks::itShouldGracefullyExitWhenFileIsNotFound()
void verifyMatch(BookmarkMatch &match, const QString &title, const QString &url, \
qreal relevance, QueryMatch::Type type) {
- QueryMatch queryMatch = match.asQueryMatch(NULL);
+ QueryMatch queryMatch = match.asQueryMatch(nullptr);
QCOMPARE(queryMatch.text(), title);
QCOMPARE(queryMatch.data().toString(), url);
QCOMPARE(queryMatch.relevance(), relevance);
diff --git a/runners/calculator/qalculate_engine.cpp \
b/runners/calculator/qalculate_engine.cpp index 39a3e672..f3068a1a 100644
--- a/runners/calculator/qalculate_engine.cpp
+++ b/runners/calculator/qalculate_engine.cpp
@@ -56,7 +56,7 @@ QalculateEngine::~QalculateEngine()
{
if (s_counter.deref()) {
delete CALCULATOR;
- CALCULATOR = NULL;
+ CALCULATOR = nullptr;
}
}
diff --git a/runners/kill/killrunner.cpp b/runners/kill/killrunner.cpp
index af81ca67..3b8ac9cb 100644
--- a/runners/kill/killrunner.cpp
+++ b/runners/kill/killrunner.cpp
@@ -174,7 +174,7 @@ void KillRunner::run(const Plasma::RunnerContext &context, const \
Plasma::QueryMa // QString user = data[1].toString();
int signal;
- if (match.selectedAction() != NULL) {
+ if (match.selectedAction() != nullptr) {
signal = match.selectedAction()->data().toInt();
} else {
signal = 9; //default: SIGKILL
diff --git a/runners/locations/locationrunner.cpp \
b/runners/locations/locationrunner.cpp index bfd488a3..592cdb99 100644
--- a/runners/locations/locationrunner.cpp
+++ b/runners/locations/locationrunner.cpp
@@ -189,7 +189,7 @@ void LocationsRunner::run(const Plasma::RunnerContext &context, \
const Plasma::Qu
QUrl urlToRun(KUriFilter::self()->filteredUri(location, \
{QStringLiteral("kshorturifilter")}));
- new KRun(urlToRun, 0);
+ new KRun(urlToRun, nullptr);
}
QMimeData * LocationsRunner::mimeDataForMatch(const Plasma::QueryMatch &match)
@@ -201,7 +201,7 @@ QMimeData * LocationsRunner::mimeDataForMatch(const \
Plasma::QueryMatch &match) return result;
}
- return 0;
+ return nullptr;
}
diff --git a/runners/places/placesrunner.cpp b/runners/places/placesrunner.cpp
index 7e208040..da3cec7e 100644
--- a/runners/places/placesrunner.cpp
+++ b/runners/places/placesrunner.cpp
@@ -135,7 +135,7 @@ void PlacesRunner::run(const Plasma::RunnerContext &context, \
const Plasma::Query Q_UNUSED(context);
//I don't just pass the model index because the list could change before the \
user clicks on it, which would make everything go wrong. Ideally we don't want things \
to go wrong. if (action.data().type() == QVariant::Url) {
- new KRun(action.data().toUrl(), 0);
+ new KRun(action.data().toUrl(), nullptr);
} else if (action.data().canConvert<QString>()) {
//search our list for the device with the same udi, then set it up (mount \
it). QString deviceUdi = action.data().toString();
diff --git a/runners/powerdevil/PowerDevilRunner.cpp \
b/runners/powerdevil/PowerDevilRunner.cpp index 2ae24441..2666956e 100644
--- a/runners/powerdevil/PowerDevilRunner.cpp
+++ b/runners/powerdevil/PowerDevilRunner.cpp
@@ -251,10 +251,10 @@ void PowerDevilRunner::run(const Plasma::RunnerContext \
&context, const Plasma::Q
switch ((Solid::PowerManagement::SleepState)match.data().toInt()) {
case Solid::PowerManagement::SuspendState:
case Solid::PowerManagement::StandbyState:
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, \
0, 0); + \
Solid::PowerManagement::requestSleep(Solid::PowerManagement::SuspendState, nullptr, \
nullptr); break;
case Solid::PowerManagement::HibernateState:
- Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, \
0, 0); + \
Solid::PowerManagement::requestSleep(Solid::PowerManagement::HibernateState, nullptr, \
nullptr); break;
}
}
diff --git a/runners/services/servicerunner.cpp b/runners/services/servicerunner.cpp
index 378ebad2..85ea5d6c 100644
--- a/runners/services/servicerunner.cpp
+++ b/runners/services/servicerunner.cpp
@@ -469,7 +469,7 @@ QMimeData * ServiceRunner::mimeDataForMatch(const \
Plasma::QueryMatch &match) return result;
}
- return 0;
+ return nullptr;
}
K_EXPORT_PLASMA_RUNNER(services, ServiceRunner)
diff --git a/runners/shell/shell_config.h b/runners/shell/shell_config.h
index 606f84a3..fb4fe49e 100644
--- a/runners/shell/shell_config.h
+++ b/runners/shell/shell_config.h
@@ -30,7 +30,7 @@ class ShellConfig : public QWidget
{
Q_OBJECT
public:
- explicit ShellConfig(const KConfigGroup &config, QWidget* parent = 0);
+ explicit ShellConfig(const KConfigGroup &config, QWidget* parent = nullptr);
~ShellConfig() override;
Ui::shellOptions m_ui;
diff --git a/runners/shell/shellrunner.cpp b/runners/shell/shellrunner.cpp
index 06ae2e71..f718876a 100644
--- a/runners/shell/shellrunner.cpp
+++ b/runners/shell/shellrunner.cpp
@@ -81,7 +81,7 @@ void ShellRunner::run(const Plasma::RunnerContext &context, const \
Plasma::QueryM
if (match.selectedAction() && match.selectedAction() == \
action(s_runInTerminalId)) { KToolInvocation::invokeTerminal(context.query());
} else {
- KRun::runCommand(context.query(), NULL);
+ KRun::runCommand(context.query(), nullptr);
}
}
}
diff --git a/runners/solid/devicewrapper.cpp b/runners/solid/devicewrapper.cpp
index aed9f830..b1aa2a18 100644
--- a/runners/solid/devicewrapper.cpp
+++ b/runners/solid/devicewrapper.cpp
@@ -108,7 +108,7 @@ Solid::Device DeviceWrapper::device() const {
}
KIcon DeviceWrapper::icon() const {
- return KIcon(m_iconName, NULL, m_emblems);
+ return KIcon(m_iconName, nullptr, m_emblems);
}
bool DeviceWrapper::isStorageAccess() const {
diff --git a/shell/alternativeshelper.cpp b/shell/alternativeshelper.cpp
index 6d763074..fa87f87f 100644
--- a/shell/alternativeshelper.cpp
+++ b/shell/alternativeshelper.cpp
@@ -77,7 +77,7 @@ void AlternativesHelper::loadAlternative(const QString &plugin)
m_applet->destroy();
connect(m_applet, &QObject::destroyed, [=]() {
- Plasma::Applet *newApplet = Q_NULLPTR;
+ Plasma::Applet *newApplet = nullptr;
QMetaObject::invokeMethod(contItem, "createApplet", \
Q_RETURN_ARG(Plasma::Applet *, newApplet), Q_ARG(QString, plugin), \
Q_ARG(QVariantList, QVariantList()), Q_ARG(QPoint, newPos));
if (newApplet) {
diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
index cb10ee4f..e46c9bef 100644
--- a/shell/containmentconfigview.cpp
+++ b/shell/containmentconfigview.cpp
@@ -159,7 +159,7 @@ void ContainmentConfigView::setCurrentWallpaper(const QString \
&wallpaper) }
delete m_ownWallpaperConfig;
- m_ownWallpaperConfig = 0;
+ m_ownWallpaperConfig = nullptr;
if (m_containment->wallpaper() == wallpaper) {
syncWallpaperObjects();
@@ -195,7 +195,7 @@ void ContainmentConfigView::applyWallpaper()
}
delete m_ownWallpaperConfig;
- m_ownWallpaperConfig = 0;
+ m_ownWallpaperConfig = nullptr;
emit wallpaperConfigurationChanged();
}
diff --git a/shell/desktopview.h b/shell/desktopview.h
index 446492a7..dc9ab54e 100644
--- a/shell/desktopview.h
+++ b/shell/desktopview.h
@@ -55,7 +55,7 @@ public:
};
Q_ENUM(SessionType)
- explicit DesktopView(Plasma::Corona *corona, QScreen *targetScreen = 0);
+ explicit DesktopView(Plasma::Corona *corona, QScreen *targetScreen = nullptr);
~DesktopView() override;
/*This is different from screen() as is always there, even if the window is
diff --git a/shell/packageplugins/wallpaperimages/wallpaperpackage.h \
b/shell/packageplugins/wallpaperimages/wallpaperpackage.h index 86e03e70..aebf254f \
100644
--- a/shell/packageplugins/wallpaperimages/wallpaperpackage.h
+++ b/shell/packageplugins/wallpaperimages/wallpaperpackage.h
@@ -27,7 +27,7 @@ class WallpaperPackage : public KPackage::PackageStructure
Q_OBJECT
public:
- explicit WallpaperPackage(QObject *parent = 0, const QVariantList &args = \
QVariantList()); + explicit WallpaperPackage(QObject *parent = nullptr, const \
QVariantList &args = QVariantList());
void initPackage(KPackage::Package *package) override;
void pathChanged(KPackage::Package *package) override;
diff --git a/shell/panelconfigview.h b/shell/panelconfigview.h
index e4c4fef6..c1ed93f3 100644
--- a/shell/panelconfigview.h
+++ b/shell/panelconfigview.h
@@ -53,7 +53,7 @@ class PanelConfigView : public PlasmaQuick::ConfigView
Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders \
NOTIFY enabledBordersChanged)
public:
- PanelConfigView(Plasma::Containment *interface, PanelView *panelView, QWindow \
*parent = 0); + PanelConfigView(Plasma::Containment *interface, PanelView \
*panelView, QWindow *parent = nullptr); ~PanelConfigView() override;
void init() override;
diff --git a/shell/panelshadows.cpp b/shell/panelshadows.cpp
index f58de77c..507b9f58 100644
--- a/shell/panelshadows.cpp
+++ b/shell/panelshadows.cpp
@@ -46,7 +46,7 @@ public:
Private(PanelShadows *shadows)
: q(shadows)
#if HAVE_X11
- ,_connection( 0x0 ),
+ ,_connection( nullptr ),
_gc( 0x0 )
, m_isX11(KWindowSystem::isPlatformX11())
#endif
@@ -161,7 +161,7 @@ void PanelShadows::removeWindow(const QWindow *window)
}
d->m_windows.remove(window);
- disconnect(window, 0, this, 0);
+ disconnect(window, nullptr, this, nullptr);
d->clearShadow(window);
if (d->m_windows.isEmpty()) {
@@ -202,7 +202,7 @@ Qt::HANDLE PanelShadows::Private::createPixmap(const QPixmap& \
source) {
// do nothing for invalid pixmaps
- if( source.isNull() ) return 0;
+ if( source.isNull() ) return nullptr;
/*
in some cases, pixmap handle is invalid. This is the case notably
@@ -212,7 +212,7 @@ Qt::HANDLE PanelShadows::Private::createPixmap(const QPixmap& \
source)
#if HAVE_X11
if (!m_isX11) {
- return 0;
+ return nullptr;
}
// check connection
@@ -228,7 +228,7 @@ Qt::HANDLE PanelShadows::Private::createPixmap(const QPixmap& \
source) if( !_gc )
{
_gc = xcb_generate_id( _connection );
- xcb_create_gc( _connection, _gc, pixmap, 0, 0x0 );
+ xcb_create_gc( _connection, _gc, pixmap, 0, nullptr );
}
// // create explicitly shared QPixmap from it
diff --git a/shell/panelshadows_p.h b/shell/panelshadows_p.h
index 157d30dc..81298742 100644
--- a/shell/panelshadows_p.h
+++ b/shell/panelshadows_p.h
@@ -30,7 +30,7 @@ class PanelShadows : public Plasma::Svg
Q_OBJECT
public:
- explicit PanelShadows(QObject *parent = 0, const QString &prefix = \
QStringLiteral("widgets/panel-background")); + explicit PanelShadows(QObject \
*parent = nullptr, const QString &prefix = \
QStringLiteral("widgets/panel-background")); ~PanelShadows() override;
static PanelShadows *self();
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index 7c87cec0..dbdf356f 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -63,7 +63,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, \
QWindow *parent m_alignment(Qt::AlignLeft),
m_corona(corona),
m_visibilityMode(NormalPanel),
- m_background(0),
+ m_background(nullptr),
m_backgroundHints(Plasma::Types::StandardBackground),
m_shellSurface(nullptr)
{
@@ -655,7 +655,7 @@ void PanelView::setAutoHideEnabled(bool enabled)
const QByteArray effectName = \
QByteArrayLiteral("_KDE_NET_WM_SCREEN_EDGE_SHOW");
xcb_intern_atom_cookie_t atomCookie = xcb_intern_atom_unchecked(c, false, \
effectName.length(), effectName.constData());
- QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
atom(xcb_intern_atom_reply(c, atomCookie, NULL)); + \
QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter> \
atom(xcb_intern_atom_reply(c, atomCookie, nullptr));
if (!atom) {
return;
diff --git a/shell/panelview.h b/shell/panelview.h
index da3c3f03..3a22d2b8 100644
--- a/shell/panelview.h
+++ b/shell/panelview.h
@@ -110,7 +110,7 @@ public:
};
Q_ENUM(VisibilityMode)
- explicit PanelView(ShellCorona *corona, QScreen *targetScreen = 0, QWindow \
*parent = 0); + explicit PanelView(ShellCorona *corona, QScreen *targetScreen = \
nullptr, QWindow *parent = nullptr); ~PanelView() override;
KConfigGroup config() const override;
diff --git a/shell/scripting/applet.cpp b/shell/scripting/applet.cpp
index 6dff46b3..d195e72c 100644
--- a/shell/scripting/applet.cpp
+++ b/shell/scripting/applet.cpp
@@ -265,7 +265,7 @@ bool Applet::locked() const
Plasma::Applet *Applet::applet() const
{
- return 0;
+ return nullptr;
}
}
diff --git a/shell/scripting/configgroup.cpp b/shell/scripting/configgroup.cpp
index 383cf090..95071006 100644
--- a/shell/scripting/configgroup.cpp
+++ b/shell/scripting/configgroup.cpp
@@ -30,8 +30,8 @@ class ConfigGroupPrivate {
public:
ConfigGroupPrivate(ConfigGroup *q)
: q(q),
- config(0),
- configGroup(0)
+ config(nullptr),
+ configGroup(nullptr)
{}
~ConfigGroupPrivate()
@@ -86,7 +86,7 @@ void ConfigGroup::setFile(const QString& filename)
return;
}
d->file = filename;
- d->config = 0;
+ d->config = nullptr;
readConfigFile();
emit fileChanged();
}
@@ -145,7 +145,7 @@ QStringList ConfigGroup::groupList() const
bool ConfigGroup::readConfigFile()
{
// Find parent ConfigGroup
- ConfigGroup* parentGroup = 0;
+ ConfigGroup* parentGroup = nullptr;
QObject* current = parent();
while (current) {
parentGroup = qobject_cast<ConfigGroup*>(current);
@@ -156,7 +156,7 @@ bool ConfigGroup::readConfigFile()
}
delete d->configGroup;
- d->configGroup = 0;
+ d->configGroup = nullptr;
if (parentGroup) {
d->configGroup = new KConfigGroup(parentGroup->configGroup(), d->group);
diff --git a/shell/scripting/configgroup.h b/shell/scripting/configgroup.h
index 9d4f50d7..801b3f6c 100644
--- a/shell/scripting/configgroup.h
+++ b/shell/scripting/configgroup.h
@@ -37,7 +37,7 @@ class ConfigGroup : public QObject
Q_PROPERTY(QStringList groupList READ groupList NOTIFY groupListChanged)
public:
- ConfigGroup(QObject* parent=0);
+ ConfigGroup(QObject* parent=nullptr);
~ConfigGroup() override;
KConfigGroup* configGroup();
diff --git a/shell/scripting/panel.cpp b/shell/scripting/panel.cpp
index b9383dfb..cb7342c3 100644
--- a/shell/scripting/panel.cpp
+++ b/shell/scripting/panel.cpp
@@ -114,7 +114,7 @@ PanelView *Panel::panel() const
{
Plasma::Containment *c = containment();
if (!c || !m_corona) {
- return 0;
+ return nullptr;
}
return m_corona->panelView(c);
diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index d8f7cecd..70e0b693 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/shell/scripting/scriptengine.cpp
@@ -360,7 +360,7 @@ Containment *ScriptEngine::createContainment(const QString &type, \
const QString return nullptr;
}
- Plasma::Containment *c = 0;
+ Plasma::Containment *c = nullptr;
if (type == QLatin1String("Panel")) {
ShellCorona *sc = qobject_cast<ShellCorona *>(m_corona);
StandaloneAppCorona *ac = qobject_cast<StandaloneAppCorona *>(m_corona);
diff --git a/shell/scripting/scriptengine_v1.cpp \
b/shell/scripting/scriptengine_v1.cpp index 889d48d2..c32e76d5 100644
--- a/shell/scripting/scriptengine_v1.cpp
+++ b/shell/scripting/scriptengine_v1.cpp
@@ -855,7 +855,7 @@ QScriptValue \
ScriptEngine::V1::knownWallpaperPlugins(QScriptContext *context, QScriptValue \
ScriptEngine::V1::configFile(QScriptContext *context, QScriptEngine *engine)
{
- ConfigGroup *file = 0;
+ ConfigGroup *file = nullptr;
if (context->argumentCount() > 0) {
if (context->argument(0).isString()) {
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index d91d744a..2072d612 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -1404,7 +1404,7 @@ void ShellCorona::loadInteractiveConsole()
{
if (KSharedConfig::openConfig()->isImmutable() || \
!KAuthorized::authorize(QStringLiteral("plasma-desktop/scripting_console"))) { \
delete m_interactiveConsole;
- m_interactiveConsole = 0;
+ m_interactiveConsole = nullptr;
return;
}
@@ -1600,14 +1600,14 @@ Plasma::Containment \
*ShellCorona::setContainmentTypeForScreen(int screen, const
//no valid containment in given screen, giving up
if (!oldContainment) {
- return 0;
+ return nullptr;
}
if (plugin.isEmpty()) {
return oldContainment;
}
- DesktopView *view = 0;
+ DesktopView *view = nullptr;
foreach (DesktopView *v, m_desktopViewforId) {
if (v->containment() == oldContainment) {
view = v;
@@ -1699,10 +1699,10 @@ void ShellCorona::checkAddPanelAction(const QStringList \
&sycocaChanges) }
delete m_addPanelAction;
- m_addPanelAction = 0;
+ m_addPanelAction = nullptr;
delete m_addPanelsMenu;
- m_addPanelsMenu = 0;
+ m_addPanelsMenu = nullptr;
KPluginInfo::List panelContainmentPlugins = \
Plasma::PluginLoader::listContainmentsOfType(QStringLiteral("Panel"));
@@ -1814,7 +1814,7 @@ Plasma::Containment *ShellCorona::addPanel(const QString \
&plugin) {
Plasma::Containment *panel = createContainment(plugin);
if (!panel) {
- return 0;
+ return nullptr;
}
QList<Plasma::Types::Location> availableLocations;
diff --git a/shell/shellmanager.cpp b/shell/shellmanager.cpp
index ebbb26cb..6f43fc60 100644
--- a/shell/shellmanager.cpp
+++ b/shell/shellmanager.cpp
@@ -58,7 +58,7 @@ class ShellManager::Private {
public:
Private()
: currentHandler(nullptr),
- corona(0)
+ corona(nullptr)
{
shellUpdateDelay.setInterval(100);
shellUpdateDelay.setSingleShot(true);
@@ -170,14 +170,14 @@ void ShellManager::updateShell()
d->shellUpdateDelay.stop();
if (d->handlers.isEmpty()) {
- KMessageBox::error(0, //wID, but we don't have a window yet
+ KMessageBox::error(nullptr, //wID, but we don't have a window yet
i18nc("Fatal error message body","All shell packages \
missing.\nThis is an installation issue, please contact your \
distribution"),
i18nc("Fatal error message title", "Plasma Cannot \
Start")); qCritical("We have no shell handlers installed");
QCoreApplication::exit(-1);
}
- QObject *handler = 0;
+ QObject *handler = nullptr;
if (!s_fixedShell.isEmpty()) {
QList<QObject *>::const_iterator it = std::find_if (d->handlers.cbegin(), \
d->handlers.cend(), [=] (QObject *handler) { @@ -186,7 +186,7 @@ void \
ShellManager::updateShell() if (it != d->handlers.cend()) {
handler = *it;
} else {
- KMessageBox::error(0,
+ KMessageBox::error(nullptr,
i18nc("Fatal error message body", "Shell package %1 \
cannot be found", s_fixedShell),
i18nc("Fatal error message title", "Plasma Cannot \
Start"));
qCritical("Unable to find the shell plugin '%s'", \
qPrintable(s_fixedShell));
diff --git a/shell/standaloneappcorona.cpp b/shell/standaloneappcorona.cpp
index 85bef18b..502e8188 100644
--- a/shell/standaloneappcorona.cpp
+++ b/shell/standaloneappcorona.cpp
@@ -40,7 +40,7 @@ StandaloneAppCorona::StandaloneAppCorona(const QString \
&coronaPlugin, QObject *p : Plasma::Corona(parent),
m_coronaPlugin(coronaPlugin),
m_activityConsumer(new KActivities::Consumer(this)),
- m_view(0)
+ m_view(nullptr)
{
qmlRegisterUncreatableType<DesktopView>("org.kde.plasma.shell", 2, 0, "Desktop", \
QStringLiteral("It is not possible to create objects of type \
Desktop"));
qmlRegisterUncreatableType<PanelView>("org.kde.plasma.shell", 2, 0, "Panel", \
QStringLiteral("It is not possible to create objects of type Panel")); @@ -226,7 \
+226,7 @@ Plasma::Containment *StandaloneAppCorona::addPanel(const QString &plugin) \
//a corona useful also when launched in fullshell Plasma::Containment *panel = \
createContainment(plugin); if (!panel) {
- return 0;
+ return nullptr;
}
return panel;
diff --git a/shell/standaloneappcorona.h b/shell/standaloneappcorona.h
index 65644a92..0d774098 100644
--- a/shell/standaloneappcorona.h
+++ b/shell/standaloneappcorona.h
@@ -34,7 +34,7 @@ class StandaloneAppCorona : public Plasma::Corona
Q_OBJECT
public:
- explicit StandaloneAppCorona(const QString &coronaPlugin, QObject * parent = 0);
+ explicit StandaloneAppCorona(const QString &coronaPlugin, QObject * parent = \
nullptr); ~StandaloneAppCorona() override;
QRect screenGeometry(int id) const override;
diff --git a/soliduiserver/deviceactionsdialog.h \
b/soliduiserver/deviceactionsdialog.h index d9e73e6b..4a017c08 100644
--- a/soliduiserver/deviceactionsdialog.h
+++ b/soliduiserver/deviceactionsdialog.h
@@ -32,7 +32,7 @@ class DeviceActionsDialog : public KDialog
Q_OBJECT
public:
- DeviceActionsDialog(QWidget *parent=0);
+ DeviceActionsDialog(QWidget *parent=nullptr);
~DeviceActionsDialog() override;
void setDevice(const Solid::Device &device);
diff --git a/soliduiserver/deviceserviceaction.cpp \
b/soliduiserver/deviceserviceaction.cpp index b267c1e5..1768380a 100644
--- a/soliduiserver/deviceserviceaction.cpp
+++ b/soliduiserver/deviceserviceaction.cpp
@@ -160,7 +160,7 @@ void DelayedExecutor::delayedExecute(const QString &udi)
MacroExpander mx(device);
mx.expandMacrosShellQuote(exec);
- KRun::runCommand(exec, QString(), m_service.icon(), 0);
+ KRun::runCommand(exec, QString(), m_service.icon(), nullptr);
deleteLater();
}
diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
index 2b45fdb0..850c6adf 100644
--- a/soliduiserver/soliduiserver.cpp
+++ b/soliduiserver/soliduiserver.cpp
@@ -130,7 +130,7 @@ void SolidUiServer::showPassphraseDialog(const QString &udi,
Solid::Device device(udi);
- KPasswordDialog *dialog = new KPasswordDialog(0, \
KPasswordDialog::ShowKeepPassword); + KPasswordDialog *dialog = new \
KPasswordDialog(nullptr, KPasswordDialog::ShowKeepPassword);
QString label = device.vendor();
if (!label.isEmpty()) label+=' ';
diff --git a/startkde/kstartupconfig/kstartupconfig.cpp \
b/startkde/kstartupconfig/kstartupconfig.cpp index c9927855..493218ea 100644
--- a/startkde/kstartupconfig/kstartupconfig.cpp
+++ b/startkde/kstartupconfig/kstartupconfig.cpp
@@ -94,11 +94,11 @@ int main()
goto doit;
config_time = st.st_mtime;
config = fopen(filename.c_str(), "r");
- if( config == NULL )
+ if( config == nullptr )
goto doit;
filename = kdehome + "/startupconfigkeys";
keys = fopen(filename.c_str(), "r");
- if( keys == NULL )
+ if( keys == nullptr )
{
fclose(config);
return 2;
@@ -109,11 +109,11 @@ int main()
char keyline[ 1024 ];
char line[ 1024 ];
- if( fgets( keyline, 1023, keys ) == NULL )
+ if( fgets( keyline, 1023, keys ) == nullptr )
return 0;
if( (nl = strchr( keyline, '\n' )) )
*nl = '\0';
- if( fgets( line, 1023, config ) == NULL )
+ if( fgets( line, 1023, config ) == nullptr )
break;
if( (nl = strchr( line, '\n' )) )
*nl = '\0';
@@ -121,7 +121,7 @@ int main()
break;
for(;;)
{
- if( fgets( line, 1023, config ) == NULL )
+ if( fgets( line, 1023, config ) == nullptr )
goto doit2;
if( (nl = strchr( line, '\n' )) )
*nl = '\0';
diff --git a/systemmonitor/ksystemactivitydialog.cpp \
b/systemmonitor/ksystemactivitydialog.cpp index b01d340f..54b9cfd8 100644
--- a/systemmonitor/ksystemactivitydialog.cpp
+++ b/systemmonitor/ksystemactivitydialog.cpp
@@ -43,7 +43,7 @@
#include <QDebug>
KSystemActivityDialog::KSystemActivityDialog(QWidget *parent)
- : QDialog(parent), m_processList(0)
+ : QDialog(parent), m_processList(nullptr)
{
setWindowTitle(i18n("System Activity"));
setWindowIcon(QIcon::fromTheme(QStringLiteral( "utilities-system-monitor" )));
diff --git a/systemmonitor/ksystemactivitydialog.h \
b/systemmonitor/ksystemactivitydialog.h index 49a12828..39163a25 100644
--- a/systemmonitor/ksystemactivitydialog.h
+++ b/systemmonitor/ksystemactivitydialog.h
@@ -34,7 +34,7 @@ class KSystemActivityDialog : public QDialog
{
Q_OBJECT
public:
- KSystemActivityDialog(QWidget *parent = NULL);
+ KSystemActivityDialog(QWidget *parent = nullptr);
/** Show the dialog and set the focus
*
diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp
index 172722c6..cf04f7a9 100644
--- a/wallpapers/image/image.cpp
+++ b/wallpapers/image/image.cpp
@@ -63,8 +63,8 @@ Image::Image(QObject *parent)
m_dirWatch(new KDirWatch(this)),
m_mode(SingleImage),
m_currentSlide(-1),
- m_model(0),
- m_dialog(0)
+ m_model(nullptr),
+ m_dialog(nullptr)
{
m_wallpaperPackage = \
KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Wallpaper/Images"));
@@ -656,7 +656,7 @@ void Image::showFileDialog()
imageGlobPatterns << mime.globPatterns();
}
- m_dialog = new QFileDialog(0, i18n("Open Image"),
+ m_dialog = new QFileDialog(nullptr, i18n("Open Image"),
path,
i18n("Image Files") + " \
("+imageGlobPatterns.join(' ') + ')');
//i18n people, this isn't a "word puzzle". there is a specific string format \
for QFileDialog::setNameFilters @@ -672,7 +672,7 @@ void Image::showFileDialog()
void Image::fileDialogFinished()
{
- m_dialog = 0;
+ m_dialog = nullptr;
}
void Image::wallpaperBrowseCompleted()
@@ -770,7 +770,7 @@ void Image::openSlide()
// open in image viewer
QUrl filepath(m_wallpaperPackage.filePath("preferred"));
qCDebug(IMAGEWALLPAPER) << "opening file " << filepath.path();
- new KRun(filepath, NULL);
+ new KRun(filepath, nullptr);
}
void Image::pathCreated(const QString &path)
diff --git a/xembed-sni-proxy/fdoselectionmanager.cpp \
b/xembed-sni-proxy/fdoselectionmanager.cpp index 7321287e..90703083 100644
--- a/xembed-sni-proxy/fdoselectionmanager.cpp
+++ b/xembed-sni-proxy/fdoselectionmanager.cpp
@@ -94,7 +94,7 @@ bool FdoSelectionManager::addDamageWatch(xcb_window_t client)
m_damageWatches[client] = damageId;
xcb_damage_create(c, damageId, client, XCB_DAMAGE_REPORT_LEVEL_NON_EMPTY);
- xcb_generic_error_t *error = Q_NULLPTR;
+ xcb_generic_error_t *error = nullptr;
QScopedPointer<xcb_get_window_attributes_reply_t, QScopedPointerPodDeleter> \
attr(xcb_get_window_attributes_reply(c, attribsCookie, &error));
QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> \
getAttrError(error); uint32_t events = XCB_EVENT_MASK_STRUCTURE_NOTIFY;
diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
index 932109d9..c2ba4607 100644
--- a/xembed-sni-proxy/sniproxy.cpp
+++ b/xembed-sni-proxy/sniproxy.cpp
@@ -94,7 +94,7 @@ SNIProxy::SNIProxy(xcb_window_t wid, QObject* parent):
auto cookie = xcb_get_geometry(c, m_windowId);
QScopedPointer<xcb_get_geometry_reply_t, QScopedPointerPodDeleter>
- clientGeom(xcb_get_geometry_reply(c, cookie, Q_NULLPTR));
+ clientGeom(xcb_get_geometry_reply(c, cookie, nullptr));
//create a container window
auto screen = xcb_setup_roots_iterator (xcb_get_setup (c)).data;
@@ -129,7 +129,7 @@ SNIProxy::SNIProxy(xcb_window_t wid, QObject* parent):
const uint32_t stackBelowData[] = {XCB_STACK_MODE_BELOW};
xcb_configure_window(c, m_containerWid, XCB_CONFIG_WINDOW_STACK_MODE, \
stackBelowData);
- NETWinInfo wm(c, m_containerWid, screen->root, 0, 0);
+ NETWinInfo wm(c, m_containerWid, screen->root, NET::Properties(), \
NET::Properties2()); wm.setOpacity(0);
#endif
@@ -279,7 +279,7 @@ QImage SNIProxy::getImageNonComposite() const
auto c = QX11Info::connection();
auto cookie = xcb_get_geometry(c, m_windowId);
QScopedPointer<xcb_get_geometry_reply_t, QScopedPointerPodDeleter>
- geom(xcb_get_geometry_reply(c, cookie, Q_NULLPTR));
+ geom(xcb_get_geometry_reply(c, cookie, nullptr));
if (!geom) {
return QImage();
@@ -458,7 +458,7 @@ void SNIProxy::sendClick(uint8_t mouseButton, int x, int y)
auto cookieSize = xcb_get_geometry(c, m_windowId);
QScopedPointer<xcb_get_geometry_reply_t, QScopedPointerPodDeleter>
- clientGeom(xcb_get_geometry_reply(c, cookieSize, Q_NULLPTR));
+ clientGeom(xcb_get_geometry_reply(c, cookieSize, nullptr));
if (!clientGeom) {
return;
@@ -466,7 +466,7 @@ void SNIProxy::sendClick(uint8_t mouseButton, int x, int y)
auto cookie = xcb_query_pointer(c, m_windowId);
QScopedPointer<xcb_query_pointer_reply_t, QScopedPointerPodDeleter>
- pointer(xcb_query_pointer_reply(c, cookie, Q_NULLPTR));
+ pointer(xcb_query_pointer_reply(c, cookie, nullptr));
/*qCDebug(SNIPROXY) << "samescreen" << pointer->same_screen << endl
<< "root x*y" << pointer->root_x << pointer->root_y << endl
<< "win x*y" << pointer->win_x << pointer->win_y;*/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic