remove knewstuff related cruft from plasma

plasma/CMakeLists.txt

@@ -3,7 +3,6 @@ kde4_no_enable_final(plasma)
 
 if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(PLASMA_NO_KDEWEBKIT TRUE)
-    set(PLASMA_NO_KNEWSTUFF TRUE)
     set(PLASMA_NO_SOLID TRUE)
     set(PLASMA_NO_KIO TRUE)
     set(PLASMA_NO_KUTILS TRUE)
@@ -29,11 +28,6 @@ if(NOT PLASMA_NO_KDEWEBKIT)
     set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} kdewebkit)
 endif(NOT PLASMA_NO_KDEWEBKIT)
 
-if(NOT PLASMA_NO_KNEWSTUFF)
-    include_directories(${CMAKE_SOURCE_DIR}/knewstuff/)
-    set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} knewstuff3)
-endif(NOT PLASMA_NO_KNEWSTUFF)
-
 if(NOT PLASMA_NO_SOLID)
     include_directories(${CMAKE_BINARY_DIR}/solid/)
     include_directories(${CMAKE_SOURCE_DIR}/solid/)
@@ -382,8 +376,6 @@ install(FILES
    data/services/plasma.protocol
    DESTINATION ${SERVICES_INSTALL_DIR})
 
-install(FILES data/knewstuff/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
-
 install(FILES data/operations/dataengineservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
 install(FILES data/operations/plasmoidservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
 install(FILES data/operations/storage.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)

plasma/config-plasma.h.cmake

@@ -1,5 +1,4 @@
 #cmakedefine PLASMA_NO_KDEWEBKIT
-#cmakedefine PLASMA_NO_KNEWSTUFF
 #cmakedefine PLASMA_NO_SOLID
 #cmakedefine PLASMA_NO_KIO
 #cmakedefine PLASMA_NO_KUTILS

plasma/data/knewstuff/plasmoids.knsrc

@@ -1,6 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=Plasmoid Script
-StandardResource=tmp
-InstallationCommand=plasmapkg -i %f
-UninstallCommand=plasmapkg -r %f

plasma/packagestructure.cpp

@@ -573,12 +573,6 @@ bool PackageStructure::uninstallPackage(const QString &packageName, const QStrin
     return Package::uninstallPackage(packageName, packageRoot, d->servicePrefix);
 }
 
-void PackageStructure::createNewWidgetBrowser(QWidget *parent)
-{
-    Q_UNUSED(parent)
-    emit newWidgetBrowserFinished();
-}
-
 QString PackageStructure::defaultPackageRoot() const
 {
     return d->packageRoot;

plasma/packagestructure.h

@@ -270,20 +270,6 @@ public:
      */
     virtual bool uninstallPackage(const QString &packageName, const QString &packageRoot);
 
-    /**
-     * When called, the package plugin should display a window to the user
-     * that they can use to browser, select and then install widgets supported by
-     * this package plugin with.
-     *
-     * The user interface may be an in-process dialog or an out-of-process application.
-     *
-     * When the process is complete, the newWidgetBrowserFinished() signal must be
-     * emitted.
-     *
-     * @param parent the parent widget to use for the widget
-     */
-    virtual void createNewWidgetBrowser(QWidget *parent = 0);
-
     /**
      * @return the prefix inserted between the base path and content entries
      * @deprecated use contentsPrefixPaths() instead.
@@ -323,12 +309,6 @@ public:
      */
     bool allowExternalPaths() const;
 
-Q_SIGNALS:
-    /**
-     * Emitted when the new widget browser process completes.
-     */
-    void newWidgetBrowserFinished();
-
 protected:
     /**
      * Sets whether or not external paths/symlinks can be followed by a package

plasma/private/packages.cpp

@@ -30,9 +30,6 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#ifndef PLASMA_NO_KNEWSTUFF
-#include <knewstuff3/downloaddialog.h>
-#endif
 
 #include "kdeclarative.h"
 
@@ -89,12 +86,6 @@ PlasmoidPackage::PlasmoidPackage(QObject *parent)
 
 PlasmoidPackage::~PlasmoidPackage()
 {
-#ifndef PLASMA_NO_KNEWSTUFF
-    if (!QCoreApplication::closingDown()) {
-        // let it "leak" on application close as this causes crashes otherwise, BUG 288153
-        delete m_knsDialog.data();
-    }
-#endif
 }
 
 void PlasmoidPackage::pathChanged()
@@ -108,22 +99,6 @@ void PlasmoidPackage::pathChanged()
     }
 }
 
-void PlasmoidPackage::createNewWidgetBrowser(QWidget *parent)
-{
-#ifndef PLASMA_NO_KNEWSTUFF
-    KNS3::DownloadDialog *knsDialog = m_knsDialog.data();
-    if (!knsDialog) {
-        m_knsDialog = knsDialog = new KNS3::DownloadDialog("plasmoids.knsrc", parent);
-        knsDialog->setProperty("DoNotCloseController", true);
-        connect(knsDialog, SIGNAL(accepted()), this, SIGNAL(newWidgetBrowserFinished()));
-	connect(knsDialog, SIGNAL(accepted()), knsDialog, SLOT(deleteLater()));
-    }
-
-    knsDialog->show();
-    knsDialog->raise();
-#endif
-}
-
 DataEnginePackage::DataEnginePackage(QObject *parent)
     : Plasma::PackageStructure(parent, QString("DataEngine"))
 {

plasma/private/packages_p.h

@@ -26,12 +26,6 @@
 
 #include "config-plasma.h"
 
-#ifndef PLASMA_NO_KNEWSTUFF
-namespace KNS3
-{
-    class DownloadDialog;
-} // namespace KNS
-#endif
 
 namespace Plasma
 {
@@ -42,15 +36,11 @@ class PlasmoidPackage : public PackageStructure
 public:
     explicit PlasmoidPackage(QObject *parent = 0);
     ~PlasmoidPackage();
-    void createNewWidgetBrowser(QWidget *parent = 0);
 
 protected:
     void pathChanged();
 
 private:
-#ifndef PLASMA_NO_KNEWSTUFF
-    QWeakPointer<KNS3::DownloadDialog> m_knsDialog;
-#endif
 };
 
 class DataEnginePackage : public PackageStructure