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

---
 libtdepim/addresseeview.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'libtdepim/addresseeview.cpp')

diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 5be001a67..559f01713 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -51,7 +51,7 @@
 using namespace KPIM;
 
 AddresseeView::AddresseeView( TQWidget *parent, const char *name,
-                              KConfig *config )
+                              TDEConfig *config )
   : KTextBrowser( parent, name ), mDefaultConfig( false ), mImageJob( 0 ),
     mLinkMask( AddressLinks | EmailLinks | PhoneLinks | URLLinks | IMLinks | CustomFields )
 {
@@ -97,7 +97,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
   connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) );
 
   if ( !config ) {
-    mConfig = new KConfig( "kaddressbookrc" );
+    mConfig = new TDEConfig( "kaddressbookrc" );
     mDefaultConfig = true;
   } else
     mConfig = config;
@@ -546,11 +546,11 @@ void AddresseeView::updateView()
       if ( mImageData.count() > 0 )
         TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) );
       else {
-        mImageJob = KIO::get( KURL( picture.url() ), false, false );
-        connect( mImageJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-                 this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
-        connect( mImageJob, TQT_SIGNAL( result( KIO::Job* ) ),
-                 this, TQT_SLOT( result( KIO::Job* ) ) );
+        mImageJob = TDEIO::get( KURL( picture.url() ), false, false );
+        connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+                 this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+        connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
+                 this, TQT_SLOT( result( TDEIO::Job* ) ) );
       }
     } else {
       TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL,
@@ -582,7 +582,7 @@ void AddresseeView::emailClicked( const TQString &email )
 
 void AddresseeView::phoneNumberClicked( const TQString &number )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "PhoneHookApplication" );
 
@@ -597,7 +597,7 @@ void AddresseeView::phoneNumberClicked( const TQString &number )
 
 void AddresseeView::smsTextClicked( const TQString &number )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "SMSHookApplication" );
 
@@ -614,7 +614,7 @@ void AddresseeView::smsTextClicked( const TQString &number )
 
 void AddresseeView::sendSMS( const TQString &number, const TQString &text )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "SMSHookApplication" );
 
@@ -631,7 +631,7 @@ void AddresseeView::sendSMS( const TQString &number, const TQString &text )
 
 void AddresseeView::faxNumberClicked( const TQString &number )
 {
-  KConfig config( "kaddressbookrc" );
+  TDEConfig config( "kaddressbookrc" );
   config.setGroup( "General" );
   TQString commandLine = config.readEntry( "FaxHookApplication", "tdeprintfax --phone %N" );
 
@@ -734,14 +734,14 @@ void AddresseeView::configChanged()
   updateView();
 }
 
-void AddresseeView::data( KIO::Job*, const TQByteArray &d )
+void AddresseeView::data( TDEIO::Job*, const TQByteArray &d )
 {
   unsigned int oldSize = mImageData.size();
   mImageData.resize( oldSize + d.size() );
   memcpy( mImageData.data() + oldSize, d.data(), d.size() );
 }
 
-void AddresseeView::result( KIO::Job *job )
+void AddresseeView::result( TDEIO::Job *job )
 {
   mImageJob = 0;
 
-- 
cgit v1.2.1