File 0001-Revert-Removed-usage-to-deprecated-interfa... of Package yakuake

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-Removed-usage-to-deprecated-interface.patch of Package yakuake (Revision caac55ee96e2fb62e3b0c86c9fd5674b)

Currently displaying revision caac55ee96e2fb62e3b0c86c9fd5674b , Show latest

From b2f1ecc408cf862d28c890770705f729256aed8e Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Wed, 5 Apr 2017 20:42:53 +0200
Subject: [PATCH] Revert "Removed usage to deprecated interface"

This reverts commit 15886b6a9c634ae3bde77af36a4090db472c97da to fix the
build with KDE Frameworks < 5.29.0.
---
 app/config/appearancesettings.cpp | 9 ++++-----
 app/config/appearancesettings.h   | 4 ++--
 app/config/skinlistdelegate.cpp   | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/config/appearancesettings.cpp b/app/config/appearancesettings.cpp
index c21ac33..730bfeb 100644
--- a/app/config/appearancesettings.cpp
+++ b/app/config/appearancesettings.cpp
@@ -30,8 +30,8 @@
 #include <KMessageBox>
 #include <KTar>
 
-#include <downloaddialog.h>
-#include <downloadmanager.h>
+#include <KNS3/DownloadDialog>
+#include <KNS3/DownloadManager>
 
 #include <QDir>
 #include <QDirIterator>
@@ -68,7 +68,7 @@ AppearanceSettings::AppearanceSettings(QWidget* parent) : QWidget(parent)
     ghnsButton->setIcon(QIcon(QStringLiteral("get-hot-new-stuff")));
 
     m_knsConfigFileName = QLatin1String("yakuake.knsrc");
-    m_knsDownloadManager = new KNSCore::DownloadManager(m_knsConfigFileName);
+    m_knsDownloadManager = new KNS3::DownloadManager(m_knsConfigFileName);
 
     connect(ghnsButton, &QPushButton::clicked, this, &AppearanceSettings::getNewSkins);
 
@@ -509,9 +509,8 @@ void AppearanceSettings::getNewSkins()
         quint32 invalidEntryCount = 0;
         QString invalidSkinText;
 
-        foreach (const KNS3::Entry &entry3, dialog->installedEntries())
+        foreach (const KNS3::Entry &entry, dialog->installedEntries())
         {
-            KNSCore::EntryInternal entry = KNSCore::EntryInternal::fromEntry(entry3);
             bool isValid = true;
             const QSet<QString>& skinIdList = extractKnsSkinIds(entry.installedFiles());
 
diff --git a/app/config/appearancesettings.h b/app/config/appearancesettings.h
index 5303f74..c226daf 100644
--- a/app/config/appearancesettings.h
+++ b/app/config/appearancesettings.h
@@ -35,7 +35,7 @@ class SkinListDelegate;
 class QStandardItem;
 class QStandardItemModel;
 
-namespace KNSCore
+namespace KNS3
 {
     class DownloadManager;
 }
@@ -134,7 +134,7 @@ class AppearanceSettings : public QWidget, private Ui::AppearanceSettings
         QStringList m_installSkinFileList;
 
         QString m_knsConfigFileName;
-        KNSCore::DownloadManager* m_knsDownloadManager;
+        KNS3::DownloadManager* m_knsDownloadManager;
 };
 
 #endif
diff --git a/app/config/skinlistdelegate.cpp b/app/config/skinlistdelegate.cpp
index d511c10..96876a4 100644
--- a/app/config/skinlistdelegate.cpp
+++ b/app/config/skinlistdelegate.cpp
@@ -57,7 +57,7 @@ void SkinListDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
 
 void SkinListDelegate::paintBackground(QPainter* painter, const QStyleOptionViewItem& option) const
 {
-    QStyleOptionViewItem opt = option;
+    QStyleOptionViewItemV4 opt = option;
     QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
     style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget);
 }
-- 
2.12.0

Places

File 0001-Revert-Removed-usage-to-deprecated-interface.patch of Package yakuake (Revision caac55ee96e2fb62e3b0c86c9fd5674b)

Places