Branch: master

9a79f045 2014-10-02 18:30:56 François Andriot 
Update for recent TDENewStuff changes
M doc/khangman/index.docbook
M kanagram/src/newstuff.cpp
M kanagram/src/newstuffdialog.cpp
M kanagram/src/newstuffdialog.h
M keduca/TODO
M khangman/README.languages
M khangman/khangman/Makefile.am
M khangman/khangman/khangman.cpp
M khangman/khangman/khangman.h
M khangman/khangman/khangman.kcfg
M khangman/khangman/khangmanrc
M khangman/khangman/khnewstuff.cpp
M khangman/khangman/khnewstuff.h
M klettres/klettres/Makefile.am
M klettres/klettres/klettres.cpp
M klettres/klettres/klettres.h
M klettres/klettres/klettresrc
M klettres/klettres/klnewstuff.cpp
M klettres/klettres/klnewstuff.h
M kstars/kstars/Makefile.am
M kstars/kstars/ksnewstuff.cpp
M kstars/kstars/ksnewstuff.h
M kstars/kstars/kstars.h
M kstars/kstars/kstarsrc
M kturtle/TODO
M kvoctrain/kvoctrain/Makefile.am
M kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
M kvoctrain/kvoctrain/kva_io.cpp
M kvoctrain/kvoctrain/kvoctrain.h
M kvoctrain/kvoctrain/kvoctrainrc
M kvoctrain/kvoctrain/kvtnewstuff.cpp
M kvoctrain/kvoctrain/kvtnewstuff.h
M kwordquiz/src/Makefile.am
M kwordquiz/src/kwordquiz.kcfg
M kwordquiz/src/kwordquizrc
M kwordquiz/src/kwqnewstuff.cpp
M kwordquiz/src/kwqnewstuff.h
 
diff --git a/doc/khangman/index.docbook b/doc/khangman/index.docbook
index 4a9e3ef..0579178 100644
--- a/doc/khangman/index.docbook
+++ b/doc/khangman/index.docbook
@@ -455,7 +455,7 @@
 <guimenu>Game</guimenu>
 <guimenuitem>Get Words in New Language...</guimenuitem>
 </menuchoice></term>
-<listitem><para><action>Display</action> the KNewStuff dialog which lists all the data available in the different languages. </para></listitem>
+<listitem><para><action>Display</action> the TDENewStuff dialog which lists all the data available in the different languages. </para></listitem>
 </varlistentry>
 <varlistentry>
 <term><menuchoice>
@@ -713,7 +713,7 @@
 </step>
 <step><para>Instead of committing your files, please sent them to
 &Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail; tarred and gzipped. As there are
-now twenty three languages, a wizard (KNewStuff) is now included in &khangman;
+now twenty three 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;.
@@ -737,7 +737,7 @@
 The English language (default) and the user language from his i18n package(s) (if available) are stored in <filename class="directory">$TDEDIR/share/apps/khangman</filename>.
 </para>
 <para>
-In the configuration file, stored for each user in his <filename>~/.trinity/share/config/khangmanrc</filename> are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the KNewStuff dialog.
+In the configuration file, stored for each user in his <filename>~/.trinity/share/config/khangmanrc</filename> are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the TDENewStuff dialog.
 </para>
 </sect1>
 <sect1 id="planned-features">
diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp
index 84a0743..7293775 100644
--- a/kanagram/src/newstuff.cpp
+++ b/kanagram/src/newstuff.cpp
@@ -4,8 +4,8 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <knewstuff/downloaddialog.h>
-#include <knewstuff/knewstuff.h>
+#include <tdenewstuff/downloaddialog.h>
+#include <tdenewstuff/knewstuff.h>
 #include <tdelocale.h>
 
 #include "kanagramsettings.h"
diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp
index 572ec03..ac8d1d7 100644
--- a/kanagram/src/newstuffdialog.cpp
+++ b/kanagram/src/newstuffdialog.cpp
@@ -1,7 +1,7 @@
 #include "newstuffdialog.h"
 
-#include <knewstuff/knewstuff.h>
-#include <knewstuff/entry.h>
+#include <tdenewstuff/knewstuff.h>
+#include <tdenewstuff/entry.h>
 #include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
@@ -9,7 +9,7 @@
 
 #include "kanagramsettings.h"
 
-NewStuffDialog::NewStuffDialog() : KNewStuff("kanagram/vocabulary", "http://kde-edu.org/kanagram/" + KanagramSettings::dataLanguage() + ".xml")
+NewStuffDialog::NewStuffDialog() : TDENewStuff("kanagram", "https://www.trinitydesktop.org/ocs/providers.xml")
 {
 }
 
diff --git a/kanagram/src/newstuffdialog.h b/kanagram/src/newstuffdialog.h
index 7c61f12..07d727e 100644
--- a/kanagram/src/newstuffdialog.h
+++ b/kanagram/src/newstuffdialog.h
@@ -1,9 +1,9 @@
 #ifndef NEWSTUFFDIALOG_H
 #define NEWSTUFFDIALOG_H
 
-#include <knewstuff/knewstuff.h>
+#include <tdenewstuff/knewstuff.h>
 
-class NewStuffDialog : public KNewStuff
+class NewStuffDialog : public TDENewStuff
 {
 	public:
 		NewStuffDialog();
diff --git a/keduca/TODO b/keduca/TODO
index 887e103..bfb7767 100644
--- a/keduca/TODO
+++ b/keduca/TODO
@@ -4,7 +4,7 @@
     -> "Explain" feature
 
   Things that NEED to be done before KDE 3.4:
-    -> Use KNewStuff
+    -> Use TDENewStuff
     -> Go through all reports in b.k.o and fix what can be fixed
 
   Things that would be nice to have done for KDE 3.4:
diff --git a/khangman/README.languages b/khangman/README.languages
index 0528405..fd73ee5 100644
--- a/khangman/README.languages
+++ b/khangman/README.languages
@@ -66,11 +66,11 @@
 
      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 fbbd51d..50652ad 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 8d7d2b2..7c4d703 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -224,7 +224,7 @@
 
     // 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 2ec8dfc..9edca42 100644
--- a/khangman/khangman/khangman.h
+++ b/khangman/khangman/khangman.h
@@ -129,7 +129,7 @@
 
     ///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 ff16a33..9916b5e 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 54e188d..0585097 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 94ce24e..a3719a9 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 a80652e..388bf2e 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 * );
diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am
index 4bf8aa6..168efc4 100644
--- a/klettres/klettres/Makefile.am
+++ b/klettres/klettres/Makefile.am
@@ -4,7 +4,7 @@
 ## INCLUDES were found outside tdevelop specific part
 
 klettres_SOURCES = fontsdlg.ui klettres.cpp klnewstuff.cpp main.cpp klettresview.cpp soundfactory.cpp prefs.kcfgc timerdlg.ui timer.cpp
-klettres_LDADD   = $(LIB_TDEUI) -lknewstuff
+klettres_LDADD   = $(LIB_TDEUI) $(LIB_TDENEWSTUFF)
 
 SUBDIRS = pics data icons
 
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index 9c63579..e899be0 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -122,7 +122,7 @@
     m_languages.sort();
     //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];
diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h
index 6814723..4102cd8 100644
--- a/klettres/klettres/klettres.h
+++ b/klettres/klettres/klettres.h
@@ -119,7 +119,7 @@
      * @param id The id of the new level
      */
     void updateLevMenu(int id);
-    ///Create a KNewStuff instance
+    ///Create a TDENewStuff instance
 ** Diff limit reached (max: 250 lines) **