Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

4 files changed, 23 insertions, 23 deletions

diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/kconfig_imp.cpp
index 3cf6e532..73ca58ed 100644
--- a/kjsembed/bindings/kconfig_imp.cpp
+++ b/kjsembed/bindings/kconfig_imp.cpp
@@ -40,7 +40,7 @@ Config::Config( TQObject *parent, const char *name)
 	if( name == 0)
 		m_config = kapp->config();
 	else
-		m_config = new KConfig(name);
+		m_config = new TDEConfig(name);
 	if( !m_config->checkConfigFilesWritable(true) )
 	{
 	  kdWarning( 80001 ) << "Could not write to config file." << endl;
@@ -61,7 +61,7 @@ Config::Config( TQObject *parent, const char *name , const TQString& confName)
         : BindingObject(parent, name)
 {
     TQString fileName = ::locate("kde_config", confName);
-    m_config = new KConfig(fileName);
+    m_config = new TDEConfig(fileName);
 }
 */
 Config::~Config()
diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h
index be27b24d..75bf3bfd 100644
--- a/kjsembed/bindings/kconfig_imp.h
+++ b/kjsembed/bindings/kconfig_imp.h
@@ -34,7 +34,7 @@
 #include "bindingobject.h"
 
 #ifndef QT_ONLY
-class KConfig;
+class TDEConfig;
 #else
 class TQSettings;
 #endif
@@ -122,7 +122,7 @@ public slots:
 
 private:
 #ifndef QT_ONLY
-    KConfig *m_config;
+    TDEConfig *m_config;
 #else
     TQSettings *m_config;
     TQString m_name;
diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp
index c7462e28..0ffbc12c 100644
--- a/kjsembed/bindings/netaccess_imp.cpp
+++ b/kjsembed/bindings/netaccess_imp.cpp
@@ -45,9 +45,9 @@ bool NetAccess::download( const KURL& src, const TQString& loc )
 {
     TQString mloc = loc;
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::download( src, mloc, 0 );
+    return TDEIO::NetAccess::download( src, mloc, 0 );
 #else
-    return KIO::NetAccess::download( src, mloc );
+    return TDEIO::NetAccess::download( src, mloc );
 #endif
 }
 
@@ -60,40 +60,40 @@ TQString NetAccess::createTempFile( const TQString& prefix, const TQString& ext,
 
 void NetAccess::removeTempFile( const TQString& name )
 {
-    KIO::NetAccess::removeTempFile( name );
+    TDEIO::NetAccess::removeTempFile( name );
 }
 
 bool NetAccess::upload( const TQString& src, const KURL& dest )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::upload( src, dest, 0 );
+    return TDEIO::NetAccess::upload( src, dest, 0 );
 #else
-    return KIO::NetAccess::upload( src, dest );
+    return TDEIO::NetAccess::upload( src, dest );
 #endif
 }
 
 bool NetAccess::copy( const KURL& src, const KURL& target )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::copy( src, target, 0 );
+    return TDEIO::NetAccess::copy( src, target, 0 );
 #else
-    return KIO::NetAccess::copy( src, target );
+    return TDEIO::NetAccess::copy( src, target );
 #endif
 }
 
 bool NetAccess::dircopy( const KURL& src, const KURL& target )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::dircopy( src, target, 0 );
+    return TDEIO::NetAccess::dircopy( src, target, 0 );
 #else
-    return KIO::NetAccess::dircopy( src, target );
+    return TDEIO::NetAccess::dircopy( src, target );
 #endif
 }
 
 bool NetAccess::move( const KURL& src, const KURL& target )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::move( src, target, 0 );
+    return TDEIO::NetAccess::move( src, target, 0 );
 #else
     kdWarning() << "NetAccess::move(src,target) is not supported on 3.1" << endl;
     return false;
@@ -103,18 +103,18 @@ bool NetAccess::move( const KURL& src, const KURL& target )
 bool NetAccess::exists( const KURL& url, bool source )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::exists( url, source, 0 );
+    return TDEIO::NetAccess::exists( url, source, 0 );
 #else
-    return KIO::NetAccess::exists( url, source );
+    return TDEIO::NetAccess::exists( url, source );
 #endif
 }
 
 bool NetAccess::del( const KURL & url )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::del( url, 0 );
+    return TDEIO::NetAccess::del( url, 0 );
 #else
-    return KIO::NetAccess::del( url );
+    return TDEIO::NetAccess::del( url );
 #endif
 }
 
@@ -127,7 +127,7 @@ int NetAccess::propertiesDialog( const KURL &url )
 TQString NetAccess::fish_execute( const KURL& url, const TQString& command )
 {
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::fish_execute( url, command, 0 );
+    return TDEIO::NetAccess::fish_execute( url, command, 0 );
 #else
     kdWarning() << "NetAccess::fish_execute(url,command) is not supported on 3.1" << endl;
     return TQString::null;
@@ -139,15 +139,15 @@ TQString NetAccess::mimetype( const KURL& url )
     kdDebug()<<"mimetype CALLED "<<endl;
 
 #if KDE_IS_VERSION(3,1,90)
-    return KIO::NetAccess::mimetype( url, 0 );
+    return TDEIO::NetAccess::mimetype( url, 0 );
 #else
-    return KIO::NetAccess::mimetype( url );
+    return TDEIO::NetAccess::mimetype( url );
 #endif
 }
 
 TQString NetAccess::lastErrorString()
 {
-    return KIO::NetAccess::lastErrorString();
+    return TDEIO::NetAccess::lastErrorString();
 }
 
 }
diff --git a/kjsembed/bindings/netaccess_imp.h b/kjsembed/bindings/netaccess_imp.h
index 8a788af4..d22d72a0 100644
--- a/kjsembed/bindings/netaccess_imp.h
+++ b/kjsembed/bindings/netaccess_imp.h
@@ -31,7 +31,7 @@ namespace KJSEmbed {
 namespace Bindings {
 
 /**
- * Provides a binding to KIO::NetAccess.
+ * Provides a binding to TDEIO::NetAccess.
  */
 class NetAccess : public BindingObject
 {