From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kaddressbook/xxport/csv_xxport.cpp      |  2 +-
 kaddressbook/xxport/csvimportdialog.cpp |  2 +-
 kaddressbook/xxport/ldif_xxport.cpp     |  2 +-
 kaddressbook/xxport/vcard_xxport.cpp    | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kaddressbook/xxport')

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 9c270a2e3..f3d47bfc3 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -66,7 +66,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQFile file( url.path() );
     if ( !file.open( IO_WriteOnly ) ) {
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 728823019..40c209dce 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -866,7 +866,7 @@ void CSVImportDialog::saveTemplate()
   if ( name.isEmpty() )
     return;
 
-  KConfig config( fileName );
+  TDEConfig config( fileName );
   config.setGroup( "General" );
   config.writeEntry( "DatePattern", mDatePatternEdit->text() );
   config.writeEntry( "Columns", mTable->numCols() );
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 30718a9f0..f0c13e610 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -114,7 +114,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index ad85389fe..34a6809fa 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
           else
             testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();
 
-          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
+          if ( TDEIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
             counter++;
             url = testUrl + TQString::number( counter ) + ".vcf";
           } else
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     bool anyFailures = false;
     KURL::List::Iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
-      if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
+      if ( TDEIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
 
         TQFile file( fileName );
 
@@ -247,7 +247,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
             addrList += parseVCard( vCardText );
           }
 #endif
-          KIO::NetAccess::removeTempFile( fileName );
+          TDEIO::NetAccess::removeTempFile( fileName );
         } else {
           TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
           text = text.arg( (*it).url() );
@@ -258,7 +258,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
         }
       } else {
         TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
-        text = text.arg( KIO::NetAccess::lastErrorString() );
+        text = text.arg( TDEIO::NetAccess::lastErrorString() );
         KMessageBox::error( parentWidget(), text, caption );
         anyFailures = true;
       }
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
   tmpFile.file()->writeBlock( data.data(), data.size() );
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #else
 KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
   stream << data;
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
 }
 #endif
 
@@ -561,7 +561,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
   mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
   layout->addWidget( mEncryptionKeys );
 
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
 
   mPrivateBox->setChecked( config.readBoolEntry( "ExportPrivateFields", true ) );
@@ -572,7 +572,7 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
 
 VCardExportSelectionDialog::~VCardExportSelectionDialog()
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
 
   config.writeEntry( "ExportPrivateFields", mPrivateBox->isChecked() );
-- 
cgit v1.2.1