Update for recent TDENewStuff changes

7 files changed, 13 insertions, 13 deletions

diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am
index 236a4cfd..24aa6427 100644
--- a/kvoctrain/kvoctrain/Makefile.am
+++ b/kvoctrain/kvoctrain/Makefile.am
@@ -13,7 +13,7 @@ spotlight2kvtml_LDADD =  $(LIB_TDECORE)
 kvoctrain_LDADD = ./docprop-dialogs/libdocpropdlg.la \
 	./entry-dialogs/libentrydlg.la ./kvt-core/libkvoctraincore.la ./kvt-core/kvt-xml/libkvtxml.la \
 	./query-dialogs/libquerydlg.la ./statistik-dialogs/libstatdlg.la ./common-dialogs/libcommondlg.la \
-	-lknewstuff $(LIB_TDEPRINT)
+	$(LIB_TDENEWSTUFF) $(LIB_TDEPRINT)
 
 EXTRA_DIST = kvoctrainui.rc
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
index 2eef8ebd..dd8732a5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
@@ -246,10 +246,10 @@
       <default param="7">10368000</default>
     </entry>
   </group>
-  <group name="KNewStuff">
+  <group name="TDENewStuff">
     <entry name="ProvidersUrl" type="Path">
        <label>The Providers path for KVocTrain</label>
-         <default>"http://edu.kde.org/kvoctrain/providers.xml"</default>
+         <default>"https://www.trinitydesktop.org/ocs/providers.xml"</default>
     </entry>
     <entry name="InstallationCommand" type="String">
        <label>The command used to start a downloaded vocabulary</label>
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 2d11c055..f227b4ac 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -35,7 +35,7 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <knewstuff/downloaddialog.h>
+#include <tdenewstuff/downloaddialog.h>
 
 #include "kvoctrain.h"
 #include "UsageManager.h"
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index 60e30731..689ab22d 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -291,7 +291,7 @@ private:
   // correct_0_times, we simply reuse random_expr1.
   vector<QueryEntryRef> correct_1_times, correct_2_times, correct_3_times;
   QuerySelection queryList;
-  //KNewStuff       *m_GHNS;
+  //TDENewStuff       *m_GHNS;
   TQTimer          *btimer;
   int              random_query_nr;
   bool             querymode;
diff --git a/kvoctrain/kvoctrain/kvoctrainrc b/kvoctrain/kvoctrain/kvoctrainrc
index f9839cc4..0585097f 100644
--- a/kvoctrain/kvoctrain/kvoctrainrc
+++ b/kvoctrain/kvoctrain/kvoctrainrc
@@ -1,2 +1,2 @@
-[KNewStuff]
-ProvidersUrl=http://edu.kde.org/contrib/kvtml/providers.xml
+[TDENewStuff]
+ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index 38338e43..ee680f9c 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -16,13 +16,13 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdemessagebox.h>
-#include <knewstuff/entry.h>
+#include <tdenewstuff/entry.h>
 
 #include "kvoctrain.h"
 #include "kvtnewstuff.h"
 #include "prefs.h"
 
-KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), KNewStuff("tdeedu/vocabulary", parent)
+KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), TDENewStuff("kwordquiz", parent)
 {
   m_app = (kvoctrainApp*) parent;
 }
@@ -53,7 +53,7 @@ TQString KVTNewStuff::destinationPath(KNS::Entry * entry)
     TQString file;
 
     if (path.isEmpty())
-      file = KNewStuff::downloadDestination(entry); //fall back on a temp file, should never happen
+      file = TDENewStuff::downloadDestination(entry); //fall back on a temp file, should never happen
     else
     {
       file = TQDir::home().path() + "/" + path + "/";
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h
index 4d901c00..fc7348ab 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.h
+++ b/kvoctrain/kvoctrain/kvtnewstuff.h
@@ -12,14 +12,14 @@
 #ifndef KVTNEWSTUFF_H
 #define KVTNEWSTUFF_H
 
-#include <knewstuff/knewstuff.h>
+#include <tdenewstuff/knewstuff.h>
 
 class kvoctrainApp;
 
 /**
 @author Peter Hedlund
 */
-class KVTNewStuff : public TQObject, public KNewStuff
+class KVTNewStuff : public TQObject, public TDENewStuff
 {
 Q_OBJECT
   
@@ -36,7 +36,7 @@ public:
 
   /**
     Creates a file suitable for upload.
-    Note that this method always fails, since using KNewStuffGeneric
+    Note that this method always fails, since using TDENewStuffGeneric
     means that the provided file must already be in a usable format.
 
     @param fileName the name of the file to upload after its creation