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

9 files changed, 37 insertions, 37 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
 {
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index c4f23b28..0c19114f 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -334,7 +334,7 @@
 
 	Fixed issue where config files where not reading and writing properly
 	When the default args where removed they would pass invalid items to
-	the KConfig methods.  This would basicly cause the methods to fail
+	the TDEConfig methods.  This would basicly cause the methods to fail
 	in strange and entertaining ways.  Since the methods with default
 	args had the default args ignored before this really changes nothing
 	on the public API.  This will someday change to an opaque proxy
@@ -346,7 +346,7 @@
 
 2004-11-30 Tuesday 10:45  geiseri
 
-	Added support for passing TQStringList through slots.  This fixed the problems with KConfig bindings not showing up.  It should also fix the problem of not being able to pass StringLists to C++ slots that have been published to javascript.
+	Added support for passing TQStringList through slots.  This fixed the problems with TDEConfig bindings not showing up.  It should also fix the problem of not being able to pass StringLists to C++ slots that have been published to javascript.
 
 2004-11-29 Monday 17:41  annma
 
@@ -932,8 +932,8 @@
 	  - Added support for a bunch more effects.
 	  - Shows the filename in the status bar.
 
-	- Added an accessor to the KConfig wrapper that lets you obtain an opaque
-	  pointer to the KConfig object.
+	- Added an accessor to the TDEConfig wrapper that lets you obtain an opaque
+	  pointer to the TDEConfig object.
 
 	- Updated class docs
 
@@ -2924,7 +2924,7 @@
 
 2003-09-17 Wednesday 21:09  geiseri
 
-	Added start of bindings for a KConfig object.
+	Added start of bindings for a TDEConfig object.
 	this is mostly untested, but it compiles so we can start to debug it.
 
 2003-09-17 Wednesday 01:43  geiseri
@@ -3283,7 +3283,7 @@
 
 2003-08-16 Saturday 15:52  rich
 
-	- Modify KIO::NetAccess binding to use KURLs now we support the 2
+	- Modify TDEIO::NetAccess binding to use KURLs now we support the 2
 	  argument variant.
 
 
@@ -3351,7 +3351,7 @@
 
 2003-08-15 Friday 04:59  zrusin
 
-	Adding KIO::NetAccess binding. So now from within scripts you can do:
+	Adding TDEIO::NetAccess binding. So now from within scripts you can do:
 	var net = application.create( 'NetAccess', 'net' );
 	net.download( 'http://www.kde.org/media/images/kde_logo.jpg', '~/logo.jpg' );
 	To download anything you want. It be cool if one could disable the progress
@@ -4093,7 +4093,7 @@
 	  - Supported KDE Widgets:
 
 	  KActiveLabel, KCharSelect, KColorButton, KColorCombo,
-	  KComboBox, KCModule, KDateWidget, KDatePicker, KDialog,
+	  KComboBox, TDECModule, KDateWidget, KDatePicker, KDialog,
 	  KDualColorButton, KEditListBox, KFontCombo, KGradientSelector,
 	  KHistoryCombo, KHSSelector, KLed, KListBox, KListView,
 	  KLineEdit, KPasswordEdit, KProgress, KPushButton,
diff --git a/kjsembed/docs/build-docs.sh b/kjsembed/docs/build-docs.sh
index 133dba91..1dcd8637 100755
--- a/kjsembed/docs/build-docs.sh
+++ b/kjsembed/docs/build-docs.sh
@@ -26,12 +26,12 @@ $JS write_docs.js 'StdIcons' 'StdIcons' 'Provides access to the KIconLoader.' >
 $JS write_docs.js 'Image' 'new Image()' 'Bindings to the TQImage class.' > $REF/image.html
 $JS write_docs.js 'Pixmap' 'new Pixmap()' 'Bindings to the TQPixmap class.' > $REF/pixmap.html
 $JS write_docs.js 'Painter' 'new Painter()' 'Bindings for painting on Pixmaps.' > $REF/painter.html
-$JS write_docs.js 'NetAccess' 'new NetAccess()' 'Bindings for KIO::NetAccess.' > $REF/netaccess.html
+$JS write_docs.js 'NetAccess' 'new NetAccess()' 'Bindings for TDEIO::NetAccess.' > $REF/netaccess.html
 $JS write_docs.js 'DCOPObject' 'new DCOPObject()' 'Provides support for DCOP.' > $REF/dcop.html
 $JS write_docs.js 'SqlDatabase' 'new SqlDatabase()' 'Provides support for QtSQL Databases.' > $REF/sqldatabase.html
 $JS write_docs.js 'SqlQuery' 'new SqlQuery()' 'Provides support for QtSQL Queries.' > $REF/sqlquery.html
 $JS write_docs.js 'TextStream' 'System.stdin' 'Bindings for TQTextSteam.' > $REF/textstream.html
-$JS write_docs.js 'Config' 'new Config()' 'Bindings to the KConfig class.' > $REF/config.html
+$JS write_docs.js 'Config' 'new Config()' 'Bindings to the TDEConfig class.' > $REF/config.html
 
 # Qt Objects
 OBJECTS="TQPushButton TQToolButton TQCheckBox TQRadioButton"
@@ -56,7 +56,7 @@ done
 OBJECTS=""
 
 OBJECTS="$OBJECTS KActiveLabel KCharSelect KColorButton KColorCombo"
-OBJECTS="$OBJECTS KComboBox KCModule KDateWidget KDatePicker KDialog"
+OBJECTS="$OBJECTS KComboBox TDECModule KDateWidget KDatePicker KDialog"
 OBJECTS="$OBJECTS KDualColorButton KEditListBox KFontCombo KGradientSelector"
 OBJECTS="$OBJECTS KHistoryCombo KHSSelector KLed KListBox KListView"
 OBJECTS="$OBJECTS KLineEdit KPasswordEdit KProgress KPushButton"
diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README
index 1c25cabd..9c048f35 100644
--- a/kjsembed/docs/embedding/simple-embed/README
+++ b/kjsembed/docs/embedding/simple-embed/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For more details, consult :
diff --git a/kjsembed/docs/examples/README b/kjsembed/docs/examples/README
index ce89dc9e..ec5e40da 100644
--- a/kjsembed/docs/examples/README
+++ b/kjsembed/docs/examples/README
@@ -44,7 +44,7 @@ qobject-dom        Illustrates the TQObject DOM API.
 connect-cpp        Connects a signal to slot.                                  
 connect            Connects signals of various types to JS methods.            
 imageviewer        Illustrates the use of TQPixmap values.                      
-netaccess          Illustrates the bindings to KIO::NetAccess.                 
+netaccess          Illustrates the bindings to TDEIO::NetAccess.                 
 listview           Creates a simple KListView.                                 
 frame              Shows off TQFrame support and the use of enums.              
 timer              Creates a flashing LED using TQTimer.                        
diff --git a/kjsembed/docs/examples/index.html b/kjsembed/docs/examples/index.html
index 4b48cc31..ef7c81cc 100644
--- a/kjsembed/docs/examples/index.html
+++ b/kjsembed/docs/examples/index.html
@@ -83,7 +83,7 @@ from a JS data structure, the other from the widget tree of a ui file.</td></tr>
 <tr><td><a href="imageviewer">imageviewer</a></td>
 <td>Illustrates the use of TQPixmap values.</td></tr>
 <tr><td><a href="netaccess">netaccess</a></td>
-<td>Illustrates the bindings to KIO::NetAccess.</td></tr>
+<td>Illustrates the bindings to TDEIO::NetAccess.</td></tr>
 <tr><td><a href="listview">listview</a></td>
 <td>Creates a simple KListView.</td></tr>
 <tr><td><a href="frame">frame</a></td>