Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

3 files changed, 10 insertions, 10 deletions

diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index 7ecd14554..85b9b12b0 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -45,7 +45,7 @@
 
 using namespace KABC;
 
-ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent,  const char* name )
+ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent,  const char* name )
   : KRES::ConfigWidget( parent, name )
 {
   TQBoxLayout *mainLayout = new TQVBoxLayout( this );
@@ -62,12 +62,12 @@ ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent,  const char* nam
   connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) );
 }
 
-void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
+void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res )
 {
   ResourceLDAPKIO *resource = dynamic_cast<ResourceLDAPKIO*>( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceLDAPKIOConfig::loadSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceLDAPTDEIOConfig::loadSettings(): cast failed" << endl;
     return;
   }
 
@@ -98,12 +98,12 @@ void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
   mAutoCache = resource->autoCache();
 }
 
-void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res )
+void ResourceLDAPTDEIOConfig::saveSettings( KRES::Resource *res )
 {
   ResourceLDAPKIO *resource = dynamic_cast<ResourceLDAPKIO*>( res );
   
   if ( !resource ) {
-    kdDebug(5700) << "ResourceLDAPKIOConfig::saveSettings(): cast failed" << endl;
+    kdDebug(5700) << "ResourceLDAPTDEIOConfig::saveSettings(): cast failed" << endl;
     return;
   }
 
@@ -131,7 +131,7 @@ void ResourceLDAPKIOConfig::saveSettings( KRES::Resource *res )
 
 }
 
-void ResourceLDAPKIOConfig::editAttributes()
+void ResourceLDAPTDEIOConfig::editAttributes()
 {
   AttributesDialog dlg( mAttributes, mRDNPrefix, this );
   if ( dlg.exec() ) {
@@ -140,7 +140,7 @@ void ResourceLDAPKIOConfig::editAttributes()
   }
 }
 
-void ResourceLDAPKIOConfig::editCache()
+void ResourceLDAPTDEIOConfig::editCache()
 {
   LDAPUrl src;
   TQStringList attr;
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h
index f8e0003ec..e14c7c428 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h
@@ -42,12 +42,12 @@ class KLineEdit;
 
 namespace KABC {
 
-class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget
+class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
 
   public:
-    ResourceLDAPKIOConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 );
 
   public slots:
     void loadSettings( KRES::Resource* );
diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
index 975837bf8..7edb90e22 100644
--- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
@@ -31,6 +31,6 @@ extern "C"
   KDE_EXPORT void *init_kabc_ldapkio()
   {
     TDEGlobal::locale()->insertCatalogue("kabc_ldapkio");
-    return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>();
+    return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPTDEIOConfig>();
   }
 }