Update for recent TDENewStuff changes

8 files changed, 55 insertions, 55 deletions

diff --git a/chalk/TODO b/chalk/TODO
index 7cd95e6b..08f81a25 100644
--- a/chalk/TODO
+++ b/chalk/TODO
@@ -74,7 +74,7 @@ Import/Export
 User Interface
     * Add an explanatory textframe to the scaling filter combobox.
     * Add a good crosshair cursor and a crosshair cursor that extends to the rulers.
-    * Add a cheatsheet widget that integrates with knewstuff to have tutorials that people
+    * Add a cheatsheet widget that integrates with tdenewstuff to have tutorials that people
       can download and follow from Chalk.
     * Add opacity widget (One that grows more white or transparent (showing those gray blocks) based on the
 	  input)
diff --git a/doc/kexi/menus.docbook b/doc/kexi/menus.docbook
index 52fd26d9..f9f1f079 100644
--- a/doc/kexi/menus.docbook
+++ b/doc/kexi/menus.docbook
@@ -58,7 +58,7 @@
 	    </menuchoice>
 	  </term>
 	  <listitem>
-	    <para><action>Open the KNewStuff dialog</action> which
+	    <para><action>Open the TDENewStuff dialog</action> which
 	    allows you to download example databases via the
 	    Internet. This is currently not available for MS Windows.</para>
 	  </listitem>
diff --git a/kexi/main/configure.in.in b/kexi/main/configure.in.in
index 00c25f38..946a1396 100644
--- a/kexi/main/configure.in.in
+++ b/kexi/main/configure.in.in
@@ -1,48 +1,48 @@
 
 dnl ======================================
-dnl KNewStuff Configuration
+dnl TDENewStuff Configuration
 dnl ======================================
 dnl
 dnl Copyright (C) 2004 Josef Spillner <spillner@kde.org>
-dnl This file is to be used within KDE's build system.
-dnl It defines $(LIB_KNEWSTUFF) if knewstuff has been found,
-dnl and a HAVE_KNEWSTUFF #define statement is added.
+dnl This file is to be used within TDE's build system.
+dnl It defines $(LIB_TDENEWSTUFF) if tdenewstuff has been found,
+dnl and a HAVE_TDENEWSTUFF #define statement is added.
 dnl
 
-AC_MSG_CHECKING([for KDE library: knewstuff])
+AC_MSG_CHECKING([for TDE library: tdenewstuff])
 
-ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
-knewstuff_libraries=""
-knewstuff_includes=""
+ac_tdenewstuff_includes=NO ac_tdenewstuff_libraries=NO
+tdenewstuff_libraries=""
+tdenewstuff_includes=""
 
-AC_CACHE_VAL(ac_cv_have_knewstuff,
+AC_CACHE_VAL(ac_cv_have_tdenewstuff,
 [
-AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)
-ac_knewstuff_includes="$knewstuff_incdir"
+AC_FIND_FILE(tdenewstuff/downloaddialog.h, $kde_incdirs, tdenewstuff_incdir)
+ac_tdenewstuff_includes="$tdenewstuff_incdir"
 
-AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir)
-ac_knewstuff_libraries="$knewstuff_libdir"
+AC_FIND_FILE(libtdenewstuff.so, $kde_libdirs, tdenewstuff_libdir)
+ac_tdenewstuff_libraries="$tdenewstuff_libdir"
 
-if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO; then
-  ac_cv_have_knewstuff="have_knewstuff=no"
-  ac_knewstuff_notfound=""
+if test "$ac_tdenewstuff_includes" = NO || test "$ac_tdenewstuff_libraries" = NO; then
+  ac_cv_have_tdenewstuff="have_tdenewstuff=no"
+  ac_tdenewstuff_notfound=""
 else
-  have_knewstuff="yes"
+  have_tdenewstuff="yes"
 fi
 ])
 
-eval "$ac_cv_have_knewstuff"
+eval "$ac_cv_have_tdenewstuff"
 
