Update for recent TDENewStuff changes

6 files changed, 27 insertions, 33 deletions

diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp
index d8e30dd..786eb98 100644
--- a/src/newstuff/dialog.cpp
+++ b/src/newstuff/dialog.cpp
@@ -26,8 +26,8 @@
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdeaccelmanager.h>
-#include <knewstuff/entry.h>
-#include <knewstuff/provider.h>
+#include <tdenewstuff/entry.h>
+#include <tdenewstuff/provider.h>
 #include <tdetempfile.h>
 
 #include <tqlabel.h>
@@ -228,21 +228,15 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_)
   connect(loader, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long)));
   connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError()));
 
-  TDEConfigGroup config(TDEGlobal::config(), "KNewStuff");
+  TDEConfigGroup config(TDEGlobal::config(), "TDENewStuff");
   TQString prov = config.readEntry("ProvidersUrl");
   if(prov.isEmpty()) {
-    if(m_type == EntryTemplate) {
-      prov = TQString::fromLatin1("http://periapsis.org/tellico/newstuff/tellicotemplates-providers.php");
-      TQString alt = TQString::fromLatin1("http://download.kde.org/khotnewstuff/tellicotemplates-providers.xml");
-      loader->setAlternativeProvider(alt);
-    } else {
-      prov = TQString::fromLatin1("http://periapsis.org/tellico/newstuff/tellicoscripts-providers.php");
-    }
+    prov = TQString::fromLatin1("https://www.trinitydesktop.org/ocs/providers.xml");
   }
   if(m_type == EntryTemplate) {
-    m_typeName = TQString::fromLatin1("tellico/entry-template");
+    m_typeName = TQString::fromLatin1("tellico template");
   } else {
-    m_typeName = TQString::fromLatin1("tellico/data-source");
+    m_typeName = TQString::fromLatin1("tellico script");
   }
   loader->load(m_typeName, prov);
 
@@ -301,9 +295,9 @@ void Dialog::slotResult(TDEIO::Job* job_) {
     return;
   }
 
-  TQDomElement knewstuff = dom.documentElement();
+  TQDomElement tdenewstuff = dom.documentElement();
 
