From 205fd169e5cead6874f1d564d44916dd1fa1ea63 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Wed, 9 Mar 2022 17:39:57 +0100
Subject: [PATCH] Port from KNS3::Button to KNSWidgets::Button

The former isn't available in KF6 anymore.
---
 src/kcmkwin/kwinscripts/CMakeLists.txt | 2 +-
 src/kcmkwin/kwinscripts/module.cpp     | 4 ++--
 src/kcmkwin/kwinscripts/module.ui      | 6 +++---
 src/kcmkwin/kwintabbox/CMakeLists.txt  | 2 +-
 src/kcmkwin/kwintabbox/main.cpp        | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/kcmkwin/kwinscripts/CMakeLists.txt b/src/kcmkwin/kwinscripts/CMakeLists.txt
index 489d8944cb..5d7508e895 100644
--- a/src/kcmkwin/kwinscripts/CMakeLists.txt
+++ b/src/kcmkwin/kwinscripts/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(kcm_kwin_scripts
 
     KF5::I18n
     KF5::KCMUtils
-    KF5::NewStuff
+    KF5::NewStuffWidgets
     KF5::Package
 )
 
diff --git a/src/kcmkwin/kwinscripts/module.cpp b/src/kcmkwin/kwinscripts/module.cpp
index aa4d94bba9..ebfe69b6f3 100644
--- a/src/kcmkwin/kwinscripts/module.cpp
+++ b/src/kcmkwin/kwinscripts/module.cpp
@@ -25,7 +25,7 @@
 #include <KPackage/PackageStructure>
 #include <KPluginFactory>
 
-#include <KNewStuff3/KNS3/Button>
+#include <KNSWidgets/Button>
 
 #include "kwinscriptsdata.h"
 #include "config-kwin.h"
@@ -53,7 +53,7 @@ Module::Module(QWidget *parent, const QVariantList &args) :
     ui->messageWidget->hide();
 
     ui->ghnsButton->setConfigFile(QStringLiteral("kwinscripts.knsrc"));
-    connect(ui->ghnsButton, &KNS3::Button::dialogFinished, this, [this](const KNS3::Entry::List &changedEntries) {
+    connect(ui->ghnsButton, &KNSWidgets::Button::dialogFinished, this, [this](const KNSCore::Entry::List &changedEntries) {
         if (!changedEntries.isEmpty()) {
             ui->scriptSelector->clear();
             updateListViewContents();
diff --git a/src/kcmkwin/kwinscripts/module.ui b/src/kcmkwin/kwinscripts/module.ui
index bddf078de9..d05323f2a5 100644
--- a/src/kcmkwin/kwinscripts/module.ui
+++ b/src/kcmkwin/kwinscripts/module.ui
@@ -62,7 +62,7 @@
       </widget>
      </item>
      <item>
-      <widget class="KNS3::Button" name="ghnsButton">
+      <widget class="KNSWidgets::Button" name="ghnsButton">
        <property name="text">
         <string>Get New Scripts...</string>
        </property>
@@ -80,9 +80,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KNS3::Button</class>
+   <class>KNSWidgets::Button</class>
    <extends>QPushButton</extends>
-   <header>KNS3/Button</header>
+   <header>KNSWidgets/Button</header>
   </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
diff --git a/src/kcmkwin/kwintabbox/CMakeLists.txt b/src/kcmkwin/kwintabbox/CMakeLists.txt
index fbf102ec66..07a93f9a58 100644
--- a/src/kcmkwin/kwintabbox/CMakeLists.txt
+++ b/src/kcmkwin/kwintabbox/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(kcm_kwintabbox
     KF5::GlobalAccel
     KF5::I18n
     KF5::KCMUtils
-    KF5::NewStuff
+    KF5::NewStuffWidgets
     KF5::Package
     KF5::Service
 
diff --git a/src/kcmkwin/kwintabbox/main.cpp b/src/kcmkwin/kwintabbox/main.cpp
index fcba5d9e88..220f718fb1 100644
--- a/src/kcmkwin/kwintabbox/main.cpp
+++ b/src/kcmkwin/kwintabbox/main.cpp
@@ -27,7 +27,7 @@
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KTitleWidget>
-#include <KNS3/Button>
+#include <KNSWidgets/Button>
 // Plasma
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
@@ -58,8 +58,8 @@ KWinTabBoxConfig::KWinTabBoxConfig(QWidget* parent, const QVariantList& args)
     tabWidget->addTab(m_primaryTabBoxUi, i18n("Main"));
     tabWidget->addTab(m_alternativeTabBoxUi, i18n("Alternative"));
 
-    KNS3::Button *ghnsButton = new KNS3::Button(i18n("Get New Task Switchers..."), QStringLiteral("kwinswitcher.knsrc"), this);
-    connect(ghnsButton, &KNS3::Button::dialogFinished, this, [this] (auto changedEntries) {
+    KNSWidgets::Button *ghnsButton = new KNSWidgets::Button(i18n("Get New Task Switchers..."), QStringLiteral("kwinswitcher.knsrc"), this);
+    connect(ghnsButton, &KNSWidgets::Button::dialogFinished, this, [this] (auto changedEntries) {
         if (!changedEntries.isEmpty()) {
             initLayoutLists();
         }