Additional k => tde renaming and fixes

6 files changed, 12 insertions, 12 deletions

diff --git a/tdeio/tests/Makefile.am b/tdeio/tests/Makefile.am
index 138d0f0d2..9ef135c53 100644
--- a/tdeio/tests/Makefile.am
+++ b/tdeio/tests/Makefile.am
@@ -17,8 +17,8 @@
 #    Boston, MA 02110-1301, USA.
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio $(all_includes)
-LDADD = $(LIB_KIO)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+LDADD = $(LIB_TDEIO)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
                  tdeioslavetest kdirwatchtest kshredtest speed kurifiltertest \
@@ -77,14 +77,14 @@ kacltest_SOURCES = kacltest.cpp
 
 check_LTLIBRARIES = tdeunittest_kdirwatch.la
 tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
-tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
+tdeunittest_kdirwatch_la_LIBADD = $(LIB_TDEUNITTEST) $(LIB_TDEIO)
 tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
 
 # tdefile meta stuff. Comment this in, if you want a small
 # metadata plugin test and "make install".
 #kde_module_LTLIBRARIES = dummymeta.la
 #dummymeta_la_SOURCES = dummymeta.cpp
-#dummymeta_la_LIBADD = $(LIB_KIO)
+#dummymeta_la_LIBADD = $(LIB_TDEIO)
 #dummymeta_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 #services_DATA = dummymeta.desktop
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index a2d5b40d1..076bc250d 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -461,7 +461,7 @@ void JobTest::moveFileNoPermissions()
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
     assert( !ok );
     assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED );
-    // OK this is fishy. Just like mv(1), KIO's behavior depends on whether
+    // OK this is fishy. Just like mv(1), TDEIO's behavior depends on whether
     // a direct rename(2) was used, or a full copy+del. In the first case
     // there is no destination file created, but in the second case the
     // destination file remains.
diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp
index 3d7505a3f..ed59f3c19 100644
--- a/tdeio/tests/kdirwatchunittest.cpp
+++ b/tdeio/tests/kdirwatchunittest.cpp
@@ -106,8 +106,8 @@ void KDirWatchTest::rename_file(const TQString& from, const TQString& to)
   ::rename(TQFile::encodeName(from), TQFile::encodeName(to));
 }
 
-KUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
-KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
+TDEUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
+TDEUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
 
 #define SLEEP() TQApplication::processEvents();
 
diff --git a/tdeio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index ba429e67a..7bf4df7a8 100644
--- a/tdeio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
@@ -8,7 +8,7 @@
 
 int main ( int argc, char** argv )
 {
-    TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
+    TDEAboutData aboutData("kiopassdlgtest", "TDEIO Password Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication app;
 
diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 527077eb0..6009af667 100644
--- a/tdeio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -13,7 +13,7 @@ static TDECmdLineOptions options[] =
 
 int main ( int argc, char** argv )
 {
-    TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
+    TDEAboutData aboutData("kpropertiesdialogtest", "TDEIO Properties Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 04992f889..7f11bd4e3 100644
--- a/tdeio/tests/tdeioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -9,8 +9,8 @@
   LGPL version 2.
  */
 
-#ifndef _KIOSLAVETEST_H
-#define _KIOSLAVETEST_H
+#ifndef _TDEIOSLAVETEST_H
+#define _TDEIOSLAVETEST_H
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -105,4 +105,4 @@ private:
   TDEIO::Slave *slave;
 };
 
-#endif // _KIOSLAVETEST_H
+#endif // _TDEIOSLAVETEST_H