Additional k => tde renaming and fixes

11 files changed, 12 insertions, 12 deletions

diff --git a/kode/Makefile.am b/kode/Makefile.am
index 877a17e94..f20e86dc5 100644
--- a/kode/Makefile.am
+++ b/kode/Makefile.am
@@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
 
 bin_PROGRAMS = kode
 
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kode_LDADD   = libkode.la -ltdeabc
 kode_SOURCES = kodemain.cpp
 
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index ab332c2bf..84882054f 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -443,7 +443,7 @@ int create( TDECmdLineArgs *args )
   } else if ( createKioslave ) {
     c.setDocs( "This class implements a tdeioslave for ..." );
   
-    c.addBaseClass( KODE::Class( "SlaveBase", "KIO" ) );
+    c.addBaseClass( KODE::Class( "SlaveBase", "TDEIO" ) );
     c.addHeaderInclude( "tdeio/slavebase.h" );
     
     KODE::Function get( "get", "void" );
@@ -573,7 +573,7 @@ int create( TDECmdLineArgs *args )
     KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES",
       "tdeio_" + protocol + ".la" );
     t.setSources( className.lower() + ".cpp" );
-    t.setLibAdd( "$(LIB_KIO)" );
+    t.setLibAdd( "$(LIB_TDEIO)" );
     t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" );
   
     am.addTarget( t );
diff --git a/kode/kwsdl/Makefile.am b/kode/kwsdl/Makefile.am
index 0accfcc69..86716e47c 100644
--- a/kode/kwsdl/Makefile.am
+++ b/kode/kwsdl/Makefile.am
@@ -11,7 +11,7 @@ libwsdl_la_LIBADD =  -ltdecore schema/libschema.la
 
 bin_PROGRAMS = kwsdl_compiler
 
-kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kwsdl_compiler_LDADD   = ../libkode.la libwsdl.la
 kwsdl_compiler_SOURCES =  compiler.cpp converter.cpp creator.cpp main.cpp  \
                           namemapper.cpp 
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index f5d904781..2117c59cb 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -938,7 +938,7 @@ void Converter::createTransportClass()
   queryCode += "TDEIO::TransferJob* job = TDEIO::http_post( KURL( " + url.name() + " ), postData, false );";
   queryCode += "if ( !job ) {";
   queryCode.indent();
-  queryCode += "kdWarning() << \"Unable to create KIO job for \" << " + url.name() + " << endl;";
+  queryCode += "kdWarning() << \"Unable to create TDEIO job for \" << " + url.name() + " << endl;";
   queryCode += "return;";
   queryCode.unindent();
   queryCode += "}";
diff --git a/kode/kwsdl/kung/Makefile.am b/kode/kwsdl/kung/Makefile.am
index 4a56da135..cbff637ac 100644
--- a/kode/kwsdl/kung/Makefile.am
+++ b/kode/kwsdl/kung/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
 
 bin_PROGRAMS = kung
-kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
                doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
                inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \
diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp
index 32cfbe6ef..e9dabf3cb 100644
--- a/kode/kwsdl/kung/transport.cpp
+++ b/kode/kwsdl/kung/transport.cpp
@@ -38,7 +38,7 @@ void Transport::query( const TQString &xml )
   
   TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
   if ( !job ) {
-    kdWarning() << "Unable to create KIO job for " << mUrl << endl;
+    kdWarning() << "Unable to create TDEIO job for " << mUrl << endl;
     return;
   }
   
diff --git a/kode/kwsdl/schema/Makefile.am b/kode/kwsdl/schema/Makefile.am
index 87884af08..bdde93a4d 100644
--- a/kode/kwsdl/schema/Makefile.am
+++ b/kode/kwsdl/schema/Makefile.am
@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libschema_la_LIBADD = -lqt-mt -ltdecore -ltdeio
 
 #bin_PROGRAMS = schematest
-#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 #schematest_SOURCES = main.cpp
 #schematest_LDADD = libschema.la
 
diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am
index 28e37586b..68f084a34 100644
--- a/kode/kwsdl/tests/google/Makefile.am
+++ b/kode/kwsdl/tests/google/Makefile.am
@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
 
 googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
 googletest_LDADD = -ltdecore -ltdeio
-googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp
index a37e5fc19..30b9645e4 100644
--- a/kode/kwsdl/tests/google/transport.cpp
+++ b/kode/kwsdl/tests/google/transport.cpp
@@ -41,7 +41,7 @@ void Transport::query( const TQString &xml )
   
   TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
   if ( !job ) {
-    kdWarning() << "Unable to create KIO job for " << mUrl << endl;
+    kdWarning() << "Unable to create TDEIO job for " << mUrl << endl;
     return;
   }
   
diff --git a/kode/kwsdl/wscl/Makefile.am b/kode/kwsdl/wscl/Makefile.am
index 67bf17207..782d912d5 100644
--- a/kode/kwsdl/wscl/Makefile.am
+++ b/kode/kwsdl/wscl/Makefile.am
@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libwscl_la_LIBADD = -lqt-mt
 
 #bin_PROGRAMS = wscltest
-#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 #wscltest_SOURCES = main.cpp
 #wscltest_LDADD = libwscl.la
 
diff --git a/kode/kxml_compiler/Makefile.am b/kode/kxml_compiler/Makefile.am
index fceb5aaf2..a8352a38b 100644
--- a/kode/kxml_compiler/Makefile.am
+++ b/kode/kxml_compiler/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
 
 bin_PROGRAMS = kxml_compiler
 
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kxml_compiler_LDADD   = ../libkode.la -ltdecore
 kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp