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

1 files changed, 9 insertions, 9 deletions

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index fb2f1ac18..62eeba756 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;