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

---
 libkpimidentities/identity.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libkpimidentities/identity.cpp')

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c0ce5a6e8..761236f55 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -121,7 +121,7 @@ TQString Signature::textFromFile( bool * ok ) const
 {
   assert( mType == FromFile );
 
-  // ### FIXME: Use KIO::NetAccess to download non-local files!
+  // ### FIXME: Use TDEIO::NetAccess to download non-local files!
   if ( !KURL(mUrl).isLocalFile() && !(TQFileInfo(mUrl).isRelative()
                                       && TQFileInfo(mUrl).exists()) ) {
     kdDebug( 5006 ) << "Signature::textFromFile: non-local URLs are unsupported" << endl;
@@ -172,7 +172,7 @@ static const char sigTextKey[] = "Inline Signature";
 static const char sigFileKey[] = "Signature File";
 static const char sigCommandKey[] = "Signature Command";
 
-void Signature::readConfig( const KConfigBase * config )
+void Signature::readConfig( const TDEConfigBase * config )
 {
   TQString sigType = config->readEntry( sigTypeKey );
   if ( sigType == sigTypeInlineValue ) {
@@ -189,7 +189,7 @@ void Signature::readConfig( const KConfigBase * config )
   mText = config->readEntry( sigTextKey );
 }
 
-void Signature::writeConfig( KConfigBase * config ) const
+void Signature::writeConfig( TDEConfigBase * config ) const
 {
   switch ( mType ) {
   case Inlined:
@@ -316,7 +316,7 @@ Identity::~Identity()
 }
 
 
-void Identity::readConfig( const KConfigBase * config )
+void Identity::readConfig( const TDEConfigBase * config )
 {
   mUoid = config->readUnsignedNumEntry("uoid",0);
 
@@ -353,7 +353,7 @@ void Identity::readConfig( const KConfigBase * config )
 }
 
 
-void Identity::writeConfig( KConfigBase * config ) const
+void Identity::writeConfig( TDEConfigBase * config ) const
 {
   config->writeEntry("uoid", mUoid);
 
-- 
cgit v1.2.1