Additional k => tde renaming and fixes

9 files changed, 20 insertions, 20 deletions

diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am
index f0a10db5..773e4308 100644
--- a/kword/mailmerge/Makefile.am
+++ b/kword/mailmerge/Makefile.am
@@ -18,5 +18,5 @@ if include_sql
 SQLDIRECTORY=sql
 endif
 
-SUBDIRS = . kabc kspread $(SQLDIRECTORY)
+SUBDIRS = . tdeabc kspread $(SQLDIRECTORY)
 
diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am
deleted file mode 100644
index 98231fed..00000000
--- a/kword/mailmerge/kabc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-KDE_CXXFLAGS = $(USE_RTTI)
-INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \
-	$(KOTEXT_INCLUDES) -I$(top_srcdir)/kword $(all_includes)
-
-kde_module_LTLIBRARIES = kwmailmerge_kabc.la
-
-## Plugin encapsulating the QT SQL database interface
-kwmailmerge_kabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui
-kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
-kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC)
-
-METASOURCES = AUTO
-
-services_DATA=kwmailmerge_kabc.desktop
-servicesdir=$(kde_servicesdir)
-
diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABC.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp
index dce0f5da..2be13003 100644
--- a/kword/mailmerge/kabc/KWMailMergeTDEABC.cpp
+++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.cpp
@@ -537,7 +537,7 @@ TQStringList KWMailMergeTDEABC::singleRecords() const
 
 extern "C"
 {
-    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent )
+    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_tdeabc( TDEInstance *inst, TQObject *parent )
     {
         return new KWMailMergeTDEABC( inst, parent );
     }
diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABC.h b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.h
index 3db02d91..3db02d91 100644
--- a/kword/mailmerge/kabc/KWMailMergeTDEABC.h
+++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABC.h
diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
index 440e208a..440e208a 100644
--- a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.cpp
+++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
diff --git a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h
index 1a23b44c..1a23b44c 100644
--- a/kword/mailmerge/kabc/KWMailMergeTDEABCConfig.h
+++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.h
diff --git a/kword/mailmerge/tdeabc/Makefile.am b/kword/mailmerge/tdeabc/Makefile.am
new file mode 100644
index 00000000..0856d2c6
--- /dev/null
+++ b/kword/mailmerge/tdeabc/Makefile.am
@@ -0,0 +1,17 @@
+
+KDE_CXXFLAGS = $(USE_RTTI)
+INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \
+	$(KOTEXT_INCLUDES) -I$(top_srcdir)/kword $(all_includes)
+
+kde_module_LTLIBRARIES = kwmailmerge_tdeabc.la
+
+## Plugin encapsulating the QT SQL database interface
+kwmailmerge_tdeabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui
+kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
+kwmailmerge_tdeabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC)
+
+METASOURCES = AUTO
+
+services_DATA=kwmailmerge_tdeabc.desktop
+servicesdir=$(kde_servicesdir)
+
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/tdeabc/addresspicker.ui
index 44dc8c8f..44dc8c8f 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/tdeabc/addresspicker.ui
diff --git a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop
index f300c0be..924d6516 100644
--- a/kword/mailmerge/kabc/kwmailmerge_kabc.desktop
+++ b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop
@@ -100,6 +100,6 @@ Comment[uk]=Цей тип джерела даних дає доступ до з�
 Comment[zh_CN]=该数据源类型允许您使用您的 TDE 地址簿条目。
 Comment[zh_TW]=這個資料來源類別讓您使用您的 TDE 通訊錄項目。
 
-X-TDE-Library=kwmailmerge_kabc
+X-TDE-Library=kwmailmerge_tdeabc
 X-TDE-Capabilities=open
 X-TDE-InternalName=KABC