Update for recent TDENewStuff changes

8 files changed, 12 insertions, 12 deletions

diff --git a/khangman/README.languages b/khangman/README.languages
index 0528405a..fd73ee5f 100644
--- a/khangman/README.languages
+++ b/khangman/README.languages
@@ -66,11 +66,11 @@ Note that you must use UTF-8 encoding when editing the files. If your editor can
 
      khangman
 
-7. Instead of committing your files, please sent them to me tarred and gzipped. As there are now twenty two languages, a   wizard (KNewStuff) is now included in KHangMan to easily download and install new languages that are placed on the website. This is done to reduce the size of the tdeedu module and it will also be done in KLettres, KStars and maybe KTouch.
+7. Instead of committing your files, please sent them to me tarred and gzipped. As there are now twenty two languages, a   wizard (TDENewStuff) is now included in KHangMan to easily download and install new languages that are placed on the website. This is done to reduce the size of the tdeedu module and it will also be done in KLettres, KStars and maybe KTouch.
  Please contact me by email (annemarie.mahfouf AT free DOT fr) if you need further information.
  When you send me the files, please don't forget to mention any special characters used in your language (put them in a text file, one per line and add this file in the tarball) and please mention any other specificity.
  Please never commit files in a BRANCH as it might break the game.
 
 Good luck and thanks!
 
-Last update: October 23rd 2004
\ No newline at end of file
+Last update: October 23rd 2004
diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am
index fbbd51d6..50652ad6 100644
--- a/khangman/khangman/Makefile.am
+++ b/khangman/khangman/Makefile.am
@@ -1,7 +1,7 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = khangman
 khangman_SOURCES = khangman.cpp main.cpp khangmanview.cpp prefs.kcfgc khnewstuff.cpp normal.ui advanced.ui timerdlg.ui timer.cpp  fontchecker.cpp 
-khangman_LDADD   =  $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la -lknewstuff
+khangman_LDADD   =  $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDENEWSTUFF) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la
 
 SUBDIRS = data pics sounds icons fonts
 
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 8d7d2b20..7c4d7039 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -224,7 +224,7 @@ void KHangMan::setLanguages()
 
     // Write the present languages in config so they cannot be downloaded.
     TDEConfig *config=kapp->config();
-    config->setGroup("KNewStuffStatus");
+    config->setGroup("TDENewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++) {
         TQString tmp = m_languages[i];
         if (!config->readEntry(tmp))
diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h
index 2ec8dfc0..9edca427 100644
--- a/khangman/khangman/khangman.h
+++ b/khangman/khangman/khangman.h
@@ -129,7 +129,7 @@ private slots:
 
     ///In Settings menu, Configure KHangMan... menu item
     void optionsPreferences();
-    ///access the KNewStuff class to install new data
+    ///access the TDENewStuff class to install new data
     void slotDownloadNewStuff();
     ///update settings after Settings->Configure KHangMan dialog is closed
     void updateSettings();
diff --git a/khangman/khangman/khangman.kcfg b/khangman/khangman/khangman.kcfg
index ff16a334..9916b5ed 100644
--- a/khangman/khangman/khangman.kcfg
+++ b/khangman/khangman/khangman.kcfg
@@ -93,10 +93,10 @@
         </entry>
     </group>
 
-    <group name="KNewStuff">
+    <group name="TDENewStuff">
         <entry name="ProvidersUrl" type="Path">
             <label>The Providers path for KHangMan</label>
-             <default code="true">"http://edu.kde.org/khangman/downloads/providers.xml"</default>
+             <default code="true">"https://www.trinitydesktop.org/ocs/providers.xml"</default>
         </entry> 
     </group>
 </kcfg>
diff --git a/khangman/khangman/khangmanrc b/khangman/khangman/khangmanrc
index 54e188d1..0585097f 100644
--- a/khangman/khangman/khangmanrc
+++ b/khangman/khangman/khangmanrc
@@ -1,2 +1,2 @@
-[KNewStuff]
-ProvidersUrl=http://edu.kde.org/khangman/downloads/providers.xml
+[TDENewStuff]
+ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml
diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp
index 94ce24e5..a3719a9a 100644
--- a/khangman/khangman/khnewstuff.cpp
+++ b/khangman/khangman/khnewstuff.cpp
@@ -33,7 +33,7 @@
 #include "khnewstuff.h"
 
 KHNewStuff::KHNewStuff( KHangManView *view ) :
-  KNewStuff( "khangman", view ),
+  TDENewStuff( "khangman", view ),
   m_view( view )
 {
 }
diff --git a/khangman/khangman/khnewstuff.h b/khangman/khangman/khnewstuff.h
index a80652ed..388bf2e3 100644
--- a/khangman/khangman/khnewstuff.h
+++ b/khangman/khangman/khnewstuff.h
@@ -24,12 +24,12 @@
 #ifndef KHNEWSTUFF_H
 #define KHNEWSTUFF_H
 
-#include "knewstuff/knewstuff.h"
+#include "tdenewstuff/knewstuff.h"
 #include "khangman.h"
 
 class KHangMan;
 
-class KHNewStuff : public KNewStuff
+class KHNewStuff : public TDENewStuff
 {
   public:
     KHNewStuff( KHangManView * );