From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 16 Feb 2011 20:17:18 +0000
Subject: Moved kpilot from kdepim to applications, as the core Trinity
 libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libkpimidentities/identity.cpp        | 18 +++++++++---------
 libkpimidentities/identitymanager.cpp |  6 +++---
 libkpimidentities/identitymanager.h   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'libkpimidentities')

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index fb2f1ac1..62eeba75 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -143,16 +143,16 @@ TQString Signature::withSeparator( bool * ok ) const
   }
   if ( ok ) *ok = true;
   if ( signature.isEmpty() ) return signature; // don't add a separator in this case
-  if ( signature.startsWith( TQString::fromLatin1("-- \n") ) )
+  if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
     // already have signature separator at start of sig:
-    return TQString::fromLatin1("\n") += signature;
-  else if ( signature.find( TQString::fromLatin1("\n-- \n") ) != -1 )
+    return TQString::tqfromLatin1("\n") += signature;
+  else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
     // already have signature separator inside sig; don't prepend '\n'
     // to improve abusing signatures as templates:
     return signature;
   else
     // need to prepend one:
-    return TQString::fromLatin1("\n-- \n") + signature;
+    return TQString::tqfromLatin1("\n-- \n") + signature;
 }
 
 
@@ -211,13 +211,13 @@ void Signature::writeConfig( KConfigBase * config ) const
 }
 
 TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Signature & sig ) {
-  return stream << static_cast<Q_UINT8>(sig.mType)
+  return stream << static_cast<TQ_UINT8>(sig.mType)
 		<< sig.mUrl
 		<< sig.mText;
 }
 
 TQDataStream & KPIM::operator>>( TQDataStream & stream, KPIM::Signature & sig ) {
-    Q_UINT8 s;
+    TQ_UINT8 s;
     stream >> s
            >> sig.mUrl
            >> sig.mText;
@@ -382,7 +382,7 @@ void Identity::writeConfig( KConfigBase * config ) const
 }
 
 TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Identity & i ) {
-  return stream << static_cast<Q_UINT32>(i.uoid())
+  return stream << static_cast<TQ_UINT32>(i.uoid())
 		<< i.identityName()
 		<< i.fullName()
 		<< i.organization()
@@ -406,7 +406,7 @@ TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Identity & i
 }
 
 TQDataStream & KPIM::operator>>( TQDataStream & stream, KPIM::Identity & i ) {
-  Q_UINT32 uoid;
+  TQ_UINT32 uoid;
   TQString format;
   stream        >> uoid
 		>> i.mIdentity
@@ -531,7 +531,7 @@ TQString Identity::fullEmailAddr(void) const
   // add DQUOTE's if necessary:
   bool needsQuotes=false;
   for (unsigned int i=0; i < mFullName.length(); i++) {
-    if ( specials.contains( mFullName[i] ) )
+    if ( specials.tqcontains( mFullName[i] ) )
       needsQuotes = true;
     else if ( mFullName[i] == '\\' || mFullName[i] == '"' ) {
       needsQuotes = true;
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index e7380ca6..939cb704 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -201,7 +201,7 @@ void IdentityManager::writeConfig() const {
   int i = 0;
   for ( ConstIterator it = mIdentities.begin() ;
 	it != mIdentities.end() ; ++it, ++i ) {
-    KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
+    KConfigGroup cg( mConfig, TQString::tqfromLatin1("Identity #%1").arg(i) );
     (*it).writeConfig( &cg );
     if ( (*it).isDefault() ) {
       // remember which one is default:
@@ -326,7 +326,7 @@ Identity & IdentityManager::modifyIdentityForName( const TQString & name )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).identityName() == name ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() replacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() tqreplacement!"
 		    << "\n  name == \"" << name << "\"" << endl;
   return newFromScratch( name );
 }
@@ -335,7 +335,7 @@ Identity & IdentityManager::modifyIdentityForUoid( uint uoid )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).uoid() == uoid ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() replacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() tqreplacement!"
 		    << "\n  uoid == \"" << uoid << "\"" << endl;
   return newFromScratch( i18n("Unnamed") );
 }
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index dfb8e8ab..4c8587be 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -101,7 +101,7 @@ public:
   **/
   const Identity & identityForAddress( const TQString & addresses ) const;
 
-  /** @return true if @p addressList contains any of our addresses,
+  /** @return true if @p addressList tqcontains any of our addresses,
       false otherwise.
       @see #identityForAddress
   **/
-- 
cgit v1.2.3