Finish renaming knewstuff

10 files changed, 37 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f51f3fa..308f403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ option( WITH_I8K "Enable dell laptop support" OFF )
 option( WITH_SNMP "Enable SNMP support" OFF )
 option( WITH_SENSORS "Enable lm_sensors support" OFF )
 option( WITH_XMMS "Enable xmms support" OFF )
-option( WITH_KNEWSTUFF "Enable knewstuff support" OFF )
+option( WITH_TDENEWSTUFF "Enable tdenewstuff support" OFF )
 
 # option( WITH_NV "Enable nv support" OFF )
 
@@ -85,10 +85,10 @@ option( WITH_KNEWSTUFF "Enable knewstuff support" OFF )
 # WITH_XMMS         affects superkaramba
 # WITH_XMMS         description enables supercaramba applets to gain 
 #                               information about now playing track etc.
-# WITH_KNEWSTUFF    affects superkaramba
-# WITH_KNEWSTUFF    description enebles support for downloadable content
-#                               from kdelooks.
-# FIXME: test if WITH_KNEWSTUFF works in trinity or not
+# WITH_TDENEWSTUFF  affects superkaramba
+# WITH_TDENEWSTUFF  description enables support for downloadable content
+#                               from OpenDesktop.org.
+# FIXME: test if WITH_TDENEWSTUFF works in trinity or not
 
 # NOTE: In addition to affects DPMS and XScreenSaver backend options for 
 #       klaptopdaemon there is some XIdle code but it wasn't compleatly 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 2766533..765f608 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -177,10 +177,10 @@ if ( BUILD_SUPERKARAMBA )
     tde_message_fatal( "python is required, but was not found on your system" )
   endif( NOT PYTHONLIBS_FOUND )
 
-  if( WITH_KNEWSTUFF )
-    set( HAVE_KNEWSTUFF 1 )
-    set( KNEWSTUFF_LIBRARIES knewstuff-shared )
-  endif( WITH_KNEWSTUFF )
+  if( WITH_TDENEWSTUFF )
+    set( HAVE_TDENEWSTUFF 1 )
+    set( TDENEWSTUFF_LIBRARIES tdenewstuff-shared )
+  endif( WITH_TDENEWSTUFF )
 
   if( WITH_XMMS )
     set( HAVE_XMMS 1 )
diff --git a/config.h.cmake b/config.h.cmake
index caff6e3..91bc6ea 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -84,7 +84,7 @@
 // superkaramba
 
 #cmakedefine HAVE_XMMS
-#cmakedefine HAVE_KNEWSTUFF
+#cmakedefine HAVE_TDENEWSTUFF
 
 #if !defined( HAVE_SYS_TYPES_H )
 #cmakedefine HAVE_SYS_TYPES_H
diff --git a/superkaramba/configure.in.in b/superkaramba/configure.in.in
index 4ff9f27..9b59909 100644
--- a/superkaramba/configure.in.in
+++ b/superkaramba/configure.in.in
@@ -63,11 +63,11 @@ AC_SUBST(XMMS_LIBS)
 AC_SUBST(XMMS_LDFLAGS)
 AC_SUBST(XMMS_INCLUDES)
 
-kde_have_knewstuff=yes
-KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)
-if test "$kde_have_knewstuff" = "yes"; then
-  AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])
-  AC_SUBST(MY_LIBKNEWSTUFF)
+kde_have_tdenewstuff=yes
+KDE_CHECK_LIB(tdenewstuff, main, [MY_LIBTDENEWSTUFF="-ltdenewstuff"], kde_have_tdenewstuff=no)
+if test "$kde_have_tdenewstuff" = "yes"; then
+  AC_DEFINE(HAVE_TDENEWSTUFF, 1, [Define if you have tdenewstuff])
+  AC_SUBST(MY_LIBTDENEWSTUFF)
 fi
 
 AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])
diff --git a/superkaramba/src/CMakeLists.txt b/superkaramba/src/CMakeLists.txt
index 07b7ec5..b0f9a4e 100644
--- a/superkaramba/src/CMakeLists.txt
+++ b/superkaramba/src/CMakeLists.txt
@@ -55,7 +55,7 @@ tde_add_executable( superkaramba AUTOMOC
     input.cpp sklineedit.cpp input_python.cpp
     svcgrp_python.cpp
   LINK tdeio-shared ${PYTHON_LIBRARIES} 
-    ${KNEWSTUFF_LIBRARIES}
+    ${TDENEWSTUFF_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am
index 191ebc7..39aa119 100644
--- a/superkaramba/src/Makefile.am
+++ b/superkaramba/src/Makefile.am
@@ -41,8 +41,7 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
 # kde_cfg_DATA = superkaramba.kcfg
 
 superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-#superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
-superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
+superkaramba_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBTDENEWSTUFF)
 
 # this is where the desktop file will go
 shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index bc8f7d4..0316b80 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -36,7 +36,7 @@
 
 #include "karambaapp.h"
 #include "themesdlg.h"
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 #include "sknewstuff.h"
 
 SKNewStuff::SKNewStuff( ThemesDlg *dlg ) :
@@ -137,4 +137,4 @@ TQString SKNewStuff::downloadDestination( KNS::Entry *entry )
   }
   return TDEGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
 }
