use KNewStuff3 instead of the deprecated KNewStuff2

svn path=/trunk/KDE/kdebase/apps/; revision=1060003

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de3e2863dcd64c0005d2bb41a4b6db6ef18947df..2b7a60e4f216cb6801addfab801111dd7b0b0143 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,7 +74,7 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF2_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
 if(X11_Xrender_FOUND)
   target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
 endif(X11_Xrender_FOUND)
@@ -201,7 +201,7 @@ target_link_libraries(dolphin
     ${KDE4_KUTILS_LIBRARY}
     konq
     dolphinprivate
-    knewstuff2
+    knewstuff3
     ${KDE4_PHONON_LIBS}
 )
 
@@ -280,7 +280,7 @@ kde4_add_plugin(kcm_dolphingeneral ${kcm_dolphingeneral_PART_SRCS})
 
 target_link_libraries(kcm_dolphinviewmodes  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
 target_link_libraries(kcm_dolphinnavigation  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
-target_link_libraries(kcm_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF2_LIBRARY} dolphinprivate)
+target_link_libraries(kcm_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate)
 target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)
 if (Nepomuk_FOUND)
   target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_LIBRARIES})

diff --git a/src/settings/servicessettingspage.cpp b/src/settings/servicessettingspage.cpp
index 9088366a8098e5a6109e59a0e913fbbaad109aec..a5e19725a51046261d33594940978214480b83dd 100644 (file)
--- a/src/settings/servicessettingspage.cpp
+++ b/src/settings/servicessettingspage.cpp
@@ -24,7 +24,7 @@
 #include <kdesktopfileactions.h>
 #include <kicon.h>
 #include <klocale.h>
-#include <knewstuff2/engine.h>
+#include <knewstuff3/knewstuffbutton.h>
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <kstandarddirs.h>
@@ -53,9 +53,10 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
     connect(m_servicesList, SIGNAL(itemClicked(QListWidgetItem*)),
             this, SIGNAL(changed()));
 
-    QPushButton* downloadButton = new QPushButton(i18nc("@action:button", "Download New Services..."));
-    downloadButton->setIcon(KIcon("get-hot-new-stuff"));
-    connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadNewServices()));
+    KNS3::Button* downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."),
+                                                    "servicemenu.knsrc",
+                                                    this);
+    connect(downloadButton, SIGNAL(dialogFinished(const Entry::List&)), this, SLOT(loadServices()));
 
     topLayout->addWidget(label);
     topLayout->addWidget(m_servicesList);
@@ -129,14 +130,6 @@ void ServicesSettingsPage::loadServices()
     }
 }
 
-void ServicesSettingsPage::downloadNewServices()
-{
-    KNS::Engine khns(this);
-    khns.init("servicemenu.knsrc");
-    khns.downloadDialogModal(this);
-    loadServices();
-}
-
 bool ServicesSettingsPage::isInServicesList(const QString& service) const
 {
     const int count = m_servicesList->count();

diff --git a/src/settings/servicessettingspage.h b/src/settings/servicessettingspage.h
index 359cc77ad6465da3334476f9d72cb1f8fa7b14a4..9a3832e7076ecf00285cae517ed6528c2d1d7971 100644 (file)
--- a/src/settings/servicessettingspage.h
+++ b/src/settings/servicessettingspage.h
@@ -49,11 +49,6 @@ private slots:
      */
     void loadServices();
 
-    /**
-     * Opens KHotNewStuff to download new services.
-     */
-    void downloadNewServices();
-
     bool isInServicesList(const QString& service) const;
 
 private: