Additional k => tde renaming and fixes

7 files changed, 23 insertions, 23 deletions

diff --git a/tderesources/birthdays/CMakeLists.txt b/tderesources/birthdays/CMakeLists.txt
index bdde602b0..7ac1be774 100644
--- a/tderesources/birthdays/CMakeLists.txt
+++ b/tderesources/birthdays/CMakeLists.txt
@@ -27,20 +27,20 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    resourcekabc.h resourcekabcconfig.h
+    resourcetdeabc.h resourcetdeabcconfig.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal )
 
 
 ##### other data ################################
 
-install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
+install( FILES tdeabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
 
 
-##### kcal_kabc (module) #######################
+##### kcal_tdeabc (module) #######################
 
-tde_add_kpart( kcal_kabc AUTOMOC
+tde_add_kpart( kcal_tdeabc AUTOMOC
   SOURCES
-    resourcekabc.cpp resourcekabcconfig.cpp
+    resourcetdeabc.cpp resourcetdeabcconfig.cpp
   LINK kabcommon-static tdepim-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tderesources/birthdays/Makefile.am b/tderesources/birthdays/Makefile.am
index c31fc0472..08d3504f8 100644
--- a/tderesources/birthdays/Makefile.am
+++ b/tderesources/birthdays/Makefile.am
@@ -3,22 +3,22 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
            -I$(top_srcdir)/kaddressbook/common \
              $(all_includes)
 
-kde_module_LTLIBRARIES = kcal_kabc.la
+kde_module_LTLIBRARIES = kcal_tdeabc.la
 
-kcal_tdeabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp
+kcal_tdeabc_la_SOURCES = resourcetdeabc.cpp resourcetdeabcconfig.cpp
 kcal_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcal_tdeabc_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
                        $(top_builddir)/kaddressbook/common/libkabcommon.la
 
 libkcalincludedir = $(includedir)/libkcal
-libkcalinclude_HEADERS = resourcekabc.h resourcekabcconfig.h
+libkcalinclude_HEADERS = resourcetdeabc.h resourcetdeabcconfig.h
 
 servicedir = $(kde_servicesdir)/tderesources/kcal
-service_DATA = kabc.desktop
+service_DATA = tdeabc.desktop
 
 METASOURCES = AUTO
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kres_birthday.pot
 
-resourcekabcconfig.lo: ../../kaddressbook/common/kabprefs_base.h
+resourcetdeabcconfig.lo: ../../kaddressbook/common/kabprefs_base.h
diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp
index 68ef63390..d36ebdddb 100644
--- a/tderesources/birthdays/resourcekabc.cpp
+++ b/tderesources/birthdays/resourcetdeabc.cpp
@@ -50,15 +50,15 @@
 
 #include <tderesources/configwidget.h>
 
-#include "resourcekabcconfig.h"
+#include "resourcetdeabcconfig.h"
 
-#include "resourcekabc.h"
+#include "resourcetdeabc.h"
 
 using namespace KCal;
 
 extern "C"
 {
-  void *init_kcal_kabc()
+  void *init_kcal_tdeabc()
   {
 	  TDEGlobal::locale()->insertCatalogue( "kres_birthday" );
     TDEGlobal::locale()->insertCatalogue( "libkcal" );
@@ -136,7 +136,7 @@ bool ResourceTDEABC::doLoad()
 
   mCalendar.close();
 
-  // import from kabc
+  // import from tdeabc
   TQString summary;
   TQStringList::ConstIterator strIt;
   const TQStringList::ConstIterator endStrIt = mCategories.end();
@@ -525,4 +525,4 @@ void ResourceTDEABC::setTimeZoneId( const TQString& tzid )
   mCalendar.setTimeZoneId( tzid );
 }
 
-#include "resourcekabc.moc"
+#include "resourcetdeabc.moc"
diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcetdeabc.h
index bea4b4637..5ba80ca1b 100644
--- a/tderesources/birthdays/resourcekabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -18,8 +18,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KCAL_RESOURCEKABC_H
-#define KCAL_RESOURCEKABC_H
+#ifndef KCAL_RESOURCETDEABC_H
+#define KCAL_RESOURCETDEABC_H
 
 #include <tqptrlist.h>
 #include <tqstring.h>
diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp
index 6bead14b5..0f9b3279b 100644
--- a/tderesources/birthdays/resourcekabcconfig.cpp
+++ b/tderesources/birthdays/resourcetdeabcconfig.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 
-#include "resourcekabc.h"
-#include "resourcekabcconfig.h"
+#include "resourcetdeabc.h"
+#include "resourcetdeabcconfig.h"
 
 using namespace KCal;
 
@@ -132,4 +132,4 @@ void ResourceTDEABCConfig::alarmClicked()
   mALabel->setDisabled(!mAlarm->isChecked());
 }
 
-#include "resourcekabcconfig.moc"
+#include "resourcetdeabcconfig.moc"
diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h
index c62037c2a..80efd02b3 100644
--- a/tderesources/birthdays/resourcekabcconfig.h
+++ b/tderesources/birthdays/resourcetdeabcconfig.h
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KCAL_RESOURCEKABCCONFIG_H
-#define KCAL_RESOURCEKABCCONFIG_H
+#ifndef KCAL_RESOURCETDEABCCONFIG_H
+#define KCAL_RESOURCETDEABCCONFIG_H
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/tderesources/birthdays/kabc.desktop b/tderesources/birthdays/tdeabc.desktop
index 8fadcb2b9..d9aaa4201 100644
--- a/tderesources/birthdays/kabc.desktop
+++ b/tderesources/birthdays/tdeabc.desktop
@@ -54,7 +54,7 @@ Name[tr]=TDE Adres Defterinden Doğum Günleri
 Name[uk]=Дні народження з KAddressBook
 Name[zh_CN]=KAddressBook 中的生日
 Name[zh_TW]=自 KaddressBook 匯入生日
-X-TDE-Library=kcal_kabc
+X-TDE-Library=kcal_tdeabc
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=calendar