-#endif //HAVE_KNEWSTUFF
+#endif //HAVE_TDENEWSTUFF
diff --git a/superkaramba/src/sknewstuff.h b/superkaramba/src/sknewstuff.h
index 0e34dda..95cfa5c 100644
--- a/superkaramba/src/sknewstuff.h
+++ b/superkaramba/src/sknewstuff.h
@@ -28,7 +28,7 @@
   #include <config.h>
 #endif
 
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 #include "tdenewstuff/knewstuff.h"
 #include "tdenewstuff/entry.h"
 
@@ -49,5 +49,5 @@ class SKNewStuff : public TDENewStuff
     KURL m_sourceLink;
 };
 
-#endif //HAVE_KNEWSTUFF
+#endif //HAVE_TDENEWSTUFF
 #endif //SKNEWSTUFF_H
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index b1bd91c..7534054 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -29,7 +29,7 @@
   #include <config.h>
 #endif
 
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   #include "sknewstuff.h"
 #endif
 
@@ -55,7 +55,7 @@ ThemesDlg::ThemesDlg(TQWidget *parent, const char *name)
  : ThemesLayout(parent, name)
 {
   populateListbox();
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   mNewStuff = 0;
 #endif
 }
@@ -64,7 +64,7 @@ ThemesDlg::~ThemesDlg()
 {
   //kdDebug() << k_funcinfo << endl;
   saveUserAddedThemes();
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   if(mNewStuff)
   {
     delete mNewStuff;
@@ -132,7 +132,7 @@ void ThemesDlg::populateListbox()
   item->setDescriptionText(i18n("Download new themes."));
 
   item->buttonGo->setText(i18n("New Stuff..."));
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   item->buttonGo->setEnabled(true);
   connect(item->buttonGo, TQT_SIGNAL(clicked()),
           this, TQT_SLOT(getNewStuff()));
@@ -216,14 +216,14 @@ void ThemesDlg::openLocalTheme()
 
 void ThemesDlg::getNewStuff()
 {
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   TDEConfig* config = TDEGlobal::config();
   config->setGroup("TDENewStuff");
   config->writePathEntry("ProvidersUrl",
       TQString::fromLatin1("https://www.trinitydesktop.org/ocs/karamba-providers.xml"));
   config->sync();
   m_newStuffStatus = config->entryMap("TDENewStuffStatus").keys();
-  //This check is b/c KNewStuff will download, throw an error,
+  //This check is b/c TDENewStuff will download, throw an error, 
   //and still have the entry in the config that it was successful
   configSanityCheck();
 
@@ -300,7 +300,7 @@ void ThemesDlg::addThemeToDialog(const KArchiveDirectory *archiveDir,
 
 void ThemesDlg::writeNewStuffConfig(const TQString &file)
 {
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   TDEConfig* config = TDEGlobal::config();
   TQStringList keys = config->entryMap("TDENewStuffStatus").keys();
 
@@ -320,7 +320,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
 
 void ThemesDlg::configSanityCheck()
 {
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   TDEConfig* config = TDEGlobal::config();
   TQStringList statusKeys = config->entryMap("TDENewStuffStatus").keys();
   TQStringList nameKeys = config->entryMap("TDENewStuffNames").keys();
@@ -476,18 +476,18 @@ void ThemesDlg::uninstall()
       karambaApp->dcopIface()->closeTheme(twPtr->themeFile()->name());
       tableThemes->removeItem( twPtr );
     }
-#ifdef HAVE_KNEWSTUFF
-    // Remove theme from KNewStuffStatus
+#ifdef HAVE_TDENEWSTUFF
+    // Remove theme from TDENewStuffStatus
     TDEConfig* config = TDEGlobal::config();
     config->setGroup("TDENewStuffNames");
     TQString name = config->readEntry(tempPath);
     if(!name.isEmpty())
     {
-      kdDebug() << "removing " << tempPath << " under KNewStuffNames from superkarambarc" 
+      kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc" 
                 << endl;
       kapp->config()->deleteEntry(tempPath);
       config->setGroup("TDENewStuffStatus");
-      kdDebug() << "removing " << name << " under KNewStuffStatus from superkarambarc" 
+      kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc" 
                 << endl;
       kapp->config()->deleteEntry(name);
       kapp->config()->sync();
@@ -506,8 +506,8 @@ void ThemesDlg::uninstall()
       TDEIO::move(remDir.path(), trash);
     }
     tableThemes->removeItem(w);
-#ifdef HAVE_KNEWSTUFF
-    // Remove theme from KNewStuffStatus
+#ifdef HAVE_TDENEWSTUFF
+    // Remove theme from TDENewStuffStatus
     TDEConfig* config = TDEGlobal::config();
     config->setGroup("TDENewStuffNames");
     TQString name = config->readEntry(theme.path());
diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h
index 22eb4c0..1e73288 100644
--- a/superkaramba/src/themesdlg.h
+++ b/superkaramba/src/themesdlg.h
@@ -31,7 +31,7 @@
 /**
 @author See README for the list of authors
 */
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
 class SKNewStuff;
 #endif
 class ThemeFile;
@@ -71,7 +71,7 @@ class ThemesDlg : public ThemesLayout
     int themeIndex(TQString file);
     TQStringList themes();
 
-#ifdef HAVE_KNEWSTUFF
+#ifdef HAVE_TDENEWSTUFF
   private:
     SKNewStuff *mNewStuff;
     TQStringList m_newStuffStatus;