From 9a79f045fc413c4edcfe4635b9f0b44a9b35e153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Fri, 3 Oct 2014 01:30:56 +0200
Subject: Update for recent TDENewStuff changes

---
 kwordquiz/src/Makefile.am     | 2 +-
 kwordquiz/src/kwordquiz.kcfg  | 6 +++---
 kwordquiz/src/kwordquizrc     | 4 ++--
 kwordquiz/src/kwqnewstuff.cpp | 8 ++++----
 kwordquiz/src/kwqnewstuff.h   | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kwordquiz')

diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index ade96b7e..131e89a7 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -12,7 +12,7 @@ kwordquiz_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \
 			prefcharacterbase.ui paukerreader.cpp wqlreader.cpp wqlwriter.cpp wqundo.cpp prefs.kcfgc \
 		prefcardappearance.cpp prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h
 kwordquiz_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \
-	$(LIBSOCKET) $(LIB_TDEPRINT) -lknewstuff
+	$(LIBSOCKET) $(LIB_TDEPRINT) $(LIB_TDENEWSTUFF)
 
 
 EXTRA_DIST = main.cpp kwordquiz.cpp kwordquiz.h kwordquizdoc.cpp kwordquizdoc.h kwordquizview.cpp kwordquizview.h kwordquizui.rc kwordquizprefs.cpp kwordquizprefs.h
diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg
index 18554adc..3eacdf76 100644
--- a/kwordquiz/src/kwordquiz.kcfg
+++ b/kwordquiz/src/kwordquiz.kcfg
@@ -101,10 +101,10 @@
       <default code="true">Qt::blue</default>
     </entry>
   </group>
-  <group name="KNewStuff">
+  <group name="TDENewStuff">
     <entry name="ProvidersUrl" type="Path">
        <label>The Providers path for KWordQuiz</label>
-         <default code="true">"http://edu.kde.org/kvoctrain/providers.xml"</default>
+         <default code="true">"https://www.trinitydesktop.org/ocs/providers.xml"</default>
     </entry>
     <entry name="InstallationCommand" type="String">
        <label>The command used to start a downloaded vocabulary</label>
@@ -115,4 +115,4 @@
        <default>Vocabularies</default>
     </entry>
   </group>
-</kcfg>
\ No newline at end of file
+</kcfg>
diff --git a/kwordquiz/src/kwordquizrc b/kwordquiz/src/kwordquizrc
index 64f970aa..0585097f 100644
--- a/kwordquiz/src/kwordquizrc
+++ b/kwordquiz/src/kwordquizrc
@@ -1,2 +1,2 @@
-[KNewStuff]
-ProvidersUrl=http://edu.kde.org/contrib/kvtml/providers.xml
\ No newline at end of file
+[TDENewStuff]
+ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml
diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp
index c8bd08e1..2b547053 100644
--- a/kwordquiz/src/kwqnewstuff.cpp
+++ b/kwordquiz/src/kwqnewstuff.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          Implementation of KNewStuff
+                          Implementation of TDENewStuff
                              -------------------
     begin                : Thu Jun 02 13:12:30 PDT 2002
     copyright            : (C) 2005 by Peter Hedlund
@@ -21,13 +21,13 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdemessagebox.h>
-#include <knewstuff/entry.h>
+#include <tdenewstuff/entry.h>
 
 #include "kwordquiz.h"
 #include "kwqnewstuff.h"
 #include "prefs.h"
 
-KWQNewStuff::KWQNewStuff(TQWidget *parent, const char *name) : TQObject(), KNewStuff("tdeedu/vocabulary", parent)
+KWQNewStuff::KWQNewStuff(TQWidget *parent, const char *name) : TQObject(), TDENewStuff("kwordquiz", parent)
 {
   m_app = (KWordQuizApp *) parent;
 }
@@ -57,7 +57,7 @@ TQString KWQNewStuff::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/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h
index 7bf9074f..a740459f 100644
--- a/kwordquiz/src/kwqnewstuff.h
+++ b/kwordquiz/src/kwqnewstuff.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          Implementation of KNewStuff
+                          Implementation of TDENewStuff
                              -------------------
     begin                : Thu Jun 02 13:12:30 PDT 2002
     copyright            : (C) 2005 by Peter Hedlund
@@ -18,14 +18,14 @@
 #ifndef KWTQNEWSTUFF_H
 #define KWTQNEWSTUFF_H
 
-#include <knewstuff/knewstuff.h>
+#include <tdenewstuff/knewstuff.h>
 
 class KWordQuizApp;
 
 /**
 @author Peter Hedlund
 */
-class KWQNewStuff : public TQObject, public KNewStuff
+class KWQNewStuff : public TQObject, public TDENewStuff
 {
 Q_OBJECT
   
@@ -42,7 +42,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
-- 
cgit v1.2.1