-if test "$have_knewstuff" != yes; then
-  AC_MSG_RESULT([$have_knewstuff])
+if test "$have_tdenewstuff" != yes; then
+  AC_MSG_RESULT([$have_tdenewstuff])
 else
-  AC_MSG_RESULT([$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)])
+  AC_MSG_RESULT([$have_tdenewstuff (libraries $ac_tdenewstuff_libraries, headers $ac_tdenewstuff_includes)])
 
-dnl  AC_DEFINE_UNQUOTED(HAVE_KNEWSTUFF, 1, [Add KNewStuff functionality.])
-  CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
+dnl  AC_DEFINE_UNQUOTED(HAVE_TDENEWSTUFF, 1, [Add TDENewStuff functionality.])
+  CXXFLAGS="$CXXFLAGS -DHAVE_TDENEWSTUFF"
 
-  LIB_KNEWSTUFF='-lknewstuff'
-  AC_SUBST(LIB_KNEWSTUFF)
+  LIB_TDENEWSTUFF='-ltdenewstuff'
+  AC_SUBST(LIB_TDENEWSTUFF)
 fi
 
 AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],
@@ -51,7 +51,7 @@ AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],
   have_internal_feedback="no"
 )
 
-AC_MSG_CHECKING([for KDE library: kfeedbackwizard])
+AC_MSG_CHECKING([for TDE library: kfeedbackwizard])
 
 ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
 kfeedback_libraries=""
@@ -92,7 +92,7 @@ else
   use_kexifb="no"
   AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)])
 
-dnl  AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add KNewStuff functionality.])
+dnl  AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add TDENewStuff functionality.])
   CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
 
   LIB_KFEEDBACK='-lkfeedbackwizard'
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index d6b2cc16..69ac854b 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -118,8 +118,8 @@
 #include <kexicontexthelp.h>
 #endif
 
-#ifdef HAVE_KNEWSTUFF
-#include <knewstuff/downloaddialog.h>
+#ifdef HAVE_TDENEWSTUFF
+#include <tdenewstuff/downloaddialog.h>
 #include "kexinewstuff.h"
 #endif
 
@@ -533,7 +533,7 @@ void KexiMainWindowImpl::initActions()
 	action->setToolTip(i18n("Open an existing project"));
 	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));
 
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),
 		TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
 	action->setToolTip(i18n("Download example databases from the Internet"));
@@ -4612,7 +4612,7 @@ void KexiMainWindowImpl::addWindow( KMdiChildView* pView, int flags )
 /// TMP (until there's true template support)
 void KexiMainWindowImpl::slotGetNewStuff()
 {
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 	if(!d->newStuff)
 		d->newStuff = new KexiNewStuff(this);
 	d->newStuff->download();
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 83814f4e..8b1a66ab 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -76,7 +76,7 @@ public:
 		dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd));
 #endif
 		maximizeFirstOpenedChildFrm = false;
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 		newStuff = 0;
 #endif
 		mdiModeToSwitchAfterRestart = (KMdi::MdiMode)0;
