diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kmail/kmfolder.cpp | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
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
Diffstat (limited to 'kmail/kmfolder.cpp')
-rw-r--r-- | kmail/kmfolder.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 3825d1ee9..307823c96 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -90,13 +90,13 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + tqparent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), - parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); + tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ), - parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); + tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); } // Resend all mStorage signals @@ -237,17 +237,17 @@ KMFolderType KMFolder::folderType() const TQString KMFolder::fileName() const { - return mStorage ? mStorage->fileName() : TQString::null; + return mStorage ? mStorage->fileName() : TQString(); } TQString KMFolder::location() const { - return mStorage ? mStorage->location() : TQString::null; + return mStorage ? mStorage->location() : TQString(); } TQString KMFolder::indexLocation() const { - return mStorage ? mStorage->indexLocation() : TQString::null; + return mStorage ? mStorage->indexLocation() : TQString(); } TQString KMFolder::subdirLocation() const @@ -284,11 +284,11 @@ KMFolderDir* KMFolder::createChildFolder() else if( folderType() == KMFolderTypeImap ) newType = KMImapDir; - mChild = new KMFolderDir( this, parent(), childName, newType ); + mChild = new KMFolderDir( this, tqparent(), childName, newType ); if( !mChild ) return 0; mChild->reload(); - parent()->append( mChild ); + tqparent()->append( mChild ); return mChild; } @@ -432,14 +432,14 @@ int KMFolder::moveMsg(TQPtrList<KMMessage> q, int* index_return ) return mStorage->moveMsg( q, index_return ); } -int KMFolder::find( const KMMsgBase* msg ) const +int KMFolder::tqfind( const KMMsgBase* msg ) const { - return mStorage ? mStorage->find( msg ) : -1; + return mStorage ? mStorage->tqfind( msg ) : -1; } -int KMFolder::find( const KMMessage* msg ) const +int KMFolder::tqfind( const KMMessage* msg ) const { - return mStorage ? mStorage->find( msg ) : -1; + return mStorage ? mStorage->tqfind( msg ) : -1; } int KMFolder::count( bool cache ) const @@ -470,10 +470,10 @@ int KMFolder::countUnreadRecursive() return count; } -void KMFolder::msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx ) +void KMFolder::msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx ) { - mStorage->msgStatusChanged( oldStatus, newStatus, idx ); + mStorage->msgStatusChanged( oldtqStatus, newtqStatus, idx ); } int KMFolder::open(const char *owner) @@ -592,11 +592,11 @@ TQString KMFolder::label() const //----------------------------------------------------------------------------- TQString KMFolder::prettyURL() const { - TQString parentUrl; - if ( parent() ) - parentUrl = parent()->prettyURL(); - if ( !parentUrl.isEmpty() ) - return parentUrl + '/' + label(); + TQString tqparentUrl; + if ( tqparent() ) + tqparentUrl = tqparent()->prettyURL(); + if ( !tqparentUrl.isEmpty() ) + return tqparentUrl + '/' + label(); else return label(); } @@ -614,7 +614,7 @@ TQString KMFolder::mailingListPostAddress() const return (*it).path(); } } - return TQString::null; + return TQString(); } void KMFolder::setMailingListEnabled( bool enabled ) @@ -704,11 +704,11 @@ void KMFolder::correctUnreadMsgsCount() TQString KMFolder::idString() const { - KMFolderNode* folderNode = parent(); + KMFolderNode* folderNode = tqparent(); if (!folderNode) return ""; - while ( folderNode->parent() ) - folderNode = folderNode->parent(); + while ( folderNode->tqparent() ) + folderNode = folderNode->tqparent(); TQString myPath = path(); int pathLen = myPath.length() - folderNode->path().length(); TQString relativePath = myPath.right( pathLen ); @@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex ) return mStorage->writeIndex( createEmptyIndex ); } -void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle ) +void KMFolder::setqStatus( int idx, KMMsgtqStatus status, bool toggle ) { - mStorage->seStatus( idx, status, toggle ); + mStorage->setqStatus( idx, status, toggle ); } -void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status, +void KMFolder::setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle ) { - mStorage->seStatus( ids, status, toggle); + mStorage->setqStatus( ids, status, toggle); } void KMFolder::setIconPaths( const TQString &normalPath, @@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type ) void KMFolder::slotFolderSizeChanged() { emit folderSizeChanged( this ); - KMFolder* papa = parent()->manager()->parentFolder( this ); + KMFolder* papa = tqparent()->manager()->tqparentFolder( this ); if ( papa && papa != this ) { papa->slotFolderSizeChanged(); } @@ -901,7 +901,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) KMFolderType fldType = folderType(); // names of local folders must not contain a '/' - if ( folderName.find( '/' ) != -1 && + if ( folderName.tqfind( '/' ) != -1 && fldType != KMFolderTypeImap && fldType != KMFolderTypeCachedImap ) { message = i18n( "Folder names cannot contain the / (slash) character; please choose another folder name." ); @@ -928,7 +928,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) delimiter = ai->delimiterForFolder( mStorage ); } } - if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) { + if ( !delimiter.isEmpty() && folderName.tqfind( delimiter ) != -1 ) { message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ); return false; } |