From 23479d802aeefcd093f4f93eaed9c9faa9c96d50 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 30 Aug 2023 04:29:08 +0300
Subject: [PATCH] keditfiletype: remove bits for always false condition

the iconLabel member is always null

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 keditfiletype/filetypedetails.cpp |  6 +---
 keditfiletype/filetypedetails.h   | 47 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/keditfiletype/filetypedetails.cpp b/keditfiletype/filetypedetails.cpp
index f98d225a..1b3b7e35 100644
--- a/keditfiletype/filetypedetails.cpp
+++ b/keditfiletype/filetypedetails.cpp
@@ -69,7 +69,6 @@ FileTypeDetails::FileTypeDetails( QWidget * parent )
   iconButton->setWhatsThis( i18n("This button displays the icon associated"
                                 " with the selected file type. Click on it to choose a different icon.") );
   iconButton->setFixedSize(70, 70);
-  iconLabel = 0;
   hBox->addWidget(iconButton);
 
   QGroupBox *gb = new QGroupBox(i18n("Filename Patterns"), firstWidget);
@@ -321,10 +320,7 @@ void FileTypeDetails::setMimeTypeData( MimeTypeData * mimeTypeData, TypesListIte
   m_item = item; // can be 0
   Q_ASSERT(mimeTypeData);
   m_mimeTypeLabel->setText(i18n("File type %1", mimeTypeData->name()));
-  if (iconButton)
-      iconButton->setIcon(mimeTypeData->icon());
-  else
-      iconLabel->setPixmap(DesktopIcon(mimeTypeData->icon()));
+  iconButton->setIcon(mimeTypeData->icon());
   description->setText(mimeTypeData->comment());
   m_rbGroupSettings->setText( i18n("Use settings for '%1' group", mimeTypeData->majorType() ) );
   extensionLB->clear();
diff --git a/keditfiletype/filetypedetails.h b/keditfiletype/filetypedetails.h
index 7cead75a..7aaa51e8 100644
--- a/keditfiletype/filetypedetails.h
+++ b/keditfiletype/filetypedetails.h
@@ -43,9 +43,9 @@ class KServiceListWidget;
  */
 class FileTypeDetails : public QWidget
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
-  FileTypeDetails(QWidget *parent = 0);
+    FileTypeDetails(QWidget *parent = 0);
 
     /**
      * Set a non-gui "mimetype data" to work on,
@@ -59,21 +59,21 @@ public:
     void refresh();
 
 protected:
-  void updateRemoveButton();
-  void updateAskSave();
+    void updateRemoveButton();
+    void updateAskSave();
 
 Q_SIGNALS:
-  void embedMajor(const QString &major, bool &embed); // To adjust whether major type is being embedded
-  void changed(bool);
+    void embedMajor(const QString &major, bool &embed); // To adjust whether major type is being embedded
+    void changed(bool);
 
 protected Q_SLOTS:
-  void updateIcon(const QString &icon);
-  void updateDescription(const QString &desc);
-  void addExtension();
-  void removeExtension();
-  void enableExtButtons();
-  void slotAutoEmbedClicked(int button);
-  void slotAskSaveToggled(bool);
+    void updateIcon(const QString &icon);
+    void updateDescription(const QString &desc);
+    void addExtension();
+    void removeExtension();
+    void enableExtButtons();
+    void slotAutoEmbedClicked(int button);
+    void slotAskSaveToggled(bool);
 
 private:
     MimeTypeData* m_mimeTypeData;
@@ -85,19 +85,18 @@ private:
 
     // First tab - General
     KIconButton* iconButton;
-    QLabel* iconLabel; // if icon cannot be changed
 
-  QListWidget *extensionLB;
-  KPushButton *addExtButton, *removeExtButton;
-  KLineEdit *description;
-  KServiceListWidget *serviceListWidget;
+    QListWidget *extensionLB;
+    KPushButton *addExtButton, *removeExtButton;
+    KLineEdit *description;
+    KServiceListWidget *serviceListWidget;
 
-  // Second tab - Embedding
-  QGroupBox *m_autoEmbedBox;
-  QButtonGroup *m_autoEmbedGroup;
-  KServiceListWidget *embedServiceListWidget;
-  QCheckBox *m_chkAskSave;
-  QRadioButton *m_rbGroupSettings;
+    // Second tab - Embedding
+    QGroupBox *m_autoEmbedBox;
+    QButtonGroup *m_autoEmbedGroup;
+    KServiceListWidget *embedServiceListWidget;
+    QCheckBox *m_chkAskSave;
+    QRadioButton *m_rbGroupSettings;
 };
 
 #endif