diff options
Diffstat (limited to 'kmail/callback.cpp')
| -rw-r--r-- | kmail/callback.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 6f5636992..037f80900 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -64,7 +64,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const return transports.first(); const TQString defaultTransport = GlobalSettings::self()->defaultTransport(); - const int defaultIndex = QMAX( 0, transports.findIndex( defaultTransport ) ); + const int defaultIndex = TQMAX( 0, transports.findIndex( defaultTransport ) ); TQString text; if ( nullIdentity ) @@ -227,14 +227,14 @@ TQString Callback::receiver() const // select default identity by default const TQString defaultAddr = kmkernel->identityManager()->defaultIdentity().primaryEmailAddress(); - const int defaultIndex = QMAX( 0, addrs.findIndex( defaultAddr ) ); + const int defaultIndex = TQMAX( 0, addrs.findIndex( defaultAddr ) ); mReceiver = KInputDialog::getItem( i18n( "Select Address" ), selectMessage, addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); if( !ok ) - mReceiver = TQString::null; + mReceiver = TQString(); } return mReceiver; |