Additional k => tde renaming and fixes

12 files changed, 15 insertions, 15 deletions

diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am
index 22349ce7..28ac2324 100644
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = . tests
 KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL)
 INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes)
-libkofficecore_la_LIBADD  = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \
+libkofficecore_la_LIBADD  = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_TDEPARTS) \
 	$(LIB_TDEPRINT) $(LIB_TDEABC) $(LIB_KWMF) -lDCOP
 
 ####### Files
diff --git a/lib/kofficeui/Makefile.am b/lib/kofficeui/Makefile.am
index cef66f55..c74406d8 100644
--- a/lib/kofficeui/Makefile.am
+++ b/lib/kofficeui/Makefile.am
@@ -50,7 +50,7 @@ include_HEADERS = \
 #AM_CXXFLAGS = -DQT_PLUGIN
 #kde_widget_LTLIBRARIES = kofficewidgets.la
 #kofficewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-#kofficewidgets_la_LIBADD = $(LIB_KIO) libkofficeui.la
+#kofficewidgets_la_LIBADD = $(LIB_TDEIO) libkofficeui.la
 #kofficewidgets_la_SOURCES =  kofficewidgets.cpp
 
 #kofficewidgets.cpp: $(srcdir)/koffice.widgets
diff --git a/lib/kofficeui/ttdeaction.h b/lib/kofficeui/ttdeaction.h
index 015bcce9..bc5912f4 100644
--- a/lib/kofficeui/ttdeaction.h
+++ b/lib/kofficeui/ttdeaction.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef TKACTION_H
-#define TKACTION_H
+#ifndef TTDEACTION_H
+#define TTDEACTION_H
 
 #include <tdeaction.h>
 #include <tqstringlist.h>
diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h
index 706a8c03..3a899fc8 100644
--- a/lib/kofficeui/ttdetoolbarbutton.h
+++ b/lib/kofficeui/ttdetoolbarbutton.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef TKTOOLBARBUTTON_H
-#define TKTOOLBARBUTTON_H
+#ifndef TTDETOOLBARBUTTON_H
+#define TTDETOOLBARBUTTON_H
 
 #include <ttdeaction.h>
 
diff --git a/lib/koproperty/editors/Makefile.am b/lib/koproperty/editors/Makefile.am
index f617a19f..b9904d18 100644
--- a/lib/koproperty/editors/Makefile.am
+++ b/lib/koproperty/editors/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
 
 noinst_LTLIBRARIES =  libkopropertyeditors.la
-libkopropertyeditors_la_LIBADD =  $(LIB_TDEUI) $(LIB_KIO)
+libkopropertyeditors_la_LIBADD =  $(LIB_TDEUI) $(LIB_TDEIO)
 libkopropertyeditors_la_LDFLAGS = -Wno-unresolved $(all_libraries)
 libkopropertyeditors_la_SOURCES = booledit.cpp coloredit.cpp combobox.cpp cursoredit.cpp dateedit.cpp \
 	datetimeedit.cpp dummywidget.cpp fontedit.cpp linestyledit.cpp pixmapedit.cpp pointedit.cpp \
diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am
index 8bdfdbe1..81619f8e 100644
--- a/lib/koproperty/test/Makefile.am
+++ b/lib/koproperty/test/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 noinst_PROGRAMS = propertytest
 
 propertytest_SOURCES = main.cpp test.cpp
-propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 propertytest_LDADD = $(LIB_KOPROPERTY)
 
 # this is where the shell's XML-GUI resource file goes
diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am
index 5302f0ef..a509da52 100644
--- a/lib/kotext/kohyphen/Makefile.am
+++ b/lib/kotext/kohyphen/Makefile.am
@@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest
 
 kohyphentest_SOURCES = kohyphentest.cpp
 kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE)
-kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp
index 6a0360aa..559375fd 100644
--- a/lib/kotext/tests/KoUserStyleTester.cpp
+++ b/lib/kotext/tests/KoUserStyleTester.cpp
@@ -29,8 +29,8 @@
 #include "KoUserStyleTester.h"
 #include "KoUserStyleTester.moc"
 
-KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester");
-KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester);
+TDEUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester");
+TDEUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester);
 
 #undef COMPARE
 /// for source-compat with qttestlib: use COMPARE(x,y) if you plan to port to qttestlib later.
diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am
index fd7754b2..7080201b 100644
--- a/lib/kotext/tests/Makefile.am
+++ b/lib/kotext/tests/Makefile.am
@@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
 TESTS = kotextformattertest kovariabletest
 
 LDADD = ../libkotext.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kobordertest_SOURCES = kobordertest.cpp
 kotextformattertest_SOURCES = kotextformattertest.cpp
diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am
index b048c26e..848ecac7 100644
--- a/lib/kross/runner/Makefile.am
+++ b/lib/kross/runner/Makefile.am
@@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner
 krossrunner_SOURCES = main.cpp
 krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 SUBDIRS = .
 METASOURCES = AUTO
diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am
index 37bee54f..e7a9164a 100644
--- a/lib/kross/test/Makefile.am
+++ b/lib/kross/test/Makefile.am
@@ -12,6 +12,6 @@ krosstest_LDADD = \
     ../main/libkrossmain.la
 
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 SUBDIRS = .
 METASOURCES = AUTO
diff --git a/lib/store/Makefile.am b/lib/store/Makefile.am
index e1eb1402..2bd3d085 100644
--- a/lib/store/Makefile.am
+++ b/lib/store/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = $(KOFFICECORE_INCLUDES) $(all_includes)
 
 ####### Files
 
-libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libkstore_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
 libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
 include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h