From e189969fd13d87f6d435fc23638cfb5520a4458a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sat, 4 May 2019 22:25:48 +0000
Subject: [PATCH] generic: various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 kcddb/libkcddb/cdinfodialog.cpp             |  4 ++--
 kdeui/widgets/kcmodule.cpp                  | 12 ++++--------
 kdeui/widgets/kmenu.cpp                     |  2 +-
 plasma/widgets/busywidget.cpp               |  2 +-
 solid/solid/backends/fakehw/fakemanager.cpp |  6 ++----
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/kcddb/libkcddb/cdinfodialog.cpp b/kcddb/libkcddb/cdinfodialog.cpp
index 16a10bb2..cab78c11 100644
--- a/kcddb/libkcddb/cdinfodialog.cpp
+++ b/kcddb/libkcddb/cdinfodialog.cpp
@@ -151,10 +151,10 @@ class CDInfoDialog::Private
           QList<QStandardItem *> trackItems = QList<QStandardItem *>();
           TrackInfo ti(info.track(i));
           QStandardItem *trackNumberItem = new QStandardItem(QString().sprintf("%02d", i + 1));
-          trackNumberItem->setEditable(FALSE);
+          trackNumberItem->setEditable(false);
           trackItems << trackNumberItem;
           QStandardItem *trackLengthItem = new QStandardItem(framesTime(trackStartFrames[i + 1] - trackStartFrames[i]));
-          trackLengthItem->setEditable(FALSE);
+          trackLengthItem->setEditable(false);
           trackItems << trackLengthItem;
           QStandardItem *trackTitleItem = new QStandardItem(ti.get(Title).toString());
           trackItems << trackTitleItem;
diff --git a/kdeui/widgets/kcmodule.cpp b/kdeui/widgets/kcmodule.cpp
index b0591578..9839222a 100644
--- a/kdeui/widgets/kcmodule.cpp
+++ b/kdeui/widgets/kcmodule.cpp
@@ -178,24 +178,21 @@ KCModule::~KCModule()
 
 void KCModule::load()
 {
-    KConfigDialogManager* manager;
-    Q_FOREACH( manager , d->managers )
+    Q_FOREACH(KConfigDialogManager *manager , d->managers )
         manager->updateWidgets();
     emit( changed( false ));
 }
 
 void KCModule::save()
 {
-    KConfigDialogManager* manager;
-    Q_FOREACH( manager , d->managers )
+    Q_FOREACH(KConfigDialogManager *manager , d->managers )
         manager->updateSettings();
     emit( changed( false ));
 }
 
 void KCModule::defaults()
 {
-    KConfigDialogManager* manager;
-    Q_FOREACH( manager , d->managers )
+    Q_FOREACH(KConfigDialogManager *manager , d->managers )
         manager->updateWidgetsDefault();
 }
 
@@ -206,8 +203,7 @@ void KCModule::widgetChanged()
 
 bool KCModule::managedWidgetChangeState() const
 {
-    KConfigDialogManager* manager;
-    Q_FOREACH( manager , d->managers )
+    Q_FOREACH(KConfigDialogManager *manager , d->managers )
     {
         if ( manager->hasChanged() )
             return true;
diff --git a/kdeui/widgets/kmenu.cpp b/kdeui/widgets/kmenu.cpp
index e8c5a6ee..7ed59be4 100644
--- a/kdeui/widgets/kmenu.cpp
+++ b/kdeui/widgets/kmenu.cpp
@@ -298,7 +298,7 @@ void KMenu::keyPressEvent(QKeyEvent* e)
     d->keySeq += keyString;
     const int seqLen = d->keySeq.length();
 
-    foreach (a, actions()) {
+    foreach (QAction *a, actions()) {
         // don't search disabled entries
         if (!a->isEnabled())
             continue;
diff --git a/plasma/widgets/busywidget.cpp b/plasma/widgets/busywidget.cpp
index 036dc614..47895f0c 100644
--- a/plasma/widgets/busywidget.cpp
+++ b/plasma/widgets/busywidget.cpp
@@ -146,7 +146,7 @@ void BusyWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
     if (!d->running && d->svg->hasElement("paused")) {
         d->svg->paint(painter, spinnerRect, "paused");
     } else {
-        if (!d->frames[intRotation]) {
+        if (d->frames[intRotation].isNull()) {
             QPointF translatedPos(spinnerRect.width()/2, spinnerRect.height()/2);
 
             d->frames[intRotation] = QPixmap(spinnerRect.size().toSize());
diff --git a/solid/solid/backends/fakehw/fakemanager.cpp b/solid/solid/backends/fakehw/fakemanager.cpp
index 3636d1c5..a16f736a 100644
--- a/solid/solid/backends/fakehw/fakemanager.cpp
+++ b/solid/solid/backends/fakehw/fakemanager.cpp
@@ -164,8 +164,7 @@ FakeDevice *FakeManager::findDevice(const QString &udi)
 QStringList FakeManager::findDeviceStringMatch(const QString &key, const QString &value)
 {
     QStringList result;
-    FakeDevice *device;
-    foreach (device, d->loadedDevices)
+    foreach (FakeDevice *device, d->loadedDevices)
     {
         if (device->property(key).toString() == value)
         {
@@ -179,8 +178,7 @@ QStringList FakeManager::findDeviceStringMatch(const QString &key, const QString
 QStringList FakeManager::findDeviceByDeviceInterface(Solid::DeviceInterface::Type type)
 {
     QStringList result;
-    FakeDevice *device;
-    foreach (device, d->loadedDevices)
+    foreach (FakeDevice *device, d->loadedDevices)
     {
         if (device->queryDeviceInterface(type))
         {