-  for(TQDomNode pn = knewstuff.firstChild(); !pn.isNull(); pn = pn.nextSibling()) {
+  for(TQDomNode pn = tdenewstuff.firstChild(); !pn.isNull(); pn = pn.nextSibling()) {
     TQDomElement stuff = pn.toElement();
     if(stuff.isNull()) {
       continue;
diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp
index cfd2292..304a110 100644
--- a/src/newstuff/manager.cpp
+++ b/src/newstuff/manager.cpp
@@ -28,7 +28,7 @@
 #include <tdeio/job.h>
 #include <tdefileitem.h>
 #include <tdeversion.h>
-#include <knewstuff/entry.h>
+#include <tdenewstuff/entry.h>
 #include <kstandarddirs.h>
 
 #include <tqfileinfo.h>
@@ -94,7 +94,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) {
   } else {
     // remove ".xsl"
     xslFile.truncate(xslFile.length()-4);
-    TDEConfigGroup config(TDEGlobal::config(), "KNewStuffFiles");
+    TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffFiles");
     config.writeEntry(xslFile, allFiles);
     m_urlNameMap.insert(url_, xslFile);
   }
@@ -106,7 +106,7 @@ bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) {
 }
 
 bool Manager::removeTemplate(const TQString& name_) {
-  TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles");
+  TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
   TQStringList files = fileGroup.readListEntry(name_);
   // at least, delete xsl file
   if(files.isEmpty()) {
@@ -130,7 +130,7 @@ bool Manager::removeTemplate(const TQString& name_) {
 
   // remove config entries even if unsuccessful
   fileGroup.deleteEntry(name_);
-  TDEConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus");
+  TDEConfigGroup statusGroup(TDEGlobal::config(), "TDENewStuffStatus");
   TQString entryName = statusGroup.readEntry(name_);
   statusGroup.deleteEntry(name_);
   statusGroup.deleteEntry(entryName);
@@ -209,7 +209,7 @@ bool Manager::installScript(const KURL& url_) {
   }
 
   {
-    TDEConfigGroup config(TDEGlobal::config(), "KNewStuffFiles");
+    TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffFiles");
     config.writeEntry(info->sourceName, archiveFiles(archiveDir));
     m_urlNameMap.insert(url_, info->sourceName);
   }
@@ -225,7 +225,7 @@ bool Manager::installScript(const KURL& url_) {
 }
 
 bool Manager::removeScript(const TQString& name_) {
-  TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles");
+  TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
   TQStringList files = fileGroup.readListEntry(name_);
 
   bool success = true;
@@ -244,7 +244,7 @@ bool Manager::removeScript(const TQString& name_) {
 
   // remove config entries even if unsuccessful
   fileGroup.deleteEntry(name_);
-  TDEConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus");
+  TDEConfigGroup statusGroup(TDEGlobal::config(), "TDENewStuffStatus");
   TQString entryName = statusGroup.readEntry(name_);
   statusGroup.deleteEntry(name_);
   statusGroup.deleteEntry(entryName);
@@ -253,7 +253,7 @@ bool Manager::removeScript(const TQString& name_) {
 }
 
 Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) {
-  TDEConfigGroup config(TDEGlobal::config(), "KNewStuffStatus");
+  TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffStatus");
   TQString datestring = config.readEntry(entry_->name());
   if(datestring.isEmpty()) {
     return NotInstalled;
@@ -268,7 +268,7 @@ Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) {
   }
 
   // also check that executable files exists
-  TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles");
+  TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
   TQStringList files = fileGroup.readListEntry(entry_->name());
   TQString path = Tellico::saveLocation(TQString::fromLatin1("data-sources/"));
   for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
@@ -394,7 +394,7 @@ void Manager::slotInstallFinished() {
   if(newScript && newScript->successfulInstall()) {
     const TQString name = m_urlNameMap[newScript->url()];
     KNS::Entry* entry = m_scriptEntryMap[newScript];
-    TDEConfigGroup config(TDEGlobal::config(), "KNewStuffStatus");
+    TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffStatus");
     // have to keep a config entry that maps the name of the file to the name
     // of the newstuff entry, so we can track which entries are installed
     // name and entry-name() are probably the same for scripts, but not a problem
diff --git a/src/newstuff/newscript.cpp b/src/newstuff/newscript.cpp
index 697f449..4ec83e3 100644
--- a/src/newstuff/newscript.cpp
+++ b/src/newstuff/newscript.cpp
@@ -22,7 +22,7 @@ using Tellico::NewStuff::NewScript;
 
 NewScript::NewScript(Manager* manager_, TQWidget* parentWidget_)
 #if KDE_IS_VERSION(3,3,90)
-    : KNewStuffSecure(TQString::fromLatin1("tellico/data-source"), parentWidget_)
+    : TDENewStuffSecure(TQString::fromLatin1("tellico script"), parentWidget_)
 #else
     : TQObject(parentWidget_)
 #endif
@@ -38,8 +38,8 @@ void NewScript::installResource() {
 }
 
 #if KDE_IS_VERSION(3,3,90)
-#include <knewstuff/knewstuffsecure.h>
-#define SUPERCLASS KNewStuffSecure
+#include <tdenewstuff/knewstuffsecure.h>
+#define SUPERCLASS TDENewStuffSecure
 #else
 #define SUPERCLASS TQObject
 #endif
diff --git a/src/newstuff/newscript.h b/src/newstuff/newscript.h
index cc290bf..eae117c 100644
--- a/src/newstuff/newscript.h
+++ b/src/newstuff/newscript.h
@@ -18,8 +18,8 @@
 #include <kurl.h>
 
 #if KDE_IS_VERSION(3,3,90)
-#include <knewstuff/knewstuffsecure.h>
-#define SUPERCLASS KNewStuffSecure
+#include <tdenewstuff/knewstuffsecure.h>
+#define SUPERCLASS TDENewStuffSecure
 #else
 #define SUPERCLASS TQObject
 #endif
@@ -47,7 +47,7 @@ private:
 
   Manager* m_manager;
 #if !KDE_IS_VERSION(3,3,90)
-  // KNewStuffSecure has a protected variable
+  // TDENewStuffSecure has a protected variable
   TQString m_tarName;
 #endif
   KURL m_url;
diff --git a/src/newstuff/providerloader.cpp b/src/newstuff/providerloader.cpp
index 173457b..625156c 100644
--- a/src/newstuff/providerloader.cpp
+++ b/src/newstuff/providerloader.cpp
@@ -11,7 +11,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// this class is largely copied from tdelibs/knewstuff/provider.cpp
+// this class is largely copied from tdelibs/tdenewstuff/provider.cpp
 // which is Copyright (c) 2002 Cornelius Schumacher <[email protected]>
 // and licensed under GPL v2, just like Tellico
 
@@ -20,7 +20,7 @@
 #include "../latin1literal.h"
 
 #include <tdeio/job.h>
-#include <knewstuff/provider.h>
+#include <tdenewstuff/provider.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdemessagebox.h>
diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h
index 8b24dbc..91fedc9 100644
--- a/src/newstuff/providerloader.h
+++ b/src/newstuff/providerloader.h
@@ -11,7 +11,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// this class is largely copied from tdelibs/knewstuff/provider.h
+// this class is largely copied from tdelibs/tdenewstuff/provider.h
 // which is Copyright (c) 2002 Cornelius Schumacher <[email protected]>
 // and licensed under GPL v2, just like Tellico
 //