From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson 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 --- korn/kmail_proto.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'korn/kmail_proto.cpp') diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index b0b65233..fb6166c3 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -38,7 +38,7 @@ const char* KMail_Protocol::kmailKeyType = "Type"; const char* KMail_Protocol::kmailKeyName = "Name"; const char* KMail_Protocol::kmailKeyId = "Id"; const char* KMail_Protocol::kmailKeyMBox = "Location"; -const char* KMail_Protocol::kmailKeyQMail = "Location"; +const char* KMail_Protocol::kmailKeyTQMail = "Location"; const int KMail_Protocol::kmailFirstGroup = 1; class KMailDrop; @@ -164,7 +164,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config result->insert( "ssl", "false" ); result->insert( "metadata", "" ); result->insert( "username", "" ); - result->insert( "mailbox", kmailconfig.readPathEntry( kmailKeyQMail, "" ) ); + result->insert( "mailbox", kmailconfig.readPathEntry( kmailKeyTQMail, "" ) ); result->insert( "password", "" ); result->insert( "savepassword", "false" ); } @@ -188,8 +188,8 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); - type = kmailconfig.readEntry( kmailKeyType, TQString::null ); - name = kmailconfig.readEntry( kmailKeyName, TQString::null ); + type = kmailconfig.readEntry( kmailKeyType, TQString() ); + name = kmailconfig.readEntry( kmailKeyName, TQString() ); if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" ) { accountList.insert( name, name ); @@ -227,7 +227,7 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) ) { kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) ); - if( kmailconfig.readEntry( kmailKeyName, TQString::null ) == kmailname ) + if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname ) { id = kmailconfig.readNumEntry( kmailKeyId, 0 ); found = true; @@ -237,10 +237,10 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k if( !found ) { nummer = -1; - return TQString::null; + return TQString(); } //The correct group is found, and kmailconfig.setGroup() is already called for the right group. - return kmailconfig.readEntry( kmailKeyType, TQString::null ); + return kmailconfig.readEntry( kmailKeyType, TQString() ); } -- cgit v1.2.3