From 099f49db36011b45bd6ca239e6aea7d0a63c05b0 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 29 Aug 2023 18:06:09 +0300
Subject: [PATCH] generic: replace QLabel with the new KPixmapWidget class

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdeui/dialogs/ktip.cpp      | 30 ++++++++++----------
 kutils/kpluginselector.cpp  | 56 ++++++++++++++++++-------------------
 kutils/ksettings/dialog.cpp | 38 ++++++++++++-------------
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/kdeui/dialogs/ktip.cpp b/kdeui/dialogs/ktip.cpp
index 6a694695..94a80420 100644
--- a/kdeui/dialogs/ktip.cpp
+++ b/kdeui/dialogs/ktip.cpp
@@ -25,6 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include "ktip.h"
+#include "kaboutdata.h"
+#include "kconfig.h"
+#include "kdebug.h"
+#include "kglobalsettings.h"
+#include "kcomponentdata.h"
+#include "klocale.h"
+#include "kpushbutton.h"
+#include "krandom.h"
+#include "kseparator.h"
+#include "kstandarddirs.h"
+#include "kpixmapwidget.h"
 
 #include <QtCore/QFile>
 #include <QtGui/QCheckBox>
@@ -33,17 +44,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QtGui/QLayout>
 #include <QtGui/QTextBrowser>
 
-#include <kaboutdata.h>
-#include <kconfig.h>
-#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kpushbutton.h>
-#include <krandom.h>
-#include <kseparator.h>
-#include <kstandarddirs.h>
-
 class KTipDatabase::Private
 {
 public:
@@ -287,10 +287,10 @@ KTipDialog::KTipDialog(KTipDatabase *database, QWidget *parent)
 
     browserLayout->addWidget(d->tipText);
 
-    QLabel *label = new QLabel(this);
-    label->setPixmap(KStandardDirs::locate("data", "kdeui/pics/ktip-bulb.png"));
-    label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-    browserLayout->addWidget(label);
+    KPixmapWidget *pixWidget = new KPixmapWidget(this);
+    pixWidget->setPixmap(KStandardDirs::locate("data", "kdeui/pics/ktip-bulb.png"));
+    pixWidget->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+    browserLayout->addWidget(pixWidget);
 
     if (!isTipDialog) {
         resize(520, 280);
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index a69415aa..df077be8 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -20,30 +20,30 @@
 
 #include "kpluginselector.h"
 #include "kpluginselector_p.h"
+#include "kdebug.h"
+#include "klineedit.h"
+#include "kdialog.h"
+#include "kurllabel.h"
+#include "ktabwidget.h"
+#include "kcmoduleinfo.h"
+#include "kcmoduleproxy.h"
+#include "kmessagebox.h"
+#include "kpushbutton.h"
+#include "kiconloader.h"
+#include "kstandarddirs.h"
+#include "klocalizedstring.h"
+#include "kcategorydrawer.h"
+#include "kcategorizedview.h"
+#include "kcategorizedsortfilterproxymodel.h"
+#include "kaboutapplicationdialog.h"
+#include "kpixmapwidget.h"
 
-#include <QtGui/QLabel>
-#include <QtGui/QPainter>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QApplication>
-#include <QtGui/QCheckBox>
-#include <QtGui/qstyleoption.h>
-
-#include <kdebug.h>
-#include <klineedit.h>
-#include <kdialog.h>
-#include <kurllabel.h>
-#include <ktabwidget.h>
-#include <kcmoduleinfo.h>
-#include <kcmoduleproxy.h>
-#include <kmessagebox.h>
-#include <kpushbutton.h>
-#include <kiconloader.h>
-#include <kstandarddirs.h>
-#include <klocalizedstring.h>
-#include <kcategorydrawer.h>
-#include <kcategorizedview.h>
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kaboutapplicationdialog.h>
+#include <QLabel>
+#include <QPainter>
+#include <QBoxLayout>
+#include <QApplication>
+#include <QCheckBox>
+#include <QStyleOption>
 
 #define MARGIN 5
 
@@ -119,11 +119,11 @@ KPluginSelector::Private::DependenciesWidget::DependenciesWidget(QWidget *parent
     QVBoxLayout *dataLayout = new QVBoxLayout;
     dataLayout->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     layout->setAlignment(Qt::AlignLeft);
-    QLabel *label = new QLabel();
-    label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-    label->setPixmap(KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog));
-    label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    layout->addWidget(label);
+    KPixmapWidget *pixmap = new KPixmapWidget();
+    pixmap->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+    pixmap->setPixmap(KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog));
+    pixmap->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    layout->addWidget(pixmap);
     KUrlLabel *link = new KUrlLabel();
     link->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     link->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index 47043819..d477de03 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -23,17 +23,19 @@
 #include "dispatcher.h"
 //#include "componentsdialog_p.h"
 
-#include <klocale.h>
-#include <kservicegroup.h>
-#include <kdebug.h>
-#include <kservicetypetrader.h>
-#include <kconfig.h>
-#include <kstandarddirs.h>
-#include <kcomponentdata.h>
-#include <kiconloader.h>
-#include <QtCore/QFile>
-#include <QtGui/QCheckBox>
-#include <QtCore/QStack>
+#include "klocale.h"
+#include "kservicegroup.h"
+#include "kdebug.h"
+#include "kservicetypetrader.h"
+#include "kconfig.h"
+#include "kstandarddirs.h"
+#include "kcomponentdata.h"
+#include "kiconloader.h"
+#include "kpixmapwidget.h"
+
+#include <QFile>
+#include <QCheckBox>
+#include <QStack>
 
 uint qHash(const KCModuleInfo &info)
 {
@@ -230,19 +232,19 @@ KPageWidgetItem *DialogPrivate::createPageItem(KPageWidgetItem *parentItem,
     QWidget * page = new QWidget( q );
 
     QCheckBox *checkBox = new QCheckBox(i18n("Enable component"), page);
-    QLabel *iconLabel = new QLabel(page);
+    KPixmapWidget *iconWidget = new KPixmapWidget(page);
     QLabel *commentLabel = new QLabel(comment, page);
     commentLabel->setTextFormat(Qt::RichText);
     QVBoxLayout * layout = new QVBoxLayout(page);
     layout->addWidget(checkBox);
-    layout->addWidget(iconLabel);
+    layout->addWidget(iconWidget);
     layout->addWidget(commentLabel);
     layout->addStretch();
     page->setLayout(layout);
 
     KPageWidgetItem *item = new KPageWidgetItem(page, name);
     item->setIcon(KIcon(iconName));
-    iconLabel->setPixmap(item->icon().pixmap(128, 128));
+    iconWidget->setPixmap(item->icon().pixmap(128, 128));
     item->setProperty("_k_weight", weight);
     checkBoxForItem.insert(item, checkBox);
 
@@ -306,11 +308,9 @@ void DialogPrivate::parseGroupFile( const QString & filename )
 void DialogPrivate::createDialogFromServices()
 {
     Q_Q(Dialog);
-	// read .setdlg files
-	QString setdlgpath = KStandardDirs::locate( "appdata",
-                                                    KGlobal::mainComponent().componentName() + ".setdlg" );
-	const QStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata",
-			"ksettingsdialog/*.setdlg" );
+    // read .setdlg files
+    QString setdlgpath = KStandardDirs::locate( "appdata", KGlobal::mainComponent().componentName() + ".setdlg" );
+    const QStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata", "ksettingsdialog/*.setdlg" );
     if (!setdlgpath.isNull()) {
         parseGroupFile(setdlgpath);
     }