diff options
Diffstat (limited to 'kmail')
75 files changed, 388 insertions, 388 deletions
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 8f7a6503..b1355c12 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -451,9 +451,9 @@ Currently defined tags are: MDNLink SerialNumber SerNum of MDN received for this message DNSLink SerialNumber SerNUm of DSN received for this message ThreadHeads SerialNumberList MD5Hash's of all (so far discovered) - _top-level thread tqparents_ + _top-level thread parents_ ThreadParents SerialNumberList MD5Hash's of all (so far discovered) - thread tqparents + thread parents "String" is either Utf8String or (Utf16String or Latin1String), @@ -589,16 +589,16 @@ Strategy: case. These are messages that have neither an In-Reply-To header nor a References header and have a subject that is not prefixed. In case there is a perfect tqparent, the current sort cache item is - appended to the tqparents list of unsorted tqchildren, or to that of + appended to the parents list of unsorted tqchildren, or to that of root, if there is not. A sort cache item is created in the mSortCache for the tqparent, if it is not already there. Messages with a tqparent of - -1 are appended to the "untqparented" list, which is later traversed and + -1 are appended to the "unparented" list, which is later traversed and its elements threaded. Messages with -2 as the tqparent are tqchildren of root as well, as noted above, and will remain so. Once the end of the file is reached, we should have a nicely filled mSortCache, containing a sort cache item for each message that was in the - sorted file. Messages with perfect tqparents know about them, top level + sorted file. Messages with perfect parents know about them, top level messages know about that as well, all others are on a list and will be threaded later. @@ -608,16 +608,16 @@ Strategy: to mFolder->count() are looked at and a SortCacheItem is created for the ones that do not have one yet. This is where all sort cache items are created if there was no sorted file. The items created here are by definition un- - sorted as well as untqparented. On creation their sort key is figured out as + sorted as well as unparented. On creation their sort key is figured out as well. - The next step is finding tqparents for those messages that are either new, or + The next step is finding parents for those messages that are either new, or had a tqparent of -1 in the .sorted file. To that end, a dict of all sort cache items indexed by the md5 hash of their messsage id headers is created, that will be used for looking up sort cache items by message id. The list of - yet untqparented messages is then traversed and findParent() called for each + yet unparented messages is then traversed and findParent() called for each element wihch checks In-Reply-To and References headers and looks up the - sort cache item of those tqparents in the above mentioned dict. Should none be + sort cache item of those parents in the above mentioned dict. Should none be found, the item is added to a second list the items of which will be subject threaded. @@ -646,7 +646,7 @@ Strategy: the messages that are now top-level, the current thread heads, so to speak, are collected into a second dict ( QDict< QPtrList< SortCacheItem > > ) that contains for each different subject an entry holding a list of (so far - top level) messages with that subject, that are potential tqparents for + top level) messages with that subject, that are potential parents for threading by subjects. These lists are sorted by date, so the tqparent closest by date can be chosen. Sorting of these lists happens via insertion sort while they are built because not only are they expected to be short (apart @@ -709,13 +709,13 @@ What happens when a message arrives in the folder? thread, those status bits are inherited from the tqparent. The message is also added to the dict of header items, the index of messages by message id and, if applicable and if the message is threaded at top level, to the list of - potential tqparents for subject threading. + potential parents for subject threading. After those house keeping tasks are performed, the list of as of yet imper- fectly threaded messages is traversed and our newly arrived message is considered as a new tqparent for each item on it. This is especially important - to ensure that tqparents arriving out of order after their tqchildren still end - up as tqparents. If necessary, the entries in the .sorted file of rethreaded + to ensure that parents arriving out of order after their tqchildren still end + up as parents. If necessary, the entries in the .sorted file of rethreaded messages are updated. An entry for the new message itself is appended to the .sorted file as well. diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 37c9d77b..9340e774 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -358,11 +358,11 @@ void AccountManager::checkMail( bool _interactive ) //----------------------------------------------------------------------------- void AccountManager::singleInvalidateIMAPFolders(KMAccount *account) { - account->tqinvalidateIMAPFolders(); + account->invalidateIMAPFolders(); } -void AccountManager::tqinvalidateIMAPFolders() +void AccountManager::invalidateIMAPFolders() { for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) singleInvalidateIMAPFolders( *it ); diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index c88aab92..2fac30c3 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -83,7 +83,7 @@ public: void checkMail( bool interactive = true ); /** Delete all IMAP folders and resync them */ - void tqinvalidateIMAPFolders(); + void invalidateIMAPFolders(); TQStringList getAccounts() const; diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp index 337c843c..a4520f3c 100644 --- a/kmail/bodyvisitor.cpp +++ b/kmail/bodyvisitor.cpp @@ -116,7 +116,7 @@ namespace KMail { // check whether to load this part or not: // look at the basic list, ask the subclass and check the tqparent if ( mBasicList.tqcontains( part->originalContentTypeStr() ) || - tqparentNeedsLoading( part ) || + parentNeedsLoading( part ) || addPartToList( part ) ) { if ( part->typeStr() != "MULTIPART" || @@ -137,7 +137,7 @@ namespace KMail { } //----------------------------------------------------------------------------- - bool BodyVisitor::tqparentNeedsLoading( KMMessagePart *msgPart ) + bool BodyVisitor::parentNeedsLoading( KMMessagePart *msgPart ) { KMMessagePart *part = msgPart; while ( part ) diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index 4ccd1659..1f236c4a 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -60,10 +60,10 @@ namespace KMail { protected: /** - * Checks if one of the tqparents needs loaded tqchildren + * Checks if one of the parents needs loaded tqchildren * This is e.g. needed for multipart/signed where all parts have to be loaded */ - static bool tqparentNeedsLoading( KMMessagePart * part ); + static bool parentNeedsLoading( KMMessagePart * part ); protected: TQPtrList<KMMessagePart> mParts; diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index ca95344c..968529be 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -549,11 +549,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) return; } else { KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() ); - KMFolderCachedImap* tqparentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); + KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); Q_ASSERT( storage ); - Q_ASSERT( tqparentStorage ); + Q_ASSERT( parentStorage ); if ( storage->imapPath().isEmpty() ) { - TQString path = mAccount->createImapPath( tqparentStorage->imapPath(), storage->folder()->name() ); + TQString path = mAccount->createImapPath( parentStorage->imapPath(), storage->folder()->name() ); if ( !storage->imapPathForCreation().isEmpty() ) path = storage->imapPathForCreation(); storage->setImapPath( path ); diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui index 4081d62b..7ffe6c9d 100644 --- a/kmail/composercryptoconfiguration.ui +++ b/kmail/composercryptoconfiguration.ui @@ -154,5 +154,5 @@ However, there may be local rules that require you to turn this option on. When <tabstop>mAutoEncrypt</tabstop> <tabstop>mNeverEncryptWhenSavingInDrafts</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 993c6c74..e1fa0898 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -3020,7 +3020,7 @@ void ComposerPage::PhrasesTab::saveActiveLanguageItem() { void ComposerPage::PhrasesTab::slotNewLanguage() { - NewLanguageDialog dialog( mLanguageList, tqparentWidget(), "New", true ); + NewLanguageDialog dialog( mLanguageList, parentWidget(), "New", true ); if ( dialog.exec() == TQDialog::Accepted ) slotAddNewLanguage( dialog.language() ); } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 098e9087..a6705c76 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -269,10 +269,10 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); + TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): - if ( text(i).tqfind( tqparenthizedLanguage ) >= 0 ) { + if ( text(i).tqfind( parenthizedLanguage ) >= 0 ) { setCurrentItem(i); return; } diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index d8ada26b..7060794c 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -355,7 +355,7 @@ <slot>mAdd_clicked()</slot> <slot>mRemove_clicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index e16c19cb..ae12c124 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -49,13 +49,13 @@ using namespace KMail; EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith, - TQObject * tqparent, TQWidget *tqparentWidget) : + TQObject * tqparent, TQWidget *parentWidget) : TQObject( tqparent ), mUrl( url ), mMimeType( mimeType ), mOpenWith( openWith ), mEditor( 0 ), - mParentWidget( tqparentWidget ), + mParentWidget( parentWidget ), mHaveInotify( false ), mFileOpen( false ), mEditorRunning( false ), diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index 68fdb54e..daa35d8a 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -44,11 +44,11 @@ class EditorWatcher : public TQObject * Constructs an EditorWatcher. * @param tqparent the tqparent object of this EditorWatcher, which will take care of deleting * this EditorWatcher if the tqparent is deleted. - * @param tqparentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent + * @param parentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent * widget for message dialogs. */ EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith, - TQObject *tqparent, TQWidget *tqparentWidget ); + TQObject *tqparent, TQWidget *parentWidget ); bool start(); bool fileChanged() const { return mFileModified; } signals: diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index c850cf2e..5237787e 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -363,7 +363,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) ); } -// Warning before save() this will return the url of the _tqparent_ folder, when creating a new one +// Warning before save() this will return the url of the _parent_ folder, when creating a new one KURL KMail::FolderDiaACLTab::imapURL() const { KURL url = mImapAccount->getUrl(); @@ -398,9 +398,9 @@ void KMail::FolderDiaACLTab::load() if ( mDlg->folder() ) { // existing folder initializeWithValuesFromFolder( mDlg->folder() ); - } else if ( mDlg->tqparentFolder() ) { + } else if ( mDlg->parentFolder() ) { // new folder - initializeWithValuesFromFolder( mDlg->tqparentFolder() ); + initializeWithValuesFromFolder( mDlg->parentFolder() ); mChanged = true; // ensure that saving happens } @@ -421,7 +421,7 @@ void KMail::FolderDiaACLTab::load() mUserIdFormat = UserName; if ( mFolderType == KMFolderTypeCachedImap ) { - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() ); if ( mUserRightsState == KMail::ACLJobs::FetchFailed || folderImap->aclListState() == KMail::ACLJobs::FetchFailed ) { @@ -450,7 +450,7 @@ void KMail::FolderDiaACLTab::load() mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) ); return; } - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); @@ -481,7 +481,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString if ( mUserRightsState != KMail::ACLJobs::Ok ) { connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getUserRights( folder, mImapPath ); } else @@ -495,7 +495,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) return; } - if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) { + if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); mUserRights = folderImap->userRights(); mUserRightsState = folderImap->userRightsState(); @@ -506,14 +506,14 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) void KMail::FolderDiaACLTab::startListing() { // List ACLs of folder - or its tqparent, if creating a new folder - mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(), mImapPath ); + mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath ); connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )), this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) ); } void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList ) { - if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) ) { + if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) { disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )), this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) ); @@ -723,15 +723,15 @@ bool KMail::FolderDiaACLTab::save() mACLList = aclList; - KMFolderImap* tqparentImap = mDlg->tqparentFolder() ? static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) : 0; + KMFolderImap* parentImap = mDlg->parentFolder() ? static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) : 0; if ( mDlg->isNewFolder() ) { // The folder isn't created yet, wait for it // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete - connect( tqparentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), + connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); } else { - slotDirectoryListingFinished( tqparentImap ); + slotDirectoryListingFinished( parentImap ); } return true; } @@ -739,7 +739,7 @@ bool KMail::FolderDiaACLTab::save() void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) { if ( !f || - f != static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) || + f != static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) || !mDlg->folder() || !mDlg->folder()->storage() ) { emit readyForAccept(); diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index ac93431f..7c893851 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -92,9 +92,9 @@ void KMail::FolderDiaQuotaTab::load() if ( mDlg->folder() ) { // existing folder initializeWithValuesFromFolder( mDlg->folder() ); - } else if ( mDlg->tqparentFolder() ) { + } else if ( mDlg->parentFolder() ) { // new folder - initializeWithValuesFromFolder( mDlg->tqparentFolder() ); + initializeWithValuesFromFolder( mDlg->parentFolder() ); } if ( mFolderType == KMFolderTypeCachedImap ) { @@ -114,7 +114,7 @@ void KMail::FolderDiaQuotaTab::load() mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) ); return; } - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); @@ -144,7 +144,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri } connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ), this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) ); - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getStorageQuotaInfo( folder, mImapPath ); } @@ -152,7 +152,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, KIO::Job* job, const KMail::QuotaInfo& info ) { - if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) { + if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )), diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index 8cc7130c..b154aac1 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -633,6 +633,6 @@ <Q_SLOTS> <slot access="protected">slotChangeIcon( TQString )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 72547d8d..469f03f1 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -977,21 +977,21 @@ void FolderStorage::readFolderIdsFile() { if ( !mExportsSernums ) return; if ( KMMsgDict::mutableInstance()->readFolderIds( *this ) == -1 ) { - tqinvalidateFolder(); + invalidateFolder(); } if ( !KMMsgDict::mutableInstance()->hasFolderIds( *this ) ) { - tqinvalidateFolder(); + invalidateFolder(); } } -void FolderStorage::tqinvalidateFolder() +void FolderStorage::invalidateFolder() { if ( !mExportsSernums ) return; unlink(TQFile::encodeName( indexLocation()) + ".sorted"); unlink(TQFile::encodeName( indexLocation()) + ".ids"); fillMessageDict(); KMMsgDict::mutableInstance()->writeFolderIds( *this ); - emit tqinvalidated( folder() ); + emit invalidated( folder() ); } diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index ab58d4fd..9ff0b67f 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -438,8 +438,8 @@ signals: /** Emitted when the folder was closed and ticket owners have to reopen */ void closed( KMFolder* ); - /** Emitted when the serial numbers of this folder were tqinvalidated. */ - void tqinvalidated( KMFolder * ); + /** Emitted when the serial numbers of this folder were invalidated. */ + void invalidated( KMFolder * ); /** Emitted when the name of the folder changes. */ void nameChanged(); @@ -554,7 +554,7 @@ protected: friend class KMMsgDict; /** Inserts messages into the message dictionary. The messages will get * new serial numbers. This is only used on newly appeared folders, where - * there is no .ids file yet, or when that has been tqinvalidated. */ + * there is no .ids file yet, or when that has been invalidated. */ virtual void fillMessageDict() {} /** Read the on-disk cache of serial numbers of messages in this store @@ -584,10 +584,10 @@ friend class KMMsgDict; * @p sernum */ void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx ); - /** Called when serial numbers for a folder are tqinvalidated, - tqinvalidates/recreates data structures dependent on the + /** Called when serial numbers for a folder are invalidated, + invalidates/recreates data structures dependent on the serial numbers for this folder */ - void tqinvalidateFolder(); + void invalidateFolder(); /** Called by KMFolder::remove() to delete the actual contents. At the time of the call the folder has already been closed, and diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index e227113d..6e1a2f88 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -28,18 +28,18 @@ using namespace KMail; using namespace FolderUtil; -KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, +KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ) { KMFolder *newFolder = 0; - if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeImap ) { - KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( tqparentFolder->storage() ); + if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) { + KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() ); KMAcctImap *anAccount = selectedStorage->account(); // check if a connection is available BEFORE creating the folder if (anAccount->makeConnection() == ImapAccountBase::Connected) { - newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, tqparentDir ); + newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir ); if ( newFolder ) { TQString imapPath, tqparent; if ( !namespaceName.isEmpty() ) { @@ -52,15 +52,15 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolder KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() ); selectedStorage->createFolder(folderName, tqparent); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); - static_cast<KMFolderImap*>(tqparentFolder->storage())->setAccount( selectedStorage->account() ); + static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() ); return newFolder; } } - } else if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeCachedImap ) { + } else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) { newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap, - tqparentDir ); + parentDir ); if ( newFolder ) { - KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( tqparentFolder->storage() ); + KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() ); KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() ); newStorage->initializeFrom( selectedStorage ); if ( !namespaceName.isEmpty() ) { @@ -75,7 +75,7 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolder // local folder Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox ); newFolder = kmkernel->folderMgr()->createFolder( folderName, false, localFolderType, - tqparentDir ); + parentDir ); return newFolder; } diff --git a/kmail/folderutil.h b/kmail/folderutil.h index 9e1ac419..25592987 100644 --- a/kmail/folderutil.h +++ b/kmail/folderutil.h @@ -35,16 +35,16 @@ namespace FolderUtil /** * Low-level function to create a subfolder for a folder of any kind. * - * @param tqparentFolder tqparent folder of the folder that should be created. Can be 0 in case of + * @param parentFolder tqparent folder of the folder that should be created. Can be 0 in case of * local folders - * @param tqparentDir tqparent folder directory, which should be the folder directory of tqparentFolder + * @param parentDir tqparent folder directory, which should be the folder directory of parentFolder * @param folderName the name the newly created folder should have * @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty. * @param localFolderType for local folders, this determines if the folder should be MBOX or maildir * * @return the newly created folder or 0 in case an error occured */ -KMFolder *createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, +KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ); diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 1912d901..c4a9a930 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -64,7 +64,7 @@ public: ~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); } /** The tqparent node of the item in the threading hierarchy. 0 if the item - * is at top level, which is the default. Can only be set by tqparents. */ + * is at top level, which is the default. Can only be set by parents. */ SortCacheItem *tqparent() const { return mParent; } /** * Returs whether the item is so far imperfectly threaded. diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 2ed869b6..67755eff 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -115,8 +115,8 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mStatusCombo) ) { KMMainWidget *mainWidget = 0; - // Travel up the tqparents list until we find the main widget - for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) { + // Travel up the parents list until we find the main widget + for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) { mainWidget = ::tqqt_cast<KMMainWidget *>( curWidget ); if ( mainWidget ) break; diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 4b0c32d5..d82ba5cc 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -417,7 +417,7 @@ namespace KMail { { // There isn't much point in asking the server about a user's rights on his own inbox, // it might not be the effective permissions (at least with Cyrus, one can admin his own inbox, - // even after a SETACL that removes the admin permissions. Other imap servers aptqparently + // even after a SETACL that removes the admin permissions. Other imap servers apparently // don't even allow removing one's own admin permission, so this code won't hurt either). if ( imapPath == "/INBOX/" ) { if ( tqparent->folderType() == KMFolderTypeImap ) @@ -1138,7 +1138,7 @@ namespace KMail { } //----------------------------------------------------------------------------- - void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart, + void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * tqparent, const DwMessage * dwmsg ) { int tqchildren; @@ -1146,7 +1146,7 @@ namespace KMail { { stream >> tqchildren; KMMessagePart* part = new KMMessagePart( stream ); - part->setParent( tqparentKMPart ); + part->setParent( parentKMPart ); mBodyPartList.append( part ); kdDebug(5006) << "ImapAccountBase::constructParts - created id " << part->partSpecifier() << " of type " << part->originalContentTypeStr() << endl; @@ -1170,8 +1170,8 @@ namespace KMail { } else dwpart = 0; - if ( !tqparentKMPart ) - tqparentKMPart = part; + if ( !parentKMPart ) + parentKMPart = part; if (tqchildren > 0) { @@ -1186,7 +1186,7 @@ namespace KMail { } KMMessagePart* newParentKMPart = part; if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent - newParentKMPart = tqparentKMPart; + newParentKMPart = parentKMPart; constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg ); } diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index eee46417..4b5cda92 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -510,7 +510,7 @@ namespace KMail { /** * Build KMMessageParts and DwBodyParts from the bodystructure-stream */ - void constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart, + void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * tqparent, const DwMessage * dwmsg ); /** Migrate the prefix */ diff --git a/kmail/imapjob.h b/kmail/imapjob.h index 55aa02dd..76174b5f 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -65,7 +65,7 @@ public: virtual ~ImapJob(); void setParentFolder( const KMFolderImap* tqparent ); - KPIM::ProgressItem* tqparentProgressItem() const { return mParentProgressItem; } + KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; } void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; } private slots: diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 9aaf4b95..a84ecf51 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -39,11 +39,11 @@ using namespace KMail; -KMail::ImportJob::ImportJob( TQWidget *tqparentWidget ) - : TQObject( tqparentWidget ), +KMail::ImportJob::ImportJob( TQWidget *parentWidget ) + : TQObject( parentWidget ), mArchive( 0 ), mRootFolder( 0 ), - mParentWidget( tqparentWidget ), + mParentWidget( parentWidget ), mNumberOfImportedMessages( 0 ), mCurrentFolder( 0 ), mCurrentMessage( 0 ), @@ -280,19 +280,19 @@ static TQString folderNameForDirectoryName( const TQString &dirName ) return returnName; } -KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, +KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, mode_t subFolderPermissions ) { - if ( !tqparentFolder->createChildFolder() ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparentFolder->name() ) ); + if ( !parentFolder->createChildFolder() ) { + abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parentFolder->name() ) ); return 0; } KMFolder *subFolder = 0; - subFolder = dynamic_cast<KMFolder*>( tqparentFolder->child()->hasNamedFolder( subFolderName ) ); + subFolder = dynamic_cast<KMFolder*>( parentFolder->child()->hasNamedFolder( subFolderName ) ); if ( !subFolder ) { - subFolder = createSubFolder( tqparentFolder, subFolderName, subFolderPermissions ); + subFolder = createSubFolder( parentFolder, subFolderName, subFolderPermissions ); } return subFolder; } diff --git a/kmail/importjob.h b/kmail/importjob.h index ddb00911..d0f4fe48 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -56,7 +56,7 @@ class ImportJob : public TQObject public: - explicit ImportJob( TQWidget *tqparentWidget = 0 ); + explicit ImportJob( TQWidget *parentWidget = 0 ); ~ImportJob(); void start(); void setFile( const KURL &archiveFile ); @@ -87,7 +87,7 @@ class ImportJob : public TQObject void queueFolders(); void importNextDirectory(); KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ); - KMFolder* getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, + KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, mode_t subFolderPermissions ); void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder ); void messageAdded(); diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h index 0765459f..c7ec0430 100644 --- a/kmail/keyresolver.h +++ b/kmail/keyresolver.h @@ -101,14 +101,14 @@ namespace Kleo { \section Step 4: Get signing keys. If, after key resolving, signing is still requested and - aptqparently possible, you can get the result of all this by + apparently possible, you can get the result of all this by iterating over the available message formats and retrieving the set of signing keys to use with a call to \c signingKeys(). \section Step 5: Get encrytion key sets. If after key resolving, encryption is still requested and - aptqparently possible, you can get the result of all this by + apparently possible, you can get the result of all this by calling \c encryptionItems() with the current message format at hand as its argument. diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index ddc16b23..796ac382 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -451,7 +451,7 @@ TQString KMAccount::importPassword(const TQString &aStr) return encryptStr(result); } -void KMAccount::tqinvalidateIMAPFolders() +void KMAccount::invalidateIMAPFolders() { // Default: Don't do anything. The IMAP account will handle it } diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 02df2421..86e2f695 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -210,7 +210,7 @@ public: /** * If this account is a disconnected IMAP account, tqinvalidate it. */ - virtual void tqinvalidateIMAPFolders(); + virtual void invalidateIMAPFolders(); /** * Determines whether the account can be checked, currently. diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 134a7102..0c89e6b1 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -310,7 +310,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder, void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) { ImapAccountBase::readConfig( config ); - // Aptqparently this method is only ever called once (from KMKernel::init) so this is ok + // Apparently this method is only ever called once (from KMKernel::init) so this is ok mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" ); mDeletedFolders.clear(); // but just in case... const TQStringList oldPaths = config.readListEntry( "renamed-folders-paths" ); @@ -336,12 +336,12 @@ void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ { config.writeEntry( "groupwareType", mGroupwareType ); } -void KMAcctCachedImap::tqinvalidateIMAPFolders() +void KMAcctCachedImap::invalidateIMAPFolders() { - tqinvalidateIMAPFolders( mFolder ); + invalidateIMAPFolders( mFolder ); } -void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder ) +void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder ) { if( !folder || !folder->folder() ) return; @@ -361,7 +361,7 @@ void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder ) KMFolder *f = *it; if( f && f->folderType() == KMFolderTypeCachedImap ) { KMFolderCachedImap *cfolder = static_cast<KMFolderCachedImap*>(f->storage()); - // This tqinvalidates the folder completely + // This invalidates the folder completely cfolder->setUidValidity("INVALID"); cfolder->writeUidCache(); } diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h index f045ca7f..a9350c3c 100644 --- a/kmail/kmacctcachedimap.h +++ b/kmail/kmacctcachedimap.h @@ -98,8 +98,8 @@ public: /** * Invalidate the local cache. */ - virtual void tqinvalidateIMAPFolders(); - virtual void tqinvalidateIMAPFolders( KMFolderCachedImap* ); + virtual void invalidateIMAPFolders(); + virtual void invalidateIMAPFolders( KMFolderCachedImap* ); /** * Remember that a folder got explicitely deleted - including all child folders diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 1b7a508f..63a6df14 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -60,10 +60,10 @@ using KRecentAddress::RecentAddresses; typedef KParts::GenericFactory< KMailPart > KMailFactory; K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory ) -KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName, +KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &) : DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name), - mParentWidget( tqparentWidget ) + mParentWidget( parentWidget ) { kdDebug(5006) << "KMailPart()" << endl; kdDebug(5006) << " InstanceName: " << kapp->instanceName() << endl; @@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName, kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. // create a canvas to insert our widget - TQWidget *canvas = new TQWidget(tqparentWidget, widgetName); + TQWidget *canvas = new TQWidget(parentWidget, widgetName); canvas->setFocusPolicy(TQ_ClickFocus); setWidget(canvas); KGlobal::iconLoader()->addAppDir("kmail"); @@ -231,7 +231,7 @@ void KMailPart::exit() delete this; } -TQWidget* KMailPart::tqparentWidget() const +TQWidget* KMailPart::parentWidget() const { return mParentWidget; } @@ -244,7 +244,7 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent ) KMainWindow * KMailStatusBarExtension::mainWindow() const { - return static_cast<KMainWindow*>( mParent->tqparentWidget() ); + return static_cast<KMainWindow*>( mParent->parentWidget() ); } #include "kmail_part.moc" diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 414ff384..d47041cc 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -54,11 +54,11 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar Q_OBJECT TQ_OBJECT public: - KMailPart(TQWidget *tqparentWidget, const char *widgetName, + KMailPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &); virtual ~KMailPart(); - TQWidget* tqparentWidget() const; + TQWidget* parentWidget() const; static KAboutData *createAboutData(); diff --git a/kmail/kmail_part.rc b/kmail/kmail_part.rc index 5c4d034f..fb4794df 100644 --- a/kmail/kmail_part.rc +++ b/kmail/kmail_part.rc @@ -22,7 +22,7 @@ <Action name="file_print" /> <Separator/> <Action name="expire_all_folders" /> - <Action name="file_tqinvalidate_imap_cache"/> + <Action name="file_invalidate_imap_cache"/> <Action name="empty_trash"/> <Separator/> <Action name="online_status" /> diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 25a90fd7..bf0e5b8c 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -1702,16 +1702,16 @@ void KMailICalIfaceImpl::readConfig() // Read remaining options const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders(); - TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent(); + TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); // Find the folder tqparent KMFolderDir* folderParentDir; KMFolderType folderType; - KMFolder* folderParent = kmkernel->findFolderById( tqparentName ); + KMFolder* folderParent = kmkernel->findFolderById( parentName ); if( folderParent == 0 ) { // Parent folder not found. It was probably deleted. The user will have to // configure things again. - kdDebug(5006) << "Groupware folder " << tqparentName << " not found. Groupware functionality disabled" << endl; + kdDebug(5006) << "Groupware folder " << parentName << " not found. Groupware functionality disabled" << endl; // Or maybe the inbox simply wasn't created on the first startup KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() ); Q_ASSERT( account ); @@ -1771,12 +1771,12 @@ void KMailICalIfaceImpl::readConfig() if( noneFound || mustFix ) { TQString msg; - TQString tqparentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name(); + TQString parentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name(); if ( noneFound ) { // No subfolder was found, so ask if we can make them msg = i18n("KMail will now create the required groupware folders" " as subfolders of %1; if you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(tqparentFolderName); + " and the IMAP resource will be disabled").tqarg(parentFolderName); } else { // Some subfolders were found, be more precise TQString operations = "<ul>"; @@ -1794,7 +1794,7 @@ void KMailICalIfaceImpl::readConfig() msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2" "<br>If you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(tqparentFolderName, operations); + " and the IMAP resource will be disabled").tqarg(parentFolderName, operations); } @@ -1959,8 +1959,8 @@ void KMailICalIfaceImpl::readConfig() void KMailICalIfaceImpl::slotCheckDone() { - TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent(); - KMFolder* folderParent = kmkernel->findFolderById( tqparentName ); + TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); + KMFolder* folderParent = kmkernel->findFolderById( parentName ); //kdDebug(5006) << k_funcinfo << " folderParent=" << folderParent << endl; if ( folderParent ) // cool it exists now { @@ -2003,9 +2003,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType folder = mFolderParentDir->createFolder( localizedDefaultFolderName( contentsType ), false, type ); if( mFolderType == KMFolderTypeImap ) { - KMFolderImap* tqparentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() ); - tqparentFolder->createFolder( localizedDefaultFolderName( contentsType ) ); - static_cast<KMFolderImap*>( folder->storage() )->setAccount( tqparentFolder->account() ); + KMFolderImap* parentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() ); + parentFolder->createFolder( localizedDefaultFolderName( contentsType ) ); + static_cast<KMFolderImap*>( folder->storage() )->setAccount( parentFolder->account() ); } // Groupware folder created, use the global setting for storage format setStorageFormat( folder, globalStorageFormat() ); @@ -2293,11 +2293,11 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource, kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl; kdDebug(5006) << "contents type: " << contentsType << endl; KMFolder *folder = findResourceFolder( tqparent ); - KMFolderDir *tqparentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; - if ( !tqparentFolderDir || tqparentFolderDir->hasNamedFolder( resource ) ) return false; + KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; + if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false; TQString msg; - if ( tqparentFolderDir->owner() && !tqparentFolderDir->owner()->isValidName( resource, msg ) ) { + if ( parentFolderDir->owner() && !parentFolderDir->owner()->isValidName( resource, msg ) ) { KMessageBox::error( 0, msg ); return false; } @@ -2305,7 +2305,7 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource, KMFolderType type = mFolderType; if( type == KMFolderTypeUnknown ) type = KMFolderTypeMaildir; - KMFolder* newFolder = tqparentFolderDir->createFolder( resource, false, type ); + KMFolder* newFolder = parentFolderDir->createFolder( resource, false, type ); if ( !newFolder ) return false; if( mFolderType == KMFolderTypeImap ) static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource ); diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 1fe29b6b..3f83fad6 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -216,7 +216,7 @@ KMMessage *KMCommand::retrievedMessage() const return mRetrievedMsgs.getFirst(); } -TQWidget *KMCommand::tqparentWidget() const +TQWidget *KMCommand::parentWidget() const { return mParent; } @@ -558,7 +558,7 @@ KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url, KMCommand::Result KMMailtoAddAddrBookCommand::execute() { KAddrBookExternal::addEmail( KMMessage::decodeMailtoUrl( mUrl.path() ), - tqparentWidget() ); + parentWidget() ); return OK; } @@ -573,7 +573,7 @@ KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url, KMCommand::Result KMMailtoOpenAddrBookCommand::execute() { KAddrBookExternal::openEmail( KMMessage::decodeMailtoUrl( mUrl.path() ), - tqparentWidget() ); + parentWidget() ); return OK; } @@ -633,10 +633,10 @@ KMCommand::Result KMUrlSaveCommand::execute() if ( mUrl.isEmpty() ) return OK; KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString(), - tqparentWidget() ); + parentWidget() ); if ( saveUrl.isEmpty() ) return Canceled; - if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) ) + if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) ) { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") @@ -1006,7 +1006,7 @@ KMCommand::Result KMOpenMsgCommand::execute() { if ( mUrl.isEmpty() ) { mUrl = KFileDialog::getOpenURL( ":OpenMessage", "message/rfc822 application/mbox", - tqparentWidget(), i18n("Open Message") ); + parentWidget(), i18n("Open Message") ); } if ( mUrl.isEmpty() ) { setDeletesItself( false ); @@ -1043,7 +1043,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) { startOfMessage = mMsgString.tqfind( '\n' ); if ( startOfMessage == -1 ) { - KMessageBox::sorry( tqparentWidget(), + KMessageBox::sorry( parentWidget(), i18n( "The file does not contain a message." ) ); setResult( Failed ); emit completed( this ); @@ -1071,7 +1071,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) dwMsg->Parse(); // check whether we have a message ( no headers => this isn't a message ) if ( dwMsg->Headers().NumFields() == 0 ) { - KMessageBox::sorry( tqparentWidget(), + KMessageBox::sorry( parentWidget(), i18n( "The file does not contain a message." ) ); delete dwMsg; dwMsg = 0; setResult( Failed ); @@ -1452,7 +1452,7 @@ KMCommand::Result KMRedirectCommand::execute() if ( !msg || !msg->codec() ) return Failed; - RedirectDialog dlg( tqparentWidget(), "redirect", true, + RedirectDialog dlg( parentWidget(), "redirect", true, kmkernel->msgSender()->sendImmediate() ); if (dlg.exec()==TQDialog::Rejected) return Failed; @@ -1650,7 +1650,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQValueListIterator<TQ_UINT32> it; int idx = -1; KMFolder *folder = 0; - bool tqparentqStatus = false; + bool parentqStatus = false; // Toggle actions on threads toggle the whole thread // depending on the state of the tqparent. @@ -1660,9 +1660,9 @@ KMCommand::Result KMSeStatusCommand::execute() if (folder) { msg = folder->getMsgBase(idx); if (msg && (msg->status()&mtqStatus)) - tqparentqStatus = true; + parentqStatus = true; else - tqparentqStatus = false; + parentqStatus = false; } } TQMap< KMFolder*, TQValueList<int> > folderMap; @@ -1678,7 +1678,7 @@ KMCommand::Result KMSeStatusCommand::execute() mytqStatus = true; else mytqStatus = false; - if (mytqStatus != tqparentqStatus) + if (mytqStatus != parentqStatus) continue; } } @@ -1994,7 +1994,7 @@ KMCommand::Result KMCopyCommand::execute() msg = srcFolder->getMsg(idx); // corrupt IMAP cache, see FolderStorage::getMsg() if ( msg == 0 ) { - KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " + KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) ); deleteLater(); return Failed; @@ -2534,7 +2534,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() // considered attachments if ( it.key()->msgPart().fileName().stripWhiteSpace().isEmpty() && ( it.key()->msgPart().name().stripWhiteSpace().isEmpty() || - !it.key()->tqparentNode() ) ) { + !it.key()->parentNode() ) ) { PartNodeMessageMap::iterator delIt = it; ++it; mAttachmentMap.remove( delIt ); @@ -2555,7 +2555,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() if ( mAttachmentMap.count() > 1 ) { // get the dir dirUrl = KDirSelectDialog::selectDirectory( TQString(), false, - tqparentWidget(), + parentWidget(), i18n("Save Attachments To") ); if ( !dirUrl.isValid() ) { setResult( Canceled ); @@ -2577,7 +2577,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' ); if ( s.isEmpty() ) s = i18n("filename for an unnamed attachment", "attachment.1"); - url = KFileDialog::getSaveURL( s, TQString(), tqparentWidget(), + url = KFileDialog::getSaveURL( s, TQString(), parentWidget(), TQString() ); if ( url.isEmpty() ) { setResult( Canceled ); @@ -2641,8 +2641,8 @@ void KMSaveAttachmentsCommand::slotSaveAll() } - if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) { - if ( KMessageBox::warningContinueCancel( tqparentWidget(), + if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { + if ( KMessageBox::warningContinueCancel( parentWidget(), i18n( "A file named %1 already exists. Do you want to overwrite it?" ) .tqarg( curUrl.fileName() ), i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) { @@ -2666,7 +2666,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, bool bSaveEncrypted = false; bool bEncryptedParts = node->encryptionState() != KMMsgNotEncrypted; if( bEncryptedParts ) - if( KMessageBox::questionYesNo( tqparentWidget(), + if( KMessageBox::questionYesNo( parentWidget(), i18n( "The part %1 of the message is encrypted. Do you want to keep the encryption when saving?" ). arg( url.fileName() ), i18n( "KMail Question" ), i18n("Keep Encryption"), i18n("Do Not Keep") ) == @@ -2675,7 +2675,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, bool bSaveWithSig = true; if( node->signatureState() != KMMsgNotSigned ) - if( KMessageBox::questionYesNo( tqparentWidget(), + if( KMessageBox::questionYesNo( parentWidget(), i18n( "The part %1 of the message is signed. Do you want to keep the signature when saving?" ). arg( url.fileName() ), i18n( "KMail Question" ), i18n("Keep Signature"), i18n("Do Not Keep") ) != @@ -2749,7 +2749,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, file.setName( url.path() ); if ( !file.open( IO_WriteOnly ) ) { - KMessageBox::error( tqparentWidget(), + KMessageBox::error( parentWidget(), i18n( "%2 is detailed error description", "Could not write the file %1:\n%2" ) .tqarg( file.name() ) @@ -2773,9 +2773,9 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, if ( !url.isLocalFile() ) { tf.close(); - if ( !KIO::NetAccess::upload( tf.name(), url, tqparentWidget() ) ) + if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) ) { - KMessageBox::error( tqparentWidget(), + KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) .tqarg( url.path() ), i18n( "KMail Error" ) ); @@ -3015,7 +3015,7 @@ KMCommand::Result KMIMChatCommand::execute() apology = apology.tqarg( names ); } - KMessageBox::sorry( tqparentWidget(), apology ); + KMessageBox::sorry( parentWidget(), apology ); return Failed; } } @@ -3196,13 +3196,13 @@ void KMHandleAttachmentCommand::atmSave() parts.append( mNode ); // save, do not leave encoded KMSaveAttachmentsCommand *command = - new KMSaveAttachmentsCommand( tqparentWidget(), parts, mMsg, false ); + new KMSaveAttachmentsCommand( parentWidget(), parts, mMsg, false ); command->start(); } void KMHandleAttachmentCommand::atmProperties() { - KMMsgPartDialogCompat dlg( tqparentWidget() , 0, true ); + KMMsgPartDialogCompat dlg( parentWidget() , 0, true ); KMMessagePart& msgPart = mNode->msgPart(); dlg.setMsgPart( &msgPart ); dlg.exec(); @@ -3229,12 +3229,12 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !listjob.get() ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } if ( listjob->exec() ) { - listjob->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Backend Error" ) ); + listjob->showErrorDialog( parentWidget(), i18n( "Chiasmus Backend Error" ) ); return; } @@ -3243,7 +3243,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() const TQString msg = i18n( "Unexpected return value from Chiasmus backend: " "The \"x-obtain-keys\" function did not return a " "string list. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } @@ -3252,11 +3252,11 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() const TQString msg = i18n( "No keys have been found. Please check that a " "valid key path has been set in the Chiasmus " "configuration." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } - ChiasmusKeySelector selectorDlg( tqparentWidget(), i18n( "Chiasmus Decryption Key Selection" ), + ChiasmusKeySelector selectorDlg( parentWidget(), i18n( "Chiasmus Decryption Key Selection" ), keys, GlobalSettings::chiasmusDecryptionKey(), GlobalSettings::chiasmusDecryptionOptions() ); if ( selectorDlg.exec() != TQDialog::Accepted ) @@ -3270,7 +3270,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } @@ -3281,13 +3281,13 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() !job->setProperty( "input", input ) ) { const TQString msg = i18n( "The \"x-decrypt\" function does not accept " "the expected parameters. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } setDeletesItself( true ); // the job below is async, we have to cleanup ourselves if ( job->start() ) { - job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) ); + job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) ); return; } @@ -3313,7 +3313,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E if ( err.isCanceled() ) return; if ( err ) { - job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) ); + job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) ); return; } @@ -3321,21 +3321,21 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E const TQString msg = i18n( "Unexpected return value from Chiasmus backend: " "The \"x-decrypt\" function did not return a " "byte array. Please report this bug." ); - KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); + KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); return; } - const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), tqparentWidget() ); + const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), parentWidget() ); if ( url.isEmpty() ) return; - bool overwrite = KMail::Util::checkOverwrite( url, tqparentWidget() ); + bool overwrite = KMail::Util::checkOverwrite( url, parentWidget() ); if ( !overwrite ) return; d.setDisabled( true ); // we got this far, don't delete yet KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); - uploadJob->setWindow( tqparentWidget() ); + uploadJob->setWindow( parentWidget() ); connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) ); } @@ -3500,7 +3500,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify() KMail::EditorWatcher *watcher = new KMail::EditorWatcher( KURL( mTempFile.file()->name() ), part.typeStr() + "/" + part.subtypeStr(), - false, this, tqparentWidget() ); + false, this, parentWidget() ); connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) ); if ( !watcher->start() ) return Failed; @@ -3529,16 +3529,16 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) DwBodyPart *dwpart = msg->findPart( mPartIndex ); KMMessage::bodyPart( dwpart, &part, true ); - DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); - assert( tqparentNode ); - tqparentNode->RemoveBodyPart( dwpart ); + DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); + assert( parentNode ); + parentNode->RemoveBodyPart( dwpart ); KMMessagePart att; att.duplicate( part ); att.setBodyEncodedBinary( data ); DwBodyPart* newDwPart = msg->createDWBodyPart( &att ); - tqparentNode->AddBodyPart( newDwPart ); + parentNode->AddBodyPart( newDwPart ); msg->getTopLevelPart()->Assemble(); KMMessage *newMsg = new KMMessage(); diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 173f98ee..8ebe68b1 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -99,7 +99,7 @@ protected: // Returns the single message retrieved KMMessage *retrievedMessage() const; // Returns the tqparent widget - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; bool deletesItself() { return mDeletesItself; } /** Specify whether the subclass takes care of the deletion of the object. diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 42d55dcd..c12ff062 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -1685,7 +1685,7 @@ void KMComposeWin::setupEditor(void) connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( tqalignmentChanged( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) ); } @@ -2010,7 +2010,7 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, mEditor->setText( otp.textualContent() ); mCharset = otp.textualContentCharset(); if ( partNode * n = root->findType( DwMime::kTypeText, DwMime::kSubtypeHtml ) ) - if ( partNode * p = n->tqparentNode() ) + if ( partNode * p = n->parentNode() ) if ( p->hasType( DwMime::kTypeMultipart ) && p->hasSubType( DwMime::kSubtypeAlternative ) ) if ( mMsg->headerField( "X-KMail-Markup" ) == "true" ) { @@ -2068,9 +2068,9 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, partNode *root = partNode::fromMessage( mMsg ); partNode *node = root->findType( DwMime::kTypeText, DwMime::kSubtypeHtml ); - if ( node && node->tqparentNode() && - node->tqparentNode()->hasType( DwMime::kTypeMultipart ) && - node->tqparentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) { + if ( node && node->parentNode() && + node->parentNode()->hasType( DwMime::kTypeMultipart ) && + node->parentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) { // we have a mp/al body part with a text and an html body kdDebug(5006) << "KMComposeWin::setMsg() : text/html found" << endl; firstAttachment = 2; @@ -5252,7 +5252,7 @@ void KMComposeWin::fontChanged( const TQFont &f ) fontSizeAction->setFontSize( f.pointSize() ); } -void KMComposeWin::tqalignmentChanged( int a ) +void KMComposeWin::alignmentChanged( int a ) { //toggleMarkup(); alignLeftAction->setChecked( ( a == AlignAuto ) || ( a & AlignLeft ) ); diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index b76aa911..874789b2 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -503,7 +503,7 @@ private slots: void slotFormatReset(); void slotTextColor(); void fontChanged( const TQFont & ); - void tqalignmentChanged( int ); + void alignmentChanged( int ); public: // kmkernel, attachmentlistview bool addAttach(const KURL url); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 5c45528e..ceef636e 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -524,7 +524,7 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* if ( commandLine.isEmpty() ) return ErrorButGoOn; - // The tqparentheses force the creation of a subshell + // The parentheses force the creation of a subshell // in which the user-specified command is executed. // This is to really catch all output of the command as well // as to avoid clashes of our redirection with the ones @@ -1800,7 +1800,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const if ( commandLine.isEmpty() ) handler->actionMessage( ErrorButGoOn ); - // The tqparentheses force the creation of a subshell + // The parentheses force the creation of a subshell // in which the user-specified command is executed. // This is to really catch all output of the command as well // as to avoid clashes of our redirection with the ones diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index a1b53aee..e8fa8a3d 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -95,7 +95,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ), + connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ), tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); } @@ -592,11 +592,11 @@ TQString KMFolder::label() const //----------------------------------------------------------------------------- TQString KMFolder::prettyURL() const { - TQString tqparentUrl; + TQString parentUrl; if ( tqparent() ) - tqparentUrl = tqparent()->prettyURL(); - if ( !tqparentUrl.isEmpty() ) - return tqparentUrl + '/' + label(); + parentUrl = tqparent()->prettyURL(); + if ( !parentUrl.isEmpty() ) + return parentUrl + '/' + label(); else return label(); } @@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type ) void KMFolder::slotFolderSizeChanged() { emit folderSizeChanged( this ); - KMFolder* papa = tqparent()->manager()->tqparentFolder( this ); + KMFolder* papa = tqparent()->manager()->parentFolder( this ); if ( papa && papa != this ) { papa->slotFolderSizeChanged(); } diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index a774e11e..de9f4e00 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -744,7 +744,7 @@ void KMFolderCachedImap::slotTroubleshoot() TQString s2 = i18n("&Refresh"); if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) == KMessageBox::Continue ) - account()->tqinvalidateIMAPFolders( this ); + account()->invalidateIMAPFolders( this ); } else { // Rebuild index file switch ( rc ) { @@ -2746,7 +2746,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr && GlobalSettings::self()->theIMAPResourceEnabled() && subtype == "default" ) { // Truncate subtype if this folder can't be a default resource folder for us, - // although it aptqparently is for someone else. + // although it apparently is for someone else. mAnnotationFolderType = type; kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: tqparent folder is " << folder()->tqparent()->owner()->idString() << " => truncating annotation to " << value << endl; } diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 9d514614..a7ebe5c1 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -272,8 +272,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, // Determine if we are allowed to rename this folder. Only possible if the folder supports // ACLs. bool nameChangeAllowed = true; - if ( mDlg->folder() && mDlg->tqparentFolder() && - mDlg->folder()->storage() && mDlg->tqparentFolder()->storage() && + if ( mDlg->folder() && mDlg->parentFolder() && + mDlg->folder()->storage() && mDlg->parentFolder()->storage() && ( mDlg->folder()->folderType() == KMFolderTypeCachedImap || mDlg->folder()->folderType() == KMFolderTypeImap ) ) { ImapAccountBase *account = 0; @@ -289,31 +289,31 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, } if ( account && account->hasACLSupport() ) { - int tqparentRights = -1; + int parentRights = -1; int folderRights = -1; - bool tqparentRightsOk = false; + bool parentRightsOk = false; bool folderRightsOk = false; if ( imap ) { - KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ); + KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ); folderRights = imap->userRights(); folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok; if ( tqparent ) { - tqparentRights = tqparent->userRights(); - tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + parentRights = tqparent->userRights(); + parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } else if ( dimap ) { - KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->tqparentFolder()->storage() ); + KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() ); folderRights = dimap->userRights(); folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok; if ( tqparent ) { - tqparentRights = tqparent->userRights(); - tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + parentRights = tqparent->userRights(); + parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } // For renaming, we need support for deleting the mailbox and then re-creating it. - if ( tqparentRightsOk && folderRightsOk && - ( !( tqparentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { + if ( parentRightsOk && folderRightsOk && + ( !( parentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { nameChangeAllowed = false; } } @@ -702,9 +702,9 @@ bool FolderDiaGeneralTab::save() else fldName = oldFldName; - if ( mDlg->tqparentFolder() && - mDlg->tqparentFolder()->folderType() != KMFolderTypeImap && - mDlg->tqparentFolder()->folderType() != KMFolderTypeCachedImap ) + if ( mDlg->parentFolder() && + mDlg->parentFolder()->folderType() != KMFolderTypeImap && + mDlg->parentFolder()->folderType() != KMFolderTypeCachedImap ) fldName.remove('/'); fldName.remove(TQRegExp("^\\.*")); if (fldName.isEmpty()) fldName = i18n("unnamed"); diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index a97d78b3..56436ece 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -215,7 +215,7 @@ public: KMFolderDir* folderDir() const { return mFolderDir; } typedef TQValueList<TQGuardedPtr<KMFolder> > FolderList; - KMFolder* tqparentFolder() const { return mParentFolder; } + KMFolder* parentFolder() const { return mParentFolder; } KMFolderTree* folderTree() const { return mFolderTree; } diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index f6edcaf1..32eb5834 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -154,22 +154,22 @@ TQString KMFolderDir::label() const //----------------------------------------------------------------------------- TQString KMFolderDir::prettyURL() const { - TQString tqparentUrl; + TQString parentUrl; if ( tqparent() ) - tqparentUrl = tqparent()->prettyURL(); - if ( !tqparentUrl.isEmpty() ) - return tqparentUrl + '/' + label(); + parentUrl = tqparent()->prettyURL(); + if ( !parentUrl.isEmpty() ) + return parentUrl + '/' + label(); else return label(); } //----------------------------------------------------------------------------- -void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ) +void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *parentFolder ) { - KMFolderDir* folderDir = new KMFolderDir( tqparentFolder, this, dirName, mDirType); + KMFolderDir* folderDir = new KMFolderDir( parentFolder, this, dirName, mDirType); folderDir->reload(); append( folderDir ); - tqparentFolder->setChild( folderDir ); + parentFolder->setChild( folderDir ); } // Get the default folder type of the given dir type. This function should only be used when diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 3df289bc..b78e82e8 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -28,7 +28,7 @@ public: /** * Adds the given subdirectory of this directory to the associated folder. */ - void addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ); + void addDirToParent( const TQString &dirName, KMFolder *parentFolder ); /** Read contents of directory. */ virtual bool reload(); diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 38e025bc..303b7b01 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -153,19 +153,19 @@ KMMessage* KMFolderImap::getMsg(int idx) KMAcctImap* KMFolderImap::account() const { if ( !mAccount ) { - KMFolderDir *tqparentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() ); - if ( !tqparentFolderDir ) { + KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() ); + if ( !parentFolderDir ) { kdWarning() << k_funcinfo << "No tqparent folder dir found for " << name() << endl; return 0; } - KMFolder *tqparentFolder = tqparentFolderDir->owner(); - if ( !tqparentFolder ) { + KMFolder *parentFolder = parentFolderDir->owner(); + if ( !parentFolder ) { kdWarning() << k_funcinfo << "No tqparent folder found for " << name() << endl; return 0; } - KMFolderImap *tqparentStorage = dynamic_cast<KMFolderImap*>( tqparentFolder->storage() ); - if ( tqparentStorage ) - mAccount = tqparentStorage->account(); + KMFolderImap *parentStorage = dynamic_cast<KMFolderImap*>( parentFolder->storage() ); + if ( parentStorage ) + mAccount = parentStorage->account(); } return mAccount; } @@ -1718,17 +1718,17 @@ void KMFolderImap::slotGetMessagesResult(KIO::Job * job) //----------------------------------------------------------------------------- -void KMFolderImap::createFolder(const TQString &name, const TQString& tqparentPath, +void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath, bool askUser) { kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",tqparent=" << - tqparentPath << ",askUser=" << askUser << endl; + parentPath << ",askUser=" << askUser << endl; if ( account()->makeConnection() != ImapAccountBase::Connected ) { kdWarning(5006) << "KMFolderImap::createFolder - got no connection" << endl; return; } KURL url = account()->getUrl(); - TQString tqparent = ( tqparentPath.isEmpty() ? imapPath() : tqparentPath ); + TQString tqparent = ( parentPath.isEmpty() ? imapPath() : parentPath ); TQString path = account()->createImapPath( tqparent, name ); if ( askUser ) { path += "/;INFO=ASKUSER"; diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index b0850895..e8ef5e7b 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -113,7 +113,7 @@ protected: /** Inserts messages into the message dictionary by iterating over the * message list. The messages will get new serial numbers. This is only * used on newly appeared folders, where there is no .ids file yet, or - * when that has been tqinvalidated. */ + * when that has been invalidated. */ virtual void fillMessageDict(); /** table of contents file */ diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 684af395..fe19131f 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -899,7 +899,7 @@ int KMFolderMaildir::createIndexFromContents() needsCompact = true; - tqinvalidateFolder(); + invalidateFolder(); return 0; } diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 504b5c5a..75a58455 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -809,7 +809,7 @@ int KMFolderMbox::createIndexFromContents() "most-likely not created by KMail;\nplease remove them from there if you " "do not want KMail to send them.")); - tqinvalidateFolder(); + invalidateFolder(); return 0; } diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index a37f9136..383f562a 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -366,20 +366,20 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder) aFolder->remove(); } -KMFolder* KMFolderMgr::tqparentFolder( KMFolder* folder ) +KMFolder* KMFolderMgr::parentFolder( KMFolder* folder ) { // find the tqparent folder by stripping "." and ".directory" from the name KMFolderDir* fdir = folder->tqparent(); - TQString tqparentName = fdir->name(); - tqparentName = tqparentName.mid( 1, tqparentName.length()-11 ); - KMFolderNode* tqparent = fdir->hasNamedFolder( tqparentName ); + TQString parentName = fdir->name(); + parentName = parentName.mid( 1, parentName.length()-11 ); + KMFolderNode* tqparent = fdir->hasNamedFolder( parentName ); if ( !tqparent && fdir->tqparent() ) // dimap obviously has a different structure - tqparent = fdir->tqparent()->hasNamedFolder( tqparentName ); + tqparent = fdir->tqparent()->hasNamedFolder( parentName ); - KMFolder* tqparentF = 0; + KMFolder* parentF = 0; if ( tqparent ) - tqparentF = dynamic_cast<KMFolder*>( tqparent ); - return tqparentF; + parentF = dynamic_cast<KMFolder*>( tqparent ); + return parentF; } void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) @@ -397,17 +397,17 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) break; } } - KMFolder* tqparentF = tqparentFolder( aFolder ); + KMFolder* parentF = parentFolder( aFolder ); // aFolder will be deleted by the next call! aFolder->tqparent()->remove(aFolder); // update the tqchildren state - if ( tqparentF ) + if ( parentF ) { - if ( tqparentF != aFolder ) + if ( parentF != aFolder ) { - tqparentF->storage()->updateChildrenState(); + parentF->storage()->updateChildrenState(); } } else diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index 7e6e630d..0565157a 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -123,7 +123,7 @@ public: void copyFolder( KMFolder* folder, KMFolderDir* newParent ); /** Returns the tqparent Folder for the given folder or 0 on failure. */ - KMFolder* tqparentFolder( KMFolder* folder ); + KMFolder* parentFolder( KMFolder* folder ); public slots: /** GUI action: compact all folders that need to be compacted */ @@ -151,7 +151,7 @@ signals: /** Emitted, when a folder has been added. */ void folderAdded(KMFolder*); - /** Emitted, when serial numbers for a folder have been tqinvalidated. */ + /** Emitted, when serial numbers for a folder have been invalidated. */ void folderInvalidated(KMFolder*); /** Emitted, when a message has been appended to a folder */ diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index fa36bde5..e7fd1d26 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -423,7 +423,7 @@ void KMFolderSearch::executeSearch() if (mSearch) mSearch->stop(); setSearch(mSearch); - tqinvalidateFolder(); + invalidateFolder(); } const KMSearch* KMFolderSearch::search() const diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h index a3a1bc92..88e34994 100644 --- a/kmail/kmfoldersearch.h +++ b/kmail/kmfoldersearch.h @@ -147,7 +147,7 @@ protected slots: void examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum); // Look at a message whose status has changed void examineChangedMessage(KMFolder *folder, TQ_UINT32 serNum, int delta); - // The serial numbers for a folder have been tqinvalidated, deal with it + // The serial numbers for a folder have been invalidated, deal with it void examineInvalidatedFolder(KMFolder *folder); // A folder has been deleted, deal with it void examineRemovedFolder(KMFolder *folder); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index c8bde2b6..32f6e3c4 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -1587,7 +1587,7 @@ void KMFolderTree::slotFolderExpanded( TQListViewItem * item ) return; if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation ) { - // check if all tqparents are expanded + // check if all parents are expanded TQListViewItem *tqparent = item->tqparent(); while ( tqparent ) { @@ -2043,15 +2043,15 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source // check if the source folders are independent of each other for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it = sources.constBegin(); move && it != sources.constEnd(); ++it ) { - KMFolderDir *tqparentDir = (*it)->child(); - if ( !tqparentDir ) + KMFolderDir *parentDir = (*it)->child(); + if ( !parentDir ) continue; for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it2 = sources.constBegin(); it2 != sources.constEnd(); ++it2 ) { if ( *it == *it2 ) continue; KMFolderDir *childDir = (*it2)->tqparent(); do { - if ( tqparentDir == childDir || tqparentDir->tqfindRef( childDir->owner() ) != -1 ) { + if ( parentDir == childDir || parentDir->tqfindRef( childDir->owner() ) != -1 ) { KMessageBox::error( this, i18n("Moving the selected folders is not possible") ); setDragEnabled( true ); return; diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index f13425eb..f8e8fff8 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -953,7 +953,7 @@ void KMHeaders::msgAdded(int id) if ( !msgId.isEmpty() ) mSortCacheItems.tqreplace(msgId, sci); - /* Add to the list of potential tqparents for subject threading. But only if + /* Add to the list of potential parents for subject threading. But only if * we are top level. */ if (mSubjThreading && tqparent) { TQString subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5(); @@ -1110,7 +1110,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if (mSortCacheItems[msgId] == removedItem->sortCacheItem()) mSortCacheItems.remove(msgId); } - // Remove the message from the list of potential tqparents for threading by + // Remove the message from the list of potential parents for threading by // subject. if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); @@ -2660,19 +2660,19 @@ void KMHeaders::setSorting( int column, bool ascending ) //Flatten the list and write it to disk static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid, - int tqparent_id, TQString key, + int parent_id, TQString key, bool update_discover=true) { unsigned long msgSerNum; - unsigned long tqparentSerNum; + unsigned long parentSerNum; msgSerNum = KMMsgDict::instance()->getMsgSerNum( folder, msgid ); - if (tqparent_id >= 0) - tqparentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, tqparent_id ) + KMAIL_RESERVED; + if (parent_id >= 0) + parentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, parent_id ) + KMAIL_RESERVED; else - tqparentSerNum = (unsigned long)(tqparent_id + KMAIL_RESERVED); + parentSerNum = (unsigned long)(parent_id + KMAIL_RESERVED); fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream); - fwrite(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream); + fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream); TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) @@ -2768,7 +2768,7 @@ bool KMHeaders::writeSortOrder() KMMsgBase *kmb; while(HeaderItem *i = items.pop()) { - int tqparent_id = -1; //no tqparent, top level + int parent_id = -1; //no tqparent, top level if (threaded) { kmb = mFolder->getMsgBase( i->msgId() ); assert(kmb); // I have seen 0L come out of this, called from @@ -2781,7 +2781,7 @@ bool KMHeaders::writeSortOrder() p = mSortCacheItems[replymd5]; if (p) - tqparent_id = p->id(); + parent_id = p->id(); // We now have either found a tqparent, or set it to -1, which means that // it will be reevaluated when a message is added, for example. If there // is no replyToId and no replyToAuxId and the message is not prefixed, @@ -2790,12 +2790,12 @@ bool KMHeaders::writeSortOrder() if (replymd5.isEmpty() && replyToAuxId.isEmpty() && !kmb->subjectIsPrefixed() ) - tqparent_id = -2; + parent_id = -2; // FIXME also mark messages with -1 as -2 a certain amount of time after // their arrival, since it becomes very unlikely that a new tqparent for // them will show up. (Ingo suggests a month.) -till } - internalWriteItem(sortStream, mFolder, i->msgId(), tqparent_id, + internalWriteItem(sortStream, mFolder, i->msgId(), parent_id, i->key(mSortCol, !mSortDescending), false); //double check for magic headers sorted_count++; @@ -2828,20 +2828,20 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) { TQString sortFile = KMAIL_SORT_FILE(mFolder); if(FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+")) { - int tqparent_id = -1; //no tqparent, top level + int parent_id = -1; //no tqparent, top level if (isThreaded()) { SortCacheItem *sci = khi->sortCacheItem(); KMMsgBase *kmb = mFolder->getMsgBase( khi->msgId() ); if(sci->tqparent() && !sci->isImperfectlyThreaded()) - tqparent_id = sci->tqparent()->id(); + parent_id = sci->tqparent()->id(); else if(kmb->replyToIdMD5().isEmpty() && kmb->replyToAuxIdMD5().isEmpty() && !kmb->subjectIsPrefixed()) - tqparent_id = -2; + parent_id = -2; } - internalWriteItem(sortStream, mFolder, khi->msgId(), tqparent_id, + internalWriteItem(sortStream, mFolder, khi->msgId(), parent_id, khi->key(mSortCol, !mSortDescending), false); //update the appended flag FIXME obsolete? @@ -2881,12 +2881,12 @@ void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder, fseek(sortStream, mSortOffset, SEEK_SET); } - int tqparent_id = -1; + int parent_id = -1; if(!waiting_for_tqparent) { if(mParent && !isImperfectlyThreaded()) - tqparent_id = mParent->id(); + parent_id = mParent->id(); } - internalWriteItem(sortStream, folder, mId, tqparent_id, mKey, update_discover); + internalWriteItem(sortStream, folder, mId, parent_id, mKey, update_discover); } static bool compare_ascending = false; @@ -2931,8 +2931,8 @@ void KMHeaders::printThreadingTree() } for (int i = 0; i < (int)mItems.size(); ++i) { HeaderItem *item = mItems[i]; - int tqparentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0; - kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << tqparentCacheId << endl; + int parentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0; + kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << parentCacheId << endl; kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " tqparent: " << item->sortCacheItem()->tqparent() << endl; } kdDebug(5006) << endl; @@ -3038,7 +3038,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) TQString replyToIdMD5 = msg->replyToIdMD5(); TQString subjMD5 = msg->strippedSubjectMD5(); if (!subjMD5.isEmpty() && mSubjectLists[subjMD5]) { - /* Iterate over the list of potential tqparents with the same + /* Iterate over the list of potential parents with the same * subject, and take the closest one by date. */ for (TQPtrListIterator<SortCacheItem> it2(*mSubjectLists[subjMD5]); it2.current(); ++it2) { @@ -3050,7 +3050,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) // delta == 0 is not allowed, to avoid circular threading // with duplicates. if (delta > 0 ) { - // Don't use tqparents more than 6 weeks older than us. + // Don't use parents more than 6 weeks older than us. if (delta < 3628899) tqparent = (*it2); break; @@ -3077,7 +3077,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) bool error = false; //threaded cases - TQPtrList<SortCacheItem> untqparented; + TQPtrList<SortCacheItem> unparented; mImperfectlyThreadedList.clear(); //cleanup @@ -3117,7 +3117,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) mSortInfo.ascending = (compare_ascending = ascending); SortCacheItem *item; - unsigned long serNum, tqparentSerNum; + unsigned long serNum, parentSerNum; int id, len, tqparent, x; TQChar *tmp_qchar = 0; int tmp_qchar_len = 0; @@ -3131,7 +3131,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) KMFolder *folder; //parse if(!fread(&serNum, sizeof(serNum), 1, sortStream) || //short read means to end - !fread(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream) || + !fread(&parentSerNum, sizeof(parentSerNum), 1, sortStream) || !fread(&len, sizeof(len), 1, sortStream)) { break; } @@ -3157,10 +3157,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) ++deleted_count; continue; } - if (tqparentSerNum < KMAIL_RESERVED) { - tqparent = (int)tqparentSerNum - KMAIL_RESERVED; + if (parentSerNum < KMAIL_RESERVED) { + tqparent = (int)parentSerNum - KMAIL_RESERVED; } else { - KMMsgDict::instance()->getLocation(tqparentSerNum - KMAIL_RESERVED, &folder, &tqparent); + KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &tqparent); if (folder != mFolder) tqparent = -1; } @@ -3185,7 +3185,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) } if (threaded && tqparent != -2) { if(tqparent == -1) { - untqparented.append(item); + unparented.append(item); mRoot->addUnsortedChild(item); } else { if( ! sortCache[tqparent] ) { @@ -3245,7 +3245,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) sortCache[x] = new SortCacheItem( x, HeaderItem::generate_key( this, msg, &mPaintInfo, sortOrder )); if(threaded) - untqparented.append(sortCache[x]); + unparented.append(sortCache[x]); else mRoot->addUnsortedChild(sortCache[x]); if(sortStream) @@ -3263,11 +3263,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if (threaded) buildThreadingTree( sortCache ); TQPtrList<SortCacheItem> toBeSubjThreaded; - if (threaded && !untqparented.isEmpty()) { + if (threaded && !unparented.isEmpty()) { CREATE_TIMER(reparent); START_TIMER(reparent); - for(TQPtrListIterator<SortCacheItem> it(untqparented); it.current(); ++it) { + for(TQPtrListIterator<SortCacheItem> it(unparented); it.current(); ++it) { SortCacheItem *item = (*it); SortCacheItem *tqparent = findParent( item ); // If we have a tqparent, make sure it's not ourselves @@ -3515,7 +3515,7 @@ void KMHeaders::setCurrentItemBySerialNum( unsigned long serialNum ) { // Linear search == slow. Don't overuse this method. // It's currently only used for finding the current item again - // after expiry deleted mails (so the index got tqinvalidated). + // after expiry deleted mails (so the index got invalidated). for (int i = 0; i < (int)mItems.size() - 1; ++i) { KMMsgBase *mMsgBase = mFolder->getMsgBase( i ); if ( mMsgBase->getMsgSerNum() == serialNum ) { diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 9754f95a..931d15ea 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -214,7 +214,7 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader ) // that the user wants to send a message with subject "ession" but // (most likely) that the user clicked on KMail's system tray applet // which results in KMKernel::raise() calling "kmail kmail newInstance" - // via dcop which aptqparently executes the application with the original + // via dcop which apparently executes the application with the original // command line arguments and those include "-session ..." if // kmail/kontact was restored by session management if ( subj == "ession" ) { diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 86acaef7..e43f8cce 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) else { KABC::VCardConverter converter; TQString fileName; - if ( KIO::NetAccess::download( (*it), fileName, tqparentWidget() ) ) { + if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) { TQFile file( fileName ); file.open( IO_ReadOnly ); const TQByteArray data = file.readAll(); @@ -133,7 +133,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) } else { TQString caption( i18n( "vCard Import Failed" ) ); TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() ); - KMessageBox::error( tqparentWidget(), text, caption ); + KMessageBox::error( parentWidget(), text, caption ); } } // Now, let the user choose which addressee to add. diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 89c50fd3..fd41d4a8 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -351,13 +351,13 @@ void KMMainWidget::readConfig(void) readPreConfig(); mHeaders->refreshNestedState(); - bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList ) + bool layoutChanged = ( oldLongFolderList != mLongFolderList ) || ( oldReaderWindowActive != mReaderWindowActive ) || ( oldReaderWindowBelow != mReaderWindowBelow ) || ( oldFavoriteFolderView != mEnableFavoriteFolderView ); - if( tqlayoutChanged ) { + if( layoutChanged ) { hide(); // delete all panners delete mPanner1; // will always delete the others @@ -389,11 +389,11 @@ void KMMainWidget::readConfig(void) widths << folderW << headerW; heights << headerH << readerH; - bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList ) + bool layoutChanged = ( oldLongFolderList != mLongFolderList ) || ( oldReaderWindowActive != mReaderWindowActive ) || ( oldReaderWindowBelow != mReaderWindowBelow ); - if (!mStartupDone || tqlayoutChanged ) + if (!mStartupDone || layoutChanged ) { /** unread / total columns * as we have some dependencies in this widget @@ -482,11 +482,11 @@ void KMMainWidget::readConfig(void) // Update systray toggleSystemTray(); - bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList ) + bool layoutChanged = ( oldLongFolderList != mLongFolderList ) || ( oldReaderWindowActive != mReaderWindowActive ) || ( oldReaderWindowBelow != mReaderWindowBelow ) || ( oldFavoriteFolderView != mEnableFavoriteFolderView ); - if ( tqlayoutChanged ) { + if ( layoutChanged ) { activatePanners(); } @@ -1314,7 +1314,7 @@ void KMMainWidget::slotInvalidateIMAPFolders() { "This will remove all changes that you have done " "locally to your IMAP folders."), i18n("Refresh IMAP Cache"), i18n("&Refresh") ) == KMessageBox::Continue ) - kmkernel->acctMgr()->tqinvalidateIMAPFolders(); + kmkernel->acctMgr()->invalidateIMAPFolders(); } //----------------------------------------------------------------------------- @@ -2659,7 +2659,7 @@ void KMMainWidget::setupActions() (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh", TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()), - actionCollection(), "file_tqinvalidate_imap_cache" ); + actionCollection(), "file_invalidate_imap_cache" ); (void) new KAction( i18n("Empty All &Trash Folders"), 0, KMKernel::self(), TQT_SLOT(slotEmptyTrash()), @@ -3339,8 +3339,8 @@ void KMMainWidget::updateMessageActions() } TQListViewItem *curItemParent = mHeaders->currentItem(); - bool tqparent_thread = 0; - if ( curItemParent && curItemParent->firstChild() != 0 ) tqparent_thread = 1; + bool parent_thread = 0; + if ( curItemParent && curItemParent->firstChild() != 0 ) parent_thread = 1; bool mass_actions = count >= 1; bool thread_actions = mass_actions && allSelectedInCommonThread && @@ -3376,7 +3376,7 @@ void KMMainWidget::updateMessageActions() mFindInMessageAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) ); mForwardInlineAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder )); mForwardAttachedAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) ); - mForwardDigestAction->setEnabled( ( count > 1 || tqparent_thread ) && !kmkernel->folderIsTemplates( mFolder ) ); + mForwardDigestAction->setEnabled( ( count > 1 || parent_thread ) && !kmkernel->folderIsTemplates( mFolder ) ); forwardMenu()->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder )); diff --git a/kmail/kmmainwin.rc b/kmail/kmmainwin.rc index 899d03c5..955dabad 100644 --- a/kmail/kmmainwin.rc +++ b/kmail/kmmainwin.rc @@ -25,7 +25,7 @@ <Action name="file_print" /> <Separator/> <Action name="expire_all_folders" /> - <Action name="file_tqinvalidate_imap_cache"/> + <Action name="file_invalidate_imap_cache"/> <Action name="empty_trash"/> <Separator/> <Action name="online_status" /> diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index e44d253b..c083638d 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -3183,10 +3183,10 @@ bool KMMessage::deleteBodyPart( int partIndex ) if ( !part.isComplete() ) return false; - DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); - if ( !tqparentNode ) + DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); + if ( !parentNode ) return false; - tqparentNode->RemoveBodyPart( dwpart ); + parentNode->RemoveBodyPart( dwpart ); // add dummy part to show that a attachment has been deleted KMMessagePart dummyPart; @@ -3204,7 +3204,7 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.setContentDisposition( "attachment" ); } DwBodyPart* newDwPart = createDWBodyPart( &dummyPart ); - tqparentNode->AddBodyPart( newDwPart ); + parentNode->AddBodyPart( newDwPart ); getTopLevelPart()->Assemble(); return true; } @@ -4306,10 +4306,10 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & } else { // update body mLastUpdated->Body().FromString( content ); - TQString tqparentSpec = partSpecifier.section( '.', 0, -2 ); - if ( !tqparentSpec.isEmpty() ) + TQString parentSpec = partSpecifier.section( '.', 0, -2 ); + if ( !parentSpec.isEmpty() ) { - DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), tqparentSpec ); + DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() ) { const DwMediaType& contentType = tqparent->Headers().ContentType(); diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 3c2e16ee..b8937dc0 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -274,7 +274,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node, DwHeaders * headers( (part && part->hasHeaders()) ? &part->Headers() - : ( (weAreReplacingTheRootNode || !dataNode->tqparentNode()) + : ( (weAreReplacingTheRootNode || !dataNode->parentNode()) ? &rootHeaders : 0 ) ); if( dataNode == curNode ) { @@ -284,7 +284,7 @@ kdDebug(5006) << "dataNode == curNode: Save curNode without replacing it." << e // AND we are not replacing a node that already *has* replaced // the root node in previous recursion steps of this function... if( headers ) { - if( dataNode->tqparentNode() && !weAreReplacingTheRootNode ) { + if( dataNode->parentNode() && !weAreReplacingTheRootNode ) { kdDebug(5006) << "dataNode is NOT replacing the root node: Store the headers." << endl; resultingData += headers->AsString().c_str(); } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){ @@ -345,7 +345,7 @@ kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE } } else { kdDebug(5006) << "dataNode != curNode: Replace curNode by dataNode." << endl; - bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->tqparentNode(); + bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode(); if( rootNodeReplaceFlag ) { kdDebug(5006) << " Root node will be replaced." << endl; } else { diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index a066fc86..9742d627 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -211,7 +211,7 @@ void KMSystemTray::updateCount() // and which has a transparent background. // Unfortunately this required the following twisted code because for some // reason text that is drawn on a transparent pixmap is invisible - // (aptqparently the alpha channel isn't changed when the text is drawn). + // (apparently the alpha channel isn't changed when the text is drawn). // Therefore I have to draw the text on a solid background and then remove // the background by making it transparent with TQPixmap::setMask. This // involves the slow createHeuristicMask() function (from the API docs: diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index cb9c420a..0b79d98c 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -208,20 +208,20 @@ namespace KMail { myBody->Headers().Parse(); } - partNode* tqparentNode = &startNode; + partNode* parentNode = &startNode; partNode* newNode = new partNode(false, myBody); // Build the object tree of the new node before setting the tqparent, as otherwise - // buildObjectTree() would erronously modify the tqparents as well + // buildObjectTree() would erronously modify the parents as well newNode->buildObjectTree( false ); - if ( append && tqparentNode->firstChild() ) { - tqparentNode = tqparentNode->firstChild(); - while( tqparentNode->nextSibling() ) - tqparentNode = tqparentNode->nextSibling(); - tqparentNode->setNext( newNode ); + if ( append && parentNode->firstChild() ) { + parentNode = parentNode->firstChild(); + while( parentNode->nextSibling() ) + parentNode = parentNode->nextSibling(); + parentNode->setNext( newNode ); } else - tqparentNode->setFirstChild( newNode ); + parentNode->setFirstChild( newNode ); if ( startNode.mimePartTreeItem() ) { newNode->fillMimePartTree( startNode.mimePartTreeItem(), 0, @@ -260,7 +260,7 @@ namespace KMail { node->setProcessed( false, false ); if ( partNode * child = node->firstChild() ) child->setProcessed( false, true ); - } else if ( mReader && !node->tqparentNode() ) { + } else if ( mReader && !node->parentNode() ) { // ...this node and all it's siblings and descendants node->setProcessed( false, true ); } @@ -338,7 +338,7 @@ namespace KMail { const AttachmentStrategy * as = attachmentStrategy(); if ( as && as->defaultDisplay( node ) == AttachmentStrategy::None && !showOnlyOneMimePart() && - node->tqparentNode() /* message is not an attachment */ ) { + node->parentNode() /* message is not an attachment */ ) { node->setDisplayedHidden( true ); return; } @@ -1544,9 +1544,9 @@ namespace KMail { } const Kleo::CryptoBackend::Protocol* oldUseThisCryptPlug = cryptoProtocol(); - if ( node->tqparentNode() - && DwMime::kTypeMultipart == node->tqparentNode()->type() - && DwMime::kSubtypeEncrypted == node->tqparentNode()->subType() ) { + if ( node->parentNode() + && DwMime::kTypeMultipart == node->parentNode()->type() + && DwMime::kSubtypeEncrypted == node->parentNode()->subType() ) { //kdDebug(5006) << "\n-----> Initially processing encrypted data\n" << endl; node->setEncryptionState( KMMsgFullyEncrypted ); if ( keepEncryptions() ) { diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index de5e2d89..35269825 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -236,8 +236,8 @@ TQCString partNode::subTypeString() const { const partNode* partNode::topLevelParent() const { const partNode *ret = this; - while ( ret->tqparentNode() ) - ret = ret->tqparentNode(); + while ( ret->parentNode() ) + ret = ret->parentNode(); return ret; } @@ -358,9 +358,9 @@ KMMsgSignatureState partNode::overallSignatureState() const TQCString partNode::path() const { - if ( !tqparentNode() ) + if ( !parentNode() ) return ':'; - const partNode * p = tqparentNode(); + const partNode * p = parentNode(); // count number of siblings with the same type as us: int nth = 0; @@ -463,7 +463,7 @@ partNode* partNode::findTypeNot( int type, int subType, bool deep, bool wide ) return 0; } -void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, +void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem, KMMimePartTree* mimePartTree, TQString labelDescr, TQString labelCntType, @@ -471,10 +471,10 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, KIO::filesize_t size, bool revertOrder ) { - if( tqparentItem || mimePartTree ) { + if( parentItem || mimePartTree ) { if( mNext ) - mNext->fillMimePartTree( tqparentItem, mimePartTree, + mNext->fillMimePartTree( parentItem, mimePartTree, TQString(), TQString(), TQString(), 0, revertOrder ); @@ -518,8 +518,8 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, // remove linebreak+whitespace from folded Content-Description cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " ); - if( tqparentItem ) - mMimePartTreeItem = new KMMimePartTreeItem( tqparentItem, + if( parentItem ) + mMimePartTreeItem = new KMMimePartTreeItem( parentItem, this, cntDesc, cntType, @@ -595,7 +595,7 @@ partNode * partNode::next( bool allowChildren ) const { return c; if ( partNode * s = nextSibling() ) return s; - for ( partNode * p = tqparentNode() ; p ; p = p->tqparentNode() ) + for ( partNode * p = parentNode() ; p ; p = p->parentNode() ) if ( partNode * s = p->nextSibling() ) return s; return 0; @@ -607,7 +607,7 @@ bool partNode::isFirstTextPart() const { const partNode * root = this; // go up until we reach the root node of a message (of the actual message or // of an attached message) - while ( const partNode * p = root->tqparentNode() ) { + while ( const partNode * p = root->parentNode() ) { if ( p->type() == DwMime::kTypeMessage ) break; else @@ -652,11 +652,11 @@ bool partNode::isInEncapsulatedMessage() const const partNode * const topLevel = topLevelParent(); const partNode *cur = this; while ( cur && cur != topLevel ) { - const bool tqparentIsMessage = cur->tqparentNode() && - cur->tqparentNode()->msgPart().typeStr().lower() == "message"; - if ( tqparentIsMessage && cur->tqparentNode() != topLevel ) + const bool parentIsMessage = cur->parentNode() && + cur->parentNode()->msgPart().typeStr().lower() == "message"; + if ( parentIsMessage && cur->parentNode() != topLevel ) return true; - cur = cur->tqparentNode(); + cur = cur->parentNode(); } return false; } @@ -768,8 +768,8 @@ partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const typeBlacklisted = typeBlacklisted || this == topLevelParent(); bool firstTextChildOfEncapsulatedMsg = msgPart().typeStr().lower() == "text" && msgPart().subtypeStr().lower() == "plain" && - tqparentNode() && - tqparentNode()->msgPart().typeStr().lower() == "message"; + parentNode() && + parentNode()->msgPart().typeStr().lower() == "message"; typeBlacklisted = typeBlacklisted || firstTextChildOfEncapsulatedMsg; info.displayInHeader = !info.label.isEmpty() && !info.icon.isEmpty() && !typeBlacklisted; return info; diff --git a/kmail/partNode.h b/kmail/partNode.h index babd9a1b..a043e140 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -179,7 +179,7 @@ public: partNode* findNodeForDwPart( DwBodyPart* part ); - void fillMimePartTree( KMMimePartTreeItem* tqparentItem, + void fillMimePartTree( KMMimePartTreeItem* parentItem, KMMimePartTree* mimePartTree, TQString labelDescr = TQString(), TQString labelCntType = TQString(), @@ -248,7 +248,7 @@ public: const TQString& trueFromAddress() const; const partNode * topLevelParent() const; - partNode * tqparentNode() const { return mRoot; } + partNode * parentNode() const { return mRoot; } partNode * nextSibling() const { return mNext; } partNode * firstChild() const { return mChild; } partNode * next( bool allowChildren=true ) const; diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 5e8175dc..59d22c54 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -291,7 +291,7 @@ int RecipientLine::setComboWidth( int w ) w = TQMAX( w, mCombo->tqsizeHint().width() ); mCombo->setFixedWidth( w ); mCombo->updateGeometry(); - tqparentWidget()->updateGeometry(); + parentWidget()->updateGeometry(); return w; } @@ -536,7 +536,7 @@ void RecipientsView::resizeView() // setFixedHeight( mLineHeight * mLines.count() ); } - tqparentWidget()->tqlayout()->activate(); + parentWidget()->tqlayout()->activate(); emit tqsizeHintChanged(); TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); } diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index acef26ca..287605aa 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -409,5 +409,5 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP <slot>setDisabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 0e3e7ece..5cdf04c7 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -169,7 +169,7 @@ <tabstop>btnAdd</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index a1596625..a9949cb5 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -177,7 +177,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 12da0501..442a36e1 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -661,9 +661,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ dlg.setCaption(i18n("Enter Values for Variables")); TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); - TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop"); - TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar"); - TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn"); + TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); + TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); + TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); KTextEdit *te = NULL; TQLabel * labTop = NULL; @@ -673,8 +673,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); - tqlayoutTop->addWidget(labTop, 0, 0); - tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); + layoutTop->addWidget(labTop, 0, 0); + tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add @@ -685,10 +685,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ cb = new TQCheckBox( &dlg, "cbVar" ); cb->setChecked( FALSE ); cb->setText(it.key()); - tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop ); + layoutVar->addWidget( cb, i ,0, TQt::AlignTop ); te = new KTextEdit( &dlg, "teVar" ); - tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop ); + layoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { cb->setChecked( TRUE ); @@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ i++; } - tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); - tqlayoutBtn->addWidget( btn1, 0, 0 ); + layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); btn2->setDefault( TRUE ); btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); - tqlayoutBtn->addWidget( btn2, 0, 1 ); + layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -750,8 +750,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ } bReturn = true; - iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height(); - iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count(); + iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); + iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); iWidth = dlg.tqgeometry().width(); } @@ -764,9 +764,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2) delete it2.data(); mapVar2Cb.clear(); - delete tqlayoutTop; - delete tqlayoutVar; - delete tqlayoutBtn; + delete layoutTop; + delete layoutVar; + delete layoutBtn; delete tqlayout; if (i==0) //if nothing happened this means, that there are no variables to translate @@ -789,18 +789,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri dlg.setCaption(i18n("Enter Values for Variables")); TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); - TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop"); - TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar"); - TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn"); + TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); + TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); + TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); KTextEdit *te = NULL; TQLabel * labTop = NULL; TQCheckBox * cb = NULL; labTop = new TQLabel( &dlg, "label" ); - tqlayoutTop->addWidget(labTop, 0, 0); + layoutTop->addWidget(labTop, 0, 0); labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); - tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); + tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -808,8 +808,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri cb->setText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); - tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop); - tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop); + layoutVar->addWidget( te, 0, 1, TQt::AlignTop); + layoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { cb->setChecked( TRUE ); te->setText((*mapSave)[var]); @@ -820,16 +820,16 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); - tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); - tqlayoutBtn->addWidget( btn1, 0, 0 ); + layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); btn2->setDefault( TRUE ); - tqlayoutBtn->addWidget( btn2, 0, 1 ); + layoutBtn->addWidget( btn2, 0, 1 ); - tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -858,9 +858,9 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri delete labTop; delete btn1; delete btn2; - delete tqlayoutTop; - delete tqlayoutVar; - delete tqlayoutBtn; + delete layoutTop; + delete layoutVar; + delete layoutBtn; delete tqlayout; return strReturn; diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index e476749e..49ece85d 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -100,7 +100,7 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI { oldItem->takeItem(cur); item->insertItem(cur); - if ( cur->isSelected() ) // we have new tqparents so open them + if ( cur->isSelected() ) // we have new parents so open them folderTree()->ensureItemVisible( cur ); ++it; } @@ -115,15 +115,15 @@ void SubscriptionDialogBase::createListViewItem( int i ) // get the tqparent GroupItem *oldItem = 0; - TQString tqparentPath; - findParentItem( mFolderNames[i], mFolderPaths[i], tqparentPath, &tqparent, &oldItem ); + TQString parentPath; + findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &tqparent, &oldItem ); - if (!tqparent && tqparentPath != "/") + if (!tqparent && parentPath != "/") { // the tqparent is not available and it's no root-item // this happens when the folders do not arrive in hierarchical order // so we create each tqparent in advance - TQStringList folders = TQStringList::split(mDelimiter, tqparentPath); + TQStringList folders = TQStringList::split(mDelimiter, parentPath); uint i = 0; for ( TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it ) { @@ -198,18 +198,18 @@ void SubscriptionDialogBase::createListViewItem( int i ) //------------------------------------------------------------------------------ -void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &tqparentPath, +void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &parentPath, GroupItem **tqparent, GroupItem **oldItem ) { // remove the name (and the separator) from the path to get the tqparent path int start = path.length() - (name.length()+2); int length = name.length()+1; if (start < 0) start = 0; - tqparentPath = path; - tqparentPath.remove(start, length); + parentPath = path; + parentPath.remove(start, length); // find the tqparent by it's path - *tqparent = mItemDict[tqparentPath]; + *tqparent = mItemDict[parentPath]; // check if the item already exists *oldItem = mItemDict[path]; diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index 116416eb..fba3da7e 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -324,7 +324,7 @@ <data format="PNG" length="807">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002ee49444154388d7d93cd6b5c6514c67fe7bdef9d8f24d349c66412a203b1b4282d21140918824816418a0b454d75e1a28ab8c8dfe1c25d70e34e0812ea4644d13610c43a1121b5d84cab6943486227499d869ae6633e32f7de79ef71d58644f0593dabdf39cf7938a2aa4c4f4f9b300c0b954ae56ca55249876128aa2a9c90738eadadada0542afd954ea7cb636363a19d9f9f4755cff6f4a53e4d67ed78f7b37ebb8b05e3810818017d0a68f1dcc36463a7ea8a4b8bdb9fcccdcdddf6eaf5bae4f3f9f7bb7a773faee94fed81b983a6d6d9ab6eb2f5f73affec6de1a536c9e4d7497696c9f63cf237d66b85b5e570cf3977c7aeaeae9a42a130d03d506bdbaddda3d1805faec6dc5a68e2a208e30124187a39c9ebefa6c8f544f84949a9ea69e75cd60641c0e1e1a1b8b849142ac51f226ece1f32fc4a86f31732f86db076178ad70e20765cfae8142207009eaafac639270022c2fd15a1b470c8f81b59defed0637024c44596c269cb3b1fe4585c68f2c76f0e23064000639e5c5804caab2d8c24187ed5c3265adc5bf4b9f2f91e377eae73fe254b6fbfc7ea7283588f9a314756089b31ed5925dd61b87b2bc5d75fd4a91d843c7fa68d5caf23fb4c8246fdc9f01300e3412e9f60f7313c285b6edf0c696bf338f3620773df3de2ea15d8de0ce92f2448f8472bd8a700515e18146e5c3714afd5197f3343ae3b463ce1cbcf94efbf7a48b6cb303462595c3801505514280c182ebed5ce37333bec3f8e387721859f80da7e8c114714097b3be65804eb799e562a95e641358e4d47cb8cbc66c9f5f6f1eb8f55967eafa140bedfe7e27b7dac2c4588a7ec6cb7622004629b4c2629954a7fda6c6b3f5f08baac1f61bd2683c3867a358931865339c8e69a9c1b323cb87fc0fa72d81091351189646262426667677b620e2fabea25942e504144fef34d80735a752daeab9a6f7ddf5f9162b1c8e4e4a45f2e974f0541d0a3aa19c03f16f4b862a061adddc96432bba2aaccccccc8d4d494b7b1b1910c8220a1aae6ff00d6da56676767303a3a1afd0b29d2596f22d0b7b20000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>templatesinsertcommand.h</includehint> diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index a2a82337..137dbfcd 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -73,7 +73,7 @@ void TreeBase::addChildFolder() const KMFolder *fld = folder(); if ( fld ) { - mFolderTree->addChildFolder( (KMFolder *) fld, tqparentWidget() ); + mFolderTree->addChildFolder( (KMFolder *) fld, parentWidget() ); reload( mLastMustBeReadWrite, mLastShowOutbox, mLastShowImapFolders ); setFolder( (KMFolder *) fld ); } diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index d7da3cea..c31bdb38 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -404,5 +404,5 @@ The recommended SPHINX setting is 14 days. <tabstop>mWarnEncrRootCertExpiresSB</tabstop> <tabstop>enableAllWarningsPB</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |