1 files changed, 4 insertions, 24 deletions
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 7abb6efb8..eb698c65c 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -35,25 +35,16 @@
 #include <tdestandarddirs.h>
 #include <tdetoolbar.h>
 
-#if KDE_IS_VERSION(3, 4, 0)
-  // The TDENewStuffSecure we use internaly for the GetHotNewStuff-functionality
-  // was introduced with KDE 3.4.
-  #define KROSS_SUPPORT_NEWSTUFF
-#endif
-
-#ifdef KROSS_SUPPORT_NEWSTUFF
-  #include <tdenewstuff/provider.h>
-  #include <tdenewstuff/engine.h>
-  #include <tdenewstuff/downloaddialog.h>
-  #include <tdenewstuff/knewstuffsecure.h>
-#endif
+#include <tdenewstuff/provider.h>
+#include <tdenewstuff/engine.h>
+#include <tdenewstuff/downloaddialog.h>
+#include <tdenewstuff/knewstuffsecure.h>
 
 #include "scriptguiclient.h"
 #include "scriptaction.h"
 
 namespace Kross { namespace Api {
 
-#ifdef KROSS_SUPPORT_NEWSTUFF
 class ScriptNewStuff : public TDENewStuffSecure
 {
     public:
@@ -65,7 +56,6 @@ class ScriptNewStuff : public TDENewStuffSecure
         ScriptGUIClient* m_scripguiclient;
         virtual void installResource() { m_scripguiclient->installScriptPackage( m_tarName ); }
 };
-#endif
 
 class ListItem : public TQListViewItem
 {
@@ -108,9 +98,7 @@ class WdgScriptsManagerPrivate
     friend class WdgScriptsManager;
     ScriptGUIClient* m_scripguiclient;
     ToolTip* m_tooltip;
-#ifdef KROSS_SUPPORT_NEWSTUFF
     ScriptNewStuff* newstuff;
-#endif
     //enum { LoadBtn = 0, UnloadBtn, InstallBtn, UninstallBtn, ExecBtn, NewStuffBtn };
 };
 
@@ -120,9 +108,7 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
 {
     d->m_scripguiclient = scr;
     d->m_tooltip = new ToolTip(scriptsList);
-#ifdef KROSS_SUPPORT_NEWSTUFF
     d->newstuff = 0;
-#endif
 
     scriptsList->header()->hide();
     //scriptsList->header()->setClickEnabled(false);
@@ -147,10 +133,8 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 ));
     connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
-#ifdef KROSS_SUPPORT_NEWSTUFF
     btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));
     connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
-#endif
 /*
     toolBar->setIconText( TDEToolBar::IconTextRight );
 
@@ -166,11 +150,9 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall"));
     toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
-#ifdef KROSS_SUPPORT_NEWSTUFF
     toolBar->insertLineSeparator();
     toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));
     toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
-#endif
 */
     connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ),
             this, TQ_SLOT( slotFillScriptsList() ));
@@ -319,7 +301,6 @@ void WdgScriptsManager::slotUnloadScript()
 
 void WdgScriptsManager::slotGetNewScript()
 {
-#ifdef KROSS_SUPPORT_NEWSTUFF
     const TQString appname = tdeApp->name();
     const TQString type = TQString("%1 1.x script").arg(appname);
 
@@ -338,7 +319,6 @@ void WdgScriptsManager::slotGetNewScript()
 
     p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml");
     d->exec();
-#endif
 }
 
 void WdgScriptsManager::slotResourceInstalled()