From 4c6f8d69e2d1501837affb472c4eb8fec4462240 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/kmfolder.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kmail/kmfolder.cpp') diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index e8fa8a3d5..08fe43e01 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -432,14 +432,14 @@ int KMFolder::moveMsg(TQPtrList q, int* index_return ) return mStorage->moveMsg( q, index_return ); } -int KMFolder::tqfind( const KMMsgBase* msg ) const +int KMFolder::find( const KMMsgBase* msg ) const { - return mStorage ? mStorage->tqfind( msg ) : -1; + return mStorage ? mStorage->find( msg ) : -1; } -int KMFolder::tqfind( const KMMessage* msg ) const +int KMFolder::find( const KMMessage* msg ) const { - return mStorage ? mStorage->tqfind( msg ) : -1; + return mStorage ? mStorage->find( msg ) : -1; } int KMFolder::count( bool cache ) const @@ -717,8 +717,8 @@ TQString KMFolder::idString() const TQString escapedName = name(); /* Escape [ and ] as they are disallowed for kconfig sections and that is what the idString is primarily used for. */ - escapedName.tqreplace( "[", "%(" ); - escapedName.tqreplace( "]", "%)" ); + escapedName.replace( "[", "%(" ); + escapedName.replace( "]", "%)" ); return relativePath + escapedName; } @@ -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.tqfind( '/' ) != -1 && + if ( folderName.find( '/' ) != -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.tqfind( delimiter ) != -1 ) { + if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) { message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).tqarg( delimiter ); return false; } -- cgit v1.2.1