@@ -574,7 +574,7 @@ void updatePropEditorDockWidthInfo() {
 
 		bool navWasVisibleBeforeProjectClosing : 1;
 		bool saveSettingsForShowProjectNavigator : 1;
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 		KexiNewStuff  *newStuff;
 #endif
 
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index c9013d25..3aed5172 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 
 #include <kdebug.h>
 #include <ktar.h>
@@ -31,9 +31,9 @@
 #include "kexinewstuff.h"
 
 KexiNewStuff::KexiNewStuff(TQWidget *parent)
- : KNewStuff( "kexi/template"
+ : TDENewStuff( "kexi template"
 #if KDE_IS_VERSION(3,3,0)
-	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
+	, "https://www.trinitydesktop.org/ocs/providers.xml"
 #endif
 	, parent)
 {
@@ -41,7 +41,7 @@ KexiNewStuff::KexiNewStuff(TQWidget *parent)
 	// fails to download something, it still marks the thing as
 	// successfully downloaded and therefore we arn't able to
 	// download it again :-/
-	TDEGlobal::config()->deleteGroup("KNewStuffStatus");
+	TDEGlobal::config()->deleteGroup("TDENewStuffStatus");
 }
 
 KexiNewStuff::~KexiNewStuff()
diff --git a/kexi/main/kexinewstuff.h b/kexi/main/kexinewstuff.h
index e2966841..a90693e3 100644
--- a/kexi/main/kexinewstuff.h
+++ b/kexi/main/kexinewstuff.h
@@ -17,14 +17,14 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 
 #ifndef KEXINEWSTUFF_H
 #define KEXINEWSTUFF_H
 
-#include "knewstuff/knewstuff.h"
+#include "tdenewstuff/knewstuff.h"
 
-class KexiNewStuff : public KNewStuff
+class KexiNewStuff : public TDENewStuff
 {
 	public:
 		KexiNewStuff(TQWidget *parent);
@@ -33,9 +33,9 @@ class KexiNewStuff : public KNewStuff
 		virtual bool install( const TQString &fileName );
 		virtual bool createUploadFile( const TQString &fileName );
 
-		//KNS::Engine*  customEngine() { return KNewStuff::engine(); }
+		//KNS::Engine*  customEngine() { return TDENewStuff::engine(); }
 };
 
 #endif
 
-#endif //HAVE_KNEWSTUFF
+#endif //HAVE_TDENEWSTUFF
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 18f19d68..7aea9b3a 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -36,16 +36,16 @@
 #include <tdetoolbar.h>
 
 #if KDE_IS_VERSION(3, 4, 0)
-  // The KNewStuffSecure we use internaly for the GetHotNewStuff-functionality
+  // 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 <knewstuff/provider.h>
-  #include <knewstuff/engine.h>
-  #include <knewstuff/downloaddialog.h>
-  #include <knewstuff/knewstuffsecure.h>
+  #include <tdenewstuff/provider.h>
+  #include <tdenewstuff/engine.h>
+  #include <tdenewstuff/downloaddialog.h>
+  #include <tdenewstuff/knewstuffsecure.h>
 #endif
 
 #include "scriptguiclient.h"
@@ -54,11 +54,11 @@
 namespace Kross { namespace Api {
 
 #ifdef KROSS_SUPPORT_NEWSTUFF
-class ScriptNewStuff : public KNewStuffSecure
+class ScriptNewStuff : public TDENewStuffSecure
 {
     public:
         ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *parentWidget = 0)
-            : KNewStuffSecure(type, parentWidget)
+            : TDENewStuffSecure(type, parentWidget)
             , m_scripguiclient(scripguiclient) {}
         virtual ~ScriptNewStuff() {}
     private:
@@ -321,7 +321,7 @@ void WdgScriptsManager::slotGetNewScript()
 {
 #ifdef KROSS_SUPPORT_NEWSTUFF
     const TQString appname = TDEApplication::kApplication()->name();
-    const TQString type = TQString("%1/script").arg(appname);
+    const TQString type = TQString("%1 1.x script").arg(appname);
 
     if(! d->newstuff) {
         d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type);
@@ -336,17 +336,17 @@ void WdgScriptsManager::slotGetNewScript()
     TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)),
                      d, TQT_SLOT(slotProviders(Provider::List*)));
 
-    p->load(type, TQString("http://download.kde.org/khotnewstuff/%1scripts-providers.xml").arg(appname));
+    p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml");
     d->exec();
 #endif
 }
 
 void WdgScriptsManager::slotResourceInstalled()
 {
-    // Delete KNewStuff's configuration entries. These entries reflect what has
+    // Delete TDENewStuff's configuration entries. These entries reflect what has
     // already been installed. As we cannot yet keep them in sync after uninstalling
     // scripts, we deactivate the check marks entirely.
-    TDEGlobal::config()->deleteGroup("KNewStuffStatus");
+    TDEGlobal::config()->deleteGroup("TDENewStuffStatus");
 }
 
 }}