From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: Initial conversion of kdepim to TQt This will probably require some
 tweaking before it will build under Qt4, however Qt3 builds are OK.  Any
 alterations this commit makes to kdepim behaviour under Qt3 are unintentional
 and should be fixed.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libkpimidentities/identity.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'libkpimidentities/identity.cpp')

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index 62eeba75..0855f8c3 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -63,7 +63,7 @@ TQString Signature::rawText( bool * ok ) const
   switch ( mType ) {
   case Disabled:
     if ( ok ) *ok = true;
-    return TQString::null;
+    return TQString();
   case Inlined:
     if ( ok ) *ok = true;
     return mText;
@@ -73,7 +73,7 @@ TQString Signature::rawText( bool * ok ) const
     return textFromCommand( ok );
   };
   kdFatal( 5006 ) << "Signature::type() returned unknown value!" << endl;
-  return TQString::null; // make compiler happy
+  return TQString(); // make compiler happy
 }
 
 TQString Signature::textFromCommand( bool * ok ) const
@@ -83,7 +83,7 @@ TQString Signature::textFromCommand( bool * ok ) const
   // handle pathological cases:
   if ( mUrl.isEmpty() ) {
     if ( ok ) *ok = true;
-    return TQString::null;
+    return TQString();
   }
 
   // create a shell process:
@@ -104,7 +104,7 @@ TQString Signature::textFromCommand( bool * ok ) const
     TQString wmsg = i18n("<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>")
       .arg( mUrl ).arg( strerror(rc) );
     KMessageBox::error(0, wmsg);
-    return TQString::null;
+    return TQString();
   }
 
   // no errors:
@@ -126,7 +126,7 @@ TQString Signature::textFromFile( bool * ok ) const
                                       && TQFileInfo(mUrl).exists()) ) {
     kdDebug( 5006 ) << "Signature::textFromFile: non-local URLs are unsupported" << endl;
     if ( ok ) *ok = false;
-    return TQString::null;
+    return TQString();
   }
   if ( ok ) *ok = true;
   // ### hmm, should we allow other encodings, too?
@@ -139,14 +139,14 @@ TQString Signature::withSeparator( bool * ok ) const
   TQString signature = rawText( &internalOK );
   if ( !internalOK ) {
     if ( ok ) *ok = false;
-    return TQString::null;
+    return TQString();
   }
   if ( ok ) *ok = true;
   if ( signature.isEmpty() ) return signature; // don't add a separator in this case
   if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
     // already have signature separator at start of sig:
     return TQString::tqfromLatin1("\n") += signature;
-  else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
+  else if ( signature.tqfind( TQString::tqfromLatin1("\n-- \n") ) != -1 )
     // already have signature separator inside sig; don't prepend '\n'
     // to improve abusing signatures as templates:
     return signature;
@@ -528,7 +528,7 @@ TQString Identity::fullEmailAddr(void) const
 
   TQString result;
 
-  // add DQUOTE's if necessary:
+  // add DTQUOTE's if necessary:
   bool needsQuotes=false;
   for (unsigned int i=0; i < mFullName.length(); i++) {
     if ( specials.tqcontains( mFullName[i] ) )
@@ -643,7 +643,7 @@ TQString Identity::signatureText( bool * ok ) const
   // Signature::withSeparator() failed, so we should probably fix the
   // cause:
   if ( ok ) *ok = false;
-  return TQString::null;
+  return TQString();
 
 #if 0 // ### FIXME: error handling
   if (mSignatureFile.endsWith("|"))
@@ -654,5 +654,5 @@ TQString Identity::signatureText( bool * ok ) const
   }
 #endif
 
-  return TQString::null;
+  return TQString();
 }
-- 
cgit v1.2.3