diff options
Diffstat (limited to 'kmail')
406 files changed, 4864 insertions, 4582 deletions
diff --git a/kmail/ChangeLog b/kmail/ChangeLog index e9c2eaa17..bd7c29081 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -184,7 +184,7 @@ please visit http://webcvs.kde.org Do the right thing when sending to "me@there (John Doe)" Waldo's folderless-acount-segv-fix More against destroyed last char in message - Better long/normal folder-list geometry bugfix + Better long/normal folder-list tqgeometry bugfix Don't quit while sending, and show a label while you send. 1999-02-03 Sven Radej <radej@kde.org> (KMail-1.0.16) @@ -245,7 +245,7 @@ please visit http://webcvs.kde.org 1999-01-23 Stefan Taferner <taferner@kde.org> (KMail-1.0.14) - * New feature: layout can now be switched between + * New feature: tqlayout can now be switched between "long folder list" and "short folder list". Option setable in settings->appearance. @@ -264,7 +264,7 @@ please visit http://webcvs.kde.org Now it is possible to have more folders than the screen is high and still select them in the filter dialog. * Filter Dialog: changed folder combo box to (semi) auto - resize. Changed layout of dialog to better display all + resize. Changed tqlayout of dialog to better display all elements. Also enabled vertical resizing of dialog. 1999-01-17 Stefan Taferner <taferner@kde.org> (KMail-1.0.12) @@ -494,7 +494,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> ignored. * Finetuning: added missing pixmaps to makefile and - repainted pixmap for queued and sent messages. + tqrepainted pixmap for queued and sent messages. * Composer: changed behaviour of email completion a bit. Now it is possible to add multiple recipients with comma @@ -553,7 +553,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> quoted text to catch smileys at the beginning of the line ;-) - * Main window configuration (geometry, etc.) is now + * Main window configuration (tqgeometry, etc.) is now stored again. * Composer: changed completion key from Ctrl-. to Ctrl-T diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 0b15ebfbc..8f7a65037 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to function that want to use the identity reference. Store the UOID instead if you need to keep track of the identity. You may also want to connect to one of the KPIM::IdentityManager::changed() or ::deleted() -signals, if you want to do special processing in case the identity +Q_SIGNALS, if you want to do special processing in case the identity changes. Thus, in the ConfigureDialog, you will see non-const KPIM::Identity @@ -271,13 +271,13 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are : folder manager. In dimap, both the headers and a copy of the full message are cached locally. 4) KMFolderMgr *searchFolderMgr() - which returns the folder manager - for search folders (folders created by using the "find + for search folders (folders created by using the "tqfind messages" tool). Other email clients call this type of folder "virtual folders". FolderJob classes - These classes allow asynchronous operations on KMFolder's. You create a Job on the heap, connect to one of its -signals and wait for the job to finish. Folders serve as FolderJob +Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob factories. For example, to retrieve the full message from a folder you do : @@ -316,9 +316,9 @@ with questions... length := Q_UINT16 ; little endian (native?) - value := unicode-string-value / ulong-value + value := tqunicode-string-value / ulong-value - unicode-string-value := 0*256QChar ; network-byte-order + tqunicode-string-value := 0*256QChar ; network-byte-order ulong-value := unsigned_long ; little endian @@ -334,7 +334,7 @@ Currently defined tag values are: IdMD5 5 u msgIdMD5().stripWhiteSpace() XMark 6 u xmark().stripWhiteSpace() Offset 7 l folderOffset() (not only mbox!) - LegacyStatus 8 l mLegacyStatus + LegacytqStatus 8 l mLegacytqStatus Size 9 l msgSize() Date 10 l date() File 11 u fileName() (not only maildir!) @@ -342,9 +342,9 @@ Currently defined tag values are: MDNSent 13 l mdnSentState() ReplyToAuxIdMD5 14 u replyToAuxIdMD5() StrippedSubject 15 u strippedSubjectMD5().stripWhiteSpace() - Status 16 l status() + tqStatus 16 l status() - u: unicode-string-value; l: ulong-value + u: tqunicode-string-value; l: ulong-value Proposed new (KDE 3.2 / KMail 1.6) entry format: @@ -446,20 +446,20 @@ Currently defined tags are: MBoxOffset Offset(64) Offset in mbox file (pointing to From_) MBoxLength Size(64) Length of message in mbox file (incl. From_) Size Size(64) rfc2822-size of message (in mbox: excl. From_) - Status BitField (see below) + tqStatus BitField (see below) MessageIdMD5 MD5Hash MD5Hash of _normalized_ Message-Id: 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 parents_ + _top-level thread tqparents_ ThreadParents SerialNumberList MD5Hash's of all (so far discovered) - thread parents + thread tqparents "String" is either Utf8String or (Utf16String or Latin1String), depending on content -Currently allocated bits for the Status BitField are: +Currently allocated bits for the tqStatus BitField are: Bit Value: on(/off) (\\imapflag) @@ -527,7 +527,7 @@ class SortCacheItem: folder) messages is cached on disk in a file named .$FOLDER.index.sorted so if, for example the name of a folder is foo, the associated sorting cache file would be called ".foo.index.sorted". - For each message, its serial number, that of its parent, the length of its + For each message, its serial number, that of its tqparent, the length of its sorting key, and the key itself are written to this file. At the start of the file several per folder counts and flags are cached additionally, immediately after a short file headers. The entries from the start of the @@ -544,13 +544,13 @@ class SortCacheItem: What is used for figuring out threading? - messages can have an In-Reply-To header that contains the message id of - another message. This is called a perfect parent. + another message. This is called a perfect tqparent. - additionally there is the References header which, if present, holds a list of message ids that the current message is a follow up to. We currently use the second to last entry in that list only. See further down for the reasoning behind that. - If the above two fail and the message is prefixed (Re: foo, Fwd: foo etc.) - an attempt is made to find a parent by looking for messages with the same + an attempt is made to find a tqparent by looking for messages with the same subject. How that is done is explained below as well. For all these comparisons of header contents, the md5 hashes of the headers @@ -578,27 +578,27 @@ Strategy: has been moved away in the meantime (possibly by outside forces such as other clients) and a deleted counter is incremented and all further processing stopped for this message. - The messages parent serial number, as read from the sorted file is then - used to look up the parent and reset it to -1 should it not be in the + The messages tqparent serial number, as read from the sorted file is then + used to look up the tqparent and reset it to -1 should it not be in the current folder anymore. -1 and -2 are special values that can show up - as parent serial numbers and are used to encode the following: - -1 means this message has no perfect parent, a parent for it needs to + as tqparent serial numbers and are used to encode the following: + -1 means this message has no perfect tqparent, a tqparent for it needs to be found from among the other messages, if there is a suitable one -2 means this message is top level and will forever stay so, no need - to even try to find a parent. This is also used for the non-threaded + to even try to find a tqparent. This is also used for the non-threaded 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 parent, the current sort cache item is - appended to the parents list of unsorted children, or to that of + 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 root, if there is not. A sort cache item is created in the mSortCache - for the parent, if it is not already there. Messages with a parent of - -1 are appended to the "unparented" list, which is later traversed and - its elements threaded. Messages with -2 as the parent are children of + 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 + 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 parents know about them, top level + sorted file. Messages with perfect tqparents 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 unparented. On creation their sort key is figured out as + sorted as well as untqparented. On creation their sort key is figured out as well. - The next step is finding parents for those messages that are either new, or - had a parent of -1 in the .sorted file. To that end, a dict of all sort + The next step is finding tqparents 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 unparented messages is then traversed and findParent() called for each + yet untqparented 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 parents in the above mentioned dict. Should none be + sort cache item of those tqparents 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. @@ -638,7 +638,7 @@ Strategy: - since the above is a common special case, it is worth trying. I think. ;) - If the parent found is perfect (In-Reply-To), the sort cache items is marked + If the tqparent found is perfect (In-Reply-To), the sort cache items is marked as such. mIsImperfectlyThreaded is used for that purposer, we will soon see why that flag is needed. @@ -646,30 +646,30 @@ 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 parents for - threading by subjects. These lists are sorted by date, so the parent closest + top level) messages with that subject, that are potential tqparents 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 from hard corner cases such as cvs commit lists, for which subject threading makes little sense anyhow and where it should be turned off), but also since the messages should be roughly pre sorted by date in the store already. Some cursory benchmarking supports that assumption. - If now a parent is needed for a message with a certain subject, the list of + If now a tqparent is needed for a message with a certain subject, the list of top level messages with that subject is traversed and the first one that is - older than our message is chosen as it's parent. Parents more than six weeks + older than our message is chosen as it's tqparent. Parents more than six weeks older than the message are not accepted. The reasoning being that if a new message with the same subject turns up after such a long time, the chances that it is still part of the same thread are slim. The value of six weeks is chosen as a result of a poll conducted on #kde-devel, so it's probably bogus. :) All of this happens in the aptly named: findParentBySubject(). - Everthing that still has no parent after this ends up at toplevel, no further + Everthing that still has no tqparent after this ends up at toplevel, no further attemp is made at finding one. If you are reading this because you want to implement threading by body search or somesuch, please go away, I don't like you. :) Ok, so far we have only operated on sort cache items, nothing ui wise has - happened yet. Now that we have established the parent/child relations of all + happened yet. Now that we have established the tqparent/child relations of all messages, it's time to create HeaderItems for them for use in the header list. But wait, you say, what about sorting? Wouldn't it make sense to do that first? Exactly, you're a clever bugger, ey? Here, have a cookie. ;) @@ -677,13 +677,13 @@ Strategy: cache items happen at the same time. As previously mentioned (or not) each sort cache item holds a list of its - sorted and one of its unsorted children. Starting with the root node the + sorted and one of its unsorted tqchildren. Starting with the root node the unsorted list is first qsorted, and then merged with the list of already - sorted children. To achieve that, the heads of both lists are compared and + sorted tqchildren. To achieve that, the heads of both lists are compared and the one with the "better" key is added to the list view next by creating a KMHeaderListItem for it. That header item receives both its sort key as well as its id from the sort cache item. Should the current sort cache item have - children, it is added to the end of a queue of nodes to repeat these steps + tqchildren, it is added to the end of a queue of nodes to repeat these steps on after the current level is sorted. This way, a breadth first merge sort is performed on the sort cache items and header items are created at each node. @@ -706,16 +706,16 @@ What happens when a message arrives in the folder? structures described above are updated accordingly. If threading is enabled, the new message is threaded using the same findParent and findParentBySubject methods used on folder open. If the message ends up in a watched or ignored - thread, those status bits are inherited from the parent. The message is also + 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 parents for subject threading. + potential tqparents 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 parent for each item on it. This is especially important - to ensure that parents arriving out of order after their children still end - up as parents. If necessary, the entries in the .sorted file of rethreaded + 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 messages are updated. An entry for the new message itself is appended to the .sorted file as well. @@ -732,10 +732,10 @@ What happens when a message is removed from the folder? In this case the msgRemoved slot kicks in and updates the headers list. First the sort cache item and header item representing our message are removed from the data structures and the ids of all items after it in the store decre- - mented. Then a list of children of the message is assembled containing those - children that have to be reparented now that our message has gone away. If - one of those children has been marked as toBeDeleted, it is simply added to - root at top level, because there is no need to find a parent for it if it is + mented. Then a list of tqchildren of the message is assembled containing those + tqchildren that have to be reparented now that our message has gone away. If + one of those tqchildren has been marked as toBeDeleted, it is simply added to + root at top level, because there is no need to find a tqparent for it if it is to go away as well. This is an optimization to avoid rethreading all messages in a thread when deleting several messages in a thread, or even the whole thread. The KMMoveCommand marks all messages that will be moved out of @@ -743,7 +743,7 @@ What happens when a message is removed from the folder? can be avoided. Note that that does not work when moving messages via filter action. - That list of children is then traversed and a new parent found for each one + That list of tqchildren is then traversed and a new tqparent found for each one using, again, findParent and findParentBySubject. When a message becomes imperfectly threaded in the process, it is added to the corresponding list. @@ -859,7 +859,7 @@ public: QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) ); } -private slots: +private Q_SLOTS: void slotTimeout() { notify(): } private: diff --git a/kmail/TODO b/kmail/TODO index cf5792a14..e16a9116c 100644 --- a/kmail/TODO +++ b/kmail/TODO @@ -29,7 +29,7 @@ DS: Zero-copy downloading from pop server DS: Set color action DS: XML GUI context menus to support KMail plugins DS: IMAP body searching -??: Dock Windows +??: TQt::Dock Windows Groupware: KHZ: Make groupware use a real vCal parser diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 19d25574f..0fa29906d 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -156,7 +156,7 @@ namespace KMail { }; static const about_data credits[] = { - { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons tqreplacement + { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement { "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu) { "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance { "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments) @@ -175,7 +175,7 @@ namespace KMail { "heiko@ist.eigentlich.net", 0 }, { "Torsten Kasch", 0, 0, 0 }, // crash fix for Solaris (cf. bug:68801) { "Jason 'vanRijn' Kasper", 0, 0, 0 }, // implemented wish 79938 (configurable font for new/unread/important messages) - { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the Status combo of the quick search + { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the tqStatus combo of the quick search { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field) { "Martin Koller", 0, 0, 0 }, // optional columns in the message list { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index b7c82f112..513f9483b 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp index c89ed360a..252a49c86 100644 --- a/kmail/accountcombobox.cpp +++ b/kmail/accountcombobox.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -34,8 +34,8 @@ using namespace KMail; -AccountComboBox::AccountComboBox( TQWidget* parent, const char* name ) - : TQComboBox( parent, name ) +AccountComboBox::AccountComboBox( TQWidget* tqparent, const char* name ) + : TQComboBox( tqparent, name ) { connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), this, TQT_SLOT( slotRefreshAccounts() ) ); diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h index 9229cb330..04a8bc07c 100644 --- a/kmail/accountcombobox.h +++ b/kmail/accountcombobox.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -39,12 +39,13 @@ namespace KMail { * WARNING: this widget is hardcoded to only display disconnected imap * accounts, in this branch. */ -class AccountComboBox : public QComboBox +class AccountComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - AccountComboBox( TQWidget* parent, const char* name = 0 ); + AccountComboBox( TQWidget* tqparent, const char* name = 0 ); void setCurrentAccount( KMAccount* account ); KMAccount* currentAccount() const; diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 51c729772..4dab221bc 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -85,7 +85,7 @@ namespace KMail { class ProcmailRCParser { public: - ProcmailRCParser(TQString fileName = TQString::null); + ProcmailRCParser(TQString fileName = TQString()); ~ProcmailRCParser(); TQStringList getLockFilesList() const { return mLockFiles; } @@ -133,7 +133,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname) int commentPos = -1; - if( (commentPos = s.find('#')) > -1 ) { + if( (commentPos = s.tqfind('#')) > -1 ) { // get rid of trailing comment s.truncate(commentPos); s = s.stripWhiteSpace(); @@ -143,7 +143,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname) processGlobalLock(s); } else if( lockFileLocal.search(s) != -1 ) { processLocalLock(s); - } else if( int i = s.find('=') ) { + } else if( int i = s.tqfind('=') ) { processVariableSetting(s,i); } } @@ -172,7 +172,7 @@ ProcmailRCParser::~ProcmailRCParser() void ProcmailRCParser::processGlobalLock(const TQString &s) { - TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace()); + TQString val = expandVars(s.mid(s.tqfind('=') + 1).stripWhiteSpace()); if ( !mLockFiles.tqcontains(val) ) mLockFiles << val; } @@ -190,7 +190,7 @@ ProcmailRCParser::processLocalLock(const TQString &s) // user specified a lockfile, so process it // val = expandVars(val); - if( val[0] != '/' && mVars.find("MAILDIR") ) + if( val[0] != '/' && mVars.tqfind("MAILDIR") ) val.insert(0, *(mVars["MAILDIR"]) + '/'); } // else we'll deduce the lockfile name one we // get the spoolfile name @@ -211,7 +211,7 @@ ProcmailRCParser::processLocalLock(const TQString &s) line = expandVars(line); // prepend default MAILDIR if needed - if( line[0] != '/' && mVars.find("MAILDIR") ) + if( line[0] != '/' && mVars.tqfind("MAILDIR") ) line.insert(0, *(mVars["MAILDIR"]) + '/'); // now we have the spoolfile name @@ -224,7 +224,7 @@ ProcmailRCParser::processLocalLock(const TQString &s) val = line; // append lock extension - if( mVars.find("LOCKEXT") ) + if( mVars.tqfind("LOCKEXT") ) val += *(mVars["LOCKEXT"]); else val += ".lock"; @@ -248,7 +248,7 @@ ProcmailRCParser::processVariableSetting(const TQString &s, int eqPos) mVars.insert(varName.latin1(), new TQString(varValue)); } -QString +TQString ProcmailRCParser::expandVars(const TQString &s) { if( s.isEmpty()) return s; @@ -268,8 +268,8 @@ ProcmailRCParser::expandVars(const TQString &s) AccountDialog::AccountDialog( const TQString & caption, KMAccount *account, - TQWidget *parent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, caption, Ok|Cancel|Help, Ok, true ), + TQWidget *tqparent, const char *name, bool modal ) + : KDialogBase( tqparent, name, modal, caption, Ok|Cancel|Help, Ok, true ), mAccount( account ), mServerTest( 0 ), mCurCapa( AllCapa ), @@ -357,11 +357,11 @@ void AccountDialog::makeLocalAccountPage() topLayout->addWidget( choose, 3, 2 ); TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); - group->setColumnLayout(0, Qt::Horizontal); + group->setColumnLayout(0, TQt::Horizontal); group->tqlayout()->setSpacing( 0 ); group->tqlayout()->setMargin( 0 ); TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( TQt::AlignTop ); groupLayout->setSpacing( 6 ); groupLayout->setMargin( 11 ); @@ -778,7 +778,7 @@ void AccountDialog::makePopAccountPage() vlay->addSpacing( KDialog::spacingHint() ); - mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mPop.encryptionNone = new TQRadioButton( i18n("&None"), mPop.encryptionGroup ); @@ -792,7 +792,7 @@ void AccountDialog::makePopAccountPage() TQT_SLOT(slotPopEncryptionChanged(int))); vlay->addWidget( mPop.encryptionGroup ); - mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup, "auth clear text" ); @@ -1093,7 +1093,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) vlay->addSpacing( KDialog::spacingHint() ); - mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mImap.encryptionNone = new TQRadioButton( i18n("&None"), mImap.encryptionGroup ); @@ -1107,7 +1107,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) TQT_SLOT(slotImapEncryptionChanged(int))); vlay->addWidget( mImap.encryptionGroup ); - mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup ); mImap.authLogin = new TQRadioButton( i18n("Please translate this " @@ -1490,7 +1490,7 @@ void AccountDialog::slotPipeliningClicked() "Supports\" button at the bottom of the dialog;\n" "if your server does not announce it, but you want more speed, then " "you should do some testing first by sending yourself a batch " - "of mail and downloading it."), TQString::null, + "of mail and downloading it."), TQString(), "pipelining"); } @@ -1764,7 +1764,7 @@ void AccountDialog::checkHighest( TQButtonGroup *btnGroup ) { kdDebug(5006) << "checkHighest( " << btnGroup << " )" << endl; for ( int i = btnGroup->count() - 1; i >= 0 ; --i ) { - TQButton * btn = btnGroup->find( i ); + TQButton * btn = btnGroup->tqfind( i ); if ( btn && btn->isEnabled() ) { btn->animateClick(); return; @@ -1972,7 +1972,7 @@ void AccountDialog::saveSettings() // get the new account and register the new destination folder // this is the target folder for local or pop accounts and the root folder // of the account for (d)imap - KMAccount* newAcct = kmkernel->acctMgr()->find(mAccount->id()); + KMAccount* newAcct = kmkernel->acctMgr()->tqfind(mAccount->id()); if (newAcct) { if( accountType == "local" ) { @@ -1994,7 +1994,7 @@ void AccountDialog::slotLocationChooser() { static TQString directory( "/" ); - KFileDialog dialog( directory, TQString::null, this, 0, true ); + KFileDialog dialog( directory, TQString(), this, 0, true ); dialog.setCaption( i18n("Choose Location") ); bool result = dialog.exec(); @@ -2117,8 +2117,8 @@ void AccountDialog::slotReloadNamespaces() { initAccountForConnect(); mImap.personalNS->setText( i18n("Fetching Namespaces...") ); - mImap.otherUsersNS->setText( TQString::null ); - mImap.sharedNS->setText( TQString::null ); + mImap.otherUsersNS->setText( TQString() ); + mImap.sharedNS->setText( TQString() ); ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); @@ -2136,16 +2136,16 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& ) this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); - mImap.personalNS->setText( TQString::null ); + mImap.personalNS->setText( TQString() ); } } void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map ) { disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - mImap.personalNS->setText( TQString::null ); - mImap.otherUsersNS->setText( TQString::null ); - mImap.sharedNS->setText( TQString::null ); + mImap.personalNS->setText( TQString() ); + mImap.otherUsersNS->setText( TQString() ); + mImap.sharedNS->setText( TQString() ); mImap.nsMap = map; ImapAccountBase::namespaceDelim ns = map[ImapAccountBase::PersonalNS]; @@ -2267,8 +2267,8 @@ void AccountDialog::slotEditSharedNamespace() } } -NamespaceLineEdit::NamespaceLineEdit( TQWidget* parent ) - : KLineEdit( parent ) +NamespaceLineEdit::NamespaceLineEdit( TQWidget* tqparent ) + : KLineEdit( tqparent ) { } @@ -2278,9 +2278,9 @@ void NamespaceLineEdit::setText( const TQString& text ) KLineEdit::setText( text ); } -NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, +NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent, ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map ) - : KDialogBase( parent, "edit_namespace", false, TQString::null, + : KDialogBase( tqparent, "edit_namespace", false, TQString(), Ok|Cancel, Ok, true ), mType( type ), mNamespaceMap( map ) { TQVBox *page = makeVBoxMainWidget(); @@ -2298,7 +2298,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, mBg = new TQButtonGroup( 0 ); connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) ); - mDelimMap = mNamespaceMap->find( mType ).data(); + mDelimMap = mNamespaceMap->tqfind( mType ).data(); ImapAccountBase::namespaceDelim::Iterator it; for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) { NamespaceLineEdit* edit = new NamespaceLineEdit( grid ); @@ -2325,9 +2325,9 @@ void NamespaceEditDialog::slotRemoveEntry( int id ) mLineEditMap.remove( id ); delete edit; } - if ( mBg->find( id ) ) { + if ( mBg->tqfind( id ) ) { // delete the button - delete mBg->find( id ); + delete mBg->tqfind( id ); } adjustSize(); } diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index 085e40d99..060b576a0 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -55,10 +55,11 @@ class FolderRequester; class AccountDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AccountDialog( const TQString & caption, KMAccount *account, - TQWidget *parent=0, const char *name=0, bool modal=true ); + TQWidget *tqparent=0, const char *name=0, bool modal=true ); virtual ~AccountDialog(); private: struct LocalWidgets @@ -302,9 +303,10 @@ class AccountDialog : public KDialogBase class NamespaceLineEdit: public KLineEdit { Q_OBJECT + TQ_OBJECT public: - NamespaceLineEdit( TQWidget* parent ); + NamespaceLineEdit( TQWidget* tqparent ); const TQString& lastText() { return mLastText; } @@ -318,9 +320,10 @@ class NamespaceLineEdit: public KLineEdit class NamespaceEditDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type, + NamespaceEditDialog( TQWidget* tqparent, ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map ); protected slots: diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 5484c66d8..d62280fd1 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -149,13 +149,13 @@ void AccountManager::processNextCheck( bool _newMail ) kdDebug(5006) << "account " << acct->name() << " finished check" << endl; mAcctChecking.remove( acct ); kmkernel->filterMgr()->deref(); - disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( acct, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); } if ( mAcctChecking.isEmpty() ) { // all checks finished, display summary if ( mDisplaySummary ) - KPIM::BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( + KPIM::BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mTotalNewMailsArrived ); emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder ); mTotalNewMailsArrived = 0; @@ -219,10 +219,10 @@ void AccountManager::processNextCheck( bool _newMail ) } } - connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); - KPIM::BroadcasStatus::instance()->seStatusMsg( + KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n("Checking account %1 for new mail").arg(curAccount->name())); kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl; @@ -293,7 +293,7 @@ KMAccount* AccountManager::findByName(const TQString &aName) const //----------------------------------------------------------------------------- -KMAccount* AccountManager::find( const uint id ) const +KMAccount* AccountManager::tqfind( const uint id ) const { if (id == 0) return 0; for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) { @@ -397,7 +397,7 @@ void AccountManager::addToTotalNewMailCount( const TQMap<TQString, int> & newInF for ( TQMap<TQString, int>::const_iterator it = newInFolder.begin(); it != newInFolder.end(); ++it ) { mTotalNewMailsArrived += it.data(); - if ( mTotalNewInFolder.find( it.key() ) == mTotalNewInFolder.end() ) + if ( mTotalNewInFolder.tqfind( it.key() ) == mTotalNewInFolder.end() ) mTotalNewInFolder[it.key()] = it.data(); else mTotalNewInFolder[it.key()] += it.data(); @@ -417,7 +417,7 @@ uint AccountManager::createId() do { newId = kapp->random(); - } while ( usedIds.find(newId) != usedIds.end() ); + } while ( usedIds.tqfind(newId) != usedIds.end() ); return newId; } diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index f693180f1..c88aab92d 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -32,9 +32,10 @@ namespace KMail { * The account manager is responsible for creating accounts of various types * via the factory method create() and for keeping track of them. */ -class KDE_EXPORT AccountManager: public QObject +class KDE_EXPORT AccountManager: public TQObject { Q_OBJECT + TQ_OBJECT friend class ::KMAccount; public: @@ -52,7 +53,7 @@ public: /** Create a new account of given type with given name. Currently the types "local" for local mail folders and "pop" are supported. */ KMAccount* create( const TQString& type, - const TQString& name = TQString::null, + const TQString& name = TQString(), uint id = 0); /** Adds an account to the list of accounts */ @@ -64,7 +65,7 @@ public: /** Find account by id. Returns 0 if account does not exist. */ - KMAccount* find( const uint id ) const; + KMAccount* tqfind( const uint id ) const; /** Physically remove account. Also deletes the given account object ! Returns FALSE and does nothing if the account cannot be removed. */ diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 0dfb503d9..e4e8b8334 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -81,8 +81,8 @@ class AccountTypeBox : public KListBox public: enum Type { Local, POP3, IMAP, dIMAP, Maildir }; - AccountTypeBox( TQWidget *parent ) - : KListBox( parent, "AccountTypeBox" ) + AccountTypeBox( TQWidget *tqparent ) + : KListBox( tqparent, "AccountTypeBox" ) { mTypeList << i18n( "Local mailbox" ); mTypeList << i18n( "POP3" ); @@ -107,8 +107,8 @@ class AccountTypeBox : public KListBox TQStringList mTypeList; }; -AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent ) - : KWizard( parent, "KWizard" ), mKernel( kernel ), +AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent ) + : KWizard( tqparent, "KWizard" ), mKernel( kernel ), mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 ) { setupWelcomePage(); @@ -118,12 +118,12 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent ) setupServerInformationPage(); } -void AccountWizard::start( KMKernel *kernel, TQWidget *parent ) +void AccountWizard::start( KMKernel *kernel, TQWidget *tqparent ) { KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" ); if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) { - AccountWizard wizard( kernel, parent ); + AccountWizard wizard( kernel, tqparent ); int result = wizard.exec(); if ( result == TQDialog::Accepted ) { wizardConfig.writeEntry( "ShowOnStartup", false ); @@ -153,7 +153,7 @@ void AccountWizard::showPage( TQWidget *page ) if ( mLoginName->text().isEmpty() ) { // try to extract login from email address TQString email = mEMailAddress->text(); - int pos = email.find( '@' ); + int pos = email.tqfind( '@' ); if ( pos != -1 ) mLoginName->setText( email.left( pos ) ); @@ -329,7 +329,7 @@ TQString AccountWizard::accountName() const TQString name( i18n( "None" ) ); TQString email = mEMailAddress->text(); - int pos = email.find( '@' ); + int pos = email.tqfind( '@' ); if ( pos != -1 ) { name = email.mid( pos + 1 ); name[ 0 ] = name[ 0 ].upper(); diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h index 51e19b10d..6a05fc655 100644 --- a/kmail/accountwizard.h +++ b/kmail/accountwizard.h @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -45,6 +45,7 @@ class KMTransportInfo; class AccountWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: /** @@ -52,9 +53,9 @@ class AccountWizard : public KWizard run successfully before. @param kernel The mail kernel the wizard should work on. - @param parent The parent widget of the dialog. + @param tqparent The tqparent widget of the dialog. */ - static void start( KMKernel *kernel, TQWidget *parent = 0 ); + static void start( KMKernel *kernel, TQWidget *tqparent = 0 ); /** Reimplemented @@ -62,7 +63,7 @@ class AccountWizard : public KWizard void showPage( TQWidget *page ); protected: - AccountWizard( KMKernel *kernel, TQWidget *parent ); + AccountWizard( KMKernel *kernel, TQWidget *tqparent ); ~AccountWizard() {}; void setupWelcomePage(); diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 9926cc463..33a7e5837 100644 --- a/kmail/acljobs.cpp +++ b/kmail/acljobs.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -198,7 +198,7 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str ) { // Parse the result - m_permissions = IMAPRightsToPermission( str, url(), TQString::null ); + m_permissions = IMAPRightsToPermission( str, url(), TQString() ); } ACLJobs::DeleteACLJob::DeleteACLJob( const KURL& url, const TQString& userId, diff --git a/kmail/acljobs.h b/kmail/acljobs.h index d6a9b245b..d548c621e 100644 --- a/kmail/acljobs.h +++ b/kmail/acljobs.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -39,7 +39,7 @@ namespace KMail { /// One entry in the ACL list: user and permissions struct ACLListEntry { - ACLListEntry() {} // for QValueVector + ACLListEntry() {} // for TQValueVector ACLListEntry( const TQString& u, const TQString& irl, int p ) : userId( u ), internalRightsList( irl ), permissions( p ), changed( false ) {} TQString userId; @@ -51,7 +51,7 @@ namespace KMail { typedef TQValueVector<ACLListEntry> ACLList; /** - * This namespace tqcontains functions that return jobs for ACL operations. + * This namespace contains functions that return jobs for ACL operations. * * The current implementation is tied to IMAP. * If someone wants to extend this to other protocols, turn the class into a namespace @@ -108,6 +108,7 @@ namespace ACLJobs { class GetACLJob : public KIO::SimpleJob { Q_OBJECT + TQ_OBJECT public: GetACLJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -124,6 +125,7 @@ namespace ACLJobs { class GetUserRightsJob : public KIO::SimpleJob { Q_OBJECT + TQ_OBJECT public: GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -140,6 +142,7 @@ namespace ACLJobs { class DeleteACLJob : public KIO::SimpleJob { Q_OBJECT + TQ_OBJECT public: DeleteACLJob( const KURL& url, const TQString& userId, const TQByteArray &packedArgs, @@ -154,6 +157,7 @@ namespace ACLJobs { /// Set and delete a list of permissions for different users on a given url class MultiSetACLJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo ); diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 6975b3fcd..77685ee4b 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -421,7 +421,7 @@ void ActionScheduler::fetchMessage() } else if (msg) { fetchTimeOutTime = TQTime::currentTime(); fetchTimeOutTimer->start( 60 * 1000, true ); - FolderJob *job = msg->parent()->createJob( msg ); + FolderJob *job = msg->tqparent()->createJob( msg ); connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), TQT_SLOT(messageFetched( KMMessage* )) ); lastJob = job; @@ -454,15 +454,15 @@ void ActionScheduler::messageFetched( KMMessage *msg ) serNumS.setNum( msg->getMsgSerNum() ); KMMessage *newMsg = new KMMessage; newMsg->fromString(msg->asString()); - newMsg->seStatus(msg->status()); + newMsg->setqStatus(msg->status()); newMsg->setComplete(msg->isComplete()); newMsg->setHeaderField( "X-KMail-Filtered", serNumS ); mSrcFolder->addMsg( newMsg ); } else { fetchMessageTimer->start( 0, true ); } - if (mFetchUnget && msg->parent()) - msg->parent()->unGetMsg( msg->parent()->find( msg )); + if (mFetchUnget && msg->tqparent()) + msg->tqparent()->unGetMsg( msg->tqparent()->tqfind( msg )); return; } @@ -562,7 +562,7 @@ void ActionScheduler::processMessage() return; } if (msg) { - FolderJob *job = msg->parent()->createJob( msg ); + FolderJob *job = msg->tqparent()->createJob( msg ); connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), TQT_SLOT(messageRetrieved( KMMessage* )) ); job->start(); @@ -665,9 +665,9 @@ void ActionScheduler::moveMessage() if (mOriginalSerNum) orgMsg = message( mOriginalSerNum ); mResult = mOldReturnCode; // ignore errors in deleting original message - if (!orgMsg || !orgMsg->parent()) { + if (!orgMsg || !orgMsg->tqparent()) { // Original message is gone, no point filtering it anymore - mSrcFolder->removeMsg( mSrcFolder->find( msg ) ); + mSrcFolder->removeMsg( mSrcFolder->tqfind( msg ) ); kdDebug(5006) << "The original serial number is missing. " << "Cannot complete the filtering." << endl; mExecutingLock = false; @@ -675,12 +675,12 @@ void ActionScheduler::moveMessage() return; } else { if (!folder) // no filter folder specified leave in current place - folder = orgMsg->parent(); + folder = orgMsg->tqparent(); } mIgnore = true; - assert( msg->parent() == mSrcFolder.operator->() ); - mSrcFolder->take( mSrcFolder->find( msg ) ); + assert( msg->tqparent() == mSrcFolder.operator->() ); + mSrcFolder->take( mSrcFolder->tqfind( msg ) ); mSrcFolder->addMsg( msg ); mIgnore = false; @@ -719,7 +719,7 @@ void ActionScheduler::moveMessageFinished( KMCommand *command ) mResult = mOldReturnCode; // ignore errors in deleting original message KMCommand *cmd = 0; - if (msg && msg->parent()) { + if (msg && msg->tqparent()) { cmd = new KMMoveCommand( 0, msg ); // cmd->start(); // Note: sensitive logic here. } @@ -787,10 +787,10 @@ TQString ActionScheduler::debug() int i = 1; for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) { res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) ); - if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) { + if ((*it)->mAccount && kmkernel->tqfind( (*it)->mAccountId )) { res.append( TQString( "Account %1, Name %2.\n" ) .arg( (*it)->mAccountId ) - .arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); + .arg( kmkernel->acctMgr()->tqfind( (*it)->mAccountId )->name() ) ); } res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) ); res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) ); diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h index 3c9894502..797b9963b 100644 --- a/kmail/actionscheduler.h +++ b/kmail/actionscheduler.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,9 +46,10 @@ class KMHeaders; namespace KMail { /* A class for asynchronous filtering of messages */ -class ActionScheduler : public QObject +class ActionScheduler : public TQObject { Q_OBJECT + TQ_OBJECT public: enum ReturnCode { ResultOk, ResultError, ResultCriticalError }; diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp index 4e5dc2015..6fb6645e9 100644 --- a/kmail/annotationjobs.cpp +++ b/kmail/annotationjobs.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h index df3da1ad0..c700a4b45 100644 --- a/kmail/annotationjobs.h +++ b/kmail/annotationjobs.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -39,7 +39,7 @@ namespace KMail { /// One entry in the annotation list: attribute name and attribute value struct AnnotationAttribute { - AnnotationAttribute() {} // for QValueVector + AnnotationAttribute() {} // for TQValueVector AnnotationAttribute( const TQString& e, const TQString& n, const TQString& v ) : entry( e ), name( n ), value( v ) {} TQString entry; // e.g. /comment @@ -50,7 +50,7 @@ struct AnnotationAttribute { typedef TQValueVector<AnnotationAttribute> AnnotationList; /** - * This namespace tqcontains functions that return jobs for annotation operations. + * This namespace contains functions that return jobs for annotation operations. * * The current implementation is tied to IMAP. * If someone wants to extend this to other protocols, turn the namespace into a class @@ -108,6 +108,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave, class GetAnnotationJob : public KIO::SimpleJob { Q_OBJECT + TQ_OBJECT public: GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -125,6 +126,7 @@ private: class MultiGetAnnotationJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo ); @@ -148,6 +150,7 @@ private: class MultiUrlGetAnnotationJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl, @@ -172,6 +175,7 @@ private: class MultiSetAnnotationJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo ); diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index 9a5b4a23e..384752c24 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -89,7 +89,7 @@ const SpamAgents AntiSpamConfig::uniqueAgents() const SpamAgents::ConstIterator end( mAgents.end() ); for ( ; it != end ; ++it ) { const TQString agent( ( *it ).name() ); - if ( seenAgents.find( agent ) == seenAgents.end() ) { + if ( seenAgents.tqfind( agent ) == seenAgents.end() ) { agents.append( *it ); seenAgents.append( agent ); } diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h index e2aa2eca5..9c3449935 100644 --- a/kmail/antispamconfig.h +++ b/kmail/antispamconfig.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 15b3e7f79..af32ec486 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -57,8 +57,8 @@ using namespace KMail; AntiSpamWizard::AntiSpamWizard( WizardMode mode, - TQWidget* parent, KMFolderTree * mainFolderTree ) - : KWizard( parent ), + TQWidget* tqparent, KMFolderTree * mainFolderTree ) + : KWizard( tqparent ), mInfoPage( 0 ), mSpamRulesPage( 0 ), mVirusRulesPage( 0 ), @@ -150,7 +150,7 @@ void AntiSpamWizard::accept() KMFilterActionDict dict; TQValueList<KMFilter*> filterList; - bool tqreplaceExistingFilters = false; + bool replaceExistingFilters = false; // Let's start with virus detection and handling, // so we can avoid spam checks for viral messages @@ -227,10 +227,10 @@ void AntiSpamWizard::accept() } } else { // AntiSpam mode - // TODO Existing filters with same name are tqreplaced. This is hardcoded - // ATM and needs to be tqreplaced with a value from a (still missing) - // checkbox in the GUI. At least, the tqreplacement is announced in the GUI. - tqreplaceExistingFilters = true; + // TODO Existing filters with same name are replaced. This is hardcoded + // ATM and needs to be replaced with a value from a (still missing) + // checkbox in the GUI. At least, the replacement is announced in the GUI. + replaceExistingFilters = true; for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin(); it != mToolList.end(); ++it ) { if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) && @@ -245,7 +245,7 @@ void AntiSpamWizard::accept() pipeFilterAction->argsFromString( (*it).getDetectCmd() ); pipeFilterActions->append( pipeFilterAction ); KMSearchPattern* pipeFilterPattern = pipeFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) pipeFilterPattern->setName( (*it).getFilterName() ); else pipeFilterPattern->setName( uniqueNameFor( (*it).getFilterName() ) ); @@ -279,7 +279,7 @@ void AntiSpamWizard::accept() spamFilterActions->append( spamFilterAction3 ); } KMSearchPattern* spamFilterPattern = spamFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) spamFilterPattern->setName( i18n( "Spam handling" ) ); else spamFilterPattern->setName( uniqueNameFor( i18n( "Spam handling" ) ) ); @@ -320,7 +320,7 @@ void AntiSpamWizard::accept() unsureFilterAction1->argsFromString( mSpamRulesPage->selectedUnsureFolderName() ); unsureFilterActions->append( unsureFilterAction1 ); KMSearchPattern* unsureFilterPattern = unsureFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) unsureFilterPattern->setName( i18n( "Semi spam (unsure) handling" ) ); else unsureFilterPattern->setName( uniqueNameFor( i18n( "Semi spam (unsure) handling" ) ) ); @@ -382,7 +382,7 @@ void AntiSpamWizard::accept() } KMSearchPattern* classSpamFilterPattern = classSpamFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) classSpamFilterPattern->setName( i18n( "Classify as spam" ) ); else classSpamFilterPattern->setName( uniqueNameFor( i18n( "Classify as spam" ) ) ); @@ -414,7 +414,7 @@ void AntiSpamWizard::accept() } } KMSearchPattern* classHamFilterPattern = classHamFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) classHamFilterPattern->setName( i18n( "Classify as NOT spam" ) ); else classHamFilterPattern->setName( uniqueNameFor( i18n( "Classify as NOT spam" ) ) ); @@ -441,7 +441,7 @@ void AntiSpamWizard::accept() * initialized. This should happend only once. */ if ( !filterList.isEmpty() ) KMKernel::self()->filterMgr()->appendFilters( - filterList, tqreplaceExistingFilters ); + filterList, replaceExistingFilters ); TQDialog::accept(); } @@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary() { TQString text; TQString newFilters; - TQString tqreplaceFilters; + TQString replaceFilters; if ( mMode == AntiVirus ) { text = ""; // TODO add summary for the virus part @@ -571,10 +571,10 @@ void AntiSpamWizard::slotBuildSummary() it != mToolList.end(); ++it ) { if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) && (*it).isSpamTool() && !(*it).isDetectionOnly() ) { - sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters ); + sortFilterOnExistance( (*it).getFilterName(), newFilters, replaceFilters ); } } - sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters ); + sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters ); // The need for a andling of status "probably spam" depends on the tools chosen if ( mSpamRulesPage->moveUnsureSelected() ) { @@ -588,7 +588,7 @@ void AntiSpamWizard::slotBuildSummary() } if ( atLeastOneUnsurePattern ) { sortFilterOnExistance( i18n( "Semi spam (unsure) handling" ), - newFilters, tqreplaceFilters ); + newFilters, replaceFilters ); text += i18n( "<p>The folder for messages classified as unsure (probably spam) is <i>" ) + mSpamRulesPage->selectedUnsureFolderName() + "</i>.</p>"; } @@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary() // Manual classification via toolbar icon / manually applied filter action sortFilterOnExistance( i18n( "Classify as spam" ), - newFilters, tqreplaceFilters ); + newFilters, replaceFilters ); sortFilterOnExistance( i18n( "Classify as NOT spam" ), - newFilters, tqreplaceFilters ); + newFilters, replaceFilters ); // Show the filters in the summary if ( !newFilters.isEmpty() ) text += i18n( "<p>The wizard will create the following filters:<ul>" ) + newFilters + "</ul></p>"; - if ( !tqreplaceFilters.isEmpty() ) - text += i18n( "<p>The wizard will tqreplace the following filters:<ul>" ) - + tqreplaceFilters + "</ul></p>"; + if ( !replaceFilters.isEmpty() ) + text += i18n( "<p>The wizard will replace the following filters:<ul>" ) + + replaceFilters + "</ul></p>"; } mSummaryPage->setSummaryText( text ); @@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name ) void AntiSpamWizard::sortFilterOnExistance( const TQString & intendedFilterName, - TQString & newFilters, TQString & tqreplaceFilters ) + TQString & newFilters, TQString & replaceFilters ) { if ( uniqueNameFor( intendedFilterName ) == intendedFilterName ) newFilters += "<li>" + intendedFilterName + "</li>"; else - tqreplaceFilters += "<li>" + intendedFilterName + "</li>"; + replaceFilters += "<li>" + intendedFilterName + "</li>"; } @@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList() //--------------------------------------------------------------------------- -ASWizPage::ASWizPage( TQWidget * parent, const char * name, +ASWizPage::ASWizPage( TQWidget * tqparent, const char * name, const TQString *bannerName ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQString banner = "kmwizard.png"; if ( bannerName && !bannerName->isEmpty() ) @@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * parent, const char * name, //--------------------------------------------------------------------------- ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, - TQWidget * parent, const char * name ) - : ASWizPage( parent, name ) + TQWidget * tqparent, const char * name ) + : ASWizPage( tqparent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); @@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange() //--------------------------------------------------------------------------- -ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, +ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ) - : ASWizPage( parent, name ) + : ASWizPage( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); @@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled ) //--------------------------------------------------------------------------- -ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name, +ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ) - : ASWizPage( parent, name ) + : ASWizPage( tqparent, name ) { TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() ); @@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange() //--------------------------------------------------------------------------- -ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) - : ASWizPage( parent, name ) +ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name ) + : ASWizPage( tqparent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index e80234263..a17e341a2 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -104,6 +104,7 @@ namespace KMail { class AntiSpamWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: /** The wizard can be used for setting up anti-spam tools and for @@ -114,13 +115,13 @@ namespace KMail { /** Constructor that needs to initialize from the main folder tree of KMail. @param mode The mode the wizard should run in. - @param parent The parent widget for the wizard. + @param tqparent The tqparent widget for the wizard. @param mainFolderTree The main folder tree from which the folders are copied to allow the selection of a spam folder in a tree within one of the wizard pages. */ AntiSpamWizard( WizardMode mode, - TQWidget * parent, KMFolderTree * mainFolderTree ); + TQWidget * tqparent, KMFolderTree * mainFolderTree ); protected: /** @@ -259,7 +260,7 @@ namespace KMail { /* convenience method to sort out new and existing filters */ void sortFilterOnExistance( const TQString & intendedFilterName, TQString & newFilters, - TQString & tqreplaceFilters ); + TQString & replaceFilters ); /* The pages in the wizard */ ASWizInfoPage * mInfoPage; @@ -280,10 +281,10 @@ namespace KMail { //--------------------------------------------------------------------------- - class ASWizPage : public QWidget + class ASWizPage : public TQWidget { public: - ASWizPage( TQWidget *parent, const char *name, + ASWizPage( TQWidget *tqparent, const char *name, const TQString *bannerName = 0); protected: @@ -298,10 +299,11 @@ namespace KMail { class ASWizInfoPage : public ASWizPage { Q_OBJECT + TQ_OBJECT public: ASWizInfoPage( AntiSpamWizard::WizardMode mode, - TQWidget *parent, const char *name ); + TQWidget *tqparent, const char *name ); void setScanProgressText( const TQString &toolName ); void addAvailableTool( const TQString &visibleName ); @@ -324,9 +326,10 @@ namespace KMail { class ASWizSpamRulesPage : public ASWizPage { Q_OBJECT + TQ_OBJECT public: - ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ); + ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ); bool markAsReadSelected() const; bool moveSpamSelected() const; @@ -356,9 +359,10 @@ namespace KMail { class ASWizVirusRulesPage : public ASWizPage { Q_OBJECT + TQ_OBJECT public: - ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ); + ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ); bool pipeRulesSelected() const; bool moveRulesSelected() const; @@ -382,9 +386,10 @@ namespace KMail { class ASWizSummaryPage : public ASWizPage { Q_OBJECT + TQ_OBJECT public: - ASWizSummaryPage( TQWidget * parent, const char * name ); + ASWizSummaryPage( TQWidget * tqparent, const char * name ); void setSummaryText( const TQString & text ); diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp index c740f02df..9a5db05b4 100644 --- a/kmail/app_octetstream.cpp +++ b/kmail/app_octetstream.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 979065e4d..ca10bd449 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -49,11 +49,11 @@ static TQString standardArchivePath( const TQString &folderName ) "_" + TQDate::tqcurrentDate().toString( TQt::ISODate ) + ".tar.bz2"; } -ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) - : KDialogBase( parent, "archive_folder_dialog", false, i18n( "Archive Folder" ), +ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent ) + : KDialogBase( tqparent, "archive_folder_dialog", false, i18n( "Archive Folder" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), - mParentWidget( parent ) + mParentWidget( tqparent ) { TQWidget *mainWidget = new TQWidget( this ); TQGridLayout *mainLayout = new TQGridLayout( mainWidget ); @@ -65,7 +65,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) // TODO: better label for "Ok" button // TODO: Explaination label - // TODO: Use QFormLayout in KDE4 + // TODO: Use TQFormLayout in KDE4 TQLabel *folderLabel = new TQLabel( i18n( "&Folder:" ), mainWidget ); mainLayout->addWidget( folderLabel, row, 0 ); diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h index 806d5b127..cc4699594 100644 --- a/kmail/archivefolderdialog.h +++ b/kmail/archivefolderdialog.h @@ -33,10 +33,11 @@ class FolderRequester; class ArchiveFolderDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ArchiveFolderDialog( TQWidget *parent = 0 ); + ArchiveFolderDialog( TQWidget *tqparent = 0 ); void setFolder( KMFolder *defaultFolder ); protected slots: diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp index 7114242c4..688af6233 100644 --- a/kmail/attachmentcollector.cpp +++ b/kmail/attachmentcollector.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) { continue; } if ( isInSkipList( node ) ) { - node = node->next( false ); // skip even the children + node = node->next( false ); // skip even the tqchildren continue; } if ( isInExclusionList( node ) ) { diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h index e74496072..6930e07ea 100644 --- a/kmail/attachmentcollector.h +++ b/kmail/attachmentcollector.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp index 49fc3935d..7eebbbb22 100644 --- a/kmail/attachmentlistview.cpp +++ b/kmail/attachmentlistview.cpp @@ -33,7 +33,7 @@ using KPIM::MailListDrag; // other KDE headers #include <kurldrag.h> -// other Qt headers +// other TQt headers #include <tqevent.h> #include <tqcstring.h> #include <tqbuffer.h> @@ -47,9 +47,9 @@ using KPIM::MailListDrag; namespace KMail { AttachmentListView::AttachmentListView( KMail::Composer * composer, - TQWidget* parent, + TQWidget* tqparent, const char* name ) - : KListView( parent, name ), + : KListView( tqparent, name ), mComposer( composer ) { setAcceptDrops( true ); diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index 2c8f2800a..a25d792e8 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -30,8 +30,9 @@ class Composer; class AttachmentListView : public KListView { Q_OBJECT + TQ_OBJECT public: - AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0, + AttachmentListView( KMail::Composer * composer = 0, TQWidget* tqparent = 0, const char* name = 0 ); virtual ~AttachmentListView(); diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp index 6e147b946..23bd05951 100644 --- a/kmail/attachmentstrategy.cpp +++ b/kmail/attachmentstrategy.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h index 835768949..268a43309 100644 --- a/kmail/attachmentstrategy.h +++ b/kmail/attachmentstrategy.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index a20e4118e..3953f3bcf 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -36,12 +36,12 @@ using namespace KMail; -BackupJob::BackupJob( TQWidget *parent ) - : TQObject( parent ), +BackupJob::BackupJob( TQWidget *tqparent ) + : TQObject( tqparent ), mArchiveType( Zip ), mRootFolder( 0 ), mArchive( 0 ), - mParentWidget( parent ), + mParentWidget( tqparent ), mCurrentFolderOpen( false ), mArchivedMessages( 0 ), mArchivedSize( 0 ), @@ -165,7 +165,7 @@ void BackupJob::finish() } } - mProgressItem->seStatus( i18n( "Archiving finished" ) ); + mProgressItem->setqStatus( i18n( "Archiving finished" ) ); mProgressItem->setComplete(); mProgressItem = 0; @@ -236,8 +236,8 @@ void BackupJob::archiveNextMessage() mCurrentMessage = message; TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) ); } - else if ( message->parent() ) { - mCurrentJob = message->parent()->createJob( message ); + else if ( message->tqparent() ) { + mCurrentJob = message->tqparent()->createJob( message ); mCurrentJob->setCancellable( false ); connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), this, TQT_SLOT( messageRetrieved( KMMessage* ) ) ); @@ -247,7 +247,7 @@ void BackupJob::archiveNextMessage() } else { kdWarning(5006) << "Message with subject " << mCurrentMessage->subject() - << " is neither complete nor has a parent!" << endl; + << " is neither complete nor has a tqparent!" << endl; abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." ) .arg( mCurrentFolder->name() ) ); } @@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder() mCurrentFolder = mPendingFolders.take( 0 ); kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl; - mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) ); + mProgressItem->setqStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) ); if ( mCurrentFolder->open( "BackupJob" ) != 0 ) { abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) ); return; diff --git a/kmail/backupjob.h b/kmail/backupjob.h index f6383d669..500e671ac 100644 --- a/kmail/backupjob.h +++ b/kmail/backupjob.h @@ -48,13 +48,14 @@ namespace KMail class BackupJob : public TQObject { Q_OBJECT + TQ_OBJECT public: // These enum values have to stay in sync with the format combobox of ArchiveFolderDialog! enum ArchiveType { Zip = 0, Tar = 1, TarBz2 = 2, TarGz = 3 }; - explicit BackupJob( TQWidget *parent = 0 ); + explicit BackupJob( TQWidget *tqparent = 0 ); ~BackupJob(); void setRootFolder( KMFolder *rootFolder ); void setSaveLocation( const KURL &savePath ); diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp index a69c01bf3..bd6da060a 100644 --- a/kmail/bodypartformatter.cpp +++ b/kmail/bodypartformatter.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -302,7 +302,7 @@ static const KMail::BodyPartFormatter * createForApplication( const char * subty return AnyTypeBodyPartFormatter::create(); } -// OK, tqreplace this with a factory with plugin support later on... +// OK, replace this with a factory with plugin support later on... const KMail::BodyPartFormatter * KMail::BodyPartFormatter::createFor( const char * type, const char * subtype ) { if ( type && *type ) switch ( type[0] ) { diff --git a/kmail/bodypartformatter.h b/kmail/bodypartformatter.h index eda28a906..1c2965824 100644 --- a/kmail/bodypartformatter.h +++ b/kmail/bodypartformatter.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp index 680d0c483..f11690d52 100644 --- a/kmail/bodypartformatterfactory.cpp +++ b/kmail/bodypartformatterfactory.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,7 +44,7 @@ using namespace KMail::BodyPartFormatterFactoryPrivate; // KDE #include <kdebug.h> -// Qt +// TQt #include <tqstring.h> #include <tqcstring.h> #include <tqstringlist.h> @@ -83,7 +83,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype, if ( !type || !*type || !subtype || !*subtype || !formatter || !all ) return; - TypeRegistry::iterator type_it = all->find( type ); + TypeRegistry::iterator type_it = all->tqfind( type ); if ( type_it == all->end() ) { kdDebug( 5006 ) << "BodyPartFormatterFactory: instantiating new Subtype Registry for \"" << type << "\"" << endl; @@ -92,7 +92,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype, } SubtypeRegistry & subtype_reg = type_it->second; - SubtypeRegistry::iterator subtype_it = subtype_reg.find( subtype ); + SubtypeRegistry::iterator subtype_it = subtype_reg.tqfind( subtype ); if ( subtype_it != subtype_reg.end() ) { kdDebug( 5006 ) << "BodyPartFormatterFactory: overwriting previously registered formatter for \"" << type << "/" << subtype << "\"" << endl; @@ -159,9 +159,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre if ( all->empty() ) return 0; - TypeRegistry::const_iterator type_it = all->find( type ); + TypeRegistry::const_iterator type_it = all->tqfind( type ); if ( type_it == all->end() ) - type_it = all->find( "*" ); + type_it = all->tqfind( "*" ); if ( type_it == all->end() ) return 0; @@ -169,9 +169,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre if ( subtype_reg.empty() ) return 0; - SubtypeRegistry::const_iterator subtype_it = subtype_reg.find( subtype ); + SubtypeRegistry::const_iterator subtype_it = subtype_reg.tqfind( subtype ); if ( subtype_it == subtype_reg.end() ) - subtype_it = subtype_reg.find( "*" ); + subtype_it = subtype_reg.tqfind( "*" ); if ( subtype_it == subtype_reg.end() ) return 0; diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h index 90217153d..dd89eb34e 100644 --- a/kmail/bodypartformatterfactory.h +++ b/kmail/bodypartformatterfactory.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h index 7ca101aba..f18bc22aa 100644 --- a/kmail/bodypartformatterfactory_p.h +++ b/kmail/bodypartformatterfactory_p.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp index 5c9205849..337c843cd 100644 --- a/kmail/bodyvisitor.cpp +++ b/kmail/bodyvisitor.cpp @@ -76,9 +76,9 @@ namespace KMail { while ( (part = it.current()) != 0 ) { ++it; - // skip this part if the parent part is already loading - if ( part->parent() && - selected.tqcontains( part->parent() ) && + // skip this part if the tqparent part is already loading + if ( part->tqparent() && + selected.tqcontains( part->tqparent() ) && part->loadPart() ) continue; @@ -114,9 +114,9 @@ namespace KMail { headerCheck = false; // check whether to load this part or not: - // look at the basic list, ask the subclass and check the parent + // look at the basic list, ask the subclass and check the tqparent if ( mBasicList.tqcontains( part->originalContentTypeStr() ) || - parentNeedsLoading( part ) || + tqparentNeedsLoading( part ) || addPartToList( part ) ) { if ( part->typeStr() != "MULTIPART" || @@ -137,18 +137,18 @@ namespace KMail { } //----------------------------------------------------------------------------- - bool BodyVisitor::parentNeedsLoading( KMMessagePart *msgPart ) + bool BodyVisitor::tqparentNeedsLoading( KMMessagePart *msgPart ) { KMMessagePart *part = msgPart; while ( part ) { - if ( part->parent() && - ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" || + if ( part->tqparent() && + ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" || ( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" && - part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) ) + part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) ) return true; - part = part->parent(); + part = part->tqparent(); } return false; } diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index 519dd86c9..4ccd16599 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -60,10 +60,10 @@ namespace KMail { protected: /** - * Checks if one of the parents needs loaded children + * Checks if one of the tqparents needs loaded tqchildren * This is e.g. needed for multipart/signed where all parts have to be loaded */ - static bool parentNeedsLoading( KMMessagePart * part ); + static bool tqparentNeedsLoading( KMMessagePart * part ); protected: TQPtrList<KMMessagePart> mParts; diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index f80f56744..2b9ab2a8e 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -70,7 +70,7 @@ CachedImapJob::CachedImapJob( const TQValueList<MsgForDownload>& msgs, // Put messages CachedImapJob::CachedImapJob( const TQPtrList<KMMessage>& msgs, JobType type, KMFolderCachedImap* folder ) - : FolderJob( msgs, TQString::null, type, folder?folder->folder():0 ), mFolder( folder ), + : FolderJob( msgs, TQString(), type, folder?folder->folder():0 ), mFolder( folder ), mTotalBytes( msgs.count() ), // we abuse it as "total number of messages" mMsg( 0 ), mParentFolder( 0 ) { @@ -78,7 +78,7 @@ CachedImapJob::CachedImapJob( const TQPtrList<KMMessage>& msgs, JobType type, CachedImapJob::CachedImapJob( const TQValueList<unsigned long>& msgs, JobType type, KMFolderCachedImap* folder ) - : FolderJob( TQPtrList<KMMessage>(), TQString::null, type, folder?folder->folder():0 ), + : FolderJob( TQPtrList<KMMessage>(), TQString(), type, folder?folder->folder():0 ), mFolder( folder ), mSerNumMsgList( msgs ), mTotalBytes( msgs.count() ), mMsg( 0 ), mParentFolder ( 0 ) { @@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mFolder->addMsgInternal( mMsg, true, &index ); if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) { - mFolder->seStatus( index, KMMsgStatusRead, false ); + mFolder->setqStatus( index, KMMsgStatusRead, false ); } emit messageRetrieved( mMsg ); @@ -339,7 +339,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mMsg->setUID(mfd.uid); mMsg->setMsgSizeServer(mfd.size); if( mfd.flags > 0 ) - KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX); + KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX); KURL url = mAccount->getUrl(); url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid)); @@ -401,9 +401,9 @@ void CachedImapJob::slotPutNextMessage() mMsg->setUID( 0 ); // for the index TQCString cstr(mMsg->asString()); - int a = cstr.find("\nX-UID: "); - int b = cstr.find('\n', a); - if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a); + int a = cstr.tqfind("\nX-UID: "); + int b = cstr.tqfind('\n', a); + if (a != -1 && b != -1 && cstr.tqfind("\n\n") > a) cstr.remove(a, b-a); TQCString mData(cstr.length() + cstr.tqcontains('\n')); unsigned int i = 0; for( char *ch = cstr.data(); *ch; ch++ ) { @@ -462,7 +462,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data return; } - if ( data.find( "UID" ) != -1 && mMsg ) { + if ( data.tqfind( "UID" ) != -1 && mMsg ) { int uid = ( data.right( data.length() - 4 ) ).toInt(); kdDebug( 5006 ) << k_funcinfo << "Server told us uid is: " << uid << endl; mMsg->setUID( uid ); @@ -498,7 +498,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job) emit progress( mSentBytes, mTotalBytes ); int i; - if( ( i = mFolder->find(mMsg) ) != -1 ) { + if( ( i = mFolder->tqfind(mMsg) ) != -1 ) { /* * If we have aquired a uid during upload the server supports the uidnext * extension and there is no need to redownload this mail, we already have @@ -534,8 +534,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) } // make copy of setting, to reset it before potentially destroying 'it' - bool silentUpload = static_cast<KMFolderCachedImap*>((*it).parent->storage())->silentUpload(); - static_cast<KMFolderCachedImap*>((*it).parent->storage())->setSilentUpload( false ); + bool silentUpload = static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->silentUpload(); + static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->setSilentUpload( false ); if ( job->error() && !silentUpload ) { TQString myError = "<p><b>" + i18n("Error while uploading folder") @@ -549,11 +549,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) return; } else { KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() ); - KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).parent->storage() ); + KMFolderCachedImap* tqparentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); Q_ASSERT( storage ); - Q_ASSERT( parentStorage ); + Q_ASSERT( tqparentStorage ); if ( storage->imapPath().isEmpty() ) { - TQString path = mAccount->createImapPath( parentStorage->imapPath(), storage->folder()->name() ); + TQString path = mAccount->createImapPath( tqparentStorage->imapPath(), storage->folder()->name() ); if ( !storage->imapPathForCreation().isEmpty() ) path = storage->imapPathForCreation(); storage->setImapPath( path ); @@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) url.setPath( path ); if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) { - // Associate the jobData with the parent folder, not with the child + // Associate the jobData with the tqparent folder, not with the child // This is necessary in case of an error while creating the subfolder, - // so that folderComplete is called on the parent (and the sync resetted). + // so that folderComplete is called on the tqparent (and the sync resetted). ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.items << folder->label(); // for the err msg jd.current = folder->folder(); @@ -679,14 +679,14 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) if( job->error() ) { mErrorCode = job->error(); - mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).tqparent->label() ) + '\n' ); delete this; return; } // Check the uidValidity TQCString cstr((*it).data.data(), (*it).data.size() + 1); - int a = cstr.find("X-uidValidity: "); + int a = cstr.tqfind("X-uidValidity: "); if (a < 0) { // Something is seriously rotten here! // TODO: Tell the user that he has a problem @@ -694,7 +694,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) << mFolder->name() << endl; } else { - int b = cstr.find("\r\n", a); + int b = cstr.tqfind("\r\n", a); if ( (b - a - 15) >= 0 ) { TQString uidv = cstr.mid(a + 15, b - a - 15); // kdDebug(5006) << "New uidv = " << uidv << ", old uidv = " @@ -711,11 +711,11 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) << mFolder->name() << endl; } - a = cstr.find( "X-PermanentFlags: " ); + a = cstr.tqfind( "X-PermanentFlags: " ); if ( a < 0 ) { kdDebug(5006) << "no PERMANENTFLAGS response? assumming custom flags are not available" << endl; } else { - int b = cstr.find( "\r\n", a ); + int b = cstr.tqfind( "\r\n", a ); if ( (b - a - 18) >= 0 ) { int flags = cstr.mid( a + 18, b - a - 18 ).toInt(); emit permanentFlags( flags ); @@ -767,7 +767,7 @@ static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath, static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage()); if ( !imapFolder->imapPath().isEmpty() ) // Only rename folders that have been accepted by the server - if( imapFolder->imapPath().find( oldPath ) == 0 ) { + if( imapFolder->imapPath().tqfind( oldPath ) == 0 ) { TQString p = imapFolder->imapPath(); p = p.mid( oldPath.length() ); p.prepend( newPath ); @@ -782,7 +782,7 @@ static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath, void CachedImapJob::revertLabelChange() { - TQMap<TQString, KMAcctCachedImap::RenamedFolder>::ConstIterator renit = mAccount->renamedFolders().find( mFolder->imapPath() ); + TQMap<TQString, KMAcctCachedImap::RenamedFolder>::ConstIterator renit = mAccount->renamedFolders().tqfind( mFolder->imapPath() ); Q_ASSERT( renit != mAccount->renamedFolders().end() ); if ( renit != mAccount->renamedFolders().end() ) { mFolder->folder()->setLabel( (*renit).mOldLabel ); @@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job ) } //----------------------------------------------------------------------------- -void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent ) +void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent ) { - mParentFolder = const_cast<KMFolderCachedImap*>( parent ); + mParentFolder = const_cast<KMFolderCachedImap*>( tqparent ); } } diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h index 4a2885b00..cf9dab57e 100644 --- a/kmail/cachedimapjob.h +++ b/kmail/cachedimapjob.h @@ -20,22 +20,22 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -60,6 +60,7 @@ namespace KMail { class CachedImapJob : public FolderJob { Q_OBJECT + TQ_OBJECT public: /** Information about a message to be downloaded (from the 'IMAP envelope') */ struct MsgForDownload { @@ -94,7 +95,7 @@ public: virtual ~CachedImapJob(); - void setParentFolder( const KMFolderCachedImap* parent ); + void setParentFolder( const KMFolderCachedImap* tqparent ); signals: // only emitted for uid validity checking jobs with PERMANENTFLAGS responses diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 6f5636992..037f80900 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -64,7 +64,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const return transports.first(); const TQString defaultTransport = GlobalSettings::self()->defaultTransport(); - const int defaultIndex = QMAX( 0, transports.findIndex( defaultTransport ) ); + const int defaultIndex = TQMAX( 0, transports.findIndex( defaultTransport ) ); TQString text; if ( nullIdentity ) @@ -227,14 +227,14 @@ TQString Callback::receiver() const // select default identity by default const TQString defaultAddr = kmkernel->identityManager()->defaultIdentity().primaryEmailAddress(); - const int defaultIndex = QMAX( 0, addrs.findIndex( defaultAddr ) ); + const int defaultIndex = TQMAX( 0, addrs.findIndex( defaultAddr ) ); mReceiver = KInputDialog::getItem( i18n( "Select Address" ), selectMessage, addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); if( !ok ) - mReceiver = TQString::null; + mReceiver = TQString(); } return mReceiver; diff --git a/kmail/callback.h b/kmail/callback.h index c7f26058f..a7e9af792 100644 --- a/kmail/callback.h +++ b/kmail/callback.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index ac4d3278a..d88c3164b 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -7,10 +7,10 @@ #include <tqlayout.h> #include <tqlabel.h> -ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption, +ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption, const TQStringList& keys, const TQString& currentKey, const TQString& lastOptions ) - : KDialogBase( parent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true ) + : KDialogBase( tqparent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true ) { TQWidget *page = makeMainWidget(); @@ -22,7 +22,7 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt mListBox = new KListBox( page ); mListBox->insertStringList( keys ); const int current = keys.findIndex( currentKey ); - mListBox->setSelected( QMAX( 0, current ), true ); + mListBox->setSelected( TQMAX( 0, current ), true ); mListBox->ensureCurrentVisible(); tqlayout->addWidget( mListBox, 1 ); diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h index 8ee24c713..3402fd370 100644 --- a/kmail/chiasmuskeyselector.h +++ b/kmail/chiasmuskeyselector.h @@ -9,9 +9,10 @@ class TQLabel; class ChiasmusKeySelector : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ChiasmusKeySelector( TQWidget* parent, const TQString& caption, + ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption, const TQStringList& keys, const TQString& currentKey, const TQString& lastOptions ); diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp index 0e6b3a400..a0ebc8253 100644 --- a/kmail/colorlistbox.cpp +++ b/kmail/colorlistbox.cpp @@ -29,8 +29,8 @@ #include "colorlistbox.h" -ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) - :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) +ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f ) + :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); @@ -178,7 +178,7 @@ void ColorListItem::paint( TQPainter *p ) p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawRect( 3, 1, mBoxWidth, h-1 ); p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor ); } diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h index 13db01afb..bb9e5b171 100644 --- a/kmail/colorlistbox.h +++ b/kmail/colorlistbox.h @@ -26,9 +26,10 @@ class ColorListBox : public KListBox { Q_OBJECT + TQ_OBJECT public: - ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); + ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 ); void setColor( uint index, const TQColor &color ); TQColor color( uint index ) const; signals: @@ -52,10 +53,10 @@ signals: }; -class ColorListItem : public QListBoxItem +class ColorListItem : public TQListBoxItem { public: - ColorListItem( const TQString &text, const TQColor &color=Qt::black ); + ColorListItem( const TQString &text, const TQColor &color=TQt::black ); const TQColor &color( void ); void setColor( const TQColor &color ); diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index 183b72163..3d3dd6acc 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -28,7 +28,7 @@ #include "compactionjob.h" #include "kmfolder.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmfoldermbox.h" #include "kmfoldermaildir.h" @@ -97,13 +97,13 @@ int MboxCompactionJob::executeNow( bool silent ) kdDebug(5006) << storage->location() << " compaction skipped." << endl; if ( !mSilent ) { TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() ); - BroadcasStatus::instance()->seStatusMsg( str ); + BroadcastqStatus::instance()->seStatusMsg( str ); } return 0; } kdDebug(5006) << "Compacting " << mSrcFolder->idString() << endl; - if (KMFolderIndex::IndexOk != mbox->indexStatus()) { + if (KMFolderIndex::IndexOk != mbox->indextqStatus()) { kdDebug(5006) << "Critical error: " << storage->location() << " has been modified by an external application while KMail was running." << endl; // exit(1); backed out due to broken nfs @@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc ) mErrorCode = rc; if ( !mSilent ) - BroadcasStatus::instance()->seStatusMsg( str ); + BroadcastqStatus::instance()->seStatusMsg( str ); mFolderOpen = false; deleteLater(); // later, because of the "return mErrorCode" @@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc ) if ( storage->isOpened() ) storage->updateIndex(); if ( !mSilent ) - BroadcasStatus::instance()->seStatusMsg( str ); + BroadcastqStatus::instance()->seStatusMsg( str ); mFolderOpen = false; deleteLater(); // later, because of the "return mErrorCode" diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h index bb234a049..e11e6ece3 100644 --- a/kmail/compactionjob.h +++ b/kmail/compactionjob.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -39,6 +39,7 @@ namespace KMail { class MboxCompactionJob : public ScheduledJob { Q_OBJECT + TQ_OBJECT public: /// @p folder should be a folder with a KMFolderMbox storage. MboxCompactionJob( KMFolder* folder, bool immediate ); @@ -72,6 +73,7 @@ private: class MaildirCompactionJob : public ScheduledJob { Q_OBJECT + TQ_OBJECT public: /// @p folder should be a folder with a KMFolderMaildir storage. MaildirCompactionJob( KMFolder* folder, bool immediate ); diff --git a/kmail/composer.h b/kmail/composer.h index 91c473445..ac903b378 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -35,6 +35,7 @@ namespace KMail { class Composer : public KMail::SecondaryWindow { Q_OBJECT + TQ_OBJECT protected: Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {} public: // mailserviceimpl diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui index 696334e19..ac1c30554 100644 --- a/kmail/composercryptoconfiguration.ui +++ b/kmail/composercryptoconfiguration.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ComposerCryptoConfiguration</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ComposerCryptoConfiguration</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>optionsGroup_2</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mAutoSignature</cstring> </property> @@ -40,7 +40,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>optionsGroup</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mEncToSelf</cstring> </property> @@ -62,7 +62,7 @@ <string>When this option is enabled, the message/file will not only be encrypted with the receiver's public key, but also with your key. This will enable you to decrypt the message/file at a later time. This is generally a good idea.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mShowEncryptionResult</cstring> </property> @@ -73,7 +73,7 @@ <string>When this option is enabled, the signed/encrypted text will be shown in a separate window, enabling you to know how it will look before it is sent. This is a good idea when you are verifying that your encryption system works.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mStoreEncrypted</cstring> </property> @@ -95,7 +95,7 @@ However, there may be local rules that require you to turn this option on. When </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mShowKeyApprovalDlg</cstring> </property> @@ -106,7 +106,7 @@ However, there may be local rules that require you to turn this option on. When <string>When this option is enabled, the application will always show you a list of public keys from which you can choose the one it will use for encryption. If it is off, the application will only show the dialog if it cannot find the right key or if there are several which could be used.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mAutoEncrypt</cstring> </property> @@ -117,7 +117,7 @@ However, there may be local rules that require you to turn this option on. When <string>When this option is enabled, every message you send will be encrypted whenever encryption is possible and desired; of course, it is still possible to disable the automatic encryption for each message individually.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mNeverEncryptWhenSavingInDrafts</cstring> </property> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index c5824eadc..bc415a888 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -101,7 +101,7 @@ using KMime::DateFormatter; #include <kcmultidialog.h> #include <kcombobox.h> -// Qt headers: +// TQt headers: #include <tqvalidator.h> #include <tqwhatsthis.h> #include <tqvgroupbox.h> @@ -214,9 +214,9 @@ namespace { } -ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) +ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal ) : KCMultiDialog( KDialogBase::IconList, KGuiItem( i18n( "&Load Profile..." ) ), - KGuiItem(), User2, i18n( "Configure" ), parent, name, modal ) + KGuiItem(), User2, i18n( "Configure" ), tqparent, name, modal ) , mProfileDialog( 0 ) { KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); @@ -284,8 +284,8 @@ TQString IdentityPage::helpAnchor() const { return TQString::tqfromLatin1("configure-identity"); } -IdentityPage::IdentityPage( TQWidget * parent, const char * name ) - : ConfigModule( parent, name ), +IdentityPage::IdentityPage( TQWidget * tqparent, const char * name ) + : ConfigModule( tqparent, name ), mIdentityDialog( 0 ) { TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); @@ -555,8 +555,8 @@ TQString AccountsPage::helpAnchor() const { return TQString::tqfromLatin1("configure-accounts"); } -AccountsPage::AccountsPage( TQWidget * parent, const char * name ) - : ConfigModuleWithTabs( parent, name ) +AccountsPage::AccountsPage( TQWidget * tqparent, const char * name ) + : ConfigModuleWithTabs( tqparent, name ) { // // "Receiving" tab: @@ -581,8 +581,8 @@ TQString AccountsPage::SendingTab::helpAnchor() const { return TQString::tqfromLatin1("configure-accounts-sending"); } -AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { mTransportInfoList.setAutoDelete( true ); // temp. vars: @@ -649,7 +649,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * btn_vlay->addStretch( 1 ); // spacer // "Common options" groupbox: - group = new TQGroupBox( 0, Qt::Vertical, + group = new TQGroupBox( 0, TQt::Vertical, i18n("Common Options"), this ); vlay->addWidget(group); @@ -739,7 +739,7 @@ static inline TQString uniqueName( const TQStringList & list, { int suffix = 1; TQString result = name; - while ( list.find( result ) != list.end() ) { + while ( list.tqfind( result ) != list.end() ) { result = i18n("%1: name; %2: number appended to it to make it unique " "among a list of names", "%1 %2") .arg( name ).arg( suffix ); @@ -911,7 +911,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport() KPIM::IdentityManager * im = kmkernel->identityManager(); for ( KPIM::IdentityManager::Iterator it = im->modifyBegin(); it != im->modifyEnd(); ++it ) { if ( item->text( 0 ) == (*it).transport() ) { - (*it).setTransport( TQString::null ); + (*it).setTransport( TQString() ); changedIdents += (*it).identityName(); } } @@ -919,7 +919,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport() // if the deleted transport is the currently used transport reset it to default const TQString& currentTransport = GlobalSettings::self()->currentTransport(); if ( item->text( 0 ) == currentTransport ) { - GlobalSettings::self()->setCurrentTransport( TQString::null ); + GlobalSettings::self()->setCurrentTransport( TQString() ); } if ( !changedIdents.isEmpty() ) { @@ -952,7 +952,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport() newCurrent->setText( 1, i18n("sendmail (Default)" )); } } else { - GlobalSettings::self()->setDefaultTransport( TQString::null ); + GlobalSettings::self()->setDefaultTransport( TQString() ); } } delete item; @@ -1056,8 +1056,8 @@ TQString AccountsPage::ReceivingTab::helpAnchor() const { return TQString::tqfromLatin1("configure-accounts-receiving"); } -AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name ) - : ConfigModuleTab ( parent, name ) +AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab ( tqparent, name ) { // temp. vars: TQVBoxLayout *vlay; @@ -1223,7 +1223,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() { default: // ### FIXME: How should this happen??? - // tqreplace with assert. + // replace with assert. KMessageBox::sorry( this, i18n("Unknown account type selected") ); return; } @@ -1481,8 +1481,8 @@ TQString AppearancePage::helpAnchor() const { return TQString::tqfromLatin1("configure-appearance"); } -AppearancePage::AppearancePage( TQWidget * parent, const char * name ) - : ConfigModuleWithTabs( parent, name ) +AppearancePage::AppearancePage( TQWidget * tqparent, const char * name ) + : ConfigModuleWithTabs( tqparent, name ) { // // "Fonts" tab: @@ -1551,8 +1551,8 @@ static const struct { }; static const int numFontNames = sizeof fontNames / sizeof *fontNames; -AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ), mActiveFontIndex( -1 ) +AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ), mActiveFontIndex( -1 ) { assert( numFontNames == sizeof mFont / sizeof *mFont ); // tmp. vars: @@ -1722,15 +1722,15 @@ static const struct { { "PGPMessageErr", I18N_NOOP("OpenPGP Message - Bad Signature") }, { "HTMLWarningColor", I18N_NOOP("Border Around Warning Prepending HTML Messages") }, { "CloseToQuotaColor", I18N_NOOP("Folder Name and Size When Close to Quota") }, - { "ColorbarBackgroundPlain", I18N_NOOP("HTML Status Bar Background - No HTML Message") }, - { "ColorbarForegroundPlain", I18N_NOOP("HTML Status Bar Foreground - No HTML Message") }, - { "ColorbarBackgroundHTML", I18N_NOOP("HTML Status Bar Background - HTML Message") }, - { "ColorbarForegroundHTML", I18N_NOOP("HTML Status Bar Foreground - HTML Message") }, + { "ColorbarBackgroundPlain", I18N_NOOP("HTML tqStatus Bar Background - No HTML Message") }, + { "ColorbarForegroundPlain", I18N_NOOP("HTML tqStatus Bar Foreground - No HTML Message") }, + { "ColorbarBackgroundHTML", I18N_NOOP("HTML tqStatus Bar Background - HTML Message") }, + { "ColorbarForegroundHTML", I18N_NOOP("HTML tqStatus Bar Foreground - HTML Message") }, }; static const int numColorNames = sizeof colorNames / sizeof *colorNames; -AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -1801,22 +1801,22 @@ void AppearancePage::ColorsTab::doLoadOther() { TQColor( 0x00, 0x60, 0x00 ), // quoted l3 KGlobalSettings::linkColor(), // link KGlobalSettings::visitedLinkColor(), // visited link - Qt::red, // misspelled words - Qt::red, // new msg - Qt::blue, // unread mgs + TQt::red, // misspelled words + TQt::red, // new msg + TQt::blue, // unread mgs TQColor( 0x00, 0x7F, 0x00 ), // important msg - Qt::blue, // todo mgs + TQt::blue, // todo mgs TQColor( 0x00, 0x80, 0xFF ), // light blue // pgp encrypted TQColor( 0x40, 0xFF, 0x40 ), // light green // pgp ok, trusted key TQColor( 0xFF, 0xFF, 0x40 ), // light yellow // pgp ok, untrusted key TQColor( 0xFF, 0xFF, 0x40 ), // light yellow // pgp unchk - Qt::red, // pgp bad + TQt::red, // pgp bad TQColor( 0xFF, 0x40, 0x40 ), // warning text color: light red - Qt::red, // close to quota - Qt::lightGray, // colorbar plain bg - Qt::black, // colorbar plain fg - Qt::black, // colorbar html bg - Qt::white, // colorbar html fg + TQt::red, // close to quota + TQt::lightGray, // colorbar plain bg + TQt::black, // colorbar plain fg + TQt::black, // colorbar html bg + TQt::white, // colorbar html fg }; for ( int i = 0 ; i < numColorNames ; i++ ) { @@ -1900,8 +1900,8 @@ static const EnumConfigEntry readerWindowMode = { readerWindowModes, DIM(readerWindowModes), 1 }; -AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout * vlay; @@ -1992,8 +1992,8 @@ static const struct { static const int numDateDisplayConfig = sizeof dateDisplayConfig / sizeof *dateDisplayConfig; -AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ), +AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ), mCustomDateFormatEdit( 0 ) { // tmp. vars: @@ -2094,8 +2094,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha "<li>ss - the seconds with a leading zero (00-59)</li>" "<li>z - the milliseconds without leading zeroes (0-999)</li>" "<li>zzz - the milliseconds with leading zeroes (000-999)</li>" - "<li>AP - switch to AM/PM display. AP will be tqreplaced by either \"AM\" or \"PM\".</li>" - "<li>ap - switch to AM/PM display. ap will be tqreplaced by either \"am\" or \"pm\".</li>" + "<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or \"PM\".</li>" + "<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li>" "<li>Z - time zone in numeric form (-0500)</li>" "</ul>" "<p><strong>All other input characters will be ignored." @@ -2184,7 +2184,7 @@ void AppearancePage::HeadersTab::save() { int result = KMessageBox::warningContinueCancel( this, i18n("Changing the global threading setting will override " "all folder specific values."), - TQString::null, KStdGuiItem::cont(), "threadOverride" ); + TQString(), KStdGuiItem::cont(), "threadOverride" ); if ( result == KMessageBox::Continue ) { tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); // remove all threadMessagesOverride keys from all [Folder-*] groups: @@ -2226,7 +2226,7 @@ static const BoolConfigEntry showColorbarMode = { }; static const BoolConfigEntry showSpamStatusMode = { - "Reader", "showSpamStatus", I18N_NOOP("Show s&pam status in fancy headers"), true + "Reader", "showSpamtqStatus", I18N_NOOP("Show s&pam status in fancy headers"), true }; static const BoolConfigEntry showEmoticons = { @@ -2249,9 +2249,9 @@ TQString AppearancePage::ReaderTab::helpAnchor() const { return TQString::tqfromLatin1("configure-appearance-reader"); } -AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, +AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( parent, name ) + : ConfigModuleTab( tqparent, name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -2276,7 +2276,7 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ), this, TQT_SLOT( slotEmitChanged() ) ); - // "tqreplace smileys by emoticons" check box; + // "replace smileys by emoticons" check box; populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons ); vlay->addWidget( mShowEmoticonsCheck ); connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ), @@ -2415,7 +2415,7 @@ void AppearancePage::ReaderTab::readCurrentOverrideCodec() kdWarning(5006) << "Unknown override character encoding \"" << currentOverrideEncoding << "\". Resetting to Auto." << endl; mOverrideCharsetCombo->setCurrentItem( 0 ); - GlobalSettings::self()->setOverrideCharacterEncoding( TQString::null ); + GlobalSettings::self()->setOverrideCharacterEncoding( TQString() ); } } @@ -2475,9 +2475,9 @@ TQString AppearancePage::SystemTrayTab::helpAnchor() const { return TQString::tqfromLatin1("configure-appearance-systemtray"); } -AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, +AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( parent, name ) + : ConfigModuleTab( tqparent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -2540,8 +2540,8 @@ TQString ComposerPage::helpAnchor() const { return TQString::tqfromLatin1("configure-composer"); } -ComposerPage::ComposerPage( TQWidget * parent, const char * name ) - : ConfigModuleWithTabs( parent, name ) +ComposerPage::ComposerPage( TQWidget * tqparent, const char * name ) + : ConfigModuleWithTabs( tqparent, name ) { // // "General" tab: @@ -2599,8 +2599,8 @@ TQString ComposerPage::GeneralTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-general"); } -ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -2796,7 +2796,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), mEditorRequester, TQT_SLOT(setEnabled(bool)) ); - label = new TQLabel( i18n("<b>%f</b> will be tqreplaced with the " + label = new TQLabel( i18n("<b>%f</b> will be replaced with the " "filename to edit."), group ); label->setEnabled( false ); // see above connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), @@ -2913,8 +2913,8 @@ TQString ComposerPage::PhrasesTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-phrases"); } -ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQGridLayout *glay; @@ -3037,7 +3037,7 @@ void ComposerPage::PhrasesTab::slotAddNewLanguage( const TQString& lang ) locale.translate("Forwarded Message"), locale.translate(">%_") ) ); mRemoveButton->setEnabled( true ); - slotLanguageChanged( TQString::null ); + slotLanguageChanged( TQString() ); } void ComposerPage::PhrasesTab::slotRemoveLanguage() @@ -3125,8 +3125,8 @@ TQString ComposerPage::TemplatesTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-templates"); } -ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name ) - : ConfigModuleTab ( parent, name ) +ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab ( tqparent, name ) { TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -3149,8 +3149,8 @@ TQString ComposerPage::CustomTemplatesTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-custom-templates"); } -ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name ) - : ConfigModuleTab ( parent, name ) +ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab ( tqparent, name ) { TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -3173,8 +3173,8 @@ TQString ComposerPage::SubjectTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-subject"); } -ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3257,8 +3257,8 @@ TQString ComposerPage::CharsetTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-charset"); } -ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3268,7 +3268,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * label = new TQLabel( i18n("This list is checked for every outgoing message " "from the top to the bottom for a charset that " - "tqcontains all required characters."), this ); + "contains all required characters."), this ); label->tqsetAlignment( WordBreak); vlay->addWidget( label ); @@ -3316,7 +3316,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { } KMessageBox::sorry( this, i18n("This charset is not supported.") ); - charset = TQString::null; + charset = TQString(); } void ComposerPage::CharsetTab::doLoadOther() { @@ -3352,8 +3352,8 @@ TQString ComposerPage::HeadersTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-headers"); } -ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3567,9 +3567,9 @@ TQString ComposerPage::AttachmentsTab::helpAnchor() const { return TQString::tqfromLatin1("configure-composer-attachments"); } -ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, +ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * tqparent, const char * name ) - : ConfigModuleTab( parent, name ) { + : ConfigModuleTab( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; TQLabel *label; @@ -3672,8 +3672,8 @@ TQString SecurityPage::helpAnchor() const { return TQString::tqfromLatin1("configure-security"); } -SecurityPage::SecurityPage( TQWidget * parent, const char * name ) - : ConfigModuleWithTabs( parent, name ) +SecurityPage::SecurityPage( TQWidget * tqparent, const char * name ) + : ConfigModuleWithTabs( tqparent, name ) { // // "Reading" tab: @@ -3719,8 +3719,8 @@ TQString SecurityPage::GeneralTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-reading"); } -SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name ) - : ConfigModuleTab ( parent, name ) +SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab ( tqparent, name ) { // tmp. vars: TQVBoxLayout *vlay; @@ -3733,7 +3733,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - // QWhat'sThis texts + // TQWhat'sThis texts TQString htmlWhatsThis = i18n( "<qt><p>Messages sometimes come in both formats. " "This option controls whether you want the HTML part or the plain " "text part to be displayed.</p>" @@ -3855,7 +3855,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * mMDNGroup->insert( radio ); for ( int i = 0 ; i < mMDNGroup->count() ; ++i ) - TQWhatsThis::add( mMDNGroup->find( i ), receiptWhatsThis ); + TQWhatsThis::add( mMDNGroup->tqfind( i ), receiptWhatsThis ); w = new TQWidget( hbox ); // spacer hbox->setStretchFactor( w, 1 ); @@ -3961,7 +3961,7 @@ void SecurityPage::GeneralTab::save() { if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked()) { if (KMessageBox::warningContinueCancel(this, i18n("Changing the global " - "HTML setting will override all folder specific values."), TQString::null, + "HTML setting will override all folder specific values."), TQString(), KStdGuiItem::cont(), "htmlMailOverride") == KMessageBox::Continue) { reader.writeEntry( "htmlMail", mHtmlMailCheck->isChecked() ); @@ -3996,8 +3996,8 @@ TQString SecurityPage::ComposerCryptoTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-composing"); } -SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name ) - : ConfigModuleTab ( parent, name ) +SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab ( tqparent, name ) { // the margins are inside mWidget itself TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); @@ -4071,8 +4071,8 @@ TQString SecurityPage::WarningTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-warnings"); } -SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // the margins are inside mWidget itself TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); @@ -4180,8 +4180,8 @@ TQString SecurityPage::SMimeTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-smime-validation"); } -SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // the margins are inside mWidget itself TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); @@ -4498,8 +4498,8 @@ TQString SecurityPage::CryptPlugTab::helpAnchor() const { return TQString::tqfromLatin1("configure-security-crypto-backends"); } -SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -4531,8 +4531,8 @@ TQString MiscPage::helpAnchor() const { return TQString::tqfromLatin1("configure-misc"); } -MiscPage::MiscPage( TQWidget * parent, const char * name ) - : ConfigModuleWithTabs( parent, name ) +MiscPage::MiscPage( TQWidget * tqparent, const char * name ) + : ConfigModuleWithTabs( tqparent, name ) { mFolderTab = new FolderTab(); addTab( mFolderTab, i18n("&Folders") ); @@ -4546,8 +4546,8 @@ TQString MiscPage::FolderTab::helpAnchor() const { return TQString::tqfromLatin1("configure-misc-folders"); } -MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) - : ConfigModuleTab( parent, name ) +MiscPageFolderTab::MiscPageFolderTab( TQWidget * tqparent, const char * name ) + : ConfigModuleTab( tqparent, name ) { // temp. vars: TQVBoxLayout *vlay; @@ -4781,7 +4781,7 @@ void MiscPage::FolderTab::save() { general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() ); general.writeEntry( "default-mailbox-format", mMailboxPrefCombo->currentItem() ); general.writeEntry( "startupFolder", mOnStartupOpenFolder->folder() ? - mOnStartupOpenFolder->folder()->idString() : TQString::null ); + mOnStartupOpenFolder->folder()->idString() : TQString() ); GlobalSettings::self()->setDelayedMarkAsRead( mDelayedMarkAsRead->isChecked() ); GlobalSettings::self()->setDelayedMarkTime( mDelayedMarkTime->value() ); @@ -4800,8 +4800,8 @@ TQString MiscPage::GroupwareTab::helpAnchor() const { return TQString::tqfromLatin1("configure-misc-groupware"); } -MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) - : ConfigModuleTab( parent, name ) +MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name ) + : ConfigModuleTab( tqparent, name ) { TQBoxLayout* vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -4866,7 +4866,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) this, TQT_SLOT( slotEmitChanged( void ) ) ); mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format - toolTip = i18n( "Set the parent of the resource folders" ); + toolTip = i18n( "Set the tqparent of the resource folders" ); whatsThis = i18n( GlobalSettings::self()->theIMAPResourceFolderParentItem()->whatsThis().utf8() ); TQToolTip::add( mFolderComboLabel, toolTip ); TQWhatsThis::add( mFolderComboLabel, whatsThis ); @@ -4999,7 +4999,7 @@ void MiscPageGroupwareTab::slotLegacyBodyInvitesToggled( bool on ) "resulting messages look very odd.<br>People that have email " "programs that do understand invitations will still " "be able to work with this.</qt>" ); - KMessageBox::information( this, txt, TQString::null, + KMessageBox::information( this, txt, TQString(), "LegacyBodyInvitesWarning" ); } // Invitations in the body are autosent in any case (no point in editing raw ICAL) @@ -5051,7 +5051,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() { KMAccount* selectedAccount = 0; int accountId = GlobalSettings::self()->theIMAPResourceAccount(); if ( accountId ) - selectedAccount = kmkernel->acctMgr()->find( accountId ); + selectedAccount = kmkernel->acctMgr()->tqfind( accountId ); else { // Fallback: iterate over accounts to select folderId if found (as an inbox folder) for( KMAccount *a = kmkernel->acctMgr()->first(); a!=0; diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h index 062bbf783..a44f5db14 100644 --- a/kmail/configuredialog.h +++ b/kmail/configuredialog.h @@ -34,9 +34,10 @@ namespace KMail { class ConfigureDialog : public KCMultiDialog { Q_OBJECT + TQ_OBJECT public: - ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); + ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true ); ~ConfigureDialog(); signals: @@ -78,6 +79,7 @@ private: */ class AccountUpdater : public TQObject { Q_OBJECT + TQ_OBJECT public: AccountUpdater(KMail::ImapAccountBase *account); void update(); diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index e17e800e8..ff473f668 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -1,5 +1,5 @@ #ifndef KDE_USE_FINAL -#define QT_NO_CAST_ASCII +#define TQT_NO_CAST_ASCII #endif // configuredialog_p.cpp: classes internal to ConfigureDialog // see configuredialog.cpp for details. @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdebug.h> -// Qt headers: +// TQt headers: #include <tqheader.h> #include <tqtabwidget.h> #include <tqradiobutton.h> @@ -38,9 +38,9 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, i18n("New Identity"), + : KDialogBase( tqparent, name, modal, i18n("New Identity"), Ok|Cancel|Help, Ok, true ) { setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") ); @@ -122,9 +122,9 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) { enableButtonOK( true ); } -ListView::ListView( TQWidget *parent, const char *name, +ListView::ListView( TQWidget *tqparent, const char *name, int visibleItem ) - : KListView( parent, name ) + : KListView( tqparent, name ) { setVisibleItem(visibleItem); } @@ -166,7 +166,7 @@ void ListView::resizeColums() void ListView::setVisibleItem( int visibleItem, bool updateSize ) { - mVisibleItem = QMAX( 1, visibleItem ); + mVisibleItem = TQMAX( 1, visibleItem ); if( updateSize == true ) { TQSize s = tqsizeHint(); @@ -191,9 +191,9 @@ TQSize ListView::tqsizeHint() const static TQString flagPng = TQString::tqfromLatin1("/flag.png"); NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) + : KDialogBase( tqparent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { // tqlayout the page (a combobox with label): TQWidget *page = makeMainWidget(); @@ -222,7 +222,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, // we extract it from the path: "/prefix/de/entry.desktop" -> "de" TQString acronym = (*it).section( '/', -2, -2 ); - if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) { + if ( suppressedAcronyms.tqfind( acronym ) == suppressedAcronyms.end() ) { // not found: TQString displayname = TQString::tqfromLatin1("%1 (%2)") .arg( name ).arg( acronym ); @@ -244,8 +244,8 @@ TQString NewLanguageDialog::language() const } -LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name ) - : TQComboBox( rw, parent, name ) +LanguageComboBox::LanguageComboBox( bool rw, TQWidget *tqparent, const char *name ) + : TQComboBox( rw, tqparent, name ) { } @@ -269,10 +269,10 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language ); + TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): - if ( text(i).find( parenthizedLanguage ) >= 0 ) { + if ( text(i).tqfind( tqparenthizedLanguage ) >= 0 ) { setCurrentItem(i); return; } @@ -284,8 +284,8 @@ void LanguageComboBox::setLanguage( const TQString & language ) // // -ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true ) +ProfileDialog::ProfileDialog( TQWidget * tqparent, const char * name, bool modal ) + : KDialogBase( tqparent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true ) { // tmp. vars: TQWidget * page = makeMainWidget(); @@ -364,9 +364,9 @@ void ProfileDialog::slotOk() { } -ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent, +ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * tqparent, const char * name ) - : ConfigModule( parent, name ) + : ConfigModule( tqparent, name ) { TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mTabWidget = new TQTabWidget( this ); diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index f12c39ba1..b1c34379a 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -78,12 +78,13 @@ namespace Kleo { class NewIdentityDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum DuplicateMode { Empty, ControlCenter, ExistingEntry }; NewIdentityDialog( const TQStringList & identities, - TQWidget *parent=0, const char *name=0, bool modal=true ); + TQWidget *tqparent=0, const char *name=0, bool modal=true ); TQString identityName() const { return mLineEdit->text(); } TQString duplicateIdentity() const { return mComboBox->currentText(); } @@ -108,10 +109,10 @@ private: struct LanguageItem { LanguageItem() {} - LanguageItem( const TQString & language, const TQString & reply=TQString::null, - const TQString & replyAll=TQString::null, - const TQString & forward=TQString::null, - const TQString & indentPrefix=TQString::null ) : + LanguageItem( const TQString & language, const TQString & reply=TQString(), + const TQString & replyAll=TQString(), + const TQString & forward=TQString(), + const TQString & indentPrefix=TQString() ) : mLanguage( language ), mReply( reply ), mReplyAll( replyAll ), mForward( forward ), mIndentPrefix( indentPrefix ) {} @@ -123,9 +124,10 @@ typedef TQValueList<LanguageItem> LanguageItemList; class NewLanguageDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0, + NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *tqparent=0, const char *name=0, bool modal=true ); TQString language() const; @@ -134,12 +136,13 @@ class NewLanguageDialog : public KDialogBase }; -class LanguageComboBox : public QComboBox +class LanguageComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 ); + LanguageComboBox( bool rw, TQWidget *tqparent=0, const char *name=0 ); int insertLanguage( const TQString & language ); TQString language() const; void setLanguage( const TQString & language ); @@ -153,8 +156,9 @@ class LanguageComboBox : public QComboBox class ProfileDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false ); + ProfileDialog( TQWidget * tqparent=0, const char * name=0, bool modal=false ); signals: void profileSelected( KConfig * profile ); @@ -174,9 +178,10 @@ private: #include <kdialog.h> class ConfigModule : public KCModule { Q_OBJECT + TQ_OBJECT public: - ConfigModule( TQWidget * parent=0, const char * name=0 ) - : KCModule ( parent, name ) + ConfigModule( TQWidget * tqparent=0, const char * name=0 ) + : KCModule ( tqparent, name ) {} ~ConfigModule() {} @@ -201,9 +206,10 @@ signals: // Individual tab of a ConfigModuleWithTabs class ConfigModuleTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ConfigModuleTab( TQWidget *parent=0, const char* name=0 ) - :TQWidget( parent, name ) + ConfigModuleTab( TQWidget *tqparent=0, const char* name=0 ) + :TQWidget( tqparent, name ) {} ~ConfigModuleTab() {} void load(); @@ -235,8 +241,9 @@ private: */ class ConfigModuleWithTabs : public ConfigModule { Q_OBJECT + TQ_OBJECT public: - ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 ); + ConfigModuleWithTabs( TQWidget * tqparent=0, const char * name=0 ); ~ConfigModuleWithTabs() {} // don't reimplement any of those methods @@ -262,8 +269,9 @@ private: class KDE_EXPORT IdentityPage : public ConfigModule { Q_OBJECT + TQ_OBJECT public: - IdentityPage( TQWidget * parent=0, const char * name=0 ); + IdentityPage( TQWidget * tqparent=0, const char * name=0 ); ~IdentityPage() {} TQString helpAnchor() const; @@ -312,8 +320,9 @@ private: // data members // subclasses: one class per tab: class AccountsPageSendingTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 ); + AccountsPageSendingTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -349,8 +358,9 @@ private: class AccountsPageReceivingTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 ); + AccountsPageReceivingTab( TQWidget * tqparent=0, const char * name=0 ); ~AccountsPageReceivingTab(); TQString helpAnchor() const; void save(); @@ -393,8 +403,9 @@ private: class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs { Q_OBJECT + TQ_OBJECT public: - AccountsPage( TQWidget * parent=0, const char * name=0 ); + AccountsPage( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -420,8 +431,9 @@ private: class AppearancePageFontsTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 ); + AppearancePageFontsTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -447,8 +459,9 @@ private: class AppearancePageColorsTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 ); + AppearancePageColorsTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -468,8 +481,9 @@ private: class AppearancePageLayoutTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 ); + AppearancePageLayoutTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -490,8 +504,9 @@ private: // data class AppearancePageHeadersTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 ); + AppearancePageHeadersTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -516,8 +531,9 @@ private: // data class AppearancePageReaderTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 ); + AppearancePageReaderTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -547,8 +563,9 @@ private: // data class AppearancePageSystemTrayTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 ); + AppearancePageSystemTrayTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -565,8 +582,9 @@ private: // data class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs { Q_OBJECT + TQ_OBJECT public: - AppearancePage( TQWidget * parent=0, const char * name=0 ); + AppearancePage( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -595,8 +613,9 @@ private: class ComposerPageGeneralTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageGeneralTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -628,8 +647,9 @@ private: class ComposerPagePhrasesTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 ); + ComposerPagePhrasesTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -659,8 +679,9 @@ private: class ComposerPageTemplatesTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageTemplatesTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -676,8 +697,9 @@ private: class ComposerPageCustomTemplatesTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageCustomTemplatesTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -693,8 +715,9 @@ private: class ComposerPageSubjectTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageSubjectTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -711,8 +734,9 @@ private: class ComposerPageCharsetTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageCharsetTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -732,8 +756,9 @@ private: class ComposerPageHeadersTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageHeadersTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -764,8 +789,9 @@ private: class ComposerPageAttachmentsTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 ); + ComposerPageAttachmentsTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -785,8 +811,9 @@ private: class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs { Q_OBJECT + TQ_OBJECT public: - ComposerPage( TQWidget * parent=0, const char * name=0 ); + ComposerPage( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -819,8 +846,9 @@ private: class SecurityPageGeneralTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 ); + SecurityPageGeneralTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; void save(); @@ -844,8 +872,9 @@ private: class SecurityPageComposerCryptoTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 ); + SecurityPageComposerCryptoTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -863,8 +892,9 @@ private: class SecurityPageWarningTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 ); + SecurityPageWarningTab( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -885,9 +915,10 @@ private: class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject { Q_OBJECT + TQ_OBJECT K_DCOP public: - SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 ); + SecurityPageSMimeTab( TQWidget * tqparent=0, const char * name=0 ); ~SecurityPageSMimeTab(); TQString helpAnchor() const; @@ -912,8 +943,9 @@ private: class SecurityPageCryptPlugTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 ); + SecurityPageCryptPlugTab( TQWidget * tqparent = 0, const char* name = 0 ); ~SecurityPageCryptPlugTab(); TQString helpAnchor() const; @@ -930,8 +962,9 @@ private: class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs { Q_OBJECT + TQ_OBJECT public: - SecurityPage( TQWidget * parent=0, const char * name=0 ); + SecurityPage( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; @@ -961,8 +994,9 @@ private: class MiscPageFolderTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - MiscPageFolderTab( TQWidget * parent=0, const char * name=0 ); + MiscPageFolderTab( TQWidget * tqparent=0, const char * name=0 ); void save(); TQString helpAnchor() const; @@ -991,8 +1025,9 @@ private: class MiscPageGroupwareTab : public ConfigModuleTab { Q_OBJECT + TQ_OBJECT public: - MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 ); + MiscPageGroupwareTab( TQWidget * tqparent=0, const char * name=0 ); void save(); TQString helpAnchor() const; @@ -1032,8 +1067,9 @@ private: class KDE_EXPORT MiscPage : public ConfigModuleWithTabs { Q_OBJECT + TQ_OBJECT public: - MiscPage( TQWidget * parent=0, const char * name=0 ); + MiscPage( TQWidget * tqparent=0, const char * name=0 ); TQString helpAnchor() const; typedef MiscPageFolderTab FolderTab; @@ -1052,8 +1088,9 @@ private: class ListView : public KListView { Q_OBJECT + TQ_OBJECT public: - ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); + ListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 ); void resizeColums(); void setVisibleItem( int visibleItem, bool updateSize=true ); diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index ddfa6d251..9be07213e 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob() /* * The basic strategy is to first create the target folder, then copy all the mail - * from the source to the target folder, then recurse for each of the folder's children + * from the source to the target folder, then recurse for each of the folder's tqchildren */ void CopyFolderJob::execute() { @@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command ) rollback(); return; } - // if we have children, recurse + // if we have tqchildren, recurse if ( mStorage->folder()->child() ) { slotCopyNextChild(); } else { @@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success ) mNextChildFolder = static_cast<KMFolder*>(node); ++mChildFolderNodeIterator; } else { - // no more children, we are done + // no more tqchildren, we are done emit folderCopyComplete( true ); deleteLater(); return; @@ -196,8 +196,8 @@ bool CopyFolderJob::createTargetDir() KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() ); connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)), this, TQT_SLOT(folderCreationDone(const TQString&, bool)) ); - selectedStorage->createFolder(mStorage->folder()->name(), TQString::null); // create it on the server - newStorage->initializeFrom( selectedStorage, imapPath, TQString::null ); + selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server + newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() ); waitForFolderCreation = true; success = true; diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h index 73311a49b..743d8b618 100644 --- a/kmail/copyfolderjob.h +++ b/kmail/copyfolderjob.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -50,11 +50,12 @@ namespace KMail { class CopyFolderJob : public FolderJob { Q_OBJECT + TQ_OBJECT public: /** * Create a new job * @param storage of the folder that should be copied - * @param newParent the target parent folder + * @param newParent the target tqparent folder */ CopyFolderJob( FolderStorage* const storage, KMFolderDir* const newParent = 0 ); @@ -69,7 +70,7 @@ public: protected slots: - /** Create the target directory under the new parent. Returns success or failure.*/ + /** Create the target directory under the new tqparent. Returns success or failure.*/ bool createTargetDir(); /** Copy all messages from the original folder to mNewFolder */ diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp index fc411be7b..3fe2fd78b 100644 --- a/kmail/csshelper.cpp +++ b/kmail/csshelper.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/csshelper.h b/kmail/csshelper.h index 7015cec5e..9e87f5dfb 100644 --- a/kmail/csshelper.h +++ b/kmail/csshelper.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 6a0a7f4cf..ef3668df4 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -52,8 +52,8 @@ #include "customtemplates.h" -CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) - :CustomTemplatesBase( parent, name ), +CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name ) + :CustomTemplatesBase( tqparent, name ), mCurrentItem( 0 ), mBlockChangeSignal( false ) { diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index a8c240619..21695824a 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -35,6 +35,7 @@ class KShortcut; class CustomTemplates : public CustomTemplatesBase { Q_OBJECT + TQ_OBJECT public: @@ -42,7 +43,7 @@ class CustomTemplates : public CustomTemplatesBase public: - CustomTemplates( TQWidget *parent = 0, const char *name = 0 ); + CustomTemplates( TQWidget *tqparent = 0, const char *name = 0 ); ~CustomTemplates(); void load(); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index ab8ecb843..cf068e9e8 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CustomTemplatesBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="tqgeometry"> <rect> <x>0</x> @@ -13,7 +13,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout9</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout8</cstring> </property> @@ -72,7 +72,7 @@ </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Type</string> @@ -120,7 +120,7 @@ </widget> </vbox> </widget> - <widget class="QFrame" row="0" column="1"> + <widget class="TQFrame" row="0" column="1"> <property name="name"> <cstring>mEditFrame</cstring> </property> @@ -145,7 +145,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout8</cstring> </property> @@ -153,7 +153,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout6</cstring> </property> @@ -161,7 +161,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mToLabel</cstring> </property> @@ -169,7 +169,7 @@ <string>To:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mCCLabel</cstring> </property> @@ -179,7 +179,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout7</cstring> </property> @@ -201,7 +201,7 @@ </widget> </hbox> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>mEdit</cstring> </property> @@ -220,7 +220,7 @@ <enum>NoWrap</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout4</cstring> </property> @@ -228,7 +228,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="1" column="2"> + <widget class="TQComboBox" row="1" column="2"> <item> <property name="text"> <string>Universal</string> @@ -253,7 +253,7 @@ <cstring>mType</cstring> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -267,7 +267,7 @@ <cstring>mKeyButton</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -351,10 +351,10 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<slots> +<Q_SLOTS> <slot>mAdd_clicked()</slot> <slot>mRemove_clicked()</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp index 947d1deb8..85c82b928 100644 --- a/kmail/dictionarycombobox.cpp +++ b/kmail/dictionarycombobox.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,8 +42,8 @@ namespace KMail { - DictionaryComboBox::DictionaryComboBox( TQWidget * parent, const char * name ) - : TQComboBox( false, parent, name ), + DictionaryComboBox::DictionaryComboBox( TQWidget * tqparent, const char * name ) + : TQComboBox( false, tqparent, name ), mSpellConfig( 0 ), mDefaultDictionary( 0 ) { diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h index 1222e1250..481605025 100644 --- a/kmail/dictionarycombobox.h +++ b/kmail/dictionarycombobox.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,9 @@ namespace KMail { class DictionaryComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - DictionaryComboBox( TQWidget * parent=0, const char * name=0 ); + DictionaryComboBox( TQWidget * tqparent=0, const char * name=0 ); ~DictionaryComboBox(); TQString currentDictionaryName() const; diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 5f590b3b9..62b4fcee4 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -43,11 +43,11 @@ #include <tqlabel.h> #include <tqlineedit.h> -class DistributionListItem : public QCheckListItem +class DistributionListItem : public TQCheckListItem { public: DistributionListItem( TQListView *list ) - : TQCheckListItem( list, TQString::null, CheckBox ) + : TQCheckListItem( list, TQString(), CheckBox ) { } @@ -93,9 +93,9 @@ class DistributionListItem : public QCheckListItem }; -DistributionListDialog::DistributionListDialog( TQWidget *parent ) +DistributionListDialog::DistributionListDialog( TQWidget *tqparent ) : KDialogBase( Plain, i18n("Save Distribution List"), User1 | Cancel, - User1, parent, 0, false, false, i18n("Save List") ) + User1, tqparent, 0, false, false, i18n("Save List") ) { TQFrame *topFrame = plainPage(); @@ -112,7 +112,7 @@ DistributionListDialog::DistributionListDialog( TQWidget *parent ) mTitleEdit->setFocus(); mRecipientsList = new KListView( topFrame ); - mRecipientsList->addColumn( TQString::null ); + mRecipientsList->addColumn( TQString() ); mRecipientsList->addColumn( i18n("Name") ); mRecipientsList->addColumn( i18n("Email") ); topLayout->addWidget( mRecipientsList ); @@ -131,7 +131,7 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients ) if ( !email.isEmpty() ) { DistributionListItem *item = new DistributionListItem( mRecipientsList ); KABC::Addressee::List addressees = - KABC::StdAddressBook::self( true )->tqfindByEmail( email ); + KABC::StdAddressBook::self( true )->findByEmail( email ); if ( addressees.isEmpty() ) { KABC::Addressee a; a.setNameFromString( name ); @@ -182,7 +182,7 @@ void DistributionListDialog::slotUser1() if ( name.isEmpty() ) { bool ok = false; name = KInputDialog::getText( i18n("New Distribution List"), - i18n("Please enter name:"), TQString::null, &ok, this ); + i18n("Please enter name:"), TQString(), &ok, this ); if ( !ok || name.isEmpty() ) return; } diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h index 6643557c4..8d57b6dce 100644 --- a/kmail/distributionlistdialog.h +++ b/kmail/distributionlistdialog.h @@ -31,7 +31,7 @@ class KListView; class DistributionListDialog : public KDialogBase { public: - DistributionListDialog( TQWidget *parent ); + DistributionListDialog( TQWidget *tqparent ); void setRecipients( const Recipient::List & ); diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index bca75762f..e16c19cb4 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -49,8 +49,8 @@ using namespace KMail; EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith, - TQObject * parent, TQWidget *tqparentWidget) : - TQObject( parent ), + TQObject * tqparent, TQWidget *tqparentWidget) : + TQObject( tqparent ), mUrl( url ), mMimeType( mimeType ), mOpenWith( openWith ), @@ -73,7 +73,7 @@ bool EditorWatcher::start() list.append( mUrl ); KService::Ptr offer = KServiceTypeProfile::preferredService( mMimeType, "Application" ); if ( mOpenWith || !offer ) { - KOpenWithDlg dlg( list, i18n("Edit with:"), TQString::null, 0 ); + KOpenWithDlg dlg( list, i18n("Edit with:"), TQString(), 0 ); if ( !dlg.exec() ) return false; offer = dlg.service(); @@ -118,7 +118,7 @@ void EditorWatcher::inotifyEvent() char buffer[4096]; ioctl( mInotifyFd, FIONREAD, &pending ); while ( pending > 0 ) { - int size = read( mInotifyFd, buffer, QMIN( pending, (int)sizeof(buffer) ) ); + int size = read( mInotifyFd, buffer, TQMIN( pending, (int)sizeof(buffer) ) ); pending -= size; if ( size < 0 ) break; // error diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index 35504d85a..68fdb54e4 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -35,19 +35,20 @@ namespace KMail { as the edited file are watched to work with as many as possible editors. */ -class EditorWatcher : public QObject +class EditorWatcher : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructs an EditorWatcher. - * @param parent the parent object of this EditorWatcher, which will take care of deleting - * this EditorWatcher if the parent is deleted. - * @param tqparentWidget the parent widget of this EditorWatcher, which will be used as the parent + * @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 * widget for message dialogs. */ EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith, - TQObject *parent, TQWidget *tqparentWidget ); + TQObject *tqparent, TQWidget *tqparentWidget ); bool start(); bool fileChanged() const { return mFileModified; } signals: diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index df595b36d..cc19e3b1e 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -1,5 +1,5 @@ /* - This file was taken from the KDE 4.x libraries and backported to Qt 3. + This file was taken from the KDE 4.x libraries and backported to TQt 3. Copyright (C) 1999 Lars Knoll (knoll@kde.org) Copyright (C) 2003 Dirk Mueller (mueller@kde.org) @@ -51,7 +51,7 @@ // Multiple scripts per language were removed and the entries were reordered so // that simple substring matching will work. For example, bam was put before ba // so that the first match will be likely the right match. Otherwise "ba" would -// match "bam" but we would have to search on to find "bam" which is what we want. +// match "bam" but we would have to search on to tqfind "bam" which is what we want. // The original file is called pango-script-lang-table.h /* pango-script-lang-table.h: @@ -856,7 +856,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t } else { - //QString->QTextCodec + //TQString->TQTextCodec enc = enc.lower(); // hebrew visually ordered @@ -880,7 +880,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t if (codec->mibEnum() == Mib8859_8) { - //We do NOT want to use Qt's TQHebrewCodec, since it tries to reorder itself. + //We do NOT want to use TQt's TQHebrewCodec, since it tries to reorder itself. codec = TQTextCodec::codecForName("iso8859-8-i"); // visually ordered unless one of the following @@ -1059,13 +1059,13 @@ bool EncodingDetector::analyze(const char *data, int len) TQCString str( ptr, (end-ptr)+1); str = str.lower(); int pos=0; - //if( (pos = str.find("http-equiv", pos)) == -1) break; - //if( (pos = str.find("content-type", pos)) == -1) break; - if( (pos = str.find("charset")) == -1) + //if( (pos = str.tqfind("http-equiv", pos)) == -1) break; + //if( (pos = str.tqfind("content-type", pos)) == -1) break; + if( (pos = str.tqfind("charset")) == -1) continue; pos+=6; // skip to '=' - if( (pos = str.find('=', pos)) == -1) + if( (pos = str.tqfind('=', pos)) == -1) continue; // skip whitespace before encoding itself diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h index b2dd97660..0f2231782 100644 --- a/kmail/encodingdetector.h +++ b/kmail/encodingdetector.h @@ -1,5 +1,5 @@ /* - This file was taken from the KDE 4.x libraries and backported to Qt 3. + This file was taken from the KDE 4.x libraries and backported to TQt 3. Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de) Copyright (C) 2007 Nick Shaforostoff (shafff@ukr.net) diff --git a/kmail/encodingdetector_ja.cpp b/kmail/encodingdetector_ja.cpp index d5eeb1e0e..659661a03 100644 --- a/kmail/encodingdetector_ja.cpp +++ b/kmail/encodingdetector_ja.cpp @@ -23,7 +23,7 @@ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING diff --git a/kmail/encodingdetector_ja_p.h b/kmail/encodingdetector_ja_p.h index 27cd067be..d5809c048 100644 --- a/kmail/encodingdetector_ja_p.h +++ b/kmail/encodingdetector_ja_p.h @@ -23,7 +23,7 @@ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING @@ -39,7 +39,7 @@ #define GUESS_JA_H #include <tqglobal.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #undef UNICODE #endif namespace khtml { diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index 010a9d003..6d634d8f8 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -31,7 +31,7 @@ #include "globalsettings.h" #include "folderstorage.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmcommands.h" #include <kdebug.h> @@ -117,7 +117,7 @@ void ExpireJob::slotDoWork() { // No need to worry about mSrcFolder==0 here. The FolderStorage deletes the jobs on destruction. FolderStorage* storage = mSrcFolder->storage(); - int stopIndex = mImmediate ? 0 : QMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES ); + int stopIndex = mImmediate ? 0 : TQMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES ); #ifdef DEBUG_SCHEDULER kdDebug(5006) << "ExpireJob: checking messages " << mCurrentIndex << " to " << stopIndex << endl; #endif @@ -190,7 +190,7 @@ void ExpireJob::done() } } if ( !str.isEmpty() ) - BroadcasStatus::instance()->seStatusMsg( str ); + BroadcastqStatus::instance()->seStatusMsg( str ); KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() ); group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used @@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command ) } default: ; } - BroadcasStatus::instance()->seStatusMsg( msg ); + BroadcastqStatus::instance()->seStatusMsg( msg ); deleteLater(); } diff --git a/kmail/expirejob.h b/kmail/expirejob.h index 16e4c7bd8..49a11a03d 100644 --- a/kmail/expirejob.h +++ b/kmail/expirejob.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -36,6 +36,7 @@ namespace KMail { class ExpireJob : public ScheduledJob { Q_OBJECT + TQ_OBJECT public: ExpireJob( KMFolder* folder, bool immediate ); virtual ~ExpireJob(); diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index 4913d1c6e..c43cefc18 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -23,7 +23,7 @@ using namespace KMail; /* - * Constructs a ExpiryPropertiesDialog as a child of 'parent', with the + * Constructs a ExpiryPropertiesDialog as a child of 'tqparent', with the * name 'name'. * */ @@ -153,7 +153,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo */ ExpiryPropertiesDialog::~ExpiryPropertiesDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void ExpiryPropertiesDialog::slotOk() diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h index d3ef7cfd3..2fd550237 100644 --- a/kmail/expirypropertiesdialog.h +++ b/kmail/expirypropertiesdialog.h @@ -33,6 +33,7 @@ namespace KMail { class ExpiryPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* folder ); diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index d70986876..7176cdebb 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -49,8 +49,8 @@ using namespace KMail; -FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, const TQString & name, KMFolder * folder) - : KMFolderTreeItem( parent, name, folder ), +FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * tqparent, const TQString & name, KMFolder * folder) + : KMFolderTreeItem( tqparent, name, folder ), mOldName( folder->label() ) { // same stuff as in KMFolderTreeItem again, this time even with virtual methods working @@ -81,8 +81,8 @@ void FavoriteFolderViewItem::nameChanged() TQValueList<FavoriteFolderView*> FavoriteFolderView::mInstances; -FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * parent) : - FolderTreeBase( mainWidget, parent ), +FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * tqparent) : + FolderTreeBase( mainWidget, tqparent ), mContextMenuItem( 0 ), mReadingConfig( false ) { @@ -399,8 +399,8 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti) assert( fti->folder() ); TQString name = fti->folder()->label(); TQListViewItem *accountFti = fti; - while ( accountFti->parent() ) - accountFti = accountFti->parent(); + while ( accountFti->tqparent() ) + accountFti = accountFti->tqparent(); if ( fti->type() == KFolderTreeItem::Inbox ) { if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) { name = i18n( "Local Inbox" ); diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h index f19dd5d79..e0e34d269 100644 --- a/kmail/favoritefolderview.h +++ b/kmail/favoritefolderview.h @@ -28,8 +28,9 @@ class FavoriteFolderView; class FavoriteFolderViewItem : public KMFolderTreeItem { Q_OBJECT + TQ_OBJECT public: - FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder ); + FavoriteFolderViewItem( FavoriteFolderView *tqparent, const TQString & name, KMFolder* folder ); protected: bool useTopLevelIcon() const { return false; } @@ -45,15 +46,16 @@ class FavoriteFolderViewItem : public KMFolderTreeItem class FavoriteFolderView : public FolderTreeBase { Q_OBJECT + TQ_OBJECT public: - FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 ); + FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *tqparent = 0 ); ~FavoriteFolderView(); void readConfig(); void writeConfig(); - KMFolderTreeItem* addFolder( KMFolder *folder, const TQString &name = TQString::null, + KMFolderTreeItem* addFolder( KMFolder *folder, const TQString &name = TQString(), TQListViewItem *after = 0 ); void addFolder( KMFolderTreeItem *fti ); diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp index 7e937c462..479e6d3e2 100644 --- a/kmail/filehtmlwriter.cpp +++ b/kmail/filehtmlwriter.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h index b9090c63e..879143228 100644 --- a/kmail/filehtmlwriter.h +++ b/kmail/filehtmlwriter.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index c5780431d..3299d1dfc 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,8 +46,8 @@ using namespace KMail; -FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent ) - :KDialogBase( parent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ), +FilterSelectionDialog::FilterSelectionDialog( TQWidget * tqparent ) + :KDialogBase( tqparent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ), wasCancelled( false ) { TQWidget *w = new TQWidget( this ); @@ -199,8 +199,8 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>& } -FilterImporterExporter::FilterImporterExporter( TQWidget* parent, bool popFilter ) -:mParent( parent), mPopFilter( popFilter ) +FilterImporterExporter::FilterImporterExporter( TQWidget* tqparent, bool popFilter ) +:mParent( tqparent), mPopFilter( popFilter ) { } @@ -210,7 +210,7 @@ FilterImporterExporter::~FilterImporterExporter() TQValueList<KMFilter*> FilterImporterExporter::importFilters() { - TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), TQString::null, mParent, i18n("Import Filters") ); + TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), TQString(), mParent, i18n("Import Filters") ); if ( fileName.isEmpty() ) return TQValueList<KMFilter*>(); // cancel @@ -232,7 +232,7 @@ TQValueList<KMFilter*> FilterImporterExporter::importFilters() void FilterImporterExporter::exportFilters(const TQValueList<KMFilter*> & filters ) { - KURL saveUrl = KFileDialog::getSaveURL( TQDir::homeDirPath(), TQString::null, mParent, i18n("Export Filters") ); + KURL saveUrl = KFileDialog::getSaveURL( TQDir::homeDirPath(), TQString(), mParent, i18n("Export Filters") ); if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) ) return; diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h index 8b9a63bb8..8c92e7692 100644 --- a/kmail/filterimporterexporter.h +++ b/kmail/filterimporterexporter.h @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,7 +47,7 @@ namespace KMail class FilterImporterExporter { public: - FilterImporterExporter( TQWidget* parent, bool popFilter = false ); + FilterImporterExporter( TQWidget* tqparent, bool popFilter = false ); virtual ~FilterImporterExporter(); /** Export the given filter rules to a file which @@ -68,8 +68,9 @@ private: class FilterSelectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FilterSelectionDialog( TQWidget * parent = 0 ); + FilterSelectionDialog( TQWidget * tqparent = 0 ); virtual ~FilterSelectionDialog(); virtual void slotCancel(); diff --git a/kmail/filterlog.cpp b/kmail/filterlog.cpp index 7415c10d0..b5e1d3913 100644 --- a/kmail/filterlog.cpp +++ b/kmail/filterlog.cpp @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/filterlog.h b/kmail/filterlog.h index f336621ad..83a2b3833 100644 --- a/kmail/filterlog.h +++ b/kmail/filterlog.h @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,9 +50,10 @@ namespace KMail { A signal is emitted whenever a new logentry is added, when the log was cleared or any log state was changed. */ - class FilterLog : public QObject + class FilterLog : public TQObject { Q_OBJECT + TQ_OBJECT public: /** access to the singleton instance */ @@ -135,7 +136,7 @@ namespace KMail { /** Non-public constructor needed by the singleton implementation */ FilterLog(); - /** The list tqcontains the single log pieces */ + /** The list contains the single log pieces */ TQStringList mLogEntries; /** the log status */ diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 90eb59263..441390fb5 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,8 +52,8 @@ using namespace KMail; -FilterLogDialog::FilterLogDialog( TQWidget * parent ) -: KDialogBase( parent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ), +FilterLogDialog::FilterLogDialog( TQWidget * tqparent ) +: KDialogBase( tqparent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ), User1|User2|Close, Close, true, KStdGuiItem::clear(), KStdGuiItem::saveAs() ) { setWFlags( WDestructiveClose ); @@ -244,7 +244,7 @@ void FilterLogDialog::slotUser1() void FilterLogDialog::slotUser2() { TQString fileName; - KFileDialog fdlg( TQString::null, TQString::null, this, 0, true ); + KFileDialog fdlg( TQString(), TQString(), this, 0, true ); fdlg.setMode( KFile::File ); fdlg.setSelection( "kmail-filter.log" ); diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h index af1be64ef..927edb6e9 100644 --- a/kmail/filterlogdlg.h +++ b/kmail/filterlogdlg.h @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,10 +48,11 @@ namespace KMail { class FilterLogDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** constructor */ - FilterLogDialog( TQWidget * parent ); + FilterLogDialog( TQWidget * tqparent ); protected slots: void slotLogEntryAdded( TQString logEntry ); diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp index 54df51677..4d1cb8089 100644 --- a/kmail/folderIface.cpp +++ b/kmail/folderIface.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -57,19 +57,19 @@ FolderIface::FolderIface( const TQString& vpath ) Q_ASSERT( mFolder ); } -QString +TQString FolderIface::path() const { return mPath; } -QString +TQString FolderIface::displayName() const { return mFolder->label(); } -QString +TQString FolderIface::displayPath() const { return mFolder->prettyURL(); @@ -81,13 +81,13 @@ FolderIface::usesCustomIcons() const return mFolder->useCustomIcons(); } -QString +TQString FolderIface::normalIconPath() const { return mFolder->normalIconPath(); } -QString +TQString FolderIface::unreadIconPath() const { return mFolder->unreadIconPath(); @@ -136,7 +136,7 @@ FolderIface::messageRefs() for( int i = 0; i < messageCache.size(); ++i ) { KMMsgBase *msg = messageCache[i]; if ( msg ) { - KMMessage *fmsg = msg->parent()->getMsg( msg->parent()->find( msg ) ); + KMMessage *fmsg = msg->tqparent()->getMsg( msg->tqparent()->tqfind( msg ) ); refList.append( DCOPRef( new MessageIface( fmsg ) ) ); } } diff --git a/kmail/folderIface.h b/kmail/folderIface.h index d43adedbe..645ab5411 100644 --- a/kmail/folderIface.h +++ b/kmail/folderIface.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -43,6 +43,7 @@ namespace KMail { public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 58130a05b..90903fdb1 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -83,8 +83,8 @@ static const struct { }; -KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name ) - : KDialogBase( parent, name, true /*modal*/, caption, +KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, true /*modal*/, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true /*sep*/ ) , mUserIdFormat( userIdFormat ) { @@ -115,7 +115,7 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt } topLayout->setRowStretch(2, 10); - TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page ); + TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the tqparent folder." ), page ); topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 ); connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); @@ -139,7 +139,7 @@ static TQString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat if ( userIdFormat == FullEmail ) return email; else { // mUserIdFormat == UserName - email.truncate( email.find( '@' ) ); + email.truncate( email.tqfind( '@' ) ); return email; } } @@ -192,7 +192,7 @@ unsigned int KMail::ACLEntryDialog::permissions() const // class KMail::FolderDiaACLTab::ListView : public KListView // { // public: -// ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {} +// ListView( TQWidget* tqparent, const char* name = 0 ) : KListView( tqparent, name ) {} // }; class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem @@ -250,7 +250,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions ) { mPermissions = permissions; - setText( 1, permissionsToUserString( permissions, TQString::null ) ); + setText( 1, permissionsToUserString( permissions, TQString() ) ); } void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry ) @@ -260,7 +260,7 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry ) // It's ok in distribution list names though, that's why this check is only done here // and also why there's no validator on the lineedit. if ( entry.userId.tqcontains( ' ' ) ) - kdWarning(5006) << "Userid tqcontains a space!!! '" << entry.userId << "'" << endl; + kdWarning(5006) << "Userid contains a space!!! '" << entry.userId << "'" << endl; setUserId( entry.userId ); mPermissions = entry.permissions; @@ -297,14 +297,14 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, TQString email = (*it).email; if ( email.isEmpty() ) email = addresseeToUserId( (*it).addressee, userIdFormat ); - ACLListEntry entry( email, TQString::null, mPermissions ); + ACLListEntry entry( email, TQString(), mPermissions ); entry.changed = true; aclList.append( entry ); } } else { // it wasn't a distribution list ACLListEntry entry( userId(), mInternalRightsList, mPermissions ); if ( mModified ) { - entry.internalRightsList = TQString::null; + entry.internalRightsList = TQString(); entry.changed = true; } aclList.append( entry ); @@ -313,8 +313,8 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, //// -KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name ) - : FolderDiaTab( parent, name ), +KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name ) + : FolderDiaTab( tqparent, name ), mImapAccount( 0 ), mUserRights( 0 ), mUserRightsState( KMail::ACLJobs::NotFetchedYet ), @@ -363,7 +363,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) ); } -// Warning before save() this will return the url of the _parent_ folder, when creating a new one +// Warning before save() this will return the url of the _tqparent_ 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->parentFolder() ) { + } else if ( mDlg->tqparentFolder() ) { // new folder - initializeWithValuesFromFolder( mDlg->parentFolder() ); + initializeWithValuesFromFolder( mDlg->tqparentFolder() ); mChanged = true; // ensure that saving happens } @@ -412,7 +412,7 @@ void KMail::FolderDiaACLTab::load() // but the default value is determined from the current user's own id. TQString defaultFormat = "fullemail"; // warning mImapAccount can be 0 if creating a subsubsubfolder with dimap... (bug?) - if ( mImapAccount && mImapAccount->login().find('@') == -1 ) + if ( mImapAccount && mImapAccount->login().tqfind('@') == -1 ) defaultFormat = "username"; // no @ found, so we assume it's just the username KConfigGroup configGroup( kmkernel->config(), "IMAP" ); TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat ); @@ -421,7 +421,7 @@ void KMail::FolderDiaACLTab::load() mUserIdFormat = UserName; if ( mFolderType == KMFolderTypeCachedImap ) { - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() ); if ( mUserRightsState == KMail::ACLJobs::FetchFailed || folderImap->aclListState() == KMail::ACLJobs::FetchFailed ) { @@ -450,18 +450,18 @@ void KMail::FolderDiaACLTab::load() mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) ); return; } - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); 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..." ).arg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start - slotConnectionResult( -1, TQString::null ); + slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected - slotConnectionResult( 0, TQString::null ); + slotConnectionResult( 0, TQString() ); } } @@ -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->parentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); mImapAccount->getUserRights( folder, mImapPath ); } else @@ -495,7 +495,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) return; } - if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { + if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) { KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); mUserRights = folderImap->userRights(); mUserRightsState = folderImap->userRightsState(); @@ -505,15 +505,15 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder ) void KMail::FolderDiaACLTab::startListing() { - // List ACLs of folder - or its parent, if creating a new folder - mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath ); + // List ACLs of folder - or its tqparent, if creating a new folder + mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(), 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->parentFolder() ) ) { + if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) ) { disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )), this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) ); @@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL() emit changed(true); } -KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept() +KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept() { if ( !mChanged || !mImapAccount ) return Accepted; // (no change made), ok for accepting the dialog immediately @@ -706,7 +706,7 @@ bool KMail::FolderDiaACLTab::save() for ( TQStringList::ConstIterator rit = mRemovedACLs.begin(); rit != mRemovedACLs.end(); ++rit ) { // We use permissions == -1 to signify deleting. At least on cyrus, setacl(0) or deleteacl are the same, // but I'm not sure if that's true for all servers. - ACLListEntry entry( *rit, TQString::null, -1 ); + ACLListEntry entry( *rit, TQString(), -1 ); entry.changed = true; aclList.append( entry ); } @@ -723,15 +723,15 @@ bool KMail::FolderDiaACLTab::save() mACLList = aclList; - KMFolderImap* parentImap = mDlg->parentFolder() ? static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) : 0; + KMFolderImap* tqparentImap = mDlg->tqparentFolder() ? static_cast<KMFolderImap*>( mDlg->tqparentFolder()->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( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), + connect( tqparentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); } else { - slotDirectoryListingFinished( parentImap ); + slotDirectoryListingFinished( tqparentImap ); } return true; } @@ -739,7 +739,7 @@ bool KMail::FolderDiaACLTab::save() void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) { if ( !f || - f != static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) || + f != static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) || !mDlg->folder() || !mDlg->folder()->storage() ) { emit readyForAccept(); @@ -754,7 +754,7 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList ); ImapAccountBase::jobData jd; - jd.total = 1; jd.done = 0; jd.parent = 0; + jd.total = 1; jd.done = 0; jd.tqparent = 0; mImapAccount->insertJob(job, jd); connect(job, TQT_SIGNAL(result(KIO::Job *)), diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index d9116a6b7..855655174 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -59,9 +59,10 @@ class ImapAccountBase; */ class ACLEntryDialog :public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 ); + ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name = 0 ); void setValues( const TQString& userId, unsigned int permissions ); @@ -86,13 +87,14 @@ private: class FolderDiaACLTab : public FolderDiaTab { Q_OBJECT + TQ_OBJECT public: - FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 ); + FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 ); virtual void load(); virtual bool save(); - virtual AccepStatus accept(); + virtual AcceptqStatus accept(); static bool supports( KMFolder* refFolder ); diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 99954cc2a..4215ba723 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -50,8 +50,8 @@ using namespace KMail; -KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name ) - : FolderDiaTab( parent, name ), +KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name ) + : FolderDiaTab( tqparent, name ), mImapAccount( 0 ), mDlg( dlg ) { @@ -92,9 +92,9 @@ void KMail::FolderDiaQuotaTab::load() if ( mDlg->folder() ) { // existing folder initializeWithValuesFromFolder( mDlg->folder() ); - } else if ( mDlg->parentFolder() ) { + } else if ( mDlg->tqparentFolder() ) { // new folder - initializeWithValuesFromFolder( mDlg->parentFolder() ); + initializeWithValuesFromFolder( mDlg->tqparentFolder() ); } if ( mFolderType == KMFolderTypeCachedImap ) { @@ -114,18 +114,18 @@ void KMail::FolderDiaQuotaTab::load() mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) ); return; } - KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); 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..." ).arg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start - slotConnectionResult( -1, TQString::null ); + slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected - slotConnectionResult( 0, TQString::null ); + slotConnectionResult( 0, TQString() ); } } @@ -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->parentFolder(); + KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(); 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->parentFolder() ) { + if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) { //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )), @@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget() } -KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept() +KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept() { if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap ) return Accepted; diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index 2fc956e96..570c7e82e 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -20,17 +20,17 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. */ -#ifndef FOLDERDIAQUOTA_H -#define FOLDERDIAQUOTA_H +#ifndef FOLDERDIATQUOTA_H +#define FOLDERDIATQUOTA_H #include "kmfolderdia.h" #include "kmfoldertype.h" @@ -53,13 +53,14 @@ class ImapAccountBase; class FolderDiaQuotaTab : public FolderDiaTab { Q_OBJECT + TQ_OBJECT public: - FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 ); + FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 ); virtual void load(); virtual bool save(); - virtual AccepStatus accept(); + virtual AcceptqStatus accept(); static bool supports( KMFolder* refFolder ); @@ -87,5 +88,5 @@ private: } // end of namespace KMail -#endif /* FOLDERDIAQUOTA_H */ +#endif /* FOLDERDIATQUOTA_H */ diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 86d399d8c..d8f8f44c4 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -51,8 +51,8 @@ using namespace KMail; struct QuotaInfo; -QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) - :TQWidget( parent, name ) +QuotaWidget::QuotaWidget( TQWidget* tqparent, const char* name ) + :TQWidget( tqparent, name ) { TQVBoxLayout *box = new TQVBoxLayout(this); TQWidget *stuff = new TQWidget( this ); @@ -66,7 +66,7 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); tqlayout->addWidget( mRootLabel, 0, 1 ); tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); - //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); + //tqlayout->addWidget( new TQLabel( i18n("tqStatus:"), stuff ), 2, 0 ); tqlayout->addWidget( mInfoLabel, 1, 1 ); tqlayout->addWidget( mProgressBar, 2, 1 ); box->addWidget( stuff ); diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h index 68b5c19fe..776ae1d76 100644 --- a/kmail/folderdiaquotatab_p.h +++ b/kmail/folderdiaquotatab_p.h @@ -19,19 +19,19 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. */ -#ifndef FOLDERDIAQUOTA_P_H -#define FOLDERDIAQUOTA_P_H +#ifndef FOLDERDIATQUOTA_P_H +#define FOLDERDIATQUOTA_P_H #include <tqlabel.h> @@ -45,8 +45,9 @@ namespace KMail { class QuotaWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - QuotaWidget( TQWidget* parent, const char* name = 0 ); + QuotaWidget( TQWidget* tqparent, const char* name = 0 ); virtual ~QuotaWidget() { } void setQuotaInfo( const KMail::QuotaInfo& info ); @@ -60,4 +61,4 @@ private: }//end of namespace KMail -#endif /* FOLDERDIAQUOTA_H */ +#endif /* FOLDERDIATQUOTA_H */ diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp index 69a1557a5..655e18d7a 100644 --- a/kmail/folderjob.cpp +++ b/kmail/folderjob.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. diff --git a/kmail/folderjob.h b/kmail/folderjob.h index 2988c925c..3d662e76d 100644 --- a/kmail/folderjob.h +++ b/kmail/folderjob.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -41,9 +41,10 @@ class KMFolder; namespace KMail { -class FolderJob : public QObject +class FolderJob : public TQObject { Q_OBJECT + TQ_OBJECT public: enum JobType { tListMessages, tGetFolder, tCreateFolder, tExpungeFolder, @@ -52,21 +53,21 @@ public: tCopyMessage, tMoveMessage, tOther /* used by subclasses */ }; /** * Constructs a new job, operating on the message msg, of type - * @p jt and with a parent folder @p folder. + * @p jt and with a tqparent folder @p folder. */ FolderJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0, - TQString partSpecifier = TQString::null ); + TQString partSpecifier = TQString() ); /** * Constructs a new job, operating on a message list @p msgList, - * set @sets, JobType @p jt and with the parent folder @p folder. + * set @sets, JobType @p jt and with the tqparent folder @p folder. * */ FolderJob( const TQPtrList<KMMessage>& msgList, const TQString& sets, JobType jt = tGetMessage, KMFolder *folder = 0 ); /** * This one should ONLY be used in derived folders, when a job - * does something internal and needs to construct an empty parent + * does something internal and needs to construct an empty tqparent * FolderJob */ FolderJob( JobType jt ); @@ -153,7 +154,7 @@ signals: void result( KMail::FolderJob* job ); /** - * This progress signal tqcontains the "done" and the "total" numbers so + * This progress signal contains the "done" and the "total" numbers so * that the caller can either make a % out of it, or combine it into * a higher-level progress info. */ diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index 45fa7015b..984885c16 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KMFolderDialogUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KMFolderDialogUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="6"> + <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="6"> <property name="name"> <cstring>mNameEdit</cstring> </property> @@ -44,7 +44,7 @@ <enum>Sunken</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -55,7 +55,7 @@ <cstring>mNameEdit</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="8"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="8"> <property name="name"> <cstring>mHoldsMailingList</cstring> </property> @@ -80,7 +80,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -111,7 +111,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -204,7 +204,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="5"> + <widget class="TQLabel" row="2" column="5"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -235,7 +235,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="8"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="8"> <property name="name"> <cstring>mIconsCheckBox</cstring> </property> @@ -243,7 +243,7 @@ <string>Use custom &icons</string> </property> </widget> - <widget class="QLineEdit" row="4" column="4" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="4" column="4" rowspan="1" colspan="4"> <property name="name"> <cstring>mMailingListPostAddress</cstring> </property> @@ -261,7 +261,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -272,7 +272,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -303,7 +303,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>mExpireRead</cstring> </property> @@ -328,7 +328,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel2_3_2</cstring> </property> @@ -342,7 +342,7 @@ <cstring>mExpireUnreadNum</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>mExpireUnread</cstring> </property> @@ -443,7 +443,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -454,7 +454,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -465,7 +465,7 @@ <cstring>mIdentity</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>mIdentity</cstring> </property> @@ -475,7 +475,7 @@ <cstring>mMailboxType</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -486,7 +486,7 @@ <cstring>mMailboxType</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -514,7 +514,7 @@ </size> </property> </spacer> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Sender</string> @@ -630,9 +630,9 @@ <variable>QValueList<QGuardedPtr<KMFolder> > mFolders;</variable> <variable>KMFolderDir *mFolderDIr;</variable> </variables> -<slots> +<Q_SLOTS> <slot access="protected">slotChangeIcon( QString )</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kmail/folderpropertiesdialog.ui.h b/kmail/folderpropertiesdialog.ui.h index c72511246..99a956ab5 100644 --- a/kmail/folderpropertiesdialog.ui.h +++ b/kmail/folderpropertiesdialog.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions respectively slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 2be44c5aa..06374664f 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -41,8 +41,8 @@ namespace KMail { -FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) - : TQWidget( parent ), mFolder( 0 ), mFolderTree( tree ), +FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree ) + : TQWidget( tqparent ), mFolder( 0 ), mFolderTree( tree ), mMustBeReadWrite( true ), mShowOutbox( true ), mShowImapFolders( true ) { TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); @@ -116,7 +116,7 @@ void FolderRequester::setFolder( const TQString &idString ) //----------------------------------------------------------------------------- void FolderRequester::keyPressEvent( TQKeyEvent * e ) { - if ( e->key() == Qt::Key_Space ) + if ( e->key() == TQt::Key_Space ) slotOpenDialog(); else e->ignore(); diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h index 9d7493c87..a13ab6d28 100644 --- a/kmail/folderrequester.h +++ b/kmail/folderrequester.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -38,22 +38,23 @@ class KMFolderTree; namespace KMail { /** - * A widget that tqcontains a KLineEdit which shows the current folder + * A widget that contains a KLineEdit which shows the current folder * and a button that fires a KMFolderSelDlg * The dialog is set to disable readonly folders by default * Search folders are excluded */ - class FolderRequester: public QWidget + class FolderRequester: public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent the parent widget + * @param tqparent the tqparent widget * @param tree the KMFolderTree to get the folders */ - FolderRequester( TQWidget *parent, KMFolderTree* tree ); + FolderRequester( TQWidget *tqparent, KMFolderTree* tree ); virtual ~FolderRequester(); /** Returns selected folder */ diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp index 147d98a05..45748b2f6 100644 --- a/kmail/foldersetselector.cpp +++ b/kmail/foldersetselector.cpp @@ -27,8 +27,8 @@ using namespace KMail; -FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * parent ) - : KDialogBase( parent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true ) +FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * tqparent ) + : KDialogBase( tqparent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true ) { assert( ft ); diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h index 5d51db31b..97cc38602 100644 --- a/kmail/foldersetselector.h +++ b/kmail/foldersetselector.h @@ -29,9 +29,10 @@ namespace KMail { class FolderSetSelector : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 ); + FolderSetSelector( KMFolderTree *ft, TQWidget *tqparent = 0 ); TQValueList<int> selectedFolders(); void setSelectedFolders( const TQValueList<int> &folderIds ); diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 80e1b28f3..b4897afec 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -25,11 +25,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -53,9 +53,9 @@ using namespace KMail; FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, KMMainWidget *mainwidget, - TQWidget *parent, + TQWidget *tqparent, const char *name ) -: KDialogBase( parent, name, true, +: KDialogBase( tqparent, name, true, i18n( "Shortcut for Folder %1" ).arg( folder->label() ), KDialogBase::Ok | KDialogBase::Cancel ), mFolder( folder ), mMainWidget( mainwidget ) diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h index 1934ad23c..da249e1a3 100644 --- a/kmail/foldershortcutdialog.h +++ b/kmail/foldershortcutdialog.h @@ -25,11 +25,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -51,9 +51,10 @@ namespace KMail class FolderShortcutDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~FolderShortcutDialog(); diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 6744e136e..e1a7f364e 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -113,7 +113,7 @@ void FolderStorage::close( const char* owner, bool aForced ) TQString FolderStorage::dotEscape(const TQString& aStr) { if (aStr[0] != '.') return aStr; - return aStr.left(aStr.find(TQRegExp("[^\\.]"))) + aStr; + return aStr.left(aStr.tqfind(TQRegExp("[^\\.]"))) + aStr; } void FolderStorage::addJob( FolderJob* job ) const @@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread() if (!(msgBase = getMsgBase(i))) continue; if (msgBase->isNew()) { - msgBase->seStatus(KMMsgStatusUnread); + msgBase->setqStatus(KMMsgStatusUnread); msgBase->setDirty(true); } } @@ -301,9 +301,9 @@ void FolderStorage::emitMsgAddedSignals(int idx) bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret) { if (aIndex_ret) *aIndex_ret = -1; - KMFolder *msgParent = aMsg->parent(); - // If the message has a parent and is in transfer, bail out. If it does not - // have a parent we want to be able to add it even if it is in transfer. + KMFolder *msgParent = aMsg->tqparent(); + // If the message has a tqparent and is in transfer, bail out. If it does not + // have a tqparent we want to be able to add it even if it is in transfer. if (aMsg->transferInProgress() && msgParent) return false; if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap) @@ -326,7 +326,7 @@ void FolderStorage::reallyAddMsg(KMMessage* aMsg) return; aMsg->setTransferInProgress( false ); aMsg->setComplete( true ); - KMFolder *aFolder = aMsg->parent(); + KMFolder *aFolder = aMsg->tqparent(); int index; ulong serNum = aMsg->getMsgSerNum(); bool undo = aMsg->enableUndo(); @@ -350,8 +350,8 @@ void FolderStorage::reallyAddCopyOfMsg(KMMessage* aMsg) unGetMsg( count() - 1 ); } -int FolderStorage::find( const KMMessage * msg ) const { - return find( &msg->toMsgBase() ); +int FolderStorage::tqfind( const KMMessage * msg ) const { + return tqfind( &msg->toMsgBase() ); } //----------------------------------------------------------------------------- @@ -359,7 +359,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMsgBase>& msgList, bool imapQuie { for( TQPtrListIterator<KMMsgBase> it( msgList ); *it; ++it ) { - int idx = find(it.current()); + int idx = tqfind(it.current()); assert( idx != -1); removeMsg(idx, imapQuiet); } @@ -370,7 +370,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMessage>& msgList, bool imapQuie { for( TQPtrListIterator<KMMessage> it( msgList ); *it; ++it ) { - int idx = find(it.current()); + int idx = tqfind(it.current()); assert( idx != -1); removeMsg(idx, imapQuiet); } @@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList) { for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() ) { - if (msg->parent()) + if (msg->tqparent()) { - int idx = msg->parent()->find(msg); + int idx = msg->tqparent()->tqfind(msg); if ( idx >= 0 ) take(idx); } @@ -621,7 +621,7 @@ FolderJob* FolderStorage::createJob( TQPtrList<KMMessage>& msgList, const TQStri int FolderStorage::moveMsg(KMMessage* aMsg, int* aIndex_ret) { assert(aMsg != 0); - KMFolder* msgParent = aMsg->parent(); + KMFolder* msgParent = aMsg->tqparent(); if (msgParent) msgParent->open("moveMsgSrc"); @@ -641,7 +641,7 @@ int FolderStorage::moveMsg(TQPtrList<KMMessage> msglist, int* aIndex_ret) { KMMessage* aMsg = msglist.first(); assert(aMsg != 0); - KMFolder* msgParent = aMsg->parent(); + KMFolder* msgParent = aMsg->tqparent(); if (msgParent) msgParent->open("foldermovemsg"); @@ -681,7 +681,7 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent) close("rename", true); oldName = folder()->fileName(); - oldParent = folder()->parent(); + oldParent = folder()->tqparent(); if (newParent) folder()->setParent( newParent ); @@ -723,14 +723,14 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent) } // if the folder is being moved then move its node and, if necessary, also - // the associated subfolder directory node to the new parent + // the associated subfolder directory node to the new tqparent if (newParent) { if (oldParent->findRef( folder() ) != -1) oldParent->take(); newParent->inSort( folder() ); if ( child ) { - if ( child->parent()->findRef( child ) != -1 ) - child->parent()->take(); + if ( child->tqparent()->findRef( child ) != -1 ) + child->tqparent()->take(); newParent->inSort( child ); child->setParent( newParent ); } @@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const } //----------------------------------------------------------------------------- -void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx) +void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx) { int oldUnread = 0; int newUnread = 0; - if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) && - !(oldStatus & KMMsgStatusIgnored)) || + if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) && + !(oldtqStatus & KMMsgStatusIgnored)) || (folder() == kmkernel->outboxFolder())) oldUnread = 1; - if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) && - !(newStatus & KMMsgStatusIgnored)) || + if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) && + !(newtqStatus & KMMsgStatusIgnored)) || (folder() == kmkernel->outboxFolder())) newUnread = 1; int deltaUnread = newUnread - oldUnread; @@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus, void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx) { if (idx < 0) - idx = aMsg->parent()->find( aMsg ); + idx = aMsg->tqparent()->tqfind( aMsg ); if (idx >= 0 ) { @@ -1022,7 +1022,7 @@ int FolderStorage::appendToFolderIdsFile( int idx ) return ret; } -void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx ) +void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx ) { if ( !mExportsSernums ) return; KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx ); @@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const } //----------------------------------------------------------------------------- -void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle) +void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle) { KMMsgBase *msg = getMsgBase(idx); if ( msg ) { if (toggle) - msg->toggleStatus(status, idx); + msg->toggletqStatus(status, idx); else - msg->seStatus(status, idx); + msg->setqStatus(status, idx); } } //----------------------------------------------------------------------------- -void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) +void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle) { for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it ) { - FolderStorage::seStatus(*it, status, toggle); + FolderStorage::setqStatus(*it, status, toggle); } } @@ -1136,7 +1136,7 @@ void FolderStorage::slotProcessNextSearchBatch() if ( !mSearchPattern ) return; TQValueList<TQ_UINT32> matchingSerNums; - const int end = QMIN( mCurrentSearchedMsg + 15, count() ); + const int end = TQMIN( mCurrentSearchedMsg + 15, count() ); for ( int i = mCurrentSearchedMsg; i < end; ++i ) { TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i ); diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index b7effe082..ab58d4fdf 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -71,20 +71,21 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the children of the folder. They are only stored here + * represented as the tqchildren of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ -class FolderStorage : public QObject +class FolderStorage : public TQObject { Q_OBJECT + TQ_OBJECT public: - /** Usually a parent is given. But in some cases there is no - fitting parent object available. Then the name of the folder + /** Usually a tqparent is given. But in some cases there is no + fitting tqparent object available. Then the name of the folder is used as the absolute path to the folder file. */ FolderStorage( KMFolder* folder, const char* name=0 ); virtual ~FolderStorage(); @@ -108,10 +109,10 @@ public: /** Specify, that the folder can't contain mails. */ virtual void setNoContent(bool aNoContent); - /** Returns, if the folder can't have children */ + /** Returns, if the folder can't have tqchildren */ virtual bool noChildren() const { return mNoChildren; } - /** Specify, that the folder can't have children */ + /** Specify, that the folder can't have tqchildren */ virtual void setNoChildren( bool aNoChildren ); enum ChildrenState { @@ -119,11 +120,11 @@ public: HasNoChildren, ChildrenUnknown }; - /** Returns if the folder has children, - * has no children or we don't know */ + /** Returns if the folder has tqchildren, + * has no tqchildren or we don't know */ virtual ChildrenState hasChildren() const { return mHasChildren; } - /** Specify if the folder has children */ + /** Specify if the folder has tqchildren */ virtual void setHasChildren( ChildrenState state ) { mHasChildren = state; } @@ -158,7 +159,7 @@ public: * for each derived KMFolder). */ virtual FolderJob* createJob( KMMessage *msg, FolderJob::JobType jt = FolderJob::tGetMessage, - KMFolder *folder = 0, TQString partSpecifier = TQString::null, + KMFolder *folder = 0, TQString partSpecifier = TQString(), const AttachmentStrategy *as = 0 ) const; virtual FolderJob* createJob( TQPtrList<KMMessage>& msgList, const TQString& sets, FolderJob::JobType jt = FolderJob::tGetMessage, @@ -228,8 +229,8 @@ public: virtual int moveMsg(TQPtrList<KMMessage>, int* index_return = 0); /** Returns the index of the given message or -1 if not found. */ - virtual int find(const KMMsgBase* msg) const = 0; - int find( const KMMessage * msg ) const; + virtual int tqfind(const KMMsgBase* msg) const = 0; + int tqfind( const KMMessage * msg ) const; /** Number of messages in this folder. */ virtual int count(bool cache = false) const; @@ -244,10 +245,10 @@ public: * be reflected in the UI. */ virtual bool isCloseToQuota() const; - /** Called by KMMsgBase::seStatus when status of a message has changed + /** Called by KMMsgBase::setqStatus when status of a message has changed required to keep the number unread messages variable current. */ - virtual void msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, + virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx); /** Open folder for access. @@ -324,7 +325,7 @@ public: /** Change the dirty flag. */ void setDirty(bool f); - /** Returns TRUE if the folder tqcontains deleted messages */ + /** Returns TRUE if the folder contains deleted messages */ bool needsCompacting() const { return needsCompact; } virtual void setNeedsCompacting(bool f) { needsCompact = f; } @@ -363,10 +364,10 @@ public: void deregisterFromMessageDict(); /** Set the status of the message at index @p idx to @p status. */ - virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false); + virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); + virtual void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false); void removeJobs(); @@ -581,7 +582,7 @@ friend class KMMsgDict; /** Replaces the serial number for the message @p msg at index @p idx with * @p sernum */ - void tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx ); + 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 diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index e126263f5..0397692aa 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -39,8 +39,8 @@ using KPIM::MailListDrag; using namespace KMail; -FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * parent, const char * name) : - KFolderTree( parent, name ), +FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * tqparent, const char * name) : + KFolderTree( tqparent, name ), mMainWidget( mainWidget ) { addAcceptableDropMimetype(MailListDrag::format(), false); @@ -212,7 +212,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ fti->setFolderIsCloseToQuota( folder->storage()->isCloseToQuota() ); } - if (fti->parent() && !fti->parent()->isOpen()) + if (fti->tqparent() && !fti->tqparent()->isOpen()) tqrepaint = false; // we're not visible if (tqrepaint) { fti->setNeedsRepaint( true ); diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h index 0c8f97207..710186637 100644 --- a/kmail/foldertreebase.h +++ b/kmail/foldertreebase.h @@ -29,8 +29,9 @@ namespace KMail { class FolderTreeBase : public KFolderTree { Q_OBJECT + TQ_OBJECT public: - FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 ); + FolderTreeBase( KMMainWidget *mainWidget, TQWidget *tqparent = 0, const char *name = 0 ); /** Returns the main widget that this widget is a child of. */ KMMainWidget* mainWidget() const { return mMainWidget; } diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index 8e65fff27..e5a604b8b 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -28,39 +28,39 @@ using namespace KMail; using namespace FolderUtil; -KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, +KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ) { KMFolder *newFolder = 0; - if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) { - KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() ); + if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeImap ) { + KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( tqparentFolder->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, parentDir ); + newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, tqparentDir ); if ( newFolder ) { - TQString imapPath, parent; + TQString imapPath, tqparent; if ( !namespaceName.isEmpty() ) { // create folder with namespace - parent = anAccount->addPathToNamespace( namespaceName ); - imapPath = anAccount->createImapPath( parent, folderName ); + tqparent = anAccount->addPathToNamespace( namespaceName ); + imapPath = anAccount->createImapPath( tqparent, folderName ); } else { imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName ); } KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() ); - selectedStorage->createFolder(folderName, parent); // create it on the server - newStorage->initializeFrom( selectedStorage, imapPath, TQString::null ); - static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() ); + selectedStorage->createFolder(folderName, tqparent); // create it on the server + newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); + static_cast<KMFolderImap*>(tqparentFolder->storage())->setAccount( selectedStorage->account() ); return newFolder; } } - } else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) { + } else if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeCachedImap ) { newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap, - parentDir ); + tqparentDir ); if ( newFolder ) { - KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() ); + KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( tqparentFolder->storage() ); KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() ); newStorage->initializeFrom( selectedStorage ); if ( !namespaceName.isEmpty() ) { @@ -75,21 +75,21 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi // local folder Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox ); newFolder = kmkernel->folderMgr()->createFolder( folderName, false, localFolderType, - parentDir ); + tqparentDir ); return newFolder; } return newFolder; } -void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent ) +void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent ) { if ( folderToDelete->hasAccounts() ) { // this folder has an account, so we need to change that to the inbox for ( AccountList::Iterator it (folderToDelete->acctList()->begin() ), end( folderToDelete->acctList()->end() ); it != end; ++it ) { (*it)->setFolder( kmkernel->inboxFolder() ); - KMessageBox::information(parent, + KMessageBox::information(tqparent, i18n("<qt>The folder you deleted was associated with the account " "<b>%1</b> which delivered mail into it. The folder the account " "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name())); diff --git a/kmail/folderutil.h b/kmail/folderutil.h index fbb4d0697..9e1ac419c 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 parentFolder parent folder of the folder that should be created. Can be 0 in case of + * @param tqparentFolder tqparent folder of the folder that should be created. Can be 0 in case of * local folders - * @param parentDir parent folder directory, which should be the folder directory of parentFolder + * @param tqparentDir tqparent folder directory, which should be the folder directory of tqparentFolder * @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 *parentFolder, KMFolderDir *parentDir, +KMFolder *createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir, const TQString &folderName, const TQString &namespaceName, KMFolderType localFolderType ); @@ -53,10 +53,10 @@ KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir, * Handles all types of folders correctly, as well as folders with accounts * * @param folderToDelete the folder which is going to be deleted - * @param parent the parent widget, which is used when displaying a messagebox, + * @param tqparent the tqparent widget, which is used when displaying a messagebox, * which happens when removing a folder with an associated account */ -void deleteFolder( KMFolder *folderToDelete, TQWidget *parent ); +void deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent ); } diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h index ee813bf47..5ffac8d4a 100644 --- a/kmail/folderviewtooltip.h +++ b/kmail/folderviewtooltip.h @@ -7,12 +7,12 @@ namespace KMail { -class FolderViewToolTip : public QToolTip +class FolderViewToolTip : public TQToolTip { public: - FolderViewToolTip( TQListView* parent ) : - TQToolTip( parent->viewport() ), - mListView( parent ) {} + FolderViewToolTip( TQListView* tqparent ) : + TQToolTip( tqparent->viewport() ), + mListView( tqparent ) {} protected: void maybeTip( const TQPoint &point ) diff --git a/kmail/globalsettings.cpp b/kmail/globalsettings.cpp index b74309491..c09b05913 100644 --- a/kmail/globalsettings.cpp +++ b/kmail/globalsettings.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "globalsettings.h" diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h index eedac97a0..6b3df4062 100644 --- a/kmail/globalsettings.h +++ b/kmail/globalsettings.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KMAIL_GLOBALSETTINGS_H @@ -31,6 +31,7 @@ class TQTimer; class GlobalSettings : public TQObject, public GlobalSettingsBase { Q_OBJECT + TQ_OBJECT public: virtual ~GlobalSettings(); diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 684dd590d..230b64999 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -42,8 +42,8 @@ using namespace KMail; // Constuction a new list view item with the given colors and pixmap -HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key ) - : KListViewItem( parent ), +HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key ) + : KListViewItem( tqparent ), mMsgId( msgId ), mKey( key ), mAboutToBeDeleted( false ), @@ -52,9 +52,9 @@ HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key ) irefresh(); } -// Constuction a new list view item with the given parent, colors, & pixmap -HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key ) - : KListViewItem( parent ), +// Constuction a new list view item with the given tqparent, colors, & pixmap +HeaderItem::HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key ) + : KListViewItem( tqparent ), mMsgId( msgId ), mKey( key ), mAboutToBeDeleted( false ), @@ -92,7 +92,7 @@ void HeaderItem::irefresh() return; //default to closed // otherwise threadingPolicy == OpenUnread - if (parent() && parent()->isOpen()) { + if (tqparent() && tqparent()->isOpen()) { setOpen(true); return; } @@ -103,8 +103,8 @@ void HeaderItem::irefresh() || mMsgBase->isImportant() || mMsgBase->isTodo() || mMsgBase->isWatched() ) { setOpen(true); HeaderItem * topOfThread = this; - while(topOfThread->parent()) - topOfThread = (HeaderItem*)topOfThread->parent(); + while(topOfThread->tqparent()) + topOfThread = (HeaderItem*)topOfThread->tqparent(); topOfThread->setOpenRecursive(true); } } @@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const // Update this item to summarise a new folder and message -//Opens all children in the thread +//Opens all tqchildren in the thread void HeaderItem::setOpenRecursive( bool open ) { if (open){ @@ -198,7 +198,7 @@ TQString HeaderItem::text( int col) const tmp = headers->mDate.dateString( mMsgBase->date() ); } else if(col == headers->paintInfo()->sizeCol && headers->paintInfo()->showSize) { - if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) { + if ( mMsgBase->tqparent()->folderType() == KMFolderTypeImap ) { tmp = KIO::convertSize( mMsgBase->msgSizeServer() ); } else { tmp = KIO::convertSize( mMsgBase->msgSize() ); @@ -212,8 +212,8 @@ void HeaderItem::setup() widthChanged(); const int ph = KMHeaders::pixNew->height(); TQListView *v = listView(); - int h = QMAX( v->fontMetrics().height(), ph ) + 2*v->itemMargin(); - h = QMAX( h, TQApplication::globalStrut().height()); + int h = TQMAX( v->fontMetrics().height(), ph ) + 2*v->itemMargin(); + h = TQMAX( h, TQApplication::globalStrut().height()); if ( h % 2 > 0 ) h++; setHeight( h ); @@ -228,7 +228,7 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const for ( PixmapList::ConstIterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { width += (*it).width(); - height = QMAX( height, (*it).height() ); + height = TQMAX( height, (*it).height() ); } TQPixmap res( width, height ); @@ -309,7 +309,7 @@ const TQPixmap *HeaderItem::pixmap(int col) const if ( msgBase->isWatched() ) pixmaps << *KMHeaders::pixWatched; } - if ( !headers->mPaintInfo.showStatus ) { + if ( !headers->mPaintInfo.showtqStatus ) { const TQPixmap *pix = statusIcon(msgBase); if ( pix ) pixmaps << *pix; } @@ -402,23 +402,23 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg, if ( mMsgBase->isTodo() ) { color = const_cast<TQColor*>( &headers->paintInfo()->colTodo ); font = headers->todoFont(); - weight = QMAX( weight, font.weight() ); + weight = TQMAX( weight, font.weight() ); } if ( mMsgBase->isUnread() ) { color = const_cast<TQColor*>( &headers->paintInfo()->colUnread ); font = headers->unreadFont(); - weight = QMAX( weight, font.weight() ); + weight = TQMAX( weight, font.weight() ); } if ( mMsgBase->isNew() ) { color = const_cast<TQColor*>( &headers->paintInfo()->colNew ); font = headers->newFont(); - weight = QMAX( weight, font.weight() ); + weight = TQMAX( weight, font.weight() ); } if ( mMsgBase->isImportant() ) { color = const_cast<TQColor*>( &headers->paintInfo()->colFlag ); font = headers->importantFont(); - weight = QMAX( weight, font.weight() ); + weight = TQMAX( weight, font.weight() ); } if ( column == headers->paintInfo()->dateCol ) { font = headers->dateFont(); @@ -451,10 +451,10 @@ TQString HeaderItem::generate_key( KMHeaders *headers, const KPaintInfo *paintInfo, int sortOrder ) { - // It appears, that TQListView in Qt-3.0 asks for the key + // It appears, that TQListView in TQt-3.0 asks for the key // in TQListView::clear(), which is called from // readSortOrder() - if (!msg) return TQString::null; + if (!msg) return TQString(); int column = sortOrder & ((1 << 5) - 1); TQString ret = TQChar( (char)sortOrder ); @@ -490,7 +490,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers, } else if (column == paintInfo->sizeCol) { TQString len; - if ( msg->parent()->folderType() == KMFolderTypeImap ) + if ( msg->tqparent()->folderType() == KMFolderTypeImap ) { len = TQString::number( msg->msgSizeServer() ); } else { @@ -603,7 +603,7 @@ int HeaderItem::compare( TQListViewItem *i, int col, bool ascending ) const res = key( col, ascending ).compare( i->key( col, ascending ) ); } else if ( col == headers->paintInfo()->dateCol ) { res = key( col, ascending ).compare( i->key( col, ascending ) ); - if (i->parent() && !ascending) + if (i->tqparent() && !ascending) res = -res; } else if ( col == headers->paintInfo()->subCol || col == headers->paintInfo()->senderCol || diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 4ada5112a..1912d901f 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -63,14 +63,14 @@ public: mImperfectlyThreaded (true), mSubjThreadingList(0) { } ~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); } - /** The parent 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 parents. */ - SortCacheItem *parent() const { return mParent; } + /** 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. */ + SortCacheItem *tqparent() const { return mParent; } /** * Returs whether the item is so far imperfectly threaded. * If an item is imperfectly threaded (by References or subject, not by * In-Reply-To) it will be reevalutated when a new mail comes in. It could be - * the perfect parent. */ + * the perfect tqparent. */ bool isImperfectlyThreaded() const { return mImperfectlyThreaded; } /** Set whether the item is currently imperfectly threaded (by References @@ -80,20 +80,20 @@ public: /** Returns whether the item has other items below it. */ bool hasChildren() const { return mSortedChildren.count() || mUnsortedCount; } - /** The sorted children are an array of sortcache items we know are below the + /** The sorted tqchildren are an array of sortcache items we know are below the * current one and are already properly sorted (as read from the cache ) */ const TQPtrList<SortCacheItem> *sortedChildren() const { return &mSortedChildren; } - /** The unsorted children are an array of sortcache items we know are below the + /** The unsorted tqchildren are an array of sortcache items we know are below the * current one, but are yet to be threaded and sorted properly. */ SortCacheItem **unsortedChildren(int &count) const { count = mUnsortedCount; return mUnsortedChildren; } - /** Add an item to this itme's list of already sorted children. */ + /** Add an item to this itme's list of already sorted tqchildren. */ void addSortedChild(SortCacheItem *i) { i->mParent = this; mSortedChildren.append(i); } - /** Add an item to this itme's list of unsorted children. */ + /** Add an item to this itme's list of unsorted tqchildren. */ void addUnsortedChild(SortCacheItem *i) { i->mParent = this; if(!mUnsortedChildren) @@ -104,7 +104,7 @@ public: mUnsortedChildren[mUnsortedCount++] = i; } - /** Clear the sorted and unsorted children datastructures. */ + /** Clear the sorted and unsorted tqchildren datastructures. */ void clearChildren() { mSortedChildren.clear(); free( mUnsortedChildren ); @@ -130,7 +130,7 @@ public: void setOffset(int x) { mSortOffset = x; } void updateSortFile( FILE *sortStream, KMFolder *folder, - bool waiting_for_parent = false, + bool waiting_for_tqparent = false, bool update_discovered_count = false); /** Set the list of mails with a certain subject that this item is on. @@ -163,8 +163,8 @@ private: class HeaderItem : public KListViewItem { public: - HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString::null ); - HeaderItem( TQListViewItem* parent, int msgId, const TQString& key = TQString::null ); + HeaderItem( TQListView* tqparent, int msgId, const TQString& key = TQString() ); + HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key = TQString() ); ~HeaderItem (); /** Set the message id of this item, which is the offset/index in the folder @@ -185,7 +185,7 @@ public: // Return the serial number of the message associated with this item; TQ_UINT32 msgSerNum() const; - /** Expands all children of the list view item. */ + /** Expands all tqchildren of the list view item. */ void setOpenRecursive( bool open ); /** Returns the text of the list view item. */ diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index a2262744f..39df6dc9b 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,11 +47,11 @@ namespace KMail { -HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, +HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent, KListView *listView, KActionCollection *actionCollection, const char *name ) - : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0), statusList() + : KListViewSearchLine(tqparent, listView, name), mStatusCombo(0), mtqStatus(0), statusList() { KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() @@ -61,27 +61,27 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, TQT_SLOT( reset() ), actionCollection, "reset_quicksearch" ); - resetQuickSearch->plug( parent ); + resetQuickSearch->plug( tqparent ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n" "Resets the quick search so that " "all messages are shown again." ) ); - TQLabel *label = new TQLabel( i18n("Stat&us:"), parent, "kde toolbar widget" ); + TQLabel *label = new TQLabel( i18n("Stat&us:"), tqparent, "kde toolbar widget" ); - mStatusCombo = new TQComboBox( parent, "quick search status combo box" ); + mStatusCombo = new TQComboBox( tqparent, "quick search status combo box" ); mStatusCombo->setSizeLimit( 12 ); - mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") ); - - inserStatus( StatusUnread ); - inserStatus( StatusNew ); - inserStatus( StatusImportant ); - inserStatus( StatusReplied ); - inserStatus( StatusForwarded ); - inserStatus( StatusToDo ); - inserStatus( StatusHasAttachment ); - inserStatus( StatusInvitation ); - inserStatus( StatusWatched ); - inserStatus( StatusIgnored ); + mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") ); + + insertqStatus( StatusUnread ); + insertqStatus( StatusNew ); + insertqStatus( StatusImportant ); + insertqStatus( StatusReplied ); + insertqStatus( StatusForwarded ); + insertqStatus( StatusToDo ); + insertqStatus( StatusHasAttachment ); + insertqStatus( StatusInvitation ); + insertqStatus( StatusWatched ); + insertqStatus( StatusIgnored ); mStatusCombo->setCurrentItem( 0 ); mStatusCombo->installEventFilter( this ); connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ), @@ -89,7 +89,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, label->setBuddy( mStatusCombo ); - KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent, + KToolBarButton * btn = new KToolBarButton( "mail_tqfind", 0, tqparent, 0, i18n( "Open Full Search" ) ); connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) ); @@ -115,7 +115,7 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) if ( watched == mStatusCombo ) { KMMainWidget *mainWidget = 0; - // Travel up the parents list until we find the main widget + // Travel up the tqparents list until we find the main widget for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) { mainWidget = ::qt_cast<KMMainWidget *>( curWidget ); if ( mainWidget ) @@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const { mCurrentSearchTerm = s; // bit of a hack, but works - if ( mStatus != 0 ) { + if ( mtqStatus != 0 ) { KMHeaders *headers = static_cast<KMHeaders*>( item->listView() ); const KMMsgBase *msg = headers->getMsgBaseForItem( item ); - if ( !msg || ! ( msg->status() & mStatus ) ) + if ( !msg || ! ( msg->status() & mtqStatus ) ) return false; } @@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset() void HeaderListQuickSearch::sloStatusChanged( int index ) { if ( index == 0 ) - mStatus = 0; + mtqStatus = 0; else - mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] ); + mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] ); updateSearch(); } -void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which) +void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which) { mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ), i18n( KMail::StatusValues[ which ].text ) ); @@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const } -int HeaderListQuickSearch::currenStatus() const +int HeaderListQuickSearch::currentqStatus() const { - return mStatus; + return mtqStatus; } } // namespace KMail diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index ddef0b40b..df326a0ae 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -18,20 +18,20 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef KMAILHEADERLISQUICKSEARCH_H -#define KMAILHEADERLISQUICKSEARCH_H +#ifndef KMAILHEADERLISTQUICKSEARCH_H +#define KMAILHEADERLISTQUICKSEARCH_H -#include "kmmsgbase.h" // for KMMsgStatus +#include "kmmsgbase.h" // for KMMsgtqStatus #include "kmsearchpattern.h" #include <klistviewsearchline.h> #include <tqvaluevector.h> @@ -45,8 +45,9 @@ namespace KMail { class HeaderListQuickSearch : public KListViewSearchLine { Q_OBJECT + TQ_OBJECT public: - HeaderListQuickSearch( TQWidget *parent, + HeaderListQuickSearch( TQWidget *tqparent, KListView *listView, KActionCollection *actionCollection, const char *name = 0 ); @@ -66,7 +67,7 @@ public: /** * Returns the currently selected status filter. */ - int currenStatus() const; + int currentqStatus() const; public slots: void reset(); @@ -76,23 +77,23 @@ signals: protected: /** - * checks whether @param item tqcontains the search string and has the status - * currently in mStatus + * checks whether @param item contains the search string and has the status + * currently in mtqStatus */ virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; private slots: /** - * cache the status in mStatus so as to avoid having to do the comparatively + * cache the status in mtqStatus so as to avoid having to do the comparatively * expensive string comparison for each item in itemMatches */ void sloStatusChanged( int index ); private: /** Helper method for the filling of the status combo. */ - void inserStatus(KMail::StatusValueTypes which); + void insertqStatus(KMail::StatusValueTypes which); TQComboBox *mStatusCombo; - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; TQValueVector<TQString> statusList; mutable TQString mCurrentSearchTerm; }; diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp index 3fed82ab2..99cc4f5f0 100644 --- a/kmail/headerstrategy.cpp +++ b/kmail/headerstrategy.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h index 4f49d5491..ebb610122 100644 --- a/kmail/headerstrategy.h +++ b/kmail/headerstrategy.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 3f3073ef7..0b728444f 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -119,7 +119,7 @@ namespace KMail { const HeaderStrategy * strategy, const TQString & vCardName, bool printing, bool topLevel ) const { Q_UNUSED( topLevel ); - if ( !message ) return TQString::null; + if ( !message ) return TQString(); if ( !strategy ) strategy = HeaderStrategy::brief(); @@ -218,7 +218,7 @@ namespace KMail { const HeaderStrategy * strategy, const TQString & vCardName, bool printing, bool topLevel ) const { Q_UNUSED( topLevel ); - if ( !message ) return TQString::null; + if ( !message ) return TQString(); if ( !strategy ) strategy = HeaderStrategy::rich(); @@ -400,7 +400,7 @@ namespace KMail { meterBar.fill( 22 ); else { meterBar.fill( 21 ); - int max = QMIN( 20, static_cast<int>( percent ) / 5 ); + int max = TQMIN( 20, static_cast<int>( percent ) / 5 ); for ( int i = 0; i < max; ++i ) { meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1], gradient[i][2] ) ); @@ -419,7 +419,7 @@ namespace KMail { const HeaderStrategy * strategy, const TQString & vCardName, bool printing, bool topLevel ) const { Q_UNUSED( topLevel ); - if ( !message ) return TQString::null; + if ( !message ) return TQString(); if ( !strategy ) strategy = HeaderStrategy::rich(); @@ -457,13 +457,13 @@ namespace KMail { } // Spam header display. - // If the spamSpamStatus config value is true then we look for headers + // If the spamSpamtqStatus config value is true then we look for headers // from a few spam filters and try to create visually meaningful graphics // out of the spam scores. TQString spamHTML; - if ( configReader.readBoolEntry( "showSpamStatus", true ) ) { + if ( configReader.readBoolEntry( "showSpamtqStatus", true ) ) { SpamScores scores = SpamHeaderAnalyzer::getSpamScores( message ); for ( SpamScoresIterator it = scores.begin(); it != scores.end(); ++it ) spamHTML += (*it).agent() + " " + @@ -478,7 +478,7 @@ namespace KMail { ::KIMProxy *imProxy = KMKernel::self()->imProxy(); TQString kabcUid; KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) ); + KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); TQString photoURL; int photoWidth = 60; @@ -646,7 +646,7 @@ namespace KMail { // kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl; - TQTime currTime = TQTime::currentTime( Qt::UTC ); + TQTime currTime = TQTime::currentTime( TQt::UTC ); // kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl; @@ -662,7 +662,7 @@ namespace KMail { color = "white"; bg_color = "#000B6B"; bg_image = "url(data:image/png;base64," - "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lEQVQI11WOsRGAQAzDOG/LHoz9" + "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lETQVQI11WOsRGATQAzDOG/LHoz9" "kikIcF+kSBxbPs7LoNGVapAI0Zn+O+8NUwldozn6io7G7kdS/5zi7i+BvUM/5uSXlIfzMHx/bmWR" "k++yj9rZAAAAAElFTkSuQmCC)"; } @@ -671,8 +671,8 @@ namespace KMail { color = "white"; bg_color = "#00A6FF"; bg_image = "url(data:image/png;base64," - "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI122OQQ7DMAzDaP3/dfuO" - "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o" + "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI122OQQ7DMAzDaP3/dfuO" + "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJTQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o" "zu4uSh7kn67/DNv+C4tsZOtjAWEHAAAAAElFTkSuQmCC)"; } else if ( currTime > TQTime( 12, 0, 0 ) && currTime <= TQTime( 18, 0, 0 ) ) { @@ -680,8 +680,8 @@ namespace KMail { color = "black"; bg_color = "#00A6FF"; bg_image = "url(data:image/png;base64," - "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlEQVQI132OwQ0AIAwCSfcfw91c" - "QsCfRm399HFwoWjdDhMICQhxHSWMQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E" + "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlETQVQI132OwQ0AIAwCSfcfw91c" + "QsCfRm399HFwoWjdDhMICQhxHSWMTQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E" "rkJggg==)"; } else { @@ -689,8 +689,8 @@ namespace KMail { color = "white"; bg_color = "#0014CC"; bg_image = "url(data:image/png;base64," - "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI11WOyRHAMAgDNQuUlBrS" - "fyFpAfKwje0PwyEt0vN+hVsJpzS6QML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO" + "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI11WOyRHAMAgDNQuUlBrS" + "fyFpAfKwje0PwyEt0vN+hVsJpzS6TQML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO" "xx7JjrtshlbXlLDSD+WhJ+hwqWo8AAAAAElFTkSuQmCC)"; } @@ -830,8 +830,8 @@ namespace KMail { headerStr.append( TQString( "<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") .arg(i18n("Sender status: ")) - .arg( directionOf( onlineStatus ) ) - .arg(onlineStatus)); + .arg( directionOf( onlinetqStatus ) ) + .arg(onlinetqStatus)); */ headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) ); headerStr.append( @@ -841,7 +841,7 @@ namespace KMail { if ( !spamHTML.isEmpty() ) headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b> <span style=\"padding-left: 20px;\">%3</span></div>\n") - .arg( subjectDir, i18n("Spam Status:"), spamHTML ) ); + .arg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) ); headerStr += "</div>\n\n"; return headerStr; @@ -877,7 +877,7 @@ namespace KMail { TQString EnterpriseHeaderStyle::format( const KMMessage * message, const HeaderStrategy * strategy, const TQString & vCardName, bool printing, bool topLevel ) const { - if ( !message ) return TQString::null; + if ( !message ) return TQString(); if ( !strategy ) strategy = HeaderStrategy::brief(); @@ -899,7 +899,7 @@ namespace KMail { subjectDir = directionOf( i18n("No Subject") ); // colors depend on if its encapsulated or not - TQColor fontColor(Qt::white); + TQColor fontColor(TQt::white); TQString linkColor = "class =\"white\""; const TQColor activeColor = tqApp->palette().active().highlight(); TQColor activeColorDark = activeColor.dark(130); diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h index 2613f6be1..ff7228d32 100644 --- a/kmail/headerstyle.h +++ b/kmail/headerstyle.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index 111ce6cd6..371a48d11 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,8 +48,8 @@ #include <tqcolor.h> #include <tqstring.h> -KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlags f ) - : TQLabel( parent, name, f ), +KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * tqparent, const char * name, WFlags f ) + : TQLabel( tqparent, name, f ), mMode( Normal ) { tqsetAlignment( AlignHCenter|AlignTop ); @@ -96,7 +96,7 @@ TQString KMail::HtmlStatusBar::message() const { "<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>" ); default: case Neutral: - return TQString::null; + return TQString(); } } @@ -114,12 +114,12 @@ TQColor KMail::HtmlStatusBar::fgColor() const { KConfigGroup conf( config(), "Reader" ); switch ( mode() ) { case Html: - return conf.readColorEntry( "ColorbarForegroundHTML", &Qt::white ); + return conf.readColorEntry( "ColorbarForegroundHTML", &TQt::white ); case Normal: - return conf.readColorEntry( "ColorbarForegroundPlain", &Qt::black ); + return conf.readColorEntry( "ColorbarForegroundPlain", &TQt::black ); default: case Neutral: - return Qt::black; + return TQt::black; } } @@ -128,12 +128,12 @@ TQColor KMail::HtmlStatusBar::bgColor() const { switch ( mode() ) { case Html: - return conf.readColorEntry( "ColorbarBackgroundHTML", &Qt::black ); + return conf.readColorEntry( "ColorbarBackgroundHTML", &TQt::black ); case Normal: - return conf.readColorEntry( "ColorbarBackgroundPlain", &Qt::lightGray ); + return conf.readColorEntry( "ColorbarBackgroundPlain", &TQt::lightGray ); default: case Neutral: - return Qt::white; + return TQt::white; } } diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h index dd7da106e..c23193fa9 100644 --- a/kmail/htmlstatusbar.h +++ b/kmail/htmlstatusbar.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -60,8 +60,9 @@ namespace KMail { **/ class HtmlStatusBar : public TQLabel { Q_OBJECT + TQ_OBJECT public: - HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); + HtmlStatusBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); virtual ~HtmlStatusBar(); enum Mode { diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 5c3f7df69..1ec367eee 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -69,7 +69,7 @@ using KMail::FolderRequester; #include <kdebug.h> #include <kpushbutton.h> -// Qt headers: +// TQt headers: #include <tqtabwidget.h> #include <tqlabel.h> #include <tqwhatsthis.h> @@ -89,9 +89,9 @@ using namespace KPIM; namespace KMail { - IdentityDialog::IdentityDialog( TQWidget * parent, const char * name ) + IdentityDialog::IdentityDialog( TQWidget * tqparent, const char * name ) : KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok, - parent, name ) + tqparent, name ) { // tmp. vars: TQWidget * tab; @@ -165,7 +165,7 @@ namespace KMail { label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab ); glay->addWidget( label, row, 0, TQt::AlignTop ); msg = i18n("<qt><h3>Email aliases</h3>" - "<p>This field tqcontains alias addresses that should also " + "<p>This field contains alias addresses that should also " "be considered as belonging to this identity (as opposed " "to representing a different identity).</p>" "<p>Example:</p>" @@ -490,7 +490,7 @@ namespace KMail { TQString DoesntMatchEMailAddress::extractEmail( const char * e ) { if ( !e || !*e ) - return TQString::null; + return TQString(); const TQString em = TQString::fromUtf8( e ); if ( e[0] == '<' ) return em.mid( 1, em.length() - 2 ); @@ -699,14 +699,14 @@ void IdentityDialog::slotOk() { ident.setReplyToAddr( mReplyToEdit->text() ); ident.setBcc( mBccEdit->text() ); ident.setTransport( ( mTransportCheck->isChecked() ) ? - mTransportCombo->currentText() : TQString::null ); + mTransportCombo->currentText() : TQString() ); ident.setDictionary( mDictionaryCombo->currentDictionary() ); ident.setFcc( mFccCombo->folder() ? - mFccCombo->folder()->idString() : TQString::null ); + mFccCombo->folder()->idString() : TQString() ); ident.setDrafts( mDraftsCombo->folder() ? - mDraftsCombo->folder()->idString() : TQString::null ); + mDraftsCombo->folder()->idString() : TQString() ); ident.setTemplates( mTemplatesCombo->folder() ? - mTemplatesCombo->folder()->idString() : TQString::null ); + mTemplatesCombo->folder()->idString() : TQString() ); // "Templates" tab: uint identity = ident.uoid(); TQString iid = TQString("IDENTITY_%1").arg( identity ); diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h index f8e71073c..82bca1c43 100644 --- a/kmail/identitydialog.h +++ b/kmail/identitydialog.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -61,8 +61,9 @@ namespace KMail { class IdentityDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IdentityDialog( TQWidget * parent=0, const char * name = 0 ); + IdentityDialog( TQWidget * tqparent=0, const char * name = 0 ); virtual ~IdentityDialog(); void setIdentity( /*_not_ const*/ KPIM::Identity & ident ); diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp index 855206372..106cb5896 100644 --- a/kmail/identitydrag.cpp +++ b/kmail/identitydrag.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h index f48e1a3c7..a93095ff5 100644 --- a/kmail/identitydrag.h +++ b/kmail/identitydrag.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,6 +43,7 @@ namespace KMail { **/ class IdentityDrag : public TQDragObject { Q_OBJECT + TQ_OBJECT public: IdentityDrag( const KPIM::Identity & ident, TQWidget * dragSource=0, const char * name=0 ); @@ -50,7 +51,7 @@ namespace KMail { public: virtual ~IdentityDrag() {} - const char * format( int i ) const; // reimp. QMimeSource + const char * format( int i ) const; // reimp. TQMimeSource TQByteArray tqencodedData( const char * mimetype ) const; // dto. static bool canDecode( const TQMimeSource * e ); diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index d40673800..319bd32a8 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,13 +52,13 @@ namespace KMail { // // - IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident ) - : KListViewItem( parent ), mUOID( ident.uoid() ) { + IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident ) + : KListViewItem( tqparent ), mUOID( ident.uoid() ) { init( ident ); } - IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident ) - : KListViewItem( parent, after ), mUOID( ident.uoid() ) { + IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident ) + : KListViewItem( tqparent, after ), mUOID( ident.uoid() ) { init( ident ); } @@ -95,8 +95,8 @@ namespace KMail { // // - IdentityListView::IdentityListView( TQWidget * parent, const char * name ) - : KListView( parent, name ) + IdentityListView::IdentityListView( TQWidget * tqparent, const char * name ) + : KListView( tqparent, name ) { setFullWidth( true ); setDragEnabled( true ); diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index 556132bf5..b2c48418e 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,7 +36,7 @@ namespace KPIM { class Identity; } class TQDropEvent; -class QDragEvent; +class TQDragEvent; namespace KMail { @@ -47,9 +47,9 @@ namespace KMail { **/ class IdentityListViewItem : public KListViewItem { public: - IdentityListViewItem( IdentityListView * parent, + IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident ); - IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, + IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident ); uint uoid() const { return mUOID; } @@ -68,8 +68,9 @@ namespace KMail { **/ class IdentityListView : public KListView { Q_OBJECT + TQ_OBJECT public: - IdentityListView( TQWidget * parent=0, const char * name=0 ); + IdentityListView( TQWidget * tqparent=0, const char * name=0 ); virtual ~IdentityListView() {} public slots: diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 01e1324c8..04dc29332 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -32,7 +32,7 @@ using KMail::SieveConfig; using KMail::AccountManager; #include "kmfolder.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmmainwin.h" #include "kmfolderimap.h" #include "kmmainwidget.h" @@ -79,8 +79,8 @@ namespace KMail { // // - ImapAccountBase::ImapAccountBase( AccountManager * parent, const TQString & name, uint id ) - : NetworkAccount( parent, name, id ), + ImapAccountBase::ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id ) + : NetworkAccount( tqparent, name, id ), mIdleTimer( 0, "mIdleTimer" ), mNoopTimer( 0, "mNoopTimer" ), mTotal( 0 ), @@ -301,7 +301,7 @@ namespace KMail { if (ret != TQDialog::Accepted ) { mPasswordDialogIsActive = false; mAskAgain = false; - emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null ); + emit connectionResult( KIO::ERR_USER_CANCELED, TQString() ); return Error; } mPasswordDialogIsActive = false; @@ -354,7 +354,7 @@ namespace KMail { checkDone( false, CheckOK ); } if ( showStatusMsg ) - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( name(), newMails); } @@ -412,19 +412,19 @@ namespace KMail { } //----------------------------------------------------------------------------- - // TODO imapPath can be removed once parent can be a KMFolderImapBase or whatever - void ImapAccountBase::getUserRights( KMFolder* parent, const TQString& imapPath ) + // TODO imapPath can be removed once tqparent can be a KMFolderImapBase or whatever + void ImapAccountBase::getUserRights( KMFolder* tqparent, const TQString& imapPath ) { // 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 apparently + // even after a SETACL that removes the admin permissions. Other imap servers aptqparently // don't even allow removing one's own admin permission, so this code won't hurt either). if ( imapPath == "/INBOX/" ) { - if ( parent->folderType() == KMFolderTypeImap ) - static_cast<KMFolderImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); - else if ( parent->folderType() == KMFolderTypeCachedImap ) - static_cast<KMFolderCachedImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); - emit receivedUserRights( parent ); // warning, you need to connect first to get that one + if ( tqparent->folderType() == KMFolderTypeImap ) + static_cast<KMFolderImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); + else if ( tqparent->folderType() == KMFolderTypeCachedImap ) + static_cast<KMFolderCachedImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok ); + emit receivedUserRights( tqparent ); // warning, you need to connect first to get that one return; } @@ -433,7 +433,7 @@ namespace KMail { ACLJobs::GetUserRightsJob* job = ACLJobs::getUserRights( mSlave, url ); - jobData jd( url.url(), parent ); + jobData jd( url.url(), tqparent ); jd.cancellable = true; insertJob(job, jd); @@ -447,7 +447,7 @@ namespace KMail { JobIterator it = findJob( job ); if ( it == jobsEnd() ) return; - KMFolder* folder = (*it).parent; + KMFolder* folder = (*it).tqparent; if ( job->error() ) { if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs mACLSupport = false; @@ -471,13 +471,13 @@ namespace KMail { } //----------------------------------------------------------------------------- - void ImapAccountBase::getACL( KMFolder* parent, const TQString& imapPath ) + void ImapAccountBase::getACL( KMFolder* tqparent, const TQString& imapPath ) { KURL url = getUrl(); url.setPath(imapPath); ACLJobs::GetACLJob* job = ACLJobs::getACL( mSlave, url ); - jobData jd( url.url(), parent ); + jobData jd( url.url(), tqparent ); jd.cancellable = true; insertJob(job, jd); @@ -491,21 +491,21 @@ namespace KMail { JobIterator it = findJob( job ); if ( it == jobsEnd() ) return; - KMFolder* folder = (*it).parent; + KMFolder* folder = (*it).tqparent; emit receivedACL( folder, job, job->entries() ); if (mSlave) removeJob(job); } //----------------------------------------------------------------------------- - // Do not remove imapPath, FolderDiaQuotaTab needs to call this with parent==0. - void ImapAccountBase::getStorageQuotaInfo( KMFolder* parent, const TQString& imapPath ) + // Do not remove imapPath, FolderDiaQuotaTab needs to call this with tqparent==0. + void ImapAccountBase::getStorageQuotaInfo( KMFolder* tqparent, const TQString& imapPath ) { if ( !mSlave ) return; KURL url = getUrl(); url.setPath(imapPath); QuotaJobs::GetStorageQuotaJob* job = QuotaJobs::getStorageQuota( mSlave, url ); - jobData jd( url.url(), parent ); + jobData jd( url.url(), tqparent ); jd.cancellable = true; insertJob(job, jd); @@ -521,7 +521,7 @@ namespace KMail { if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION ) setHasNoQuotaSupport(); - KMFolder* folder = (*it).parent; // can be 0 + KMFolder* folder = (*it).tqparent; // can be 0 emit receivedStorageQuotaInfo( folder, job, job->storageQuotaInfo() ); if (mSlave) removeJob(job); } @@ -570,7 +570,7 @@ namespace KMail { const TQString &errorMsg) { if (aSlave != mSlave) return; - handleError( errorCode, errorMsg, 0, TQString::null, true ); + handleError( errorCode, errorMsg, 0, TQString(), true ); if ( mAskAgain ) if ( makeConnection() != ImapAccountBase::Error ) return; @@ -593,7 +593,7 @@ namespace KMail { if (aSlave != mSlave) return; mSlaveConnected = true; mNoopTimer.start( 60000 ); // make sure we start sending noops - emit connectionResult( 0, TQString::null ); // success + emit connectionResult( 0, TQString() ); // success if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), @@ -643,7 +643,7 @@ namespace KMail { jd.progressItem = ProgressManager::createProgressItem( ProgressManager::getUniqueID(), i18n("Retrieving Namespaces"), - TQString::null, true, useSSL() || useTLS() ); + TQString(), true, useSSL() || useTLS() ); jd.progressItem->setTotalItems( 1 ); connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), @@ -737,7 +737,7 @@ namespace KMail { "configuration of the account \"%1\" which is obsolete with the " "support of IMAP namespaces.").arg( name() ); if ( list.tqcontains( "" ) ) { - // tqreplace empty entry with the old prefix + // replace empty entry with the old prefix list.remove( "" ); list += mOldPrefix; mNamespaces[PersonalNS] = list; @@ -746,11 +746,11 @@ namespace KMail { mNamespaceToDelimiter.remove( "" ); mNamespaceToDelimiter[mOldPrefix] = delim; } - kdDebug(5006) << "migratePrefix - tqreplaced empty with " << mOldPrefix << endl; + kdDebug(5006) << "migratePrefix - replaced empty with " << mOldPrefix << endl; msg += i18n("The configuration was automatically migrated but you should check " "your account configuration."); } else if ( list.count() == 1 ) { - // only one entry in the personal namespace so tqreplace it + // only one entry in the personal namespace so replace it TQString old = list.first(); list.clear(); list += mOldPrefix; @@ -760,7 +760,7 @@ namespace KMail { mNamespaceToDelimiter.remove( old ); mNamespaceToDelimiter[mOldPrefix] = delim; } - kdDebug(5006) << "migratePrefix - tqreplaced single with " << mOldPrefix << endl; + kdDebug(5006) << "migratePrefix - replaced single with " << mOldPrefix << endl; msg += i18n("The configuration was automatically migrated but you should check " "your account configuration."); } else { @@ -799,12 +799,12 @@ namespace KMail { ns = ns.left( ns.length()-1 ); } // first ignore an empty prefix as it would match always - if ( !ns.isEmpty() && path.find( ns ) != -1 ) { + if ( !ns.isEmpty() && path.tqfind( ns ) != -1 ) { return (*strit); } } } - return TQString::null; + return TQString(); } //----------------------------------------------------------------------------- @@ -820,7 +820,7 @@ namespace KMail { // exclude empty namespace for ( namespaceDelim::ConstIterator it = mNamespaceToDelimiter.begin(); it != mNamespaceToDelimiter.end(); ++it ) { - // the namespace definition sometimes tqcontains the delimiter + // the namespace definition sometimes contains the delimiter // make sure we also match this version TQString stripped = it.key().left( it.key().length() - 1 ); if ( !it.key().isEmpty() && @@ -835,7 +835,7 @@ namespace KMail { } // well, we tried //kdDebug(5006) << "delimiterForNamespace - not found" << endl; - return TQString::null; + return TQString(); } //----------------------------------------------------------------------------- @@ -858,7 +858,7 @@ namespace KMail { } if (job->error()) { if (!quiet) - handleJobError(job, TQString::null ); + handleJobError(job, TQString() ); else { if ( job->error() == KIO::ERR_CONNECTION_BROKEN && slave() ) { // make sure ERR_CONNECTION_BROKEN is properly handled and the slave @@ -894,13 +894,13 @@ namespace KMail { TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job ) { TQString error = _error; - if ( error.find( "quota", 0, false ) == -1 ) return error; + if ( error.tqfind( "quota", 0, false ) == -1 ) return error; // this is a quota error, prettify it a bit JobIterator it = findJob( job ); TQString quotaAsString( i18n("No detailed quota information available.") ); bool readOnly = false; if (it != mapJobData.end()) { - const KMFolder * const folder = (*it).parent; + const KMFolder * const folder = (*it).tqparent; if( !folder ) return _error; const KMFolderCachedImap * const imap = dynamic_cast<const KMFolderCachedImap*>( folder->storage() ); if ( imap ) { @@ -961,10 +961,10 @@ namespace KMail { KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" ); // Show it in the status bar, in case the user has ticked "don't show again" if ( errorCode == KIO::ERR_CONNECTION_BROKEN ) - KPIM::BroadcasStatus::instance()->seStatusMsg( + KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "The connection to account %1 was broken." ).arg( name() ) ); else if ( errorCode == KIO::ERR_SERVER_TIMEOUT ) - KPIM::BroadcasStatus::instance()->seStatusMsg( + KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "The connection to account %1 timed out." ).arg( name() ) ); } else { if ( !errors.isEmpty() ) @@ -1031,9 +1031,9 @@ namespace KMail { mCheckingSingleFolder = ( type == Single ); if ( checkingMail() ) { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); - connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); } else { slotCheckQueuedFolders(); @@ -1043,7 +1043,7 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::slotCheckQueuedFolders() { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders; @@ -1109,7 +1109,7 @@ namespace KMail { // more than 50% of the parts have to be loaded anyway so it is faster // to load the message completely kdDebug(5006) << "Falling back to normal mode" << endl; - FolderJob *job = msg->parent()->createJob( + FolderJob *job = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0, "TEXT" ); job->start(); return; @@ -1123,14 +1123,14 @@ namespace KMail { if ( part->loadHeaders() ) { kdDebug(5006) << "load HEADER" << endl; - FolderJob *job = msg->parent()->createJob( + FolderJob *job = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0, part->partSpecifier()+".MIME" ); job->start(); } if ( part->loadPart() ) { kdDebug(5006) << "load Part" << endl; - FolderJob *job = msg->parent()->createJob( + FolderJob *job = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0, part->partSpecifier() ); job->start(); } @@ -1138,26 +1138,26 @@ namespace KMail { } //----------------------------------------------------------------------------- - void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, - DwBodyPart * parent, const DwMessage * dwmsg ) + void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart, + DwBodyPart * tqparent, const DwMessage * dwmsg ) { - int children; + int tqchildren; for (int i = 0; i < count; i++) { - stream >> children; + stream >> tqchildren; KMMessagePart* part = new KMMessagePart( stream ); - part->setParent( parentKMPart ); + part->setParent( tqparentKMPart ); mBodyPartList.append( part ); kdDebug(5006) << "ImapAccountBase::constructParts - created id " << part->partSpecifier() << " of type " << part->originalContentTypeStr() << endl; DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part ); - if ( parent ) + if ( tqparent ) { - // add to parent body - parent->Body().AddBodyPart( dwpart ); + // add to tqparent body + tqparent->Body().AddBodyPart( dwpart ); dwpart->Parse(); -// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent +// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent // << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl; } else if ( part->partSpecifier() != "0" && !part->partSpecifier().endsWith(".HEADER") ) @@ -1165,39 +1165,39 @@ namespace KMail { // add to message dwmsg->Body().AddBodyPart( dwpart ); dwpart->Parse(); -// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent +// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent // << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl; } else dwpart = 0; - if ( !parentKMPart ) - parentKMPart = part; + if ( !tqparentKMPart ) + tqparentKMPart = part; - if (children > 0) + if (tqchildren > 0) { - DwBodyPart* newparent = dwpart; + DwBodyPart* newtqparent = dwpart; const DwMessage* newmsg = dwmsg; if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart && dwpart->Body().Message() ) { // set the encapsulated message as the new message - newparent = 0; + newtqparent = 0; newmsg = dwpart->Body().Message(); } KMMessagePart* newParentKMPart = part; - if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent - newParentKMPart = parentKMPart; + if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent + newParentKMPart = tqparentKMPart; - constructParts( stream, children, newParentKMPart, newparent, newmsg ); + constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg ); } } } //----------------------------------------------------------------------------- - void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) + void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) { // set the status on the server, the uids are integrated in the path - kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl; + kdDebug(5006) << "setImaptqStatus path=" << path << " to: " << flags << endl; KURL url = getUrl(); url.setPath(path); @@ -1218,7 +1218,7 @@ namespace KMail { TQT_SLOT(slotSeStatusResult(KIO::Job *))); } - void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen) + void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen) { KURL url = getUrl(); url.setPath(path); @@ -1246,16 +1246,16 @@ namespace KMail { ImapAccountBase::JobIterator it = findJob(job); if ( it == jobsEnd() ) return; int errorCode = job->error(); - KMFolder * const parent = (*it).parent; + KMFolder * const tqparent = (*it).tqparent; const TQString path = (*it).path; if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING) { bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' ); - emit imapStatusChanged( parent, path, cont ); + emit imapStatusChanged( tqparent, path, cont ); } else { - emit imapStatusChanged( parent, path, true ); + emit imapStatusChanged( tqparent, path, true ); removeJob(it); } } @@ -1370,11 +1370,11 @@ namespace KMail { } //------------------------------------------------------------------------------ - TQString ImapAccountBase::createImapPath( const TQString& parent, + TQString ImapAccountBase::createImapPath( const TQString& tqparent, const TQString& folderName ) { - kdDebug(5006) << "createImapPath parent="<<parent<<", folderName="<<folderName<<endl; - TQString newName = parent; + kdDebug(5006) << "createImapPath tqparent="<<tqparent<<", folderName="<<folderName<<endl; + TQString newName = tqparent; // strip / at the end if ( newName.endsWith("/") ) { newName = newName.left( newName.length() - 1 ); @@ -1399,14 +1399,14 @@ namespace KMail { } //------------------------------------------------------------------------------ - TQString ImapAccountBase::createImapPath( FolderStorage* parent, + TQString ImapAccountBase::createImapPath( FolderStorage* tqparent, const TQString& folderName ) { TQString path; - if ( parent->folderType() == KMFolderTypeImap ) { - path = static_cast<KMFolderImap*>( parent )->imapPath(); - } else if ( parent->folderType() == KMFolderTypeCachedImap ) { - path = static_cast<KMFolderCachedImap*>( parent )->imapPath(); + if ( tqparent->folderType() == KMFolderTypeImap ) { + path = static_cast<KMFolderImap*>( tqparent )->imapPath(); + } else if ( tqparent->folderType() == KMFolderTypeCachedImap ) { + path = static_cast<KMFolderCachedImap*>( tqparent )->imapPath(); } else { // error return path; @@ -1418,7 +1418,7 @@ namespace KMail { bool ImapAccountBase::locallySubscribedTo( const TQString& imapPath ) { - return mLocalSubscriptionBlackList.find( imapPath ) == mLocalSubscriptionBlackList.end(); + return mLocalSubscriptionBlackList.tqfind( imapPath ) == mLocalSubscriptionBlackList.end(); } void ImapAccountBase::changeLocalSubscription( const TQString& imapPath, bool subscribe ) diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 0795eb2ab..eee46417d 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -58,8 +58,9 @@ namespace KMail { class ImapAccountBase : public KMail::NetworkAccount { Q_OBJECT + TQ_OBJECT protected: - ImapAccountBase( AccountManager * parent, const TQString & name, uint id ); + ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id ); public: virtual ~ImapAccountBase(); @@ -141,13 +142,13 @@ namespace KMail { struct jobData { // Needed by TQMap, don't use - jobData() : url(TQString::null), parent(0), current(0), total(1), done(0), offset(0), progressItem(0), + jobData() : url(TQString()), tqparent(0), current(0), total(1), done(0), offset(0), progressItem(0), onlySubscribed(false), quiet(false), cancellable(false) {} // Real constructor - jobData( const TQString& _url, KMFolder *_parent = 0, + jobData( const TQString& _url, KMFolder *_tqparent = 0, int _total = 1, int _done = 0, bool _quiet = false, bool _cancelable = false ) - : url(_url), parent(_parent), current(0), total(_total), done(_done), offset(0), + : url(_url), tqparent(_tqparent), current(0), total(_total), done(_done), offset(0), progressItem(0), quiet(_quiet), cancellable(_cancelable) {} TQString path; @@ -156,7 +157,7 @@ namespace KMail { TQByteArray data; TQCString cdata; TQStringList items; - KMFolder *parent, *current; + KMFolder *tqparent, *current; TQPtrList<KMMessage> msgList; int total, done, offset; KPIM::ProgressItem *progressItem; @@ -173,7 +174,7 @@ namespace KMail { /** * Look for the jobData related to a given job. Compare with end() */ - JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); } + JobIterator findJob( KIO::Job* job ) { return mapJobData.tqfind( job ); } JobIterator jobsEnd() { return mapJobData.end(); } /** * Call this when a job is finished. @@ -230,13 +231,13 @@ namespace KMail { * Set the status on the server * Emits imapStatusChanged signal on success/error. */ - void setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags ); + void setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ); /** * Set seen status on the server. * Emits imapStatusChanged signal on success/error. */ - void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen ); + void setImapSeentqStatus( KMFolder* folder, const TQString& path, bool seen ); /** * The KIO-Slave died @@ -400,16 +401,16 @@ namespace KMail { return mCapabilities.tqcontains( capa ); } /** - * Create an IMAP path for a parent folder and a foldername + * Create an IMAP path for a tqparent folder and a foldername * Parent and folder are separated with the delimiter of the account * The path starts and ends with '/' */ - TQString createImapPath( FolderStorage* parent, const TQString& folderName ); + TQString createImapPath( FolderStorage* tqparent, const TQString& folderName ); /** - * Create an IMAP path for a parent imapPath and a folderName + * Create an IMAP path for a tqparent imapPath and a folderName */ - TQString createImapPath( const TQString& parent, const TQString& folderName ); + TQString createImapPath( const TQString& tqparent, const TQString& folderName ); public slots: @@ -509,8 +510,8 @@ namespace KMail { /** * Build KMMessageParts and DwBodyParts from the bodystructure-stream */ - void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, - DwBodyPart * parent, const DwMessage * dwmsg ); + void constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart, + DwBodyPart * tqparent, const DwMessage * dwmsg ); /** Migrate the prefix */ void migratePrefix(); @@ -590,13 +591,13 @@ namespace KMail { /** * Emitted when changeSubscription() failed. - * @param errorMessage the error message that tqcontains the reason for the failure + * @param errorMessage the error message that contains the reason for the failure */ void subscriptionChangeFailed( const TQString &errorMessage ); /** * Emitted upon completion of the job for setting the status for a group of UIDs, - * as a result of a setImapStatus call. + * as a result of a setImaptqStatus call. * On error, if the user chooses abort (not continue), cont is set to false. */ void imapStatusChanged( KMFolder*, const TQString& imapPath, bool cont ); diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index b76c6d2cc..fe773a9dc 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, if (folder) { folder->open("imapjobdest"); } - KMFolder *msg_parent = msg->parent(); - if (msg_parent) { - msg_parent->open("imapjobsrc"); + KMFolder *msg_tqparent = msg->tqparent(); + if (msg_tqparent) { + msg_tqparent->open("imapjobsrc"); } - mSrcFolder = msg_parent; + mSrcFolder = msg_tqparent; // If there is a destination folder, this is a copy, move or put to an // imap folder, use its account for keeping track of the job. Otherwise, // this is a get job and the src folder is an imap one. Use its account @@ -99,8 +99,8 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, if (folder) { account = folder->account(); } else { - if ( msg_parent && msg_parent->storage() ) - account = static_cast<KMFolderImap*>(msg_parent->storage())->account(); + if ( msg_tqparent && msg_tqparent->storage() ) + account = static_cast<KMFolderImap*>(msg_tqparent->storage())->account(); } if ( !account || account->makeConnection() == ImapAccountBase::Error ) { @@ -118,21 +118,21 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, ++it; if ( mSrcFolder && !curMsg->isMessage() ) { - int idx = mSrcFolder->find( curMsg ); + int idx = mSrcFolder->tqfind( curMsg ); curMsg = mSrcFolder->getMsg( idx ); } KURL url = account->getUrl(); TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() ); url.setPath( folder->imapPath() + ";SECTION=" + flags ); ImapAccountBase::jobData jd; - jd.parent = 0; jd.offset = 0; jd.done = 0; + jd.tqparent = 0; jd.offset = 0; jd.done = 0; jd.total = ( curMsg->msgSizeServer() > 0 ) ? curMsg->msgSizeServer() : curMsg->msgSize(); jd.msgList.append( curMsg ); TQCString cstr( curMsg->asString() ); - int a = cstr.find("\nX-UID: "); - int b = cstr.find('\n', a); - if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a); + int a = cstr.tqfind("\nX-UID: "); + int b = cstr.tqfind('\n', a); + if (a != -1 && b != -1 && cstr.tqfind("\n\n") > a) cstr.remove(a, b-a); jd.data.resize( cstr.length() + cstr.tqcontains( "\n" ) - cstr.tqcontains( "\r\n" ) ); unsigned int i = 0; char prevChar = '\0'; @@ -175,10 +175,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, KURL url = account->getUrl(); KURL destUrl = account->getUrl(); destUrl.setPath(folder->imapPath()); - KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_parent->storage()); + KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_tqparent->storage()); url.setPath( imapDestFolder->imapPath() + ";UID=" + sets ); ImapAccountBase::jobData jd; - jd.parent = 0; jd.offset = 0; + jd.tqparent = 0; jd.offset = 0; jd.total = 1; jd.done = 0; jd.msgList = msgList; @@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, "ImapJobCopyMove"+ProgressManager::getUniqueID(), i18n("Server operation"), i18n("Source folder: %1 - Destination folder: %2") - .arg( TQStyleSheet::escape( msg_parent->prettyURL() ), + .arg( TQStyleSheet::escape( msg_tqparent->prettyURL() ), TQStyleSheet::escape( mDestFolder->prettyURL() ) ), true, account->useSSL() || account->useTLS() ); @@ -285,12 +285,12 @@ void ImapJob::slotGetNextMessage() KURL url = account->getUrl(); TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID()); ImapAccountBase::jobData jd; - jd.parent = 0; jd.offset = 0; + jd.tqparent = 0; jd.offset = 0; jd.total = 1; jd.done = 0; jd.msgList.append( msg ); if ( !mPartSpecifier.isEmpty() ) { - if ( mPartSpecifier.find ("STRUCTURE", 0, false) != -1 ) { + if ( mPartSpecifier.tqfind ("STRUCTURE", 0, false) != -1 ) { path += ";SECTION=STRUCTURE"; } else if ( mPartSpecifier == "HEADER" ) { path += ";SECTION=HEADER"; @@ -325,7 +325,7 @@ void ImapJob::slotGetNextMessage() KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); mJob = simpleJob; account->insertJob( mJob, jd ); - if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 ) + if ( mPartSpecifier.tqfind( "STRUCTURE", 0, false ) != -1 ) { connect( mJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) ); @@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage() void ImapJob::slotGetMessageResult( KIO::Job * job ) { KMMessage *msg = mMsgList.first(); - if (!msg || !msg->parent() || !job) { + if (!msg || !msg->tqparent() || !job) { emit messageRetrieved( 0 ); deleteLater(); return; } - KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage()); + KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage()); if (msg->transferInProgress()) msg->setTransferInProgress( false ); - KMAcctImap *account = parent->account(); + KMAcctImap *account = tqparent->account(); if ( !account ) { emit messageRetrieved( 0 ); deleteLater(); @@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) { TQString errorStr = i18n( "Error while retrieving messages from the server." ); if ( (*it).progressItem ) - (*it).progressItem->seStatus( errorStr ); + (*it).progressItem->setqStatus( errorStr ); account->handleJobError( job, errorStr ); return; } else { @@ -397,10 +397,10 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) // During the construction of the message from the byteArray it does // not have a uid. Therefore we have to make sure that no connected // slots are called, since they would operate on uid == 0. - msg->parent()->storage()->blockSignals( true ); + msg->tqparent()->storage()->blockSignals( true ); msg->fromByteArray( (*it).data ); // now let others react - msg->parent()->storage()->blockSignals( false ); + msg->tqparent()->storage()->blockSignals( false ); if ( size > 0 && msg->msgSizeServer() == 0 ) { msg->setMsgSizeServer(size); } @@ -447,9 +447,9 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) /* we got an answer but not data * this means that the msg is not on the server anymore so delete it */ emit messageRetrieved( 0 ); - parent->ignoreJobsForMessage( msg ); - int idx = parent->find( msg ); - if (idx != -1) parent->removeMsg( idx, true ); + tqparent->ignoreJobsForMessage( msg ); + int idx = tqparent->tqfind( msg ); + if (idx != -1) tqparent->removeMsg( idx, true ); // the removeMsg will unGet the message, which will delete all // jobs, including this one return; @@ -464,14 +464,14 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) void ImapJob::slotGetBodyStructureResult( KIO::Job * job ) { KMMessage *msg = mMsgList.first(); - if (!msg || !msg->parent() || !job) { + if (!msg || !msg->tqparent() || !job) { deleteLater(); return; } - KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage()); + KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage()); if (msg->transferInProgress()) msg->setTransferInProgress( false ); - KMAcctImap *account = parent->account(); + KMAcctImap *account = tqparent->account(); if ( !account ) { deleteLater(); return; @@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job ) if (job->error()) { if ( (*it).progressItem ) - (*it).progressItem->seStatus( i18n("Uploading message data failed.") ); + (*it).progressItem->setqStatus( i18n("Uploading message data failed.") ); account->handlePutError( job, *it, mDestFolder ); return; } else { if ( (*it).progressItem ) - (*it).progressItem->seStatus( i18n("Uploading message data completed.") ); + (*it).progressItem->setqStatus( i18n("Uploading message data completed.") ); if ( mParentProgressItem ) { mParentProgressItem->incCompletedItems(); @@ -583,7 +583,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data) ImapAccountBase::JobIterator it = account->findJob( job ); if ( it == account->jobsEnd() ) return; - if (data.find("UID") != -1) + if (data.tqfind("UID") != -1) { // split TQString oldUid = data.section(' ', 1, 1); @@ -622,7 +622,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data) ImapAccountBase::JobIterator it = account->findJob( job ); if ( it == account->jobsEnd() ) return; - if ( data.find("UID") != -1 ) + if ( data.tqfind("UID") != -1 ) { ulong uid = ( data.right(data.length()-4) ).toInt(); if ( !(*it).msgList.isEmpty() ) @@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job ) mErrorCode = job->error(); TQString errStr = i18n("Error while copying messages."); if ( (*it).progressItem ) - (*it).progressItem->seStatus( errStr ); + (*it).progressItem->setqStatus( errStr ); if ( account->handleJobError( job, errStr ) ) deleteLater(); return; @@ -678,9 +678,9 @@ void ImapJob::execute() } //----------------------------------------------------------------------------- -void ImapJob::setParentFolder( const KMFolderImap* parent ) +void ImapJob::setParentFolder( const KMFolderImap* tqparent ) { - mParentFolder = const_cast<KMFolderImap*>( parent ); + mParentFolder = const_cast<KMFolderImap*>( tqparent ); } //----------------------------------------------------------------------------- @@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed) if (!msg || !job) { return; } - KMFolderImap* parent = 0; - if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap ) - parent = static_cast<KMFolderImap*>(msg->parent()->storage()); + KMFolderImap* tqparent = 0; + if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap ) + tqparent = static_cast<KMFolderImap*>(msg->tqparent()->storage()); else if (mDestFolder) // put - parent = static_cast<KMFolderImap*>(mDestFolder->storage()); - if (!parent) return; - KMAcctImap *account = parent->account(); + tqparent = static_cast<KMFolderImap*>(mDestFolder->storage()); + if (!tqparent) return; + KMAcctImap *account = tqparent->account(); if ( !account ) return; ImapAccountBase::JobIterator it = account->findJob( job ); if ( it == account->jobsEnd() ) return; diff --git a/kmail/imapjob.h b/kmail/imapjob.h index 94be48d14..55aa02ddb 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -54,17 +54,18 @@ class AttachmentStrategy; class ImapJob : public FolderJob { Q_OBJECT + TQ_OBJECT friend class ::KMAcctImap; public: ImapJob( KMMessage *msg, JobType jt = tGetMessage, KMFolderImap *folder = 0, - TQString partSpecifier = TQString::null, const AttachmentStrategy *as = 0 ); + TQString partSpecifier = TQString(), const AttachmentStrategy *as = 0 ); ImapJob( TQPtrList<KMMessage>& msgList, TQString sets, JobType jt = tGetMessage, KMFolderImap *folder = 0 ); virtual ~ImapJob(); - void setParentFolder( const KMFolderImap* parent ); - KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; } + void setParentFolder( const KMFolderImap* tqparent ); + KPIM::ProgressItem* tqparentProgressItem() const { return mParentProgressItem; } void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; } private slots: diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp index b446ba0b1..e820f1139 100644 --- a/kmail/importarchivedialog.cpp +++ b/kmail/importarchivedialog.cpp @@ -32,11 +32,11 @@ using namespace KMail; -ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags ) - : KDialogBase( parent, "import_archive_dialog", false, i18n( "Import Archive" ), +ImportArchiveDialog::ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags ) + : KDialogBase( tqparent, "import_archive_dialog", false, i18n( "Import Archive" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), - mParentWidget( parent ) + mParentWidget( tqparent ) { setWFlags( flags ); TQWidget *mainWidget = new TQWidget( this ); @@ -48,7 +48,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla int row = 0; // TODO: Explaination label - // TODO: Use QFormLayout in KDE4 + // TODO: Use TQFormLayout in KDE4 // TODO: better label for "Ok" button TQLabel *folderLabel = new TQLabel( i18n( "&Folder:" ), mainWidget ); diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h index 0b04d9b84..f8c15bab4 100644 --- a/kmail/importarchivedialog.h +++ b/kmail/importarchivedialog.h @@ -32,10 +32,11 @@ class FolderRequester; class ImportArchiveDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags ); + ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags ); void setFolder( KMFolder *defaultFolder ); protected slots: diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index cddf6a65e..f7c44d19d 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -106,12 +106,12 @@ void KMail::ImportJob::abort( const TQString &errorMessage ) deleteLater(); } -KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions ) +KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ) { - KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(), + KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(), KMFolderTypeMaildir ); if ( !newFolder ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparent->name() ) ); return 0; } else { @@ -131,7 +131,7 @@ void KMail::ImportJob::enqueueMessages( const KArchiveDirectory *dir, KMFolder * const KArchiveDirectory *messageDir = dynamic_cast<const KArchiveDirectory*>( dir->entry( "cur" ) ); if ( messageDir ) { Messages messagesToQueue; - messagesToQueue.parent = folder; + messagesToQueue.tqparent = folder; const TQStringList entries = messageDir->entries(); for ( uint i = 0; i < entries.size(); i++ ) { const KArchiveEntry *entry = messageDir->entry( entries[i] ); @@ -199,7 +199,7 @@ void KMail::ImportJob::importNextMessage() return; } - KMFolder *folder = messages.parent; + KMFolder *folder = messages.tqparent; if ( folder != mCurrentFolder ) { kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl; if ( mCurrentFolder ) { @@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage() return; } kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl; - mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) ); + mProgressItem->setqStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage() messages.files.removeFirst(); mCurrentMessage = new KMMessage(); - mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ ); + mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setqStatus */ ); int retIndex; // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is @@ -273,26 +273,26 @@ static TQString folderNameForDirectoryName( const TQString &dirName ) Q_ASSERT( dirName.startsWith( "." ) ); const TQString end = ".directory"; const int expectedIndex = dirName.length() - end.length(); - if ( dirName.lower().find( end ) != expectedIndex ) + if ( dirName.lower().tqfind( end ) != expectedIndex ) return TQString(); TQString returnName = dirName.left( dirName.length() - end.length() ); returnName = returnName.right( returnName.length() - 1 ); return returnName; } -KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, +KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, mode_t subFolderPermissions ) { - if ( !parentFolder->createChildFolder() ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) ); + if ( !tqparentFolder->createChildFolder() ) { + abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparentFolder->name() ) ); return 0; } KMFolder *subFolder = 0; - subFolder = dynamic_cast<KMFolder*>( parentFolder->child()->hasNamedFolder( subFolderName ) ); + subFolder = dynamic_cast<KMFolder*>( tqparentFolder->child()->hasNamedFolder( subFolderName ) ); if ( !subFolder ) { - subFolder = createSubFolder( parentFolder, subFolderName, subFolderPermissions ); + subFolder = createSubFolder( tqparentFolder, subFolderName, subFolderPermissions ); } return subFolder; } @@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory() } Folder folder = mQueuedDirectories.first(); - KMFolder *currentFolder = folder.parent; + KMFolder *currentFolder = folder.tqparent; mQueuedDirectories.pop_front(); kdDebug(5006) << "importNextDirectory(): Working on directory " << folder.archiveDir->name() << endl; @@ -343,7 +343,7 @@ void KMail::ImportJob::importNextDirectory() Folder newFolder; newFolder.archiveDir = dir; - newFolder.parent = subFolder; + newFolder.tqparent = subFolder; kdDebug(5006) << "Enqueueing directory " << entry->name() << endl; mQueuedDirectories.push_back( newFolder ); } @@ -388,7 +388,7 @@ void KMail::ImportJob::start() Folder nextFolder; nextFolder.archiveDir = mArchive->directory(); - nextFolder.parent = mRootFolder; + nextFolder.tqparent = mRootFolder; mQueuedDirectories.push_back( nextFolder ); importNextDirectory(); } diff --git a/kmail/importjob.h b/kmail/importjob.h index 170441415..ddb009113 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -52,6 +52,7 @@ namespace KMail class ImportJob : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -71,13 +72,13 @@ class ImportJob : public TQObject struct Folder { - KMFolder *parent; + KMFolder *tqparent; const KArchiveDirectory *archiveDir; }; struct Messages { - KMFolder *parent; + KMFolder *tqparent; TQPtrList<KArchiveFile> files; }; @@ -85,8 +86,8 @@ class ImportJob : public TQObject void abort( const TQString &errorMessage ); void queueFolders(); void importNextDirectory(); - KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions ); - KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName, + KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions ); + KMFolder* getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName, mode_t subFolderPermissions ); void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder ); void messageAdded(); @@ -101,11 +102,11 @@ class ImportJob : public TQObject KURL mArchiveFile; int mNumberOfImportedMessages; - // List of archive folders with their corresponding KMail parent folder that are awaiting + // List of archive folders with their corresponding KMail tqparent folder that are awaiting // processing TQValueList<Folder> mQueuedDirectories; - // List of list of messages and their parent folders which are awaiting processing + // List of list of messages and their tqparent folders which are awaiting processing TQValueList<Messages> mQueuedMessages; // The folder to which we are currently importing messages diff --git a/kmail/index.cpp b/kmail/index.cpp index 632315a52..f824880fc 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -60,14 +60,14 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled"; #ifdef HAVE_INDEXLIB static -TQValueList<int> vectorToQValueList( const std::vector<TQ_UINT32>& input ) { +TQValueList<int> vectorToTQValueList( const std::vector<TQ_UINT32>& input ) { TQValueList<int> res; std::copy( input.begin(), input.end(), std::back_inserter( res ) ); return res; } static -std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) { +std::vector<TQ_UINT32> TQValueListToVector( const TQValueList<int>& input ) { std::vector<TQ_UINT32> res; // res.assign( input.begin(), input.end() ) doesn't work for some reason for ( TQValueList<int>::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) { @@ -77,8 +77,8 @@ std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) { } #endif -KMMsgIndex::KMMsgIndex( TQObject* parent ): - TQObject( parent, "index" ), +KMMsgIndex::KMMsgIndex( TQObject* tqparent ): + TQObject( tqparent, "index" ), mState( s_idle ), #ifdef HAVE_INDEXLIB mLockFile( std::string( static_cast<const char*>( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ), @@ -123,8 +123,8 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) ); mState = s_creating; } else { - mPendingMsgs = QValueListToVector( cfg.readIntListEntry( "pending" ) ); - mRemovedMsgs = QValueListToVector( cfg.readIntListEntry( "removed" ) ); + mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) ); + mRemovedMsgs = TQValueListToVector( cfg.readIntListEntry( "removed" ) ); } } mIndex = 0; @@ -143,17 +143,17 @@ KMMsgIndex::~KMMsgIndex() { TQValueList<int> pendingMsg; if ( mState == s_processing ) { Q_ASSERT( mAddedMsgs.empty() ); - pendingMsg = vectorToQValueList( mPendingMsgs ); + pendingMsg = vectorToTQValueList( mPendingMsgs ); } cfg.writeEntry( "pending", pendingMsg ); - cfg.writeEntry( "removed", vectorToQValueList( mRemovedMsgs ) ); + cfg.writeEntry( "removed", vectorToTQValueList( mRemovedMsgs ) ); delete mIndex; #endif } bool KMMsgIndex::isIndexable( KMFolder* folder ) const { - if ( !folder || !folder->parent() ) return false; - const KMFolderMgr* manager = folder->parent()->manager(); + if ( !folder || !folder->tqparent() ) return false; + const KMFolderMgr* manager = folder->tqparent()->manager(); return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr(); } @@ -219,9 +219,9 @@ void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) { // create() will notice that folder is disabled break; case s_creating: - if ( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) { + if ( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) { // easy: - mPendingFolders.erase( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) ); + mPendingFolders.erase( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) ); break; } //else fall-through @@ -433,7 +433,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) { //} void KMMsgIndex::removeSearch( TQObject* destroyed ) { - mSearches.erase( std::find( mSearches.begin(), mSearches.end(), destroyed ) ); + mSearches.erase( std::tqfind( mSearches.begin(), mSearches.end(), destroyed ) ); } diff --git a/kmail/index.h b/kmail/index.h index 5e7f16dce..f24dc47b9 100644 --- a/kmail/index.h +++ b/kmail/index.h @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -51,8 +51,9 @@ class KMSearchPattern; class KMMsgIndex : public TQObject { Q_OBJECT + TQ_OBJECT public: - explicit KMMsgIndex( TQObject* parent ); + explicit KMMsgIndex( TQObject* tqparent ); ~KMMsgIndex(); public: @@ -194,6 +195,7 @@ class KMMsgIndex : public TQObject { class KMMsgIndex::Search : public TQObject { Q_OBJECT + TQ_OBJECT public: explicit Search( KMSearch* s ); ~Search(); diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h index 8d3e1bbca..251d61aff 100644 --- a/kmail/interfaces/bodypart.h +++ b/kmail/interfaces/bodypart.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -84,7 +84,7 @@ namespace KMail { /** @return the decoded (CTE, canonicalisation, and charset encoding undone) text contained in the body part, or - TQString::null, it the body part is not of type "text". + TQString(), it the body part is not of type "text". */ virtual TQString asText() const = 0; @@ -96,7 +96,7 @@ namespace KMail { /** @return the value of the content-type header field parameter - with name \a parameter, or TQString::null, if that that + with name \a parameter, or TQString(), if that that parameter is not present in the body's content-type header field. RFC 2231 encoding is removed first. @@ -114,7 +114,7 @@ namespace KMail { /** @return the content of the content-description header field, - or TQString::null if that header is not present in this body + or TQString() if that header is not present in this body part. RFC 2047 encoding is decoded first. */ virtual TQString contentDescription() const = 0; @@ -122,7 +122,7 @@ namespace KMail { //virtual int contentDisposition() const = 0; /** @return the value of the content-disposition header field - parameter with name \a parameter, or TQString::null if that + parameter with name \a parameter, or TQString() if that parameter is not present in the body's content-disposition header field. RFC 2231 encoding is removed first. diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h index 9bc947f53..14fedc617 100644 --- a/kmail/interfaces/bodypartformatter.h +++ b/kmail/interfaces/bodypartformatter.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h index be34e74a3..01f64adbe 100644 --- a/kmail/interfaces/bodyparturlhandler.h +++ b/kmail/interfaces/bodyparturlhandler.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -81,7 +81,7 @@ namespace KMail { /** Called when RMB-clicking on a link in the reader. Should show a context menu at the specified point with the - specified widget as parent. + specified widget as tqparent. @return true if the right-click was handled by this handler, false otherwise. @@ -91,7 +91,7 @@ namespace KMail { /** Called when hovering over a link. @return a string to be shown in the status bar while - hovering over this link or TQString::null if the link was not + hovering over this link or TQString() if the link was not handled by this handler. */ virtual TQString statusBarMessage( BodyPart * part, const TQString & path ) const = 0; diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h index 963835357..932350166 100644 --- a/kmail/interfaces/htmlwriter.h +++ b/kmail/interfaces/htmlwriter.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/interfaces/observable.h b/kmail/interfaces/observable.h index 184ee3189..10d14dfa4 100644 --- a/kmail/interfaces/observable.h +++ b/kmail/interfaces/observable.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/interfaces/observer.h b/kmail/interfaces/observer.h index 5f1d9b887..31cbc80a7 100644 --- a/kmail/interfaces/observer.h +++ b/kmail/interfaces/observer.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h index 4d3eca8b3..330952238 100644 --- a/kmail/interfaces/rulewidgethandler.h +++ b/kmail/interfaces/rulewidgethandler.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h index 38ada083f..702efa415 100644 --- a/kmail/interfaces/urlhandler.h +++ b/kmail/interfaces/urlhandler.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -94,7 +94,7 @@ namespace KMail { /** Called when RMB-clicking on a link in the reader. Should show a context menu at the specified point with the specified - widget as parent. + widget as tqparent. @return true if the right-click was handled by this URLHandler, false otherwise. diff --git a/kmail/isubject.h b/kmail/isubject.h index 93a84a29b..8bad40c46 100644 --- a/kmail/isubject.h +++ b/kmail/isubject.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp index 89cabec9e..caf4759f8 100644 --- a/kmail/jobscheduler.cpp +++ b/kmail/jobscheduler.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -34,8 +34,8 @@ using namespace KMail; -JobScheduler::JobScheduler( TQObject* parent, const char* name ) - : TQObject( parent, name ), mTimer( this, "mTimer" ), +JobScheduler::JobScheduler( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), mTimer( this, "mTimer" ), mPendingImmediateTasks( 0 ), mCurrentTask( 0 ), mCurrentJob( 0 ) { @@ -109,7 +109,7 @@ void JobScheduler::notifyOpeningFolder( KMFolder* folder ) } else { // Jobs scheduled from here should always be cancellable. // One exception though, is when ExpireJob does its final KMMoveCommand. - // Then that command shouldn't kill its own parent job just because it opens a folder... + // Then that command shouldn't kill its own tqparent job just because it opens a folder... if ( mCurrentJob->isCancellable() ) interruptCurrentTask(); } diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h index 2dd04d4ac..c35121ddd 100644 --- a/kmail/jobscheduler.h +++ b/kmail/jobscheduler.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -93,11 +93,12 @@ private: * using too much CPU for too long. Tasks for opened folders are not executed until * the folder is closed. */ -class JobScheduler : public QObject +class JobScheduler : public TQObject { Q_OBJECT + TQ_OBJECT public: - JobScheduler( TQObject* parent, const char* name = 0 ); + JobScheduler( TQObject* tqparent, const char* name = 0 ); ~JobScheduler(); /// Register a task to be done for a given folder diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp index 3ba43637d..6cb283746 100644 --- a/kmail/kcm_kmail.cpp +++ b/kmail/kcm_kmail.cpp @@ -31,55 +31,55 @@ //---------------------------- extern "C" { - KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *tqparent, const char * ) { - MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" ); + MiscPage *page = new MiscPage( tqparent, "kcmkmail_config_misc" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *tqparent, const char * ) { AppearancePage *page = - new AppearancePage( parent, "kcmkmail_config_appearance" ); + new AppearancePage( tqparent, "kcmkmail_config_appearance" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *tqparent, const char * ) { - ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" ); + ComposerPage *page = new ComposerPage( tqparent, "kcmkmail_config_composer" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *tqparent, const char * ) { - IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" ); + IdentityPage *page = new IdentityPage( tqparent, "kcmkmail_config_identity" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *tqparent, const char * ) { - AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" ); + AccountsPage *page = new AccountsPage( tqparent, "kcmkmail_config_accounts" ); return page; } } extern "C" { - KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *tqparent, const char * ) { - SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" ); + SecurityPage *page = new SecurityPage( tqparent, "kcmkmail_config_security" ); return page; } } diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h index a93e92afb..3f6526d72 100644 --- a/kmail/kcursorsaver.h +++ b/kmail/kcursorsaver.h @@ -10,11 +10,11 @@ * As soon as it gets out of scope, it will restore the original * cursor. */ -class KCursorSaver : public Qt +class KCursorSaver : public TQt { public: /// constructor taking TQCursor tqshapes - KCursorSaver(Qt::tqCursorShape tqshape) { + KCursorSaver(TQt::tqCursorShape tqshape) { TQApplication::setOverrideCursor( TQCursor(tqshape) ); inited = true; } diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index 94edd591c..bd4d4a51d 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -555,7 +555,7 @@ namespace { static TQString canonicalAddress( const TQString & _address ) { const TQString address = KPIM::getEmailAddress( _address ); - if ( address.find('@') == -1 ) { + if ( address.tqfind('@') == -1 ) { // local address //char hostname[1024]; //gethostname(hostname,1024); @@ -1370,7 +1370,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() { dump(); for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) { std::map<CryptoMessageFormat,FormatInfo>::iterator pos = - d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] ); + d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] ); if ( pos == d->mFormatInfoMap.end() ) continue; std::vector<SplitInfo> & v = pos->second.splitInfos; @@ -1394,7 +1394,7 @@ void Kleo::KeyResolver::addToAllSplitInfos( const std::vector<GpgME::Key> & keys if ( !( f & concreteCryptoMessageFormats[i] ) ) continue; std::map<CryptoMessageFormat,FormatInfo>::iterator pos = - d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] ); + d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] ); if ( pos == d->mFormatInfoMap.end() ) continue; std::vector<SplitInfo> & v = pos->second.splitInfos; @@ -1560,14 +1560,14 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() { std::vector<Kleo::KeyResolver::SplitInfo> Kleo::KeyResolver::encryptionItems( Kleo::CryptoMessageFormat f ) const { dump(); std::map<CryptoMessageFormat,FormatInfo>::const_iterator it = - d->mFormatInfoMap.find( f ); + d->mFormatInfoMap.tqfind( f ); return it != d->mFormatInfoMap.end() ? it->second.splitInfos : std::vector<SplitInfo>() ; } std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) const { dump(); std::map<CryptoMessageFormat,FormatInfo>::const_iterator it = - d->mFormatInfoMap.find( f ); + d->mFormatInfoMap.tqfind( f ); return it != d->mFormatInfoMap.end() ? it->second.signKeys : std::vector<GpgME::Key>() ; } @@ -1579,8 +1579,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector<GpgME::Key> & selectedKeys ) const { - const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats ); - const bool x509 = tqcontainsSMIME( mCryptoMessageFormats ); + const bool opgp = containsOpenPGP( mCryptoMessageFormats ); + const bool x509 = containsSMIME( mCryptoMessageFormats ); Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"), msg, KPIM::getEmailAddress(person), selectedKeys, @@ -1765,12 +1765,12 @@ void Kleo::KeyResolver::addKeys( const std::vector<Item> & items ) { Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences( const TQString& address ) const { const Private::ContactPreferencesMap::iterator it = - d->mContactPreferencesMap.find( address ); + d->mContactPreferencesMap.tqfind( address ); if ( it != d->mContactPreferencesMap.end() ) return it->second; KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - const KABC::Addressee::List res = ab->tqfindByEmail( address ); + const KABC::Addressee::List res = ab->findByEmail( address ); ContactPreferences pref; if ( !res.isEmpty() ) { KABC::Addressee addr = res.first(); @@ -1792,12 +1792,12 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont { d->mContactPreferencesMap.insert( std::make_pair( email, pref ) ); KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - KABC::Addressee::List res = ab->tqfindByEmail( email ); + KABC::Addressee::List res = ab->findByEmail( email ); KABC::Addressee addr; if ( res.isEmpty() ) { bool ok = true; - TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString::null, &ok ); + TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok ); if ( ok ) { addr.setNameFromString( fullName ); addr.insertEmail( email, true ); diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h index f39a0f96e..0765459f9 100644 --- a/kmail/keyresolver.h +++ b/kmail/keyresolver.h @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -101,14 +101,14 @@ namespace Kleo { \section Step 4: Get signing keys. If, after key resolving, signing is still requested and - apparently possible, you can get the result of all this by + aptqparently 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 - apparently possible, you can get the result of all this by + aptqparently 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/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp index 900264cd6..64f085f92 100644 --- a/kmail/khtmlparthtmlwriter.cpp +++ b/kmail/khtmlparthtmlwriter.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ namespace KMail { KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part, - TQObject * parent, const char * name ) - : TQObject( parent, name ), HtmlWriter(), + TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), HtmlWriter(), mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended ) { assert( part ); @@ -140,7 +140,7 @@ namespace KMail { DOM::HTMLImageElement image( node ); KURL url( image.src().string() ); if ( url.protocol() == "cid" ) { - EmbeddedPartMap::const_iterator it = mEmbeddedPartMap.find( url.path() ); + EmbeddedPartMap::const_iterator it = mEmbeddedPartMap.tqfind( url.path() ); if ( it != mEmbeddedPartMap.end() ) { kdDebug(5006) << "Replacing " << url.prettyURL() << " by " << it.data() << endl; image.setSrc( it.data() ); diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h index 482d9b2c8..3db102f78 100644 --- a/kmail/khtmlparthtmlwriter.h +++ b/kmail/khtmlparthtmlwriter.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,11 +45,12 @@ namespace KMail { class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter { Q_OBJECT + TQ_OBJECT public: // Key is Content-Id, value is URL typedef TQMap<TQString, TQString> EmbeddedPartMap; KHtmlPartHtmlWriter( KHTMLPart * part, - TQObject * parent=0, const char * name = 0 ); + TQObject * tqparent=0, const char * name = 0 ); virtual ~KHtmlPartHtmlWriter(); void begin( const TQString & cssDefs ); diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h index 6baa874be..7cf11ebdc 100644 --- a/kmail/kleo_util.h +++ b/kmail/kleo_util.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -77,11 +77,11 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) { return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ; } -static inline bool tqcontainsSMIME( unsigned int f ) { +static inline bool containsSMIME( unsigned int f ) { return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ; } -static inline bool tqcontainsOpenPGP( unsigned int f ) { +static inline bool containsOpenPGP( unsigned int f ) { return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ; } diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp index 4249d3bf1..530ffaf45 100644 --- a/kmail/klistboxdialog.cpp +++ b/kmail/klistboxdialog.cpp @@ -11,10 +11,10 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString, const TQString& caption, const TQString& labelText, - TQWidget* parent, + TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ), + : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ), selectedString( _selectedString ) { @@ -52,7 +52,7 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString, */ KListBoxDialog::~KListBoxDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void KListBoxDialog::setLabelAbove(const TQString& label) diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h index e245d1df7..cf155075f 100644 --- a/kmail/klistboxdialog.h +++ b/kmail/klistboxdialog.h @@ -9,12 +9,13 @@ class TQListBox; class KListBoxDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KListBoxDialog( TQString& _selectedString, const TQString& caption, const TQString& labelText, - TQWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); ~KListBoxDialog(); diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp index 78a20dc5b..f556c07dc 100644 --- a/kmail/klistviewindexedsearchline.cpp +++ b/kmail/klistviewindexedsearchline.cpp @@ -17,11 +17,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -38,8 +38,8 @@ using KMail::HeaderListQuickSearch; -KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ): - HeaderListQuickSearch( parent, listView, actionCollection, name ), +KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* tqparent, KListView* listView, KActionCollection* actionCollection, const char* name ): + HeaderListQuickSearch( tqparent, listView, actionCollection, name ), mFiltering( false ) { } diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h index 5bd67e4bf..f8aaf176a 100644 --- a/kmail/klistviewindexedsearchline.h +++ b/kmail/klistviewindexedsearchline.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -49,10 +49,11 @@ class KListViewSearchLine; class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch { Q_OBJECT + TQ_OBJECT public: - explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0); + explicit KListViewIndexedSearchLine(TQWidget *tqparent, KListView *listView, KActionCollection* action, const char *name = 0); ~KListViewIndexedSearchLine(); public slots: @@ -60,7 +61,7 @@ public slots: * Updates search to only make visible the items that match \a s. If * \a s is null then the line edit's text will be used. */ - virtual void updateSearch(const TQString &s = TQString::null); + virtual void updateSearch(const TQString &s = TQString()); protected: virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 8ddf6899a..eebe99f76 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -12,7 +12,7 @@ using KMail::AccountManager; #include "messagesender.h" #include "kmmessage.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmfoldercachedimap.h" #include "progressmanager.h" @@ -42,10 +42,10 @@ using KMail::FolderJob; #include "kmaccount.moc" //----------------------------------------------------------------------------- -KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) - : TQObject(parent), mPrecommand(precommand) +KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent) + : TQObject(tqparent), mPrecommand(precommand) { - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( i18n("Executing precommand %1").arg(precommand )); mPrecommandProcess.setUseShell(true); @@ -181,7 +181,7 @@ void KMAccount::writeConfig(KConfig& config) KAccount::writeConfig(config); config.writeEntry("Type", type()); - config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString::null); + config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString()); config.writeEntry("check-interval", mInterval); config.writeEntry("check-exclude", mExclude); config.writePathEntry("precommand", mPrecommand); @@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) assert(aMsg != 0); // Save this one for readding - KMFolderCachedImap* parent = 0; + KMFolderCachedImap* tqparent = 0; if( type() == "cachedimap" ) - parent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); + tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() ); // checks whether we should send delivery receipts // and sends them. @@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) // This is only valid for pop accounts and produces wrong stati for imap. if ( type() != "cachedimap" && type() != "imap" ) { if ( aMsg->isOld() ) - aMsg->seStatus(KMMsgStatusUnread); // -sanders - // aMsg->seStatus(KMMsgStatusRead); + aMsg->setqStatus(KMMsgStatusUnread); // -sanders + // aMsg->setqStatus(KMMsgStatusRead); else - aMsg->seStatus(KMMsgStatusNew); + aMsg->setqStatus(KMMsgStatusNew); } /* TQFile fileD0( "testdat_xx-kmaccount-0" ); @@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) { else if (processResult == 1) { if( type() == "cachedimap" ) - ; // already done by caller: parent->addMsgInternal( aMsg, false ); + ; // already done by caller: tqparent->addMsgInternal( aMsg, false ); else { // TODO: Perhaps it would be best, if this if was handled by a virtual // method, so the if( !dimap ) above could die? @@ -287,11 +287,11 @@ if( fileD0.open( IO_WriteOnly ) ) { // Count number of new messages for each folder TQString folderId; if ( processResult == 1 ) { - folderId = ( type() == "cachedimap" ) ? parent->folder()->idString() + folderId = ( type() == "cachedimap" ) ? tqparent->folder()->idString() : mFolder->idString(); } else { - folderId = aMsg->parent()->idString(); + folderId = aMsg->tqparent()->idString(); } addToNewInFolder( folderId, 1 ); @@ -312,7 +312,7 @@ int KMAccount::checkInterval() const { if ( mInterval <= 0 ) return mInterval; - return QMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() ); + return TQMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() ); } //---------------------------------------------------------------------------- @@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand) KMPrecommand precommandProcess(precommand, this); - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( i18n("Executing precommand %1").arg(precommand )); connect(&precommandProcess, TQT_SIGNAL(finished(bool)), @@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) { } //----------------------------------------------------------------------------- -void KMAccount::checkDone( bool newmail, CheckStatus status ) +void KMAccount::checkDone( bool newmail, ChecktqStatus status ) { setCheckingMail( false ); // Reset the timeout for automatic mailchecking. The user might have @@ -493,7 +493,7 @@ void KMAccount::checkDone( bool newmail, CheckStatus status ) //----------------------------------------------------------------------------- void KMAccount::addToNewInFolder( TQString folderId, int num ) { - if ( mNewInFolder.find( folderId ) == mNewInFolder.end() ) + if ( mNewInFolder.tqfind( folderId ) == mNewInFolder.end() ) mNewInFolder[folderId] = num; else mNewInFolder[folderId] += num; diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 2872b1110..02df2421c 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -49,12 +49,13 @@ using KPIM::ProgressItem; class KMAccount; typedef TQValueList< ::KMAccount* > AccountList; -class KMPrecommand : public QObject +class KMPrecommand : public TQObject { Q_OBJECT + TQ_OBJECT public: - KMPrecommand(const TQString &precommand, TQObject *parent = 0); + KMPrecommand(const TQString &precommand, TQObject *tqparent = 0); virtual ~KMPrecommand(); bool start(); @@ -73,6 +74,7 @@ protected: class KMAccount: public TQObject, public KAccount { Q_OBJECT + TQ_OBJECT friend class KMail::AccountManager; friend class ::KMail::FolderJob; friend class ::AccountsPageReceivingTab; // part of the config dialog @@ -81,7 +83,7 @@ class KMAccount: public TQObject, public KAccount public: virtual ~KMAccount(); - enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, + enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, CheckError }; /** The default check interval */ @@ -90,7 +92,7 @@ public: /** * Returns type of the account */ - virtual TQString type() const { return TQString::null; } + virtual TQString type() const { return TQString(); } /** * Reimplemented, set account name @@ -229,7 +231,7 @@ public: * @param newMail true if new mail arrived * @param status the status of the mail check */ - void checkDone( bool newMail, CheckStatus status ); + void checkDone( bool newMail, ChecktqStatus status ); /** * Abort all running mail checks. Used when closing the last KMMainWin. @@ -258,7 +260,7 @@ signals: * @param newMail true if there was new mail * @param status the status of the mail check **/ - virtual void finishedCheck( bool newMail, CheckStatus status ); + virtual void finishedCheck( bool newMail, ChecktqStatus status ); /** * Emitted after the mail check is finished. diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 4fc57d2c1..134a71020 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -134,8 +134,8 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis TQValueList<KMFolderCachedImap*> folderList; TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin(); for (; it != mapJobData.end(); ++it) { - if ((*it).parent) - folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage()); + if ((*it).tqparent) + folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage()); // Kill the job - except if it's the one that already died and is calling us if ( !it.key()->error() && mSlave ) { it.key()->kill(); @@ -163,8 +163,8 @@ void KMAcctCachedImap::cancelMailCheck() TQValueList<KMFolderCachedImap*> folderList; TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin(); for (; it != mapJobData.end(); ++it) { - if ( (*it).cancellable && (*it).parent ) - folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage()); + if ( (*it).cancellable && (*it).tqparent ) + folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage()); } // Kill jobs ImapAccountBase::cancelMailCheck(); @@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders() mMailCheckFolders.append( mFoldersQueuedForChecking.front() ); mFoldersQueuedForChecking.pop_front(); if ( mFoldersQueuedForChecking.isEmpty() ) - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); kmkernel->acctMgr()->singleCheckMail(this, true); @@ -243,7 +243,7 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder, mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + TQString::number( id() ), TQStyleSheet::escape( folder->label() ), // will be changed immediately in serverSync anyway - TQString::null, + TQString(), true, // can be cancelled useSSL() || useTLS() ); connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), @@ -287,7 +287,7 @@ void KMAcctCachedImap::addUnreadMsgCount( const KMFolderCachedImap *folder, // therefore doesn't need to be counted here const TQString folderId = folder->folder()->idString(); int newInFolder = countUnread; - if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() ) + if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() ) newInFolder -= mUnreadBeforeCheck[folderId]; if ( newInFolder > 0 ) addToNewInFolder( folderId, newInFolder ); @@ -310,7 +310,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder, void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) { ImapAccountBase::readConfig( config ); - // Apparently this method is only ever called once (from KMKernel::init) so this is ok + // Aptqparently 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" ); @@ -318,7 +318,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) { TQStringList::const_iterator it = oldPaths.begin(); TQStringList::const_iterator nameit = newNames.begin(); for( ; it != oldPaths.end() && nameit != newNames.end(); ++it, ++nameit ) { - addRenamedFolder( *it, TQString::null, *nameit ); + addRenamedFolder( *it, TQString(), *nameit ); } mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab ); } @@ -351,7 +351,7 @@ void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder ) TQStringList strList; TQValueList<TQGuardedPtr<KMFolder> > folderList; kmkernel->dimapFolderMgr()->createFolderList( &strList, &folderList, - folder->folder()->child(), TQString::null, + folder->folder()->child(), TQString(), false ); TQValueList<TQGuardedPtr<KMFolder> >::Iterator it; mCountLastUnread = 0; @@ -417,12 +417,12 @@ TQStringList KMAcctCachedImap::deletedFolderPaths( const TQString& subFolderPath bool KMAcctCachedImap::isDeletedFolder( const TQString& subFolderPath ) const { - return mDeletedFolders.find( subFolderPath ) != mDeletedFolders.end(); + return mDeletedFolders.tqfind( subFolderPath ) != mDeletedFolders.end(); } bool KMAcctCachedImap::isPreviouslyDeletedFolder( const TQString& subFolderPath ) const { - return mPreviouslyDeletedFolders.find( subFolderPath ) != mPreviouslyDeletedFolders.end(); + return mPreviouslyDeletedFolders.tqfind( subFolderPath ) != mPreviouslyDeletedFolders.end(); } void KMAcctCachedImap::removeDeletedFolder( const TQString& subFolderPath ) @@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* ) killAllJobs( abortConnection ); if ( abortConnection ) { // If we were trying to connect, tell kmfoldercachedimap so that it moves on - emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null ); + emit connectionResult( KIO::ERR_USER_CANCELED, TQString() ); } } @@ -459,10 +459,10 @@ FolderStorage* KMAcctCachedImap::rootFolder() const TQString KMAcctCachedImap::renamedFolder( const TQString& imapPath ) const { - TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.find( imapPath ); + TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.tqfind( imapPath ); if ( renit != mRenamedFolders.end() ) return (*renit).mNewName; - return TQString::null; + return TQString(); } #include "kmacctcachedimap.moc" diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h index 5c3aa6c3b..f045ca7fb 100644 --- a/kmail/kmacctcachedimap.h +++ b/kmail/kmacctcachedimap.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -54,6 +54,7 @@ namespace KIO { class KMAcctCachedImap: public KMail::ImapAccountBase { Q_OBJECT + TQ_OBJECT friend class ::KMail::ImapJob; friend class ::KMail::CachedImapJob; @@ -144,7 +145,7 @@ public: void removeRenamedFolder( const TQString& subFolderPath ); struct RenamedFolder { - RenamedFolder() {} // for QMap + RenamedFolder() {} // for TQMap RenamedFolder( const TQString& oldLabel, const TQString& newName ) : mOldLabel( oldLabel ), mNewName( newName ) {} TQString mOldLabel; diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h index 6545d4e62..488142a9b 100644 --- a/kmail/kmacctfolder.h +++ b/kmail/kmacctfolder.h @@ -24,7 +24,7 @@ class KMAccount; -/** Simple wrapper class that tqcontains the kmail account handling +/** Simple wrapper class that contains the kmail account handling * stuff that is usually not required outside kmail. * * WARNING: do not add virtual methods in this class. This class is @@ -48,7 +48,7 @@ public: void clearAccountList(); private: - KMAcctFolder( KMFolderDir* parent, const TQString& name, + KMAcctFolder( KMFolderDir* tqparent, const TQString& name, KMFolderType aFolderType ); }; diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 12d17af89..6942bab53 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -28,7 +28,7 @@ using KMail::SieveConfig; #include "kmmessage.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmfoldertree.h" #include "kmfoldermgr.h" #include "kmfolderimap.h" @@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave ) msg->setTransferInProgress( false ); } } - if ((*it).parent) + if ((*it).tqparent) { // clear folder state - KMFolderImap *fld = static_cast<KMFolderImap*>((*it).parent->storage()); + KMFolderImap *fld = static_cast<KMFolderImap*>((*it).tqparent->storage()); fld->setCheckingValidity(false); fld->quiet(false); fld->setContentState(KMFolderImap::imapNoInformation); @@ -222,7 +222,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder ) { ImapJob *job = it.current(); ++it; - if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == folder ) + if ( !job->msgList().isEmpty() && job->msgList().first()->tqparent() == folder ) { job->kill(); } @@ -237,8 +237,8 @@ void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder ) while ( it != mapJobData.end() ) { TQMap<KIO::Job*, jobData>::Iterator i = it; it++; - if ( (*i).parent ) { - if ( (*i).parent == folder ) { + if ( (*i).tqparent ) { + if ( (*i).tqparent == folder ) { mapJobData.remove(i); } } @@ -252,8 +252,8 @@ void KMAcctImap::cancelMailCheck() TQValueList<KMFolderImap*> folderList; TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin(); for (; it != mapJobData.end(); ++it) { - if ( (*it).cancellable && (*it).parent ) { - folderList << static_cast<KMFolderImap*>((*it).parent->storage()); + if ( (*it).cancellable && (*it).tqparent ) { + folderList << static_cast<KMFolderImap*>((*it).tqparent->storage()); } } // Kill jobs @@ -298,7 +298,7 @@ void KMAcctImap::processNewMail(bool interactive) ProgressManager::createProgressItem( "MailCheckAccount" + name(), i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ), - TQString::null, // status + TQString(), // status true, // can be canceled useSSL() || useTLS() ); @@ -395,14 +395,14 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") ); + mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") ); } mCountRemainChecks--; // count the unread messages const TQString folderId = folder->idString(); int newInFolder = folder->countUnread(); - if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() ) + if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() ) newInFolder -= mUnreadBeforeCheck[folderId]; if ( newInFolder > 0 ) { addToNewInFolder( folderId, newInFolder ); @@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count // when we check only one folder (=selected) and we have new mails // then do not display a summary as the normal status message is better - bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true; - ImapAccountBase::postProcessNewMail( showStatus ); + bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true; + ImapAccountBase::postProcessNewMail( showtqStatus ); mUnreadBeforeCheck.clear(); mCheckingSingleFolder = false; } @@ -512,7 +512,7 @@ void KMAcctImap::slotUpdateFolderList() TQStringList strList; mMailCheckFolders.clear(); kmkernel->imapFolderMgr()->createFolderList(&strList, &mMailCheckFolders, - mFolder->folder()->child(), TQString::null, false); + mFolder->folder()->child(), TQString(), false); // the new list TQValueList<TQGuardedPtr<KMFolder> > includedFolders; // check for excluded folders @@ -580,7 +580,7 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool ) void KMAcctImap::execFilters(TQ_UINT32 serNum) { if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return; - TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.find( serNum ); + TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.tqfind( serNum ); if ( findIt != mFilterSerNums.end() ) return; mFilterSerNums.append( serNum ); @@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg ) kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno))); return 2; } - if (msg->parent()) { // unGet this msg + if (msg->tqparent()) { // unGet this msg int idx = -1; KMFolder * p = 0; KMMsgDict::instance()->getLocation( msg, &p, &idx ); - assert( p == msg->parent() ); assert( idx >= 0 ); + assert( p == msg->tqparent() ); assert( idx >= 0 ); p->unGetMsg( idx ); } diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h index f3fcc693f..1a6c48820 100644 --- a/kmail/kmacctimap.h +++ b/kmail/kmacctimap.h @@ -40,6 +40,7 @@ class FolderStorage; class KMAcctImap: public KMail::ImapAccountBase { Q_OBJECT + TQ_OBJECT friend class KMail::ImapJob; public: diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 47e04f33b..6062f3547 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -8,7 +8,7 @@ #include "kmfoldermbox.h" #include "kmacctfolder.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "progressmanager.h" using KPIM::ProgressManager; @@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess() if ( precommand().isEmpty() ) { TQFileInfo fi( location() ); if ( fi.size() == 0 ) { - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); checkDone( mHasNewMail, CheckOK ); return false; } @@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess() if (!mFolder) { checkDone( mHasNewMail, CheckError ); - BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return false; } - //BroadcasStatus::instance()->reset(); - BroadcasStatus::instance()->seStatusMsg( + //BroadcastqStatus::instance()->reset(); + BroadcastqStatus::instance()->seStatusMsg( i18n("Preparing transmission from \"%1\"...").arg(mName)); @@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess() { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( mHasNewMail, CheckError ); - BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." )); + BroadcastqStatus::instance()->seStatusMsg( i18n( "Running precommand failed." )); return false; } @@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess() kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/" << mMailFolder->name() << endl; checkDone( mHasNewMail, CheckError ); - BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return false; } @@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess() checkDone( mHasNewMail, CheckError ); TQString errMsg = i18n( "Transmission failed: Could not lock %1." ) .arg( mMailFolder->location() ); - BroadcasStatus::instance()->seStatusMsg( errMsg ); + BroadcastqStatus::instance()->seStatusMsg( errMsg ); return false; } @@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess() mStatusMsgStub = i18n("Moving message %3 of %2 from %1.") .arg(mMailFolder->location()).arg( mNumMsgs ); - //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true ); + //BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true ); return true; } @@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg() if (kmkernel->mailCheckAborted()) break; */ const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched ); - //BroadcasStatus::instance()->seStatusMsg( statusMsg ); + //BroadcastqStatus::instance()->seStatusMsg( statusMsg ); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setqStatus( statusMsg ); msg = mMailFolder->take(0); if (msg) @@ -214,8 +214,8 @@ bool KMAcctLocal::fetchMsg() fileD0.close(); // If data is 0 we just create a zero length file. } #endif - msg->seStatus(msg->headerField("Status").latin1(), - msg->headerField("X-Status").latin1()); + msg->setqStatus(msg->headerField("tqStatus").latin1(), + msg->headerField("X-tqStatus").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) ); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); msg->setComplete(true); @@ -249,8 +249,8 @@ void KMAcctLocal::postProcess() } if( mMailCheckProgressItem ) { // do this only once... - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); - mMailCheckProgressItem->seStatus( + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from mailbox %1.", "Fetched %n messages from mailbox %1.", mNumMsgs ).arg( mMailFolder->location() ) ); diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index ca3789207..7b83dcf89 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -9,7 +9,7 @@ #include "kmfoldermaildir.h" #include "kmacctfolder.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "progressmanager.h" using KPIM::ProgressManager; @@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool) TQFileInfo fi( location() ); if ( !fi.exists() ) { checkDone( hasNewMail, CheckOK ); - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 ); return; } } @@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool) if (!mFolder) { checkDone( hasNewMail, CheckError ); - BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return; } - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( i18n("Preparing transmission from \"%1\"...").arg(mName)); Q_ASSERT( !mMailCheckProgressItem ); @@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool) { kdDebug(5006) << "cannot run precommand " << precommand() << endl; checkDone( hasNewMail, CheckError ); - BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return; } @@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool) KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); - BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); + BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." )); return; } @@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool) { if( kmkernel->mailCheckAborted() ) { - BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") ); + BroadcastqStatus::instance()->seStatusMsg( i18n("Transmission aborted.") ); num = i; addedOk = false; } @@ -165,13 +165,13 @@ void KMAcctMaildir::processNewMail(bool) TQString statusMsg = statusMsgStub.arg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setqStatus( statusMsg ); msg = mailFolder.take(0); if (msg) { - msg->seStatus(msg->headerField("Status").latin1(), - msg->headerField("X-Status").latin1()); + msg->setqStatus(msg->headerField("tqStatus").latin1(), + msg->headerField("X-tqStatus").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0)); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); @@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool) } if( mMailCheckProgressItem ) { // do this only once... - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num ); - mMailCheckProgressItem->seStatus( + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( num ); + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", num ).arg(mailFolder.location() ) ); @@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool) } if (addedOk) { - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num ); + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, num ); } // else warning is written already diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 44df37c61..caa2a2150 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -32,8 +32,8 @@ #include "kmacctseldlg.moc" -KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Add Account"), Ok|Cancel, Ok ) +KMAcctSelDlg::KMAcctSelDlg( TQWidget *tqparent, const char *name, bool modal ) + : KDialogBase( tqparent, name, modal, i18n("Add Account"), Ok|Cancel, Ok ) { TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h index 3aad59b15..62a0012b3 100644 --- a/kmail/kmacctseldlg.h +++ b/kmail/kmacctseldlg.h @@ -30,9 +30,10 @@ class KMAcctSelDlg: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true ); + KMAcctSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true ); /** * Returns selected button from the account selection group: diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp index 055b29fcc..8fdc5554c 100644 --- a/kmail/kmaddrbook.cpp +++ b/kmail/kmaddrbook.cpp @@ -56,18 +56,18 @@ void KabcBridge::addresses(TQStringList& result) // includes lists for ( mit = emails.begin(); mit != emails.end(); ++mit ) { email = *mit; if (!email.isEmpty()) { - if (n.isEmpty() || (email.find( '<' ) != -1)) - addr = TQString::null; + if (n.isEmpty() || (email.tqfind( '<' ) != -1)) + addr = TQString(); else { // do we really need quotes around this name ? - if (n.find(needQuotes) != -1) + if (n.tqfind(needQuotes) != -1) addr = '"' + n + endQuote; else addr = n + ' '; } - if (!addr.isEmpty() && (email.find( '<' ) == -1) - && (email.find( '>' ) == -1) - && (email.find( ',' ) == -1)) + if (!addr.isEmpty() && (email.tqfind( '<' ) == -1) + && (email.tqfind( '>' ) == -1) + && (email.tqfind( ',' ) == -1)) addr += '<' + email + '>'; else addr += email; @@ -99,7 +99,7 @@ TQStringList KabcBridge::addresses() TQString KabcBridge::expandNickName( const TQString& nickName ) { if ( nickName.isEmpty() ) - return TQString::null; + return TQString(); const TQString lowerNickName = nickName.lower(); const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); @@ -108,7 +108,7 @@ TQString KabcBridge::expandNickName( const TQString& nickName ) if ( (*it).nickName().lower() == lowerNickName ) return (*it).fullEmail(); } - return TQString::null; + return TQString(); } @@ -126,7 +126,7 @@ TQStringList KabcBridge::categories() for ( TQStringList::ConstIterator itAux = aux.begin(); itAux != aux.end(); ++itAux ) { // don't have duplicates in allcategories - if ( allcategories.find( *itAux ) == allcategories.end() ) + if ( allcategories.tqfind( *itAux ) == allcategories.end() ) allcategories += *itAux; } } diff --git a/kmail/kmail.antispamrc b/kmail/kmail.antispamrc index 098f80c26..2bef9ad09 100644 --- a/kmail/kmail.antispamrc +++ b/kmail/kmail.antispamrc @@ -20,7 +20,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-Status +ScoreHeader=X-Spam-tqStatus ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -139,7 +139,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-Status +ScoreHeader=X-Spam-tqStatus ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -163,7 +163,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-Status +ScoreHeader=X-Spam-tqStatus ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -222,7 +222,7 @@ PipeFilterName=CRM114 Check PipeCmdDetect=crm -u $HOME/.crm114 mailreaver.crm ExecCmdSpam=crm -u $HOME/.crm114 mailreaver.crm --spam ExecCmdHam=crm -u $HOME/.crm114 mailreaver.crm --good -DetectionHeader=X-CRM114-Status +DetectionHeader=X-CRM114-tqStatus DetectionPattern=SPAM DetectionPattern2=UNSURE DetectionOnly=0 @@ -230,7 +230,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=1 ScoreName=CRM114 -ScoreHeader=X-CRM114-Status +ScoreHeader=X-CRM114-tqStatus ScoreType=Bool ScoreValueRegexp=SPAM ScoreThresholdRegexp= diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 4bbd1be6c..88370a456 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -97,7 +97,7 @@ </group> <group name="General"> - <entry name="disregardUmask" type="Bool"> + <entry name="disregardUtqmask" type="Bool"> <label>Disregard the users umask setting and use "read-write for the user only" instead</label> <default>false</default> </entry> @@ -257,7 +257,7 @@ </entry> <entry name="TheIMAPResourceFolderParent" type="String"> - <whatsthis><p>This chooses the parent of the IMAP resource folders.</p><p>By default, the Kolab server sets the IMAP inbox to be the parent.</p></whatsthis> + <whatsthis><p>This chooses the tqparent of the IMAP resource folders.</p><p>By default, the Kolab server sets the IMAP inbox to be the tqparent.</p></whatsthis> <default>inbox</default> </entry> @@ -451,14 +451,14 @@ <entry name="ReplyPrefixes" type="StringList" key="reply-prefixes"> <default>Re\\s*:,Re\\[\\d+\\]:,Re\\d+:</default> </entry> - <entry name="ReplaceReplyPrefix" type="Bool" key="replace-reply-prefix"> + <entry name="ReplaceReplyPrefix" type="Bool" key="tqreplace-reply-prefix"> <label>Replace recognized prefi&x with "Re:"</label> <default>true</default> </entry> <entry name="ForwardPrefixes" type="StringList" key="forward-prefixes"> <default>Fwd:,FW:</default> </entry> - <entry name="ReplaceForwardPrefix" type="Bool" key="replace-forward-prefix"> + <entry name="ReplaceForwardPrefix" type="Bool" key="tqreplace-forward-prefix"> <label>Replace recognized prefix with "&Fwd:"</label> <default>true</default> </entry> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index cb40bc30a..70c90cb00 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifdef HAVE_CONFIG_H @@ -61,8 +61,8 @@ typedef KParts::GenericFactory< KMailPart > KMailFactory; K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory ) KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &) : - DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name), + TQObject *tqparent, const char *name, const TQStringList &) : + DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name), mParentWidget( tqparentWidget ) { kdDebug(5006) << "KMailPart()" << endl; @@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e) mainWidget->initializeFilterActions(); mainWidget->initializeFolderShortcutActions(); mainWidget->setupForwardingActionsList(); - mainWidget->updateVactionScripStatus(); + mainWidget->updateVactionScriptqStatus(); } void KMailPart::exit() @@ -237,8 +237,8 @@ TQWidget* KMailPart::tqparentWidget() const } -KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent ) - : KParts::StatusBarExtension( parent ), mParent( parent ) +KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent ) + : KParts::StatusBarExtension( tqparent ), mParent( tqparent ) { } diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 69203db9b..414ff384e 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KMail_PART_H #define KMail_PART_H @@ -52,9 +52,10 @@ class ActionManager; class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface { Q_OBJECT + TQ_OBJECT public: KMailPart(TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &); + TQObject *tqparent, const char *name, const TQStringList &); virtual ~KMailPart(); TQWidget* tqparentWidget() const; @@ -88,7 +89,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar class KMailStatusBarExtension : public KParts::StatusBarExtension { public: - KMailStatusBarExtension( KMailPart *parent ); + KMailStatusBarExtension( KMailPart *tqparent ); KMainWindow *mainWindow() const; diff --git a/kmail/kmail_part.rc b/kmail/kmail_part.rc index fb4794dfd..5c4d034f3 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_invalidate_imap_cache"/> + <Action name="file_tqinvalidate_imap_cache"/> <Action name="empty_trash"/> <Separator/> <Action name="online_status" /> diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h index 91f15df53..cd4ef29c9 100644 --- a/kmail/kmailicalIface.h +++ b/kmail/kmailicalIface.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,7 +50,7 @@ public: k_dcop: struct SubResource { //dcopidl barfs on those constructors, but dcopidlng works - SubResource() {} // for QValueList + SubResource() {} // for TQValueList SubResource( const TQString& loc, const TQString& lab, bool rw, bool ar ) : location( loc ), label( lab ), writable( rw ), alarmRelevant( ar ) {} TQString location; // unique @@ -115,11 +115,11 @@ k_dcop: /** * Trigger the creation of a new resource folder with name @param resource - * under parent @param. + * under tqparent @param. * @return success or failure */ virtual bool addSubresource( const TQString& resource, - const TQString& parent, + const TQString& tqparent, const TQString& contentsType ) = 0; /** * Trigger the deletion of a new resource folder with id @param resource. diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 41e9f96d7..812374734 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -236,7 +236,7 @@ inline static void debugBodyParts( const char*, const KMMessage& ) {} // Add (or overwrite, resp.) an attachment in an existing mail, // attachments must be local files, they are identified by their names. -// If lookupByName if false the attachment to tqreplace is looked up by mimetype. +// If lookupByName if false the attachment to replace is looked up by mimetype. // return value: wrong if attachment could not be added/updated bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg, const TQString& attachmentURL, @@ -260,7 +260,7 @@ bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg, KMMessagePart msgPart; msgPart.setName( attachmentName ); - const int iSlash = attachmentMimetype.find('/'); + const int iSlash = attachmentMimetype.tqfind('/'); const TQCString sType = attachmentMimetype.left( iSlash ).latin1(); const TQCString sSubtype = attachmentMimetype.mid( iSlash+1 ).latin1(); msgPart.setTypeStr( sType ); @@ -309,7 +309,7 @@ bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg, // Look for the attachment with the right mimetype bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQString& mimetype, TQString& s ) { - const int iSlash = mimetype.find('/'); + const int iSlash = mimetype.tqfind('/'); const TQCString sType = mimetype.left( iSlash ).latin1(); const TQCString sSubtype = mimetype.mid( iSlash+1 ).latin1(); DwBodyPart* part = findBodyPartByMimeType( msg, sType, sSubtype, true /* starts with sSubtype, to accept application/x-vnd.kolab.contact.distlist */ ); @@ -556,7 +556,7 @@ TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& kdDebug(5006) << "The folder has " << f->count() << " messages." << endl; int stopIndex = nbMessages == -1 ? f->count() : - QMIN( f->count(), startIndex + nbMessages ); + TQMIN( f->count(), startIndex + nbMessages ); for(int i = startIndex; i < stopIndex; ++i) { #if 0 @@ -566,7 +566,7 @@ TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& KMMessage* msg = f->storage()->readTemporaryMsg(i); #endif if ( msg ) { - const int iSlash = mimetype.find('/'); + const int iSlash = mimetype.tqfind('/'); const TQCString sType = mimetype.left( iSlash ).latin1(); const TQCString sSubtype = mimetype.mid( iSlash+1 ).latin1(); if ( sType.isEmpty() || sSubtype.isEmpty() ) { @@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg ) { if( !msg ) return; - KMFolder *parent = msg->parent(); - Q_ASSERT( parent ); + KMFolder *tqparent = msg->tqparent(); + Q_ASSERT( tqparent ); TQ_UINT32 sernum = msg->getMsgSerNum(); // do we have an accumulator for this folder? - Accumulator *ac = mAccumulators.find( parent->location() ); + Accumulator *ac = mAccumulators.tqfind( tqparent->location() ); if( ac ) { TQString s; if ( !vPartFoundAndDecoded( msg, s ) ) return; @@ -634,7 +634,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg ) } else { /* We are not accumulating for this folder, so this one was added * by KMail. Do your thang. */ - slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() ); + slotIncidenceAdded( msg->tqparent(), msg->getMsgSerNum() ); } if ( mTheUnGetMes.tqcontains( sernum ) ) { @@ -687,10 +687,10 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) } // Another special case is our own folders, under the imap INBOX, make // those prettier too - const KMFolder *parent = folder; - while ( parent->parent() && parent->parent()->owner() ) { - parent = parent->parent()->owner(); - if ( parent->isSystemFolder() ) { + const KMFolder *tqparent = folder; + while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) { + tqparent = tqparent->tqparent()->owner(); + if ( tqparent->isSystemFolder() ) { TQStringList remainder(parts); remainder.pop_front(); remainder.pop_front(); @@ -720,7 +720,7 @@ TQValueList<KMailICalIfaceImpl::SubResource> KMailICalIfaceImpl::subresourcesKol TQValueList<SubResource> subResources; // Add the default one - KMFolder* f = folderFromType( contentsType, TQString::null ); + KMFolder* f = folderFromType( contentsType, TQString() ); if ( f ) { subResources.append( SubResource( f->location(), subresourceLabelForPresentation( f ), f->isWritable(), folderIsAlarmRelevant( f ) ) ); @@ -1139,7 +1139,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, // go get the rest of it, then try again // TODO: Till, port me if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true ); - FolderJob *job = msg->parent()->createJob( msg ); + FolderJob *job = msg->tqparent()->createJob( msg ); connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) ); job->start(); @@ -1199,7 +1199,7 @@ void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder, void KMailICalIfaceImpl::slotRefresh( const TQString& type ) { if( mUseResourceIMAP ) { - signalRefresh( type, TQString::null /* PENDING(bo) folder->location() */ ); + signalRefresh( type, TQString() /* PENDING(bo) folder->location() */ ); kdDebug(5006) << "Emitting DCOP signal signalRefresh( " << type << " )" << endl; } } @@ -1213,7 +1213,7 @@ void KMailICalIfaceImpl::slotRefreshFolder( KMFolder* folder) if( mUseResourceIMAP && folder ) { if( folder == mCalendar || folder == mContacts || folder == mNotes || folder == mTasks - || folder == mJournals || mExtraFolders.find( folder->location() ) ) { + || folder == mJournals || mExtraFolders.tqfind( folder->location() ) ) { // Refresh the folder of this type KMail::FolderContentsType ct = folder->storage()->contentsType(); slotRefresh( s_folderContentsType[ct].contentsTypeStr ); @@ -1257,7 +1257,7 @@ KMFolder* KMailICalIfaceImpl::folderFromType( const TQString& type, bool KMailICalIfaceImpl::isResourceFolder( KMFolder* folder ) const { return mUseResourceIMAP && folder && - ( isStandardResourceFolder( folder ) || mExtraFolders.find( folder->location() )!=0 ); + ( isStandardResourceFolder( folder ) || mExtraFolders.tqfind( folder->location() )!=0 ); } bool KMailICalIfaceImpl::isStandardResourceFolder( KMFolder* folder ) const @@ -1286,7 +1286,7 @@ KFolderTreeItem::Type KMailICalIfaceImpl::folderType( KMFolder* folder ) const if( mUseResourceIMAP && folder ) { if( folder == mCalendar || folder == mContacts || folder == mNotes || folder == mTasks - || folder == mJournals || mExtraFolders.find( folder->location() ) ) { + || folder == mJournals || mExtraFolders.tqfind( folder->location() ) ) { KMail::FolderContentsType ct = folder->storage()->contentsType(); return s_folderContentsType[ct].treeItemType; } @@ -1385,9 +1385,9 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg ) { if( !msg ) return; // Commands are now delayed; can't use that anymore, we need immediate deletion - //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start(); - KMFolder *srcFolder = msg->parent(); - int idx = srcFolder->find(msg); + //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start(); + KMFolder *srcFolder = msg->tqparent(); + int idx = srcFolder->tqfind(msg); assert(idx != -1); // kill existing jobs since we are about to delete the message srcFolder->ignoreJobsForMessage( msg ); @@ -1415,7 +1415,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder, // Check if already know that 'extra folder' const TQString location = folder->location(); - ExtraFolder* ef = mExtraFolders.find( location ); + ExtraFolder* ef = mExtraFolders.tqfind( location ); if ( ef && ef->folder ) { // Notify that the old folder resource is no longer available subresourceDeleted(folderContentsType( folder->storage()->contentsType() ), location ); @@ -1469,7 +1469,7 @@ KMFolder* KMailICalIfaceImpl::extraFolder( const TQString& type, if ( t < 1 || t > 5 ) return 0; - ExtraFolder* ef = mExtraFolders.find( folder ); + ExtraFolder* ef = mExtraFolders.tqfind( folder ); if ( ef && ef->folder && ef->folder->storage()->contentsType() == t ) return ef->folder; @@ -1478,7 +1478,7 @@ KMFolder* KMailICalIfaceImpl::extraFolder( const TQString& type, KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( KMFolder* folder ) const { - FolderInfoMap::ConstIterator it = mFolderInfoMap.find( folder ); + FolderInfoMap::ConstIterator it = mFolderInfoMap.tqfind( folder ); if ( it != mFolderInfoMap.end() ) return (*it).mStorageFormat; return globalStorageFormat(); @@ -1486,7 +1486,7 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( KMFolder* f void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat format ) { - FolderInfoMap::Iterator it = mFolderInfoMap.find( folder ); + FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder ); if ( it != mFolderInfoMap.end() ) { (*it).mStorageFormat = format; } else { @@ -1500,7 +1500,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges changes ) { - FolderInfoMap::Iterator it = mFolderInfoMap.find( folder ); + FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder ); if ( it != mFolderInfoMap.end() ) { (*it).mChanges = static_cast<FolderChanges>( (*it).mChanges | changes ); } else { // Otherwise, well, it's a folder we don't care about. @@ -1529,7 +1529,7 @@ KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolde void KMailICalIfaceImpl::folderSynced( KMFolder* folder, const KURL& folderURL ) { - FolderInfoMap::Iterator it = mFolderInfoMap.find( folder ); + FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder ); if ( it != mFolderInfoMap.end() && (*it).mChanges ) { handleFolderSynced( folder, folderURL, (*it).mChanges ); (*it).mChanges = NoChange; @@ -1569,13 +1569,13 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL ) // IMAP path is either /INBOX/<path> or /user/someone/<path> TQString path = folderURL.path( -1 ); Q_ASSERT( path.startsWith( "/" ) ); - int secondSlash = path.find( '/', 1 ); + int secondSlash = path.tqfind( '/', 1 ); if ( secondSlash == -1 ) { kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl; return; } if ( path.startsWith( "/INBOX/", false ) ) { - // If INBOX, tqreplace it with the username (which is user@domain) + // If INBOX, replace it with the username (which is user@domain) path = path.mid( secondSlash ); path.prepend( folderURL.user() ); } else { @@ -1585,7 +1585,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL ) } httpURL.setPath( "/freebusy/trigger/" + path + ".pfb" ); - httpURL.setQuery( TQString::null ); + httpURL.setQuery( TQString() ); // Ensure that we encode everything with UTF8 httpURL = KURL( httpURL.url(0,106), 106 ); kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl; @@ -1617,7 +1617,7 @@ void KMailICalIfaceImpl::slotFolderLocationChanged( const TQString &oldLocation, const TQString &newLocation ) { KMFolder *folder = findResourceFolder( oldLocation ); - ExtraFolder* ef = mExtraFolders.find( oldLocation ); + ExtraFolder* ef = mExtraFolders.tqfind( oldLocation ); if ( ef ) { // reuse the ExtraFolder entry, but adjust the key mExtraFolders.setAutoDelete( false ); @@ -1645,7 +1645,7 @@ KMFolder* KMailICalIfaceImpl::findResourceFolder( const TQString& resource ) return mJournals; // No luck. Try the extrafolders - ExtraFolder* ef = mExtraFolders.find( resource ); + ExtraFolder* ef = mExtraFolders.tqfind( resource ); if ( ef ) return ef->folder; @@ -1702,24 +1702,24 @@ void KMailICalIfaceImpl::readConfig() // Read remaining options const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders(); - TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); + TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent(); - // Find the folder parent + // Find the folder tqparent KMFolderDir* folderParentDir; KMFolderType folderType; - KMFolder* folderParent = kmkernel->findFolderById( parentName ); + KMFolder* folderParent = kmkernel->findFolderById( tqparentName ); if( folderParent == 0 ) { // Parent folder not found. It was probably deleted. The user will have to // configure things again. - kdDebug(5006) << "Groupware folder " << parentName << " not found. Groupware functionality disabled" << endl; + kdDebug(5006) << "Groupware folder " << tqparentName << " not found. Groupware functionality disabled" << endl; // Or maybe the inbox simply wasn't created on the first startup - KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); + KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() ); Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; @@ -1738,7 +1738,7 @@ void KMailICalIfaceImpl::readConfig() KMAcctCachedImap::GroupwareType groupwareType = dynamic_cast<KMFolderCachedImap *>( folderParent->storage() )->account()->groupwareType(); if ( groupwareType == KMAcctCachedImap::GroupwareKolab ) { - // Make sure the folder parent has the subdirs + // Make sure the folder tqparent has the subdirs // Globally there are 3 cases: nothing found, some stuff found by type/name heuristics, or everything found OK bool noneFound = true; bool mustFix = false; // true when at least one was found by heuristics @@ -1771,12 +1771,12 @@ void KMailICalIfaceImpl::readConfig() if( noneFound || mustFix ) { TQString msg; - TQString parentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name(); + TQString tqparentFolderName = 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").arg(parentFolderName); + " and the IMAP resource will be disabled").arg(tqparentFolderName); } 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").arg(parentFolderName, operations); + " and the IMAP resource will be disabled").arg(tqparentFolderName, operations); } @@ -1959,14 +1959,14 @@ void KMailICalIfaceImpl::readConfig() void KMailICalIfaceImpl::slotCheckDone() { - TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent(); - KMFolder* folderParent = kmkernel->findFolderById( parentName ); + TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent(); + KMFolder* folderParent = kmkernel->findFolderById( tqparentName ); //kdDebug(5006) << k_funcinfo << " folderParent=" << folderParent << endl; if ( folderParent ) // cool it exists now { - KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); + KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); readConfig(); } @@ -2003,9 +2003,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType folder = mFolderParentDir->createFolder( localizedDefaultFolderName( contentsType ), false, type ); if( mFolderType == KMFolderTypeImap ) { - KMFolderImap* parentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() ); - parentFolder->createFolder( localizedDefaultFolderName( contentsType ) ); - static_cast<KMFolderImap*>( folder->storage() )->setAccount( parentFolder->account() ); + KMFolderImap* tqparentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() ); + tqparentFolder->createFolder( localizedDefaultFolderName( contentsType ) ); + static_cast<KMFolderImap*>( folder->storage() )->setAccount( tqparentFolder->account() ); } // Groupware folder created, use the global setting for storage format setStorageFormat( folder, globalStorageFormat() ); @@ -2136,7 +2136,7 @@ void KMailICalIfaceImpl::cleanup() TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const { if( !mUseResourceIMAP ) - return TQString::null; + return TQString(); if( type == KFolderTreeItem::Contacts ) return TQString::tqfromLatin1( "kmgroupware_folder_contacts" ); @@ -2149,7 +2149,7 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const else if( type == KFolderTreeItem::Journals ) return TQString::tqfromLatin1( "kmgroupware_folder_journals" ); - return TQString::null; + return TQString(); } static void reloadFolderTree() @@ -2287,17 +2287,17 @@ bool KMailICalIfaceImpl::isResourceQuiet() const bool KMailICalIfaceImpl::addSubresource( const TQString& resource, - const TQString& parent, + const TQString& tqparent, const TQString& contentsType ) { - kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl; + kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl; kdDebug(5006) << "contents type: " << contentsType << endl; - KMFolder *folder = findResourceFolder( parent ); - KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; - if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false; + KMFolder *folder = findResourceFolder( tqparent ); + KMFolderDir *tqparentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir; + if ( !tqparentFolderDir || tqparentFolderDir->hasNamedFolder( resource ) ) return false; TQString msg; - if ( parentFolderDir->owner() && !parentFolderDir->owner()->isValidName( resource, msg ) ) { + if ( tqparentFolderDir->owner() && !tqparentFolderDir->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 = parentFolderDir->createFolder( resource, false, type ); + KMFolder* newFolder = tqparentFolderDir->createFolder( resource, false, type ); if ( !newFolder ) return false; if( mFolderType == KMFolderTypeImap ) static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource ); @@ -2359,10 +2359,10 @@ void KMailICalIfaceImpl::syncFolder(KMFolder * folder) const KMFolderCachedImap *dimapFolder = dynamic_cast<KMFolderCachedImap*>( folder->storage() ); if ( !dimapFolder ) return; - // check if the folder exists already, otherwise sync its parent as well to create it + // check if the folder exists already, otherwise sync its tqparent as well to create it if ( dimapFolder->imapPath().isEmpty() ) { - if ( folder->parent() && folder->parent()->owner() ) - syncFolder( folder->parent()->owner() ); + if ( folder->tqparent() && folder->tqparent()->owner() ) + syncFolder( folder->tqparent()->owner() ); else return; } diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h index ae2d1d6ec..3cec23c62 100644 --- a/kmail/kmailicalifaceimpl.h +++ b/kmail/kmailicalifaceimpl.h @@ -21,17 +21,17 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -/** @file This file tqcontains the class KMailICalIfaceImpl which actually +/** @file This file contains the class KMailICalIfaceImpl which actually * implements the ICal (DCOP) interface for KMail. */ @@ -83,6 +83,7 @@ public: /** The implementation of the interface. */ class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface { Q_OBJECT + TQ_OBJECT public: KMailICalIfaceImpl(); @@ -135,7 +136,7 @@ public: bool removeSubresource( const TQString& ); bool addSubresource( const TQString& resource, - const TQString& parent, + const TQString& tqparent, const TQString& contentsType ); // tell KOrganizer about messages to be deleted @@ -178,7 +179,7 @@ public: /** * Returns the name of the standard icon for a folder of given type or - * TQString::null if the type is no groupware type. + * TQString() if the type is no groupware type. */ TQString folderPixmap( KFolderTreeItem::Type type ) const; @@ -315,7 +316,7 @@ private: // The reason for storing it here is that it can be shared between // kmfoldercachedimap and kmfolderimap, and that it's groupware data anyway. struct FolderInfo { - FolderInfo() {} // for QMap + FolderInfo() {} // for TQMap FolderInfo( StorageFormat f, FolderChanges c ) : mStorageFormat( f ), mChanges( c ) {} StorageFormat mStorageFormat; diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index 849676466..7a507c3f1 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -9,9 +9,9 @@ #include <tqcheckbox.h> #include <tqheader.h> -KMAtmListViewItem::KMAtmListViewItem( TQListView *parent ) +KMAtmListViewItem::KMAtmListViewItem( TQListView *tqparent ) : TQObject(), - TQListViewItem( parent ) + TQListViewItem( tqparent ) { mCBCompress = new TQCheckBox( listView()->viewport() ); mCBEncrypt = new TQCheckBox( listView()->viewport() ); @@ -70,7 +70,7 @@ void KMAtmListViewItem::updateAllCheckBoxes() // as well. This is necessary to keep the positions of the checkboxes // up-to-date. The signals which are, in the constructor of this class, // connected to the update slots are not sufficent because unfortunatly, -// Qt does not provide a signal for changed item positions, e.g. during +// TQt does not provide a signal for changed item positions, e.g. during // deleting or adding items. The problem with this is that this function does // not catch updates which are off-screen, which means under some circumstances // checkboxes have invalid positions. This should not happen anymore, but was diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h index 35a65859c..72ae6e25b 100644 --- a/kmail/kmatmlistview.h +++ b/kmail/kmatmlistview.h @@ -12,12 +12,13 @@ class KMComposeWin; class MessageComposer; class TQCheckBox; -class KMAtmListViewItem : public TQObject, public QListViewItem +class KMAtmListViewItem : public TQObject, public TQListViewItem { Q_OBJECT + TQ_OBJECT public: - KMAtmListViewItem( TQListView *parent ); + KMAtmListViewItem( TQListView *tqparent ); virtual ~KMAtmListViewItem(); //A custom compare function is needed because the size column is diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 907d21100..1473d3d6e 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -156,28 +156,28 @@ private: }; -KMCommand::KMCommand( TQWidget *parent ) +KMCommand::KMCommand( TQWidget *tqparent ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( parent ) + mEmitsCompletedItself( false ), mParent( tqparent ) { } -KMCommand::KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ) +KMCommand::KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( parent ), mMsgList( msgList ) + mEmitsCompletedItself( false ), mParent( tqparent ), mMsgList( msgList ) { } -KMCommand::KMCommand( TQWidget *parent, KMMsgBase *msgBase ) +KMCommand::KMCommand( TQWidget *tqparent, KMMsgBase *msgBase ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( parent ) + mEmitsCompletedItself( false ), mParent( tqparent ) { mMsgList.append( msgBase ); } -KMCommand::KMCommand( TQWidget *parent, KMMessage *msg ) +KMCommand::KMCommand( TQWidget *tqparent, KMMessage *msg ) : mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ), - mEmitsCompletedItself( false ), mParent( parent ) + mEmitsCompletedItself( false ), mParent( tqparent ) { if (msg) mMsgList.append( &msg->toMsgBase() ); @@ -229,14 +229,14 @@ void KMCommand::slotStart() this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); kmkernel->filterMgr()->ref(); - if (mMsgList.find(0) != -1) { + if (mMsgList.tqfind(0) != -1) { emit messagesTransfered( Failed ); return; } if ((mMsgList.count() == 1) && (mMsgList.getFirst()->isMessage()) && - (mMsgList.getFirst()->parent() == 0)) + (mMsgList.getFirst()->tqparent() == 0)) { // Special case of operating on message that isn't in a folder mRetrievedMsgs.append((KMMessage*)mMsgList.getFirst()); @@ -246,11 +246,11 @@ void KMCommand::slotStart() for ( KMMsgBase *mb = mMsgList.first(); mb; mb = mMsgList.next() ) { if ( mb ) { - if ( !mb->parent() ) { + if ( !mb->tqparent() ) { emit messagesTransfered( Failed ); return; } else { - keepFolderOpen( mb->parent() ); + keepFolderOpen( mb->tqparent() ); } } } @@ -271,7 +271,7 @@ void KMCommand::slotPostTransfer( KMCommand::Result result ) while ( (msg = it.current()) != 0 ) { ++it; - if (msg->parent()) + if (msg->tqparent()) msg->setTransferInProgress(false); } kmkernel->filterMgr()->deref(); @@ -315,27 +315,27 @@ void KMCommand::transferSelectedMsgs() thisMsg = static_cast<KMMessage*>(mb); else { - KMFolder *folder = mb->parent(); - int idx = folder->find(mb); + KMFolder *folder = mb->tqparent(); + int idx = folder->tqfind(mb); if (idx < 0) continue; thisMsg = folder->getMsg(idx); } if (!thisMsg) continue; if ( thisMsg->transferInProgress() && - thisMsg->parent()->folderType() == KMFolderTypeImap ) + thisMsg->tqparent()->folderType() == KMFolderTypeImap ) { thisMsg->setTransferInProgress( false, true ); - thisMsg->parent()->ignoreJobsForMessage( thisMsg ); + thisMsg->tqparent()->ignoreJobsForMessage( thisMsg ); } - if ( thisMsg->parent() && !thisMsg->isComplete() && + if ( thisMsg->tqparent() && !thisMsg->isComplete() && ( !mProgressDialog || !mProgressDialog->wasCancelled() ) ) { kdDebug(5006)<<"### INCOMPLETE\n"; // the message needs to be transferred first complete = false; KMCommand::mCountJobs++; - FolderJob *job = thisMsg->parent()->createJob(thisMsg); + FolderJob *job = thisMsg->tqparent()->createJob(thisMsg); job->setCancellable( false ); totalSize += thisMsg->msgSizeServer(); // emitted when the message was transferred successfully @@ -436,12 +436,12 @@ void KMCommand::slotTransferCancelled() KMMessage* msg; while ( (msg = it.current()) != 0 ) { - KMFolder *folder = msg->parent(); + KMFolder *folder = msg->tqparent(); ++it; if (!folder) continue; msg->setTransferInProgress(false); - int idx = folder->find(msg); + int idx = folder->tqfind(msg); if (idx > 0) folder->unGetMsg(idx); } mRetrievedMsgs.clear(); @@ -465,8 +465,8 @@ KMCommand::Result KMMailtoComposeCommand::execute() KMMessage *msg = new KMMessage; uint id = 0; - if ( mMessage && mMessage->parent() ) - id = mMessage->parent()->identity(); + if ( mMessage && mMessage->tqparent() ) + id = mMessage->tqparent()->identity(); msg->initHeader(id); msg->setCharset("utf-8"); @@ -481,9 +481,9 @@ KMCommand::Result KMMailtoComposeCommand::execute() } -KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *parent, +KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url, KMMessage *msg, const TQString &selection ) - :KMCommand( parent, msg ), mUrl( url ), mSelection( selection ) + :KMCommand( tqparent, msg ), mUrl( url ), mSelection( selection ) { } @@ -506,9 +506,9 @@ KMCommand::Result KMMailtoReplyCommand::execute() } -KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *parent, +KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url, KMMessage *msg ) - :KMCommand( parent, msg ), mUrl( url ) + :KMCommand( tqparent, msg ), mUrl( url ) { } @@ -530,8 +530,8 @@ KMCommand::Result KMMailtoForwardCommand::execute() } -KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent ) - : KMCommand( parent ), mUrl( url ) +KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent ) + : KMCommand( tqparent ), mUrl( url ) { } @@ -550,8 +550,8 @@ KMCommand::Result KMAddBookmarksCommand::execute() } KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url, - TQWidget *parent ) - : KMCommand( parent ), mUrl( url ) + TQWidget *tqparent ) + : KMCommand( tqparent ), mUrl( url ) { } @@ -565,8 +565,8 @@ KMCommand::Result KMMailtoAddAddrBookCommand::execute() KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url, - TQWidget *parent ) - : KMCommand( parent ), mUrl( url ) + TQWidget *tqparent ) + : KMCommand( tqparent ), mUrl( url ) { } @@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget ) KMCommand::Result KMUrlCopyCommand::execute() { - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::clipboard(); if (mUrl.protocol() == "mailto") { // put the url into the mouse selection and the clipboard @@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute() clip->setText( address ); clip->setSelectionMode( false ); clip->setText( address ); - KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." )); + KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." )); } else { // put the url into the mouse selection and the clipboard clip->setSelectionMode( true ); clip->setText( mUrl.url() ); clip->setSelectionMode( false ); clip->setText( mUrl.url() ); - KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." )); + KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." )); } return OK; @@ -623,8 +623,8 @@ KMCommand::Result KMUrlOpenCommand::execute() } -KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *parent ) - : KMCommand( parent ), mUrl( url ) +KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *tqparent ) + : KMCommand( tqparent ), mUrl( url ) { } @@ -632,14 +632,14 @@ KMCommand::Result KMUrlSaveCommand::execute() { if ( mUrl.isEmpty() ) return OK; - KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString::null, + KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString(), tqparentWidget() ); if ( saveUrl.isEmpty() ) return Canceled; if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) ) { if (KMessageBox::warningContinueCancel(0, - i18n("<qt>File <b>%1</b> exists.<br>Do you want to tqreplace it?</qt>") + i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) != KMessageBox::Continue) return Canceled; @@ -664,45 +664,45 @@ void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job ) } -KMEditMsgCommand::KMEditMsgCommand( TQWidget *parent, KMMessage *msg ) - :KMCommand( parent, msg ) +KMEditMsgCommand::KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg ) + :KMCommand( tqparent, msg ) { } KMCommand::Result KMEditMsgCommand::execute() { KMMessage *msg = retrievedMessage(); - if ( !msg || !msg->parent() || - ( !kmkernel->folderIsDraftOrOutbox( msg->parent() ) && - !kmkernel->folderIsTemplates( msg->parent() ) ) ) + if ( !msg || !msg->tqparent() || + ( !kmkernel->folderIsDraftOrOutbox( msg->tqparent() ) && + !kmkernel->folderIsTemplates( msg->tqparent() ) ) ) return Failed; - // Remember the old parent, we need it a bit further down to be able + // Remember the old tqparent, we need it a bit further down to be able // to put the unchanged messsage back in the original folder if the nth // edit is discarded, for n > 1. - KMFolder *parent = msg->parent(); - if ( parent ) - parent->take( parent->find( msg ) ); + KMFolder *tqparent = msg->tqparent(); + if ( tqparent ) + tqparent->take( tqparent->tqfind( msg ) ); KMail::Composer * win = KMail::makeComposer(); msg->setTransferInProgress(false); // From here on on, the composer owns the message. win->setMsg(msg, false, true); - win->setFolder( parent ); + win->setFolder( tqparent ); win->show(); return OK; } -KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *parent, KMMessage *msg ) - :KMCommand( parent, msg ) +KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg ) + :KMCommand( tqparent, msg ) { } KMCommand::Result KMUseTemplateCommand::execute() { KMMessage *msg = retrievedMessage(); - if ( !msg || !msg->parent() || - !kmkernel->folderIsTemplates( msg->parent() ) ) + if ( !msg || !msg->tqparent() || + !kmkernel->folderIsTemplates( msg->tqparent() ) ) return Failed; // Take a copy of the original message, which remains unchanged. @@ -721,9 +721,9 @@ KMCommand::Result KMUseTemplateCommand::execute() return OK; } -KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *parent, +KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *tqparent, KMMessage *msg, bool fixedFont ) - :KMCommand( parent, msg ), mFixedFont( fixedFont ) + :KMCommand( tqparent, msg ), mFixedFont( fixedFont ) { // remember complete state mMsgWasComplete = msg->isComplete(); @@ -763,7 +763,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute() static KURL subjectToUrl( const TQString & subject ) { - // We need to tqreplace colons with underscores since those cause problems with KFileDialog (bug + // We need to replace colons with underscores since those cause problems with KFileDialog (bug // in KFileDialog though) and also on Windows filesystems. // We also look at the special case of ": ", since converting that to "_ " would look strange, // simply "_" looks better. @@ -782,8 +782,8 @@ static KURL subjectToUrl( const TQString & subject ) return KFileDialog::getSaveURL( cleanSubject, filter ); } -KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg ) - : KMCommand( parent ), +KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg ) + : KMCommand( tqparent ), mMsgListIndex( 0 ), mStandAloneMessage( 0 ), mOffset( 0 ), @@ -797,8 +797,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg ) // from an .eml file. if ( msg->getMsgSerNum() != 0 ) { mMsgList.append( msg->getMsgSerNum() ); - if ( msg->parent() ) { - msg->parent()->open( "kmsavemsgcommand" ); + if ( msg->tqparent() ) { + msg->tqparent()->open( "kmsavemsgcommand" ); } } else { mStandAloneMessage = msg; @@ -806,9 +806,9 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg ) mUrl = subjectToUrl( msg->cleanSubject() ); } -KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, +KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ) - : KMCommand( parent ), + : KMCommand( tqparent ), mMsgListIndex( 0 ), mStandAloneMessage( 0 ), mOffset( 0 ), @@ -826,8 +826,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, while ( it.current() ) { mMsgList.append( (*it)->getMsgSerNum() ); mTotalSize += (*it)->msgSize(); - if ((*it)->parent() != 0) - (*it)->parent()->open("kmcommand"); + if ((*it)->tqparent() != 0) + (*it)->tqparent()->open("kmcommand"); ++it; } mMsgListIndex = 0; @@ -895,8 +895,8 @@ void KMSaveMsgCommand::slotSaveDataReq() slotMessageRetrievedForSaving( msg ); } else { // retrieve Message first - if ( msg->parent() && !msg->isComplete() ) { - FolderJob *job = msg->parent()->createJob( msg ); + if ( msg->tqparent() && !msg->isComplete() ) { + FolderJob *job = msg->tqparent()->createJob( msg ); job->setCancellable( false ); connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); @@ -944,12 +944,12 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg) } ++mMsgListIndex; // Get rid of the message. - if ( msg && msg->parent() && msg->getMsgSerNum() && + if ( msg && msg->tqparent() && msg->getMsgSerNum() && mUngetMsgs.tqcontains( msg ) ) { int idx = -1; KMFolder * p = 0; KMMsgDict::instance()->getLocation( msg, &p, &idx ); - assert( p == msg->parent() ); assert( idx >= 0 ); + assert( p == msg->tqparent() ); assert( idx >= 0 ); p->unGetMsg( idx ); p->close("kmcommand"); } @@ -962,7 +962,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) if (job->error() == KIO::ERR_FILE_ALREADY_EXIST) { if (KMessageBox::warningContinueCancel(0, - i18n("File %1 exists.\nDo you want to tqreplace it?") + i18n("File %1 exists.\nDo you want to replace it?") .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) { mOffset = 0; @@ -993,9 +993,9 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) //----------------------------------------------------------------------------- -KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *parent, const KURL & url, +KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *tqparent, const KURL & url, const TQString & encoding ) - : KMCommand( parent ), + : KMCommand( tqparent ), mUrl( url ), mEncoding( encoding ) { @@ -1041,7 +1041,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) else { int startOfMessage = 0; if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) { - startOfMessage = mMsgString.find( '\n' ); + startOfMessage = mMsgString.tqfind( '\n' ); if ( startOfMessage == -1 ) { KMessageBox::sorry( tqparentWidget(), i18n( "The file does not contain a message." ) ); @@ -1060,7 +1060,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) } // check for multiple messages in the file bool multipleMessages = true; - int endOfMessage = mMsgString.find( "\nFrom " ); + int endOfMessage = mMsgString.tqfind( "\nFrom " ); if ( endOfMessage == -1 ) { endOfMessage = mMsgString.length(); multipleMessages = false; @@ -1090,7 +1090,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) win->show(); if ( multipleMessages ) KMessageBox::information( win, - i18n( "The file tqcontains multiple messages. " + i18n( "The file contains multiple messages. " "Only the first message is shown." ) ); setResult( OK ); emit completed( this ); @@ -1102,9 +1102,9 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job ) //TODO: ReplyTo, NoQuoteReplyTo, ReplyList, ReplyToAll, ReplyAuthor // are all similar and should be factored -KMReplyToCommand::KMReplyToCommand( TQWidget *parent, KMMessage *msg, +KMReplyToCommand::KMReplyToCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection ) - : KMCommand( parent, msg ), mSelection( selection ) + : KMCommand( tqparent, msg ), mSelection( selection ) { } @@ -1125,9 +1125,9 @@ KMCommand::Result KMReplyToCommand::execute() } -KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *parent, +KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *tqparent, KMMessage *msg ) - : KMCommand( parent, msg ) + : KMCommand( tqparent, msg ) { } @@ -1148,9 +1148,9 @@ KMCommand::Result KMNoQuoteReplyToCommand::execute() } -KMReplyListCommand::KMReplyListCommand( TQWidget *parent, +KMReplyListCommand::KMReplyListCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection ) - : KMCommand( parent, msg ), mSelection( selection ) + : KMCommand( tqparent, msg ), mSelection( selection ) { } @@ -1171,9 +1171,9 @@ KMCommand::Result KMReplyListCommand::execute() } -KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *parent, +KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection ) - :KMCommand( parent, msg ), mSelection( selection ) + :KMCommand( tqparent, msg ), mSelection( selection ) { } @@ -1194,9 +1194,9 @@ KMCommand::Result KMReplyToAllCommand::execute() } -KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg, +KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection ) - : KMCommand( parent, msg ), mSelection( selection ) + : KMCommand( tqparent, msg ), mSelection( selection ) { } @@ -1217,16 +1217,16 @@ KMCommand::Result KMReplyAuthorCommand::execute() } -KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent, +KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity ) - : KMCommand( parent, msgList ), + : KMCommand( tqparent, msgList ), mIdentity( identity ) { } -KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent, +KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent, KMMessage *msg, uint identity ) - : KMCommand( parent, msg ), + : KMCommand( tqparent, msg ), mIdentity( identity ) { } @@ -1290,16 +1290,16 @@ KMCommand::Result KMForwardInlineCommand::execute() } -KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent, +KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win ) - : KMCommand( parent, msgList ), mIdentity( identity ), + : KMCommand( tqparent, msgList ), mIdentity( identity ), mWin( TQGuardedPtr<KMail::Composer>( win )) { } -KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent, +KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent, KMMessage * msg, uint identity, KMail::Composer *win ) - : KMCommand( parent, msg ), mIdentity( identity ), + : KMCommand( tqparent, msg ), mIdentity( identity ), mWin( TQGuardedPtr< KMail::Composer >( win )) { } @@ -1353,16 +1353,16 @@ KMCommand::Result KMForwardAttachedCommand::execute() } -KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent, +KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win ) - : KMCommand( parent, msgList ), mIdentity( identity ), + : KMCommand( tqparent, msgList ), mIdentity( identity ), mWin( TQGuardedPtr<KMail::Composer>( win )) { } -KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent, +KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent, KMMessage * msg, uint identity, KMail::Composer *win ) - : KMCommand( parent, msg ), mIdentity( identity ), + : KMCommand( tqparent, msg ), mIdentity( identity ), mWin( TQGuardedPtr< KMail::Composer >( win )) { } @@ -1440,9 +1440,9 @@ KMCommand::Result KMForwardDigestCommand::execute() return OK; } -KMRedirectCommand::KMRedirectCommand( TQWidget *parent, +KMRedirectCommand::KMRedirectCommand( TQWidget *tqparent, KMMessage *msg ) - : KMCommand( parent, msg ) + : KMCommand( tqparent, msg ) { } @@ -1470,10 +1470,10 @@ KMCommand::Result KMRedirectCommand::execute() } -KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg, +KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection, const TQString &tmpl ) - : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl ) + : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl ) { } @@ -1495,10 +1495,10 @@ KMCommand::Result KMCustomReplyToCommand::execute() } -KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg, +KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection, const TQString &tmpl ) - : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl ) + : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl ) { } @@ -1520,16 +1520,16 @@ KMCommand::Result KMCustomReplyAllToCommand::execute() } -KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent, +KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl ) - : KMCommand( parent, msgList ), + : KMCommand( tqparent, msgList ), mIdentity( identity ), mTemplate( tmpl ) { } -KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent, +KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent, KMMessage *msg, uint identity, const TQString &tmpl ) - : KMCommand( parent, msg ), + : KMCommand( tqparent, msg ), mIdentity( identity ), mTemplate( tmpl ) { } @@ -1593,12 +1593,12 @@ KMCommand::Result KMCustomForwardCommand::execute() } -KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg, +KMPrintCommand::KMPrintCommand( TQWidget *tqparent, KMMessage *msg, const KMail::HeaderStyle *headerStyle, const KMail::HeaderStrategy *headerStrategy, bool htmlOverride, bool htmlLoadExtOverride, bool useFixedFont, const TQString & encoding ) - : KMCommand( parent, msg ), + : KMCommand( tqparent, msg ), mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ), mHtmlOverride( htmlOverride ), mHtmlLoadExtOverride( htmlLoadExtOverride ), @@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute() } -KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status, +KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &serNums, bool toggle ) - : mStatus( status ), mSerNums( serNums ), mToggle( toggle ) + : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle ) { } @@ -1650,19 +1650,19 @@ KMCommand::Result KMSeStatusCommand::execute() TQValueListIterator<TQ_UINT32> it; int idx = -1; KMFolder *folder = 0; - bool parenStatus = false; + bool tqparentqStatus = false; // Toggle actions on threads toggle the whole thread - // depending on the state of the parent. + // depending on the state of the tqparent. if (mToggle) { KMMsgBase *msg; KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx ); if (folder) { msg = folder->getMsgBase(idx); - if (msg && (msg->status()&mStatus)) - parenStatus = true; + if (msg && (msg->status()&mtqStatus)) + tqparentqStatus = true; else - parenStatus = false; + tqparentqStatus = false; } } TQMap< KMFolder*, TQValueList<int> > folderMap; @@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute() KMMsgBase *msg = folder->getMsgBase(idx); // check if we are already at the target toggle state if (msg) { - bool myStatus; - if (msg->status()&mStatus) - myStatus = true; + bool mytqStatus; + if (msg->status()&mtqStatus) + mytqStatus = true; else - myStatus = false; - if (myStatus != parenStatus) + mytqStatus = false; + if (mytqStatus != tqparentqStatus) continue; } } @@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin(); while ( it2 != folderMap.end() ) { KMFolder *f = it2.key(); - f->seStatus( (*it2), mStatus, mToggle ); + f->setqStatus( (*it2), mtqStatus, mToggle ); ++it2; } //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); @@ -1712,10 +1712,10 @@ KMCommand::Result KMFilterCommand::execute() } -KMFilterActionCommand::KMFilterActionCommand( TQWidget *parent, +KMFilterActionCommand::KMFilterActionCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, KMFilter *filter ) - : KMCommand( parent, msgList ), mFilter( filter ) + : KMCommand( tqparent, msgList ), mFilter( filter ) { TQPtrListIterator<KMMsgBase> it(msgList); while ( it.current() ) { @@ -1742,7 +1742,7 @@ KMCommand::Result KMFilterActionCommand::execute() progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); - KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg ); + KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1821,9 +1821,9 @@ void FolderShortcutCommand::setAction( KAction* action ) mAction = action; } -KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *parent, +KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *tqparent, KMMessage *msg ) - : KMCommand( parent, msg ) + : KMCommand( tqparent, msg ) { } @@ -1984,12 +1984,12 @@ KMCommand::Result KMCopyCommand::execute() for (msgBase = mMsgList.first(); msgBase; msgBase = mMsgList.next() ) { - KMFolder *srcFolder = msgBase->parent(); + KMFolder *srcFolder = msgBase->tqparent(); if (( isMessage = msgBase->isMessage() )) { msg = static_cast<KMMessage*>(msgBase); } else { - idx = srcFolder->find(msgBase); + idx = srcFolder->tqfind(msgBase); assert(idx != -1); msg = srcFolder->getMsg(idx); // corrupt IMAP cache, see FolderStorage::getMsg() @@ -2015,12 +2015,12 @@ KMCommand::Result KMCopyCommand::execute() // make sure the attachment state is only calculated when it's complete if (!newMsg->isComplete()) newMsg->setReadyToShow(false); - newMsg->seStatus(msg->status()); + newMsg->setqStatus(msg->status()); if (srcFolder && !newMsg->isComplete()) { // imap => others - newMsg->setParent(msg->parent()); + newMsg->setParent(msg->tqparent()); FolderJob *job = srcFolder->createJob(newMsg); job->setCancellable( false ); mPendingJobs << job; @@ -2307,7 +2307,7 @@ void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool succe void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum) { - if ( folder != mDestFolder || mLostBoys.find( serNum ) == mLostBoys.end() ) { + if ( folder != mDestFolder || mLostBoys.tqfind( serNum ) == mLostBoys.end() ) { //kdDebug(5006) << "KMMoveCommand::msgAddedToDestFolder different " // "folder or invalid serial number." << endl; return; @@ -2421,7 +2421,7 @@ KMCommand::Result KMUrlClickedCommand::execute() TQString query=mUrl.query(); while (!query.isEmpty()) { TQString queryPart; - int secondQuery = query.find('?',1); + int secondQuery = query.tqfind('?',1); if (secondQuery != -1) queryPart = query.left(secondQuery); else @@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute() (mUrl.protocol() == "smb") || (mUrl.protocol() == "fish") || (mUrl.protocol() == "news")) { - KPIM::BroadcasStatus::instance()->seStatusMsg( i18n("Opening URL...")); + KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n("Opening URL...")); KMimeType::Ptr mime = KMimeType::findByURL( mUrl ); if (mime->name() == "application/x-desktop" || mime->name() == "application/x-executable" || @@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute() mime->name() == "application/x-shellscript" ) { if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" ) - .arg( mUrl.prettyURL() ), TQString::null, i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) + .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) return Canceled; } KRun * runner = new KRun( mUrl ); @@ -2473,19 +2473,19 @@ KMCommand::Result KMUrlClickedCommand::execute() return OK; } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg ) - : KMCommand( parent, msg ), mImplicitAttachments( true ), mEncoded( false ) +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg ) + : KMCommand( tqparent, msg ), mImplicitAttachments( true ), mEncoded( false ) { } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs ) - : KMCommand( parent, msgs ), mImplicitAttachments( true ), mEncoded( false ) +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs ) + : KMCommand( tqparent, msgs ), mImplicitAttachments( true ), mEncoded( false ) { } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode>& attachments, +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode>& attachments, KMMessage *msg, bool encoded ) - : KMCommand( parent ), mImplicitAttachments( false ), mEncoded( encoded ) + : KMCommand( tqparent ), mImplicitAttachments( false ), mEncoded( encoded ) { for ( TQPtrListIterator<partNode> it( attachments ); it.current(); ++it ) { mAttachmentMap.insert( it.current(), msg ); @@ -2534,7 +2534,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() // considered attachments if ( it.key()->msgPart().fileName().stripWhiteSpace().isEmpty() && ( it.key()->msgPart().name().stripWhiteSpace().isEmpty() || - !it.key()->parentNode() ) ) { + !it.key()->tqparentNode() ) ) { PartNodeMessageMap::iterator delIt = it; ++it; mAttachmentMap.remove( delIt ); @@ -2554,7 +2554,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() KURL url, dirUrl; if ( mAttachmentMap.count() > 1 ) { // get the dir - dirUrl = KDirSelectDialog::selectDirectory( TQString::null, false, + dirUrl = KDirSelectDialog::selectDirectory( TQString(), false, tqparentWidget(), i18n("Save Attachments To") ); if ( !dirUrl.isValid() ) { @@ -2570,15 +2570,15 @@ void KMSaveAttachmentsCommand::slotSaveAll() else { // only one item, get the desired filename partNode *node = mAttachmentMap.begin().key(); - // tqreplace all ':' with '_' because ':' isn't allowed on FAT volumes + // replace all ':' with '_' because ':' isn't allowed on FAT volumes TQString s = node->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' ); if ( s.isEmpty() ) s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' ); if ( s.isEmpty() ) s = i18n("filename for an unnamed attachment", "attachment.1"); - url = KFileDialog::getSaveURL( s, TQString::null, tqparentWidget(), - TQString::null ); + url = KFileDialog::getSaveURL( s, TQString(), tqparentWidget(), + TQString() ); if ( url.isEmpty() ) { setResult( Canceled ); emit completed( this ); @@ -2759,7 +2759,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, } // #79685 by default use the umask the user defined, but let it be configurable - if ( GlobalSettings::self()->disregardUmask() ) + if ( GlobalSettings::self()->disregardUtqmask() ) fchmod( file.handle(), S_IRUSR | S_IWUSR ); ds.setDevice( &file ); @@ -2814,7 +2814,7 @@ void KMLoadPartsCommand::slotStart() !it.key()->msgPart().partSpecifier().isEmpty() ) { // incomplete part, so retrieve it first ++mNeedsRetrieval; - KMFolder* curFolder = it.data()->parent(); + KMFolder* curFolder = it.data()->tqparent(); if ( curFolder ) { FolderJob *job = curFolder->createJob( it.data(), FolderJob::tGetMessage, @@ -2824,7 +2824,7 @@ void KMLoadPartsCommand::slotStart() this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); job->start(); } else - kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl; + kdWarning(5006) << "KMLoadPartsCommand - msg has no tqparent" << endl; } } if ( mNeedsRetrieval == 0 ) @@ -2860,9 +2860,9 @@ KMCommand::Result KMLoadPartsCommand::execute() return OK; } -KMResendMessageCommand::KMResendMessageCommand( TQWidget *parent, +KMResendMessageCommand::KMResendMessageCommand( TQWidget *tqparent, KMMessage *msg ) - :KMCommand( parent, msg ) + :KMCommand( tqparent, msg ) { } @@ -2892,8 +2892,8 @@ KMCommand::Result KMResendMessageCommand::execute() return OK; } -KMMailingListCommand::KMMailingListCommand( TQWidget *parent, KMFolder *folder ) - : KMCommand( parent ), mFolder( folder ) +KMMailingListCommand::KMMailingListCommand( TQWidget *tqparent, KMFolder *folder ) + : KMCommand( tqparent ), mFolder( folder ) { } @@ -2931,8 +2931,8 @@ void KMMailingListCommand::commandCompleted( KMCommand *command ) deleteLater(); } -KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *parent, KMFolder *folder ) - : KMMailingListCommand( parent, folder ) +KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder ) + : KMMailingListCommand( tqparent, folder ) { } KURL::List KMMailingListPostCommand::urls() const @@ -2940,8 +2940,8 @@ KURL::List KMMailingListPostCommand::urls() const return mFolder->mailingList().postURLS(); } -KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder ) - : KMMailingListCommand( parent, folder ) +KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder ) + : KMMailingListCommand( tqparent, folder ) { } KURL::List KMMailingListSubscribeCommand::urls() const @@ -2949,8 +2949,8 @@ KURL::List KMMailingListSubscribeCommand::urls() const return mFolder->mailingList().subscribeURLS(); } -KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder ) - : KMMailingListCommand( parent, folder ) +KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder ) + : KMMailingListCommand( tqparent, folder ) { } KURL::List KMMailingListUnsubscribeCommand::urls() const @@ -2958,8 +2958,8 @@ KURL::List KMMailingListUnsubscribeCommand::urls() const return mFolder->mailingList().unsubscribeURLS(); } -KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder ) - : KMMailingListCommand( parent, folder ) +KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder ) + : KMMailingListCommand( tqparent, folder ) { } KURL::List KMMailingListArchivesCommand::urls() const @@ -2967,8 +2967,8 @@ KURL::List KMMailingListArchivesCommand::urls() const return mFolder->mailingList().archiveURLS(); } -KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder ) - : KMMailingListCommand( parent, folder ) +KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder ) + : KMMailingListCommand( tqparent, folder ) { } KURL::List KMMailingListHelpCommand::urls() const @@ -2987,7 +2987,7 @@ KMCommand::Result KMIMChatCommand::execute() TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() ); // find UID for mail address KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddresseeList addressees = addressBook->tqfindByEmail( KPIM::getEmailAddress( addr ) ) ; + KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ; // start chat if( addressees.count() == 1 ) { @@ -3022,8 +3022,8 @@ KMCommand::Result KMIMChatCommand::execute() KMHandleAttachmentCommand::KMHandleAttachmentCommand( partNode* node, KMMessage* msg, int atmId, const TQString& atmName, - AttachmentAction action, KService::Ptr offer, TQWidget* parent ) -: KMCommand( parent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ), + AttachmentAction action, KService::Ptr offer, TQWidget* tqparent ) +: KMCommand( tqparent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ), mAction( action ), mOffer( offer ), mJob( 0 ) { } @@ -3109,7 +3109,7 @@ TQString KMHandleAttachmentCommand::createAtmFileLink() const if ( ::link(TQFile::encodeName( mAtmName ), TQFile::encodeName( linkName )) == 0 ) { return linkName; // success } - return TQString::null; + return TQString(); } KService::Ptr KMHandleAttachmentCommand::getServiceOffer() @@ -3128,13 +3128,13 @@ KService::Ptr KMHandleAttachmentCommand::getServiceOffer() mimetype = KMimeType::mimeType( contentTypeStr ); if ( mimetype->name() == "application/octet-stream" ) { // consider the filename if Content-Type is application/octet-stream - mimetype = KMimeType::tqfindByPath( mAtmName, 0, true /* no disk access */ ); + mimetype = KMimeType::findByPath( mAtmName, 0, true /* no disk access */ ); } if ( ( mimetype->name() == "application/octet-stream" ) && msgPart.isComplete() ) { // consider the attachment's contents if neither the Content-Type header // nor the filename give us a clue - mimetype = KMimeType::tqfindByFileContent( mAtmName ); + mimetype = KMimeType::findByFileContent( mAtmName ); } return KServiceTypeProfile::preferredService( mimetype->name(), "Application" ); } @@ -3325,7 +3325,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E return; } - const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, tqparentWidget() ); + const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), tqparentWidget() ); if ( url.isEmpty() ) return; @@ -3349,15 +3349,15 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job } -AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * parent) : - KMCommand( parent, msg ), +AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) : + KMCommand( tqparent, msg ), mPartIndex( node->nodeId() ), mSernum( 0 ) { } -AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent ) - : KMCommand( parent, msg ), +AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ) + : KMCommand( tqparent, msg ), mPartIndex( nodeId ), mSernum( 0 ) { @@ -3374,7 +3374,7 @@ KMCommand::Result AttachmentModifyCommand::execute() return Failed; mSernum = msg->getMsgSerNum(); - mFolder = msg->parent(); + mFolder = msg->tqparent(); if ( !mFolder || !mFolder->storage() ) return Failed; @@ -3427,14 +3427,14 @@ void AttachmentModifyCommand::messageDeleteResult(KMCommand * cmd) deleteLater(); } -KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) : - AttachmentModifyCommand( node, msg, parent ) +KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) : + AttachmentModifyCommand( node, msg, tqparent ) { kdDebug(5006) << k_funcinfo << endl; } -KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ) - : AttachmentModifyCommand( nodeId, msg, parent ) +KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ) + : AttachmentModifyCommand( nodeId, msg, tqparent ) { kdDebug(5006) << k_funcinfo << endl; } @@ -3452,22 +3452,22 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify() KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setqStatus( msg->status() ); storeChangedMessage( newMsg ); return OK; } -KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) : - AttachmentModifyCommand( node, msg, parent ) +KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) : + AttachmentModifyCommand( node, msg, tqparent ) { kdDebug(5006) << k_funcinfo << endl; mTempFile.setAutoDelete( true ); } -KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ) - : AttachmentModifyCommand( nodeId, msg, parent ) +KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ) + : AttachmentModifyCommand( nodeId, msg, tqparent ) { kdDebug(5006) << k_funcinfo << endl; mTempFile.setAutoDelete( true ); @@ -3529,28 +3529,28 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) DwBodyPart *dwpart = msg->findPart( mPartIndex ); KMMessage::bodyPart( dwpart, &part, true ); - DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); - assert( parentNode ); - parentNode->RemoveBodyPart( dwpart ); + DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); + assert( tqparentNode ); + tqparentNode->RemoveBodyPart( dwpart ); KMMessagePart att; att.duplicate( part ); att.setBodyEncodedBinary( data ); DwBodyPart* newDwPart = msg->createDWBodyPart( &att ); - parentNode->AddBodyPart( newDwPart ); + tqparentNode->AddBodyPart( newDwPart ); msg->getTopLevelPart()->Assemble(); KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setqStatus( msg->status() ); storeChangedMessage( newMsg ); } -CreateTodoCommand::CreateTodoCommand(TQWidget * parent, KMMessage * msg) - : KMCommand( parent, msg ) +CreateTodoCommand::CreateTodoCommand(TQWidget * tqparent, KMMessage * msg) + : KMCommand( tqparent, msg ) { } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 5fbebb65c..173f98ee6 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -11,7 +11,7 @@ #include <tqtimer.h> #include <tqfont.h> #include <kio/job.h> -#include "kmmsgbase.h" // for KMMsgStatus +#include "kmmsgbase.h" // for KMMsgtqStatus #include <mimelib/string.h> #include <kdepimmacros.h> #include <kservice.h> @@ -48,22 +48,23 @@ namespace Kleo { class SpecialJob; } typedef TQMap<int,KMFolder*> KMMenuToFolder; typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap; -class KDE_EXPORT KMCommand : public QObject +class KDE_EXPORT KMCommand : public TQObject { Q_OBJECT + TQ_OBJECT friend class LaterDeleterWithCommandCompletion; public: enum Result { Undefined, OK, Canceled, Failed }; // Trival constructor, don't retrieve any messages - KMCommand( TQWidget *parent = 0 ); + KMCommand( TQWidget *tqparent = 0 ); // Retrieve all messages in msgList when start is called. - KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ); + KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ); // Retrieve the single message msgBase when start is called. - KMCommand( TQWidget *parent, KMMsgBase *msgBase ); + KMCommand( TQWidget *tqparent, KMMsgBase *msgBase ); // Retrieve the single message msgBase when start is called. - KMCommand( TQWidget *parent, KMMessage *message ); + KMCommand( TQWidget *tqparent, KMMessage *message ); virtual ~KMCommand(); /** These folders will be closed by the dtor, handy, if you need to keep @@ -97,7 +98,7 @@ protected: const TQPtrList<KMMessage> retrievedMsgs() const; // Returns the single message retrieved KMMessage *retrievedMessage() const; - // Returns the parent widget + // Returns the tqparent widget TQWidget *tqparentWidget() const; bool deletesItself() { return mDeletesItself; } @@ -164,6 +165,7 @@ private: class KDE_EXPORT KMMailtoComposeCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMMailtoComposeCommand( const KURL &url, KMMessage *msg=0 ); @@ -178,9 +180,10 @@ private: class KDE_EXPORT KMMailtoReplyCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMMailtoReplyCommand( TQWidget *parent, const KURL &url, + KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url, KMMessage *msg, const TQString &selection ); private: @@ -193,9 +196,10 @@ private: class KDE_EXPORT KMMailtoForwardCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMMailtoForwardCommand( TQWidget *parent, const KURL &url, + KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url, KMMessage *msg ); private: @@ -207,9 +211,10 @@ private: class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent ); + KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *tqparent ); private: virtual Result execute(); @@ -220,9 +225,10 @@ private: class KDE_EXPORT KMAddBookmarksCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMAddBookmarksCommand( const KURL &url, TQWidget *parent ); + KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent ); private: virtual Result execute(); @@ -234,9 +240,10 @@ private: class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent ); + KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *tqparent ); private: virtual Result execute(); @@ -247,6 +254,7 @@ private: class KDE_EXPORT KMUrlCopyCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget = 0 ); @@ -261,6 +269,7 @@ private: class KDE_EXPORT KMUrlOpenCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMUrlOpenCommand( const KURL &url, KMReaderWin *readerWin ); @@ -275,9 +284,10 @@ private: class KDE_EXPORT KMUrlSaveCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMUrlSaveCommand( const KURL &url, TQWidget *parent ); + KMUrlSaveCommand( const KURL &url, TQWidget *tqparent ); private slots: void slotUrlSaveResult( KIO::Job *job ); @@ -291,9 +301,10 @@ private: class KDE_EXPORT KMEditMsgCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMEditMsgCommand( TQWidget *parent, KMMessage *msg ); + KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg ); private: virtual Result execute(); @@ -302,9 +313,10 @@ private: class KDE_EXPORT KMUseTemplateCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMUseTemplateCommand( TQWidget *parent, KMMessage *msg ); + KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg ); private: virtual Result execute(); @@ -313,9 +325,10 @@ private: class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg, + KMShowMsgSrcCommand( TQWidget *tqparent, KMMessage *msg, bool fixedFont ); virtual Result execute(); @@ -327,10 +340,11 @@ private: class KDE_EXPORT KMSaveMsgCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ); - KMSaveMsgCommand( TQWidget *parent, KMMessage * msg ); + KMSaveMsgCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList ); + KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg ); KURL url(); private: @@ -358,9 +372,10 @@ private: class KDE_EXPORT KMOpenMsgCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(), + KMOpenMsgCommand( TQWidget *tqparent, const KURL & url = KURL(), const TQString & encoding = TQString() ); private: @@ -381,26 +396,27 @@ private: class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: /** Use this to save all attachments of the given message. - @param parent The parent widget of the command used for message boxes. + @param tqparent The tqparent widget of the command used for message boxes. @param msg The message of which the attachments should be saved. */ - KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg ); + KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg ); /** Use this to save all attachments of the given messages. - @param parent The parent widget of the command used for message boxes. + @param tqparent The tqparent widget of the command used for message boxes. @param msgs The messages of which the attachments should be saved. */ - KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs ); + KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs ); /** Use this to save the specified attachments of the given message. - @param parent The parent widget of the command used for message + @param tqparent The tqparent widget of the command used for message boxes. @param attachments The attachments that should be saved. @param msg The message that the attachments belong to. @param encoded True if the transport encoding should not be removed when the attachment is saved. */ - KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode> &attachments, + KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode> &attachments, KMMessage *msg, bool encoded = false ); private slots: @@ -419,10 +435,11 @@ private: class KDE_EXPORT KMReplyToCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMReplyToCommand( TQWidget *parent, KMMessage *msg, - const TQString &selection = TQString::null ); + KMReplyToCommand( TQWidget *tqparent, KMMessage *msg, + const TQString &selection = TQString() ); private: virtual Result execute(); @@ -434,9 +451,10 @@ private: class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg ); + KMNoQuoteReplyToCommand( TQWidget *tqparent, KMMessage *msg ); private: virtual Result execute(); @@ -445,10 +463,11 @@ private: class KMReplyListCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMReplyListCommand( TQWidget *parent, KMMessage *msg, - const TQString &selection = TQString::null ); + KMReplyListCommand( TQWidget *tqparent, KMMessage *msg, + const TQString &selection = TQString() ); private: virtual Result execute(); @@ -460,10 +479,11 @@ private: class KDE_EXPORT KMReplyToAllCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMReplyToAllCommand( TQWidget *parent, KMMessage *msg, - const TQString &selection = TQString::null ); + KMReplyToAllCommand( TQWidget *tqparent, KMMessage *msg, + const TQString &selection = TQString() ); private: virtual Result execute(); @@ -475,10 +495,11 @@ private: class KDE_EXPORT KMReplyAuthorCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg, - const TQString &selection = TQString::null ); + KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg, + const TQString &selection = TQString() ); private: virtual Result execute(); @@ -490,11 +511,12 @@ private: class KDE_EXPORT KMForwardInlineCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, + KMForwardInlineCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity = 0 ); - KMForwardInlineCommand( TQWidget *parent, KMMessage * msg, + KMForwardInlineCommand( TQWidget *tqparent, KMMessage * msg, uint identity = 0 ); private: @@ -507,11 +529,12 @@ private: class KDE_EXPORT KMForwardAttachedCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, + KMForwardAttachedCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity = 0, KMail::Composer *win = 0 ); - KMForwardAttachedCommand( TQWidget *parent, KMMessage * msg, + KMForwardAttachedCommand( TQWidget *tqparent, KMMessage * msg, uint identity = 0, KMail::Composer *win = 0 ); private: @@ -524,11 +547,12 @@ private: class KDE_EXPORT KMForwardDigestCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, + KMForwardDigestCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity = 0, KMail::Composer *win = 0 ); - KMForwardDigestCommand( TQWidget *parent, KMMessage * msg, + KMForwardDigestCommand( TQWidget *tqparent, KMMessage * msg, uint identity = 0, KMail::Composer *win = 0 ); private: @@ -541,9 +565,10 @@ private: class KDE_EXPORT KMRedirectCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMRedirectCommand( TQWidget *parent, KMMessage *msg ); + KMRedirectCommand( TQWidget *tqparent, KMMessage *msg ); private: virtual Result execute(); @@ -552,9 +577,10 @@ private: class KDE_EXPORT KMCustomReplyToCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg, + KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection, const TQString &tmpl ); @@ -569,9 +595,10 @@ private: class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg, + KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg, const TQString &selection, const TQString &tmpl ); @@ -586,11 +613,12 @@ private: class KDE_EXPORT KMCustomForwardCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, + KMCustomForwardCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl ); - KMCustomForwardCommand( TQWidget *parent, KMMessage * msg, + KMCustomForwardCommand( TQWidget *tqparent, KMMessage * msg, uint identity, const TQString &tmpl ); private: @@ -603,9 +631,10 @@ private: class KDE_EXPORT KMPrintCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMPrintCommand( TQWidget *parent, KMMessage *msg, + KMPrintCommand( TQWidget *tqparent, KMMessage *msg, const KMail::HeaderStyle *headerStyle = 0, const KMail::HeaderStrategy *headerStrategy = 0, bool htmlOverride = false, @@ -630,16 +659,17 @@ private: class KDE_EXPORT KMSeStatusCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: // Serial numbers - KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &, + KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &, bool toggle=false ); private: virtual Result execute(); - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; TQValueList<TQ_UINT32> mSerNums; TQValueList<int> mIds; bool mToggle; @@ -648,6 +678,7 @@ private: class KDE_EXPORT KMFilterCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMFilterCommand( const TQCString &field, const TQString &value ); @@ -663,9 +694,10 @@ private: class KDE_EXPORT KMFilterActionCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMFilterActionCommand( TQWidget *parent, + KMFilterActionCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList, KMFilter *filter ); @@ -676,9 +708,10 @@ private: }; -class KDE_EXPORT KMMetaFilterActionCommand : public QObject +class KDE_EXPORT KMMetaFilterActionCommand : public TQObject { Q_OBJECT + TQ_OBJECT public: KMMetaFilterActionCommand( KMFilter *filter, KMHeaders *headers, @@ -693,9 +726,10 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT FolderShortcutCommand : public QObject +class KDE_EXPORT FolderShortcutCommand : public TQObject { Q_OBJECT + TQ_OBJECT public: FolderShortcutCommand( KMMainWidget* mainwidget, KMFolder *folder ); @@ -718,9 +752,10 @@ private: class KDE_EXPORT KMMailingListFilterCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg ); + KMMailingListFilterCommand( TQWidget *tqparent, KMMessage *msg ); private: virtual Result execute(); @@ -737,6 +772,7 @@ private: class KDE_EXPORT KMMenuCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: static void folderToPopupMenu(bool move, TQObject *receiver, @@ -749,6 +785,7 @@ public: class KDE_EXPORT KMCopyCommand : public KMMenuCommand { Q_OBJECT + TQ_OBJECT public: KMCopyCommand( KMFolder* destFolder, @@ -774,6 +811,7 @@ namespace KPIM { class KDE_EXPORT KMMoveCommand : public KMMenuCommand { Q_OBJECT + TQ_OBJECT public: KMMoveCommand( KMFolder* destFolder, const TQPtrList<KMMsgBase> &msgList ); @@ -809,6 +847,7 @@ private: class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand { Q_OBJECT + TQ_OBJECT public: KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList ); @@ -823,6 +862,7 @@ private: class KDE_EXPORT KMUrlClickedCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMUrlClickedCommand( const KURL &url, uint identity, @@ -841,6 +881,7 @@ private: class KDE_EXPORT KMLoadPartsCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMLoadPartsCommand( TQPtrList<partNode>& parts, KMMessage* msg ); @@ -866,9 +907,10 @@ private: class KDE_EXPORT KMResendMessageCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 ); + KMResendMessageCommand( TQWidget *tqparent, KMMessage *msg=0 ); private: virtual Result execute(); @@ -877,8 +919,9 @@ private: class KDE_EXPORT KMMailingListCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListCommand( TQWidget *parent, KMFolder *folder ); + KMMailingListCommand( TQWidget *tqparent, KMFolder *folder ); private: virtual Result execute(); private slots: @@ -892,8 +935,9 @@ protected: class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListPostCommand( TQWidget *parent, KMFolder *folder ); + KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -901,8 +945,9 @@ protected: class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder ); + KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -910,8 +955,9 @@ protected: class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder ); + KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -919,8 +965,9 @@ protected: class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder ); + KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -928,8 +975,9 @@ protected: class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand { Q_OBJECT + TQ_OBJECT public: - KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder ); + KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder ); protected: virtual KURL::List urls() const; }; @@ -937,6 +985,7 @@ protected: class KDE_EXPORT KMIMChatCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: KMIMChatCommand( const KURL &url, KMMessage *msg=0 ); @@ -957,6 +1006,7 @@ private: class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: /** Supported types of attachment handling */ @@ -979,7 +1029,7 @@ public: * @param offer specify a KService that should handle the "open" action, 0 otherwise */ KMHandleAttachmentCommand( partNode* node, KMMessage* msg, int atmId, - const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* parent ); + const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* tqparent ); signals: @@ -1043,9 +1093,10 @@ private: class KDE_EXPORT AttachmentModifyCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent ); - AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent ); + AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *tqparent ); + AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ); ~AttachmentModifyCommand(); protected: @@ -1070,9 +1121,10 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand { Q_OBJECT + TQ_OBJECT public: - KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); - KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ); + KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent ); + KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ); ~KMDeleteAttachmentCommand(); protected: @@ -1083,9 +1135,10 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand { Q_OBJECT + TQ_OBJECT public: - KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); - KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ); + KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent ); + KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent ); ~KMEditAttachmentCommand(); protected: @@ -1101,8 +1154,9 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand class KDE_EXPORT CreateTodoCommand : public KMCommand { Q_OBJECT + TQ_OBJECT public: - CreateTodoCommand( TQWidget *parent, KMMessage *msg ); + CreateTodoCommand( TQWidget *tqparent, KMMessage *msg ); private: Result execute(); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index e6ec6f967..98a5c6e0a 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -196,7 +196,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) setInstance( kmkernel->xmlGuiInstance() ); mMainWidget = new TQWidget(this); // splitter between the headers area and the actual editor - mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); + mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); @@ -331,9 +331,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mFixedFontAction = 0; mTempDir = 0; // the attachment view is separated from the editor by a splitter - mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); + mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); mSplitter->setChildrenCollapsible( false ); - mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter"); + mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter"); mSnippetSplitter->setChildrenCollapsible( false ); TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter ); @@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) TQHBoxLayout *hbox = new TQHBoxLayout( vbox ); { mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mSignatureStateIndicator->tqsetAlignment( Qt::AlignHCenter ); + mSignatureStateIndicator->tqsetAlignment( TQt::AlignHCenter ); hbox->addWidget( mSignatureStateIndicator ); KConfigGroup reader( KMKernel::config(), "Reader" ); @@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mSignatureStateIndicator->setPalette( p ); mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mEncryptionStateIndicator->tqsetAlignment( Qt::AlignHCenter ); + mEncryptionStateIndicator->tqsetAlignment( TQt::AlignHCenter ); hbox->addWidget( mEncryptionStateIndicator ); p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) ); mEncryptionStateIndicator->setPalette( p ); @@ -369,7 +369,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mSplitter->setOpaqueResize( true ); mEditor->initializeAutoSpellChecking(); - mEditor->setTextFormat(Qt::PlainText); + mEditor->setTextFormat(TQt::PlainText); mEditor->setAcceptDrops( true ); TQWhatsThis::add( mBtnIdentity, @@ -557,7 +557,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&))); for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) { if (!addAttach( *itr )) - mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url + mAttachFilesPending.remove(mAttachFilesPending.tqfind(*itr)); // only remove one copy of the url } if (mAttachFilesPending.isEmpty() && mAttachFilesSend == how) @@ -571,7 +571,7 @@ void KMComposeWin::slotAttachedFile(const KURL &url) { if (mAttachFilesPending.isEmpty()) return; - mAttachFilesPending.remove(mAttachFilesPending.find(url)); // only remove one copy of url + mAttachFilesPending.remove(mAttachFilesPending.tqfind(url)); // only remove one copy of url if (mAttachFilesPending.isEmpty()) { send(mAttachFilesSend); @@ -618,7 +618,7 @@ void KMComposeWin::slotAttachPNGImageData(const TQByteArray &image) { bool ok; - TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString::null, &ok, this ); + TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString(), &ok, this ); if ( !ok ) return; @@ -965,7 +965,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width) w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label. w->adjustSize(); w->show(); - return QMAX( width, w->tqsizeHint().width() ); + return TQMAX( width, w->tqsizeHint().width() ); } void KMComposeWin::rethinkFields(bool fromSlot) @@ -1336,8 +1336,8 @@ void KMComposeWin::setupActions(void) KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection()); KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection()); - KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::tqfindNext(this, TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::tqfind (this, TQT_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection()); KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection()); KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck"); @@ -1714,7 +1714,7 @@ TQString KMComposeWin::to() const } else if ( mRecipientsEditor ) { return mRecipientsEditor->recipientString( Recipient::To ); } else { - return TQString::null; + return TQString(); } } @@ -1726,7 +1726,7 @@ TQString KMComposeWin::cc() const } else if ( mRecipientsEditor ) { return mRecipientsEditor->recipientString( Recipient::Cc ); } else { - return TQString::null; + return TQString(); } } @@ -1738,7 +1738,7 @@ TQString KMComposeWin::bcc() const } else if ( mRecipientsEditor ) { return mRecipientsEditor->recipientString( Recipient::Bcc ); } else { - return TQString::null; + return TQString(); } } @@ -1754,7 +1754,7 @@ TQString KMComposeWin::replyTo() const if ( mEdtReplyTo ) { return cleanedUpHeaderString( mEdtReplyTo->text() ); } else { - return TQString::null; + return TQString(); } } @@ -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->parentNode() ) + if ( partNode * p = n->tqparentNode() ) 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->parentNode() && - node->parentNode()->hasType( DwMime::kTypeMultipart ) && - node->parentNode()->hasSubType( DwMime::kSubtypeAlternative ) ) { + if ( node && node->tqparentNode() && + node->tqparentNode()->hasType( DwMime::kTypeMultipart ) && + node->tqparentNode()->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; @@ -2245,7 +2245,7 @@ bool KMComposeWin::queryClose () const int rc = KMessageBox::warningYesNoCancel( this, i18n("Do you want to save the message for later or discard it?"), i18n("Close Composer"), - KGuiItem(savebut, "filesave", TQString::null, savetext), + KGuiItem(savebut, "filesave", TQString(), savetext), KStdGuiItem::discard() ); if ( rc == KMessageBox::Cancel ) return false; @@ -2292,14 +2292,14 @@ bool KMComposeWin::userForgotAttachment() bool gotMatch = false; - // check whether the subject tqcontains one of the attachment key words + // check whether the subject contains one of the attachment key words // unless the message is a reply or a forwarded message TQString subj = subject(); gotMatch = ( KMMessage::stripOffPrefixes( subj ) == subj ) && ( rx.search( subj ) >= 0 ); if ( !gotMatch ) { - // check whether the non-quoted text tqcontains one of the attachment key + // check whether the non-quoted text contains one of the attachment key // words TQRegExp quotationRx ("^([ \\t]*([|>:}#]|[A-Za-z]+>))+"); for ( int i = 0; i < mEditor->numLines(); ++i ) { @@ -2751,13 +2751,13 @@ void KMComposeWin::slotAttachFile() // Handle the case where the last savedir is gone. kolab/issue4057 TQString recent; - KURL recentURL = KFileDialog::getStartURL( TQString::null, recent ); + KURL recentURL = KFileDialog::getStartURL( TQString(), recent ); if ( !recentURL.url().isEmpty() && !KIO::NetAccess::exists( recentURL, true, this ) ) { recentURL = KURL( TQDir::homeDirPath() ); } - KFileDialog fdlg( recentURL.url(), TQString::null, this, 0, true ); + KFileDialog fdlg( recentURL.url(), TQString(), this, 0, true ); fdlg.setOperationMode( KFileDialog::Other ); fdlg.setCaption( i18n( "Attach File" ) ); fdlg.okButton()->setGuiItem( KGuiItem( i18n( "&Attach" ),"fileopen" ) ); @@ -2773,7 +2773,7 @@ void KMComposeWin::slotAttachFile() //----------------------------------------------------------------------------- void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data) { - TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job); + TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.tqfind(job); assert(it != mMapAtmLoadData.end()); TQBuffer buff((*it).data); buff.open(IO_WriteOnly | IO_Append); @@ -2785,10 +2785,10 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data) //----------------------------------------------------------------------------- void KMComposeWin::slotAttachFileResult(KIO::Job *job) { - TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job); + TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.tqfind(job); assert(it != mMapAtmLoadData.end()); KURL attachURL; - TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job); + TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.tqfind(job); bool attachURLfound = (jit != mAttachJobs.end()); if (attachURLfound) { @@ -2886,7 +2886,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) !kmkernel->msgSender()->sendQuotedPrintable()); kdDebug(5006) << "autodetected cte: " << msgPart->cteStr() << endl; } - int slash = mimeType.find( '/' ); + int slash = mimeType.tqfind( '/' ); if( slash == -1 ) slash = mimeType.length(); msgPart->setTypeStr( mimeType.left( slash ).latin1() ); @@ -2938,7 +2938,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job) //----------------------------------------------------------------------------- void KMComposeWin::slotInsertFile() { - KFileDialog fdlg(TQString::null, TQString::null, this, 0, true); + KFileDialog fdlg(TQString(), TQString(), this, 0, true); fdlg.setOperationMode( KFileDialog::Opening ); fdlg.okButton()->setText(i18n("&Insert")); fdlg.setCaption(i18n("Insert File")); @@ -3162,7 +3162,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ // add the new attachment to the list addAttach(msgPart); - rethinkFields(); //work around initial-size bug in Qt-1.32 + rethinkFields(); //work around initial-size bug in TQt-1.32 } //----------------------------------------------------------------------------- @@ -3309,7 +3309,7 @@ void KMComposeWin::compressAttach( int idx ) zip.close(); if ( array.size() >= decoded.size() ) { if ( KMessageBox::questionYesNo( this, i18n("The compressed file is larger " - "than the original. Do you want to keep the original one?" ), TQString::null, i18n("Keep"), i18n("Compress") ) + "than the original. Do you want to keep the original one?" ), TQString(), i18n("Keep"), i18n("Compress") ) == KMessageBox::Yes ) { static_cast<KMAtmListViewItem*>( mAtmItemList.at( i ) )->setCompress( false ); return; @@ -3583,7 +3583,7 @@ void KMComposeWin::slotAttachSave() pname = msgPart->name(); if (pname.isEmpty()) pname="unnamed"; - KURL url = KFileDialog::getSaveURL(pname, TQString::null, 0, i18n("Save Attachment As")); + KURL url = KFileDialog::getSaveURL(pname, TQString(), 0, i18n("Save Attachment As")); if( url.isEmpty() ) return; @@ -3649,7 +3649,7 @@ void KMComposeWin::slotUpdateFont() TQString KMComposeWin::quotePrefixName() const { if ( !msg() ) - return TQString::null; + return TQString(); int languageNr = GlobalSettings::self()->replyCurrentLanguage(); ReplyPhrases replyPhrases( TQString::number(languageNr) ); @@ -3673,9 +3673,9 @@ void KMComposeWin::slotPasteClipboardAsQuotation() void KMComposeWin::slotPasteClipboardAsAttachment() { - KURL url( TQApplication::clipboard()->text( QClipboard::Clipboard ) ); + KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); if ( url.isValid() ) { - addAttach(TQApplication::clipboard()->text( QClipboard::Clipboard ) ); + addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); return; } @@ -3685,7 +3685,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() } else { bool ok; - TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString::null, &ok, this ); + TQString attName = KInputDialog::getText( "KMail", i18n("Name of the attachment:"), TQString(), &ok, this ); if ( !ok ) return; KMMessagePart *msgPart = new KMMessagePart; @@ -3824,10 +3824,10 @@ void KMComposeWin::slotCopy() //----------------------------------------------------------------------------- void KMComposeWin::slotPasteClipboard() { - paste( QClipboard::Clipboard ); + paste( TQClipboard::Clipboard ); } -void KMComposeWin::paste( QClipboard::Mode mode ) +void KMComposeWin::paste( TQClipboard::Mode mode ) { TQWidget* fw = tqfocusWidget(); if (!fw) return; @@ -4091,7 +4091,7 @@ void KMComposeWin::slotContinuePrint( bool rc ) } //---------------------------------------------------------------------------- -bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addresses ) +bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addresses ) { TQString brokenAddress; KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress ); @@ -4099,7 +4099,7 @@ bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addres TQString errorMsg( "<qt><p><b>" + brokenAddress + "</b></p><p>" + KPIM::emailParseResultToString( errorCode ) + "</p></qt>" ); - KMessageBox::sorry( parent, errorMsg, i18n("Invalid Email Address") ); + KMessageBox::sorry( tqparent, errorMsg, i18n("Invalid Email Address") ); return false; } return true; @@ -4210,11 +4210,11 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method, connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), TQT_SLOT( slotContinueDoSend( bool ) ) ); - if ( mEditor->textFormat() == Qt::RichText ) + if ( mEditor->textFormat() == TQt::RichText ) mMsg->setHeaderField( "X-KMail-Markup", "true" ); else mMsg->removeHeaderField( "X-KMail-Markup" ); - if ( mEditor->textFormat() == Qt::RichText && inlineSigningEncryptionSelected() ) { + if ( mEditor->textFormat() == TQt::RichText && inlineSigningEncryptionSelected() ) { TQString keepBtnText = mEncryptAction->isChecked() ? mSignAction->isChecked() ? i18n( "&Keep markup, do not sign/encrypt" ) : i18n( "&Keep markup, do not encrypt" ) @@ -4625,7 +4625,7 @@ void KMComposeWin::slotCleanSpace() // show cleared text area) to get back the original, pre-cleaned text. // If you use mEditor->setText( s ) then the undo history is cleared so // that isn't a good solution either. - // TODO: is Qt4 better at handling the undo history?? + // TODO: is TQt4 better at handling the undo history?? if ( !mEditor->hasMarkedText() ) mEditor->clear(); mEditor->insert( s ); @@ -4666,7 +4666,7 @@ void KMComposeWin::toggleMarkup(bool markup) textItalicAction->setChecked(_italic); mEditor->setSelection ( paraFrom, indexFrom, paraTo, indexTo); - mEditor->setTextFormat(Qt::RichText); + mEditor->setTextFormat(TQt::RichText); mEditor->setModified(true); markupAction->setChecked(true); toolBar( "htmlToolBar" )->show(); @@ -4680,7 +4680,7 @@ void KMComposeWin::toggleMarkup(bool markup) toolBar("htmlToolBar")->hide(); if ( mUseHTMLEditor ) { // it was turned on mUseHTMLEditor = false; - mEditor->setTextFormat(Qt::PlainText); + mEditor->setTextFormat(TQt::PlainText); TQString text = mEditor->text(); mEditor->setText(text); // otherwise the text still looks formatted mEditor->setModified(true); @@ -4780,10 +4780,10 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneCleartqStatus()) ); } -void KMComposeWin::slotSpellcheckDoneClearStatus() +void KMComposeWin::slotSpellcheckDoneCleartqStatus() { statusBar()->changeItem("", 0); } @@ -4820,7 +4820,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // don't overwrite the BCC field under certain circomstances // NOT edited and preset BCC from the identity if( mEdtBcc && !mEdtBcc->edited() && !ident.bcc().isEmpty() ) { - // BCC NOT empty AND tqcontains a diff adress then the preset BCC + // BCC NOT empty AND contains a diff adress then the preset BCC // of the new identity if( !mEdtBcc->text().isEmpty() && mEdtBcc->text() != ident.bcc() && !mEdtBcc->edited() ) { mEdtBcc->setText( ident.bcc() ); @@ -4931,7 +4931,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) } mEditor->setText( edtText ); } else { - const int pos = edtText.find( mOldSigText ); + const int pos = edtText.tqfind( mOldSigText ); if ( pos >= 0 && !mOldSigText.isEmpty() ) { const int oldLength = mOldSigText.length(); mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature() diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 30362e851..b76aa9113 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -99,6 +99,7 @@ namespace GpgME { class KMComposeWin : public KMail::Composer, public MailComposerIface { Q_OBJECT + TQ_OBJECT friend class ::KMEdit; friend class ::MessageComposer; @@ -271,7 +272,7 @@ private: // kmedit: } bool subjectTextWasSpellChecked() const { return mSubjectTextWasSpellChecked; } - void paste( QClipboard::Mode mode ); + void paste( TQClipboard::Mode mode ); public: // callback /** Disabled signing and encryption completely for this composer window. */ @@ -469,7 +470,7 @@ private slots: // void slotSpellConfigure(); void slotSpellcheckDone(int result); - void slotSpellcheckDoneClearStatus(); + void slotSpellcheckDoneCleartqStatus(); public slots: // kmkernel void autoSaveMessage(); @@ -552,8 +553,8 @@ private: void rethinkHeaderLine( int aValue, int aMask, int& aRow, TQLabel* aLbl, TQLineEdit* aEdt, TQPushButton* aBtn = 0, - const TQString &toolTip = TQString::null, - const TQString &whatsThis = TQString::null ); + const TQString &toolTip = TQString(), + const TQString &whatsThis = TQString() ); void rethinkHeaderLine( int value, int tqmask, int& row, TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk ); @@ -671,7 +672,7 @@ private: /** * Decrypt an OpenPGP block or strip off the OpenPGP envelope of a text * block with a clear text signature. This is only done if the given - * string tqcontains exactly one OpenPGP block. + * string contains exactly one OpenPGP block. * This function is for example used to restore the unencrypted/unsigned * message text for editting. */ @@ -715,7 +716,7 @@ private: * @return true if all addresses are valid. * @return false if one or several addresses are invalid. */ - static bool validateAddresses( TQWidget * parent, const TQString & addresses ); + static bool validateAddresses( TQWidget * tqparent, const TQString & addresses ); /** * Sets the transport combobox to @p transport. If @p transport is empty diff --git a/kmail/kmdict.cpp b/kmail/kmdict.cpp index de4ed86f4..0ba60ed55 100644 --- a/kmail/kmdict.cpp +++ b/kmail/kmdict.cpp @@ -104,7 +104,7 @@ void KMDict::removeFollowing(KMDictItem *item, long key) //----------------------------------------------------------------------------- -KMDictItem *KMDict::find(long key) +KMDictItem *KMDict::tqfind(long key) { int idx = (unsigned long)key % mSize; KMDictItem *item = mVecs[idx]; diff --git a/kmail/kmdict.h b/kmail/kmdict.h index 374577c28..0b365acb6 100644 --- a/kmail/kmdict.h +++ b/kmail/kmdict.h @@ -1,5 +1,5 @@ /* - * simple hash table for kmail. inspired by QDict + * simple hash table for kmail. inspired by TQDict */ #ifndef __KMDICT @@ -49,7 +49,7 @@ public: void remove(long key); /** Find an item by key. Returns pointer to it, or 0 if not found. */ - KMDictItem *find(long key); + KMDictItem *tqfind(long key); private: /** Removes all items _following_ @p item with key @p key. */ diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 46fd2a83b..5442bef40 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -82,7 +82,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e ) int line, col; getCursorPosition( &line, &col ); TQString lineText = text( line ); - // returns line with additional trailing space (bug in Qt?), cut it off + // returns line with additional trailing space (bug in TQt?), cut it off lineText.truncate( lineText.length() - 1 ); // special treatment of quoted lines only if the cursor is neither at // the begin nor at the end of the line @@ -112,7 +112,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e ) && ( col >= int( bot ) ) ) { // The cursor position might have changed unpredictably if there was selected - // text which got tqreplaced by a new line, so we query it again: + // text which got replaced by a new line, so we query it again: getCursorPosition( &line, &col ); TQString newLine = text( line ); // remove leading white space from the new line and instead @@ -209,10 +209,10 @@ void KMEdit::contentsDropEvent(TQDropEvent *e) } } -KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer, +KMEdit::KMEdit(TQWidget *tqparent, KMComposeWin* composer, KSpellConfig* autoSpellConfig, const char *name) - : KEdit( parent, name ), + : KEdit( tqparent, name ), mComposer( composer ), mKSpellForDialog( 0 ), mSpeller( 0 ), @@ -225,7 +225,7 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer, mWasModifiedBeforeSpellCheck( false ), mHighlighter( 0 ), mSpellLineEdit( false ), - mPasteMode( QClipboard::Clipboard ) + mPasteMode( TQClipboard::Clipboard ) { connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); installEventFilter(this); @@ -253,7 +253,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor3( 0x00, 0x60, 0x00 ); TQColor defaultForeground( kapp->palette().active().text() ); - TQColor c = Qt::red; + TQColor c = TQt::red; KConfigGroup readerConfig( KMKernel::config(), "Reader" ); TQColor col1; if ( !readerConfig.readBoolEntry( "defaultColors", true ) ) @@ -356,7 +356,7 @@ unsigned int KMEdit::lineBreakColumn() const unsigned int lineBreakColumn = 0; unsigned int numlines = numLines(); while ( numlines-- ) { - lineBreakColumn = QMAX( lineBreakColumn, textLine( numlines ).length() ); + lineBreakColumn = TQMAX( lineBreakColumn, textLine( numlines ).length() ); } return lineBreakColumn; } @@ -447,8 +447,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) sysLine += " "; while (!sysLine.isEmpty()) { - *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit(); - sysLine.remove(0, sysLine.find(" ") + 1); + *mExtEditorProcess << sysLine.left(sysLine.tqfind(" ")).local8Bit(); + sysLine.remove(0, sysLine.tqfind(" ") + 1); } connect(mExtEditorProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExternalEditorDone(KProcess*))); @@ -498,7 +498,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) //Get word right clicked on const TQRegExp wordBoundary( "[\\s\\W]" ); firstSpace = paraText.findRev( wordBoundary, charPos ) + 1; - lastSpace = paraText.find( wordBoundary, charPos ); + lastSpace = paraText.tqfind( wordBoundary, charPos ); if( lastSpace == -1 ) lastSpace = paraText.length(); TQString word = paraText.mid( firstSpace, lastSpace - firstSpace ); @@ -581,7 +581,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) int KMEdit::autoSpellChecking( bool on ) { - if ( textFormat() == Qt::RichText ) { + if ( textFormat() == TQt::RichText ) { // syntax highlighter doesn't support extended text properties if ( on ) KMessageBox::sorry(this, i18n("Automatic spellchecking is not possible on text with markup.")); @@ -649,7 +649,7 @@ void KMEdit::spellcheck() mWasModifiedBeforeSpellCheck = isModified(); mSpellLineEdit = !mSpellLineEdit; // maybe for later, for now plaintext is given to KSpell -// if (textFormat() == Qt::RichText ) { +// if (textFormat() == TQt::RichText ) { // kdDebug(5006) << "KMEdit::spellcheck, spellchecking for RichText" << endl; // mKSpellForDialog = new KSpell(this, i18n("Spellcheck - KMail"), this, // TQT_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); @@ -679,21 +679,21 @@ void KMEdit::spellcheck() void KMEdit::cut() { KEdit::cut(); - if ( textFormat() != Qt::RichText && mHighlighter ) + if ( textFormat() != TQt::RichText && mHighlighter ) mHighlighter->restartBackgroundSpellCheck(); } void KMEdit::clear() { KEdit::clear(); - if ( textFormat() != Qt::RichText && mHighlighter ) + if ( textFormat() != TQt::RichText && mHighlighter ) mHighlighter->restartBackgroundSpellCheck(); } void KMEdit::del() { KEdit::del(); - if ( textFormat() != Qt::RichText && mHighlighter ) + if ( textFormat() != TQt::RichText && mHighlighter ) mHighlighter->restartBackgroundSpellCheck(); } @@ -709,11 +709,11 @@ void KMEdit::paste() // Roll our own internal flag. void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) { - if( e->button() != Qt::MidButton ) + if( e->button() != TQt::MidButton ) return KEdit::contentsMouseReleaseEvent( e ); - mPasteMode = QClipboard::Selection; + mPasteMode = TQClipboard::Selection; KEdit::contentsMouseReleaseEvent( e ); - mPasteMode = QClipboard::Clipboard; + mPasteMode = TQClipboard::Clipboard; } void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e ) @@ -828,7 +828,7 @@ void KMEdit::slotSpellcheck2(KSpell*) kdDebug(5006) << "spelling: new SpellingFilter with prefix=\"" << quotePrefix << "\"" << endl; TQTextEdit plaintext; plaintext.setText(text()); - plaintext.setTextFormat(Qt::PlainText); + plaintext.setTextFormat(TQt::PlainText); mSpellingFilter = new SpellingFilter(plaintext.text(), quotePrefix, SpellingFilter::FilterUrls, SpellingFilter::FilterEmailAddresses); diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 855c29ead..08ed687d4 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -65,8 +65,9 @@ class KMSyntaxHighter : public KDictSpellingHighlighter class KMEdit : public KEdit { Q_OBJECT + TQ_OBJECT public: - KMEdit(TQWidget *parent=0,KMComposeWin* composer=0, + KMEdit(TQWidget *tqparent=0,KMComposeWin* composer=0, KSpellConfig* spellConfig = 0, const char *name=0); ~KMEdit(); @@ -193,7 +194,7 @@ private: bool mWasModifiedBeforeSpellCheck; KMSyntaxHighter *mHighlighter; bool mSpellLineEdit; - QClipboard::Mode mPasteMode; + TQClipboard::Mode mPasteMode; }; #endif // __KMAIL_KMEDIT_H__ diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index 2316321f5..c495ffbbd 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -25,15 +25,15 @@ // //============================================================================= -KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* parent, const char* name ) - : TQWidget( parent, name ) +KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { TQHBoxLayout *hbl = new TQHBoxLayout(this); hbl->setSpacing(4); mLineEdit = new KLineEdit(this); mLineEdit->setName( "addressEdit" ); hbl->addWidget( mLineEdit, 1 /*stretch*/ ); - mBtn = new TQPushButton( TQString::null ,this ); + mBtn = new TQPushButton( TQString() ,this ); mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) ); mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() ); TQToolTip::add( mBtn, i18n( "Open Address Book" ) ); @@ -69,8 +69,8 @@ void KMFilterActionWithAddressWidget::slotAddrBook() mLineEdit->setText( txt + addrList.join(",") ); } -KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name) - : TQWidget( parent, name) +KMSoundTestWidget::KMSoundTestWidget(TQWidget *tqparent, const char *name) + : TQWidget( tqparent, name) { TQHBoxLayout *lay1 = new TQHBoxLayout( this ); m_playButton = new TQPushButton( this, "m_playButton" ); diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h index 5a6990a8b..c0605874f 100644 --- a/kmail/kmfawidgets.h +++ b/kmail/kmfawidgets.h @@ -15,11 +15,12 @@ class TQPushButton; class KURLRequester; -class KMFilterActionWithAddressWidget : public QWidget +class KMFilterActionWithAddressWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 ); + KMFilterActionWithAddressWidget( TQWidget* tqparent=0, const char* name=0 ); void clear() { mLineEdit->clear(); } TQString text() const { return mLineEdit->text(); } @@ -37,11 +38,12 @@ private: TQLineEdit* mLineEdit; }; -class KMSoundTestWidget : public QWidget +class KMSoundTestWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KMSoundTestWidget( TQWidget * parent, const char * name=0 ); + KMSoundTestWidget( TQWidget * tqparent, const char * name=0 ); ~KMSoundTestWidget(); TQString url() const; void setUrl( const TQString & url ); diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index 1d36677d6..6d1f50c1d 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -198,7 +198,7 @@ bool KMFilter::applyOnAccount( uint id ) const if ( applicability() == All ) return true; if ( applicability() == ButImap ) { - KMAccount *account = kmkernel->acctMgr()->find( id ); + KMAccount *account = kmkernel->acctMgr()->tqfind( id ); bool result = account && !dynamic_cast<KMAcctImap*>(account); return result; } @@ -363,7 +363,7 @@ void KMFilter::purify() // Remove invalid accounts from mAccounts - just to be tidy TQValueListIterator<int> it2 = mAccounts.begin(); while ( it2 != mAccounts.end() ) { - if ( !kmkernel->acctMgr()->find( *it2 ) ) + if ( !kmkernel->acctMgr()->tqfind( *it2 ) ) it2 = mAccounts.remove( it2 ); else ++it2; @@ -418,8 +418,8 @@ const TQString KMFilter::asString() const if ( mAccounts.isEmpty() ) result += " None"; else for ( it2 = mAccounts.begin() ; it2 != mAccounts.end() ; ++it2 ) - if ( kmkernel->acctMgr()->find( *it2 ) ) - result += " " + kmkernel->acctMgr()->find( *it2 )->name(); + if ( kmkernel->acctMgr()->tqfind( *it2 ) ) + result += " " + kmkernel->acctMgr()->tqfind( *it2 )->name(); result += "\n"; } if ( bStopProcessingHere ) diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 180c2746f..c23a5644a 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -88,9 +88,9 @@ KMFilterAction* KMFilterAction::newAction() return 0; } -TQWidget* KMFilterAction::createParamWidget(TQWidget* parent) const +TQWidget* KMFilterAction::createParamWidget(TQWidget* tqparent) const { - return new TQWidget(parent); + return new TQWidget(tqparent); } void KMFilterAction::applyParamWidgetValue(TQWidget*) @@ -201,9 +201,9 @@ KMFilterActionWithString::KMFilterActionWithString( const char* aName, const TQS { } -TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* tqparent ) const { - TQLineEdit *le = new KLineEdit(parent); + TQLineEdit *le = new KLineEdit(tqparent); le->setText( mParameter ); return le; } @@ -251,9 +251,9 @@ KMFilterActionWithStringList::KMFilterActionWithStringList( const char* aName, c { } -TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* tqparent ) const { - TQComboBox *cb = new TQComboBox( false, parent ); + TQComboBox *cb = new TQComboBox( false, tqparent ); cb->insertStringList( mParameterList ); setParamWidgetValue( cb ); return cb; @@ -298,9 +298,9 @@ KMFilterActionWithFolder::KMFilterActionWithFolder( const char* aName, const TQS mFolder = 0; } -TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* tqparent ) const { - FolderRequester *req = new FolderRequester( parent, + FolderRequester *req = new FolderRequester( tqparent, kmkernel->getKMMainWidget()->folderTree() ); setParamWidgetValue( req ); return req; @@ -380,9 +380,9 @@ KMFilterActionWithAddress::KMFilterActionWithAddress( const char* aName, const T { } -TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* tqparent ) const { - KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(parent); + KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(tqparent); w->setText( mParameter ); return w; } @@ -413,9 +413,9 @@ KMFilterActionWithCommand::KMFilterActionWithCommand( const char* aName, const T { } -TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* tqparent ) const { - return KMFilterActionWithUrl::createParamWidget( parent ); + return KMFilterActionWithUrl::createParamWidget( tqparent ); } void KMFilterActionWithCommand::applyParamWidgetValue( TQWidget* paramWidget ) @@ -464,7 +464,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs tf->close(); delete tf; kdDebug(5006) << "KMFilterActionWithCommand: Could not create temp file!" << endl; - return TQString::null; + return TQString(); } tf->setAutoDelete(true); aTempFileList.append( tf ); @@ -490,14 +490,14 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs else result = result.arg( tempFileName ); } - // And finally, tqreplace the %{foo} with the content of the foo + // And finally, replace the %{foo} with the content of the foo // header field: TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false ); int idx = 0; while ( ( idx = header_rx.search( result, idx ) ) != -1 ) { - TQString tqreplacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) ); - result.tqreplace( idx, header_rx.matchedLength(), tqreplacement ); - idx += tqreplacement.length(); + TQString replacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) ); + result.tqreplace( idx, header_rx.matchedLength(), replacement ); + idx += replacement.length(); } return result; @@ -524,7 +524,7 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage* if ( commandLine.isEmpty() ) return ErrorButGoOn; - // The parentheses force the creation of a subshell + // The tqparentheses 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 @@ -689,9 +689,9 @@ public: virtual ReturnCode process(KMMessage* msg) const; static KMFilterAction* newAction(); - TQWidget * createParamWidget( TQWidget * parent ) const; - void applyParamWidgetValue( TQWidget * parent ); - void setParamWidgetValue( TQWidget * parent ) const; + TQWidget * createParamWidget( TQWidget * tqparent ) const; + void applyParamWidgetValue( TQWidget * tqparent ); + void setParamWidgetValue( TQWidget * tqparent ) const; void clearParamWidget( TQWidget * param ) const; }; @@ -712,9 +712,9 @@ KMFilterAction::ReturnCode KMFilterActionIdentity::process(KMMessage* msg) const return GoOn; } -TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * parent ) const +TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * tqparent ) const { - KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), parent ); + KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), tqparent ); ic->setCurrentIdentity( mParameter ); return ic; } @@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const } //============================================================================= -// KMFilterActionSeStatus - set status to +// KMFilterActionSetqStatus - set status to // Set the status of messages //============================================================================= -class KMFilterActionSeStatus: public KMFilterActionWithStringList +class KMFilterActionSetqStatus: public KMFilterActionWithStringList { public: - KMFilterActionSeStatus(); + KMFilterActionSetqStatus(); virtual ReturnCode process(KMMessage* msg) const; virtual bool requiresBody(KMMsgBase*) const; @@ -762,7 +762,7 @@ public: }; -static const KMMsgStatus stati[] = +static const KMMsgtqStatus stati[] = { KMMsgStatusFlag, KMMsgStatusRead, @@ -776,18 +776,18 @@ static const KMMsgStatus stati[] = KMMsgStatusSpam, KMMsgStatusHam }; -static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus ); +static const int StatiCount = sizeof( stati ) / sizeof( KMMsgtqStatus ); -KMFilterAction* KMFilterActionSeStatus::newAction() +KMFilterAction* KMFilterActionSetqStatus::newAction() { - return (new KMFilterActionSeStatus); + return (new KMFilterActionSetqStatus); } -KMFilterActionSeStatus::KMFilterActionSeStatus() +KMFilterActionSetqStatus::KMFilterActionSetqStatus() : KMFilterActionWithStringList( "set status", i18n("Mark As") ) { // if you change this list, also update - // KMFilterActionSeStatus::stati above + // KMFilterActionSetqStatus::stati above mParameterList.append( "" ); mParameterList.append( i18n("msg status","Important") ); mParameterList.append( i18n("msg status","Read") ); @@ -804,22 +804,22 @@ KMFilterActionSeStatus::KMFilterActionSeStatus() mParameter = *mParameterList.at(0); } -KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const +KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const { int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return ErrorButGoOn; - KMMsgStatus status = stati[idx-1] ; - msg->seStatus( status ); + KMMsgtqStatus status = stati[idx-1] ; + msg->setqStatus( status ); return GoOn; } -bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const +bool KMFilterActionSetqStatus::requiresBody(KMMsgBase*) const { return false; } -void KMFilterActionSeStatus::argsFromString( const TQString argsStr ) +void KMFilterActionSetqStatus::argsFromString( const TQString argsStr ) { if ( argsStr.length() == 1 ) { for ( int i = 0 ; i < StatiCount ; i++ ) @@ -831,16 +831,16 @@ void KMFilterActionSeStatus::argsFromString( const TQString argsStr ) mParameter = *mParameterList.at(0); } -const TQString KMFilterActionSeStatus::argsAsString() const +const TQString KMFilterActionSetqStatus::argsAsString() const { int idx = mParameterList.findIndex( mParameter ); - if ( idx < 1 ) return TQString::null; + if ( idx < 1 ) return TQString(); - KMMsgStatus status = stati[idx-1]; + KMMsgtqStatus status = stati[idx-1]; return KMMsgBase::statusToStr(status); } -const TQString KMFilterActionSeStatus::displayString() const +const TQString KMFilterActionSetqStatus::displayString() const { // FIXME after string freeze: // return i18n("").arg( ); @@ -930,7 +930,7 @@ void KMFilterActionFakeDisposition::argsFromString( const TQString argsStr ) const TQString KMFilterActionFakeDisposition::argsAsString() const { int idx = mParameterList.findIndex( mParameter ); - if ( idx < 1 ) return TQString::null; + if ( idx < 1 ) return TQString(); return TQString( TQChar( idx < 2 ? 'I' : char(mdns[idx-2]) ) ); } @@ -951,7 +951,7 @@ class KMFilterActionRemoveHeader: public KMFilterActionWithStringList public: KMFilterActionRemoveHeader(); virtual ReturnCode process(KMMessage* msg) const; - virtual TQWidget* createParamWidget( TQWidget* parent ) const; + virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; virtual void setParamWidgetValue( TQWidget* paramWidget ) const; static KMFilterAction* newAction(); @@ -974,9 +974,9 @@ KMFilterActionRemoveHeader::KMFilterActionRemoveHeader() mParameter = *mParameterList.at(0); } -TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* tqparent ) const { - TQComboBox *cb = new TQComboBox( true/*editable*/, parent ); + TQComboBox *cb = new TQComboBox( true/*editable*/, tqparent ); cb->setInsertionPolicy( TQComboBox::AtBottom ); setParamWidgetValue( cb ); return cb; @@ -1017,7 +1017,7 @@ class KMFilterActionAddHeader: public KMFilterActionWithStringList public: KMFilterActionAddHeader(); virtual ReturnCode process(KMMessage* msg) const; - virtual TQWidget* createParamWidget( TQWidget* parent ) const; + virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; virtual void setParamWidgetValue( TQWidget* paramWidget ) const; virtual void applyParamWidgetValue( TQWidget* paramWidget ); virtual void clearParamWidget( TQWidget* paramWidget ) const; @@ -1055,9 +1055,9 @@ KMFilterAction::ReturnCode KMFilterActionAddHeader::process(KMMessage* msg) cons return GoOn; } -TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* tqparent ) const { - TQWidget *w = new TQWidget( parent ); + TQWidget *w = new TQWidget( tqparent ); TQHBoxLayout *hbl = new TQHBoxLayout( w ); hbl->setSpacing( 4 ); TQComboBox *cb = new TQComboBox( true, w, "combo" ); @@ -1157,7 +1157,7 @@ class KMFilterActionRewriteHeader: public KMFilterActionWithStringList public: KMFilterActionRewriteHeader(); virtual ReturnCode process(KMMessage* msg) const; - virtual TQWidget* createParamWidget( TQWidget* parent ) const; + virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; virtual void setParamWidgetValue( TQWidget* paramWidget ) const; virtual void applyParamWidgetValue( TQWidget* paramWidget ); virtual void clearParamWidget( TQWidget* paramWidget ) const; @@ -1194,7 +1194,7 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg) if ( mParameter.isEmpty() || !mRegExp.isValid() ) return ErrorButGoOn; - KRegExp3 rx = mRegExp; // KRegExp3::tqreplace is not const. + KRegExp3 rx = mRegExp; // KRegExp3::replace is not const. TQString newValue = rx.tqreplace( msg->headerField( mParameter.latin1() ), mReplacementString ); @@ -1203,9 +1203,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg) return GoOn; } -TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) const { - TQWidget *w = new TQWidget( parent ); + TQWidget *w = new TQWidget( tqparent ); TQHBoxLayout *hbl = new TQHBoxLayout( w ); hbl->setSpacing( 4 ); @@ -1366,7 +1366,7 @@ KMFilterAction::ReturnCode KMFilterActionMove::process(KMMessage* msg) const bool KMFilterActionMove::requiresBody(KMMsgBase*) const { - return false; //iff mFolder->folderMgr == msgBase->parent()->folderMgr; + return false; //iff mFolder->folderMgr == msgBase->tqparent()->folderMgr; } @@ -1443,7 +1443,7 @@ class KMFilterActionForward: public KMFilterActionWithAddress public: KMFilterActionForward(); virtual ReturnCode process( KMMessage* msg ) const; - virtual TQWidget* createParamWidget( TQWidget* parent ) const; + virtual TQWidget* createParamWidget( TQWidget* tqparent ) const; virtual void applyParamWidgetValue( TQWidget* paramWidget ); virtual void setParamWidgetValue( TQWidget* paramWidget ) const; virtual void clearParamWidget( TQWidget* paramWidget ) const; @@ -1495,9 +1495,9 @@ KMFilterAction::ReturnCode KMFilterActionForward::process(KMMessage* aMsg) const return GoOn; } -TQWidget* KMFilterActionForward::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionForward::createParamWidget( TQWidget* tqparent ) const { - TQWidget *addressAndTemplate = new TQWidget( parent ); + TQWidget *addressAndTemplate = new TQWidget( tqparent ); TQHBoxLayout *hBox = new TQHBoxLayout( addressAndTemplate ); TQWidget *addressEdit = KMFilterActionWithAddress::createParamWidget( addressAndTemplate ); addressEdit->setName( "addressEdit" ); @@ -1540,7 +1540,7 @@ void KMFilterActionForward::applyParamWidgetValue( TQWidget* paramWidget ) if ( templateCombo->currentItem() == 0 ) { // Default template, so don't use a custom one - mTemplate = TQString::null; + mTemplate = TQString(); } else { mTemplate = templateCombo->currentText(); @@ -1573,7 +1573,7 @@ void KMFilterActionForward::setParamWidgetValue( TQWidget* paramWidget ) const templateCombo->setCurrentItem( templateIndex ); } else { - mTemplate = TQString::null; + mTemplate = TQString(); } } } @@ -1596,7 +1596,7 @@ static const TQString forwardFilterArgsSeperator = "@$$@"; void KMFilterActionForward::argsFromString( const TQString argsStr ) { - int seperatorPos = argsStr.find( forwardFilterArgsSeperator ); + int seperatorPos = argsStr.tqfind( forwardFilterArgsSeperator ); if ( seperatorPos == - 1 ) { // Old config, assume that the whole string is the addressee @@ -1699,8 +1699,8 @@ KMFilterAction::ReturnCode KMFilterActionExec::process(KMMessage *aMsg) const class PipeJob : public KPIM::ThreadWeaver::Job { public: - PipeJob(TQObject* parent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 ) - : Job (parent, name), + PipeJob(TQObject* tqparent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 ) + : Job (tqparent, name), mTempFileName(tempFileName), mCmd(cmd), mMsg( aMsg ) @@ -1737,17 +1737,17 @@ class PipeJob : public KPIM::ThreadWeaver::Job pclose(p); if ( !ba.isEmpty() ) { KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", TQString(ba).latin1() ); - KMFolder *filterFolder = mMsg->parent(); + KMFolder *filterFolder = mMsg->tqparent(); ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() ); mMsg->fromByteArray( ba ); if ( !origSerNum.isEmpty() ) mMsg->setHeaderField( "X-KMail-Filtered", origSerNum ); if ( filterFolder && handler ) { - bool oldStatus = handler->ignoreChanges( true ); - filterFolder->take( filterFolder->find( mMsg ) ); + bool oldtqStatus = handler->ignoreChanges( true ); + filterFolder->take( filterFolder->tqfind( mMsg ) ); filterFolder->addMsg( mMsg ); - handler->ignoreChanges( oldStatus ); + handler->ignoreChanges( oldtqStatus ); } else { kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl; } @@ -1800,7 +1800,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const if ( commandLine.isEmpty() ) handler->actionMessage( ErrorButGoOn ); - // The parentheses force the creation of a subshell + // The tqparentheses 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 @@ -1842,9 +1842,9 @@ KMFilterActionWithTest::~KMFilterActionWithTest() { } -TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* tqparent ) const { - KMSoundTestWidget *le = new KMSoundTestWidget(parent); + KMSoundTestWidget *le = new KMSoundTestWidget(tqparent); le->setUrl( mParameter ); return le; } @@ -1919,9 +1919,9 @@ KMFilterActionWithUrl::~KMFilterActionWithUrl() { } -TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* parent ) const +TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* tqparent ) const { - KURLRequester *le = new KURLRequester(parent); + KURLRequester *le = new KURLRequester(tqparent); le->setURL( mParameter ); return le; } @@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void) insert( KMFilterActionMove::newAction ); insert( KMFilterActionCopy::newAction ); insert( KMFilterActionIdentity::newAction ); - insert( KMFilterActionSeStatus::newAction ); + insert( KMFilterActionSetqStatus::newAction ); insert( KMFilterActionFakeDisposition::newAction ); insert( KMFilterActionTransport::newAction ); insert( KMFilterActionReplyTo::newAction ); diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index 55aba2cf2..21fa0e73b 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -111,7 +111,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -190,8 +190,8 @@ public: virtual void argsFromString(const TQString) {}; /** Return extra arguments as string. Must not contain newlines. We - return TQString::null, because we have no parameter. */ - virtual const TQString argsAsString() const { return TQString::null; } + return TQString(), because we have no parameter. */ + virtual const TQString argsAsString() const { return TQString(); } /** Returns a translated string describing this filter for visualization purposes, e.g. in the filter log. */ @@ -234,7 +234,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -345,7 +345,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -404,7 +404,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -469,7 +469,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -493,7 +493,7 @@ public: /** Abstract base class for KMail's filter actions that need a command - line as parameter, e.g. 'forward to'. Can create a QLineEdit + line as parameter, e.g. 'forward to'. Can create a TQLineEdit (are there better widgets in the depths of the kdelibs?) as parameter widget. A subclass of this must provide at least implementations for the following methods: @@ -526,7 +526,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -565,7 +565,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -607,7 +607,7 @@ public: /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ - virtual TQWidget* createParamWidget(TQWidget* parent) const; + virtual TQWidget* createParamWidget(TQWidget* tqparent) const; /** The filter action shall set it's parameter from the widget's contents. It is allowed that the value is read by the action @@ -648,7 +648,7 @@ struct KMFilterActionDesc KMFilterActionNewFunc create; }; -/** Dictionary that tqcontains a list of all registered filter actions +/** Dictionary that contains a list of all registered filter actions with their creation functions. They are hard-coded into the constructor. If you want to add a new KMFilterAction, make sure you add the details of it in init, too. diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index c9e42d1c7..a83b6eec6 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -32,7 +32,7 @@ using KMail::FilterImporterExporter; #include <klistview.h> #include <kpushbutton.h> -// other Qt headers: +// other TQt headers: #include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> @@ -128,8 +128,8 @@ const char * KMPopFilterDlgHelpAnchor = "popfilters-id" ; // //============================================================================= -KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter ) - : KDialogBase( parent, name, false /* modality */, +KMFilterDlg::KMFilterDlg(TQWidget* tqparent, const char* name, bool popFilter, bool createDummyFilter ) + : KDialogBase( tqparent, name, false /* modality */, (popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/, Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */, Ok /* default btn */, false /* separator */), @@ -173,21 +173,21 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo hbl->setStretchFactor( vbl, 2 ); mPatternEdit = new KMSearchPatternEdit( i18n("Filter Criteria"), bPopFilter ? w : page1 , "spe", bPopFilter); - vbl->addWidget( mPatternEdit, 0, Qt::AlignTop ); + vbl->addWidget( mPatternEdit, 0, TQt::AlignTop ); if(bPopFilter){ mActionGroup = new KMPopFilterActionWidget( i18n("Filter Action"), w ); - vbl->addWidget( mActionGroup, 0, Qt::AlignTop ); + vbl->addWidget( mActionGroup, 0, TQt::AlignTop ); mGlobalsBox = new TQVGroupBox(i18n("Global Options"), w); mShowLaterBtn = new TQCheckBox(i18n("Always &show matched 'Download Later' messages in confirmation dialog"), mGlobalsBox); TQWhatsThis::add( mShowLaterBtn, i18n(_wt_filterdlg_showLater) ); - vbl->addWidget( mGlobalsBox, 0, Qt::AlignTop ); + vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop ); } else { TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Vertical, i18n("Filter Actions"), page1 ); mActionLister = new KMFilterActionWidgetLister( agb ); - vbl->addWidget( agb, 0, Qt::AlignTop ); + vbl->addWidget( agb, 0, TQt::AlignTop ); mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Vertical, i18n("Advanced Options"), page2); @@ -257,7 +257,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo gl->addMultiCellWidget( hbox, 9, 9, 0, 3 ); } - vbl2->addWidget( mAdvOptsGroup, 0, Qt::AlignTop ); + vbl2->addWidget( mAdvOptsGroup, 0, TQt::AlignTop ); } // spacer: vbl->addStretch( 1 ); @@ -577,8 +577,8 @@ void KMFilterDlg::slotUpdateAccountList() // //============================================================================= -KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter ) - : TQGroupBox( 1, Horizontal, title, parent, name ), +KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *tqparent, const char* name, bool popFilter ) + : TQGroupBox( 1, Horizontal, title, tqparent, name ), bPopFilter(popFilter) { mFilterList.setAutoDelete( true ); @@ -592,19 +592,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons //----------- the first row of buttons TQHBox *hb = new TQHBox(this); hb->setSpacing(4); - mBtnTop = new KPushButton( TQString::null, hb ); + mBtnTop = new KPushButton( TQString(), hb ); mBtnTop->setAutoRepeat( true ); mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) ); mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 ); - mBtnUp = new KPushButton( TQString::null, hb ); + mBtnUp = new KPushButton( TQString(), hb ); mBtnUp->setAutoRepeat( true ); mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) ); mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 ); - mBtnDown = new KPushButton( TQString::null, hb ); + mBtnDown = new KPushButton( TQString(), hb ); mBtnDown->setAutoRepeat( true ); mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) ); mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 ); - mBtnBot = new KPushButton( TQString::null, hb ); + mBtnBot = new KPushButton( TQString(), hb ); mBtnBot->setAutoRepeat( true ); mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) ); mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 ); @@ -620,13 +620,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons //----------- the second row of buttons hb = new TQHBox(this); hb->setSpacing(4); - mBtnNew = new TQPushButton( TQString::null, hb ); + mBtnNew = new TQPushButton( TQString(), hb ); mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) ); mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 ); - mBtnCopy = new TQPushButton( TQString::null, hb ); + mBtnCopy = new TQPushButton( TQString(), hb ); mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) ); mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 ); - mBtnDelete = new TQPushButton( TQString::null, hb ); + mBtnDelete = new TQPushButton( TQString(), hb ); mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) ); mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 ); mBtnRename = new TQPushButton( i18n("Rename..."), hb ); @@ -757,7 +757,7 @@ void KMFilterListBox::slotApplyFilterChanges() "IMAP account. Such filters will only be applied " "when manually filtering and when filtering " "incoming online IMAP mail."); - KMessageBox::information( this, str, TQString::null, + KMessageBox::information( this, str, TQString(), "filterDlgOnlineImapCheck" ); } } @@ -786,7 +786,7 @@ TQValueList<KMFilter*> KMFilterListBox::filtersForSaving() const TQString msg = i18n("The following filters have not been saved because they " "were invalid (e.g. containing no actions or no search " "rules)."); - KMessageBox::informationList( 0, msg, emptyFilters, TQString::null, + KMessageBox::informationList( 0, msg, emptyFilters, TQString(), "ShowInvalidFilterWarning" ); } return filters; @@ -1108,8 +1108,8 @@ void KMFilterListBox::swapFilters( int from, int to ) // //============================================================================= -KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) - : TQHBox( parent, name ) +KMFilterActionWidget::KMFilterActionWidget( TQWidget *tqparent, const char* name ) + : TQHBox( tqparent, name ) { int i; mActionList.setAutoDelete( true ); @@ -1162,7 +1162,7 @@ void KMFilterActionWidget::setAction( const KMFilterAction* aAction ) int i=0; bool found = false ; int count = mComboBox->count() - 1 ; // last entry is the empty one - TQString label = ( aAction ) ? aAction->label() : TQString::null ; + TQString label = ( aAction ) ? aAction->label() : TQString() ; // find the index of typeOf(aAction) in mComboBox // and clear the other widgets on the way. @@ -1209,8 +1209,8 @@ KMFilterAction * KMFilterActionWidget::action() // //============================================================================= -KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *parent, const char* name ) - : KWidgetLister( 1, FILTER_MAX_ACTIONS, parent, name ) +KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *tqparent, const char* name ) + : KWidgetLister( 1, FILTER_MAX_ACTIONS, tqparent, name ) { mActionList = 0; } @@ -1228,7 +1228,7 @@ void KMFilterActionWidgetLister::setActionList( TQPtrList<KMFilterAction> *aList mActionList = aList; - ((TQWidget*)parent())->setEnabled( true ); + ((TQWidget*)tqparent())->setEnabled( true ); if ( aList->count() == 0 ) { slotClear(); @@ -1262,12 +1262,12 @@ void KMFilterActionWidgetLister::reset() mActionList = 0; slotClear(); - ((TQWidget*)parent())->setEnabled( false ); + ((TQWidget*)tqparent())->setEnabled( false ); } -TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *parent ) +TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *tqparent ) { - return new KMFilterActionWidget(parent); + return new KMFilterActionWidget(tqparent); } void KMFilterActionWidgetLister::clearWidget( TQWidget *aWidget ) @@ -1297,8 +1297,8 @@ void KMFilterActionWidgetLister::regenerateActionListFromWidgets() // //============================================================================= -KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *parent, const char* name ) - : TQVButtonGroup( title, parent, name ) +KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *tqparent, const char* name ) + : TQVButtonGroup( title, tqparent, name ) { mActionMap[Down] = new TQRadioButton( i18n("&Download mail"), this ); mActionMap[Later] = new TQRadioButton( i18n("Download mail la&ter"), this ); diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h index 4b8d67a7d..a664fad9c 100644 --- a/kmail/kmfilterdlg.h +++ b/kmail/kmfilterdlg.h @@ -57,12 +57,13 @@ class KListView; @see KMFilter KMFilterDlg KMFilterActionEdit KMSearchPatternEdit */ -class KMFilterListBox : public QGroupBox +class KMFilterListBox : public TQGroupBox { Q_OBJECT + TQ_OBJECT public: /** Constuctor. */ - KMFilterListBox( const TQString & title, TQWidget* parent=0, const char* name=0, bool popFilter = false); + KMFilterListBox( const TQString & title, TQWidget* tqparent=0, const char* name=0, bool popFilter = false); /** Called from KMFilterDlg. Creates a new filter and presets the first rule with "field equals value". It's there mainly to @@ -192,13 +193,14 @@ private: @see KMFilterAction KMFilter KMFilterActionWidgetLister */ -class KMFilterActionWidget : public QHBox +class KMFilterActionWidget : public TQHBox { Q_OBJECT + TQ_OBJECT public: /** Constructor. Creates a filter action widget with no type selected. */ - KMFilterActionWidget( TQWidget* parent=0, const char* name=0 ); + KMFilterActionWidget( TQWidget* tqparent=0, const char* name=0 ); /** Set an action. The action's type is determined and the corresponding widget it loaded with @p aAction's parameters and @@ -216,7 +218,7 @@ private: that they are 'forced' to create parameter widgets for the widget stack and to clear them on setAction. */ TQPtrList<KMFilterAction> mActionList; - /** The combo box that tqcontains the labels of all KMFilterActions. + /** The combo box that contains the labels of all KMFilterActions. It's @p activated(int) signal is internally connected to the @p raiseWidget(int) slot of @p mWidgetStack. */ TQComboBox *mComboBox; @@ -225,11 +227,12 @@ private: TQWidgetStack *mWidgetStack; }; -class KMPopFilterActionWidget : public QVButtonGroup +class KMPopFilterActionWidget : public TQVButtonGroup { Q_OBJECT + TQ_OBJECT public: - KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 ); + KMPopFilterActionWidget( const TQString &title, TQWidget* tqparent=0, const char* name=0 ); void setAction( KMPopFilterAction aAction ); KMPopFilterAction action(); @@ -252,8 +255,9 @@ signals: // Signals class KMFilterActionWidgetLister : public KWidgetLister { Q_OBJECT + TQ_OBJECT public: - KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 ); + KMFilterActionWidgetLister( TQWidget *tqparent=0, const char* name=0 ); virtual ~KMFilterActionWidgetLister(); @@ -267,7 +271,7 @@ public slots: protected: virtual void clearWidget( TQWidget *aWidget ); - virtual TQWidget* createWidget( TQWidget *parent ); + virtual TQWidget* createWidget( TQWidget *tqparent ); private: void regenerateActionListFromWidgets(); @@ -335,11 +339,12 @@ private: class KMFilterDlg: public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** Create the filter dialog. The only class which should be able to do this is KMFilterMgr. This ensures that there is only a single filter dialog */ - KMFilterDlg( TQWidget* parent=0, const char* name=0, bool popFilter=false, + KMFilterDlg( TQWidget* tqparent=0, const char* name=0, bool popFilter=false, bool createDummyFilter=true ); /** Called from KMFilterMgr. Creates a new filter and presets @@ -386,7 +391,7 @@ protected slots: void slotExportFilters(); protected: - /** The widget that tqcontains the ListBox showing the filters, and + /** The widget that contains the ListBox showing the filters, and the controls to remove filters, add new ones and to change their order. */ KMFilterListBox *mFilterList; diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index 2d1e6c914..b16769c58 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -25,7 +25,7 @@ using KMail::MessageProperty; #include <klocale.h> #include <kconfig.h> -// other Qt headers +// other TQt headers #include <tqregexp.h> #include <tqvaluevector.h> @@ -125,16 +125,16 @@ int KMFilterMgr::moveMessage(KMMessage *msg) const void KMFilterMgr::endFiltering(KMMsgBase *msgBase) const { - KMFolder *parent = msgBase->parent(); - if ( parent ) { - if ( parent == MessageProperty::filterFolder( msgBase ) ) { - parent->take( parent->find( msgBase ) ); + KMFolder *tqparent = msgBase->tqparent(); + if ( tqparent ) { + if ( tqparent == MessageProperty::filterFolder( msgBase ) ) { + tqparent->take( tqparent->tqfind( msgBase ) ); } else if ( ! MessageProperty::filterFolder( msgBase ) ) { - int index = parent->find( msgBase ); - KMMessage *msg = parent->getMsg( index ); - parent->take( index ); - parent->addMsgKeepUID( msg ); + int index = tqparent->tqfind( msgBase ); + KMMessage *msg = tqparent->getMsg( index ); + tqparent->take( index ); + tqparent->addMsgKeepUID( msg ); } } MessageProperty::setFiltering( msgBase, false ); @@ -392,7 +392,7 @@ void KMFilterMgr::openDialog( TQWidget *, bool checkForEmptyFilterList ) if( !mEditDialog ) { // - // We can't use the parent as long as the dialog is modeless + // We can't use the tqparent as long as the dialog is modeless // and there is one shared dialog for all top level windows. // mEditDialog = new KMFilterDlg( 0, "filterdialog", bPopFilter, @@ -437,11 +437,11 @@ const TQString KMFilterMgr::createUniqueName( const TQString & name ) //----------------------------------------------------------------------------- void KMFilterMgr::appendFilters( const TQValueList<KMFilter*> &filters, - bool tqreplaceIfNameExists ) + bool replaceIfNameExists ) { mDirtyBufferedFolderTarget = true; beginUpdate(); - if ( tqreplaceIfNameExists ) { + if ( replaceIfNameExists ) { TQValueListConstIterator<KMFilter*> it1 = filters.constBegin(); for ( ; it1 != filters.constEnd() ; ++it1 ) { TQValueListConstIterator<KMFilter*> it2 = mFilters.constBegin(); diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h index eabfe0935..4aae19918 100644 --- a/kmail/kmfiltermgr.h +++ b/kmail/kmfiltermgr.h @@ -31,9 +31,10 @@ class KMFilterDlg; template <typename T> class TQValueVector; template <typename T> class TQValueList; -class KMFilterMgr: public QObject +class KMFilterMgr: public TQObject { Q_OBJECT + TQ_OBJECT public: KMFilterMgr(bool popFilter = false); @@ -54,7 +55,7 @@ public: /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter is created to improve the visibility of the dialog in case no filter has been defined so far. */ - void openDialog( TQWidget *parent, bool checkForEmptyFilterList = true ); + void openDialog( TQWidget *tqparent, bool checkForEmptyFilterList = true ); /** Open an edit dialog, create a new filter and preset the first rule with "field equals value" */ @@ -89,7 +90,7 @@ public: write everything back into the configuration. The filter manager takes ownership of the filters in the list. */ void appendFilters( const TQValueList<KMFilter*> &filters, - bool tqreplaceIfNameExists = false ); + bool replaceIfNameExists = false ); /** Replace the list of filters under control of the filter manager. * The manager takes ownershipt of the filters. */ diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 3825d1ee9..307823c96 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -90,13 +90,13 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + tqparent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), - parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); + tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ), - parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); + tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); } // Resend all mStorage signals @@ -237,17 +237,17 @@ KMFolderType KMFolder::folderType() const TQString KMFolder::fileName() const { - return mStorage ? mStorage->fileName() : TQString::null; + return mStorage ? mStorage->fileName() : TQString(); } TQString KMFolder::location() const { - return mStorage ? mStorage->location() : TQString::null; + return mStorage ? mStorage->location() : TQString(); } TQString KMFolder::indexLocation() const { - return mStorage ? mStorage->indexLocation() : TQString::null; + return mStorage ? mStorage->indexLocation() : TQString(); } TQString KMFolder::subdirLocation() const @@ -284,11 +284,11 @@ KMFolderDir* KMFolder::createChildFolder() else if( folderType() == KMFolderTypeImap ) newType = KMImapDir; - mChild = new KMFolderDir( this, parent(), childName, newType ); + mChild = new KMFolderDir( this, tqparent(), childName, newType ); if( !mChild ) return 0; mChild->reload(); - parent()->append( mChild ); + tqparent()->append( mChild ); return mChild; } @@ -432,14 +432,14 @@ int KMFolder::moveMsg(TQPtrList<KMMessage> q, int* index_return ) return mStorage->moveMsg( q, index_return ); } -int KMFolder::find( const KMMsgBase* msg ) const +int KMFolder::tqfind( const KMMsgBase* msg ) const { - return mStorage ? mStorage->find( msg ) : -1; + return mStorage ? mStorage->tqfind( msg ) : -1; } -int KMFolder::find( const KMMessage* msg ) const +int KMFolder::tqfind( const KMMessage* msg ) const { - return mStorage ? mStorage->find( msg ) : -1; + return mStorage ? mStorage->tqfind( msg ) : -1; } int KMFolder::count( bool cache ) const @@ -470,10 +470,10 @@ int KMFolder::countUnreadRecursive() return count; } -void KMFolder::msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx ) +void KMFolder::msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx ) { - mStorage->msgStatusChanged( oldStatus, newStatus, idx ); + mStorage->msgStatusChanged( oldtqStatus, newtqStatus, idx ); } int KMFolder::open(const char *owner) @@ -592,11 +592,11 @@ TQString KMFolder::label() const //----------------------------------------------------------------------------- TQString KMFolder::prettyURL() const { - TQString parentUrl; - if ( parent() ) - parentUrl = parent()->prettyURL(); - if ( !parentUrl.isEmpty() ) - return parentUrl + '/' + label(); + TQString tqparentUrl; + if ( tqparent() ) + tqparentUrl = tqparent()->prettyURL(); + if ( !tqparentUrl.isEmpty() ) + return tqparentUrl + '/' + label(); else return label(); } @@ -614,7 +614,7 @@ TQString KMFolder::mailingListPostAddress() const return (*it).path(); } } - return TQString::null; + return TQString(); } void KMFolder::setMailingListEnabled( bool enabled ) @@ -704,11 +704,11 @@ void KMFolder::correctUnreadMsgsCount() TQString KMFolder::idString() const { - KMFolderNode* folderNode = parent(); + KMFolderNode* folderNode = tqparent(); if (!folderNode) return ""; - while ( folderNode->parent() ) - folderNode = folderNode->parent(); + while ( folderNode->tqparent() ) + folderNode = folderNode->tqparent(); TQString myPath = path(); int pathLen = myPath.length() - folderNode->path().length(); TQString relativePath = myPath.right( pathLen ); @@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex ) return mStorage->writeIndex( createEmptyIndex ); } -void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle ) +void KMFolder::setqStatus( int idx, KMMsgtqStatus status, bool toggle ) { - mStorage->seStatus( idx, status, toggle ); + mStorage->setqStatus( idx, status, toggle ); } -void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status, +void KMFolder::setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle ) { - mStorage->seStatus( ids, status, toggle); + mStorage->setqStatus( ids, status, toggle); } void KMFolder::setIconPaths( const TQString &normalPath, @@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type ) void KMFolder::slotFolderSizeChanged() { emit folderSizeChanged( this ); - KMFolder* papa = parent()->manager()->parentFolder( this ); + KMFolder* papa = tqparent()->manager()->tqparentFolder( this ); if ( papa && papa != this ) { papa->slotFolderSizeChanged(); } @@ -901,7 +901,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) KMFolderType fldType = folderType(); // names of local folders must not contain a '/' - if ( folderName.find( '/' ) != -1 && + if ( folderName.tqfind( '/' ) != -1 && fldType != KMFolderTypeImap && fldType != KMFolderTypeCachedImap ) { message = i18n( "Folder names cannot contain the / (slash) character; please choose another folder name." ); @@ -928,7 +928,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) delimiter = ai->delimiterForFolder( mStorage ); } } - if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) { + if ( !delimiter.isEmpty() && folderName.tqfind( delimiter ) != -1 ) { message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ); return false; } diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 77979b98f..83a4a7a2f 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -60,7 +60,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the children of the folder. They are only stored here + * represented as the tqchildren of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -68,14 +68,15 @@ typedef TQValueList<TQ_UINT32> SerNumList; class KMFolder: public KMFolderNode { Q_OBJECT + TQ_OBJECT friend class ::KMFolderJob; public: /** * Constructs a new Folder object. - * @param parent The directory in the folder storage hierarchy under which + * @param tqparent The directory in the folder storage hierarchy under which * the folder's storage will be found or created. - * @param name If name of the folder. In case there is no parent directory, because + * @param name If name of the folder. In case there is no tqparent directory, because * the folder is free-standing (/var/spool/mail/foo), this is used for the full path to * the folder's storage location. * @param aFolderType The type of folder to create. @@ -86,7 +87,7 @@ public: * the global MsgDict for lookup. * @return A new folder instance. */ - KMFolder( KMFolderDir* parent, const TQString& name, + KMFolder( KMFolderDir* tqparent, const TQString& name, KMFolderType aFolderType, bool withIndex = true, bool exportedSernums = true ); ~KMFolder(); @@ -168,10 +169,10 @@ public: /** Specify, that the folder can't contain mails. */ void setNoContent(bool aNoContent); - /** Returns, if the folder can't have children */ + /** Returns, if the folder can't have tqchildren */ bool noChildren() const; - /** Specify, that the folder can't have children */ + /** Specify, that the folder can't have tqchildren */ void setNoChildren(bool aNoChildren); /** Read message at given index. Indexing starts at zero */ @@ -196,7 +197,7 @@ public: * for each derived KMFolder). */ FolderJob* createJob( KMMessage *msg, FolderJob::JobType jt = FolderJob::tGetMessage, - KMFolder *folder = 0, TQString partSpecifier = TQString::null, + KMFolder *folder = 0, TQString partSpecifier = TQString(), const AttachmentStrategy *as = 0 ) const; FolderJob* createJob( TQPtrList<KMMessage>& msgList, const TQString& sets, FolderJob::JobType jt = FolderJob::tGetMessage, @@ -259,8 +260,8 @@ public: int moveMsg(TQPtrList<KMMessage>, int* index_return = 0); /** Returns the index of the given message or -1 if not found. */ - int find(const KMMsgBase* msg) const; - int find( const KMMessage * msg ) const; + int tqfind(const KMMsgBase* msg) const; + int tqfind( const KMMessage * msg ) const; /** Number of messages in this folder. */ int count(bool cache = false) const; @@ -272,10 +273,10 @@ public: contained by this folder */ int countUnreadRecursive(); - /** Called by KMMsgBase::seStatus when status of a message has changed + /** Called by KMMsgBase::setqStatus when status of a message has changed required to keep the number unread messages variable current. */ - void msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, + void msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx); /** Open folder for access. @@ -337,7 +338,7 @@ public: /** Change the dirty flag. */ void setDirty(bool f); - /** Returns true if the folder tqcontains deleted messages */ + /** Returns true if the folder contains deleted messages */ bool needsCompacting() const; void setNeedsCompacting(bool f); @@ -489,10 +490,10 @@ public: int writeIndex( bool createEmptyIndex = false ); /** Set the status of the message at index @p idx to @p status. */ - void seStatus(int idx, KMMsgStatus status, bool toggle=false); + void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); + void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false); /** Icon related methods */ bool useCustomIcons() const { return mUseCustomIcons; } @@ -541,7 +542,7 @@ public: /** * Returns true if the name is valid for a child of this folder. - * If the name tqcontains invalid characters then false is returned and message will contain + * If the name contains invalid characters then false is returned and message will contain * an explanation that can be presented to the user. */ bool isValidName( const TQString &folderName, TQString &message ); @@ -639,7 +640,7 @@ private: bool mExportsSernums :1; bool mMoveInProgress :1; - /** nationalized label or TQString::null (then name() should be used) */ + /** nationalized label or TQString() (then name() should be used) */ TQString mLabel; TQString mSystemLabel; diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index 61e155acb..f0b3f0cec 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -49,7 +49,7 @@ using KMail::AccountManager; #include "kmglobal.h" #include "acljobs.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "progressmanager.h" using KMail::CachedImapJob; @@ -92,7 +92,7 @@ static TQString incidencesForToString( KMFolderCachedImap::IncidencesFor r ) { case KMFolderCachedImap::IncForAdmins: return "admins"; case KMFolderCachedImap::IncForReaders: return "readers"; } - return TQString::null; // can't happen + return TQString(); // can't happen } static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString& str ) { @@ -102,10 +102,10 @@ static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString return KMFolderCachedImap::IncForAdmins; // by default } -DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent, +DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n( "Troubleshooting IMAP Cache" ), - Ok | Cancel, Cancel, parent, name, true ), + Ok | Cancel, Cancel, tqparent, name, true ), rc( None ) { TQFrame* page = plainPage(); @@ -239,13 +239,13 @@ void KMFolderCachedImap::reallyDoClose( const char* owner ) KMFolderMaildir::reallyDoClose( owner ); } -void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent ) +void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* tqparent ) { - setAccount( parent->account() ); + setAccount( tqparent->account() ); // Now that we have an account, tell it that this folder was created: // if this folder was just removed, then we don't really want to remove it from the server. mAccount->removeDeletedFolder( imapPath() ); - setUserRights( parent->userRights(), parent->userRightsState() ); + setUserRights( tqparent->userRights(), tqparent->userRightsState() ); } void KMFolderCachedImap::readConfig() @@ -285,7 +285,7 @@ void KMFolderCachedImap::readConfig() int storageQuotaUsage = config->readNumEntry( "StorageQuotaUsage", -1 ); int storageQuotaLimit = config->readNumEntry( "StorageQuotaLimit", -1 ); - TQString storageQuotaRoot = config->readEntry( "StorageQuotaRoot", TQString::null ); + TQString storageQuotaRoot = config->readEntry( "StorageQuotaRoot", TQString() ); if ( !storageQuotaRoot.isNull() ) { // isEmpty() means we know there is no quota set mQuotaInfo.setName( "STORAGE" ); mQuotaInfo.setRoot( storageQuotaRoot ); @@ -674,7 +674,7 @@ KMMsgBase* KMFolderCachedImap::findByUID( ulong uid ) mapReloaded = true; } - TQMap<ulong,int>::Iterator it = uidMap.find( uid ); + TQMap<ulong,int>::Iterator it = uidMap.tqfind( uid ); if( it != uidMap.end() ) { KMMsgBase *msg = getMsgBase( *it ); #if MAIL_LOSS_DEBUGGING @@ -701,7 +701,7 @@ KMMsgBase* KMFolderCachedImap::findByUID( ulong uid ) return 0; // There could be a problem in the maps. Rebuild them and try again reloadUidMap(); - it = uidMap.find( uid ); + it = uidMap.tqfind( uid ); if( it != uidMap.end() ) // Since the uid map is just rebuilt, no need for the sanity check return getMsgBase( *it ); @@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot() void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly ) { if( mSyncState != SYNC_STATE_INITIAL ) { - if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString::null, i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { + if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { mSyncState = SYNC_STATE_INITIAL; } else return; } @@ -828,13 +828,13 @@ TQString KMFolderCachedImap::state2String( int state ) const case SYNC_STATE_SET_ANNOTATIONS: return "SYNC_STATE_SET_ANNOTATIONS"; case SYNC_STATE_GET_ACLS: return "SYNC_STATE_GET_ACLS"; case SYNC_STATE_SET_ACLS: return "SYNC_STATE_SET_ACLS"; - case SYNC_STATE_GET_QUOTA: return "SYNC_STATE_GET_QUOTA"; + case SYNC_STATE_GET_TQUOTA: return "SYNC_STATE_GET_TQUOTA"; case SYNC_STATE_FIND_SUBFOLDERS: return "SYNC_STATE_FIND_SUBFOLDERS"; case SYNC_STATE_SYNC_SUBFOLDERS: return "SYNC_STATE_SYNC_SUBFOLDERS"; case SYNC_STATE_RENAME_FOLDER: return "SYNC_STATE_RENAME_FOLDER"; case SYNC_STATE_CHECK_UIDVALIDITY: return "SYNC_STATE_CHECK_UIDVALIDITY"; case SYNC_STATE_CLOSE: return "SYNC_STATE_CLOSE"; - case SYNC_STATE_GET_SUBFOLDER_QUOTA: return "SYNC_STATE_GET_SUBFOLDER_QUOTA"; + case SYNC_STATE_GET_SUBFOLDER_TQUOTA: return "SYNC_STATE_GET_SUBFOLDER_TQUOTA"; default: return "Unknown state"; } } @@ -1080,7 +1080,7 @@ void KMFolderCachedImap::serverSyncInternal() mSyncState = SYNC_STATE_GET_MESSAGES; if( !mQuotaOnly && !noContent() ) { newState( mProgress, i18n("Expunging deleted messages")); - CachedImapJob *job = new CachedImapJob( TQString::null, + CachedImapJob *job = new CachedImapJob( TQString(), CachedImapJob::tExpungeFolder, this ); connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); @@ -1170,7 +1170,7 @@ void KMFolderCachedImap::serverSyncInternal() // for a folder we didn't create ourselves: get annotation from server if ( mAnnotationFolderType == "FROMSERVER" ) { needToGetInitialAnnotations = true; - mAnnotationFolderType = TQString::null; + mAnnotationFolderType = TQString(); } else { updateAnnotationFolderType(); } @@ -1293,13 +1293,13 @@ void KMFolderCachedImap::serverSyncInternal() case SYNC_STATE_SYNC_SUBFOLDERS: syncNextSubFolder( false ); break; - case SYNC_STATE_GET_SUBFOLDER_QUOTA: + case SYNC_STATE_GET_SUBFOLDER_TQUOTA: // Sync the subfolders again, so that the quota information is updated for all. This state is // only entered if the close to quota property of one subfolder changed in the previous state. syncNextSubFolder( true ); break; - case SYNC_STATE_GET_QUOTA: + case SYNC_STATE_GET_TQUOTA: mSyncState = SYNC_STATE_CLOSE; if( !noContent() && mAccount->hasQuotaSupport() ) { mProgress = 98; @@ -1346,10 +1346,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync ) if( mSubfoldersForSync.isEmpty() ) { // Sync finished, and a close to quota property of an subfolder changed, therefore go into - // the SYNC_STATE_GET_SUBFOLDER_QUOTA state and sync again + // the SYNC_STATE_GET_SUBFOLDER_TQUOTA state and sync again if ( mSomeSubFolderCloseToQuotaChanged && mRecurse && !secondSync ) { buildSubFolderList(); - mSyncState = SYNC_STATE_GET_SUBFOLDER_QUOTA; + mSyncState = SYNC_STATE_GET_SUBFOLDER_TQUOTA; serverSyncInternal(); } @@ -1358,7 +1358,7 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync ) // Quota checking has to come after syncing subfolder, otherwise the quota information would // be outdated, since the subfolders can change in size during the syncing. // https://issues.kolab.org/issue4066 - mSyncState = SYNC_STATE_GET_QUOTA; + mSyncState = SYNC_STATE_GET_TQUOTA; serverSyncInternal(); } } else { @@ -1491,7 +1491,7 @@ void KMFolderCachedImap::slotPutProgress( unsigned long done, unsigned long tota { // (going from mProgress to mProgress+10) int progressSpan = 10; - newState( mProgress + (progressSpan * done) / total, TQString::null ); + newState( mProgress + (progressSpan * done) / total, TQString() ); if ( done == total ) // we're done mProgress += progressSpan; } @@ -1511,7 +1511,7 @@ void KMFolderCachedImap::uploadFlags() if( !msg || msg->UID() == 0 ) // Either not a valid message or not one that is on the server yet continue; - if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end() + if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end() && !mStatusChangedLocally ) { // This message has not had its status changed locally continue; @@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags() // Send off a status setting job for each set. for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) { TQString imappath = imapPath() + ";UID=" + ( *slit ); - mAccount->setImapStatus(folder(), imappath, flags); + mAccount->setImaptqStatus(folder(), imappath, flags); } } // FIXME END DUPLICATED FROM KMFOLDERIMAP @@ -1559,7 +1559,7 @@ void KMFolderCachedImap::uploadSeenFlags() // Either not a valid message or not one that is on the server yet continue; - if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end() + if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end() && !mStatusChangedLocally ) { // This message has not had its status changed locally continue; @@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags() mStatusFlagsJobs += sets.count(); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - mAccount->setImapSeenStatus( folder(), imappath, true ); + mAccount->setImapSeentqStatus( folder(), imappath, true ); } } if ( !unseenUids.isEmpty() ) { @@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags() mStatusFlagsJobs += sets.count(); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - mAccount->setImapSeenStatus( folder(), imappath, false ); + mAccount->setImapSeentqStatus( folder(), imappath, false ); } } @@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& } // This is not perfect, what if the status didn't really change? Oh well ... -void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setqStatus( int idx, KMMsgtqStatus status, bool toggle) { - KMFolderMaildir::seStatus( idx, status, toggle ); + KMFolderMaildir::setqStatus( idx, status, toggle ); const KMMsgBase *msg = getMsgBase( idx ); Q_ASSERT( msg ); if ( msg ) mUIDsOfLocallyChangedStatuses.insert( msg->UID() ); } -void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle) { - KMFolderMaildir::seStatus(ids, status, toggle); + KMFolderMaildir::setqStatus(ids, status, toggle); for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) { const KMMsgBase *msg = getMsgBase( *it ); Q_ASSERT( msg ); @@ -1691,7 +1691,7 @@ bool KMFolderCachedImap::deleteMessages() TQMap<ulong,int>::const_iterator it = uidMap.constBegin(); for( ; it != uidMap.end(); it++ ) { ulong uid ( it.key() ); - if( uid!=0 && !uidsOnServer.find( uid ) ) { + if( uid!=0 && !uidsOnServer.tqfind( uid ) ) { uids << TQString::number( uid ); msgsForDeletion.append( getMsgBase( *it ) ); } @@ -1832,28 +1832,28 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & return; } (*it).cdata += TQCString(data, data.size() + 1); - int pos = (*it).cdata.find("\r\n--IMAPDIGEST"); + int pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST"); if (pos > 0) { - int a = (*it).cdata.find("\r\nX-uidValidity:"); + int a = (*it).cdata.tqfind("\r\nX-uidValidity:"); if (a != -1) { - int b = (*it).cdata.find("\r\n", a + 17); + int b = (*it).cdata.tqfind("\r\n", a + 17); setUidValidity((*it).cdata.mid(a + 17, b - a - 17)); } - a = (*it).cdata.find("\r\nX-Access:"); + a = (*it).cdata.tqfind("\r\nX-Access:"); // Only trust X-Access (i.e. the imap select info) if we don't know mUserRights. // The latter is more accurate (checked on every sync) whereas X-Access is only // updated when selecting the folder again, which might not happen if using // RMB / Check Mail in this folder. We don't need two (potentially conflicting) // sources for the readonly setting, in any case. if (a != -1 && mUserRightsState != KMail::ACLJobs::Ok ) { - int b = (*it).cdata.find("\r\n", a + 12); + int b = (*it).cdata.tqfind("\r\n", a + 12); const TQString access = (*it).cdata.mid(a + 12, b - a - 12); setReadOnly( access == "Read only" ); } (*it).cdata.remove(0, pos); mFoundAnIMAPDigest = true; } - pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1); + pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1); // Start with something largish when rebuilding the cache if ( uidsOnServer.size() == 0 ) uidsOnServer.resize( KMail::nextPrime( 2000 ) ); @@ -1869,16 +1869,16 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & // The below is optimized for speed, not prettiness. The commented out chunk // above was the solution copied from kmfolderimap, and it's 15-20% slower. const TQCString& entry( (*it).cdata ); - const int indexOfUID = entry.find("X-UID", 16); + const int indexOfUID = entry.tqfind("X-UID", 16); const int startOfUIDValue = indexOfUID + 7; - const int indexOfLength = entry.find("X-Length", startOfUIDValue ); // we know length comes after UID + const int indexOfLength = entry.tqfind("X-Length", startOfUIDValue ); // we know length comes after UID const int startOfLengthValue = indexOfLength + 10; - const int indexOfFlags = entry.find("X-Flags", startOfLengthValue ); // we know flags comes last + const int indexOfFlags = entry.tqfind("X-Flags", startOfLengthValue ); // we know flags comes last const int startOfFlagsValue = indexOfFlags + 9; - const int flags = entry.mid( startOfFlagsValue, entry.find( '\r', startOfFlagsValue ) - startOfFlagsValue ).toInt(); - const ulong size = entry.mid( startOfLengthValue, entry.find( '\r', startOfLengthValue ) - startOfLengthValue ).toULong(); - const ulong uid = entry.mid( startOfUIDValue, entry.find( '\r', startOfUIDValue ) - startOfUIDValue ).toULong(); + const int flags = entry.mid( startOfFlagsValue, entry.tqfind( '\r', startOfFlagsValue ) - startOfFlagsValue ).toInt(); + const ulong size = entry.mid( startOfLengthValue, entry.tqfind( '\r', startOfLengthValue ) - startOfLengthValue ).toULong(); + const ulong uid = entry.mid( startOfUIDValue, entry.tqfind( '\r', startOfUIDValue ) - startOfUIDValue ).toULong(); const bool deleted = ( flags & 8 ); if ( !deleted ) { @@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & // be considered correct. if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) { /* The message is OK, update flags */ - KMFolderImap::flagsToStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags ); + KMFolderImap::flagsTotqStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags ); } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { - KMFolderImap::seenFlagToStatus( existingMessage, flags ); + KMFolderImap::seenFlagTotqStatus( existingMessage, flags ); } } // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl; @@ -1941,7 +1941,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should download it" << endl; #endif // The message is new since the last sync, but we might have just uploaded it, in which case - // the uid map already tqcontains it. + // the uid map already contains it. if ( !uidMap.tqcontains( uid ) ) { mMsgsForDownload << KMail::CachedImapJob::MsgForDownload(uid, flags, size); if( imapPath() == "/INBOX/" ) @@ -1958,7 +1958,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & } (*it).cdata.remove(0, pos); (*it).done++; - pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1); + pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1); } } @@ -1994,7 +1994,7 @@ void KMFolderCachedImap::slotProgress(unsigned long done, unsigned long total) // Progress info while retrieving new emails // (going from mProgress to mProgress+progressSpan) - newState( mProgress + additionalProgress, TQString::null ); + newState( mProgress + additionalProgress, TQString() ); } void KMFolderCachedImap::setAccount(KMAcctCachedImap *aAccount) @@ -2264,11 +2264,11 @@ void KMFolderCachedImap::listDirectory2() } if ( root && !mSubfolderNames.isEmpty() ) { - KMFolderCachedImap* parent = + KMFolderCachedImap* tqparent = findParent( mSubfolderPaths.first(), mSubfolderNames.first() ); - if ( parent ) { + if ( tqparent ) { kdDebug(5006) << "KMFolderCachedImap::listDirectory2 - pass listing to " - << parent->label() << endl; + << tqparent->label() << endl; mSubfolderNames.clear(); } } @@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2() // (could be that the folder was deleted & recreated meanwhile from another client...) if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) { locallyDeleted = KMessageBox::warningYesNo( - 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString::null, KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; + 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; } if ( locallyDeleted ) { @@ -2344,7 +2344,7 @@ void KMFolderCachedImap::listDirectory2() AnnotationJobs::MultiUrlGetAnnotationJob* job = AnnotationJobs::multiUrlGetAnnotation( mAccount->slave(), mAccount->getUrl(), paths, KOLAB_FOLDERTYPE ); - ImapAccountBase::jobData jd( TQString::null, folder() ); + ImapAccountBase::jobData jd( TQString(), folder() ); jd.cancellable = true; mAccount->insertJob(job, jd); connect( job, TQT_SIGNAL(result(KIO::Job *)), @@ -2392,18 +2392,18 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue KMFolderCachedImap* KMFolderCachedImap::findParent( const TQString& path, const TQString& name ) { - TQString parent = path.left( path.length() - name.length() - 2 ); - if ( parent.length() > 1 ) + TQString tqparent = path.left( path.length() - name.length() - 2 ); + if ( tqparent.length() > 1 ) { - // extract name of the parent - parent = parent.right( parent.length() - 1 ); - if ( parent != label() ) + // extract name of the tqparent + tqparent = tqparent.right( tqparent.length() - 1 ); + if ( tqparent != label() ) { KMFolderNode *node = folder()->child()->first(); - // look for a better parent + // look for a better tqparent while ( node ) { - if ( node->name() == parent ) + if ( node->name() == tqparent ) { KMFolder* fld = static_cast<KMFolder*>(node); KMFolderCachedImap* imapFld = @@ -2555,7 +2555,7 @@ KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job) { KMAcctCachedImap::JobIterator it = mAccount->findJob(job); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - if ( (*it).parent != folder() ) return; // Shouldn't happen + if ( (*it).tqparent != folder() ) return; // Shouldn't happen if ( job->error() ) // Display error but don't abort the sync just for this @@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState() KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); TQString str = i18n("Aborted"); if (progressItem) - progressItem->seStatus( str ); + progressItem->setqStatus( str ); emit statusMsg( str ); emit syncStateChanged(); } @@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress() mProgress += 5; } -void KMFolderCachedImap::newState( int progress, const TQString& syncStatus ) +void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus ) { - //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl; + //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl; KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); if( progressItem ) progressItem->setCompletedItems( progress ); - if ( !syncStatus.isEmpty() ) { + if ( !synctqStatus.isEmpty() ) { TQString str; // For a subfolder, show the label. But for the main folder, it's already shown. if ( mAccount->imapFolder() == this ) - str = syncStatus; + str = synctqStatus; else - str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus ); + str = TQString( "%1: %2" ).arg( label() ).arg( synctqStatus ); if( progressItem ) - progressItem->seStatus( str ); + progressItem->setqStatus( str ); emit statusMsg( str ); } if( progressItem ) @@ -2669,7 +2669,7 @@ void KMFolderCachedImap::updateAnnotationFolderType() { TQString oldType = mAnnotationFolderType; TQString oldSubType; - int dot = oldType.find( '.' ); + int dot = oldType.tqfind( '.' ); if ( dot != -1 ) { oldType.truncate( dot ); oldSubType = mAnnotationFolderType.mid( dot + 1 ); @@ -2693,7 +2693,7 @@ void KMFolderCachedImap::updateAnnotationFolderType() //kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: " << newType << " " << newSubType << endl; if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) { - mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString::null : "."+newSubType ); + mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString() : "."+newSubType ); mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to TRUE" << endl; } @@ -2728,7 +2728,7 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr if ( found ) { TQString type = value; TQString subtype; - int dot = value.find( '.' ); + int dot = value.tqfind( '.' ); if ( dot != -1 ) { type.truncate( dot ); subtype = value.mid( dot + 1 ); @@ -2742,13 +2742,13 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr if ( contentsType != ContentsTypeMail ) kmkernel->iCalIface().setStorageFormat( folder(), KMailICalIfaceImpl::StorageXML ); mAnnotationFolderType = value; - if ( folder()->parent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent() + if ( folder()->tqparent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent() && GlobalSettings::self()->theIMAPResourceEnabled() && subtype == "default" ) { // Truncate subtype if this folder can't be a default resource folder for us, - // although it apparently is for someone else. + // although it aptqparently is for someone else. mAnnotationFolderType = type; - kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: parent folder is " << folder()->parent()->owner()->idString() << " => truncating annotation to " << value << endl; + kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: tqparent folder is " << folder()->tqparent()->owner()->idString() << " => truncating annotation to " << value << endl; } setContentsType( contentsType ); mAnnotationFolderTypeChanged = false; // we changed it, not the user @@ -2800,8 +2800,8 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).parent == folder() ); - if ( (*it).parent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).tqparent == folder() ); + if ( (*it).tqparent != folder() ) return; // Shouldn't happen AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job ); if ( annjob->error() ) { @@ -2826,8 +2826,8 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).parent == folder() ); - if ( (*it).parent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).tqparent == folder() ); + if ( (*it).tqparent != folder() ) return; // Shouldn't happen TQValueVector<int> folders; AnnotationJobs::MultiUrlGetAnnotationJob* annjob @@ -2852,7 +2852,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) kdDebug(5006) << k_funcinfo << "Folder: " << folderPath << " has type: " << annotation << endl; // we're only interested in the main type TQString type(annotation); - int dot = annotation.find( '.' ); + int dot = annotation.tqfind( '.' ); if ( dot != -1 ) type.truncate( dot ); type = type.simplifyWhiteSpace(); @@ -2878,8 +2878,8 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).parent == folder() ); - if ( (*it).parent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).tqparent == folder() ); + if ( (*it).tqparent != folder() ) return; // Shouldn't happen QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job ); QuotaInfo empty; @@ -2921,8 +2921,8 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).parent == folder() ); - if ( (*it).parent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).tqparent == folder() ); + if ( (*it).tqparent != folder() ) return; // Shouldn't happen mAccount->setAnnotationCheckPassed( true ); if ( job->error() ) { @@ -2940,11 +2940,11 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job) { KMAcctCachedImap::JobIterator it = mAccount->findJob(job); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - if ( (*it).parent != folder() ) return; // Shouldn't happen + if ( (*it).tqparent != folder() ) return; // Shouldn't happen bool cont = true; if ( job->error() ) { - // Don't show error if the server doesn't support ANNOTATEMORE and this folder only tqcontains mail + // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) { if (mAccount->slave()) mAccount->removeJob(job); } else { @@ -3133,7 +3133,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "Please contact your administrator to allow upload of new messages " "to you, or move them out of this folder.</p> " "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) ); - if ( KMessageBox::warningYesNo( 0, msg, TQString::null, i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { + if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(), i18n("Move Messages to Folder"), true ); if ( dlg.exec() ) { diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index 61fcfcbac..87c15f751 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -66,6 +66,7 @@ using KMail::AttachmentStrategy; class DImapTroubleShootDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum SelectedOperation { None = -1, @@ -75,7 +76,7 @@ public: RefreshCache }; - DImapTroubleShootDialog( TQWidget* parent=0, const char* name=0 ); + DImapTroubleShootDialog( TQWidget* tqparent=0, const char* name=0 ); static int run(); @@ -92,14 +93,15 @@ private: class KMFolderCachedImap : public KMFolderMaildir { Q_OBJECT + TQ_OBJECT public: static TQString cacheLocation() { return locateLocal("data", "kmail/dimap" ); } - /** Usually a parent is given. But in some cases there is no - fitting parent object available. Then the name of the folder + /** Usually a tqparent is given. But in some cases there is no + fitting tqparent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderCachedImap(KMFolder* folder, const char* name=0); virtual ~KMFolderCachedImap(); @@ -108,7 +110,7 @@ public: void reallyDoClose(const char* owner); /** Initialize this storage from another one. Used when creating a child folder */ - void initializeFrom( KMFolderCachedImap* parent ); + void initializeFrom( KMFolderCachedImap* tqparent ); virtual void readConfig(); virtual void writeConfig(); @@ -283,8 +285,8 @@ public: void setACLList( const ACLList& arr ); // Reimplemented so the mStatusChangedLocally bool can be set - virtual void seStatus( int id, KMMsgStatus status, bool toggle ); - virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ); + virtual void setqStatus( int id, KMMsgtqStatus status, bool toggle ); + virtual void setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle ); TQString annotationFolderType() const { return mAnnotationFolderType; } @@ -322,7 +324,7 @@ public: /** * Specify an imap path that is used to create the folder on the server - * Otherwise the parent folder is used to construct the path + * Otherwise the tqparent folder is used to construct the path */ const TQString& imapPathForCreation() { return mImapPathCreation; } void setImapPathForCreation( const TQString& path ) { mImapPathCreation = path; } @@ -403,9 +405,9 @@ protected: virtual void timerEvent( TQTimerEvent* ); /* update progress status */ - void newState( int progress, const TQString& syncStatus ); + void newState( int progress, const TQString& synctqStatus ); - /** See if there is a better parent then this folder */ + /** See if there is a better tqparent then this folder */ KMFolderCachedImap* findParent( const TQString& path, const TQString& name ); @@ -472,8 +474,8 @@ private: /** * Sync the next subfolder in the list of subfolders (mSubfoldersForSync). - * When finished, this will switch either to the state SYNC_STATE_GET_SUBFOLDER_QUOTA or - * to SYNC_STATE_GET_QUOTA. + * When finished, this will switch either to the state SYNC_STATE_GET_SUBFOLDER_TQUOTA or + * to SYNC_STATE_GET_TQUOTA. */ void syncNextSubFolder( bool secondSync ); @@ -503,13 +505,13 @@ private: SYNC_STATE_SET_ANNOTATIONS, SYNC_STATE_GET_ACLS, SYNC_STATE_SET_ACLS, - SYNC_STATE_GET_QUOTA, + SYNC_STATE_GET_TQUOTA, SYNC_STATE_FIND_SUBFOLDERS, SYNC_STATE_SYNC_SUBFOLDERS, SYNC_STATE_CHECK_UIDVALIDITY, SYNC_STATE_RENAME_FOLDER, SYNC_STATE_CLOSE, - SYNC_STATE_GET_SUBFOLDER_QUOTA + SYNC_STATE_GET_SUBFOLDER_TQUOTA } mSyncState; int mProgress; @@ -588,7 +590,7 @@ private: bool mSharedSeenFlagsChanged; /** - * UIDs added by seStatus. Indicates that the client has changed + * UIDs added by setqStatus. Indicates that the client has changed * the status of those mails. The mail flags for changed mails will be * uploaded to the server, overwriting the server's notion of the status * of the mails in this folder. diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp index 499d444f1..1135b25b7 100644 --- a/kmail/kmfoldercombobox.cpp +++ b/kmail/kmfoldercombobox.cpp @@ -8,8 +8,8 @@ //----------------------------------------------------------------------------- -KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name ) - : TQComboBox( parent, name ) +KMFolderComboBox::KMFolderComboBox( TQWidget *tqparent, char *name ) + : TQComboBox( tqparent, name ) { init(); } @@ -17,8 +17,8 @@ KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name ) //----------------------------------------------------------------------------- -KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *parent, char *name ) - : TQComboBox( rw, parent, name ) +KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *tqparent, char *name ) + : TQComboBox( rw, tqparent, name ) { init(); } diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h index 38268e752..b53519022 100644 --- a/kmail/kmfoldercombobox.h +++ b/kmail/kmfoldercombobox.h @@ -11,13 +11,14 @@ #include <tqcombobox.h> #include <tqguardedptr.h> -class KMFolderComboBox : public QComboBox +class KMFolderComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - KMFolderComboBox( TQWidget *parent = 0, char *name = 0 ); - KMFolderComboBox( bool rw, TQWidget *parent = 0, char *name = 0 ); + KMFolderComboBox( TQWidget *tqparent = 0, char *name = 0 ); + KMFolderComboBox( bool rw, TQWidget *tqparent = 0, char *name = 0 ); /** Select whether the outbox folder is shown. Default is yes. */ void showOutboxFolder(bool shown); diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 4e17ce235..9d514614f 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -100,12 +100,12 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folders; - // get all folders but search and folders that can not have children + // get all folders but search and folders that can not have tqchildren aParent->createFolderList(&folderNames, &folders, true, true, true, false, true, false); if( mFolderDir ) { - // search the parent folder of the folder + // search the tqparent folder of the folder FolderList::ConstIterator it; int i = 1; for( it = folders.begin(); it != folders.end(); ++it, ++i ) { @@ -185,7 +185,7 @@ void KMFolderDialog::slotOk() mDelayedSavingTabs = 0; // number of tabs which need delayed saving for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) { - FolderDiaTab::AccepStatus s = mTabs[i]->accept(); + FolderDiaTab::AcceptqStatus s = mTabs[i]->accept(); if ( s == FolderDiaTab::Canceled ) { slotCancelAccept(); return; @@ -234,9 +234,9 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) +static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout ) { - TQFrame *line = new TQFrame( parent, "line" ); + TQFrame *line = new TQFrame( tqparent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); @@ -247,8 +247,8 @@ static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) //---------------------------------------------------------------------------- KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, const TQString& aName, - TQWidget* parent, const char* name ) - : FolderDiaTab( parent, name ), + TQWidget* tqparent, const char* name ) + : FolderDiaTab( tqparent, name ), mSharedSeenFlagsCheckBox( 0 ), mDlg( dlg ) { @@ -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->parentFolder() && - mDlg->folder()->storage() && mDlg->parentFolder()->storage() && + if ( mDlg->folder() && mDlg->tqparentFolder() && + mDlg->folder()->storage() && mDlg->tqparentFolder()->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 parentRights = -1; + int tqparentRights = -1; int folderRights = -1; - bool parentRightsOk = false; + bool tqparentRightsOk = false; bool folderRightsOk = false; if ( imap ) { - KMFolderImap * const parent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ); + KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ); folderRights = imap->userRights(); folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok; - if ( parent ) { - parentRights = parent->userRights(); - parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok; + if ( tqparent ) { + tqparentRights = tqparent->userRights(); + tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } else if ( dimap ) { - KMFolderCachedImap * const parent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() ); + KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->tqparentFolder()->storage() ); folderRights = dimap->userRights(); folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok; - if ( parent ) { - parentRights = parent->userRights(); - parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok; + if ( tqparent ) { + tqparentRights = tqparent->userRights(); + tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } // For renaming, we need support for deleting the mailbox and then re-creating it. - if ( parentRightsOk && folderRightsOk && - ( !( parentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { + if ( tqparentRightsOk && folderRightsOk && + ( !( tqparentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { nameChangeAllowed = false; } } @@ -325,7 +325,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mNameEdit->setEnabled( nameChangeAllowed ); if ( !nameChangeAllowed ) { TQToolTip::add( mNameEdit, i18n( "Not enough permissions to rename this folder.\n" - "The parent folder doesn't have write support.\n" + "The tqparent folder doesn't have write support.\n" "A sync is needed after changing the permissions." ) ); } mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") ); @@ -702,9 +702,9 @@ bool FolderDiaGeneralTab::save() else fldName = oldFldName; - if ( mDlg->parentFolder() && - mDlg->parentFolder()->folderType() != KMFolderTypeImap && - mDlg->parentFolder()->folderType() != KMFolderTypeCachedImap ) + if ( mDlg->tqparentFolder() && + mDlg->tqparentFolder()->folderType() != KMFolderTypeImap && + mDlg->tqparentFolder()->folderType() != KMFolderTypeCachedImap ) fldName.remove('/'); fldName.remove(TQRegExp("^\\.*")); if (fldName.isEmpty()) fldName = i18n("unnamed"); @@ -796,8 +796,8 @@ void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-r //---------------------------------------------------------------------------- KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg, - TQWidget* parent ) - : FolderDiaTab( parent, 0 ), mDlg( dlg ) + TQWidget* tqparent ) + : FolderDiaTab( tqparent, 0 ), mDlg( dlg ) { mIsLocalSystemFolder = mDlg->folder()->isSystemFolder(); diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index 31fb26d9b..a97d78b33 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -67,12 +67,13 @@ namespace KMail { * Feel free to rename and move this base class somewhere else if it * can be useful for other dialogs. */ -class FolderDiaTab : public QWidget +class FolderDiaTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FolderDiaTab( TQWidget *parent=0, const char* name=0 ) - : TQWidget( parent, name ) {} + FolderDiaTab( TQWidget *tqparent=0, const char* name=0 ) + : TQWidget( tqparent, name ) {} virtual void load() = 0; @@ -82,12 +83,12 @@ public: /// @return whether save succeeded virtual bool save() = 0; - enum AccepStatus { Accepted, Canceled, Delayed }; + enum AcceptqStatus { Accepted, Canceled, Delayed }; /// Called when clicking OK. /// If a module returns Delayed, the closing is cancelled for now, /// and the module can close the dialog later on (i.e. after an async /// operation like a KIO job). - virtual AccepStatus accept() { + virtual AcceptqStatus accept() { return save() ? Accepted : Canceled; } @@ -111,11 +112,12 @@ signals: class FolderDiaGeneralTab : public FolderDiaTab { Q_OBJECT + TQ_OBJECT public: FolderDiaGeneralTab( KMFolderDialog* dlg, const TQString& aName, - TQWidget* parent, const char* name = 0 ); + TQWidget* tqparent, const char* name = 0 ); virtual void load(); virtual bool save(); @@ -162,9 +164,10 @@ private: class FolderDiaTemplatesTab : public FolderDiaTab { Q_OBJECT + TQ_OBJECT public: - FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent ); + FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *tqparent ); virtual void load(); virtual bool save(); @@ -196,11 +199,12 @@ private: class KMFolderDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir, - KMFolderTree* parent, const TQString& caption, - const TQString& name = TQString::null ); + KMFolderTree* tqparent, const TQString& caption, + const TQString& name = TQString() ); KMFolder* folder() const { return mFolder; } void setFolder( KMFolder* folder ); @@ -211,7 +215,7 @@ public: KMFolderDir* folderDir() const { return mFolderDir; } typedef TQValueList<TQGuardedPtr<KMFolder> > FolderList; - KMFolder* parentFolder() const { return mParentFolder; } + KMFolder* tqparentFolder() const { return mParentFolder; } KMFolderTree* folderTree() const { return mFolderTree; } diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index f3b80e3f1..1f6019b00 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -55,7 +55,7 @@ TQString KMFolderRootDir::prettyURL() const if ( !mBaseURL.isEmpty() ) return i18n( mBaseURL.data() ); else - return TQString::null; + return TQString(); } @@ -75,9 +75,9 @@ KMFolderMgr* KMFolderRootDir::manager() const //============================================================================= //============================================================================= -KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* parent, +KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* tqparent, const TQString& name, KMFolderDirType dirType ) - : KMFolderNode( parent, name ), KMFolderNodeList(), + : KMFolderNode( tqparent, name ), KMFolderNodeList(), mOwner( owner ), mDirType( dirType ) { setAutoDelete( true ); @@ -129,9 +129,9 @@ TQString KMFolderDir::path() const { static TQString p; - if (parent()) + if (tqparent()) { - p = parent()->path(); + p = tqparent()->path(); p.append("/"); p.append(name()); } @@ -147,29 +147,29 @@ TQString KMFolderDir::label() const if ( mOwner ) return mOwner->label(); else - return TQString::null; + return TQString(); } //----------------------------------------------------------------------------- TQString KMFolderDir::prettyURL() const { - TQString parentUrl; - if ( parent() ) - parentUrl = parent()->prettyURL(); - if ( !parentUrl.isEmpty() ) - return parentUrl + '/' + label(); + TQString tqparentUrl; + if ( tqparent() ) + tqparentUrl = tqparent()->prettyURL(); + if ( !tqparentUrl.isEmpty() ) + return tqparentUrl + '/' + label(); else return label(); } //----------------------------------------------------------------------------- -void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *parentFolder ) +void KMFolderDir::addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ) { - KMFolderDir* folderDir = new KMFolderDir( parentFolder, this, dirName, mDirType); + KMFolderDir* folderDir = new KMFolderDir( tqparentFolder, this, dirName, mDirType); folderDir->reload(); append( folderDir ); - parentFolder->setChild( folderDir ); + tqparentFolder->setChild( folderDir ); } // Get the default folder type of the given dir type. This function should only be used when @@ -179,7 +179,7 @@ KMFolderType dirTypeToFolderType( KMFolderDirType dirType ) switch( dirType ) { // Use maildir for normal folder dirs, as this function is only called when finding a dir - // without a parent folder, which can only happen with maildir-like folders + // without a tqparent folder, which can only happen with maildir-like folders case KMStandardDir: return KMFolderTypeMaildir; case KMImapDir: return KMFolderTypeImap; @@ -211,7 +211,7 @@ bool KMFolderDir::reload(void) return FALSE; } - QFileInfoList* fiList=(QFileInfoList*)dir.entryInfoList(); + TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); if (!fiList) { TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); @@ -320,8 +320,8 @@ bool KMFolderDir::reload(void) // .foo.directory => foo TQString folderName = *it; - int right = folderName.find( ".directory" ); - int left = folderName.find( "." ); + int right = folderName.tqfind( ".directory" ); + int left = folderName.tqfind( "." ); Q_ASSERT( left != -1 && right != -1 ); folderName = folderName.mid( left + 1, right - 1 ); @@ -354,7 +354,7 @@ KMFolderNode* KMFolderDir::hasNamedFolder(const TQString& aName) //----------------------------------------------------------------------------- KMFolderMgr* KMFolderDir::manager() const { - return parent()->manager(); + return tqparent()->manager(); } diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index c93317e52..3df289bcc 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -15,10 +15,11 @@ class KMFolderMgr; class KMFolderDir: public KMFolderNode, public KMFolderNodeList { Q_OBJECT + TQ_OBJECT public: - KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0, - const TQString& path = TQString::null, + KMFolderDir( KMFolder * owner, KMFolderDir * tqparent = 0, + const TQString& path = TQString(), KMFolderDirType = KMStandardDir ); virtual ~KMFolderDir(); @@ -27,7 +28,7 @@ public: /** * Adds the given subdirectory of this directory to the associated folder. */ - void addDirToParent( const TQString &dirName, KMFolder *parentFolder ); + void addDirToParent( const TQString &dirName, KMFolder *tqparentFolder ); /** Read contents of directory. */ virtual bool reload(); @@ -54,7 +55,7 @@ public: /** Returns the folder manager that manages this folder */ virtual KMFolderMgr* manager() const; - /** Returns the folder whose children we are holding */ + /** Returns the folder whose tqchildren we are holding */ KMFolder* owner() const { return mOwner; } virtual KMFolderDirType type() const { return mDirType; } @@ -70,10 +71,11 @@ protected: class KMFolderRootDir: public KMFolderDir { Q_OBJECT + TQ_OBJECT public: KMFolderRootDir( KMFolderMgr* manager, - const TQString& path=TQString::null, + const TQString& path=TQString(), KMFolderDirType dirType = KMStandardDir ); virtual ~KMFolderRootDir(); virtual TQString path() const; diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index c924fa8a1..28ba493c2 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 *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->parent() ); - if ( !parentFolderDir ) { - kdWarning() << k_funcinfo << "No parent folder dir found for " << name() << endl; + KMFolderDir *tqparentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() ); + if ( !tqparentFolderDir ) { + kdWarning() << k_funcinfo << "No tqparent folder dir found for " << name() << endl; return 0; } - KMFolder *parentFolder = parentFolderDir->owner(); - if ( !parentFolder ) { - kdWarning() << k_funcinfo << "No parent folder found for " << name() << endl; + KMFolder *tqparentFolder = tqparentFolderDir->owner(); + if ( !tqparentFolder ) { + kdWarning() << k_funcinfo << "No tqparent folder found for " << name() << endl; return 0; } - KMFolderImap *parentStorage = dynamic_cast<KMFolderImap*>( parentFolder->storage() ); - if ( parentStorage ) - mAccount = parentStorage->account(); + KMFolderImap *tqparentStorage = dynamic_cast<KMFolderImap*>( tqparentFolder->storage() ); + if ( tqparentStorage ) + mAccount = tqparentStorage->account(); } return mAccount; } @@ -302,7 +302,7 @@ void KMFolderImap::removeMsg( const TQPtrList<KMMessage>& msgList, bool quiet ) KMMessage *msg; while ( (msg = it.current()) != 0 ) { ++it; - int idx = find(msg); + int idx = tqfind(msg); assert( idx != -1); // ATTENTION port me to maildir KMFolderMbox::removeMsg(idx, quiet); @@ -321,13 +321,13 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent ) //----------------------------------------------------------------------------- void KMFolderImap::addMsgQuiet(KMMessage* aMsg) { - KMFolder *aFolder = aMsg->parent(); + KMFolder *aFolder = aMsg->tqparent(); TQ_UINT32 serNum = 0; aMsg->setTransferInProgress( false ); if (aFolder) { serNum = aMsg->getMsgSerNum(); kmkernel->undoStack()->pushSingleAction( serNum, aFolder, folder() ); - int idx = aFolder->find( aMsg ); + int idx = aFolder->tqfind( aMsg ); assert( idx != -1 ); aFolder->take( idx ); } @@ -351,7 +351,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList) mAddMessageProgressItem->setComplete(); mAddMessageProgressItem = 0; } - KMFolder *aFolder = msgList.first()->parent(); + KMFolder *aFolder = msgList.first()->tqparent(); int undoId = -1; bool uidplus = account()->hasCapability("uidplus"); for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() ) @@ -371,7 +371,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList) if ( aFolder ) { aFolder->take( msgList ); } else { - kdDebug(5006) << k_funcinfo << "no parent" << endl; + kdDebug(5006) << k_funcinfo << "no tqparent" << endl; } msgList.setAutoDelete(true); msgList.clear(); @@ -392,7 +392,7 @@ int KMFolderImap::addMsg(KMMessage* aMsg, int* aIndex_ret) int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex_ret) { KMMessage *aMsg = msgList.getFirst(); - KMFolder *msgParent = aMsg->parent(); + KMFolder *msgParent = aMsg->tqparent(); ImapJob *imapJob = 0; if (msgParent) @@ -412,7 +412,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex { if (!msg->isComplete()) { - int idx = msgParent->find(msg); + int idx = msgParent->tqfind(msg); assert(idx != -1); msg = msgParent->getMsg(idx); } @@ -480,10 +480,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex if ( !msg->transferInProgress() ) msg->setTransferInProgress( true ); } - imapJob = new ImapJob( msgList, TQString::null, ImapJob::tPutMessage, this ); + imapJob = new ImapJob( msgList, TQString(), ImapJob::tPutMessage, this ); if ( !mAddMessageProgressItem && msgList.count() > 1 ) { - // use a parent progress if we have more than 1 message + // use a tqparent progress if we have more than 1 message // otherwise the normal progress is more accurate mAddMessageProgressItem = ProgressManager::createProgressItem( "Uploading"+ProgressManager::getUniqueID(), @@ -786,17 +786,17 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, initInbox(); } - // see if we have a better parent - // if you have a prefix that tqcontains a folder (e.g "INBOX.") the folders + // see if we have a better tqparent + // if you have a prefix that contains a folder (e.g "INBOX.") the folders // need to be created underneath it if ( root && !subfolderNames.empty() ) { - KMFolderImap* parent = findParent( subfolderPaths.first(), subfolderNames.first() ); - if ( parent ) + KMFolderImap* tqparent = findParent( subfolderPaths.first(), subfolderNames.first() ); + if ( tqparent ) { kdDebug(5006) << "KMFolderImap::slotListResult - pass listing to " - << parent->label() << endl; - parent->slotListResult( subfolderNames, subfolderPaths, + << tqparent->label() << endl; + tqparent->slotListResult( subfolderNames, subfolderPaths, subfolderMimeTypes, subfolderAttributes, jobData ); // cleanup TQStringList list; @@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, // update progress account()->listDirProgressItem()->incCompletedItems(); account()->listDirProgressItem()->updateProgress(); - account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") ); + account()->listDirProgressItem()->setqStatus( folder()->prettyURL() + i18n(" completed") ); f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] ); f->setChildrenState( subfolderAttributes[i] ); @@ -905,7 +905,7 @@ void KMFolderImap::initInbox() } if ( f ) { f->initializeFrom( this, "/INBOX/", "message/directory" ); - f->setChildrenState( TQString::null ); + f->setChildrenState( TQString() ); } // so we have an INBOX account()->setHasInbox( true ); @@ -914,18 +914,18 @@ void KMFolderImap::initInbox() //----------------------------------------------------------------------------- KMFolderImap* KMFolderImap::findParent( const TQString& path, const TQString& name ) { - TQString parent = path.left( path.length() - name.length() - 2 ); - if ( parent.length() > 1 ) + TQString tqparent = path.left( path.length() - name.length() - 2 ); + if ( tqparent.length() > 1 ) { - // extract name of the parent - parent = parent.right( parent.length() - 1 ); - if ( parent != label() ) + // extract name of the tqparent + tqparent = tqparent.right( tqparent.length() - 1 ); + if ( tqparent != label() ) { KMFolderNode *node = folder()->child()->first(); - // look for a better parent + // look for a better tqparent while ( node ) { - if ( node->name() == parent ) + if ( node->name() == tqparent ) { KMFolder* fld = static_cast<KMFolder*>(node); KMFolderImap* imapFld = static_cast<KMFolderImap*>( fld->storage() ); @@ -984,10 +984,10 @@ void KMFolderImap::checkFolders( const TQStringList& subfolderNames, } //----------------------------------------------------------------------------- -void KMFolderImap::initializeFrom( KMFolderImap* parent, TQString folderPath, +void KMFolderImap::initializeFrom( KMFolderImap* tqparent, TQString folderPath, TQString mimeType ) { - setAccount( parent->account() ); + setAccount( tqparent->account() ); setImapPath( folderPath ); setNoContent( mimeType == "inode/directory" ); setNoChildren( mimeType == "message/digest" ); @@ -1003,12 +1003,12 @@ bool KMFolderImap::mailCheckInProgress() const //----------------------------------------------------------------------------- void KMFolderImap::setChildrenState( TQString attributes ) { - // update children state - if ( attributes.find( "haschildren", 0, false ) != -1 ) + // update tqchildren state + if ( attributes.tqfind( "hastqchildren", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasChildren ); - } else if ( attributes.find( "hasnochildren", 0, false ) != -1 || - attributes.find( "noinferiors", 0, false ) != -1 ) + } else if ( attributes.tqfind( "hasnotqchildren", 0, false ) != -1 || + attributes.tqfind( "noinferiors", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasNoChildren ); } else @@ -1060,10 +1060,10 @@ void KMFolderImap::checkValidity() } // otherwise we already are inside a mailcheck if ( !mMailCheckProgressItem ) { - ProgressItem* parent = ( account()->checkingSingleFolder() ? 0 : + ProgressItem* tqparent = ( account()->checkingSingleFolder() ? 0 : account()->mailCheckProgressItem() ); mMailCheckProgressItem = ProgressManager::createProgressItem( - parent, + tqparent, "MailCheck" + folder()->prettyURL(), TQStyleSheet::escape( folder()->prettyURL() ), i18n("checking"), @@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity() mMailCheckProgressItem->setProgress(0); } if ( account()->mailCheckProgressItem() ) { - account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() ); + account()->mailCheckProgressItem()->setqStatus( folder()->prettyURL() ); } ImapAccountBase::jobData jd( url.url() ); KIO::SimpleJob *job = KIO::get(url, false, false); @@ -1123,26 +1123,26 @@ void KMFolderImap::slotCheckValidityResult(KIO::Job * job) close("checkvalidity"); } else { TQCString cstr((*it).data.data(), (*it).data.size() + 1); - int a = cstr.find("X-uidValidity: "); - int b = cstr.find("\r\n", a); + int a = cstr.tqfind("X-uidValidity: "); + int b = cstr.tqfind("\r\n", a); TQString uidv; if ( (b - a - 15) >= 0 ) uidv = cstr.mid(a + 15, b - a - 15); - a = cstr.find("X-Access: "); - b = cstr.find("\r\n", a); + a = cstr.tqfind("X-Access: "); + b = cstr.tqfind("\r\n", a); TQString access; if ( (b - a - 10) >= 0 ) access = cstr.mid(a + 10, b - a - 10); mReadOnly = access == "Read only"; - a = cstr.find("X-Count: "); - b = cstr.find("\r\n", a); + a = cstr.tqfind("X-Count: "); + b = cstr.tqfind("\r\n", a); int exists = -1; bool ok = false; if ( (b - a - 9) >= 0 ) exists = cstr.mid(a + 9, b - a - 9).toInt(&ok); if ( !ok ) exists = -1; - a = cstr.find( "X-PermanentFlags: " ); - b = cstr.find( "\r\n", a ); + a = cstr.tqfind( "X-PermanentFlags: " ); + b = cstr.tqfind( "\r\n", a ); if ( a >= 0 && (b - a - 18) >= 0 ) mPermanentFlags = cstr.mid( a + 18, b - a - 18 ).toInt(&ok); if ( !ok ) mPermanentFlags = 0; @@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) if (startUid.isEmpty()) { if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( i18n("Retrieving message status") ); + mMailCheckProgressItem->setqStatus( i18n("Retrieving message status") ); url.setPath(imapPath() + ";SECTION=UID FLAGS"); KIO::SimpleJob *job = KIO::listDir(url, false); KIO::Scheduler::assignJobToSlave(account()->slave(), job); @@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) } else { mContentState = imapDownloadInProgress; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") ); url.setPath(imapPath() + ";UID=" + startUid + ":*;SECTION=ENVELOPE"); KIO::SimpleJob *newJob = KIO::get(url, false, false); @@ -1296,7 +1296,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) mailUid = msgBase->UID(); // parse the uid from the server and the flags out of the list from // the server. Format: 1234, 1 - c = (*uid).find(","); + c = (*uid).tqfind(","); serverUid = (*uid).left( c ).toLong(); serverFlags = (*uid).mid( c+1 ).toInt(); if ( mailUid < serverUid ) { @@ -1309,9 +1309,9 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) int supportedFlags = mUploadAllFlags ? 31 : mPermanentFlags; if ( mReadOnly ) supportedFlags = INT_MAX; - flagsToStatus( msgBase, serverFlags, false, supportedFlags ); + flagsTotqStatus( msgBase, serverFlags, false, supportedFlags ); } else - seenFlagToStatus( msgBase, serverFlags, false ); + seenFlagTotqStatus( msgBase, serverFlags, false ); idx++; uid = (*it).items.remove(uid); if ( msgBase->getMsgSerNum() > 0 ) { @@ -1326,8 +1326,8 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) } // strip the flags from the list of uids, so it can be reused for (uid = (*it).items.begin(); uid != (*it).items.end(); ++uid) - (*uid).truncate((*uid).find(",")); - ImapAccountBase::jobData jd( TQString::null, (*it).parent ); + (*uid).truncate((*uid).tqfind(",")); + ImapAccountBase::jobData jd( TQString(), (*it).tqparent ); jd.total = (*it).items.count(); if (jd.total == 0) { @@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) mMailCheckProgressItem->setCompletedItems( 0 ); mMailCheckProgressItem->setTotalItems( jd.total ); mMailCheckProgressItem->setProgress( 0 ); - mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") ); } TQStringList sets; @@ -1421,7 +1421,7 @@ void KMFolderImap::slotListFolderEntries(KIO::Job * job, //X } //----------------------------------------------------------------------------- -void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags ) +void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags ) { if ( !msg ) return; @@ -1440,45 +1440,45 @@ void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int sup }; static const int numFlags = sizeof imapFlagMap / sizeof *imapFlagMap; - const KMMsgStatus oldStatus = msg->status(); + const KMMsgtqStatus oldtqStatus = msg->status(); for ( int i = 0; i < numFlags; ++i ) { if ( ( (supportedFlags & imapFlagMap[i].imapFlag) == 0 && (supportedFlags & 64) == 0 ) && !imapFlagMap[i].standardFlag ) { continue; } - if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldStatus & imapFlagMap[i].kmFlag) > 0) ) { - msg->toggleStatus( imapFlagMap[i].kmFlag ); + if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldtqStatus & imapFlagMap[i].kmFlag) > 0) ) { + msg->toggletqStatus( imapFlagMap[i].kmFlag ); } } - seenFlagToStatus( msg, flags, newMsg ); + seenFlagTotqStatus( msg, flags, newMsg ); } -void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg) +void KMFolderImap::seenFlagTotqStatus(KMMsgBase * msg, int flags, bool newMsg) { if ( !msg ) return; - const KMMsgStatus oldStatus = msg->status(); - if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 ) - msg->seStatus( KMMsgStatusOld ); + const KMMsgtqStatus oldtqStatus = msg->status(); + if ( (flags & 1) && (oldtqStatus & KMMsgStatusOld) == 0 ) + msg->setqStatus( KMMsgStatusOld ); // In case the message does not have the seen flag set, override our local // notion that it is read. Otherwise the count of unread messages and the // number of messages which actually show up as read can go out of sync. - if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { + if ( msg->isOfUnknowntqStatus() || (!(flags&1) && !(oldtqStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { if (newMsg) { - if ( (oldStatus & KMMsgStatusNew) == 0 ) - msg->seStatus( KMMsgStatusNew ); + if ( (oldtqStatus & KMMsgStatusNew) == 0 ) + msg->setqStatus( KMMsgStatusNew ); } else { - if ( (oldStatus & KMMsgStatusUnread) == 0 ) - msg->seStatus( KMMsgStatusUnread ); + if ( (oldtqStatus & KMMsgStatusUnread) == 0 ) + msg->setqStatus( KMMsgStatusUnread ); } } } //----------------------------------------------------------------------------- -TQString KMFolderImap::statusToFlags(KMMsgStatus status, int supportedFlags) +TQString KMFolderImap::statusToFlags(KMMsgtqStatus status, int supportedFlags) { TQString flags; if (status & KMMsgStatusDeleted) @@ -1509,7 +1509,7 @@ void KMFolderImap::ignoreJobsForMessage( KMMessage* msg ) { if ( !msg || msg->transferInProgress() || - !msg->parent() || msg->parent()->folderType() != KMFolderTypeImap ) + !msg->tqparent() || msg->tqparent()->folderType() != KMFolderTypeImap ) return; KMAcctImap *account; if ( !(account = static_cast<KMFolderImap*>(msg->storage())->account()) ) @@ -1525,28 +1525,28 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) ImapAccountBase::JobIterator it = account()->findJob(job); if ( it == account()->jobsEnd() ) return; (*it).cdata += TQCString(data, data.size() + 1); - int pos = (*it).cdata.find("\r\n--IMAPDIGEST"); + int pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST"); if ( pos == -1 ) { - // if we do not find the pattern in the complete string we will not find + // if we do not find the pattern in the complete string we will not tqfind // it in a substring. return; } if (pos > 0) { - int p = (*it).cdata.find("\r\nX-uidValidity:"); + int p = (*it).cdata.tqfind("\r\nX-uidValidity:"); if (p != -1) setUidValidity((*it).cdata - .mid(p + 17, (*it).cdata.find("\r\n", p+1) - p - 17)); - int c = (*it).cdata.find("\r\nX-Count:"); + .mid(p + 17, (*it).cdata.tqfind("\r\n", p+1) - p - 17)); + int c = (*it).cdata.tqfind("\r\nX-Count:"); if ( c != -1 ) { bool ok; int exists = (*it).cdata.mid( c+10, - (*it).cdata.find("\r\n", c+1) - c-10 ).toInt(&ok); + (*it).cdata.tqfind("\r\n", c+1) - c-10 ).toInt(&ok); if ( ok && exists < count() ) { kdDebug(5006) << "KMFolderImap::slotGetMessagesData - server has less messages (" << exists << ") then folder (" << count() << "), so reload" << endl; open("getMessage"); - reallyGetFolder( TQString::null ); + reallyGetFolder( TQString() ); (*it).cdata.remove(0, pos); return; } else if ( ok ) { @@ -1558,7 +1558,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } (*it).cdata.remove(0, pos); } - pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1); + pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1); int flags; while (pos >= 0) { @@ -1571,7 +1571,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) flags = msg->headerField("X-Flags").toInt(); ulong uid = msg->UID(); KMMsgMetaData *md = 0; - if ( mUidMetaDataMap.find( uid ) ) { + if ( mUidMetaDataMap.tqfind( uid ) ) { md = mUidMetaDataMap[uid]; } ulong serNum = 0; @@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } // Transfer the status, if it is cached. if ( md ) { - msg->seStatus( md->status() ); + msg->setqStatus( md->status() ); } else if ( !account()->hasCapability("uidplus") ) { // see if we have cached the msgIdMD5 and get the status + // serial number from there TQString id = msg->msgIdMD5(); - if ( mMetaDataMap.find( id ) ) { + if ( mMetaDataMap.tqfind( id ) ) { md = mMetaDataMap[id]; - msg->seStatus( md->status() ); + msg->setqStatus( md->status() ); if ( md->serNum() != 0 && serNum == 0 ) { msg->setMsgSerNum( md->serNum() ); } @@ -1613,7 +1613,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } KMFolderMbox::addMsg(msg, 0); // Merge with the flags from the server. - flagsToStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags); + flagsTotqStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags); // set the correct size msg->setMsgSizeServer( msg->headerField("X-Length").toUInt() ); msg->setUID(uid); @@ -1637,7 +1637,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } (*it).cdata.remove(0, pos); (*it).done++; - pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1); + pos = (*it).cdata.tqfind("\r\n--IMAPDIGEST", 1); } // while } @@ -1667,7 +1667,7 @@ KMFolderImap::doCreateJob( KMMessage *msg, FolderJob::JobType jt, } else { // download complete message or part (attachment) if ( partSpecifier == "STRUCTURE" ) // hide from outside - partSpecifier = TQString::null; + partSpecifier = TQString(); ImapJob *job = new ImapJob( msg, jt, kmfi, partSpecifier ); job->setParentFolder( this ); @@ -1718,18 +1718,18 @@ void KMFolderImap::slotGetMessagesResult(KIO::Job * job) //----------------------------------------------------------------------------- -void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath, +void KMFolderImap::createFolder(const TQString &name, const TQString& tqparentPath, bool askUser) { - kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",parent=" << - parentPath << ",askUser=" << askUser << endl; + kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",tqparent=" << + tqparentPath << ",askUser=" << askUser << endl; if ( account()->makeConnection() != ImapAccountBase::Connected ) { kdWarning(5006) << "KMFolderImap::createFolder - got no connection" << endl; return; } KURL url = account()->getUrl(); - TQString parent = ( parentPath.isEmpty() ? imapPath() : parentPath ); - TQString path = account()->createImapPath( parent, name ); + TQString tqparent = ( tqparentPath.isEmpty() ? imapPath() : tqparentPath ); + TQString path = account()->createImapPath( tqparent, name ); if ( askUser ) { path += "/;INFO=ASKUSER"; } @@ -1824,7 +1824,7 @@ void KMFolderImap::deleteMessage(KMMessage * msg) mUidMetaDataMap.remove( msg->UID() ); mMetaDataMap.remove( msg->msgIdMD5() ); KURL url = account()->getUrl(); - KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->storage()); + KMFolderImap *msg_tqparent = static_cast<KMFolderImap*>(msg->storage()); ulong uid = msg->UID(); /* If the uid is empty the delete job below will nuke all mail in the folder, so we better safeguard against that. See ::expungeFolder, as @@ -1834,7 +1834,7 @@ void KMFolderImap::deleteMessage(KMMessage * msg) "an empty UID. Aborting." << endl; return; } - url.setPath(msg_parent->imapPath() + ";UID=" + TQString::number(uid) ); + url.setPath(msg_tqparent->imapPath() + ";UID=" + TQString::number(uid) ); if ( account()->makeConnection() != ImapAccountBase::Connected ) return; KIO::SimpleJob *job = KIO::file_delete(url, false); @@ -1860,14 +1860,14 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) TQStringList sets = makeSets(uids); KURL url = account()->getUrl(); - KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.getFirst()->storage()); + KMFolderImap *msg_tqparent = static_cast<KMFolderImap*>(msgList.getFirst()->storage()); for ( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString uid = *it; // Don't delete with no uid, that nukes the folder. Should not happen, but // better safe than sorry. if ( uid.isEmpty() ) continue; - url.setPath(msg_parent->imapPath() + ";UID=" + uid); + url.setPath(msg_tqparent->imapPath() + ";UID=" + uid); if ( account()->makeConnection() != ImapAccountBase::Connected ) return; KIO::SimpleJob *job = KIO::file_delete(url, false); @@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) } //----------------------------------------------------------------------------- -void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle) +void KMFolderImap::setqStatus(int idx, KMMsgtqStatus status, bool toggle) { TQValueList<int> ids; ids.append(idx); - seStatus(ids, status, toggle); + setqStatus(ids, status, toggle); } -void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle) +void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle) { - FolderStorage::seStatus(_ids, status, toggle); + FolderStorage::setqStatus(_ids, status, toggle); TQValueList<int> ids; if ( mUploadAllFlags ) { kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl; @@ -1929,14 +1929,14 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog TQStringList sets = KMFolderImap::makeSets( seenUids, true ); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - account()->setImapSeenStatus( folder(), imappath, true ); + account()->setImapSeentqStatus( folder(), imappath, true ); } } if ( !unseenUids.isEmpty() ) { TQStringList sets = KMFolderImap::makeSets( unseenUids, true ); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - account()->setImapSeenStatus( folder(), imappath, false ); + account()->setImapSeentqStatus( folder(), imappath, false ); } } return; @@ -1960,7 +1960,7 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog // Send off a status setting job for each set. for ( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) { TQString imappath = imapPath() + ";UID=" + ( *slit ); - account()->setImapStatus(folder(), imappath, flags); + account()->setImaptqStatus(folder(), imappath, flags); } } if ( mContentState == imapListingInProgress ) { @@ -1970,7 +1970,7 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog kdDebug(5006) << "Set status during folder listing, restarting listing." << endl; disconnect(this, TQT_SLOT(slotListFolderResult(KIO::Job *))); quiet( false ); - reallyGetFolder( TQString::null ); + reallyGetFolder( TQString() ); } } @@ -2185,7 +2185,7 @@ TQValueList<ulong> KMFolderImap::splitSets(const TQString uids) TQValueList<ulong> uidlist; // ex: 1205,1204,1203,1202,1236:1238 - TQString buffer = TQString::null; + TQString buffer = TQString(); int setstart = -1; // iterate over the uids for (uint i = 0; i < uids.length(); i++) @@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state ) mSubfolderState = state; if ( state == imapNoInformation && folder()->child() ) { - // pass through to children + // pass through to tqchildren KMFolderNode* node; TQPtrListIterator<KMFolderNode> it( *folder()->child() ); for ( ; (node = it.current()); ) @@ -2395,7 +2395,7 @@ bool KMFolderImap::isMoveable() const //----------------------------------------------------------------------------- ulong KMFolderImap::serNumForUID( ulong uid ) { - if ( mUidMetaDataMap.find( uid ) ) { + if ( mUidMetaDataMap.tqfind( uid ) ) { KMMsgMetaData *md = mUidMetaDataMap[uid]; return md->serNum(); } else { diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 2f85685b6..f303325b6 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -61,15 +61,15 @@ using KPIM::ProgressItem; class KMMsgMetaData { public: - KMMsgMetaData(KMMsgStatus aStatus) - :mStatus(aStatus), mSerNum(0) {} - KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum) - :mStatus(aStatus), mSerNum(aSerNum) {} + KMMsgMetaData(KMMsgtqStatus atqStatus) + :mtqStatus(atqStatus), mSerNum(0) {} + KMMsgMetaData(KMMsgtqStatus atqStatus, TQ_UINT32 aSerNum) + :mtqStatus(atqStatus), mSerNum(aSerNum) {} ~KMMsgMetaData() {}; - KMMsgStatus status() const { return mStatus; } + KMMsgtqStatus status() const { return mtqStatus; } TQ_UINT32 serNum() const { return mSerNum; } private: - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; TQ_UINT32 mSerNum; }; @@ -78,6 +78,7 @@ private: class KMFolderImap : public KMFolderMbox { Q_OBJECT + TQ_OBJECT friend class ::KMail::ImapJob; public: @@ -98,8 +99,8 @@ public: virtual imapState getSubfolderState() { return mSubfolderState; } virtual void setSubfolderState(imapState state); - /** Usually a parent is given. But in some cases there is no - fitting parent object available. Then the name of the folder + /** Usually a tqparent is given. But in some cases there is no + fitting tqparent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderImap(KMFolder* folder, const char* name=0); virtual ~KMFolderImap(); @@ -167,11 +168,11 @@ public: * Create a new subfolder * You may specify the root imap path or this folder will be used * If you set askUser to false and the server can only handle folders - * that contain messages _or_ folders the new folder is set to "tqcontains messages" + * that contain messages _or_ folders the new folder is set to "contains messages" * by default */ void createFolder(const TQString &name, - const TQString& imapPath = TQString::null, bool askUser = true); + const TQString& imapPath = TQString(), bool askUser = true); /** * Delete a message @@ -183,12 +184,12 @@ public: * Change the status of the message indicated by @p index * Overloaded function for the following one */ - virtual void seStatus(int idx, KMMsgStatus status, bool toggle); + virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle); /** * Change the status of several messages indicated by @p ids */ - virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle); + virtual void setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle); /** generates sets of uids */ static TQStringList makeSets( TQValueList<ulong>&, bool sort = true); @@ -240,7 +241,7 @@ public: /** * Convert message status to a list of IMAP flags */ - static TQString statusToFlags(KMMsgStatus status, int supportedFalgs); + static TQString statusToFlags(KMMsgtqStatus status, int supportedFalgs); /** * Return the filename of the folder (reimplemented from KFolder) @@ -289,7 +290,7 @@ public: /** * Mark the folder as already removed from the server * If set to true the folder will only be deleted locally - * This will recursively be applied to all children + * This will recursively be applied to all tqchildren */ void setAlreadyRemoved(bool removed); @@ -320,7 +321,7 @@ public: virtual bool isMoveable() const; /** Initialize this storage from another one. Used when creating a child folder */ - void initializeFrom( KMFolderImap* parent, TQString path, TQString mimeType ); + void initializeFrom( KMFolderImap* tqparent, TQString path, TQString mimeType ); /** Returns the IMAP flags that can be stored on the server. */ int permanentFlags() const { return mPermanentFlags; } @@ -362,7 +363,7 @@ public slots: virtual int addMsg(TQPtrList<KMMessage>&, TQValueList<int>& index_return); /** Copy the messages to this folder */ - void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* parent*/); + void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* tqparent*/); /** Detach message from this folder. Usable to call addMsg() afterwards. @@ -379,13 +380,13 @@ public slots: * Convert IMAP flags to a message status * @param newMsg specifies whether unseen messages are new or unread */ - static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); + static void flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); /** * Convert IMAP seen flag to a message status. * @param newMsg specifies whether unseen messages are new or unread */ - static void seenFlagToStatus( KMMsgBase *msg, int flags, bool newMsg = true ); + static void seenFlagTotqStatus( KMMsgBase *msg, int flags, bool newMsg = true ); /** * Connected to the result signal of the copy/move job @@ -437,7 +438,7 @@ protected: /** Create or find the INBOX and initialize it */ void initInbox(); - /** See if there is a better parent then this folder */ + /** See if there is a better tqparent then this folder */ KMFolderImap* findParent( const TQString& path, const TQString& name ); /** See if all folders are still present on server, otherwise delete them */ @@ -456,7 +457,7 @@ protected slots: /** * Get the folder now (internal) */ - void reallyGetFolder(const TQString &startUid = TQString::null); + void reallyGetFolder(const TQString &startUid = TQString()); /** * For listing the contents of a folder diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index a6b7f2ce3..635afae52 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex() #ifdef OBSOLETE else if (mi->isNew()) { - mi->seStatus(KMMsgStatusUnread); + mi->setqStatus(KMMsgStatusUnread); mi->setDirty(false); } #endif @@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv) "The mail index for '%1' is from an unknown version of KMail (%2).\n" "This index can be regenerated from your mail folder, but some " "information, including status flags, may be lost. Do you wish " - "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString::null, i18n("Downgrade"), i18n("Do Not Downgrade") ); + "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); kapp->restoreOverrideCursor(); if (r == KMessageBox::Yes) createIndexFromContents(); @@ -467,7 +467,7 @@ bool KMFolderIndex::updateIndexStreamPtr(bool) } -KMFolderIndex::IndexStatus KMFolderIndex::indexStatus() +KMFolderIndex::IndextqStatus KMFolderIndex::indextqStatus() { if ( !mCompactable ) return IndexCorrupt; @@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents() msg.fromDwString( msgString, false ); msg.updateInvitationState(); if ( msg.status() & KMMsgStatusHasInvitation ) { - msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation ); + msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasInvitation ); } if ( msg.status() & KMMsgStatusHasNoInvitation ) { - msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); + msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); } msgInfo->setFrom( msg.from() ); msgInfo->setTo( msg.to() ); diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 2762d143d..b08508955 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -37,23 +37,24 @@ class KMFolderIndex: public FolderStorage { Q_OBJECT + TQ_OBJECT //TODO:Have to get rid of this friend declaration and add necessary pure - //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder + //virtuals to kmfolder.h so that KMMsgBase::tqparent() can be a plain KMFolder //rather than a KMFolderIndex. Need this for database indices. friend class ::KMMsgBase; public: /** This enum indicates the status of the index file. It's returned by - indexStatus(). + indextqStatus(). */ - enum IndexStatus { IndexOk, + enum IndextqStatus { IndexOk, IndexMissing, IndexCorrupt, IndexTooOld }; - /** Usually a parent is given. But in some cases there is no - fitting parent object available. Then the name of the folder + /** Usually a tqparent is given. But in some cases there is no + fitting tqparent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderIndex(KMFolder* folder, const char* name=0); virtual ~KMFolderIndex(); @@ -67,8 +68,8 @@ public: virtual const KMMsgBase* getMsgBase(int idx) const { return mMsgList[idx]; } virtual KMMsgBase* getMsgBase(int idx) { return mMsgList[idx]; } - virtual int find(const KMMsgBase* msg) const { return mMsgList.find((KMMsgBase*)msg); } - int find( const KMMessage * msg ) const { return FolderStorage::find( msg ); } + virtual int tqfind(const KMMsgBase* msg) const { return mMsgList.tqfind((KMMsgBase*)msg); } + int tqfind( const KMMessage * msg ) const { return FolderStorage::tqfind( msg ); } /** Registered unique serial number for the index file */ int serialIndexId() const { return mIndexId; } @@ -90,7 +91,7 @@ public: Should return IndexOk if the folder doesn't exist anymore "physically" or if the index is not older than the contents. */ - virtual IndexStatus indexStatus() = 0; + virtual IndextqStatus indextqStatus() = 0; public slots: /** Incrementally update the index if possible else call writeIndex */ diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 2ec8326ed..ace5a6ddc 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -117,7 +117,7 @@ int KMFolderMaildir::open(const char *) if (!folder()->path().isEmpty()) { - if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed + if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed { TQString str; mIndexStream = 0; @@ -279,7 +279,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS TQString subdirCur(location() + "/cur/"); unsigned int stopIndex = nbMessages == -1 ? mMsgList.count() : - QMIN( mMsgList.count(), startIndex + nbMessages ); + TQMIN( mMsgList.count(), startIndex + nbMessages ); //kdDebug(5006) << "KMFolderMaildir: compacting from " << startIndex << " to " << stopIndex << endl; for(unsigned int idx = startIndex; idx < stopIndex; ++idx) { KMMsgInfo* mi = (KMMsgInfo*)mMsgList.at(idx); @@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS // we can't have any New messages at this point if (mi->isNew()) { - mi->seStatus(KMMsgStatusUnread); + mi->setqStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -375,13 +375,13 @@ if( fileD0.open( IO_WriteOnly ) ) { int rc; // take message out of the folder it is currently in, if any - msgParent = aMsg->parent(); + msgParent = aMsg->tqparent(); if (msgParent) { if (msgParent==folder() && !kmkernel->folderIsDraftOrOutbox(folder())) return 0; - idx = msgParent->find(aMsg); + idx = msgParent->tqfind(aMsg); msgParent->getMsg( idx ); } @@ -404,7 +404,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (len <= 0) { - kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl; + kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl; return 0; } @@ -480,7 +480,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (aMsg->getMsgSerNum() <= 0) aMsg->setMsgSerNum(); else - tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx ); + replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx ); // write index entry if desired if (mAutoCreateIndex) @@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; + kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; if (ftell(mIndexStream) > revert) { kdDebug(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on device or insufficient quota?)\n" + "(No space left on tqdevice or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -583,7 +583,7 @@ DwString KMFolderMaildir::getDwString(int idx) } -void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status) +void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status) { // we keep our current directory to restore it later char path_buffer[PATH_MAX]; @@ -596,7 +596,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& // actually be some other state (but not New) if (status == KMMsgStatusRead) { - if (file.find(":2,") == -1) + if (file.tqfind(":2,") == -1) status = KMMsgStatusUnread; else if (file.right(5) == ":2,RS") status |= KMMsgStatusReplied; @@ -636,7 +636,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& msgIdStr = msgIdStr.stripWhiteSpace(); if( !msgIdStr.isEmpty() ) { int rightAngle; - rightAngle = msgIdStr.find( '>' ); + rightAngle = msgIdStr.tqfind( '>' ); if( rightAngle != -1 ) msgIdStr.truncate( rightAngle + 1 ); } @@ -644,7 +644,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& replyToIdStr = replyToIdStr.stripWhiteSpace(); if( !replyToIdStr.isEmpty() ) { int rightAngle; - rightAngle = replyToIdStr.find( '>' ); + rightAngle = replyToIdStr.tqfind( '>' ); if( rightAngle != -1 ) replyToIdStr.truncate( rightAngle + 1 ); } @@ -672,7 +672,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& // message In-Reply-To points to is not kept in this folder, // but e.g. in an Outbox replyToAuxIdStr = referencesStr; - rightAngle = referencesStr.find( '>' ); + rightAngle = referencesStr.tqfind( '>' ); if( rightAngle != -1 ) replyToAuxIdStr.truncate( rightAngle + 1 ); } @@ -697,7 +697,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& charset = ""; if ( !contentTypeStr.isEmpty() ) { - int cidx = contentTypeStr.find( "charset=" ); + int cidx = contentTypeStr.tqfind( "charset=" ); if ( cidx != -1 ) { charset = contentTypeStr.mid( cidx + 8 ); if ( !charset.isEmpty() && ( charset[0] == '"' ) ) { @@ -800,7 +800,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& { xmarkStr = TQCString(line+13); } - else if (strncasecmp(line, "X-Status:", 9) == 0) + else if (strncasecmp(line, "X-tqStatus:", 9) == 0) { statusStr = TQCString(line+9); } @@ -864,8 +864,8 @@ int KMFolderMaildir::createIndexFromContents() curDir.setFilter(TQDir::Files); // then, we look for all the 'cur' files - const QFileInfoList *list = curDir.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = curDir.entryInfoList(); + TQFileInfoListIterator it(*list); TQFileInfo *fi; while ((fi = it.current())) @@ -893,7 +893,7 @@ int KMFolderMaildir::createIndexFromContents() correctUnreadMsgsCount(); if (kmkernel->outboxFolder() == folder() && count() > 0) - KMessageBox::information(0, i18n("Your outbox tqcontains messages which were " + KMessageBox::information(0, i18n("Your outbox contains messages which were " "most-likely not created by KMail;\nplease remove them from there if you " "do not want KMail to send them.")); @@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents() return 0; } -KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus() +KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -989,8 +989,8 @@ static bool removeDirAndContentsRecursively( const TQString & path ) d.setPath( path ); d.setFilter( TQDir::Files | TQDir::Dirs | TQDir::Hidden | TQDir::NoSymLinks ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd; //----------------------------------------------------------------------------- // static TQString KMFolderMaildir::constructValidFileName( const TQString & filename, - KMMsgStatus status ) + KMMsgtqStatus status ) { TQString aFileName( filename ); @@ -1075,7 +1075,7 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status) +TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status) { TQString dest(newLoc); // make sure that our destination filename doesn't already exist @@ -1090,19 +1090,19 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n TQDir d; if (d.rename(oldLoc, dest) == false) - return TQString::null; + return TQString(); else return dest; } //----------------------------------------------------------------------------- -void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx) +void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx) { // if the status of any message changes, then we need to compact needsCompact = true; - KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx); + KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx); } /*virtual*/ diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index d8be0139f..83cb0b689 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -24,10 +24,11 @@ using KMail::AttachmentStrategy; class KMFolderMaildir : public KMFolderIndex { Q_OBJECT + TQ_OBJECT friend class ::KMail::MaildirJob; public: - /** Usually a parent is given. But in some cases there is no - fitting parent object available. Then the name of the folder + /** Usually a tqparent is given. But in some cases there is no + fitting tqparent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderMaildir(KMFolder* folder, const char* name=0); virtual ~KMFolderMaildir(); @@ -55,10 +56,10 @@ public: virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } - // Called by KMMsgBase::seStatus when status of a message has changed + // Called by KMMsgBase::setqStatus when status of a message has changed // required to keep the number unread messages variable current. - virtual void msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, + virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx); /** Open folder for access. @@ -86,7 +87,7 @@ public: static int createMaildirFolders( const TQString & folderPath ); static TQString constructValidFileName( const TQString & filename = TQString(), - KMMsgStatus status = KMMsgStatusNew ); + KMMsgtqStatus status = KMMsgStatusNew ); static bool removeFile( const TQString & folderPath, const TQString & filename ); @@ -147,9 +148,9 @@ private slots: void slotDirSizeJobResult( KIO::Job* job ); private: - void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status); + void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status); TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, KMMsgInfo* mi); - TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status); + TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status); bool removeFile(const TQString& filename); /** Tests whether the contents of this folder is newer than the index. @@ -157,9 +158,9 @@ private: Returns IndexMissing if there is no index. Returns IndexOk if the index is not older than the contents. */ - virtual IndexStatus indexStatus(); + virtual IndextqStatus indextqStatus(); - typedef QPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry; + typedef TQPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry; static TQValueList<DirSizeJobQueueEntry> s_DirSizeJobQueue; TQStrList mIdxToFileList; diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 025a9d71d..287ce5766 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -55,7 +55,7 @@ #include <sys/stat.h> #include <sys/file.h> #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #ifndef MAX_LINE #define MAX_LINE 4096 @@ -119,7 +119,7 @@ int KMFolderMbox::open(const char *owner) if (!folder()->path().isEmpty()) { - KMFolderIndex::IndexStatus index_status = indexStatus(); + KMFolderIndex::IndextqStatus index_status = indextqStatus(); // test if index file exists and is up-to-date if (KMFolderIndex::IndexOk != index_status) { @@ -262,7 +262,7 @@ void KMFolderMbox::reallyDoClose(const char* owner) Q_UNUSED( owner ); if (mAutoCreateIndex) { - if (KMFolderIndex::IndexOk != indexStatus()) { + if (KMFolderIndex::IndexOk != indextqStatus()) { kdDebug(5006) << "Critical error: " << location() << " has been modified by an external application while KMail was running." << endl; // exit(1); backed out due to broken nfs @@ -521,7 +521,7 @@ int KMFolderMbox::unlock() //----------------------------------------------------------------------------- -KMFolderIndex::IndexStatus KMFolderMbox::indexStatus() +KMFolderIndex::IndextqStatus KMFolderMbox::indextqStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -555,8 +555,8 @@ int KMFolderMbox::createIndexFromContents() KMMsgInfo* mi; TQString msgStr; TQRegExp regexp(MSG_SEPERATOR_REGEX); - int i, num, numStatus; - short needStatus; + int i, num, numtqStatus; + short needtqStatus; assert(mStream != 0); rewind(mStream); @@ -564,7 +564,7 @@ int KMFolderMbox::createIndexFromContents() mMsgList.clear(); num = -1; - numStatus= 11; + numtqStatus= 11; off_t offs = 0; size_t size = 0; dateStr = ""; @@ -578,7 +578,7 @@ int KMFolderMbox::createIndexFromContents() replyToAuxIdStr = ""; referencesStr = ""; msgIdStr = ""; - needStatus = 3; + needtqStatus = 3; size_t sizeServer = 0; ulong uid = 0; @@ -597,11 +597,11 @@ int KMFolderMbox::createIndexFromContents() if (num >= 0) { - if (numStatus <= 0) + if (numtqStatus <= 0) { msgStr = i18n("Creating index file: one message done", "Creating index file: %n messages done", num); emit statusMsg(msgStr); - numStatus = 10; + numtqStatus = 10; } if (size > 0) @@ -609,7 +609,7 @@ int KMFolderMbox::createIndexFromContents() msgIdStr = msgIdStr.stripWhiteSpace(); if( !msgIdStr.isEmpty() ) { int rightAngle; - rightAngle = msgIdStr.find( '>' ); + rightAngle = msgIdStr.tqfind( '>' ); if( rightAngle != -1 ) msgIdStr.truncate( rightAngle + 1 ); } @@ -617,7 +617,7 @@ int KMFolderMbox::createIndexFromContents() replyToIdStr = replyToIdStr.stripWhiteSpace(); if( !replyToIdStr.isEmpty() ) { int rightAngle; - rightAngle = replyToIdStr.find( '>' ); + rightAngle = replyToIdStr.tqfind( '>' ); if( rightAngle != -1 ) replyToIdStr.truncate( rightAngle + 1 ); } @@ -645,7 +645,7 @@ int KMFolderMbox::createIndexFromContents() // message In-Reply-To points to is not kept in this folder, // but e.g. in an Outbox replyToAuxIdStr = referencesStr; - rightAngle = referencesStr.find( '>' ); + rightAngle = referencesStr.tqfind( '>' ); if( rightAngle != -1 ) replyToAuxIdStr.truncate( rightAngle + 1 ); } @@ -654,7 +654,7 @@ int KMFolderMbox::createIndexFromContents() charset = ""; if ( !contentTypeStr.isEmpty() ) { - int cidx = contentTypeStr.find( "charset=" ); + int cidx = contentTypeStr.tqfind( "charset=" ); if ( cidx != -1 ) { charset = contentTypeStr.mid( cidx + 8 ); if ( !charset.isEmpty() && ( charset[0] == '"' ) ) { @@ -682,14 +682,14 @@ int KMFolderMbox::createIndexFromContents() replyToIdStr, replyToAuxIdStr, msgIdStr, KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown, KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid ); - mi->seStatus(status, xstatus); + mi->setqStatus(status, xstatus); mi->setDate( dateStr.stripWhiteSpace() ); mi->setDirty(false); mMsgList.append(mi, mExportsSernums ); *status = '\0'; *xstatus = '\0'; - needStatus = 3; + needtqStatus = 3; xmarkStr = ""; replyToIdStr = ""; replyToAuxIdStr = ""; @@ -701,12 +701,12 @@ int KMFolderMbox::createIndexFromContents() sizeServer = 0; uid = 0; } - else num--,numStatus++; + else num--,numtqStatus++; } offs = ftell(mStream); num++; - numStatus--; + numtqStatus--; inHeader = true; continue; } @@ -727,19 +727,19 @@ int KMFolderMbox::createIndexFromContents() /* -sanders Make all messages read when auto-recreating index */ /* Reverted, as it breaks reading the sent mail status, for example. -till */ - if ((needStatus & 1) && strncasecmp(line, "Status:", 7) == 0) + if ((needtqStatus & 1) && strncasecmp(line, "tqStatus:", 7) == 0) { for(i=0; i<4 && line[i+8] > ' '; i++) status[i] = line[i+8]; status[i] = '\0'; - needStatus &= ~1; + needtqStatus &= ~1; } - else if ((needStatus & 2) && strncasecmp(line, "X-Status:", 9)==0) + else if ((needtqStatus & 2) && strncasecmp(line, "X-tqStatus:", 9)==0) { for(i=0; i<4 && line[i+10] > ' '; i++) xstatus[i] = line[i+10]; xstatus[i] = '\0'; - needStatus &= ~2; + needtqStatus &= ~2; } else if (strncasecmp(line,"X-KMail-Mark:",13)==0) xmarkStr = TQCString(line+13); @@ -805,7 +805,7 @@ int KMFolderMbox::createIndexFromContents() if (kmkernel->outboxFolder() == folder() && count() > 0) KMessageBox::queuedMessageBox(0, KMessageBox::Information, - i18n("Your outbox tqcontains messages which were " + i18n("Your outbox contains messages which were " "most-likely not created by KMail;\nplease remove them from there if you " "do not want KMail to send them.")); @@ -950,7 +950,7 @@ int KMFolderMbox::addMsg( KMMessage* aMsg, int* aIndex_ret ) } // take message out of the folder it is currently in, if any - msgParent = aMsg->parent(); + msgParent = aMsg->tqparent(); if (msgParent) { if ( msgParent== folder() ) @@ -965,7 +965,7 @@ int KMFolderMbox::addMsg( KMMessage* aMsg, int* aIndex_ret ) return 0; } - idx = msgParent->find(aMsg); + idx = msgParent->tqfind(aMsg); msgParent->getMsg( idx ); } @@ -998,7 +998,7 @@ if( fileD1.open( IO_WriteOnly ) ) { clearerr(mStream); if (len <= 0) { - kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl; + kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl; return 0; } @@ -1047,7 +1047,7 @@ if( fileD1.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on device or insufficient quota?)\n" + "(No space left on tqdevice or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); kmkernel->kbp()->idle(); @@ -1085,7 +1085,7 @@ if( fileD1.open( IO_WriteOnly ) ) { if ( aMsg->getMsgSerNum() <= 0 ) aMsg->setMsgSerNum(); else - tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx ); + replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx ); // change the length of the previous message to encompass white space added if ((idx > 0) && (growth > 0)) { @@ -1118,7 +1118,7 @@ if( fileD1.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdWarning(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; + kdWarning(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; if (ftell(mIndexStream) > revert) { kdWarning(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -1126,14 +1126,14 @@ if( fileD1.open( IO_WriteOnly ) ) { if ( errno ) kmkernel->emergencyExit( i18n("Could not add message to folder:") + TQString::fromLocal8Bit(strerror(errno))); else - kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on device?)") ); + kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on tqdevice?)") ); /* This code may not be 100% reliable bool busy = kmkernel->kbp()->isBusy(); if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on device or insufficient quota?)\n" + "(No space left on tqdevice or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -1155,7 +1155,7 @@ int KMFolderMbox::compact( unsigned int startIndex, int nbMessages, FILE* tmpfil int rc = 0; TQCString mtext; unsigned int stopIndex = nbMessages == -1 ? mMsgList.count() : - QMIN( mMsgList.count(), startIndex + nbMessages ); + TQMIN( mMsgList.count(), startIndex + nbMessages ); //kdDebug(5006) << "KMFolderMbox: compacting from " << startIndex << " to " << stopIndex << endl; for(unsigned int idx = startIndex; idx < stopIndex; ++idx) { KMMsgInfo* mi = (KMMsgInfo*)mMsgList.at(idx); @@ -1237,10 +1237,10 @@ int KMFolderMbox::compact( bool silent ) // Note that job autodeletes itself. // If this is the current folder, the changed signal will ultimately call - // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it - TQString statusMsg = BroadcasStatus::instance()->statusMsg(); + // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it + TQString statusMsg = BroadcastqStatus::instance()->statusMsg(); emit changed(); - BroadcasStatus::instance()->seStatusMsg( statusMsg ); + BroadcastqStatus::instance()->seStatusMsg( statusMsg ); return rc; } diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index 7c48324e9..cf8871372 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -39,7 +39,7 @@ using KMail::AttachmentStrategy; * * Accounts: * The accounts (of KMail) that are fed into the folder are - * represented as the children of the folder. They are only stored here + * represented as the tqchildren of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -47,12 +47,13 @@ using KMail::AttachmentStrategy; class KMFolderMbox : public KMFolderIndex { Q_OBJECT + TQ_OBJECT friend class ::KMail::MboxJob; public: - /** Usually a parent is given. But in some cases there is no - fitting parent object available. Then the name of the folder + /** Usually a tqparent is given. But in some cases there is no + fitting tqparent object available. Then the name of the folder is used as the absolute path to the folder file. */ KMFolderMbox(KMFolder* folder, const char* name=0); virtual ~KMFolderMbox(); @@ -109,7 +110,7 @@ public: static TQByteArray escapeFrom( const DwString & str ); - virtual IndexStatus indexStatus(); + virtual IndextqStatus indextqStatus(); /** reimp */ virtual TQ_INT64 doFolderSize() const; diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index 81b6ca973..3d42a2d38 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -39,7 +39,7 @@ using KMail::CopyFolderJob; //----------------------------------------------------------------------------- KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType): - TQObject(), mDir(this, TQString::null, dirType) + TQObject(), mDir(this, TQString(), dirType) { if ( dirType == KMStandardDir ) mDir.setBaseURL( I18N_NOOP("Local Folders") ); @@ -53,7 +53,7 @@ KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType): //----------------------------------------------------------------------------- KMFolderMgr::~KMFolderMgr() { - mBasePath = TQString::null; + mBasePath = TQString(); } @@ -219,7 +219,7 @@ KMFolder* KMFolderMgr::createFolder(const TQString& fName, bool sysFldr, //----------------------------------------------------------------------------- -KMFolder* KMFolderMgr::find(const TQString& folderName, bool foldersOnly) +KMFolder* KMFolderMgr::tqfind(const TQString& folderName, bool foldersOnly) { KMFolderNode* node; @@ -234,7 +234,7 @@ KMFolder* KMFolderMgr::find(const TQString& folderName, bool foldersOnly) //----------------------------------------------------------------------------- KMFolder* KMFolderMgr::findById(const uint id) { - return findIdString( TQString::null, id ); + return findIdString( TQString(), id ); } //----------------------------------------------------------------------------- @@ -303,7 +303,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr, { KMFolder* folder = 0; if ( id == 0 ) - folder = find(aFolderName); + folder = tqfind(aFolderName); else folder = findById(id); @@ -366,20 +366,20 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder) aFolder->remove(); } -KMFolder* KMFolderMgr::parentFolder( KMFolder* folder ) +KMFolder* KMFolderMgr::tqparentFolder( KMFolder* folder ) { - // find the parent folder by stripping "." and ".directory" from the name - KMFolderDir* fdir = folder->parent(); - TQString parentName = fdir->name(); - parentName = parentName.mid( 1, parentName.length()-11 ); - KMFolderNode* parent = fdir->hasNamedFolder( parentName ); - if ( !parent && fdir->parent() ) // dimap obviously has a different structure - parent = fdir->parent()->hasNamedFolder( parentName ); + // 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 ); + if ( !tqparent && fdir->tqparent() ) // dimap obviously has a different structure + tqparent = fdir->tqparent()->hasNamedFolder( tqparentName ); - KMFolder* parentF = 0; - if ( parent ) - parentF = dynamic_cast<KMFolder*>( parent ); - return parentF; + KMFolder* tqparentF = 0; + if ( tqparent ) + tqparentF = dynamic_cast<KMFolder*>( tqparent ); + return tqparentF; } void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) @@ -389,7 +389,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) return; } - KMFolderDir* fdir = aFolder->parent(); + KMFolderDir* fdir = aFolder->tqparent(); KMFolderNode* fN; for (fN = fdir->first(); fN != 0; fN = fdir->next()) { if (fN->isDir() && (fN->name() == "." + aFolder->fileName() + ".directory")) { @@ -397,24 +397,24 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) break; } } - KMFolder* parentF = parentFolder( aFolder ); + KMFolder* tqparentF = tqparentFolder( aFolder ); // aFolder will be deleted by the next call! - aFolder->parent()->remove(aFolder); + aFolder->tqparent()->remove(aFolder); - // update the children state - if ( parentF ) + // update the tqchildren state + if ( tqparentF ) { - if ( parentF != aFolder ) + if ( tqparentF != aFolder ) { - parentF->storage()->updateChildrenState(); + tqparentF->storage()->updateChildrenState(); } } else - kdWarning(5006) << "Can not find parent folder" << endl; + kdWarning(5006) << "Can not find tqparent folder" << endl; if (aFolder == mRemoveOrig) { - // call only if we're removing the original parent folder + // call only if we're removing the original tqparent folder contentsChanged(); mRemoveOrig = 0; } @@ -425,7 +425,7 @@ void KMFolderMgr::removeDirAux(KMFolderDir* aFolderDir) TQDir dir; TQString folderDirLocation = aFolderDir->path(); aFolderDir->clear(); - aFolderDir->parent()->remove(aFolderDir); + aFolderDir->tqparent()->remove(aFolderDir); dir.rmdir(folderDirLocation); } @@ -460,7 +460,7 @@ void KMFolderMgr::createFolderList(TQStringList *str, void KMFolderMgr::createI18nFolderList(TQStringList *str, TQValueList<TQGuardedPtr<KMFolder> > *folders) { - createFolderList( str, folders, 0, TQString::null, true ); + createFolderList( str, folders, 0, TQString(), true ); } //----------------------------------------------------------------------------- diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index 587d85255..7e6e630db 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -13,9 +13,10 @@ class KMFolder; -class KMFolderMgr: public QObject +class KMFolderMgr: public TQObject { Q_OBJECT + TQ_OBJECT public: KMFolderMgr(const TQString& basePath, KMFolderDirType dirType = KMStandardDir); @@ -32,13 +33,13 @@ public: /** Searches folder and returns it. Skips directories (objects of type KMFolderDir) if foldersOnly is TRUE. */ - virtual KMFolder* find(const TQString& folderName, bool foldersOnly=TRUE); + virtual KMFolder* tqfind(const TQString& folderName, bool foldersOnly=TRUE); /** Searches for a folder with the given id, recurses into directories */ virtual KMFolder* findIdString(const TQString& folderId, const uint id = 0, KMFolderDir *dir = 0); - /** Uses find() to find given folder. If not found the folder is + /** Uses tqfind() to find given folder. If not found the folder is * created. Directories are skipped. * If an id is passed this searches for it */ @@ -50,10 +51,10 @@ public: virtual KMFolder* findById(const uint id); virtual void getFolderURLS( TQStringList& flist, - const TQString& prefix=TQString::null, + const TQString& prefix=TQString(), KMFolderDir *adir=0 ); virtual KMFolder* getFolderByURL( const TQString& vpath, - const TQString& prefix=TQString::null, + const TQString& prefix=TQString(), KMFolderDir *adir=0 ); /** Create a mail folder in the root folder directory dir() @@ -121,8 +122,8 @@ public: /** Copy a folder */ void copyFolder( KMFolder* folder, KMFolderDir* newParent ); - /** Returns the parent Folder for the given folder or 0 on failure. */ - KMFolder* parentFolder( KMFolder* folder ); + /** Returns the tqparent Folder for the given folder or 0 on failure. */ + KMFolder* tqparentFolder( KMFolder* folder ); public slots: /** GUI action: compact all folders that need to be compacted */ diff --git a/kmail/kmfoldernode.cpp b/kmail/kmfoldernode.cpp index e27a88f81..e8ba86f52 100644 --- a/kmail/kmfoldernode.cpp +++ b/kmail/kmfoldernode.cpp @@ -7,9 +7,9 @@ #include "kmfolderdir.h" //----------------------------------------------------------------------------- -KMFolderNode::KMFolderNode( KMFolderDir * parent, const TQString & name ) +KMFolderNode::KMFolderNode( KMFolderDir * tqparent, const TQString & name ) : mName( name ), - mParent( parent ), + mParent( tqparent ), mDir( false ), mId( 0 ) { @@ -31,8 +31,8 @@ bool KMFolderNode::isDir(void) const //----------------------------------------------------------------------------- TQString KMFolderNode::path() const { - if (parent()) return parent()->path(); - return TQString::null; + if (tqparent()) return tqparent()->path(); + return TQString(); } //----------------------------------------------------------------------------- @@ -42,7 +42,7 @@ TQString KMFolderNode::label(void) const } //----------------------------------------------------------------------------- -KMFolderDir* KMFolderNode::parent(void) const +KMFolderDir* KMFolderNode::tqparent(void) const { return mParent; } diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h index 2eb197a3b..a3bb03c39 100644 --- a/kmail/kmfoldernode.h +++ b/kmail/kmfoldernode.h @@ -26,16 +26,17 @@ class KMFolderDir; -class KMFolderNode: public QObject +class KMFolderNode: public TQObject { Q_OBJECT + TQ_OBJECT public: - KMFolderNode( KMFolderDir * parent, const TQString & name ); + KMFolderNode( KMFolderDir * tqparent, const TQString & name ); virtual ~KMFolderNode(); /** Is it a directory where mail folders are stored or is it a folder that - tqcontains mail ? + contains mail ? Note that there are some kinds of mail folders like the type mh uses that are directories on disk but are handled as folders here. */ virtual bool isDir(void) const; @@ -43,12 +44,12 @@ public: /** Returns ptr to owning directory object or 0 if none. This is just a wrapper for convenient access. */ - KMFolderDir* parent(void) const ; + KMFolderDir* tqparent(void) const ; void setParent( KMFolderDir* aParent ); - // { return (KMFolderDir*)KMFolderNodeInherited::parent(); } + // { return (KMFolderDir*)KMFolderNodeInherited::tqparent(); } /** Returns full path to the directory where this node is stored or 0 - if the node has no parent. Example: if this object represents a folder + if the node has no tqparent. Example: if this object represents a folder ~joe/Mail/inbox then path() returns "/home/joe/Mail" and name() returns "inbox". */ virtual TQString path() const; diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index 471d2f3e0..5ebc8b2c4 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -69,8 +69,8 @@ #define IDS_SEARCH_HEADER_LEN 30 -KMSearch::KMSearch(TQObject * parent, const char * name) - :TQObject(parent, name) +KMSearch::KMSearch(TQObject * tqparent, const char * name) + :TQObject(tqparent, name) { mRemainingFolders = -1; mRecursive = true; @@ -135,11 +135,11 @@ bool KMSearch::inScope(KMFolder* folder) const return false; KMFolderDir *rootDir = mRoot->child(); - KMFolderDir *ancestorDir = folder->parent(); + KMFolderDir *ancestorDir = folder->tqparent(); while ( ancestorDir ) { if ( ancestorDir == rootDir ) return true; - ancestorDir = ancestorDir->parent(); + ancestorDir = ancestorDir->tqparent(); } return false; } @@ -204,7 +204,7 @@ void KMSearch::start() } mRemainingFolders = mFolders.count(); - mLastFolder = TQString::null; + mLastFolder = TQString(); mProcessNextBatchTimer->start( 0, true ); } @@ -237,7 +237,7 @@ void KMSearch::stop() mRemainingFolders = -1; mOpenedFolders.clear(); mFolders.clear(); - mLastFolder = TQString::null; + mLastFolder = TQString(); mRunByIndex = mRunning = false; emit finished(false); } @@ -304,7 +304,7 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder, { mRemainingFolders = 0; mRunning = false; - mLastFolder = TQString::null; + mLastFolder = TQString(); mRemainingFolders = -1; mFolders.clear(); emit finished( true ); @@ -688,7 +688,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg ) this folder via the inherited method, then clear the imap ones. */ FolderStorage::ignoreJobsForMessage( msg ); - if (msg->parent()->folderType() == KMFolderTypeImap) { + if (msg->tqparent()->folderType() == KMFolderTypeImap) { KMAcctImap *account = static_cast<KMFolderImap*>( msg->storage() )->account(); if( !account ) @@ -698,7 +698,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg ) } -int KMFolderSearch::find(const KMMsgBase* msg) const +int KMFolderSearch::tqfind(const KMMsgBase* msg) const { int pos = 0; TQ_UINT32 serNum = msg->getMsgSerNum(); @@ -787,7 +787,7 @@ int KMFolderSearch::writeIndex( bool ) DwString KMFolderSearch::getDwString(int idx) { - return getMsgBase(idx)->parent()->getDwString( idx ); + return getMsgBase(idx)->tqparent()->getDwString( idx ); } KMMessage* KMFolderSearch::readMsg(int idx) @@ -910,7 +910,7 @@ KMMsgInfo* KMFolderSearch::setIndexEntry(int idx, KMMessage *msg) { assert(idx >= 0 && idx < (int)mSerNums.count()); Q_UNUSED( idx ); - return msg->storage()->setIndexEntry(msg->parent()->find(msg), msg); + return msg->storage()->setIndexEntry(msg->tqparent()->tqfind(msg), msg); } void KMFolderSearch::clearIndex(bool, bool) diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h index ced2af350..a3a1bc928 100644 --- a/kmail/kmfoldersearch.h +++ b/kmail/kmfoldersearch.h @@ -49,12 +49,13 @@ namespace KMail { } using KMail::AttachmentStrategy; -class KMSearch: public QObject +class KMSearch: public TQObject { Q_OBJECT + TQ_OBJECT public: - KMSearch(TQObject * parent = 0, const char * name = 0); + KMSearch(TQObject * tqparent = 0, const char * name = 0); ~KMSearch(); bool write(TQString location) const; @@ -109,6 +110,7 @@ private: class KMFolderSearch: public FolderStorage { Q_OBJECT + TQ_OBJECT friend class ::KMFolderSearchJob; public: KMFolderSearch(KMFolder* folder, const char* name=0); @@ -179,7 +181,7 @@ public: virtual bool isReadOnly() const; virtual const KMMsgBase* getMsgBase(int idx) const; virtual KMMsgBase* getMsgBase(int idx); - virtual int find(const KMMsgBase* msg) const; + virtual int tqfind(const KMMsgBase* msg) const; virtual TQString indexLocation() const; virtual int writeIndex( bool createEmptyIndex = false ); DwString getDwString(int idx); diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index 00849b6e7..b1df389ad 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -18,20 +18,20 @@ using namespace KMail; //----------------------------------------------------------------------------- -KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, +KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings ) - : KDialogBase( parent, "folder dialog", true, caption, + : KDialogBase( tqparent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, KGuiItem(i18n("&New Subfolder..."), "folder_new", i18n("Create a new subfolder under the currently selected folder")) - ), // mainwin as parent, modal + ), // mainwin as tqparent, modal mUseGlobalSettings( useGlobalSettings ) { - KMFolderTree * ft = parent->folderTree(); + KMFolderTree * ft = tqparent->folderTree(); assert( ft ); TQString preSelection = mUseGlobalSettings ? - GlobalSettings::self()->lastSelectedFolder() : TQString::null; + GlobalSettings::self()->lastSelectedFolder() : TQString(); TQWidget * container = makeVBoxMainWidget(); new TQLabel( i18n("You can start typing to filter the list of folders"), container ); mTreeView = new KMail::SimpleFolderTree( container, ft, @@ -40,17 +40,17 @@ KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, } //---------------------------------------------------------------------------- -KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, +KMFolderSelDlg::KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings ) - : KDialogBase( parent, "folder dialog", true, caption, + : KDialogBase( tqparent, "folder dialog", true, caption, Ok|Cancel|User1, Ok, true, KGuiItem(i18n("&New Subfolder..."), "folder_new", i18n("Create a new subfolder under the currently selected folder")) - ), // mainwin as parent, modal + ), // mainwin as tqparent, modal mUseGlobalSettings( useGlobalSettings ) { TQString preSelection = mUseGlobalSettings ? - GlobalSettings::self()->lastSelectedFolder() : TQString::null; + GlobalSettings::self()->lastSelectedFolder() : TQString(); TQWidget * container = makeVBoxMainWidget(); new TQLabel( i18n("You can start typing to filter the list of folders"), container ); mTreeView = new KMail::SimpleFolderTree( container, tree, @@ -65,7 +65,7 @@ void KMFolderSelDlg::init() connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( slotSelect() ) ); connect( mTreeView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateBtnStatus() ) ); + this, TQT_SLOT( slotUpdateBtntqStatus() ) ); readConfig(); } @@ -107,7 +107,7 @@ void KMFolderSelDlg::slotUser1() } //----------------------------------------------------------------------------- -void KMFolderSelDlg::slotUpdateBtnStatus() +void KMFolderSelDlg::slotUpdateBtntqStatus() { enableButton( User1, folder() && ( !folder()->noContent() && !folder()->noChildren() ) ); diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h index f1637a2f8..81bdd7eba 100644 --- a/kmail/kmfolderseldlg.h +++ b/kmail/kmfolderseldlg.h @@ -21,17 +21,18 @@ namespace KMail { class KMFolderSelDlg: public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor with KMMainWidget - * @p parent @em must be a KMMainWin, because we + * @p tqparent @em must be a KMMainWin, because we * need its foldertree. * @param mustBeReadWrite if true, readonly folders are disabled * @param useGlobalSettings if true, the current folder is read and * written to GlobalSettings */ - KMFolderSelDlg( KMMainWidget * parent, const TQString& caption, + KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings = true ); /** * Constructor with separate KMFolderTree @@ -39,7 +40,7 @@ namespace KMail { * @param useGlobalSettings if true, the current folder is read and * written to GlobalSettings */ - KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, + KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree, const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings = true ); @@ -57,7 +58,7 @@ namespace KMail { protected slots: void slotSelect(); void slotUser1(); - void slotUpdateBtnStatus(); + void slotUpdateBtntqStatus(); protected: void readConfig(); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 86dab4126..edd641cc9 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -51,10 +51,10 @@ using namespace KPIM; //============================================================================= -KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name, +KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, KFolderTreeItem::Protocol protocol ) - : TQObject( parent, name.latin1() ), - KFolderTreeItem( parent, name, protocol, Root ), + : TQObject( tqparent, name.latin1() ), + KFolderTreeItem( tqparent, name, protocol, Root ), mFolder( 0 ), mNeedsRepaint( true ) { init(); @@ -62,10 +62,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name, } //----------------------------------------------------------------------------- -KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name, +KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, KMFolder* folder ) - : TQObject( parent, name.latin1() ), - KFolderTreeItem( parent, name ), + : TQObject( tqparent, name.latin1() ), + KFolderTreeItem( tqparent, name ), mFolder( folder ), mNeedsRepaint( true ) { init(); @@ -73,10 +73,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name, } //----------------------------------------------------------------------------- -KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *parent, const TQString & name, +KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *tqparent, const TQString & name, KMFolder* folder ) : TQObject( 0, name.latin1() ), - KFolderTreeItem( parent, name ), + KFolderTreeItem( tqparent, name ), mFolder( folder ), mNeedsRepaint( true ) { init(); @@ -136,7 +136,7 @@ TQPixmap KMFolderTreeItem::normalIcon(int size) const } // non-root search folders if ( protocol() == KMFolderTreeItem::Search ) { - icon = "mail_find"; + icon = "mail_tqfind"; } if ( mFolder && mFolder->noContent() ) { icon = "folder_grey"; @@ -373,9 +373,9 @@ void KMFolderTreeItem::updateCount() //============================================================================= -KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, +KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent, const char *name ) - : KMail::FolderTreeBase( mainWidget, parent, name ) + : KMail::FolderTreeBase( mainWidget, tqparent, name ) , mUpdateTimer( 0, "mUpdateTimer" ) , autoopen_timer( 0, "autoopen_timer" ) { @@ -712,7 +712,7 @@ void KMFolderTree::slotUpdateOneCount() //----------------------------------------------------------------------------- // Recursively add a directory of folders to the tree of folders -void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) +void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ) { for ( KMFolderNode * node = fdir->first() ; node ; node = fdir->next() ) { if ( node->isDir() ) @@ -720,7 +720,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) KMFolder * folder = static_cast<KMFolder*>(node); KMFolderTreeItem * fti = 0; - if (!parent) + if (!tqparent) { // create new root-item, but only if this is not the root of a // "groupware folders only" account @@ -742,8 +742,8 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) } // create new child - fti = new KMFolderTreeItem( parent, folder->label(), folder ); - // set folders explicitely to exandable when they have children + fti = new KMFolderTreeItem( tqparent, folder->label(), folder ); + // set folders explicitely to exandable when they have tqchildren // this way we can do a listing for IMAP folders when the user expands them // even when the child folders are not created yet if ( folder->storage()->hasChildren() == FolderStorage::HasChildren ) { @@ -757,7 +757,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) addDirectory( folder->child(), fti ); } - // Check if this is an IMAP resource folder or a no-content parent only + // Check if this is an IMAP resource folder or a no-content tqparent only // containing groupware folders if ( (kmkernel->iCalIface().hideResourceFolder( folder ) || folder->noContent()) && fti->childCount() == 0 ) { @@ -858,8 +858,8 @@ void KMFolderTree::slotFolderRemoved(KMFolder *aFolder) // Methods for navigating folders with the keyboard void KMFolderTree::prepareItem( KMFolderTreeItem* fti ) { - for ( TQListViewItem * parent = fti->parent() ; parent ; parent = parent->parent() ) - parent->setOpen( true ); + for ( TQListViewItem * tqparent = fti->tqparent() ; tqparent ; tqparent = tqparent->tqparent() ) + tqparent->setOpen( true ); ensureItemVisible( fti ); } @@ -1086,7 +1086,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, /* Treat the special case of the root and account folders */ if ((!fti->folder() || (fti->folder()->noContent() - && !fti->parent()))) + && !fti->tqparent()))) { TQString createChild = i18n("&New Subfolder..."); if (!fti->folder()) createChild = i18n("&New Folder..."); @@ -1184,7 +1184,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, mMainWidget->action("post_message")->plug(folderMenu); } - if (fti->folder() && fti->parent() && !multiFolder) + if (fti->folder() && fti->tqparent() && !multiFolder) { folderMenu->insertItem(SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), @@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me) } // react on middle-button only - if (btn != Qt::MidButton) { + if (btn != TQt::MidButton) { KFolderTree::contentsMouseReleaseEvent(me); return; } @@ -1264,7 +1264,7 @@ static bool folderHasCreateRights( const KMFolder *folder ) //----------------------------------------------------------------------------- // Create a subfolder. // Requires creating the appropriate subdirectory and show a dialog -void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent ) +void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * tqparent ) { KMFolder *aFolder = folder; if ( !aFolder ) { @@ -1286,8 +1286,8 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent ) } } - if ( parent ) - ( new KMail::NewFolderDialog( parent, aFolder ) )->exec(); + if ( tqparent ) + ( new KMail::NewFolderDialog( tqparent, aFolder ) )->exec(); else ( new KMail::NewFolderDialog( this, aFolder ) )->show(); return; @@ -1392,7 +1392,7 @@ void KMFolderTree::cleanupConfigFile() { if ((*grpIt).left(7) != "Folder-") continue; name = (*grpIt).mid(7); - if (folderMap.find(name) == folderMap.end()) + if (folderMap.tqfind(name) == folderMap.end()) { KMFolder* folder = kmkernel->findFolderById( name ); if ( folder ) { @@ -1522,8 +1522,8 @@ void KMFolderTree::contentsDropEvent( TQDropEvent *e ) if (fti && mCopySourceFolders.count() == 1) { KMFolder *source = mCopySourceFolders.first(); - // if we are dragging to ourselves or to our parent, set fti to 0 so nothing is done - if (source == fti->folder() || source->parent()->owner() == fti->folder()) fti = 0; + // if we are dragging to ourselves or to our tqparent, set fti to 0 so nothing is done + if (source == fti->folder() || source->tqparent()->owner() == fti->folder()) fti = 0; } if (fti && acceptDrag(e) && ( fti != oldSelected || e->source() != mMainWidget->headers()->viewport() ) ) { @@ -1583,22 +1583,22 @@ void KMFolderTree::slotFolderExpanded( TQListViewItem * item ) KMFolderImap *folder = static_cast<KMFolderImap*>( fti->folder()->storage() ); // if we should list all folders we limit this to the root folder if ( !folder->account() || ( !folder->account()->listOnlyOpenFolders() && - fti->parent() ) ) + fti->tqparent() ) ) return; if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation ) { - // check if all parents are expanded - TQListViewItem *parent = item->parent(); - while ( parent ) + // check if all tqparents are expanded + TQListViewItem *tqparent = item->tqparent(); + while ( tqparent ) { - if ( !parent->isOpen() ) + if ( !tqparent->isOpen() ) return; - parent = parent->parent(); + tqparent = tqparent->tqparent(); } // the tree will be reloaded after that bool success = folder->listDirectory(); if (!success) fti->setOpen( false ); - if ( fti->childCount() == 0 && fti->parent() ) + if ( fti->childCount() == 0 && fti->tqparent() ) fti->setExpandable( false ); } } @@ -1970,9 +1970,9 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source // Disable drag during copy operation since it prevents from many crashes setDragEnabled( false ); - KMFolderDir* parent = &(kmkernel->folderMgr()->dir()); + KMFolderDir* tqparent = &(kmkernel->folderMgr()->dir()); if ( destination ) - parent = destination->createChildFolder(); + tqparent = destination->createChildFolder(); TQStringList sourceFolderNames; @@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( source ) sourceFolderName = source->label(); - if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) { + if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>") .arg( sourceFolderName ) ); setDragEnabled( true ); @@ -2002,19 +2002,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source setDragEnabled( true ); return; } - if ( f->parent() ) - f = f->parent()->owner(); + if ( f->tqparent() ) + f = f->tqparent()->owner(); } TQString message = i18n( "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>" ). arg( sourceFolderName ); - KMFolderDir* folderDir = parent; + KMFolderDir* folderDir = tqparent; // check that the folder can be moved if ( source && source->child() ) { while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) && - ( folderDir != source->parent() ) ) + ( folderDir != source->tqparent() ) ) { if ( folderDir->findRef( source ) != -1 ) { @@ -2022,19 +2022,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source setDragEnabled( true ); return; } - folderDir = folderDir->parent(); + folderDir = folderDir->tqparent(); } } - if( source && source->child() && parent && - ( parent->path().find( source->child()->path() + "/" ) == 0 ) ) { + if( source && source->child() && tqparent && + ( tqparent->path().tqfind( source->child()->path() + "/" ) == 0 ) ) { KMessageBox::error( this, message ); setDragEnabled( true ); return; } if( source && source->child() - && ( parent == source->child() ) ) { + && ( tqparent == source->child() ) ) { KMessageBox::error( this, message ); setDragEnabled( true ); return; @@ -2043,20 +2043,20 @@ 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 *parentDir = (*it)->child(); - if ( !parentDir ) + KMFolderDir *tqparentDir = (*it)->child(); + if ( !tqparentDir ) continue; for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it2 = sources.constBegin(); it2 != sources.constEnd(); ++it2 ) { if ( *it == *it2 ) continue; - KMFolderDir *childDir = (*it2)->parent(); + KMFolderDir *childDir = (*it2)->tqparent(); do { - if ( parentDir == childDir || parentDir->findRef( childDir->owner() ) != -1 ) { + if ( tqparentDir == childDir || tqparentDir->findRef( childDir->owner() ) != -1 ) { KMessageBox::error( this, i18n("Moving the selected folders is not possible") ); setDragEnabled( true ); return; } - childDir = childDir->parent(); + childDir = childDir->tqparent(); } while ( childDir && childDir != &kmkernel->folderMgr()->dir() ); } @@ -2074,9 +2074,9 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( move ) { kdDebug(5006) << "move folder " << (source ? source->label(): "Unknown") << " to " << ( destination ? destination->label() : "Local Folders" ) << endl; - kmkernel->folderMgr()->moveFolder( source, parent ); + kmkernel->folderMgr()->moveFolder( source, tqparent ); } else { - kmkernel->folderMgr()->copyFolder( source, parent ); + kmkernel->folderMgr()->copyFolder( source, tqparent ); } } } @@ -2085,7 +2085,7 @@ TQDragObject * KMFolderTree::dragObject() { KMFolderTreeItem *item = static_cast<KMFolderTreeItem*> (itemAt(viewport()->mapFromGlobal(TQCursor::pos()))); - if ( !item || !item->parent() || !item->folder() ) // top-level items or something invalid + if ( !item || !item->tqparent() || !item->folder() ) // top-level items or something invalid return 0; mCopySourceFolders = selectedFolders(); diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 640da9507..73704df4a 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -45,17 +45,18 @@ template <typename T> class TQGuardedPtr; class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem { Q_OBJECT + TQ_OBJECT public: /** Construct a root item _without_ folder */ - KMFolderTreeItem( KFolderTree *parent, const TQString & name, + KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, KFolderTreeItem::Protocol protocol=KFolderTreeItem::NONE ); /** Construct a root item _with_ folder */ - KMFolderTreeItem( KFolderTree *parent, const TQString & name, + KMFolderTreeItem( KFolderTree *tqparent, const TQString & name, KMFolder* folder ); /** Construct a child item */ - KMFolderTreeItem( KFolderTreeItem* parent, const TQString & name, + KMFolderTreeItem( KFolderTreeItem* tqparent, const TQString & name, KMFolder* folder ); virtual ~KMFolderTreeItem(); @@ -67,7 +68,7 @@ public: /** associated folder */ KMFolder* folder() const { return mFolder; } - TQListViewItem* parent() const { return KFolderTreeItem::parent(); } + TQListViewItem* tqparent() const { return KFolderTreeItem::tqparent(); } /** Adjust the unread count from the folder and update the * pixmaps accordingly. */ @@ -108,16 +109,17 @@ private: class KMFolderTree : public KMail::FolderTreeBase { Q_OBJECT + TQ_OBJECT public: - KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0, + KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent=0, const char *name=0 ); /** Save config options */ void writeConfig(); /** Recusively add folders in a folder directory to a listview item. */ - virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ); + virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent ); /** create a folderlist */ void createFolderList( TQStringList *str, @@ -165,7 +167,7 @@ public: MoveFolder }; - /** Generate a popup menu that tqcontains all folders that can have content */ + /** Generate a popup menu that contains all folders that can have content */ void folderToPopupMenu( MenuAction action, TQObject *receiver, KMMenuToFolder *, TQPopupMenu *menu, TQListViewItem *start = 0 ); @@ -224,7 +226,7 @@ public slots: void slotResetFolderList( TQListViewItem* item = 0, bool startList = true ); /** Create a child folder */ - void addChildFolder( KMFolder *folder = 0, TQWidget * parent = 0 ); + void addChildFolder( KMFolder *folder = 0, TQWidget * tqparent = 0 ); /** Copies the currently selected folder. */ void copyFolder(); diff --git a/kmail/kmgroupware.cpp b/kmail/kmgroupware.cpp index 47bcf33b1..92c3a01f8 100644 --- a/kmail/kmgroupware.cpp +++ b/kmail/kmgroupware.cpp @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/kmgroupware.h b/kmail/kmgroupware.h index 0c815b4c3..27fa3a355 100644 --- a/kmail/kmgroupware.h +++ b/kmail/kmgroupware.h @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 5afc9d811..f20ceb994 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -22,7 +22,7 @@ using KMail::ActionScheduler; #include "messagecopyhelper.h" using KMail::MessageCopyHelper; #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "progressmanager.h" using KPIM::ProgressManager; using KPIM::ProgressItem; @@ -92,9 +92,9 @@ TQPixmap* KMHeaders::pixReadFwdReplied = 0; //----------------------------------------------------------------------------- -KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, +KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *tqparent, const char *name) : - KListView( parent, name ), + KListView( tqparent, name ), mIgnoreSortOrderChanges( false ) { static bool pixmapsLoaded = false; @@ -129,7 +129,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, mPopup = new KPopupMenu(this); mPopup->insertTitle(i18n("View Columns")); mPopup->setCheckable(true); - mPopup->insertItem(i18n("Status"), KPaintInfo::COL_STATUS); + mPopup->insertItem(i18n("tqStatus"), KPaintInfo::COL_STATUS); mPopup->insertItem(i18n("Important"), KPaintInfo::COL_IMPORTANT); mPopup->insertItem(i18n("Action Item"), KPaintInfo::COL_TODO); mPopup->insertItem(i18n("Attachment"), KPaintInfo::COL_ATTACHMENT); @@ -329,7 +329,7 @@ void KMHeaders::slotToggleColumn(int id, int mode) } case KPaintInfo::COL_STATUS: { - show = &mPaintInfo.showStatus; + show = &mPaintInfo.showtqStatus; col = &mPaintInfo.statusCol; width = pixNew->width() + 8; if ( *col == header()->mapToIndex( *col ) ) @@ -622,7 +622,7 @@ void KMHeaders::readFolderConfig (void) mCurrentItemSerNum = config->readNumEntry("CurrentSerialNum", 0); mPaintInfo.orderOfArrival = config->readBoolEntry( "OrderOfArrival", false ); - mPaintInfo.status = config->readBoolEntry( "Status", false ); + mPaintInfo.status = config->readBoolEntry( "tqStatus", false ); { //area for config group "Geometry" KConfigGroupSaver saver(config, "Geometry"); @@ -653,7 +653,7 @@ void KMHeaders::writeFolderConfig (void) config->writeEntry("CurrentSerialNum", sernum); config->writeEntry("OrderOfArrival", mPaintInfo.orderOfArrival); - config->writeEntry("Status", mPaintInfo.status); + config->writeEntry("tqStatus", mPaintInfo.status); } //----------------------------------------------------------------------------- @@ -669,7 +669,7 @@ void KMHeaders::writeConfig (void) config->writeEntry("showTodoColumn" , mPaintInfo.showTodo); config->writeEntry("showSpamHamColumn" , mPaintInfo.showSpamHam); config->writeEntry("showWatchedIgnoredColumn", mPaintInfo.showWatchedIgnored); - config->writeEntry("showStatusColumn" , mPaintInfo.showStatus); + config->writeEntry("showStatusColumn" , mPaintInfo.showtqStatus); config->writeEntry("showSignedColumn" , mPaintInfo.showSigned); config->writeEntry("showCryptoColumn" , mPaintInfo.showCrypto); config->writeEntry("showReceiverColumn" , mPaintInfo.showReceiver); @@ -700,7 +700,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) highlightMessage(0, false); disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + this, TQT_SLOT(setFolderInfotqStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); @@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) disconnect(mFolder, TQT_SIGNAL(closed()), this, TQT_SLOT(folderClosed())); disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ), - BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); + BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); writeSortOrder(); mFolder->close("kmheaders"); @@ -752,9 +752,9 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) connect(mFolder, TQT_SIGNAL(closed()), this, TQT_SLOT(folderClosed())); connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), - BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); + BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + this, TQT_SLOT(setFolderInfotqStatus())); connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); // Not very nice, but if we go from nested to non-nested @@ -789,7 +789,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) END_TIMER(updateMsg); SHOW_TIMER(updateMsg); makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); TQString colText = i18n( "Sender" ); if (mFolder && (mFolder->whoField().lower() == "to") && !mPaintInfo.showReceiver) @@ -803,7 +803,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) colText = i18n( "Subject" ); if (mPaintInfo.status) - colText = colText + i18n( " (Status)" ); + colText = colText + i18n( " (tqStatus)" ); setColumnText( mPaintInfo.subCol, colText); } @@ -920,26 +920,26 @@ void KMHeaders::msgAdded(int id) msgId = ""; TQString replyToId = mFolder->getMsgBase(id)->replyToIdMD5(); - SortCacheItem *parent = findParent( sci ); - if (!parent && mSubjThreading) { - parent = findParentBySubject( sci ); - if (parent && sci->isImperfectlyThreaded()) { - // The parent we found could be by subject, in which case it is + SortCacheItem *tqparent = findParent( sci ); + if (!tqparent && mSubjThreading) { + tqparent = findParentBySubject( sci ); + if (tqparent && sci->isImperfectlyThreaded()) { + // The tqparent we found could be by subject, in which case it is // possible, that it would be preferrable to thread it below us, // not the other way around. Check that. This is not only // cosmetic, as getting this wrong leads to circular threading. - if (msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToIdMD5() - || msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToAuxIdMD5()) - parent = NULL; + if (msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToIdMD5() + || msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToAuxIdMD5()) + tqparent = NULL; } } - if (parent && mFolder->getMsgBase(parent->id())->isWatched()) - mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched ); - else if (parent && mFolder->getMsgBase(parent->id())->isIgnored()) - mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored ); - if (parent) - hi = new HeaderItem( parent->item(), id ); + if (tqparent && mFolder->getMsgBase(tqparent->id())->isWatched()) + mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched ); + else if (tqparent && mFolder->getMsgBase(tqparent->id())->isIgnored()) + mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored ); + if (tqparent) + hi = new HeaderItem( tqparent->item(), id ); else hi = new HeaderItem( this, id ); @@ -953,16 +953,16 @@ void KMHeaders::msgAdded(int id) if ( !msgId.isEmpty() ) mSortCacheItems.tqreplace(msgId, sci); - /* Add to the list of potential parents for subject threading. But only if + /* Add to the list of potential tqparents for subject threading. But only if * we are top level. */ - if (mSubjThreading && parent) { + if (mSubjThreading && tqparent) { TQString subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5(); if (subjMD5.isEmpty()) { mFolder->getMsgBase(id)->initStrippedSubjectMD5(); subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5(); } if( !subjMD5.isEmpty()) { - if ( !mSubjectLists.find(subjMD5) ) + if ( !mSubjectLists.tqfind(subjMD5) ) mSubjectLists.insert(subjMD5, new TQPtrList<SortCacheItem>()); // insertion sort by date. See buildThreadTrees for details. int p=0; @@ -977,7 +977,7 @@ void KMHeaders::msgAdded(int id) sci->setSubjectThreadingList( mSubjectLists[subjMD5] ); } } - // The message we just added might be a better parent for one of the as of + // The message we just added might be a better tqparent for one of the as of // yet imperfectly threaded messages. Let's find out. /* In case the current item is taken during reparenting, prevent qlistview @@ -1006,7 +1006,7 @@ void KMHeaders::msgAdded(int id) if (msgId != otherMsg->replyToAuxIdMD5()) continue; else { - if (!otherId.isEmpty() && mSortCacheItems.find(otherId)) + if (!otherId.isEmpty() && mSortCacheItems.tqfind(otherId)) continue; else // Thread below us by aux id, but keep on the list of @@ -1017,8 +1017,8 @@ void KMHeaders::msgAdded(int id) TQListViewItem *newParent = mItems[id]; TQListViewItem *msg = mItems[tryMe]; - if (msg->parent()) - msg->parent()->takeItem(msg); + if (msg->tqparent()) + msg->tqparent()->takeItem(msg); else takeItem(msg); newParent->insertItem(msg); @@ -1029,7 +1029,7 @@ void KMHeaders::msgAdded(int id) if (perfectParent) { mImperfectlyThreadedList.removeRef (mItems[tryMe]); - // The item was imperfectly thread before, now it's parent + // The item was imperfectly thread before, now it's tqparent // is there. Update the .sorted file accordingly. TQString sortFile = KMAIL_SORT_FILE(mFolder); FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+"); @@ -1110,17 +1110,17 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if (mSortCacheItems[msgId] == removedItem->sortCacheItem()) mSortCacheItems.remove(msgId); } - // Remove the message from the list of potential parents for threading by + // Remove the message from the list of potential tqparents for threading by // subject. if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); - // Reparent children of item. + // Retqparent tqchildren of item. TQListViewItem *myParent = removedItem; TQListViewItem *myChild = myParent->firstChild(); TQListViewItem *threadRoot = myParent; - while (threadRoot->parent()) - threadRoot = threadRoot->parent(); + while (threadRoot->tqparent()) + threadRoot = threadRoot->tqparent(); TQString key = static_cast<HeaderItem*>(threadRoot)->key(mSortCol, !mSortDescending); TQPtrList<TQListViewItem> childList; @@ -1148,26 +1148,26 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) TQListViewItem *lvi = *it; HeaderItem *item = static_cast<HeaderItem*>(lvi); SortCacheItem *sci = item->sortCacheItem(); - SortCacheItem *parent = findParent( sci ); - if ( !parent && mSubjThreading ) - parent = findParentBySubject( sci ); + SortCacheItem *tqparent = findParent( sci ); + if ( !tqparent && mSubjThreading ) + tqparent = findParentBySubject( sci ); - Q_ASSERT( !parent || parent->item() != removedItem ); + Q_ASSERT( !tqparent || tqparent->item() != removedItem ); myParent->takeItem(lvi); - if ( parent && parent->item() != item && parent->item() != removedItem ) { - parent->item()->insertItem(lvi); - parent->addSortedChild( sci ); + if ( tqparent && tqparent->item() != item && tqparent->item() != removedItem ) { + tqparent->item()->insertItem(lvi); + tqparent->addSortedChild( sci ); } else { insertItem(lvi); mRoot->addSortedChild( sci ); } - if ((!parent || sci->isImperfectlyThreaded()) - && !mImperfectlyThreadedList.tqcontainsRef(item)) + if ((!tqparent || sci->isImperfectlyThreaded()) + && !mImperfectlyThreadedList.containsRef(item)) mImperfectlyThreadedList.append(item); - if (parent && !sci->isImperfectlyThreaded() - && mImperfectlyThreadedList.tqcontainsRef(item)) + if (tqparent && !sci->isImperfectlyThreaded() + && mImperfectlyThreadedList.containsRef(item)) mImperfectlyThreadedList.removeRef(item); } } @@ -1220,7 +1220,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId) //----------------------------------------------------------------------------- -void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle) +void KMHeaders::setMsgtqStatus (KMMsgtqStatus status, bool toggle) { // kdDebug() << k_funcinfo << endl; SerNumList serNums = selectedVisibleSernums(); @@ -1242,8 +1242,8 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const // ...find the top-level item: TQListViewItem *topOfThread = curItem; - while ( topOfThread->parent() ) - topOfThread = topOfThread->parent(); + while ( topOfThread->tqparent() ) + topOfThread = topOfThread->tqparent(); // collect the items in this thread: TQPtrList<TQListViewItem> list; @@ -1254,7 +1254,7 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const return list; } -void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle) +void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle) { TQPtrList<TQListViewItem> curThread; @@ -1266,8 +1266,8 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle) if (item->isSelected() ) { // ...find the top-level item: TQListViewItem *top = item; - while ( top->parent() ) - top = top->parent(); + while ( top->tqparent() ) + top = top->tqparent(); if (!topOfThreads.tqcontains(top)) { topOfThreads.append(top); } @@ -1313,11 +1313,11 @@ int KMHeaders::slotFilterMsg(KMMessage *msg) kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno))); return 2; } - if (msg->parent()) { // unGet this msg + if (msg->tqparent()) { // unGet this msg int idx = -1; KMFolder * p = 0; KMMsgDict::instance()->getLocation( msg, &p, &idx ); - assert( p == msg->parent() ); assert( idx >= 0 ); + assert( p == msg->tqparent() ); assert( idx >= 0 ); p->unGetMsg( idx ); } @@ -1328,13 +1328,13 @@ int KMHeaders::slotFilterMsg(KMMessage *msg) void KMHeaders::slotExpandOrCollapseThread( bool expand ) { if ( !isThreaded() ) return; - // find top-level parent of currentItem(). + // find top-level tqparent of currentItem(). TQListViewItem *item = currentItem(); if ( !item ) return; clearSelection(); item->setSelected( true ); - while ( item->parent() ) - item = item->parent(); + while ( item->tqparent() ) + item = item->tqparent(); HeaderItem * hdrItem = static_cast<HeaderItem*>(item); hdrItem->setOpenRecursive( expand ); if ( !expand ) // collapse can hide the current item: @@ -1358,8 +1358,8 @@ void KMHeaders::slotExpandOrCollapseAllThreads( bool expand ) if ( !expand ) { // collapse can hide the current item: TQListViewItem * item = currentItem(); if( item ) { - while ( item->parent() ) - item = item->parent(); + while ( item->tqparent() ) + item = item->tqparent(); setCurrentMsg( static_cast<HeaderItem*>(item)->msgId() ); } } @@ -1389,7 +1389,7 @@ void KMHeaders::styleChange( TQStyle& oldStyle ) } //----------------------------------------------------------------------------- -void KMHeaders::setFolderInfoStatus () +void KMHeaders::setFolderInfotqStatus () { if ( !mFolder ) return; TQString str; @@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfoStatus () : i18n( "0 messages" ); // no need for "0 unread" to be added here if ( mFolder->isReadOnly() ) str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str ); - BroadcasStatus::instance()->seStatusMsg(str); + BroadcastqStatus::instance()->seStatusMsg(str); } //----------------------------------------------------------------------------- @@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg() progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); - KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg ); + KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg () this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); - BroadcasStatus::instance()->seStatusMsg(""); + BroadcastqStatus::instance()->seStatusMsg(""); // triggerUpdate(); } @@ -1620,7 +1620,7 @@ void KMHeaders::slotMoveCompleted( KMCommand *command ) if ( command->result() == KMCommand::OK ) { // make sure the current item is shown makeHeaderVisible(); - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") ); } else { /* The move failed or the user canceled it; reset the state of all @@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command ) } triggerUpdate(); if ( command->result() == KMCommand::Failed ) - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") ); else - BroadcasStatus::instance()->seStatusMsg( + BroadcastqStatus::instance()->seStatusMsg( deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") ); } mOwner->updateMessageActions(); @@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur) setSelectionAnchor( currentItem() ); } makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); } //----------------------------------------------------------------------------- @@ -1713,8 +1713,8 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected ) if ( item->isVisible() ) KListView::setSelected( item, selected ); - // If the item is the parent of a closed thread recursively select - // children . + // If the item is the tqparent of a closed thread recursively select + // tqchildren . if ( isThreaded() && !item->isOpen() && item->firstChild() ) { TQListViewItem *nextRoot = item->itemBelow(); TQListViewItemIterator it( item->firstChild() ); @@ -1826,14 +1826,14 @@ void KMHeaders::selectNextMessage() if (lvi && below ) { while (temp) { temp->firstChild(); - temp = temp->parent(); + temp = temp->tqparent(); } lvi->tqrepaint(); /* test to see if we need to unselect messages on back track */ (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true)); setCurrentItem(below); makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); } } } @@ -1864,14 +1864,14 @@ void KMHeaders::selectPrevMessage() if (lvi && above) { while (temp) { temp->firstChild(); - temp = temp->parent(); + temp = temp->tqparent(); } lvi->tqrepaint(); /* test to see if we need to unselect messages on back track */ (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true)); setCurrentItem(above); makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); } } } @@ -1997,11 +1997,11 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept // first unread item. // // Find the ancestor of the unread item closest to the - // root and recursively sort all of that ancestors children. + // root and recursively sort all of that ancestors tqchildren. if (item) { TQListViewItem *next = item; - while (next->parent()) - next = next->parent(); + while (next->tqparent()) + next = next->tqparent(); next = static_cast<HeaderItem*>(next)->firstChildNonConst(); while (next && (next != item)) if (static_cast<HeaderItem*>(next)->firstChildNonConst()) @@ -2010,7 +2010,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept next = next->nextSibling(); else { while (next && (next != item)) { - next = next->parent(); + next = next->tqparent(); if (next == item) break; if (next && next->nextSibling()) { @@ -2135,12 +2135,12 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread) return; } - BroadcasStatus::instance()->seStatusMsg(""); + BroadcastqStatus::instance()->seStatusMsg(""); if (markitread && idx >= 0) setMsgRead(idx); mItems[idx]->irefresh(); mItems[idx]->tqrepaint(); emit selected( msg ); - setFolderInfoStatus(); + setFolderInfotqStatus(); } void KMHeaders::highlightCurrentThread() @@ -2288,9 +2288,9 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) && ( mPressPos.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); if ( rootDecoClicked ) { - // Check if our item is the parent of a closed thread and if so, if the root + // Check if our item is the tqparent of a closed thread and if so, if the root // decoration of the item was clicked (i.e. the +/- sign) which would expand - // the thread. In that case, deselect all children, so opening the thread + // the thread. In that case, deselect all tqchildren, so opening the thread // doesn't cause a flicker. if ( !lvi->isOpen() && lvi->firstChild() ) { TQListViewItem *nextRoot = lvi->itemBelow(); @@ -2303,7 +2303,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) // let klistview do it's thing, expanding/collapsing, selection/deselection KListView::contentsMousePressEvent(e); - /* QListView's shift-select selects also invisible items. Until that is + /* TQListView's shift-select selects also invisible items. Until that is fixed, we have to deselect hidden items here manually, so the quick search doesn't mess things up. */ if ( e->state() & ShiftButton ) { @@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } if ( rootDecoClicked ) { - // select the thread's children after closing if the parent is selected + // select the thread's tqchildren after closing if the tqparent is selected if ( lvi && !lvi->isOpen() && lvi->isSelected() ) setSelected( lvi, true ); } @@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( lvi != currentItem() ) highlightMessage( lvi ); /* Explicitely set selection state. This is necessary because we want to - * also select all children of closed threads when the parent is selected. */ + * also select all tqchildren of closed threads when the tqparent is selected. */ // unless ctrl tqmask, set selected if it isn't already if ( !( e->state() & ControlButton ) && !wasSelected ) @@ -2344,21 +2344,21 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) HeaderItem *item = static_cast<HeaderItem*>( lvi ); KMMsgBase *msg = mFolder->getMsgBase(item->msgId()); if ( section == mPaintInfo.flagCol && flagsToggleable ) { - setMsgStatus( KMMsgStatusFlag, true ); + setMsgtqStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.importantCol && flagsToggleable ) { - setMsgStatus( KMMsgStatusFlag, true ); + setMsgtqStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.todoCol && flagsToggleable ) { - setMsgStatus( KMMsgStatusTodo, true ); + setMsgtqStatus( KMMsgStatusTodo, true ); } else if ( section == mPaintInfo.watchedIgnoredCol && flagsToggleable ) { if ( msg->isWatched() || msg->isIgnored() ) - setMsgStatus( KMMsgStatusIgnored, true ); + setMsgtqStatus( KMMsgStatusIgnored, true ); else - setMsgStatus( KMMsgStatusWatched, true ); + setMsgtqStatus( KMMsgStatusWatched, true ); } else if ( section == mPaintInfo.statusCol ) { if ( msg->isUnread() || msg->isNew() ) - setMsgStatus( KMMsgStatusRead ); + setMsgtqStatus( KMMsgStatusRead ); else - setMsgStatus( KMMsgStatusUnread ); + setMsgtqStatus( KMMsgStatusUnread ); } } } @@ -2645,7 +2645,7 @@ void KMHeaders::setSorting( int column, bool ascending ) colText = i18n( "Subject" ); if (mPaintInfo.status) - colText = colText + i18n( " (Status)" ); + colText = colText + i18n( " (tqStatus)" ); setColumnText( mPaintInfo.subCol, colText); } KListView::setSorting( column, ascending ); @@ -2660,23 +2660,23 @@ 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 parent_id, TQString key, + int tqparent_id, TQString key, bool update_discover=true) { unsigned long msgSerNum; - unsigned long parentSerNum; + unsigned long tqparentSerNum; msgSerNum = KMMsgDict::instance()->getMsgSerNum( folder, msgid ); - if (parent_id >= 0) - parentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, parent_id ) + KMAIL_RESERVED; + if (tqparent_id >= 0) + tqparentSerNum = KMMsgDict::instance()->getMsgSerNum( folder, tqparent_id ) + KMAIL_RESERVED; else - parentSerNum = (unsigned long)(parent_id + KMAIL_RESERVED); + tqparentSerNum = (unsigned long)(tqparent_id + KMAIL_RESERVED); fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream); - fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream); + fwrite(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream); TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) - fwrite(key.tqunicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); + fwrite(key.tqunicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); if (update_discover) { //update the discovered change count @@ -2768,7 +2768,7 @@ bool KMHeaders::writeSortOrder() KMMsgBase *kmb; while(HeaderItem *i = items.pop()) { - int parent_id = -1; //no parent, top level + int tqparent_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,8 +2781,8 @@ bool KMHeaders::writeSortOrder() p = mSortCacheItems[replymd5]; if (p) - parent_id = p->id(); - // We now have either found a parent, or set it to -1, which means that + tqparent_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, // this message is top level, and will always be, so no need to @@ -2790,12 +2790,12 @@ bool KMHeaders::writeSortOrder() if (replymd5.isEmpty() && replyToAuxId.isEmpty() && !kmb->subjectIsPrefixed() ) - parent_id = -2; + tqparent_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 parent for + // 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(), parent_id, + internalWriteItem(sortStream, mFolder, i->msgId(), tqparent_id, i->key(mSortCol, !mSortDescending), false); //double check for magic headers sorted_count++; @@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder() if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").arg( sortFile )); } fclose(sortStream); ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile)); @@ -2828,20 +2828,20 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) { TQString sortFile = KMAIL_SORT_FILE(mFolder); if(FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+")) { - int parent_id = -1; //no parent, top level + int tqparent_id = -1; //no tqparent, top level if (isThreaded()) { SortCacheItem *sci = khi->sortCacheItem(); KMMsgBase *kmb = mFolder->getMsgBase( khi->msgId() ); - if(sci->parent() && !sci->isImperfectlyThreaded()) - parent_id = sci->parent()->id(); + if(sci->tqparent() && !sci->isImperfectlyThreaded()) + tqparent_id = sci->tqparent()->id(); else if(kmb->replyToIdMD5().isEmpty() && kmb->replyToAuxIdMD5().isEmpty() && !kmb->subjectIsPrefixed()) - parent_id = -2; + tqparent_id = -2; } - internalWriteItem(sortStream, mFolder, khi->msgId(), parent_id, + internalWriteItem(sortStream, mFolder, khi->msgId(), tqparent_id, khi->key(mSortCol, !mSortDescending), false); //update the appended flag FIXME obsolete? @@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").arg( sortFile )); } fclose(sortStream); } else { @@ -2872,7 +2872,7 @@ void KMHeaders::dirtySortOrder(int column) // ----------------- void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder, - bool waiting_for_parent, bool update_discover) + bool waiting_for_tqparent, bool update_discover) { if(mSortOffset == -1) { fseek(sortStream, 0, SEEK_END); @@ -2881,12 +2881,12 @@ void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder, fseek(sortStream, mSortOffset, SEEK_SET); } - int parent_id = -1; - if(!waiting_for_parent) { + int tqparent_id = -1; + if(!waiting_for_tqparent) { if(mParent && !isImperfectlyThreaded()) - parent_id = mParent->id(); + tqparent_id = mParent->id(); } - internalWriteItem(sortStream, folder, mId, parent_id, mKey, update_discover); + internalWriteItem(sortStream, folder, mId, tqparent_id, mKey, update_discover); } static bool compare_ascending = false; @@ -2931,9 +2931,9 @@ void KMHeaders::printThreadingTree() } for (int i = 0; i < (int)mItems.size(); ++i) { HeaderItem *item = mItems[i]; - int parentCacheId = item->sortCacheItem()->parent()?item->sortCacheItem()->parent()->id():0; - kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " parent: " << parentCacheId << endl; - kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " parent: " << item->sortCacheItem()->parent() << endl; + int tqparentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0; + kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << tqparentCacheId << endl; + kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " tqparent: " << item->sortCacheItem()->tqparent() << endl; } kdDebug(5006) << endl; } @@ -2962,8 +2962,8 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache for(int x = 0; x < mFolder->count(); x++) { // Only a lot items that are now toplevel - if ( sortCache[x]->parent() - && sortCache[x]->parent()->id() != -666 ) continue; + if ( sortCache[x]->tqparent() + && sortCache[x]->tqparent()->id() != -666 ) continue; KMMsgBase *mi = mFolder->getMsgBase(x); TQString subjMD5 = mi->strippedSubjectMD5(); if (subjMD5.isEmpty()) { @@ -2974,7 +2974,7 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache /* For each subject, keep a list of items with that subject * (stripped of prefixes) sorted by date. */ - if (!mSubjectLists.find(subjMD5)) + if (!mSubjectLists.tqfind(subjMD5)) mSubjectLists.insert(subjMD5, new TQPtrList<SortCacheItem>()); /* Insertion sort by date. These lists are expected to be very small. * Also, since the messages are roughly ordered by date in the store, @@ -2996,36 +2996,36 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache SortCacheItem* KMHeaders::findParent(SortCacheItem *item) { - SortCacheItem *parent = NULL; - if (!item) return parent; + SortCacheItem *tqparent = NULL; + if (!item) return tqparent; KMMsgBase *msg = mFolder->getMsgBase(item->id()); TQString replyToIdMD5 = msg->replyToIdMD5(); item->setImperfectlyThreaded(true); /* First, try if the message our Reply-To header points to * is available to thread below. */ if(!replyToIdMD5.isEmpty()) { - parent = mSortCacheItems[replyToIdMD5]; - if (parent) + tqparent = mSortCacheItems[replyToIdMD5]; + if (tqparent) item->setImperfectlyThreaded(false); } - if (!parent) { + if (!tqparent) { // If we dont have a replyToId, or if we have one and the // corresponding message is not in this folder, as happens // if you keep your outgoing messages in an OUTBOX, for // example, try the list of references, because the second // to last will likely be in this folder. replyToAuxIdMD5 - // tqcontains the second to last one. + // contains the second to last one. TQString ref = msg->replyToAuxIdMD5(); if (!ref.isEmpty()) - parent = mSortCacheItems[ref]; + tqparent = mSortCacheItems[ref]; } - return parent; + return tqparent; } SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) { - SortCacheItem *parent = NULL; - if (!item) return parent; + SortCacheItem *tqparent = NULL; + if (!item) return tqparent; KMMsgBase *msg = mFolder->getMsgBase(item->id()); @@ -3033,31 +3033,31 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) // This is necessary to make for example cvs commit mailing lists // work as expected without having to turn threading off alltogether. if (!msg->subjectIsPrefixed()) - return parent; + return tqparent; TQString replyToIdMD5 = msg->replyToIdMD5(); TQString subjMD5 = msg->strippedSubjectMD5(); if (!subjMD5.isEmpty() && mSubjectLists[subjMD5]) { - /* Iterate over the list of potential parents with the same + /* Iterate over the list of potential tqparents with the same * subject, and take the closest one by date. */ for (TQPtrListIterator<SortCacheItem> it2(*mSubjectLists[subjMD5]); it2.current(); ++it2) { KMMsgBase *mb = mFolder->getMsgBase((*it2)->id()); - if ( !mb ) return parent; + if ( !mb ) return tqparent; // make sure it's not ourselves if ( item == (*it2) ) continue; int delta = msg->date() - mb->date(); // delta == 0 is not allowed, to avoid circular threading // with duplicates. if (delta > 0 ) { - // Don't use parents more than 6 weeks older than us. + // Don't use tqparents more than 6 weeks older than us. if (delta < 3628899) - parent = (*it2); + tqparent = (*it2); break; } } } - return parent; + return tqparent; } bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) @@ -3077,7 +3077,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) bool error = false; //threaded cases - TQPtrList<SortCacheItem> unparented; + TQPtrList<SortCacheItem> untqparented; mImperfectlyThreadedList.clear(); //cleanup @@ -3117,8 +3117,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) mSortInfo.ascending = (compare_ascending = ascending); SortCacheItem *item; - unsigned long serNum, parentSerNum; - int id, len, parent, x; + unsigned long serNum, tqparentSerNum; + int id, len, tqparent, x; TQChar *tmp_qchar = 0; int tmp_qchar_len = 0; const int mFolderCount = mFolder->count(); @@ -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(&parentSerNum, sizeof(parentSerNum), 1, sortStream) || + !fread(&tqparentSerNum, sizeof(tqparentSerNum), 1, sortStream) || !fread(&len, sizeof(len), 1, sortStream)) { break; } @@ -3157,15 +3157,15 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) ++deleted_count; continue; } - if (parentSerNum < KMAIL_RESERVED) { - parent = (int)parentSerNum - KMAIL_RESERVED; + if (tqparentSerNum < KMAIL_RESERVED) { + tqparent = (int)tqparentSerNum - KMAIL_RESERVED; } else { - KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &parent); + KMMsgDict::instance()->getLocation(tqparentSerNum - KMAIL_RESERVED, &folder, &tqparent); if (folder != mFolder) - parent = -1; + tqparent = -1; } if ((id < 0) || (id >= mFolderCount) || - (parent < -2) || (parent >= mFolderCount)) { // sanity checking + (tqparent < -2) || (tqparent >= mFolderCount)) { // sanity checking kdDebug(5006) << "Whoa.1! " << __FILE__ << ":" << __LINE__ << endl; error = true; continue; @@ -3183,15 +3183,15 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) } else { item = sortCache[id] = new SortCacheItem(id, key, offset); } - if (threaded && parent != -2) { - if(parent == -1) { - unparented.append(item); + if (threaded && tqparent != -2) { + if(tqparent == -1) { + untqparented.append(item); mRoot->addUnsortedChild(item); } else { - if( ! sortCache[parent] ) { - sortCache[parent] = new SortCacheItem; + if( ! sortCache[tqparent] ) { + sortCache[tqparent] = new SortCacheItem; } - sortCache[parent]->addUnsortedChild(item); + sortCache[tqparent]->addUnsortedChild(item); } } else { if(x < sorted_count ) @@ -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) - unparented.append(sortCache[x]); + untqparented.append(sortCache[x]); else mRoot->addUnsortedChild(sortCache[x]); if(sortStream) @@ -3258,21 +3258,21 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) SHOW_TIMER(holes); } - // Make sure we've placed everything in parent/child relationship. All - // messages with a parent id of -1 in the sort file are reevaluated here. + // Make sure we've placed everything in tqparent/child relationship. All + // messages with a tqparent id of -1 in the sort file are reevaluated here. if (threaded) buildThreadingTree( sortCache ); TQPtrList<SortCacheItem> toBeSubjThreaded; - if (threaded && !unparented.isEmpty()) { + if (threaded && !untqparented.isEmpty()) { CREATE_TIMER(reparent); START_TIMER(reparent); - for(TQPtrListIterator<SortCacheItem> it(unparented); it.current(); ++it) { + for(TQPtrListIterator<SortCacheItem> it(untqparented); it.current(); ++it) { SortCacheItem *item = (*it); - SortCacheItem *parent = findParent( item ); - // If we have a parent, make sure it's not ourselves - if ( parent && (parent != (*it)) ) { - parent->addUnsortedChild((*it)); + SortCacheItem *tqparent = findParent( item ); + // If we have a tqparent, make sure it's not ourselves + if ( tqparent && (tqparent != (*it)) ) { + tqparent->addUnsortedChild((*it)); if(sortStream) (*it)->updateSortFile(sortStream, mFolder); } else { @@ -3289,10 +3289,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) buildSubjectThreadingTree( sortCache ); for(TQPtrListIterator<SortCacheItem> it(toBeSubjThreaded); it.current(); ++it) { SortCacheItem *item = (*it); - SortCacheItem *parent = findParentBySubject( item ); + SortCacheItem *tqparent = findParentBySubject( item ); - if ( parent ) { - parent->addUnsortedChild((*it)); + if ( tqparent ) { + tqparent->addUnsortedChild((*it)); if(sortStream) (*it)->updateSortFile(sortStream, mFolder); } else { @@ -3321,8 +3321,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort compare_SortCacheItem); - /* The sorted list now tqcontains all sorted children of this item, while - * the (aptly named) unsorted array tqcontains all as of yet unsorted + /* The sorted list now contains all sorted tqchildren of this item, while + * the (aptly named) unsorted array contains all as of yet unsorted * ones. It has just been qsorted, so it is in itself sorted. These two * sorted lists are now merged into one. */ for(TQPtrListIterator<SortCacheItem> it(*sorted); @@ -3348,16 +3348,16 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) /* Otherwise use the next item of the unsorted list */ new_kci = unsorted[unsorted_off++]; } - if(new_kci->item() || new_kci->parent() != i) //could happen if you reparent + if(new_kci->item() || new_kci->tqparent() != i) //could happen if you reparent continue; if(threaded && i->item()) { - // If the parent is watched or ignored, propagate that to it's - // children + // If the tqparent is watched or ignored, propagate that to it's + // tqchildren if (mFolder->getMsgBase(i->id())->isWatched()) - mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched); + mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched); if (mFolder->getMsgBase(i->id())->isIgnored()) - mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored); + mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusIgnored); khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key()); } else { khi = new HeaderItem(this, new_kci->id(), new_kci->key()); @@ -3406,7 +3406,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) sortCache[x]->setItem(mItems[sortCache[x]->id()] = khi); } // Add all imperfectly threaded items to a list, so they can be - // reevaluated when a new message arrives which might be a better parent. + // reevaluated when a new message arrives which might be a better tqparent. // Important for messages arriving out of order. if (threaded && sortCache[x]->isImperfectlyThreaded()) { mImperfectlyThreadedList.append(sortCache[x]->item()); @@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if ( sortStream ) fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; return true; @@ -3620,12 +3620,12 @@ TQValueList< TQ_UINT32 > KMHeaders::selectedVisibleSernums() TQListViewItemIterator it(this, TQListViewItemIterator::Selected|TQListViewItemIterator::Visible); while( it.current() ) { if ( it.current()->isSelected() && it.current()->isVisible() ) { - if ( it.current()->parent() && ( !it.current()->parent()->isOpen() ) ) { - // the item's parent is closed, don't traverse any more of this subtree - TQListViewItem * lastAncestorWithSiblings = it.current()->parent(); + if ( it.current()->tqparent() && ( !it.current()->tqparent()->isOpen() ) ) { + // the item's tqparent is closed, don't traverse any more of this subtree + TQListViewItem * lastAncestorWithSiblings = it.current()->tqparent(); // travel towards the root until we find an ancestor with siblings while ( ( lastAncestorWithSiblings->depth() > 0 ) && !lastAncestorWithSiblings->nextSibling() ) - lastAncestorWithSiblings = lastAncestorWithSiblings->parent(); + lastAncestorWithSiblings = lastAncestorWithSiblings->tqparent(); // move the iterator to that ancestor's next sibling it = TQListViewItemIterator( lastAncestorWithSiblings->nextSibling() ); continue; diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 4eddbdf46..e6bbe4223 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -10,7 +10,7 @@ using KMail::HeaderItem; #include <klistview.h> #include <kfoldertree.h> // for KPaintInfo -#include <kmmsgbase.h> // for KMMsgStatus +#include <kmmsgbase.h> // for KMMsgtqStatus #include <tqwidget.h> #include <tqstrlist.h> @@ -48,11 +48,12 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread }; class KMHeaders : public KListView { Q_OBJECT + TQ_OBJECT friend class ::KMail::HeaderItem; // For easy access to the pixmaps public: - KMHeaders(KMMainWidget *owner, TQWidget *parent=0, const char *name=0); + KMHeaders(KMMainWidget *owner, TQWidget *tqparent=0, const char *name=0); virtual ~KMHeaders(); /** A new folder has been selected update the list of headers shown @@ -76,13 +77,13 @@ public: /** Set all messages in the current thread to status @p status or toggle it, if specified. */ - virtual void setThreadStatus(KMMsgStatus status, bool toggle=false); + virtual void setThreadtqStatus(KMMsgtqStatus status, bool toggle=false); /* Set message status to read if it is new, or unread */ virtual void setMsgRead(int msgId); /** The following methods processes all selected messages. */ - virtual void setMsgStatus(KMMsgStatus status, bool toggle=false); + virtual void setMsgtqStatus(KMMsgtqStatus status, bool toggle=false); virtual void deleteMsg(); virtual void applyFiltersOnMsg(); virtual void undo(); @@ -113,7 +114,7 @@ public: /** Returns the sernums of all selected items. */ TQValueList<TQ_UINT32> selectedSernums(); - /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by + /** Returns the sernums of all visible (ie. items with expanded tqparent, not hidden by eg. the quick search) selected items. */ TQValueList<TQ_UINT32> selectedVisibleSernums(); @@ -284,13 +285,13 @@ public slots: virtual void ensureCurrentItemVisible(); - /** Select an item and if it is the parent of a closed thread, also - recursively select its children. */ + /** Select an item and if it is the tqparent of a closed thread, also + recursively select its tqchildren. */ virtual void setSelected(TQListViewItem *item, bool selected); /** Select several items by message index - * and if they are the parent of a closed thread, also - * recursively select their children. */ + * and if they are the tqparent of a closed thread, also + * recursively select their tqchildren. */ void setSelectedByIndex(TQValueList<int> items, bool selected); /** switch a column with the given id (see KPaintInfo enum) @@ -298,7 +299,7 @@ public slots: void slotToggleColumn(int id, int mode = -1); /** Provide information about number of messages in a folder */ - void setFolderInfoStatus(); + void setFolderInfotqStatus(); protected: static TQPixmap *pixNew, *pixUns, *pixDel, *pixRead, *pixRep, *pixSent, diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index b464913b6..0eb1a1166 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -11,7 +11,7 @@ #include "globalsettings.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmstartup.h" #include "index.h" #include "kmmainwin.h" @@ -98,8 +98,8 @@ static bool s_askingToGoOnline = false; /********************************************************************/ /* Constructor and destructor */ /********************************************************************/ -KMKernel::KMKernel (TQObject *parent, const char *name) : - DCOPObject("KMailIface"), TQObject(parent, name), +KMKernel::KMKernel (TQObject *tqparent, const char *name) : + DCOPObject("KMailIface"), TQObject(tqparent, name), mIdentityManager(0), mConfigureDialog(0), mContextMenuShown( false ), mWallet( 0 ) { @@ -146,11 +146,11 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : new Kpgp::Module(); - // register our own (libkdenetwork) utf-7 codec as long as Qt + // register our own (libkdenetwork) utf-7 codec as long as TQt // doesn't have it's own: if ( !TQTextCodec::codecForName("utf-7") ) { - kdDebug(5006) << "No Qt-native utf-7 codec found; registering QUtf7Codec from libkdenetwork" << endl; - (void) new QUtf7Codec(); + kdDebug(5006) << "No TQt-native utf-7 codec found; registering TQUtf7Codec from libkdenetwork" << endl; + (void) new TQUtf7Codec(); } // In the case of Japan. Japanese locale name is "eucjp" but @@ -214,11 +214,11 @@ 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 apparently executes the application with the original + // via dcop which aptqparently executes the application with the original // command line arguments and those include "-session ..." if // kmail/kontact was restored by session management if ( subj == "ession" ) { - subj = TQString::null; + subj = TQString(); calledWithSession = true; } else @@ -375,7 +375,7 @@ void KMKernel::openReader( bool onlyCheck ) if ( activate ) { // Activate window - doing this instead of KWin::activateWindow(mWin->winId()); // so that it also works when called from KMailApplication::newInstance() -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY KStartupInfo::setNewStartupId( mWin, kapp->startupId() ); #endif } @@ -425,7 +425,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, for ( QCStringList::ConstIterator it = customHeaders.begin() ; it != customHeaders.end() ; ++it ) if ( !(*it).isEmpty() ) { - const int pos = (*it).find( ':' ); + const int pos = (*it).tqfind( ':' ); if ( pos > 0 ) { TQCString header, value; @@ -445,7 +445,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, cWin->show(); // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY KStartupInfo::setNewStartupId( cWin, kapp->startupId() ); #endif } @@ -592,7 +592,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, cWin->show(); // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY KStartupInfo::setNewStartupId( cWin, kapp->startupId() ); #endif } else { @@ -606,7 +606,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, void KMKernel::setDefaultTransport( const TQString & transport ) { TQStringList availTransports = KMail::TransportManager::transportNames(); - TQStringList::const_iterator it = availTransports.find( transport ); + TQStringList::const_iterator it = availTransports.tqfind( transport ); if ( it == availTransports.end() ) { kdWarning() << "The transport you entered is not available" << endl; return; @@ -638,7 +638,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc, cWin->show(); // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY KStartupInfo::setNewStartupId( cWin, kapp->startupId() ); #endif } @@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData ) return 1; } -KMMsgStatus KMKernel::strToStatus(const TQString &flags) +KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags) { - KMMsgStatus status = 0; + KMMsgtqStatus status = 0; if (!flags.isEmpty()) { for (uint n = 0; n < flags.length() ; n++) { switch (flags[n]) { @@ -938,7 +938,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, } int k = mAddMessageMsgIds.findIndex( msgId ); - //fprintf(stderr,"find %s = %d\n",(const char *) msgId,k); + //fprintf(stderr,"tqfind %s = %d\n",(const char *) msgId,k); if ( k == -1 ) { if ( !msgId.isEmpty() ) { @@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, } if ( !MsgStatusFlags.isEmpty() ) { - KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + KMMsgtqStatus status = strTotqStatus(MsgStatusFlags); + if (status) msg->setqStatus(status); } int index; @@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, int index; if( !MsgStatusFlags.isEmpty() ) { - KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + KMMsgtqStatus status = strTotqStatus(MsgStatusFlags); + if (status) msg->setqStatus(status); } if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) { @@ -1156,7 +1156,7 @@ bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ ) KMReaderMainWin *win = new KMReaderMainWin( false, false ); KMMessage *newMessage = new KMMessage( *msg ); - newMessage->setParent( msg->parent() ); + newMessage->setParent( msg->tqparent() ); newMessage->setMsgSerNum( msg->getMsgSerNum() ); newMessage->setReadyToShow( true ); win->showMsg( GlobalSettings::self()->overrideCharacterEncoding(), newMessage ); @@ -1176,11 +1176,11 @@ TQString KMKernel::getFrom( TQ_UINT32 serialNumber ) KMFolder *folder = 0; KMMsgDict::instance()->getLocation(serialNumber, &folder, &idx); if (!folder || (idx == -1)) - return TQString::null; + return TQString(); KMFolderOpener openFolder(folder, "getFrom"); KMMsgBase *msgBase = folder->getMsgBase(idx); if (!msgBase) - return TQString::null; + return TQString(); bool unGet = !msgBase->isMessage(); KMMessage *msg = folder->getMsg(idx); TQString result = msg->from(); @@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline ); - BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); + BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); } @@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online ); - BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); + BroadcastqStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); if ( kmkernel->msgSender()->sendImmediate() ) { @@ -1431,7 +1431,7 @@ void KMKernel::initFolders(KConfig* cfg) the_inboxFolder->setSystemFolder(true); if ( the_inboxFolder->userWhoField().isEmpty() ) - the_inboxFolder->setUserWhoField( TQString::null ); + the_inboxFolder->setUserWhoField( TQString() ); // inboxFolder->open(); the_outboxFolder = the_folderMgr->findOrCreate(cfg->readEntry("outboxFolder", I18N_NOOP("outbox"))); @@ -1442,7 +1442,7 @@ void KMKernel::initFolders(KConfig* cfg) the_outboxFolder->setSystemFolder(true); if ( the_outboxFolder->userWhoField().isEmpty() ) - the_outboxFolder->setUserWhoField( TQString::null ); + the_outboxFolder->setUserWhoField( TQString() ); /* Nuke the oubox's index file, to make sure that no ghost messages are in * it from a previous crash. Ghost messages happen in the outbox because it * the only folder where messages enter and leave within 5 seconds, which is @@ -1459,7 +1459,7 @@ void KMKernel::initFolders(KConfig* cfg) } the_sentFolder->setSystemFolder(true); if ( the_sentFolder->userWhoField().isEmpty() ) - the_sentFolder->setUserWhoField( TQString::null ); + the_sentFolder->setUserWhoField( TQString() ); // the_sentFolder->open(); the_trashFolder = the_folderMgr->findOrCreate(cfg->readEntry("trashFolder", I18N_NOOP("trash"))); @@ -1468,7 +1468,7 @@ void KMKernel::initFolders(KConfig* cfg) } the_trashFolder->setSystemFolder( true ); if ( the_trashFolder->userWhoField().isEmpty() ) - the_trashFolder->setUserWhoField( TQString::null ); + the_trashFolder->setUserWhoField( TQString() ); // the_trashFolder->open(); the_draftsFolder = the_folderMgr->findOrCreate(cfg->readEntry("draftsFolder", I18N_NOOP("drafts"))); @@ -1477,7 +1477,7 @@ void KMKernel::initFolders(KConfig* cfg) } the_draftsFolder->setSystemFolder( true ); if ( the_draftsFolder->userWhoField().isEmpty() ) - the_draftsFolder->setUserWhoField( TQString::null ); + the_draftsFolder->setUserWhoField( TQString() ); the_draftsFolder->open("kmkernel"); the_templatesFolder = @@ -1488,7 +1488,7 @@ void KMKernel::initFolders(KConfig* cfg) } the_templatesFolder->setSystemFolder( true ); if ( the_templatesFolder->userWhoField().isEmpty() ) - the_templatesFolder->setUserWhoField( TQString::null ); + the_templatesFolder->setUserWhoField( TQString() ); the_templatesFolder->open("kmkernel"); } @@ -1528,7 +1528,7 @@ void KMKernel::init() recreateCorruptIndexFiles(); the_searchFolderMgr = new KMFolderMgr(locateLocal("data","kmail/search"), KMSearchDir); - KMFolder *lsf = the_searchFolderMgr->find( i18n("Last Search") ); + KMFolder *lsf = the_searchFolderMgr->tqfind( i18n("Last Search") ); if (lsf) the_searchFolderMgr->remove( lsf ); @@ -1613,7 +1613,7 @@ void KMKernel::cleanupImapFolders() KMFolderNode *node = the_imapFolderMgr->dir().first(); while (node) { - if (node->isDir() || ((acct = the_acctMgr->find(node->id())) + if (node->isDir() || ((acct = the_acctMgr->tqfind(node->id())) && ( acct->type() == "imap" )) ) { node = the_imapFolderMgr->dir().next(); @@ -1629,7 +1629,7 @@ void KMKernel::cleanupImapFolders() node = the_dimapFolderMgr->dir().first(); while (node) { - if (node->isDir() || ((acct = the_acctMgr->find(node->id())) + if (node->isDir() || ((acct = the_acctMgr->tqfind(node->id())) && ( acct->type() == "cachedimap" )) ) { node = the_dimapFolderMgr->dir().next(); @@ -1665,7 +1665,7 @@ void KMKernel::cleanupImapFolders() if (acct->type() != "cachedimap" ) continue; - KMFolder* fld = the_dimapFolderMgr->find(TQString::number(acct->id())); + KMFolder* fld = the_dimapFolderMgr->tqfind(TQString::number(acct->id())); if( fld ) cfld = static_cast<KMFolderCachedImap*>( fld->storage() ); if (cfld == 0) { @@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles() if ( !folder || folder->isDir() || folder->isOpened() ) continue; KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() ); - if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) { + if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) { foldersWithBrokenIndex.append( index ); } } @@ -1880,7 +1880,7 @@ bool KMKernel::transferMail( TQString & destinationDir ) "%1 now uses the <i>%5</i> folder for " "its messages.<p>" "%2 can move the contents of <i>%6<i> into this folder for " - "you, though this may tqreplace any existing files with " + "you, though this may replace any existing files with " "the same name in <i>%7</i>.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) @@ -1933,7 +1933,7 @@ void KMKernel::ungrabPtrKb(void) // Message handler -void KMKernel::kmailMsgHandler(QtMsgType aType, const char* aMsg) +void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg) { static int recurse=-1; @@ -2016,7 +2016,7 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data) { // send the data in 64 KB chunks const int MAX_CHUNK_SIZE = 64*1024; - TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job); + TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.tqfind(job); assert(it != mPutJobs.end()); int remainingBytes = (*it).data.size() - (*it).offset; if( remainingBytes > MAX_CHUNK_SIZE ) @@ -2039,14 +2039,14 @@ void KMKernel::slotDataReq(KIO::Job *job, TQByteArray &data) void KMKernel::slotResult(KIO::Job *job) { - TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.find(job); + TQMap<KIO::Job*, putData>::Iterator it = mPutJobs.tqfind(job); assert(it != mPutJobs.end()); if (job->error()) { if (job->error() == KIO::ERR_FILE_ALREADY_EXIST) { if (KMessageBox::warningContinueCancel(0, - i18n("File %1 exists.\nDo you want to tqreplace it?") + i18n("File %1 exists.\nDo you want to replace it?") .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) byteArrayToRemoteFile((*it).data, (*it).url, true); @@ -2119,7 +2119,7 @@ bool KMKernel::registerSystemTrayApplet( const KSystemTray* applet ) bool KMKernel::unregisterSystemTrayApplet( const KSystemTray* applet ) { TQValueList<const KSystemTray*>::iterator it = - systemTrayApplets.find( applet ); + systemTrayApplets.tqfind( applet ); if ( it != systemTrayApplets.end() ) { systemTrayApplets.remove( it ); return true; @@ -2464,7 +2464,7 @@ Wallet *KMKernel::wallet() { if ( !Wallet::isEnabled() || walletOpenFailed ) return 0; - // find an appropriate parent window for the wallet dialog + // find an appropriate tqparent window for the wallet dialog WId window = 0; if ( tqApp->activeWindow() ) window = tqApp->activeWindow()->winId(); diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 3eb19f651..871582ace 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -28,7 +28,7 @@ namespace KWallet { class Wallet; } -/** The KMail namespace tqcontains classes used for KMail. +/** The KMail namespace contains classes used for KMail. * This is to keep them out of the way from all the other * un-namespaced classes in libs and the rest of PIM. */ @@ -83,9 +83,10 @@ class ConfigureDialog; class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface { Q_OBJECT + TQ_OBJECT public: - KMKernel (TQObject *parent=0, const char *name=0); + KMKernel (TQObject *tqparent=0, const char *name=0); ~KMKernel (); /** dcop callable stuff */ @@ -262,12 +263,12 @@ public: void quit(); /** * Returns true if the transfer was successful, otherwise false. In any case - * destinationDir tqcontains the path to the current mail storage when the + * destinationDir contains the path to the current mail storage when the * method returns. */ bool transferMail( TQString & destinationDir ); void ungrabPtrKb(void); - void kmailMsgHandler(QtMsgType aType, const char* aMsg); + void kmailMsgHandler(TQtMsgType aType, const char* aMsg); bool doSessionManagement(); bool firstInstance() { return the_firstInstance; } void setFirstInstance(bool value) { the_firstInstance = value; } @@ -441,7 +442,7 @@ signals: private: void openReader( bool onlyCheck ); - KMMsgStatus strToStatus(const TQString &flags); + KMMsgtqStatus strTotqStatus(const TQString &flags); KMFolder *currentFolder(); KMFolder *the_inboxFolder; diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 0cd5aec55..de50cd782 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -30,8 +30,8 @@ KMLineEdit::KMLineEdit(bool useCompletion, - TQWidget *parent, const char *name) - : KPIM::AddresseeLineEdit(parent,useCompletion,name) + TQWidget *tqparent, const char *name) + : KPIM::AddresseeLineEdit(tqparent,useCompletion,name) { allowSemiColonAsSeparator( GlobalSettings::allowSemicolonAsAddressSeparator() ); } @@ -108,7 +108,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) KABC::Addressee::List list; for ( it = urls.begin(); it != urls.end(); ++it ) { - // First, let's deal with mailto Urls. The path() part tqcontains the + // First, let's deal with mailto Urls. The path() part contains the // email-address. if ( (*it).protocol() == "mailto" ) { KABC::Addressee addressee; @@ -210,8 +210,8 @@ void KMLineEdit::loadContacts() KMLineEditSpell::KMLineEditSpell(bool useCompletion, - TQWidget *parent, const char *name) - : KMLineEdit(useCompletion,parent,name) + TQWidget *tqparent, const char *name) + : KMLineEdit(useCompletion,tqparent,name) { } diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h index 46d4d0dbc..70c8316fe 100644 --- a/kmail/kmlineeditspell.h +++ b/kmail/kmlineeditspell.h @@ -12,8 +12,9 @@ class TQPopupMenu; class KMLineEdit : public KPIM::AddresseeLineEdit { Q_OBJECT + TQ_OBJECT public: - KMLineEdit(bool useCompletion, TQWidget *parent = 0, + KMLineEdit(bool useCompletion, TQWidget *tqparent = 0, const char *name = 0); signals: @@ -21,7 +22,7 @@ signals: void focusDown(); protected: - // Inherited. Always called by the parent when this widget is created. + // Inherited. Always called by the tqparent when this widget is created. virtual void loadContacts(); virtual void keyPressEvent(TQKeyEvent*); @@ -40,8 +41,9 @@ private: class KMLineEditSpell : public KMLineEdit { Q_OBJECT + TQ_OBJECT public: - KMLineEditSpell(bool useCompletion, TQWidget *parent = 0, + KMLineEditSpell(bool useCompletion, TQWidget *tqparent = 0, const char *name = 0); void highLightWord( unsigned int length, unsigned int pos ); void spellCheckDone( const TQString &s ); diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index a3363e4fc..e573af2a8 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -46,7 +46,7 @@ #include "globalsettings.h" #include "kcursorsaver.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "kmfoldermgr.h" #include "kmfolderdia.h" #include "accountmanager.h" @@ -135,10 +135,10 @@ TQValueList<KMMainWidget*>* KMMainWidget::s_mainWidgetList = 0; static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd; //----------------------------------------------------------------------------- -KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, +KMMainWidget::KMMainWidget(TQWidget *tqparent, const char *name, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KConfig* config ) : - TQWidget(parent, name), + TQWidget(tqparent, name), mFavoritesCheckMailAction( 0 ), mFavoriteFolderView( 0 ), mFolderView( 0 ), @@ -238,7 +238,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, this, TQT_SLOT(slotFolderRemoved(KMFolder*))); connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); + this, TQT_SLOT( slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -559,9 +559,9 @@ void KMMainWidget::createWidgets(void) if ( mLongFolderList ) { // superior splitter: folder tree vs. rest // inferior splitter: headers vs. message vs. mime tree - mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" ); + mPanner1 = new TQSplitter( TQt::Horizontal, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); - Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal; + Qt::Orientation orientation = mReaderWindowBelow ? TQt::Vertical : TQt::Horizontal; mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); mPanner2->setChildrenCollapsible( false ); @@ -570,10 +570,10 @@ void KMMainWidget::createWidgets(void) } else /* !mLongFolderList */ { // superior splitter: ( folder tree + headers ) vs. message vs. mime // inferior splitter: folder tree vs. headers - mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" ); + mPanner1 = new TQSplitter( TQt::Vertical, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); mPanner1->setChildrenCollapsible( false ); - mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" ); + mPanner2 = new TQSplitter( TQt::Horizontal, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); headerParent = mFolderViewParent = mPanner2; mimeParent = messageParent = mPanner1; @@ -637,7 +637,7 @@ void KMMainWidget::createWidgets(void) mMsgActions->setMessageView( mMsgView ); } - connect(mMsgView, TQT_SIGNAL(tqreplaceMsgByUnencryptedVersion()), + connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()), this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion())); connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); @@ -677,7 +677,7 @@ void KMMainWidget::createWidgets(void) action->plugAccel( actionCollection()->kaccel() ); // create list of folders - mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); + mFolderViewSplitter = new TQSplitter( TQt::Vertical, mFolderViewParent ); mFolderViewSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) @@ -939,7 +939,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, for ( TQStringList::const_iterator it = keys.begin(); it != keys.end(); ++it ) { - kdDebug(5006) << newInFolder.find( *it ).data() << " new message(s) in " + kdDebug(5006) << newInFolder.tqfind( *it ).data() << " new message(s) in " << *it << endl; KMFolder *folder = kmkernel->findFolderById( *it ); @@ -949,7 +949,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( GlobalSettings::self()->verboseNewMailNotification() ) { summary += "<br>" + i18n( "1 new message in %1", "%n new messages in %1", - newInFolder.find( *it ).data() ) + newInFolder.tqfind( *it ).data() ) .arg( folder->prettyURL() ); } } @@ -1096,7 +1096,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) { KMFolder* folder = folderItem->folder(); KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() ); - KMFolderDialog props( folder, folder->parent(), folderTree, + KMFolderDialog props( folder, folder->tqparent(), folderTree, i18n("Properties of Folder %1").arg( folder->label() ) ); props.exec(); updateFolderMenu(); @@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder() if (mMsgView) mMsgView->clearCache(); if ( !isTrash ) - BroadcasStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash")); + BroadcastqStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash")); updateMessageActions(); @@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder() KCursorSaver busy(KBusyPtr::busy()); mFolder->compact( KMFolder::CompactNow ); // setCurrentItemByIndex will override the statusbar message, so save/restore it - TQString statusMsg = BroadcasStatus::instance()->statusMsg(); + TQString statusMsg = BroadcastqStatus::instance()->statusMsg(); mHeaders->setCurrentItemByIndex(idx); - BroadcasStatus::instance()->seStatusMsg( statusMsg ); + BroadcastqStatus::instance()->seStatusMsg( statusMsg ); } } @@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters() //----------------------------------------------------------------------------- void KMMainWidget::slotCheckVacation() { - updateVactionScripStatus( false ); + updateVactionScriptqStatus( false ); if ( !kmkernel->askToGoOnline() ) return; Vacation *vac = new Vacation( this, true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation() return; mVacation = new Vacation( this ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); if ( mVacation->isUsable() ) { connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); } else { @@ -1763,7 +1763,7 @@ void KMMainWidget::slotDebugSieve() void KMMainWidget::slotStartCertManager() { KProcess certManagerProc; // save to create on the heap, since - // there is no parent + // there is no tqparent certManagerProc << "kleopatra"; if( !certManagerProc.start( KProcess::DontCare ) ) @@ -1903,10 +1903,10 @@ void KMMainWidget::slotSaveAttachments() saveCommand->start(); } -void KMMainWidget::slotOnlineStatus() +void KMMainWidget::slotOnlinetqStatus() { // KMKernel will emit a signal when we toggle the network state that is caught by - // KMMainWidget::slotUpdateOnlineStatus to update our GUI + // KMMainWidget::slotUpdateOnlinetqStatus to update our GUI if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) { // if online; then toggle and set it offline. kmkernel->stopNetworkJobs(); @@ -1916,7 +1916,7 @@ void KMMainWidget::slotOnlineStatus() } } -void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) +void KMMainWidget::slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) { if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) actionCollection()->action( "online_status" )->setText( i18n("Work Offline") ); @@ -2120,7 +2120,7 @@ void KMMainWidget::showOfflinePage() //----------------------------------------------------------------------------- void KMMainWidget::slotMsgSelected(KMMessage *msg) { - if ( msg && msg->parent() && !msg->isComplete() ) + if ( msg && msg->tqparent() && !msg->isComplete() ) { if ( msg->transferInProgress() ) return; @@ -2131,7 +2131,7 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) disconnect( mJob, 0, mMsgView, 0 ); delete mJob; } - mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, + mJob = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0, "STRUCTURE", mMsgView->attachmentStrategy() ); connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)), mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*))); @@ -2165,7 +2165,7 @@ void KMMainWidget::slotSelectFolder(KMFolder* folder) //----------------------------------------------------------------------------- void KMMainWidget::slotSelectMessage(KMMessage* msg) { - int idx = mFolder->find(msg); + int idx = mFolder->tqfind(msg); if (idx != -1) { mHeaders->setCurrentMsg(idx); if (mMsgView) @@ -2189,7 +2189,7 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() { TQString msgId( oldMsg->msgId() ); TQString prefix("DecryptedMsg."); - int oldIdx = msgId.find(prefix, 0, false); + int oldIdx = msgId.tqfind(prefix, 0, false); if( -1 == oldIdx ) { int leftAngle = msgId.findRev( '<' ); msgId = msgId.insert( (-1 == leftAngle) ? 0 : ++leftAngle, prefix ); @@ -2210,12 +2210,12 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() kdDebug(5006) << "KMMainWidget - adding unencrypted message to folder" << endl; mFolder->addMsg( newMsg ); /* Figure out its index in the folder for selecting. This must be count()-1, - * since we append. Be safe and do find, though, just in case. */ - int newMsgIdx = mFolder->find( newMsg ); + * since we append. Be safe and do tqfind, though, just in case. */ + int newMsgIdx = mFolder->tqfind( newMsg ); Q_ASSERT( newMsgIdx != -1 ); /* we need this unget, to have the message displayed correctly initially */ mFolder->unGetMsg( newMsgIdx ); - int idx = mFolder->find( oldMsg ); + int idx = mFolder->tqfind( oldMsg ); Q_ASSERT( idx != -1 ); /* only select here, so the old one is not un-Gotten before, which would * render the pointer we hold invalid so that find would fail */ @@ -2239,37 +2239,37 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusNew() { - mHeaders->setThreadStatus(KMMsgStatusNew); + mHeaders->setThreadtqStatus(KMMsgStatusNew); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusUnread() { - mHeaders->setThreadStatus(KMMsgStatusUnread); + mHeaders->setThreadtqStatus(KMMsgStatusUnread); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusFlag() { - mHeaders->setThreadStatus(KMMsgStatusFlag, true); + mHeaders->setThreadtqStatus(KMMsgStatusFlag, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusRead() { - mHeaders->setThreadStatus(KMMsgStatusRead); + mHeaders->setThreadtqStatus(KMMsgStatusRead); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusTodo() { - mHeaders->setThreadStatus(KMMsgStatusTodo, true); + mHeaders->setThreadtqStatus(KMMsgStatusTodo, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusWatched() { - mHeaders->setThreadStatus(KMMsgStatusWatched, true); + mHeaders->setThreadtqStatus(KMMsgStatusWatched, true); if (mWatchThreadAction->isChecked()) { mIgnoreThreadAction->setChecked(false); } @@ -2278,7 +2278,7 @@ void KMMainWidget::slotSetThreadStatusWatched() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusIgnored() { - mHeaders->setThreadStatus(KMMsgStatusIgnored, true); + mHeaders->setThreadtqStatus(KMMsgStatusIgnored, true); if (mIgnoreThreadAction->isChecked()) { mWatchThreadAction->setChecked(false); } @@ -2316,8 +2316,8 @@ void KMMainWidget::slotDisplayCurrentMessage() void KMMainWidget::slotMsgActivated(KMMessage *msg) { if ( !msg ) return; - if ( msg->parent() && !msg->isComplete() ) { - FolderJob *job = msg->parent()->createJob( msg ); + if ( msg->tqparent() && !msg->isComplete() ) { + FolderJob *job = msg->tqparent()->createJob( msg ); connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), TQT_SLOT( slotMsgActivated( KMMessage* ) ) ); job->start(); @@ -2340,7 +2340,7 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg) : reader.readBoolEntry( "useFixedFont", false ); win->setUseFixedFont( useFixedFont ); KMMessage *newMessage = new KMMessage(*msg); - newMessage->setParent( msg->parent() ); + newMessage->setParent( msg->tqparent() ); newMessage->setMsgSerNum( msg->getMsgSerNum() ); newMessage->setReadyToShow( true ); win->showMsg( overrideEncoding(), newMessage ); @@ -2689,8 +2689,8 @@ void KMMainWidget::setupActions() (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, this, TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); - (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, this, - TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); + (void) new KAction( i18n("Online tqStatus (unknown)"), "online_status", 0, this, + TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status"); KActionMenu *sendActionMenu = new KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -2703,7 +2703,7 @@ void KMMainWidget::setupActions() KAction *act; //----- Tools menu - if (parent()->inherits("KMMainWin")) { + if (tqparent()->inherits("KMMainWin")) { act = new KAction( i18n("&Address Book..."), "contents", 0, this, TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (KStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); @@ -2767,10 +2767,10 @@ void KMMainWidget::setupActions() TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); - (void) new KAction( i18n("&Find Messages..."), "mail_find", Key_S, this, + (void) new KAction( i18n("&Find Messages..."), "mail_tqfind", Key_S, this, TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); - mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), this, + mFindInMessageAction = new KAction( i18n("&Find in Message..."), "tqfind", KStdAccel::shortcut(KStdAccel::Find), this, TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), this, @@ -3029,25 +3029,25 @@ void KMMainWidget::setupActions() mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total size of messages in folders.") ); - (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString::null, + (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), i18n("Expand the current thread") ), Key_Period, this, TQT_SLOT(slotExpandThread()), actionCollection(), "expand_thread" ); - (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString::null, + (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), i18n("Collapse the current thread") ), Key_Comma, this, TQT_SLOT(slotCollapseThread()), actionCollection(), "collapse_thread" ); - (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString::null, + (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(), i18n("Expand all threads in the current folder") ), CTRL+Key_Period, this, TQT_SLOT(slotExpandAllThreads()), actionCollection(), "expand_all_threads" ); - (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString::null, + (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(), i18n("Collapse all threads in the current folder") ), CTRL+Key_Comma, this, TQT_SLOT(slotCollapseAllThreads()), @@ -3063,7 +3063,7 @@ void KMMainWidget::setupActions() dukeOfMonmoth->plugAccel( actionCollection()->kaccel() ); //----- Go Menu - new KAction( KGuiItem( i18n("&Next Message"), TQString::null, + new KAction( KGuiItem( i18n("&Next Message"), TQString(), i18n("Go to the next message") ), "N;Right", this, TQT_SLOT(slotNextMessage()), actionCollection(), "go_next_message" ); @@ -3075,13 +3075,13 @@ void KMMainWidget::setupActions() actionCollection(), "go_next_unread_message" ); /* ### needs better support from folders: - new KAction( KGuiItem( i18n("Next &Important Message"), TQString::null, + new KAction( KGuiItem( i18n("Next &Important Message"), TQString(), i18n("Go to the next important message") ), 0, this, TQT_SLOT(slotNextImportantMessage()), actionCollection(), "go_next_important_message" ); */ - new KAction( KGuiItem( i18n("&Previous Message"), TQString::null, + new KAction( KGuiItem( i18n("&Previous Message"), TQString(), i18n("Go to the previous message") ), "P;Left", this, TQT_SLOT(slotPrevMessage()), actionCollection(), "go_prev_message" ); @@ -3093,14 +3093,14 @@ void KMMainWidget::setupActions() actionCollection(), "go_prev_unread_message" ); /* needs better support from folders: - new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString::null, + new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), i18n("Go to the previous important message") ), 0, this, TQT_SLOT(slotPrevImportantMessage()), actionCollection(), "go_prev_important_message" ); */ KAction *action = - new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString::null, + new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), i18n("Go to the next folder with unread messages") ), ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()), actionCollection(), "go_next_unread_folder" ); @@ -3109,7 +3109,7 @@ void KMMainWidget::setupActions() action->setShortcut( shortcut ); action = - new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString::null, + new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString(), i18n("Go to the previous folder with unread messages") ), ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()), actionCollection(), "go_prev_unread_folder" ); @@ -3117,7 +3117,7 @@ void KMMainWidget::setupActions() shortcut.append( KKey( CTRL+Key_Minus ) ); action->setShortcut( shortcut ); - new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString::null, + new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString(), i18n("Go to the next unread text"), i18n("Scroll down current message. " "If at end of current message, " @@ -3126,7 +3126,7 @@ void KMMainWidget::setupActions() actionCollection(), "go_next_unread_text" ); //----- Settings Menu - mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString::null, + mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString(), 0, this, TQT_SLOT(slotToggleShowQuickSearch()), actionCollection(), "show_quick_search"); mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() ); @@ -3328,7 +3328,7 @@ void KMMainWidget::updateMessageActions() for ( TQPtrListIterator<TQListViewItem> it( selectedItems ) ; it.current() ; ++ it ) { TQListViewItem * item = *it; - if ( item->parent()==0 && item->childCount()==0 ) { + if ( item->tqparent()==0 && item->childCount()==0 ) { allSelectedInCommonThread = false; break; } @@ -3339,8 +3339,8 @@ void KMMainWidget::updateMessageActions() } TQListViewItem *curItemParent = mHeaders->currentItem(); - bool parent_thread = 0; - if ( curItemParent && curItemParent->firstChild() != 0 ) parent_thread = 1; + bool tqparent_thread = 0; + if ( curItemParent && curItemParent->firstChild() != 0 ) tqparent_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 || parent_thread ) && !kmkernel->folderIsTemplates( mFolder ) ); + mForwardDigestAction->setEnabled( ( count > 1 || tqparent_thread ) && !kmkernel->folderIsTemplates( mFolder ) ); forwardMenu()->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder )); @@ -3402,7 +3402,7 @@ void KMMainWidget::updateMessageActions() actionCollection()->action( "go_prev_unread_message" )->setEnabled( enable_goto_unread ); actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); - slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); + slotUpdateOnlinetqStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); if (action( "edit_undo" )) action( "edit_undo" )->setEnabled( mHeaders->canUndo() ); @@ -3578,7 +3578,7 @@ void KMMainWidget::slotShowStartupFolder() void KMMainWidget::slotShowTip() { - KTipDialog::showTip( this, TQString::null, true ); + KTipDialog::showTip( this, TQString(), true ); } //----------------------------------------------------------------------------- @@ -3587,7 +3587,7 @@ void KMMainWidget::slotChangeCaption(TQListViewItem * i) if ( !i ) return; // set the caption to the current full path TQStringList names; - for ( TQListViewItem * item = i ; item ; item = item->parent() ) + for ( TQListViewItem * item = i ; item ; item = item->tqparent() ) names.prepend( item->text(0) ); emit captionChangeRequest( names.join( "/" ) ); } @@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates() "Removed %n duplicate messages.", numDuplicates ); else msg = i18n("No duplicate messages found."); - BroadcasStatus::instance()->seStatusMsg( msg ); + BroadcastqStatus::instance()->seStatusMsg( msg ); } @@ -3993,20 +3993,20 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch() assert( mSearchWin ); KMSearchPattern pattern; pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) ); - int status = mQuickSearchLine->currenStatus(); + int status = mQuickSearchLine->currentqStatus(); if ( status != 0 ) { - pattern.append( new KMSearchRuleStatus( status ) ); + pattern.append( new KMSearchRuletqStatus( status ) ); } mSearchWin->setSearchPattern( pattern ); } -void KMMainWidget::updateVactionScripStatus(bool active) +void KMMainWidget::updateVactionScriptqStatus(bool active) { mVacationIndicatorActive = active; if ( active ) { mVacationScriptIndicator->setText( i18n("Out of office reply active") ); - mVacationScriptIndicator->setPaletteBackgroundColor( Qt::yellow ); - mVacationScriptIndicator->setCursor( TQCursor( Qt::PointingHandCursor ) ); + mVacationScriptIndicator->setPaletteBackgroundColor( TQt::yellow ); + mVacationScriptIndicator->setCursor( TQCursor( TQt::PointingHandCursor ) ); mVacationScriptIndicator->show(); } else { mVacationScriptIndicator->hide(); diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 824f2aaab..1bb3ee067 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -79,12 +79,13 @@ namespace KMail { typedef TQMap<int,KMFolder*> KMMenuToFolder; -class KDE_EXPORT KMMainWidget : public QWidget +class KDE_EXPORT KMMainWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KMMainWidget(TQWidget *parent, const char *name, + KMMainWidget(TQWidget *tqparent, const char *name, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KConfig*config = KMKernel::config() ); @@ -178,7 +179,7 @@ public: void setupForwardingActionsList(); KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; } - void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); } + void updateVactionScriptqStatus() { updateVactionScriptqStatus( mVacationIndicatorActive ); } public slots: void slotMoveMsgToFolder( KMFolder *dest); @@ -261,7 +262,7 @@ protected: KActionCollection * actionCollection() const { return mActionCollection; } - /** @return the correct config dialog depending on whether the parent of the mainWidget + /** @return the correct config dialog depending on whether the tqparent of the mainWidget * is a KPart or a KMMainWindow. When dealing with geometries, use this pointer */ KConfig * config(); @@ -338,8 +339,8 @@ protected slots: void slotToggleSizeColumn(); void slotSendQueued(); void slotSendQueuedVia( int item ); - void slotOnlineStatus(); - void slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ); + void slotOnlinetqStatus(); + void slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ); void slotMsgPopup(KMMessage &msg, const KURL &aUrl, const TQPoint&); void slotMarkAll(); void slotMemInfo(); @@ -446,7 +447,7 @@ private: private slots: void slotRequestFullSearchFromQuickSearch(); - void updateVactionScripStatus( bool active ); + void updateVactionScriptqStatus( bool active ); private: // Message actions @@ -516,9 +517,9 @@ private: int mMessageStatusId; TQValueList<int> mPanner1Sep, mPanner2Sep; KURL mUrlCurrent; - QPopupMenu *mActMenu; + TQPopupMenu *mActMenu; TQPopupMenu *mSendMenu; - QPopupMenu *mFileMenu; + TQPopupMenu *mFileMenu; bool mLongFolderList; diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index 503c9a06b..21879c55e 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *) applyMainWindowSettings(KMKernel::config(), "Main Window"); - connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), + connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), this, TQT_SLOT( displayStatusMsg(const TQString&) ) ); connect(kmkernel, TQT_SIGNAL(configChanged()), diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index 201c3824b..006020e82 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -35,11 +35,12 @@ using KPIM::ProgressDialog; class KMMainWin : public KMainWindow { Q_OBJECT + TQ_OBJECT public: // the main window needs to have a name since else restoring the window // settings by kwin doesn't work - KMMainWin(TQWidget *parent = 0); + KMMainWin(TQWidget *tqparent = 0); virtual ~KMMainWin(); KMMainWidget *mainKMWidget() const { return mKMMainWidget; }; StatusbarProgressWidget* progressWidget() const { return mLittleProgress; } diff --git a/kmail/kmmainwin.rc b/kmail/kmmainwin.rc index 955dabad2..899d03c58 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_invalidate_imap_cache"/> + <Action name="file_tqinvalidate_imap_cache"/> <Action name="empty_trash"/> <Separator/> <Action name="online_status" /> diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 3af9a252a..6501c9e5e 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -97,7 +97,7 @@ KMMessage::KMMessage(DwMessage* aMsg) } //----------------------------------------------------------------------------- -KMMessage::KMMessage(KMFolder* parent): KMMsgBase(parent) +KMMessage::KMMessage(KMFolder* tqparent): KMMsgBase(tqparent) { init(); } @@ -110,7 +110,7 @@ KMMessage::KMMessage(KMMsgInfo& msgInfo): KMMsgBase() // now overwrite a few from the msgInfo mMsgSize = msgInfo.msgSize(); mFolderOffset = msgInfo.folderOffset(); - mStatus = msgInfo.status(); + mtqStatus = msgInfo.status(); mEncryptionState = msgInfo.encryptionState(); mSignatureState = msgInfo.signatureState(); mMDNSentState = msgInfo.mdnSentState(); @@ -145,7 +145,7 @@ void KMMessage::init( DwMessage* aMsg ) mMsgSize = 0; mMsgLength = 0; mFolderOffset = 0; - mStatus = KMMsgStatusNew; + mtqStatus = KMMsgStatusNew; mEncryptionState = KMMsgEncryptionStateUnknown; mSignatureState = KMMsgSignatureStateUnknown; mMDNSentState = KMMsgMDNStateUnknown; @@ -173,7 +173,7 @@ void KMMessage::assign( const KMMessage& other ) mMsgSize = other.mMsgSize; mMsgLength = other.mMsgLength; mFolderOffset = other.mFolderOffset; - mStatus = other.mStatus; + mtqStatus = other.mtqStatus; mEncryptionState = other.mEncryptionState; mSignatureState = other.mSignatureState; mMDNSentState = other.mMDNSentState; @@ -248,10 +248,10 @@ void KMMessage::setTransferInProgress(bool value, bool force) MessageProperty::setTransferInProgress( getMsgSerNum(), value, force ); if ( !transferInProgress() && sPendingDeletes.tqcontains( this ) ) { sPendingDeletes.remove( this ); - if ( parent() ) { - int idx = parent()->find( this ); + if ( tqparent() ) { + int idx = tqparent()->tqfind( this ); if ( idx > 0 ) { - parent()->removeMsg( idx ); + tqparent()->removeMsg( idx ); } } } @@ -336,8 +336,8 @@ TQCString KMMessage::headerAsSendableString() const } void KMMessage::removePrivateHeaderFields() { - removeHeaderField("Status"); - removeHeaderField("X-Status"); + removeHeaderField("tqStatus"); + removeHeaderField("X-tqStatus"); removeHeaderField("X-KMail-EncryptionState"); removeHeaderField("X-KMail-SignatureState"); removeHeaderField("X-KMail-MDN-Sent"); @@ -355,8 +355,8 @@ void KMMessage::seStatusFields() { char str[2] = { 0, 0 }; - setHeaderField("Status", status() & KMMsgStatusNew ? "R" : "RO"); - setHeaderField("X-Status", statusToStr(status())); + setHeaderField("tqStatus", status() & KMMsgStatusNew ? "R" : "RO"); + setHeaderField("X-tqStatus", statusToStr(status())); str[0] = (char)encryptionState(); setHeaderField("X-KMail-EncryptionState", str); @@ -383,7 +383,7 @@ TQString KMMessage::headerAsString() const DwHeaders& header = mMsg->Headers(); header.Assemble(); if ( header.AsString().empty() ) - return TQString::null; + return TQString(); return TQString::tqfromLatin1( header.AsString().c_str() ); } @@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType() return mMsg->Headers().ContentType(); } -void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) { - return fromDwString( DwString( ba.data(), ba.size() ), seStatus ); +void KMMessage::fromByteArray( const TQByteArray & ba, bool setqStatus ) { + return fromDwString( DwString( ba.data(), ba.size() ), setqStatus ); } -void KMMessage::fromString( const TQCString & str, bool aSeStatus ) { - return fromDwString( KMail::Util::dwString( str ), aSeStatus ); +void KMMessage::fromString( const TQCString & str, bool aSetqStatus ) { + return fromDwString( KMail::Util::dwString( str ), aSetqStatus ); } -void KMMessage::fromDwString(const DwString& str, bool aSeStatus) +void KMMessage::fromDwString(const DwString& str, bool aSetqStatus) { delete mMsg; mMsg = new DwMessage; mMsg->FromString( str ); mMsg->Parse(); - if (aSeStatus) { - seStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); + if (aSetqStatus) { + setqStatus(headerField("tqStatus").latin1(), headerField("X-tqStatus").latin1()); setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) ); setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) ); setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) ); @@ -541,7 +541,7 @@ static TQString splitLine( TQString &line) if ( i == l ) { TQString result = line.left(j); - line = TQString::null; + line = TQString(); return result; } @@ -583,7 +583,7 @@ static TQString flowText(TQString &text, const TQString& indent, int maxLength) if (i < (int) text.length()) text = text.mid(i); else - text = TQString::null; + text = TQString(); result += indent + line + '\n'; @@ -667,7 +667,7 @@ TQString KMMessage::smartQuote( const TQString & msg, int maxLineLength ) if ( line.isEmpty()) { if (!firstPart) - part.append(TQString::null); + part.append(TQString()); continue; }; @@ -750,14 +750,14 @@ TQString KMMessage::asPlainTextFromObjectTree( partNode *root, bool aStripSignat bool isHTML = false; const TQTextCodec * codec = 0; - if ( !root ) return TQString::null; + if ( !root ) return TQString(); parseTextStringFromDwPart( root, parsedString, codec, isHTML ); if ( mOverrideCodec || !codec ) codec = this->codec(); if ( parsedString.isEmpty() ) - return TQString::null; + return TQString(); bool clearSigned = false; TQString result; @@ -826,7 +826,7 @@ TQString KMMessage::asPlainText( bool aStripSignature, bool allowDecryption ) co { partNode *root = partNode::fromMessage( this ); if ( !root ) - return TQString::null; + return TQString(); ObjectTreeParser otp; otp.parseObjectTree( root ); @@ -837,7 +837,7 @@ TQString KMMessage::asPlainText( bool aStripSignature, bool allowDecryption ) co TQString KMMessage::asQuotedString( const TQString& aHeaderStr, const TQString& aIndentStr, - const TQString& selection /* = TQString::null */, + const TQString& selection /* = TQString() */, bool aStripSignature /* = true */, bool allowDecryption /* = true */) const { @@ -845,7 +845,7 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr, asPlainText( aStripSignature, allowDecryption ) : selection ; // Remove blank lines at the beginning: - const int firstNonWS = content.find( TQRegExp( "\\S" ) ); + const int firstNonWS = content.tqfind( TQRegExp( "\\S" ) ); const int lineStart = content.findRev( '\n', firstNonWS ); if ( lineStart >= 0 ) content.remove( 0, static_cast<unsigned int>( lineStart ) ); @@ -864,10 +864,10 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr, //----------------------------------------------------------------------------- KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, - TQString selection /* = TQString::null */, + TQString selection /* = TQString() */, bool noQuote /* = false */, bool allowDecryption /* = true */, - const TQString &tmpl /* = TQString::null */ ) + const TQString &tmpl /* = TQString() */ ) { KMMessage* msg = new KMMessage; TQString mailingListStr, replyToStr, toStr; @@ -883,11 +883,11 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, msg->setCharset("utf-8"); // determine the mailing list posting address - if ( parent() && parent()->isMailingListEnabled() && - !parent()->mailingListPostAddress().isEmpty() ) { - mailingListAddresses << parent()->mailingListPostAddress(); + if ( tqparent() && tqparent()->isMailingListEnabled() && + !tqparent()->mailingListPostAddress().isEmpty() ) { + mailingListAddresses << tqparent()->mailingListPostAddress(); } - if ( headerField("List-Post").find( "mailto:", 0, false ) != -1 ) { + if ( headerField("List-Post").tqfind( "mailto:", 0, false ) != -1 ) { TQString listPost = headerField("List-Post"); TQRegExp rx( "<mailto:([^@>]+)@([^>]+)>", false ); if ( rx.search( listPost, 0 ) != -1 ) // matched @@ -916,7 +916,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, // strip all my addresses from the list of recipients TQStringList recipients = KPIM::splitEmailAddrList( toStr ); toStr = stripMyAddressesFromAddressList( recipients ).join(", "); - // ... unless the list tqcontains only my addresses (reply to self) + // ... unless the list contains only my addresses (reply to self) if ( toStr.isEmpty() && !recipients.isEmpty() ) toStr = recipients[0]; @@ -1081,11 +1081,11 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, parser.process( this ); } } - // seStatus(KMMsgStatusReplied); + // setqStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); - if ( parent() && parent()->putRepliesInSameFolder() ) - msg->setFcc( parent()->idString() ); + if ( tqparent() && tqparent()->putRepliesInSameFolder() ) + msg->setFcc( tqparent()->idString() ); // replies to an encrypted message should be encrypted as well if ( encryptionState() == KMMsgPartiallyEncrypted || @@ -1108,8 +1108,8 @@ TQCString KMMessage::getRefStr() const if (refStr.isEmpty()) return headerField("Message-Id").latin1(); - i = refStr.find('<'); - j = refStr.find('>'); + i = refStr.tqfind('<'); + j = refStr.tqfind('>'); firstRef = refStr.mid(i, j-i+1); if (!firstRef.isEmpty()) retRefStr = firstRef + ' '; @@ -1185,7 +1185,7 @@ TQCString KMMessage::createForwardBody() if (sHeaderStrategy == HeaderStrategy::all()) { s = "\n\n---------- " + sForwardStr + " ----------\n\n"; s += headerAsString(); - str = asQuotedString(s, "", TQString::null, false, false).utf8(); + str = asQuotedString(s, "", TQString(), false, false).utf8(); str += "\n-------------------------------------------------------\n"; } else { s = "\n\n---------- " + sForwardStr + " ----------\n\n"; @@ -1198,7 +1198,7 @@ TQCString KMMessage::createForwardBody() s += "To: " + to() + "\n"; if (!cc().isEmpty()) s += "Cc: " + cc() + "\n"; s += "\n"; - str = asQuotedString(s, "", TQString::null, false, false).utf8(); + str = asQuotedString(s, "", TQString(), false, false).utf8(); str += "\n-------------------------------------------------------\n"; } @@ -1215,7 +1215,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList ) while (field) { nextField = field->Next(); - if ( field->FieldNameStr().find( "ontent" ) == DwString::npos + if ( field->FieldNameStr().tqfind( "ontent" ) == DwString::npos && !whiteList.tqcontains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) ) header.RemoveField(field); field = nextField; @@ -1224,7 +1224,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList ) } //----------------------------------------------------------------------------- -KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */ ) +KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString() */ ) { KMMessage* msg = new KMMessage(); @@ -1245,7 +1245,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */ TQStringList blacklist = GlobalSettings::self()->mimetypesToStripWhenInlineForwarding(); for ( TQStringList::Iterator it = blacklist.begin(); it != blacklist.end(); ++it ) { TQString entry = (*it); - int sep = entry.find( '/' ); + int sep = entry.tqfind( '/' ); TQCString type = entry.left( sep ).latin1(); TQCString subtype = entry.mid( sep+1 ).latin1(); kdDebug( 5006 ) << "Looking for blacklisted type: " << type << "/" << subtype << endl; @@ -1276,7 +1276,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */ msg->initFromMessage( this ); msg->removeHeaderField("Content-Type"); msg->removeHeaderField("Content-Transfer-Encoding"); - // Modify the ContentType directly (tqreplaces setAutomaticFields(true)) + // Modify the ContentType directly (replaces setAutomaticFields(true)) DwHeaders & header = msg->mMsg->Headers(); header.MimeVersion().FromString("1.0"); DwMediaType & contentType = msg->dwContentType(); @@ -1328,32 +1328,32 @@ static const struct { const char * text; } mdnMessageBoxes[] = { { "mdnNormalAsk", true, - I18N_NOOP("This message tqcontains a request to return a notification " + I18N_NOOP("This message contains a request to return a notification " "about your reception of the message.\n" "You can either ignore the request or let KMail send a " "\"denied\" or normal response.") }, { "mdnUnknownOption", false, - I18N_NOOP("This message tqcontains a request to send a notification " + I18N_NOOP("This message contains a request to send a notification " "about your reception of the message.\n" - "It tqcontains a processing instruction that is marked as " + "It contains a processing instruction that is marked as " "\"required\", but which is unknown to KMail.\n" "You can either ignore the request or let KMail send a " "\"failed\" response.") }, { "mdnMultipleAddressesInReceiptTo", true, - I18N_NOOP("This message tqcontains a request to send a notification " + I18N_NOOP("This message contains a request to send a notification " "about your reception of the message,\n" "but it is requested to send the notification to more " "than one address.\n" "You can either ignore the request or let KMail send a " "\"denied\" or normal response.") }, { "mdnReturnPathEmpty", true, - I18N_NOOP("This message tqcontains a request to send a notification " + I18N_NOOP("This message contains a request to send a notification " "about your reception of the message,\n" "but there is no return-path set.\n" "You can either ignore the request or let KMail send a " "\"denied\" or normal response.") }, { "mdnReturnPathNotInReceiptTo", true, - I18N_NOOP("This message tqcontains a request to send a notification " + I18N_NOOP("This message contains a request to send a notification " "about your reception of the message,\n" "but the return-path address differs from the address " "the notification was requested to be sent to.\n" @@ -1473,7 +1473,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a, // SHOULD be obtained (or no MDN sent) if there is no Return-Path // header in the message [...] AddrSpecList returnPathList = extractAddrSpecs("Return-Path"); - TQString returnPath = returnPathList.isEmpty() ? TQString::null + TQString returnPath = returnPathList.isEmpty() ? TQString() : returnPathList.front().localPart + '@' + returnPathList.front().domain ; kdDebug(5006) << "clean return path: " << returnPath << endl; if ( returnPath.isEmpty() || !receiptTo.tqcontains( returnPath, false ) ) { @@ -1523,7 +1523,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a, receipt->initFromMessage( this ); receipt->removeHeaderField("Content-Type"); receipt->removeHeaderField("Content-Transfer-Encoding"); - // Modify the ContentType directly (tqreplaces setAutomaticFields(true)) + // Modify the ContentType directly (replaces setAutomaticFields(true)) DwHeaders & header = receipt->mMsg->Headers(); header.MimeVersion().FromString("1.0"); DwMediaType & contentType = receipt->dwContentType(); @@ -1533,7 +1533,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a, receipt->mNeedsAssembly = true; receipt->setContentTypeParam( "report-type", "disposition-notification" ); - TQString description = tqreplaceHeadersInString( MDN::descriptionFor( d, m ) ); + TQString description = replaceHeadersInString( MDN::descriptionFor( d, m ) ); // text/plain part: KMMessagePart firstMsgPart; @@ -1605,7 +1605,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a, return receipt; } -TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const { +TQString KMMessage::replaceHeadersInString( const TQString & s ) const { TQString result = s; TQRegExp rx( "\\$\\{([a-z0-9-]+)\\}", false ); Q_ASSERT( rx.isValid() ); @@ -1623,9 +1623,9 @@ TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const { idx = 0; while ( ( idx = rx.search( result, idx ) ) != -1 ) { - TQString tqreplacement = headerField( rx.cap(1).latin1() ); - result.tqreplace( idx, rx.matchedLength(), tqreplacement ); - idx += tqreplacement.length(); + TQString replacement = headerField( rx.cap(1).latin1() ); + result.tqreplace( idx, rx.matchedLength(), replacement ); + idx += replacement.length(); } return result; } @@ -1693,17 +1693,17 @@ void KMMessage::applyIdentity( uint id ) setHeaderField( "X-KMail-Transport", ident.transport() ); if ( ident.fcc().isEmpty() ) - setFcc( TQString::null ); + setFcc( TQString() ); else setFcc( ident.fcc() ); if ( ident.drafts().isEmpty() ) - setDrafts( TQString::null ); + setDrafts( TQString() ); else setDrafts( ident.drafts() ); if ( ident.templates().isEmpty() ) - setTemplates( TQString::null ); + setTemplates( TQString() ); else setTemplates( ident.templates() ); @@ -1729,8 +1729,8 @@ uint KMMessage::identityUoid() const { if ( !ok || id == 0 ) id = kmkernel->identityManager()->identityForAddress( to() + ", " + cc() ).uoid(); - if ( id == 0 && parent() ) - id = parent()->identity(); + if ( id == 0 && tqparent() ) + id = tqparent()->identity(); return id; } @@ -2039,7 +2039,7 @@ TQString KMMessage::sender() const { if ( asl.empty() ) asl = extractAddrSpecs( "From" ); if ( asl.empty() ) - return TQString::null; + return TQString(); return asl.front().asString(); } @@ -2081,7 +2081,7 @@ TQString KMMessage::replyToId() const replyTo = headerField("In-Reply-To"); // search the end of the (first) message id in the In-Reply-To header - rightAngle = replyTo.find( '>' ); + rightAngle = replyTo.tqfind( '>' ); if (rightAngle != -1) replyTo.truncate( rightAngle + 1 ); // now search the start of the message id @@ -2094,14 +2094,14 @@ TQString KMMessage::replyToId() const // misconfigured Mutt. They look like this <"from foo"@bar.baz>, i.e. // they contain double quotes and spaces. We only check for '"'. if (!replyTo.isEmpty() && (replyTo[0] == '<') && - ( -1 == replyTo.find( '"' ) ) ) + ( -1 == replyTo.tqfind( '"' ) ) ) return replyTo; references = headerField("References"); leftAngle = references.findRev( '<' ); if (leftAngle != -1) references = references.mid( leftAngle ); - rightAngle = references.find( '>' ); + rightAngle = references.tqfind( '>' ); if (rightAngle != -1) references.truncate( rightAngle + 1 ); @@ -2137,16 +2137,16 @@ TQString KMMessage::references() const if( !references.isEmpty() && references[0] == '<' ) return references; else - return TQString::null; + return TQString(); } //----------------------------------------------------------------------------- TQString KMMessage::replyToAuxIdMD5() const { TQString result = references(); - // references tqcontains two items, use the first one + // references contains two items, use the first one // (the second to last reference) - const int rightAngle = result.find( '>' ); + const int rightAngle = result.tqfind( '>' ); if( rightAngle != -1 ) result.truncate( rightAngle + 1 ); @@ -2182,7 +2182,7 @@ TQString KMMessage::msgId() const TQString msgId = headerField("Message-Id"); // search the end of the message id - const int rightAngle = msgId.find( '>' ); + const int rightAngle = msgId.tqfind( '>' ); if (rightAngle != -1) msgId.truncate( rightAngle + 1 ); // now search the start of the message id @@ -2287,10 +2287,10 @@ TQValueList<TQCString> KMMessage::rawHeaderFields( const TQCString& field ) cons TQString KMMessage::headerField(const TQCString& aName) const { if ( aName.isEmpty() ) - return TQString::null; + return TQString(); if ( !mMsg->Headers().FindField( aName ) ) - return TQString::null; + return TQString(); return decodeRFC2047String( mMsg->Headers().FieldBody( aName.data() ).AsString().c_str(), charset() ); @@ -2666,7 +2666,7 @@ TQValueList<int> KMMessage::determineAllowedCtes( const CharFreq& cf, } // In the following cases only QP and Base64 are allowed: - // - the buffer will be OpenPGP/MIME signed and it tqcontains trailing + // - the buffer will be OpenPGP/MIME signed and it contains trailing // whitespace (cf. RFC 3156) // - a line starts with "From " if ( ( willBeSigned && cf.hasTrailingWhitespace() ) || @@ -2819,7 +2819,7 @@ int KMMessage::numBodyParts() const parts.append( part ); part = part->Body().FirstBodyPart(); } - // this is where currPart->msgPart tqcontains a leaf message part + // this is where currPart->msgPart contains a leaf message part count++; // go up in the tree until reaching a node with next // (or the last top-level node) @@ -2871,7 +2871,7 @@ int KMMessage::partNumber( DwBodyPart * aDwBodyPart ) const parts.append( curpart ); curpart = curpart->Body().FirstBodyPart(); } - // this is where currPart->msgPart tqcontains a leaf message part + // this is where currPart->msgPart contains a leaf message part if (curpart == aDwBodyPart) idx = curIdx; curIdx++; @@ -2911,7 +2911,7 @@ DwBodyPart * KMMessage::dwBodyPart( int aIdx ) const parts.append( curpart ); curpart = curpart->Body().FirstBodyPart(); } - // this is where currPart->msgPart tqcontains a leaf message part + // this is where currPart->msgPart contains a leaf message part if (curIdx==aIdx) part = curpart; curIdx++; @@ -2949,7 +2949,7 @@ DwBodyPart * KMMessage::findDwBodyPart( int type, int subtype ) const parts.append( curpart ); curpart = curpart->Body().FirstBodyPart(); } - // this is where curPart->msgPart tqcontains a leaf message part + // this is where curPart->msgPart contains a leaf message part // pending(khz): Find out WHY this look does not travel down *into* an // embedded "Message/RfF822" message containing a "Multipart/Mixed" @@ -2998,7 +2998,7 @@ DwBodyPart * KMMessage::findDwBodyPart( const TQCString& type, const TQCString& parts.append( curpart ); curpart = curpart->Body().FirstBodyPart(); } - // this is where curPart->msgPart tqcontains a leaf message part + // this is where curPart->msgPart contains a leaf message part // pending(khz): Find out WHY this look does not travel down *into* an // embedded "Message/RfF822" message containing a "Multipart/Mixed" @@ -3183,10 +3183,10 @@ bool KMMessage::deleteBodyPart( int partIndex ) if ( !part.isComplete() ) return false; - DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); - if ( !parentNode ) + DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() ); + if ( !tqparentNode ) return false; - parentNode->RemoveBodyPart( dwpart ); + tqparentNode->RemoveBodyPart( dwpart ); // add dummy part to show that a attachment has been deleted KMMessagePart dummyPart; @@ -3197,14 +3197,14 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.setContentDescription( comment ); dummyPart.setBodyEncodedBinary( TQByteArray() ); TQCString cd = dummyPart.contentDisposition(); - if ( cd.find( "inline", 0, false ) == 0 ) { + if ( cd.tqfind( "inline", 0, false ) == 0 ) { cd.tqreplace( 0, 10, "attachment" ); dummyPart.setContentDisposition( cd ); } else if ( cd.isEmpty() ) { dummyPart.setContentDisposition( "attachment" ); } DwBodyPart* newDwPart = createDWBodyPart( &dummyPart ); - parentNode->AddBodyPart( newDwPart ); + tqparentNode->AddBodyPart( newDwPart ); getTopLevelPart()->Assemble(); return true; } @@ -3251,14 +3251,14 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart) int iL, i1, i2, iM; iL = additionalParam.length(); i1 = 0; - i2 = additionalParam.find(';', i1, false); + i2 = additionalParam.tqfind(';', i1, false); while ( i1 < iL ) { if( -1 == i2 ) i2 = iL; if( i1+1 < i2 ) { parAV = additionalParam.mid( i1, (i2-i1) ); - iM = parAV.find('='); + iM = parAV.tqfind('='); if( -1 < iM ) { parA = parAV.left( iM ); @@ -3281,7 +3281,7 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart) ct.AddParameter( param ); } i1 = i2+1; - i2 = additionalParam.find(';', i1, false); + i2 = additionalParam.tqfind(';', i1, false); } } @@ -3639,7 +3639,7 @@ TQString KMMessage::stripEmailAddr( const TQString& aStr ) //kdDebug(5006) << "KMMessage::stripEmailAddr( " << aStr << " )" << endl; if ( aStr.isEmpty() ) - return TQString::null; + return TQString(); TQString result; @@ -3710,9 +3710,9 @@ TQString KMMessage::stripEmailAddr( const TQString& aStr ) else if ( !angleAddress.isEmpty() ) { result += angleAddress; } - name = TQString::null; - comment = TQString::null; - angleAddress = TQString::null; + name = TQString(); + comment = TQString(); + angleAddress = TQString(); } else name += ch; @@ -3975,7 +3975,7 @@ TQString KMMessage::expandAliases( const TQString& recipients ) // check whether the address is missing the domain part // FIXME: looking for '@' might be wrong - if ( receiver.find('@') == -1 ) { + if ( receiver.tqfind('@') == -1 ) { KConfigGroup general( KMKernel::config(), "General" ); TQString defaultdomain = general.readEntry( "Default domain" ); if( !defaultdomain.isEmpty() ) { @@ -4014,7 +4014,7 @@ TQString KMMessage::guessEmailAddressFromLoginName( const TQString& loginName ) const KUser user( loginName ); if ( user.isValid() ) { TQString fullName = user.fullName(); - if ( fullName.find( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 ) + if ( fullName.tqfind( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 ) address = '"' + fullName.tqreplace( '\\', "\\" ).tqreplace( '"', "\\" ) + "\" <" + address + '>'; else @@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) //----------------------------------------------------------------------------- -void KMMessage::seStatus(const KMMsgStatus aStatus, int idx) +void KMMessage::setqStatus(const KMMsgtqStatus atqStatus, int idx) { - if (mStatus == aStatus) + if (mtqStatus == atqStatus) return; - KMMsgBase::seStatus(aStatus, idx); + KMMsgBase::setqStatus(atqStatus, idx); } void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx) @@ -4182,11 +4182,11 @@ void KMMessage::setMDNSentState( KMMsgMDNSentState status, int idx ) } //----------------------------------------------------------------------------- -void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) +void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus ) { - Q_ASSERT( aStatus == KMMsgStatusReplied - || aStatus == KMMsgStatusForwarded - || aStatus == KMMsgStatusDeleted ); + Q_ASSERT( atqStatus == KMMsgStatusReplied + || atqStatus == KMMsgStatusForwarded + || atqStatus == KMMsgStatusDeleted ); TQString message = headerField( "X-KMail-Link-Message" ); if ( !message.isEmpty() ) @@ -4196,11 +4196,11 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) type += ','; message += TQString::number( aMsg->getMsgSerNum() ); - if ( aStatus == KMMsgStatusReplied ) + if ( atqStatus == KMMsgStatusReplied ) type += "reply"; - else if ( aStatus == KMMsgStatusForwarded ) + else if ( atqStatus == KMMsgStatusForwarded ) type += "forward"; - else if ( aStatus == KMMsgStatusDeleted ) + else if ( atqStatus == KMMsgStatusDeleted ) type += "deleted"; setHeaderField( "X-KMail-Link-Message", message ); @@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) } //----------------------------------------------------------------------------- -void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const +void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const { *retMsgSerNum = 0; - *reStatus = KMMsgStatusUnknown; + *retqStatus = KMMsgStatusUnknown; TQString message = headerField("X-KMail-Link-Message"); TQString type = headerField("X-KMail-Link-Type"); @@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const if ( !message.isEmpty() && !type.isEmpty() ) { *retMsgSerNum = message.toULong(); if ( type == "reply" ) - *reStatus = KMMsgStatusReplied; + *retqStatus = KMMsgStatusReplied; else if ( type == "forward" ) - *reStatus = KMMsgStatusForwarded; + *retqStatus = KMMsgStatusForwarded; else if ( type == "deleted" ) - *reStatus = KMMsgStatusDeleted; + *retqStatus = KMMsgStatusDeleted; } } @@ -4275,7 +4275,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & TQString specifier = partSpecifier; if ( partSpecifier.endsWith(".HEADER") || partSpecifier.endsWith(".MIME") ) { - // get the parent bodypart + // get the tqparent bodypart specifier = partSpecifier.section( '.', 0, -2 ); } @@ -4292,7 +4292,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & { // update headers // get rid of EOL - content.resize( QMAX( content.length(), 2 ) - 2 ); + content.resize( TQMAX( content.length(), 2 ) - 2 ); // we have to delete the fields first as they might have been created by // an earlier call to DwHeaders::FieldBody mLastUpdated->Headers().DeleteAllFields(); @@ -4306,19 +4306,19 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & } else { // update body mLastUpdated->Body().FromString( content ); - TQString parentSpec = partSpecifier.section( '.', 0, -2 ); - if ( !parentSpec.isEmpty() ) + TQString tqparentSpec = partSpecifier.section( '.', 0, -2 ); + if ( !tqparentSpec.isEmpty() ) { - DwBodyPart* parent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); - if ( parent && parent->hasHeaders() && parent->Headers().HasContentType() ) + DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), tqparentSpec ); + if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() ) { - const DwMediaType& contentType = parent->Headers().ContentType(); + const DwMediaType& contentType = tqparent->Headers().ContentType(); if ( contentType.Type() == DwMime::kTypeMessage && contentType.Subtype() == DwMime::kSubtypeRfc822 ) { // an embedded message that is not multipart // update this directly - parent->Body().Message()->Body().FromString( content ); + tqparent->Body().Message()->Body().FromString( content ); } } } @@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState() cntType += '/'; cntType += mMsg->Headers().ContentType().SubtypeStr().c_str(); if ( cntType.lower() == "text/calendar" ) { - seStatus( KMMsgStatusHasInvitation ); + setqStatus( KMMsgStatusHasInvitation ); return; } } - seStatus( KMMsgStatusHasNoInvitation ); + setqStatus( KMMsgStatusHasNoInvitation ); return; } @@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( !part ) { // kdDebug(5006) << "updateAttachmentState - no part!" << endl; - seStatus( KMMsgStatusHasNoAttach ); + setqStatus( KMMsgStatusHasNoAttach ); return; } @@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature && part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) ) { - seStatus( KMMsgStatusHasAttach ); + setqStatus( KMMsgStatusHasAttach ); } return; } @@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( part->Next() ) updateAttachmentState( part->Next() ); else if ( attachmentState() == KMMsgAttachmentUnknown ) - seStatus( KMMsgStatusHasNoAttach ); + setqStatus( KMMsgStatusHasNoAttach ); } void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity ) diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index a063ca1a8..32e79e2ad 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -71,7 +71,7 @@ class KMMessage: public KMMsgBase, public KMail::ISubject public: // promote some of KMMsgBase's methods to public: - using KMMsgBase::parent; + using KMMsgBase::tqparent; using KMMsgBase::setParent; using KMMsgBase::enableUndo; // KMFolder using KMMsgBase::setEnableUndo; // dto. @@ -85,7 +85,7 @@ public: using KMMsgBase::setSignatureStateChar; // dto. /** Straight forward initialization. */ - KMMessage(KMFolder* parent=0); + KMMessage(KMFolder* tqparent=0); /** Constructor from a DwMessage. KMMessage takes possession of the DwMessage, so don't dare to delete it. @@ -131,7 +131,7 @@ public: */ void setUnencryptedMsg( KMMessage* unencrypted ); - /** Returns TRUE if the message tqcontains an unencrypted copy of itself. */ + /** Returns TRUE if the message contains an unencrypted copy of itself. */ bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; } /** Returns an unencrypted copy of this message or 0 if none exists. */ @@ -150,21 +150,21 @@ public: } /** Mark the message as deleted */ - void del() { seStatus(KMMsgStatusDeleted); } + void del() { setqStatus(KMMsgStatusDeleted); } /** Undelete the message. Same as touch */ - void undel() { seStatus(KMMsgStatusOld); } + void undel() { setqStatus(KMMsgStatusOld); } /** Touch the message - mark it as read */ - void touch() { seStatus(KMMsgStatusOld); } + void touch() { setqStatus(KMMsgStatusOld); } /** Create a new message that is a reply to this message, filling all required header fields with the proper values. The returned message is not stored in any folder. Marks this message as replied. */ KMMessage* createReply( KMail::ReplyStrategy replyStrategy = KMail::ReplySmart, - TQString selection=TQString::null, bool noQuote = false, + TQString selection=TQString(), bool noQuote = false, bool allowDecryption = true, - const TQString &tmpl = TQString::null ); + const TQString &tmpl = TQString() ); /** Create a new message that is a redirect to this message, filling all required header fields with the proper values. The returned message @@ -181,7 +181,7 @@ public: /** Create a new message that is a forward of this message, filling all required header fields with the proper values. The returned message is not stored in any folder. Marks this message as forwarded. */ - KMMessage* createForward( const TQString &tmpl = TQString::null ); + KMMessage* createForward( const TQString &tmpl = TQString() ); /** Create a new message that is a delivery receipt of this message, filling required header fileds with the proper values. The @@ -210,9 +210,9 @@ public: void sanitizeHeaders( const TQStringList& whiteList = TQStringList() ); /** Parse the string and create this message from it. */ - void fromDwString(const DwString& str, bool seStatus=false); - void fromString(const TQCString& str, bool seStatus=false); - void fromByteArray(const TQByteArray & ba, bool seStatus=false); + void fromDwString(const DwString& str, bool setqStatus=false); + void fromString(const TQCString& str, bool setqStatus=false); + void fromByteArray(const TQByteArray & ba, bool setqStatus=false); /** Return the entire message contents in the DwString. This function is *fast* even for large message since it does *not* involve a @@ -243,7 +243,7 @@ public: TQCString headerAsSendableString() const; /** - * Remove all private header fields: *Status: and X-KMail-* + * Remove all private header fields: *tqStatus: and X-KMail-* **/ void removePrivateHeaderFields(); @@ -274,7 +274,7 @@ public: /** @return the UOID of the identity for this message. Searches the "x-kmail-identity" header and if that fails, searches with KPIM::IdentityManager::identityForAddress() - and if that fails queries the KMMsgBase::parent() folder for a default. + and if that fails queries the KMMsgBase::tqparent() folder for a default. **/ uint identityUoid() const; @@ -663,11 +663,11 @@ public: /** * Delete a body part with the specified part index. - * A dummy body part with the text "the attachment foo was deleted" will tqreplace the old part. + * A dummy body part with the text "the attachment foo was deleted" will replace the old part. */ bool deleteBodyPart( int partIndex ); - /** Set "Status" and "X-Status" fields of the message from the + /** Set "tqStatus" and "X-tqStatus" fields of the message from the * internal message status. */ void seStatusFields(); @@ -679,7 +679,7 @@ public: /** Convert '<' into "<" resp. '>' into ">" in order to * prevent their interpretation by KHTML. - * Does *not* use the Qt tqreplace function but runs a very fast C code + * Does *not* use the TQt replace function but runs a very fast C code * the same way as lf2crlf() does. */ static TQCString html2source( const TQCString & src ); @@ -717,7 +717,7 @@ public: * only the name part and not the given emailAddr. */ static TQString emailAddrAsAnchor(const TQString& emailAddr, - bool stripped=true, const TQString& cssStyle = TQString::null, bool link = true); + bool stripped=true, const TQString& cssStyle = TQString(), bool link = true); /** Strips an address from an address list. This is for example used when replying to all. @@ -760,7 +760,7 @@ public: static const TQStringList &preferredCharsets(); /** Replaces every occurrence of "${foo}" in @p s with headerField("foo") */ - TQString tqreplaceHeadersInString( const TQString & s ) const; + TQString replaceHeadersInString( const TQString & s ) const; /** Get the message charset.*/ TQCString charset() const; @@ -822,11 +822,11 @@ public: ulong UID() const; void setUID(ulong uid); - /** Status of the message. */ - KMMsgStatus status() const { return mStatus; } + /** tqStatus of the message. */ + KMMsgtqStatus status() const { return mtqStatus; } /** Set status and mark dirty. */ - void seStatus(const KMMsgStatus status, int idx = -1); - void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } + void setqStatus(const KMMsgtqStatus status, int idx = -1); + void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); } /** Set encryption status of the message. */ void setEncryptionState(const KMMsgEncryptionState, int idx = -1); @@ -844,11 +844,11 @@ public: KMMsgMDNSentState mdnSentState() const { return mMDNSentState; } - /** Links this message to @p aMsg, setting link type to @p aStatus. */ - void link(const KMMessage *aMsg, KMMsgStatus aStatus); + /** Links this message to @p aMsg, setting link type to @p atqStatus. */ + void link(const KMMessage *aMsg, KMMsgtqStatus atqStatus); /** Returns the information for the Nth link into @p retMsg - * and @p reStatus. */ - void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const; + * and @p retqStatus. */ + void getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const; /** Convert wildcards into normal string */ TQString formatString(const TQString&) const; @@ -886,7 +886,7 @@ public: /** Returns message body with quoting header and indented by the given indentation string. This is suitable for including the message in another message of for replies, forwards. The header string is - a template where the following fields are tqreplaced with the + a template where the following fields are replaced with the corresponding values: <pre> %D: date of this message @@ -900,7 +900,7 @@ public: get converted to plain text when allowDecryption is true. */ TQString asQuotedString( const TQString & headerStr, const TQString & indentStr, - const TQString & selection=TQString::null, + const TQString & selection=TQString(), bool aStripSignature=true, bool allowDecryption=true) const; @@ -969,7 +969,7 @@ private: KMMessage* mUnencryptedMsg; DwBodyPart* mLastUpdated; int mCursorPos; - KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage tqreplaced in the KMMsgList + KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage replaced in the KMMsgList static TQValueList<KMMessage*> sPendingDeletes; }; diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 6e73051f7..c0b791892 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -55,9 +55,9 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, - TQWidget* parent, + TQWidget* tqparent, const char* name ) - : KListView( parent, name ), + : KListView( tqparent, name ), mReaderWin( readerWin ), mSizeColumn(0) { setStyleDependantFrameWidth(); @@ -65,7 +65,7 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, addColumn( i18n("Type") ); addColumn( i18n("Encoding") ); mSizeColumn = addColumn( i18n("Size") ); - setColumnAlignment( 3, Qt::AlignRight ); + setColumnAlignment( 3, TQt::AlignRight ); restoreLayoutIfPresent(); connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), @@ -245,8 +245,8 @@ void KMMimePartTree::correctSize( TQListViewItem * item ) } if ( totalSize > static_cast<KMMimePartTreeItem*>(item)->origSize() ) item->setText( mSizeColumn, KIO::convertSize(totalSize) ); - if ( item->parent() ) - correctSize( item->parent() ); + if ( item->tqparent() ) + correctSize( item->tqparent() ); } void KMMimePartTree::slotDelete() @@ -309,18 +309,18 @@ void KMMimePartTree::slotCopy() if ( !url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::clipboard()->setData( drag, QClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } //============================================================================= -KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent, +KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * tqparent, partNode* node, const TQString & description, const TQString & mimetype, const TQString & encoding, KIO::filesize_t size ) - : TQListViewItem( parent, description, - TQString::null, // set by setIconAndTextForType() + : TQListViewItem( tqparent, description, + TQString(), // set by setIconAndTextForType() encoding, KIO::convertSize( size ) ), mPartNode( node ), mOrigSize(size) @@ -328,19 +328,19 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent, if( node ) node->setMimePartTreeItem( this ); setIconAndTextForType( mimetype ); - if ( parent ) - parent->correctSize(this); + if ( tqparent ) + tqparent->correctSize(this); } -KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * parent, +KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * tqparent, partNode* node, const TQString & description, const TQString & mimetype, const TQString & encoding, KIO::filesize_t size, bool revertOrder ) - : TQListViewItem( parent, description, - TQString::null, // set by setIconAndTextForType() + : TQListViewItem( tqparent, description, + TQString(), // set by setIconAndTextForType() encoding, KIO::convertSize( size ) ), mPartNode( node ), mOrigSize(size) diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index a2e4370a6..f520a7950 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,11 +47,12 @@ class KMMimePartTreeItem; class KMMimePartTree : public KListView { Q_OBJECT + TQ_OBJECT friend class ::KMReaderWin; public: KMMimePartTree( KMReaderWin* readerWin, - TQWidget* parent, + TQWidget* tqparent, const char* name = 0 ); virtual ~KMMimePartTree(); @@ -94,20 +95,20 @@ protected: int mSizeColumn; }; -class KMMimePartTreeItem :public QListViewItem +class KMMimePartTreeItem :public TQListViewItem { public: - KMMimePartTreeItem( KMMimePartTree * parent, + KMMimePartTreeItem( KMMimePartTree * tqparent, partNode* node, const TQString & labelDescr, - const TQString & labelCntType = TQString::null, - const TQString & labelEncoding = TQString::null, + const TQString & labelCntType = TQString(), + const TQString & labelEncoding = TQString(), KIO::filesize_t size=0 ); - KMMimePartTreeItem( KMMimePartTreeItem * parent, + KMMimePartTreeItem( KMMimePartTreeItem * tqparent, partNode* node, const TQString & labelDescr, - const TQString & labelCntType = TQString::null, - const TQString & labelEncoding = TQString::null, + const TQString & labelCntType = TQString(), + const TQString & labelEncoding = TQString(), KIO::filesize_t size=0, bool revertOrder = false ); partNode* node() const { return mPartNode; } diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index 71a1731ca..aed324580 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -72,7 +72,7 @@ using KMail::MessageProperty; //----------------------------------------------------------------------------- KMMsgBase::KMMsgBase(KMFolder* aParentFolder) : mParent( aParentFolder ), mIndexOffset( 0 ), - mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mStatus( KMMsgStatusUnknown ) + mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mtqStatus( KMMsgStatusUnknown ) { } @@ -121,145 +121,145 @@ bool KMMsgBase::isMessage(void) const return false; } //----------------------------------------------------------------------------- -void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx) +void KMMsgBase::toggletqStatus(const KMMsgtqStatus atqStatus, int idx) { mDirty = true; - KMMsgStatus oldStatus = status(); - if ( status() & aStatus ) { - mStatus &= ~aStatus; + KMMsgtqStatus oldtqStatus = status(); + if ( status() & atqStatus ) { + mtqStatus &= ~atqStatus; } else { - mStatus |= aStatus; + mtqStatus |= atqStatus; // Ignored and Watched are toggleable, yet mutually exclusive. // That is an arbitrary restriction on my part. HAR HAR HAR :) -till - if (aStatus == KMMsgStatusWatched) - mStatus &= ~KMMsgStatusIgnored; - if (aStatus == KMMsgStatusIgnored) - mStatus &= ~KMMsgStatusWatched; - if (aStatus == KMMsgStatusSpam) - mStatus &= ~KMMsgStatusHam; - if (aStatus == KMMsgStatusHam) - mStatus &= ~KMMsgStatusSpam; + if (atqStatus == KMMsgStatusWatched) + mtqStatus &= ~KMMsgStatusIgnored; + if (atqStatus == KMMsgStatusIgnored) + mtqStatus &= ~KMMsgStatusWatched; + if (atqStatus == KMMsgStatusSpam) + mtqStatus &= ~KMMsgStatusHam; + if (atqStatus == KMMsgStatusHam) + mtqStatus &= ~KMMsgStatusSpam; } if (storage()) { if (idx < 0) - idx = storage()->find( this ); - storage()->msgStatusChanged( oldStatus, status(), idx ); + idx = storage()->tqfind( this ); + storage()->msgStatusChanged( oldtqStatus, status(), idx ); storage()->headerOfMsgChanged(this, idx); } } //----------------------------------------------------------------------------- -void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) +void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx) { mDirty = true; - KMMsgStatus oldStatus = status(); - switch (aStatus) { + KMMsgtqStatus oldtqStatus = status(); + switch (atqStatus) { case KMMsgStatusRead: // Unset unread and new, set read - mStatus &= ~KMMsgStatusUnread; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusRead; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus |= KMMsgStatusRead; break; case KMMsgStatusUnread: // unread overrides read - mStatus &= ~KMMsgStatusOld; - mStatus &= ~KMMsgStatusRead; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusUnread; + mtqStatus &= ~KMMsgStatusOld; + mtqStatus &= ~KMMsgStatusRead; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus |= KMMsgStatusUnread; break; case KMMsgStatusOld: // old can't be new or unread - mStatus &= ~KMMsgStatusNew; - mStatus &= ~KMMsgStatusUnread; - mStatus |= KMMsgStatusOld; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus |= KMMsgStatusOld; break; case KMMsgStatusNew: // new overrides old and read - mStatus &= ~KMMsgStatusOld; - mStatus &= ~KMMsgStatusRead; - mStatus &= ~KMMsgStatusUnread; - mStatus |= KMMsgStatusNew; + mtqStatus &= ~KMMsgStatusOld; + mtqStatus &= ~KMMsgStatusRead; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus |= KMMsgStatusNew; break; case KMMsgStatusDeleted: - mStatus |= KMMsgStatusDeleted; + mtqStatus |= KMMsgStatusDeleted; break; case KMMsgStatusReplied: - mStatus |= KMMsgStatusReplied; + mtqStatus |= KMMsgStatusReplied; break; case KMMsgStatusForwarded: - mStatus |= KMMsgStatusForwarded; + mtqStatus |= KMMsgStatusForwarded; break; case KMMsgStatusQueued: - mStatus |= KMMsgStatusQueued; + mtqStatus |= KMMsgStatusQueued; break; case KMMsgStatusTodo: - mStatus |= KMMsgStatusTodo; + mtqStatus |= KMMsgStatusTodo; break; case KMMsgStatusSent: - mStatus &= ~KMMsgStatusQueued; - mStatus &= ~KMMsgStatusUnread; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusSent; + mtqStatus &= ~KMMsgStatusQueued; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus |= KMMsgStatusSent; break; case KMMsgStatusFlag: - mStatus |= KMMsgStatusFlag; + mtqStatus |= KMMsgStatusFlag; break; // Watched and ignored are mutually exclusive case KMMsgStatusWatched: - mStatus &= ~KMMsgStatusIgnored; - mStatus |= KMMsgStatusWatched; + mtqStatus &= ~KMMsgStatusIgnored; + mtqStatus |= KMMsgStatusWatched; break; case KMMsgStatusIgnored: - mStatus &= ~KMMsgStatusWatched; - mStatus |= KMMsgStatusIgnored; + mtqStatus &= ~KMMsgStatusWatched; + mtqStatus |= KMMsgStatusIgnored; break; // as are ham and spam case KMMsgStatusSpam: - mStatus &= ~KMMsgStatusHam; - mStatus |= KMMsgStatusSpam; + mtqStatus &= ~KMMsgStatusHam; + mtqStatus |= KMMsgStatusSpam; break; case KMMsgStatusHam: - mStatus &= ~KMMsgStatusSpam; - mStatus |= KMMsgStatusHam; + mtqStatus &= ~KMMsgStatusSpam; + mtqStatus |= KMMsgStatusHam; break; case KMMsgStatusHasAttach: - mStatus &= ~KMMsgStatusHasNoAttach; - mStatus |= KMMsgStatusHasAttach; + mtqStatus &= ~KMMsgStatusHasNoAttach; + mtqStatus |= KMMsgStatusHasAttach; break; case KMMsgStatusHasNoAttach: - mStatus &= ~KMMsgStatusHasAttach; - mStatus |= KMMsgStatusHasNoAttach; + mtqStatus &= ~KMMsgStatusHasAttach; + mtqStatus |= KMMsgStatusHasNoAttach; break; case KMMsgStatusHasInvitation: - mStatus &= ~KMMsgStatusHasNoInvitation; - mStatus |= KMMsgStatusHasInvitation; + mtqStatus &= ~KMMsgStatusHasNoInvitation; + mtqStatus |= KMMsgStatusHasInvitation; break; case KMMsgStatusHasNoInvitation: - mStatus &= ~KMMsgStatusHasInvitation; - mStatus |= KMMsgStatusHasNoInvitation; + mtqStatus &= ~KMMsgStatusHasInvitation; + mtqStatus |= KMMsgStatusHasNoInvitation; break; default: - mStatus = aStatus; + mtqStatus = atqStatus; break; } - if ( oldStatus != mStatus && storage() ) { + if ( oldtqStatus != mtqStatus && storage() ) { if (idx < 0) - idx = storage()->find( this ); - storage()->msgStatusChanged( oldStatus, status(), idx ); + idx = storage()->tqfind( this ); + storage()->msgStatusChanged( oldtqStatus, status(), idx ); storage()->headerOfMsgChanged( this, idx ); } } @@ -267,40 +267,40 @@ void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) //----------------------------------------------------------------------------- -void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr) +void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr) { - // first try to find status from "X-Status" field if given + // first try to find status from "X-tqStatus" field if given if (aXStatusStr) { - if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew); - if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread); - if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld); - if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead); - if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted); - if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied); - if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded); - if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued); - if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo); - if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent); - if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag); - if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam); - if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam); - if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach); - if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach); + if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew); + if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread); + if (strchr(aXStatusStr, 'O')) setqStatus(KMMsgStatusOld); + if (strchr(aXStatusStr, 'R')) setqStatus(KMMsgStatusRead); + if (strchr(aXStatusStr, 'D')) setqStatus(KMMsgStatusDeleted); + if (strchr(aXStatusStr, 'A')) setqStatus(KMMsgStatusReplied); + if (strchr(aXStatusStr, 'F')) setqStatus(KMMsgStatusForwarded); + if (strchr(aXStatusStr, 'Q')) setqStatus(KMMsgStatusQueued); + if (strchr(aXStatusStr, 'K')) setqStatus(KMMsgStatusTodo); + if (strchr(aXStatusStr, 'S')) setqStatus(KMMsgStatusSent); + if (strchr(aXStatusStr, 'G')) setqStatus(KMMsgStatusFlag); + if (strchr(aXStatusStr, 'P')) setqStatus(KMMsgStatusSpam); + if (strchr(aXStatusStr, 'H')) setqStatus(KMMsgStatusHam); + if (strchr(aXStatusStr, 'T')) setqStatus(KMMsgStatusHasAttach); + if (strchr(aXStatusStr, 'C')) setqStatus(KMMsgStatusHasNoAttach); } - // Merge the contents of the "Status" field + // Merge the contents of the "tqStatus" field if (aStatusStr) { if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') || (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) { - seStatus( KMMsgStatusOld ); - seStatus( KMMsgStatusRead ); + setqStatus( KMMsgStatusOld ); + setqStatus( KMMsgStatusRead ); } else if (aStatusStr[0] == 'R') - seStatus(KMMsgStatusRead); + setqStatus(KMMsgStatusRead); else if (aStatusStr[0] == 'D') - seStatus(KMMsgStatusDeleted); + setqStatus(KMMsgStatusDeleted); else - seStatus(KMMsgStatusNew); + setqStatus(KMMsgStatusNew); } } @@ -363,117 +363,117 @@ void KMMsgBase::setSignatureStateChar( TQChar status, int idx ) //----------------------------------------------------------------------------- bool KMMsgBase::isUnread(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusUnread && !(st & KMMsgStatusIgnored)); } //----------------------------------------------------------------------------- bool KMMsgBase::isNew(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusNew && !(st & KMMsgStatusIgnored)); } //----------------------------------------------------------------------------- -bool KMMsgBase::isOfUnknownStatus(void) const +bool KMMsgBase::isOfUnknowntqStatus(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st == KMMsgStatusUnknown); } //----------------------------------------------------------------------------- bool KMMsgBase::isOld(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusOld); } //----------------------------------------------------------------------------- bool KMMsgBase::isRead(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusRead || st & KMMsgStatusIgnored); } //----------------------------------------------------------------------------- bool KMMsgBase::isDeleted(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusDeleted); } //----------------------------------------------------------------------------- bool KMMsgBase::isReplied(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusReplied); } //----------------------------------------------------------------------------- bool KMMsgBase::isForwarded(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusForwarded); } //----------------------------------------------------------------------------- bool KMMsgBase::isQueued(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusQueued); } //----------------------------------------------------------------------------- bool KMMsgBase::isTodo(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusTodo); } //----------------------------------------------------------------------------- bool KMMsgBase::isSent(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusSent); } //----------------------------------------------------------------------------- bool KMMsgBase::isImportant(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusFlag); } //----------------------------------------------------------------------------- bool KMMsgBase::isWatched(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusWatched); } //----------------------------------------------------------------------------- bool KMMsgBase::isIgnored(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusIgnored); } //----------------------------------------------------------------------------- bool KMMsgBase::isSpam(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusSpam); } //----------------------------------------------------------------------------- bool KMMsgBase::isHam(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusHam); } //----------------------------------------------------------------------------- -TQCString KMMsgBase::statusToStr(const KMMsgStatus status) +TQCString KMMsgBase::statusToStr(const KMMsgtqStatus status) { TQCString sstr; if (status & KMMsgStatusNew) sstr += 'N'; @@ -608,7 +608,7 @@ TQStringList KMMsgBase::supportedEncodings(bool usAscii) { TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); - if (mimeNames.find(mimeName) == mimeNames.end()) + if (mimeNames.tqfind(mimeName) == mimeNames.end()) { encodings.append(KGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); @@ -658,14 +658,14 @@ namespace { TQString KMMsgBase::decodeRFC2047String(const TQCString& aStr, TQCString prefCharset) { if ( aStr.isEmpty() ) - return TQString::null; + return TQString(); const TQCString str = unfold( aStr ); if ( str.isEmpty() ) - return TQString::null; + return TQString(); - if ( str.find( "=?" ) < 0 ) { + if ( str.tqfind( "=?" ) < 0 ) { if ( !prefCharset.isEmpty() && kmkernel->isCodecAsciiCompatible( KMMsgBase::codecForName( prefCharset ) ) ) { if ( prefCharset == "us-ascii" ) { @@ -813,7 +813,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, start = pos; p = pos; while (p < strLength) { - if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1)) + if (!breakLine && (_str.at(p) == ' ' || dontQuote.tqfind(_str.at(p)) != -1)) start = p + 1; if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32) break; @@ -821,9 +821,9 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, } if (breakLine || p < strLength) { - while (dontQuote.find(_str.at(start)) != -1) start++; + while (dontQuote.tqfind(_str.at(start)) != -1) start++; stop = start; - while (stop < strLength && dontQuote.find(_str.at(stop)) == -1) + while (stop < strLength && dontQuote.tqfind(_str.at(stop)) == -1) stop++; result += _str.mid(pos, start - pos).latin1(); encLength = encodeRFC2047Quoted(codec->fromUnicode(_str. @@ -946,7 +946,7 @@ TQCString KMMsgBase::encodeRFC2231StringAutoDetectCharset( const TQString &str, //----------------------------------------------------------------------------- TQString KMMsgBase::decodeRFC2231String(const TQCString& _str) { - int p = _str.find('\''); + int p = _str.tqfind('\''); if (p < 0) return kmkernel->networkCodec()->toUnicode(_str); TQCString charset = _str.left(p); @@ -996,10 +996,10 @@ TQCString KMMsgBase::extractRFC2231HeaderField( const TQCString &aStr, const TQC // Quoted values end at the ending quote if ( aStr[startPart] == '"' ) { startPart++; // the double quote isn't part of the filename - endPart = aStr.find('"', startPart) - 1; + endPart = aStr.tqfind('"', startPart) - 1; } else { - endPart = aStr.find(';', startPart) - 1; + endPart = aStr.tqfind(';', startPart) - 1; } if (endPart < 0) endPart = 32767; @@ -1081,7 +1081,7 @@ unsigned long KMMsgBase::getMsgSerNum() const if (msn) return msn; if (mParent) { - int index = mParent->find((KMMsgBase*)this); + int index = mParent->tqfind((KMMsgBase*)this); msn = KMMsgDict::instance()->getMsgSerNum(mParent, index); if (msn) MessageProperty::setSerialCache( this, msn ); @@ -1093,7 +1093,7 @@ unsigned long KMMsgBase::getMsgSerNum() const //----------------------------------------------------------------------------- KMMsgAttachmentState KMMsgBase::attachmentState() const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); if (st & KMMsgStatusHasAttach) return KMMsgHasAttachment; else if (st & KMMsgStatusHasNoAttach) @@ -1105,7 +1105,7 @@ KMMsgAttachmentState KMMsgBase::attachmentState() const KMMsgInvitationState KMMsgBase::invitationState() const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); if (st & KMMsgStatusHasInvitation) return KMMsgHasInvitation; else if (st & KMMsgStatusHasNoInvitation) @@ -1204,9 +1204,9 @@ retry: g_chunk_length = 0; g_chunk = 0; } - // Normally we need to swap the byte order because the QStrings are written - // in the style of Qt2 (MSB -> network ordered). - // QStrings in Qt3 expect host ordering. + // Normally we need to swap the byte order because the TQStrings are written + // in the style of TQt2 (MSB -> network ordered). + // TQStrings in TQt3 expect host ordering. // On e.g. Intel host ordering is LSB, on e.g. Sparc it is MSB. #ifndef WORDS_BIGENDIAN @@ -1372,7 +1372,7 @@ const uchar *KMMsgBase::asIndexString(int &length) const //these is at the beginning because it is queried quite often tmp_str = msgIdMD5().stripWhiteSpace(); STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); - tmp = mLegacyStatus; + tmp = mLegacytqStatus; STORE_DATA(MsgLegacyStatusPart, tmp); //these are completely arbitrary order @@ -1461,13 +1461,13 @@ void KMMsgBase::readConfig() // static TQString KMMsgBase::stripOffPrefixes( const TQString& str ) { - return tqreplacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes, - true, TQString::null ).stripWhiteSpace(); + return replacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes, + true, TQString() ).stripWhiteSpace(); } //----------------------------------------------------------------------------- // static -TQString KMMsgBase::tqreplacePrefixes( const TQString& str, +TQString KMMsgBase::replacePrefixes( const TQString& str, const TQStringList& prefixRegExps, bool tqreplace, const TQString& newPrefix ) @@ -1480,7 +1480,7 @@ TQString KMMsgBase::tqreplacePrefixes( const TQString& str, .arg( prefixRegExps.join(")|(?:") ); TQRegExp rx( bigRegExp, false /*case insens.*/ ); if ( !rx.isValid() ) { - kdWarning(5006) << "KMMessage::tqreplacePrefixes(): bigRegExp = \"" + kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \"" << bigRegExp << "\"\n" << "prefix regexp is invalid!" << endl; // try good ole Re/Fwd: @@ -1503,7 +1503,7 @@ TQString KMMsgBase::tqreplacePrefixes( const TQString& str, TQString KMMsgBase::cleanSubject() const { return cleanSubject( sReplySubjPrefixes + sForwardSubjPrefixes, - true, TQString::null ).stripWhiteSpace(); + true, TQString() ).stripWhiteSpace(); } //----------------------------------------------------------------------------- @@ -1511,7 +1511,7 @@ TQString KMMsgBase::cleanSubject( const TQStringList & prefixRegExps, bool tqreplace, const TQString & newPrefix ) const { - return KMMsgBase::tqreplacePrefixes( subject(), prefixRegExps, tqreplace, + return KMMsgBase::replacePrefixes( subject(), prefixRegExps, tqreplace, newPrefix ); } diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index d5b7107f2..e3bf0029c 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -38,7 +38,7 @@ class KMFolderIndex; to Unread or New. This is done in KMMsgBase::isRead() and related getters. So we can preserve the state when switching a thread to Ignored and back. */ -enum MsgStatus +enum MsgtqStatus { KMMsgStatusUnknown = 0x00000000, KMMsgStatusNew = 0x00000001, @@ -62,7 +62,7 @@ enum MsgStatus KMMsgStatusHasNoInvitation = 0x00040000 }; -typedef uint KMMsgStatus; +typedef uint KMMsgtqStatus; /** The old status format, only one at a time possible. Needed for upgrade path purposes. */ @@ -80,7 +80,7 @@ typedef enum KMLegacyMsgStatusQueued='Q', KMLegacyMsgStatusSent='S', KMLegacyMsgStatusFlag='G' -} KMLegacyMsgStatus; +} KMLegacyMsgtqStatus; @@ -152,13 +152,13 @@ public: KMFolderIndex* storage() const; /** Return owning folder. */ - KMFolder* parent() const { return mParent; } + KMFolder* tqparent() const { return mParent; } /** Set owning folder. */ void setParent(KMFolder* p) { mParent = p; } /** Convert the given message status to a string. */ - static TQCString statusToStr(const KMMsgStatus status); + static TQCString statusToStr(const KMMsgtqStatus status); /** Convert the given message status to a string. */ TQString statusToSortRank(); @@ -173,7 +173,7 @@ public: virtual bool isNew(void) const; /** Returns TRUE if status is unknown. */ - virtual bool isOfUnknownStatus(void) const; + virtual bool isOfUnknowntqStatus(void) const; /** Returns TRUE if status is old. */ virtual bool isOld(void) const; @@ -215,14 +215,14 @@ public: virtual bool isHam(void) const; - /** Status of the message. */ - virtual KMMsgStatus status(void) const = 0; + /** tqStatus of the message. */ + virtual KMMsgtqStatus status(void) const = 0; /** Set status and mark dirty. Optional optimization: @p idx may - * specify the index of this message within the parent folder. */ - virtual void seStatus(const KMMsgStatus status, int idx = -1); - virtual void toggleStatus(const KMMsgStatus status, int idx = -1); - virtual void seStatus(const char* statusField, const char* xstatusField=0); + * specify the index of this message within the tqparent folder. */ + virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); + virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1); + virtual void setqStatus(const char* statusField, const char* xstatusField=0); /** Encryption status of the message. */ virtual KMMsgEncryptionState encryptionState() const = 0; @@ -238,22 +238,22 @@ public: /** Set encryption status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the parent folder. */ + * the tqparent folder. */ virtual void setEncryptionState(const KMMsgEncryptionState, int idx = -1); /** Set signature status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the parent folder. */ + * the tqparent folder. */ virtual void setSignatureState(const KMMsgSignatureState, int idx = -1); /** Set encryption status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the parent folder. */ + * the tqparent folder. */ virtual void setEncryptionStateChar( TQChar status, int idx = -1 ); /** Set signature status of the message and mark dirty. Optional * optimization: @p idx may specify the index of this message within - * the parent folder. */ + * the tqparent folder. */ virtual void setSignatureStateChar( TQChar status, int idx = -1 ); /** Important header fields of the message that are also kept in the index. */ @@ -403,16 +403,16 @@ public: /** Return if the message has at least one attachment */ virtual KMMsgAttachmentState attachmentState() const; - /** Return if the message tqcontains an invitation */ + /** Return if the message contains an invitation */ virtual KMMsgInvitationState invitationState() const; /** Check for prefixes @p prefixRegExps in @p str. If none is found, @p newPrefix + ' ' is prepended to @p str and the - resulting string is returned. If @p tqreplace is true, any + resulting string is returned. If @p replace is true, any sequence of whitespace-delimited prefixes at the beginning of - @p str is tqreplaced by @p newPrefix. + @p str is replaced by @p newPrefix. **/ - static TQString tqreplacePrefixes( const TQString& str, + static TQString replacePrefixes( const TQString& str, const TQStringList& prefixRegExps, bool tqreplace, const TQString& newPrefix ); @@ -423,9 +423,9 @@ public: /** Check for prefixes @p prefixRegExps in #subject(). If none is found, @p newPrefix + ' ' is prepended to the subject and the - resulting string is returned. If @p tqreplace is true, any + resulting string is returned. If @p replace is true, any sequence of whitespace-delimited prefixes at the beginning of - #subject() is tqreplaced by @p newPrefix + #subject() is replaced by @p newPrefix **/ TQString cleanSubject(const TQStringList& prefixRegExps, bool tqreplace, const TQString& newPrefix) const; @@ -450,10 +450,10 @@ protected: short mIndexLength; bool mDirty; bool mEnableUndo; - mutable KMMsgStatus mStatus; + mutable KMMsgtqStatus mtqStatus; // This is kept to provide an upgrade path from the the old single status // to the new multiple status scheme. - mutable KMLegacyMsgStatus mLegacyStatus; + mutable KMLegacyMsgtqStatus mLegacytqStatus; public: enum MsgPartType diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp index 07f5797d0..223a8adf9 100644 --- a/kmail/kmmsgdict.cpp +++ b/kmail/kmmsgdict.cpp @@ -92,7 +92,7 @@ public: if (index >= 0) { int size = array.size(); if (index >= size) { - int newsize = QMAX(size + 25, index + 1); + int newsize = TQMAX(size + 25, index + 1); array.resize(newsize); for (int j = size; j < newsize; j++) array.at(j) = 0; @@ -215,10 +215,10 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum, } if (index == -1) - index = folder->find(msg); + index = folder->tqfind(msg); // Should not happen, indicates id file corruption - while (dict->find((long)msn)) { + while (dict->tqfind((long)msn)) { msn = getNextMsgSerNum(); folder->setDirty( true ); // rewrite id file } @@ -251,7 +251,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum, { KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() ); if ( !folder ) { - kdDebug(5006) << "KMMsgDict::tqreplace: Cannot tqreplace the message serial " + kdDebug(5006) << "KMMsgDict::tqreplace: Cannot replace the message serial " << "number, null pointer to storage. Requested serial: " << msgSerNum << endl; kdDebug(5006) << " Message info: Subject: " << msg->subject() << ", To: " @@ -260,7 +260,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum, } if ( index == -1 ) - index = folder->find( msg ); + index = folder->tqfind( msg ); remove( msgSerNum ); KMMsgDictEntry *entry = new KMMsgDictEntry( folder->folder(), index ); @@ -279,7 +279,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum, void KMMsgDict::remove(unsigned long msgSerNum) { long key = (long)msgSerNum; - KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find(key); + KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind(key); if (!entry) return; @@ -303,7 +303,7 @@ unsigned long KMMsgDict::remove(const KMMsgBase *msg) void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex) { - KMMsgDictREntry *rentry = msg->parent()->storage()->rDict(); + KMMsgDictREntry *rentry = msg->tqparent()->storage()->rDict(); if (rentry) { KMMsgDictEntry *entry = rentry->get(index); if (entry) { @@ -319,7 +319,7 @@ void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex) void KMMsgDict::getLocation(unsigned long key, KMFolder **retFolder, int *retIndex) const { - KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find((long)key); + KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind((long)key); if (entry) { *retFolder = (KMFolder *)entry->folder; *retIndex = entry->index; @@ -448,7 +448,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage ) if (swapByteOrder) msn = kmail_swap_32(msn); - if (!readOk || dict->find(msn)) { + if (!readOk || dict->tqfind(msn)) { for (unsigned int i = 0; i < index; i++) { msn = rentry->getMsn(i); dict->remove((long)msn); diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp index 9a7b1ed88..2d678bf19 100644 --- a/kmail/kmmsginfo.cpp +++ b/kmail/kmmsginfo.cpp @@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other) delete kd; kd = 0; } - mStatus = other.status(); + mtqStatus = other.status(); return *this; } #endif @@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg) kd->strippedSubjectMD5 = msg.strippedSubjectMD5(); kd->msgIdMD5 = msg.msgIdMD5(); kd->xmark = msg.xmark(); - mStatus = msg.status(); + mtqStatus = msg.status(); kd->folderOffset = msg.folderOffset(); kd->msgSize = msg.msgSize(); kd->date = msg.date(); @@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg) //----------------------------------------------------------------------------- void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, const TQCString& aTo, time_t aDate, - KMMsgStatus aStatus, const TQCString& aXMark, + KMMsgtqStatus atqStatus, const TQCString& aXMark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, KMMsgEncryptionState encryptionState, @@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, kd->msgIdMD5 = base64EncodedMD5( msgId ); kd->xmark = aXMark; kd->folderOffset = aFolderOffset; - mStatus = aStatus; + mtqStatus = atqStatus; kd->msgSize = aMsgSize; kd->date = aDate; kd->file = ""; @@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, const TQCString& aTo, time_t aDate, - KMMsgStatus aStatus, const TQCString& aXMark, + KMMsgtqStatus atqStatus, const TQCString& aXMark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, const TQCString& aFileName, @@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, size_t aMsgSizeServer, ulong aUID) { // use the "normal" init for most stuff - init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId, + init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId, msgId, encryptionState, signatureState, mdnSentState, prefCharset, (unsigned long)0, aMsgSize, aMsgSizeServer, aUID ); kd->file = aFileName; @@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx ) } //----------------------------------------------------------------------------- -KMMsgStatus KMMsgInfo::status(void) const +KMMsgtqStatus KMMsgInfo::status(void) const { - if (mStatus == KMMsgStatusUnknown) { - KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart); + if (mtqStatus == KMMsgStatusUnknown) { + KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart); if (!st) { // We are opening an old index for the first time, get the legacy // status and merge it in. - mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart); + mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart); st = KMMsgStatusRead; - switch (mLegacyStatus) { + switch (mLegacytqStatus) { case KMLegacyMsgStatusUnknown: st = KMMsgStatusUnknown; break; @@ -525,9 +525,9 @@ KMMsgStatus KMMsgInfo::status(void) const } } - mStatus = st; + mtqStatus = st; } - return mStatus; + return mtqStatus; } @@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file) } //----------------------------------------------------------------------------- -void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx) +void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx) { - if(aStatus == status()) + if(atqStatus == status()) return; - KMMsgBase::seStatus(aStatus, idx); //base does more "stuff" + KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff" } //----------------------------------------------------------------------------- @@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8) kd->folderOffset = str.mid(2,9).toULong(); kd->msgSize = str.mid(12,9).toULong(); kd->date = (time_t)str.mid(22,10).toULong(); - mStatus = (KMMsgStatus)str.at(0); + mtqStatus = (KMMsgtqStatus)str.at(0); if (toUtf8) { kd->subject = str.mid(37, 100).stripWhiteSpace(); kd->fromStrip = str.mid(138, 50).stripWhiteSpace(); diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index ce15e3127..567354483 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -29,7 +29,7 @@ class KMMessage; class KMMsgInfo: public KMMsgBase { public: - KMMsgInfo(KMFolder* parent, off_t off=0, short len=0); + KMMsgInfo(KMFolder* tqparent, off_t off=0, short len=0); virtual ~KMMsgInfo(); /** left for old style index files */ @@ -39,7 +39,7 @@ public: /** Initialize with given values and set dirty flag to FALSE. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, - KMMsgStatus status, const TQCString& xmark, + KMMsgtqStatus status, const TQCString& xmark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, @@ -53,7 +53,7 @@ public: /** Initialize with given values and set dirty flag to FALSE. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, - KMMsgStatus status, const TQCString& xmark, + KMMsgtqStatus status, const TQCString& xmark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, @@ -78,7 +78,7 @@ public: virtual bool subjectIsPrefixed() const; virtual TQString msgIdMD5(void) const; virtual TQString fileName(void) const; - virtual KMMsgStatus status(void) const; + virtual KMMsgtqStatus status(void) const; virtual KMMsgEncryptionState encryptionState() const; virtual KMMsgSignatureState signatureState() const; virtual KMMsgMDNSentState mdnSentState() const; @@ -91,7 +91,7 @@ public: void setMsgSizeServer(size_t sz); void setFolderOffset(off_t offs); void setFileName(const TQString& file); - virtual void seStatus(const KMMsgStatus status, int idx = -1); + virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); virtual void setDate(time_t aUnixTime); virtual void setSubject(const TQString&); virtual void setXMark(const TQString&); @@ -107,7 +107,7 @@ public: virtual void setTo( const TQString &to ); /** Grr.. c++! */ - virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } + virtual void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); } virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); } virtual bool dirty(void) const; diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index a96d6aae2..9e71f285d 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -45,7 +45,7 @@ KMMessagePart::KMMessagePart( TQDataStream & stream ) KPIM::kAsciiToUpper( mOriginalContentTypeStr.data() ); // set the type - int sep = mOriginalContentTypeStr.find('/'); + int sep = mOriginalContentTypeStr.tqfind('/'); mType = mOriginalContentTypeStr.left(sep); mSubtype = mOriginalContentTypeStr.mid(sep+1); @@ -70,11 +70,11 @@ void KMMessagePart::clear() mContentDisposition = TQCString(); mBody.truncate( 0 ); mAdditionalCTypeParamStr = TQCString(); - mName = TQString::null; + mName = TQString(); mParameterAttribute = TQCString(); - mParameterValue = TQString::null; + mParameterValue = TQString(); mCharset = TQCString(); - mPartSpecifier = TQString::null; + mPartSpecifier = TQString(); mBodyDecodedSize = 0; mParent = 0; mLoadHeaders = false; @@ -87,7 +87,7 @@ void KMMessagePart::duplicate( const KMMessagePart & msgPart ) { // copy the data of msgPart *this = msgPart; - // detach the explicitely shared QByteArray + // detach the explicitely shared TQByteArray mBody.detach(); } @@ -103,7 +103,7 @@ int KMMessagePart::decodedSize(void) const //----------------------------------------------------------------------------- void KMMessagePart::setBody(const TQCString &aStr) { - KMail::Util::setFromQCString( mBody, aStr ); + KMail::Util::setFromTQCString( mBody, aStr ); int enc = cte(); if (enc == DwMime::kCte7bit || enc == DwMime::kCte8bit || enc == DwMime::kCteBinary) @@ -422,10 +422,10 @@ void KMMessagePart::magicSetType(bool aAutoDecode) KMimeMagic::self()->setFollowLinks( true ); // is it necessary ? const TQByteArray body = ( aAutoDecode ) ? bodyDecodedBinary() : mBody ; - KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferType( body ); + KMimeMagicResult * result = KMimeMagic::self()->findBufferType( body ); TQString mimetype = result->mimeType(); - const int sep = mimetype.find('/'); + const int sep = mimetype.tqfind('/'); mType = mimetype.left(sep).latin1(); mSubtype = mimetype.mid(sep+1).latin1(); } @@ -438,14 +438,14 @@ TQString KMMessagePart::iconName( int size ) const KPIM::kAsciiToLower( mimeType.data() ); TQString fileName = - KMimeType::mimeType( mimeType )->icon( TQString::null, false ); + KMimeType::mimeType( mimeType )->icon( TQString(), false ); if ( fileName.isEmpty() ) { fileName = this->fileName(); if ( fileName.isEmpty() ) fileName = this->name(); if ( !fileName.isEmpty() ) { - fileName = KMimeType::tqfindByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true ); + fileName = KMimeType::findByPath( "/tmp/"+fileName, 0, true )->icon( TQString(), true ); } } @@ -568,19 +568,19 @@ TQString KMMessagePart::fileName(void) const // Standard RFC 2047-encoded // search the start of the filename - int startOfFilename = mContentDisposition.find("filename=", 0, false); + int startOfFilename = mContentDisposition.tqfind("filename=", 0, false); if (startOfFilename < 0) - return TQString::null; + return TQString(); startOfFilename += 9; // search the end of the filename int endOfFilename; if ( '"' == mContentDisposition[startOfFilename] ) { startOfFilename++; // the double quote isn't part of the filename - endOfFilename = mContentDisposition.find('"', startOfFilename) - 1; + endOfFilename = mContentDisposition.tqfind('"', startOfFilename) - 1; } else { - endOfFilename = mContentDisposition.find(';', startOfFilename) - 1; + endOfFilename = mContentDisposition.tqfind(';', startOfFilename) - 1; } if (endOfFilename < 0) endOfFilename = 32767; @@ -591,7 +591,7 @@ TQString KMMessagePart::fileName(void) const return KMMsgBase::decodeRFC2047String(str); } - return TQString::null; + return TQString(); } TQCString KMMessagePart::body() const diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 85906af5f..8ab55358d 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -63,12 +63,12 @@ public: TQString bodyToUnicode(const TQTextCodec* codec=0) const; /** Returns body as decoded string. Assumes that content-transfer-encoding - tqcontains the correct encoding. This routine is meant for binary data. + contains the correct encoding. This routine is meant for binary data. No trailing 0 is appended. */ TQByteArray bodyDecodedBinary(void) const; /** Returns body as decoded string. Assumes that content-transfer-encoding - tqcontains the correct encoding. This routine is meant for text strings! */ + contains the correct encoding. This routine is meant for text strings! */ TQCString bodyDecoded(void) const; /** Sets body, encoded in the best fitting @@ -100,8 +100,8 @@ public: This one is for text strings, the trailing 0 is not used. For speed reasons, prefer setBodyEncodedBinary. - When possible (the TQCString isn't used afterwards), change setBodyEncoded(myQCString) into: - setBodyEncodedBinary(byteArrayFromQCStringNoDetach(myQCString)); + When possible (the TQCString isn't used afterwards), change setBodyEncoded(myTQCString) into: + setBodyEncodedBinary(byteArrayFromTQCStringNoDetach(myTQCString)); */ void setBodyEncoded(const TQCString& aStr); @@ -209,13 +209,13 @@ public: /** Sets the part number */ void setPartSpecifier( const TQString & part ) { mPartSpecifier = part; } - /** If this part is complete (tqcontains a body) */ + /** If this part is complete (contains a body) */ bool isComplete() { return (!mBody.isNull()); } - /** Returns the parent part */ - KMMessagePart* parent() { return mParent; } + /** Returns the tqparent part */ + KMMessagePart* tqparent() { return mParent; } - /** Set the parent of this part */ + /** Set the tqparent of this part */ void setParent( KMMessagePart* part ) { mParent = part; } /** Returns true if the headers should be loaded */ diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index e87fbd8ac..386f4af60 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -21,7 +21,7 @@ #include <kcombobox.h> #include <kdebug.h> -// other Qt includes: +// other TQt includes: #include <tqlabel.h> #include <tqlayout.h> #include <tqwhatsthis.h> @@ -44,10 +44,10 @@ static const int numEncodingTypes = sizeof encodingTypes / sizeof *encodingTypes; KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, - TQWidget * parent, const char * name ) + TQWidget * tqparent, const char * name ) : KDialogBase( Plain, caption.isEmpty() ? i18n("Message Part Properties") : caption, - Ok|Cancel|Help, Ok, parent, name, true, true) + Ok|Cancel|Help, Ok, tqparent, name, true, true) { // tmp vars: TQGridLayout * glay; @@ -331,8 +331,8 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) { -KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * parent, const char *, bool readOnly) - : KMMsgPartDialog(TQString::null, parent ), mMsgPart( 0 ) +KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * tqparent, const char *, bool readOnly) + : KMMsgPartDialog(TQString(), tqparent ), mMsgPart( 0 ) { setShownEncodings( SevenBit|EightBit|QuotedPrintable|Base64 ); if (readOnly) @@ -370,7 +370,7 @@ void KMMsgPartDialogCompat::setMsgPart( KMMessagePart * aMsgPart ) setMimeType( mMsgPart->typeStr(), mMsgPart->subtypeStr() ); setSize( mMsgPart->decodedSize() ); setInline( mMsgPart->contentDisposition() - .find( TQRegExp("^\\s*inline", false) ) >= 0 ); + .tqfind( TQRegExp("^\\s*inline", false) ) >= 0 ); } @@ -408,7 +408,7 @@ void KMMsgPartDialogCompat::applyChanges() // apply Content-Type: TQCString type = mimeType().latin1(); TQCString subtype; - int idx = type.find('/'); + int idx = type.tqfind('/'); if ( idx < 0 ) subtype = ""; else { diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index d53b7d565..eb69c0bec 100644 --- a/kmail/kmmsgpartdlg.h +++ b/kmail/kmmsgpartdlg.h @@ -39,10 +39,11 @@ class TQLineEdit; class KMMsgPartDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KMMsgPartDialog( const TQString & caption=TQString::null, - TQWidget * parent=0, const char * name=0 ); + KMMsgPartDialog( const TQString & caption=TQString(), + TQWidget * tqparent=0, const char * name=0 ); virtual ~KMMsgPartDialog(); /** Get the currently selected mimetype */ @@ -139,8 +140,9 @@ protected: */ class KMMsgPartDialogCompat : public KMMsgPartDialog { Q_OBJECT + TQ_OBJECT public: - KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE ); + KMMsgPartDialogCompat( TQWidget * tqparent=0, const char * caption=0, bool=FALSE ); virtual ~KMMsgPartDialogCompat(); /** Display information about this message part. */ diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 3139aa32f..0936df8a2 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -30,11 +30,11 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial : KListView(aParent) { mDialog=aDialog; - int mDownIndex=addColumn(TQIconSet(TQPixmap(mDown)), TQString::null, 24); + int mDownIndex=addColumn(TQIconSet(TQPixmap(mDown)), TQString(), 24); assert( mDownIndex == Down ); //This code relies on the fact that radiobuttons are the first three columns for easier Column-Action mapping //it does not necessarily be true - you could redefine mapToColumn and mapToAction to eg. shift those numbers by 1 - addColumn(TQIconSet(TQPixmap(mLater)), TQString::null, 24); - addColumn(TQIconSet(TQPixmap(mDel)), TQString::null, 24); + addColumn(TQIconSet(TQPixmap(mLater)), TQString(), 24); + addColumn(TQIconSet(TQPixmap(mDel)), TQString(), 24); /*int subjCol =*/ addColumn(i18n("Subject"), 180); /*int sendCol =*/ addColumn(i18n("Sender"), 150); @@ -44,10 +44,10 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial setAllColumnsShowFocus(true); - setColumnAlignment(Down, Qt::AlignHCenter); - setColumnAlignment(Later, Qt::AlignHCenter); - setColumnAlignment(Delete, Qt::AlignHCenter); - setColumnAlignment(sizeCol, Qt::AlignRight); + setColumnAlignment(Down, TQt::AlignHCenter); + setColumnAlignment(Later, TQt::AlignHCenter); + setColumnAlignment(Delete, TQt::AlignHCenter); + setColumnAlignment(sizeCol, TQt::AlignRight); setSorting(dateCol, false); setShowSortIndicator(true); diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h index 76744d7ce..8055faeae 100644 --- a/kmail/kmpopfiltercnfrmdlg.h +++ b/kmail/kmpopfiltercnfrmdlg.h @@ -36,6 +36,7 @@ class KMPopFilterCnfrmDlg; class KMPopHeadersView : public KListView { Q_OBJECT + TQ_OBJECT public: KMPopHeadersView(TQWidget *aParent=0, KMPopFilterCnfrmDlg *aDialog=0); @@ -78,6 +79,7 @@ class KMPopFilterCnfrmDlg : public KDialogBase { friend class ::KMPopHeadersView; Q_OBJECT + TQ_OBJECT protected: KMPopFilterCnfrmDlg() { }; TQMap<TQListViewItem*, KMPopHeaders*> mItemMap; diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 375234c09..840608178 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -156,15 +156,15 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg, menuBar()->show(); toolBar( "mainToolBar" )->show(); - connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); + connect ( msg->tqparent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); } void KMReaderMainWin::slotFolderRemoved( TQObject* folderPtr ) { assert(mMsg); - assert(folderPtr == mMsg->parent()); - if( mMsg && folderPtr == mMsg->parent() ) + assert(folderPtr == mMsg->tqparent()); + if( mMsg && folderPtr == mMsg->tqparent() ) mMsg->setParent( 0 ); } @@ -181,18 +181,18 @@ void KMReaderMainWin::slotTrashMsg() if ( !mMsg ) return; // find the real msg by its sernum - KMFolder* parent; + KMFolder* tqparent; int index; - KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &parent, &index ); - if ( parent && !parent->isTrash() ) { + KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &tqparent, &index ); + if ( tqparent && !tqparent->isTrash() ) { // open the folder (ref counted) - parent->open("trashmsg"); - KMMessage *msg = parent->getMsg( index ); + tqparent->open("trashmsg"); + KMMessage *msg = tqparent->getMsg( index ); if (msg) { - KMDeleteMsgCommand *command = new KMDeleteMsgCommand( parent, msg ); + KMDeleteMsgCommand *command = new KMDeleteMsgCommand( tqparent, msg ); command->start(); } - parent->close("trashmsg"); + tqparent->close("trashmsg"); } close(); } @@ -235,9 +235,9 @@ void KMReaderMainWin::slotPrintMsg() void KMReaderMainWin::slotForwardInlineMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->parent() ) { + if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { command = new KMForwardInlineCommand( this, mReaderWin->message(), - mReaderWin->message()->parent()->identity() ); + mReaderWin->message()->tqparent()->identity() ); } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } @@ -250,9 +250,9 @@ void KMReaderMainWin::slotForwardInlineMsg() void KMReaderMainWin::slotForwardAttachedMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->parent() ) { + if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { command = new KMForwardAttachedCommand( this, mReaderWin->message(), - mReaderWin->message()->parent()->identity() ); + mReaderWin->message()->tqparent()->identity() ); } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } @@ -265,9 +265,9 @@ void KMReaderMainWin::slotForwardAttachedMsg() void KMReaderMainWin::slotForwardDigestMsg() { KMCommand *command = 0; - if ( mReaderWin->message() && mReaderWin->message()->parent() ) { + if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) { command = new KMForwardDigestCommand( this, mReaderWin->message(), - mReaderWin->message()->parent()->identity() ); + mReaderWin->message()->tqparent()->identity() ); } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } @@ -362,8 +362,8 @@ void KMReaderMainWin::setupAccel() //----- Edit Menu KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() ); - KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() ); - KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection() ); + KStdAction::tqfind( this, TQT_SLOT(slotFind()), actionCollection() ); + KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() ); mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), Key_Delete, this, TQT_SLOT( slotTrashMsg() ), @@ -487,9 +487,9 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo return; } - if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() || - aMsg.parent()->isDrafts() || - aMsg.parent()->isTemplates() ) ) ) { + if ( ! ( aMsg.tqparent() && ( aMsg.tqparent()->isSent() || + aMsg.tqparent()->isDrafts() || + aMsg.tqparent()->isTemplates() ) ) ) { // add the reply and forward actions only if we are not in a sent-mail, // templates or drafts folder // diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h index a4d8e9725..83d872676 100644 --- a/kmail/kmreadermainwin.h +++ b/kmail/kmreadermainwin.h @@ -25,6 +25,7 @@ class MessageActions; class KMReaderMainWin : public KMail::SecondaryWindow { Q_OBJECT + TQ_OBJECT public: KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 ); diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 0fce722d3..a6b3c1d51 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -136,7 +136,7 @@ using KMail::TeeHtmlWriter; #include <paths.h> #endif -class NewByteArray : public QByteArray +class NewByteArray : public TQByteArray { public: NewByteArray &appendNULL(); @@ -274,21 +274,21 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node, DwHeaders * headers( (part && part->hasHeaders()) ? &part->Headers() - : ( (weAreReplacingTheRootNode || !dataNode->parentNode()) + : ( (weAreReplacingTheRootNode || !dataNode->tqparentNode()) ? &rootHeaders : 0 ) ); if( dataNode == curNode ) { kdDebug(5006) << "dataNode == curNode: Save curNode without replacing it." << endl; // A) Store the headers of this part IF curNode is not the root node - // AND we are not replacing a node that already *has* tqreplaced + // 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->parentNode() && !weAreReplacingTheRootNode ) { + if( dataNode->tqparentNode() && !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() ){ -kdDebug(5006) << "dataNode tqreplace the root node: Do NOT store the headers but change" << endl; +kdDebug(5006) << "dataNode replace the root node: Do NOT store the headers but change" << endl; kdDebug(5006) << " the Message's headers accordingly." << endl; kdDebug(5006) << " old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl; kdDebug(5006) << " new Content-Type = " << headers->ContentType( ).AsString().c_str() << endl; @@ -309,10 +309,10 @@ kdDebug(5006) << " new Content-Type = " << headers->ContentType( // B) Store the body of this part. if( headers && bIsMultipart && dataNode->firstChild() ) { -kdDebug(5006) << "is valid Multipart, processing children:" << endl; +kdDebug(5006) << "is valid Multipart, processing tqchildren:" << endl; TQCString boundary = headers->ContentType().Boundary().c_str(); curNode = dataNode->firstChild(); - // store children of multipart + // store tqchildren of multipart while( curNode ) { kdDebug(5006) << "--boundary" << endl; if( resultingData.size() && @@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl; resultingData += boundary; resultingData += "\n"; // note: We are processing a harmless multipart that is *not* - // to be tqreplaced by one of it's children, therefor + // to be replaced by one of it's tqchildren, therefor // we set their doStoreHeaders to true. objectTreeToDecryptedMsg( curNode, resultingData, @@ -336,7 +336,7 @@ kdDebug(5006) << "--boundary--" << endl; resultingData += "\n--"; resultingData += boundary; resultingData += "--\n\n"; -kdDebug(5006) << "Multipart processing children - DONE" << endl; +kdDebug(5006) << "Multipart processing tqchildren - DONE" << endl; } else if( part ){ // store simple part kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl; @@ -345,13 +345,13 @@ 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->parentNode(); + bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->tqparentNode(); if( rootNodeReplaceFlag ) { -kdDebug(5006) << " Root node will be tqreplaced." << endl; +kdDebug(5006) << " Root node will be replaced." << endl; } else { -kdDebug(5006) << " Root node will NOT be tqreplaced." << endl; +kdDebug(5006) << " Root node will NOT be replaced." << endl; } - // store special data to tqreplace the current part + // store special data to replace the current part // (e.g. decrypted data or embedded RfC 822 data) objectTreeToDecryptedMsg( dataNode, resultingData, @@ -386,7 +386,7 @@ kdDebug(5006) << " Root node will NOT be tqreplaced." << en void KMReaderWin::createWidgets() { TQVBoxLayout * vlay = new TQVBoxLayout( this ); - mSplitter = new TQSplitter( Qt::Vertical, this, "mSplitter" ); + mSplitter = new TQSplitter( TQt::Vertical, this, "mSplitter" ); vlay->addWidget( mSplitter ); mMimePartTree = new KMMimePartTree( this, mSplitter, "mMimePartTree" ); mBox = new TQHBox( mSplitter, "mBox" ); @@ -406,7 +406,7 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, KActionCollection* actionCollection, const char *aName, int aFlags ) - : TQWidget(aParent, aName, aFlags | Qt::WDestructiveClose), + : TQWidget(aParent, aName, aFlags | TQt::WDestructiveClose), mSerNumOfOriginalMessage( 0 ), mNodeIdOffset( -1 ), mAttachmentStrategy( 0 ), @@ -1002,7 +1002,7 @@ void KMReaderWin::initHtmlWidget(void) if ( !htmlWriter() ) #ifdef KMAIL_READER_HTML_DEBUG - mHtmlWriter = new TeeHtmlWriter( new FileHtmlWriter( TQString::null ), + mHtmlWriter = new TeeHtmlWriter( new FileHtmlWriter( TQString() ), new KHtmlPartHtmlWriter( mViewer, 0 ) ); #else mHtmlWriter = new KHtmlPartHtmlWriter( mViewer, 0 ); @@ -1033,7 +1033,7 @@ void KMReaderWin::contacStatusChanged( const TQString &uid) kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl; kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl; TQString newPresence = kmkernel->imProxy()->presenceString( uid ); - if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString::null ) + if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() ) newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" ); n.firstChild().setNodeValue( newPresence ); // kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl; @@ -1088,7 +1088,7 @@ void KMReaderWin::setOverrideEncoding( const TQString & encoding ) kdWarning(5006) << "Unknown override character encoding \"" << encoding << "\". Using Auto instead." << endl; mSelectEncodingAction->setCurrentItem( 0 ); - mOverrideEncoding = TQString::null; + mOverrideEncoding = TQString(); } } } @@ -1364,7 +1364,7 @@ void KMReaderWin::displayAboutPage() "an incoming as well as outgoing mail account." "</p>\n") ); } else { - info = info.arg( TQString::null ); + info = info.arg( TQString() ); } if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) { @@ -1465,7 +1465,7 @@ void KMReaderWin::displayMessage() { htmlWriter()->begin( mCSSHelper->cssDefinitions( isFixedFont() ) ); htmlWriter()->queue( mCSSHelper->htmlHead( isFixedFont() ) ); - if (!parent()) + if (!tqparent()) setCaption(msg->subject()); removeTempFiles(); @@ -1592,7 +1592,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) kdDebug(5006) << "\n\n\nKMReaderWin::parseMsg() - special post-encryption handling:\n1." << endl; kdDebug(5006) << "(aMsg == msg) = " << (aMsg == message()) << endl; -kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()) << endl; +kdDebug(5006) << "aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() = " << (aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder()) << endl; kdDebug(5006) << "message_was_saved_decrypted_before( aMsg ) = " << message_was_saved_decrypted_before( aMsg ) << endl; kdDebug(5006) << "this->decryptMessage() = " << decryptMessage() << endl; kdDebug(5006) << "otp.hasPendingAsyncJobs() = " << otp.hasPendingAsyncJobs() << endl; @@ -1602,7 +1602,7 @@ kdDebug(5006) << "|| (KMMsgPartiallyEncrypted == encryptionState) = " << (KMMsgP // double click on the message (==not running in a separate window) if( (aMsg == message()) // don't remove encryption in the outbox folder :) - && ( aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() ) + && ( aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() ) // only proceed if this message was not saved encryptedly before && !message_was_saved_decrypted_before( aMsg ) // only proceed if the message has actually been decrypted @@ -1653,7 +1653,7 @@ kdDebug(5006) << "KMReaderWin - composing unencrypted message" << endl; if( emitReplaceMsgByUnencryptedVersion ) { kdDebug(5006) << "KMReaderWin - invoce saving in decrypted form:" << endl; - emit tqreplaceMsgByUnencryptedVersion(); + emit replaceMsgByUnencryptedVersion(); } else { kdDebug(5006) << "KMReaderWin - finished parsing and displaying of message." << endl; showHideMimeTree( rootNodeCntType == DwMime::kTypeText && @@ -1708,7 +1708,7 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart, size = KMail::Util::crlf2lf( data.data(), size ); } if( !KPIM::kBytesToFile( data.data(), size, fname, false, false, false ) ) - return TQString::null; + return TQString(); mTempFiles.append( fname ); // make file read-only so that nobody gets the impression that he might @@ -1720,7 +1720,7 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart, TQString KMReaderWin::createTempDir( const TQString ¶m ) { - KTempFile *tempFile = new KTempFile( TQString::null, "." + param ); + KTempFile *tempFile = new KTempFile( TQString(), "." + param ); tempFile->setAutoDelete( true ); TQString fname = tempFile->name(); delete tempFile; @@ -1729,7 +1729,7 @@ TQString KMReaderWin::createTempDir( const TQString ¶m ) // Not there or not writable if( ::mkdir( TQFile::encodeName( fname ), 0 ) != 0 || ::chmod( TQFile::encodeName( fname ), S_IRWXU ) != 0 ) - return TQString::null; //failed create + return TQString(); //failed create assert( !fname.isNull() ); @@ -1814,7 +1814,7 @@ void KMReaderWin::slotTouchMessage() message()->encryptionState() != KMMsgEncryptionStateUnknown ) return; - KMFolder *folder = message()->parent(); + KMFolder *folder = message()->tqparent(); if (folder && (folder->isOutbox() || folder->isSent() || folder->isTrash() || folder->isDrafts() || folder->isTemplates() ) ) @@ -1845,15 +1845,15 @@ bool foundSMIMEData( const TQString aUrl, displayName = ""; libName = ""; keyId = ""; - int i1 = aUrl.find( showCertMan ); + int i1 = aUrl.tqfind( showCertMan ); if( -1 < i1 ) { i1 += showCertMan.length(); - int i2 = aUrl.find(" ### ", i1); + int i2 = aUrl.tqfind(" ### ", i1); if( i1 < i2 ) { displayName = aUrl.mid( i1, i2-i1 ); i1 = i2+5; - i2 = aUrl.find(" ### ", i1); + i2 = aUrl.tqfind(" ### ", i1); if( i1 < i2 ) { libName = aUrl.mid( i1, i2-i1 ); @@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl) } if ( aUrl.stripWhiteSpace().isEmpty() ) { - KPIM::BroadcasStatus::instance()->reset(); + KPIM::BroadcastqStatus::instance()->reset(); mHoveredUrl = KURL(); mLastClickImagePath = TQString(); return; @@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl) const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this ); kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl; - KPIM::BroadcasStatus::instance()->setTransienStatusMsg( msg ); + KPIM::BroadcastqStatus::instance()->setTransienStatusMsg( msg ); } @@ -1916,7 +1916,7 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &) return; kdWarning( 5006 ) << "KMReaderWin::slotOpenUrl(): Unhandled URL click!" << endl; - emit urlClicked( aUrl, Qt::LeftButton ); + emit urlClicked( aUrl, TQt::LeftButton ); } //----------------------------------------------------------------------------- @@ -1940,7 +1940,7 @@ void KMReaderWin::slotUrlPopup(const TQString &aUrl, const TQPoint& aPos) } } -// Checks if the given node has a parent node that is a DIV which has an ID attribute +// Checks if the given node has a tqparent node that is a DIV which has an ID attribute // with the value specified here static bool hasParentDivWithId( const DOM::Node &start, const TQString &id ) { @@ -1955,8 +1955,8 @@ static bool hasParentDivWithId( const DOM::Node &start, const TQString &id ) } } - if ( !start.parentNode().isNull() ) - return hasParentDivWithId( start.parentNode(), id ); + if ( !start.tqparentNode().isNull() ) + return hasParentDivWithId( start.tqparentNode(), id ); else return false; } @@ -1971,7 +1971,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem(i18n("to view something", "View"), 3); menu->insertItem(SmallIcon("filesaveas"),i18n("Save As..."), 4); menu->insertItem(SmallIcon("editcopy"), i18n("Copy"), 9 ); - const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : false; + const bool canChange = message()->tqparent() ? !message()->tqparent()->isReadOnly() : false; if ( GlobalSettings::self()->allowAttachmentEditing() && canChange ) menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 ); if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange ) @@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice ) if (!url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::clipboard()->setData( drag, QClipboard::Clipboard ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); } else if ( choice == 10 ) { // Scroll To scrollToAttachment( node ); } @@ -2050,13 +2050,13 @@ void KMReaderWin::slotHandleAttachment( int choice ) //----------------------------------------------------------------------------- void KMReaderWin::slotFind() { - mViewer->tqfindText(); + mViewer->findText(); } //----------------------------------------------------------------------------- void KMReaderWin::slotFindNext() { - mViewer->tqfindTextNext(); + mViewer->findTextNext(); } //----------------------------------------------------------------------------- @@ -2084,7 +2084,7 @@ void KMReaderWin::atmViewMsg( KMMessagePart* aMsgPart, int nodeId ) assert(msg != 0); msg->setMsgSerNum( 0 ); // because lookups will fail // some information that is needed for imap messages with LOD - msg->setParent( message()->parent() ); + msg->setParent( message()->tqparent() ); msg->setUID(message()->UID()); msg->setReadyToShow(true); KMReaderMainWin *win = new KMReaderMainWin(); @@ -2138,7 +2138,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, ObjectTreeParser otp( this ); otp.writeBodyStr( str, overrideCodec() ? overrideCodec() : aMsgPart->codec(), - message() ? message()->from() : TQString::null ); + message() ? message()->from() : TQString() ); } htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); @@ -2190,8 +2190,8 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, // A TQString cannot handle binary data. So if it's shorter than the // attachment, we assume the attachment is binary: if( str.length() < (unsigned) aMsgPart->decodedSize() ) { - str.prepend( i18n("[KMail: Attachment tqcontains binary data. Trying to show first character.]", - "[KMail: Attachment tqcontains binary data. Trying to show first %n characters.]", + str.prepend( i18n("[KMail: Attachment contains binary data. Trying to show first character.]", + "[KMail: Attachment contains binary data. Trying to show first %n characters.]", str.length()) + TQChar('\n') ); } htmlWriter()->queue( TQStyleSheet::escape( str ) ); @@ -2270,13 +2270,13 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) ); if ( mimetype->name() == "application/octet-stream" ) { // consider the filename if Content-Type is application/octet-stream - mimetype = KMimeType::tqfindByPath( name, 0, true /* no disk access */ ); + mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ ); } if ( ( mimetype->name() == "application/octet-stream" ) && msgPart.isComplete() ) { // consider the attachment's contents if neither the Content-Type header // nor the filename give us a clue - mimetype = KMimeType::tqfindByFileContent( name ); + mimetype = KMimeType::findByFileContent( name ); } KService::Ptr offer = @@ -2476,8 +2476,8 @@ void KMReaderWin::slotUrlClicked() { KMMainWidget *mainWidget = dynamic_cast<KMMainWidget*>(mMainWindow); uint identity = 0; - if ( message() && message()->parent() ) { - identity = message()->parent()->identity(); + if ( message() && message()->tqparent() ) { + identity = message()->tqparent()->identity(); } KMCommand *command = new KMUrlClickedCommand( mClickedUrl, identity, this, @@ -2636,8 +2636,8 @@ static TQString linkForNode( const DOM::Node &node ) return href.nodeValue().string(); } } - if ( !node.parentNode().isNull() ) { - return linkForNode( node.parentNode() ); + if ( !node.tqparentNode().isNull() ) { + return linkForNode( node.tqparentNode() ); } else { return TQString(); } @@ -2905,7 +2905,7 @@ static TQColor nextColor( const TQColor & c ) { int h, s, v; c.hsv( &h, &s, &v ); - return TQColor( (h + 50) % 360, QMAX(s, 64), v, TQColor::Hsv ); + return TQColor( (h + 50) % 360, TQMAX(s, 64), v, TQColor::Hsv ); } TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor ) @@ -3000,7 +3000,7 @@ void KMReaderWin::setBodyPartMemento( const partNode * node, const TQCString & w BodyPartMemento * KMReaderWin::bodyPartMemento( const partNode * node, const TQCString & which ) const { const TQCString index = node->path() + ':' + which.lower(); - const std::map<TQCString,BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.find( index ); + const std::map<TQCString,BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.tqfind( index ); if ( it == mBodyPartMementoMap.end() ) { return 0; } diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 27bc33b0e..4db8f05d3 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -75,6 +75,7 @@ namespace KParts { class KMReaderWin: public TQWidget, public KMail::Interface::Observer { Q_OBJECT + TQ_OBJECT friend void KMMimePartTree::itemClicked( TQListViewItem* item ); friend void KMMimePartTree::itemRightClicked( TQListViewItem* item, const TQPoint & ); @@ -85,7 +86,7 @@ class KMReaderWin: public TQWidget, public KMail::Interface::Observer { friend class KMail::KHtmlPartHtmlWriter; public: - KMReaderWin( TQWidget *parent, + KMReaderWin( TQWidget *tqparent, TQWidget *mainWindow, KActionCollection *actionCollection, const char *name=0, @@ -323,7 +324,7 @@ public: /* show or hide the list that points to the attachments */ void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; } - // This controls whether a Toltec invitation is shown in its raw form or as a tqreplacement text. + // This controls whether a Toltec invitation is shown in its raw form or as a replacement text. // This can be toggled with the "kmail:showRawToltecMail" link. bool showRawToltecMail() const { return mShowRawToltecMail; } void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; } @@ -331,9 +332,9 @@ public: /* retrieve BodyPartMemento of id \a which for partNode \a node */ KMail::Interface::BodyPartMemento * bodyPartMemento( const partNode * node, const TQCString & which ) const; - /* set/tqreplace BodyPartMemento \a memento of id \a which for + /* set/replace BodyPartMemento \a memento of id \a which for partNode \a node. If there was a BodyPartMemento registered - already, tqreplaces (deletes) that one. */ + already, replaces (deletes) that one. */ void setBodyPartMemento( const partNode * node, const TQCString & which, KMail::Interface::BodyPartMemento * memento ); /// Scrolls to the given attachment and marks it with a yellow border @@ -347,7 +348,7 @@ private: signals: /** Emitted after parsing of a message to have it stored in unencrypted state in it's folder. */ - void tqreplaceMsgByUnencryptedVersion(); + void replaceMsgByUnencryptedVersion(); /** The user presses the right mouse button. 'url' may be 0. */ void popupMenu(KMMessage &msg, const KURL &url, const TQPoint& mousePos); @@ -493,7 +494,7 @@ protected: TQString writeMsgHeader(KMMessage* aMsg, partNode *vCardNode = 0, bool topLevel=false ); /** Writes the given message part to a temporary file and returns the - name of this file or TQString::null if writing failed. + name of this file or TQString() if writing failed. */ TQString writeMessagePartToTempFile( KMMessagePart* msgPart, int partNumber ); diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index dc2cc4a1c..4af3d68a0 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -41,7 +41,7 @@ static const int numFuncConfigNames = sizeof funcConfigNames / sizeof *funcConfi struct _statusNames { const char* name; - KMMsgStatus status; + KMMsgtqStatus status; }; static struct _statusNames statusNames[] = { @@ -104,7 +104,7 @@ KMSearchRule * KMSearchRule::createInstance( const TQCString & field, { KMSearchRule *ret = 0; if (field == "<status>") - ret = new KMSearchRuleStatus( field, func, contents ); + ret = new KMSearchRuletqStatus( field, func, contents ); else if ( field == "<age in days>" || field == "<size>" ) ret = new KMSearchRuleNumerical( field, func, contents ); else @@ -281,10 +281,10 @@ bool KMSearchRuleString::matches( const DwString & aStr, KMMessage & msg, rc = ( ( function() & 1 ) == 1 ); else { start += headerLen; - size_t stop = aStr.find( '\n', start ); + size_t stop = aStr.tqfind( '\n', start ); char ch = '\0'; while ( stop != DwString::npos && ( ( ch = aStr.at( stop + 1 ) ) == ' ' || ch == '\t' ) ) - stop = aStr.find( '\n', stop + 1 ); + stop = aStr.tqfind( '\n', stop + 1 ); const int len = stop == DwString::npos ? aStr.length() - start : stop - start ; const TQCString codedValue( aStr.data() + start, len + 1 ); const TQString msgContents = KMMsgBase::decodeRFC2047String( codedValue ).stripWhiteSpace(); // FIXME: This needs to be changed for IDN support. @@ -357,7 +357,7 @@ bool KMSearchRuleString::matches( const KMMessage * msg ) const msgContents = msg->headerAsString(); logContents = false; } else if ( field() == "<recipients>" ) { - // (mmutz 2001-11-05) hack to fix "<recipients> !tqcontains foo" to + // (mmutz 2001-11-05) hack to fix "<recipients> !contains foo" to // meet user's expectations. See FAQ entry in KDE 2.2.2's KMail // handbook if ( function() == FuncEquals || function() == FuncNotEqual ) @@ -419,10 +419,10 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const return ( TQString::compare( msgContents.lower(), contents().lower() ) != 0 ); case KMSearchRule::FuncContains: - return ( msgContents.find( contents(), 0, false ) >= 0 ); + return ( msgContents.tqfind( contents(), 0, false ) >= 0 ); case KMSearchRule::FuncContainsNot: - return ( msgContents.find( contents(), 0, false ) < 0 ); + return ( msgContents.tqfind( contents(), 0, false ) < 0 ); case KMSearchRule::FuncRegExp: { @@ -455,7 +455,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const for( TQStringList::ConstIterator it = addressList.begin(); ( it != addressList.end() ); ++it ) { - if ( !stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() ) + if ( !stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() ) return true; } return false; @@ -468,7 +468,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const for( TQStringList::ConstIterator it = addressList.begin(); ( it != addressList.end() ); ++it ) { - if ( stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() ) + if ( stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() ) return true; } return false; @@ -481,7 +481,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const for( TQStringList::ConstIterator it = addressList.begin(); it != addressList.end(); ++it ) { - KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ); + KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) ); for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd ) if ( (*itAd).hasCategory(category) ) @@ -498,7 +498,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const for( TQStringList::ConstIterator it = addressList.begin(); it != addressList.end(); ++it ) { - KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ); + KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) ); for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd ) if ( (*itAd).hasCategory(category) ) @@ -576,10 +576,10 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue, return ( numericalValue != numericalMsgContents ); case KMSearchRule::FuncContains: - return ( msgContents.find( contents(), 0, false ) >= 0 ); + return ( msgContents.tqfind( contents(), 0, false ) >= 0 ); case KMSearchRule::FuncContainsNot: - return ( msgContents.find( contents(), 0, false ) < 0 ); + return ( msgContents.tqfind( contents(), 0, false ) < 0 ); case KMSearchRule::FuncRegExp: { @@ -622,35 +622,35 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue, //================================================== // -// class KMSearchRuleStatus +// class KMSearchRuletqStatus // //================================================== -TQString englishNameForStatus( const KMMsgStatus& status ) +TQString englishNameFortqStatus( const KMMsgtqStatus& status ) { for ( int i=0; i< numStatusNames; i++ ) { if ( statusNames[i].status == status ) { return statusNames[i].name; } } - return TQString::null; + return TQString(); } -KMSearchRuleStatus::KMSearchRuleStatus( const TQCString & field, +KMSearchRuletqStatus::KMSearchRuletqStatus( const TQCString & field, Function func, const TQString & aContents ) : KMSearchRule(field, func, aContents) { // the values are always in english, both from the conf file as well as // the patternedit gui - mStatus = statusFromEnglishName( aContents ); + mtqStatus = statusFromEnglishName( aContents ); } -KMSearchRuleStatus::KMSearchRuleStatus( int status, Function func ) -: KMSearchRule( "<status>", func, englishNameForStatus( status ) ) +KMSearchRuletqStatus::KMSearchRuletqStatus( int status, Function func ) +: KMSearchRule( "<status>", func, englishNameFortqStatus( status ) ) { - mStatus = status; + mtqStatus = status; } -KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusString ) +KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aStatusString ) { for ( int i=0; i< numStatusNames; i++ ) { if ( !aStatusString.compare( statusNames[i].name ) ) { @@ -660,33 +660,33 @@ KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusS return KMMsgStatusUnknown; } -bool KMSearchRuleStatus::isEmpty() const +bool KMSearchRuletqStatus::isEmpty() const { return field().stripWhiteSpace().isEmpty() || contents().isEmpty(); } -bool KMSearchRuleStatus::matches( const DwString &, KMMessage &, +bool KMSearchRuletqStatus::matches( const DwString &, KMMessage &, const DwBoyerMoore *, int ) const { assert( 0 ); return false; // don't warn } -bool KMSearchRuleStatus::matches( const KMMessage * msg ) const +bool KMSearchRuletqStatus::matches( const KMMessage * msg ) const { - KMMsgStatus msgStatus = msg->status(); + KMMsgtqStatus msgtqStatus = msg->status(); bool rc = false; switch ( function() ) { case FuncEquals: // fallthrough. So that "<status> 'is' 'read'" works case FuncContains: - if (msgStatus & mStatus) + if (msgtqStatus & mtqStatus) rc = true; break; case FuncNotEqual: // fallthrough. So that "<status> 'is not' 'read'" works case FuncContainsNot: - if (! (msgStatus & mStatus) ) + if (! (msgtqStatus & mtqStatus) ) rc = true; break; // FIXME what about the remaining funcs, how can they make sense for diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index a79b6122a..4c2cb75de 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -10,7 +10,7 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqcstring.h> -#include "kmmsgbase.h" // for KMMsgStatus +#include "kmmsgbase.h" // for KMMsgtqStatus class KMMessage; class KConfig; @@ -48,7 +48,7 @@ public: FuncIsInCategory, FuncIsNotInCategory, FuncHasAttachment, FuncHasNoAttachment}; KMSearchRule ( const TQCString & field=0, Function=FuncContains, - const TQString &contents=TQString::null ); + const TQString &contents=TQString() ); KMSearchRule ( const KMSearchRule &other ); const KMSearchRule & operator=( const KMSearchRule & other ); @@ -57,7 +57,7 @@ public: priate subclass depending on the @p field. */ static KMSearchRule* createInstance( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); + const TQString & contents=TQString() ); static KMSearchRule* createInstance( const TQCString & field, const char * function, @@ -160,7 +160,7 @@ class KMSearchRuleString : public KMSearchRule { public: KMSearchRuleString( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); + const TQString & contents=TQString() ); KMSearchRuleString( const KMSearchRuleString & other ); const KMSearchRuleString & operator=( const KMSearchRuleString & other ); @@ -195,7 +195,7 @@ class KMSearchRuleNumerical : public KMSearchRule { public: KMSearchRuleNumerical( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); + const TQString & contents=TQString() ); virtual bool isEmpty() const ; virtual bool matches( const KMMessage * msg ) const; @@ -208,13 +208,13 @@ public: namespace KMail { // The below are used in several places and here so they are accessible. - struct MessageStatus { + struct MessagetqStatus { const char * const text; const char * const icon; }; // If you change the ordering here; also do it in the enum below - static const MessageStatus StatusValues[] = { + static const MessagetqStatus StatusValues[] = { { I18N_NOOP( "Important" ), "kmmsgflag" }, { I18N_NOOP( "New" ), "kmmsgnew" }, { I18N_NOOP( "Unread" ), "kmmsgunseen" }, @@ -255,7 +255,7 @@ namespace KMail { }; static const int StatusValueCount = - sizeof( StatusValues ) / sizeof( MessageStatus ); + sizeof( StatusValues ) / sizeof( MessagetqStatus ); // we want to show all status entries in the quick search bar, but only the // ones up to attachment in the search/filter dialog, because there the // attachment case is handled separately. @@ -267,12 +267,12 @@ namespace KMail { @short This class represents a search pattern rule operating on message status. */ -class KMSearchRuleStatus : public KMSearchRule +class KMSearchRuletqStatus : public KMSearchRule { public: - KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains, - const TQString & contents=TQString::null ); - KMSearchRuleStatus( int status, Function function=FuncContains ); + KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains, + const TQString & contents=TQString() ); + KMSearchRuletqStatus( int status, Function function=FuncContains ); virtual bool isEmpty() const ; virtual bool matches( const KMMessage * msg ) const; @@ -280,9 +280,9 @@ public: virtual bool matches( const DwString &, KMMessage &, const DwBoyerMoore *, int ) const; - static KMMsgStatus statusFromEnglishName(const TQString&); + static KMMsgtqStatus statusFromEnglishName(const TQString&); private: - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; }; // ------------------------------------------------------------------------ @@ -365,7 +365,7 @@ public: */ void readConfig( const KConfig * config ); /** Writes itself into @p config. The group has to be preset. Tries - to delete old-style keys by overwriting them with TQString::null. + to delete old-style keys by overwriting them with TQString(). Derived classes reimplementing writeConfig() should also call this method, or else the rules will not be stored. diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index 5f7c96cbd..84005f2b7 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -37,7 +37,7 @@ static const struct { { "<recipients>", I18N_NOOP( "All Recipients" ) }, { "<size>", I18N_NOOP( "Size in Bytes" ) }, { "<age in days>", I18N_NOOP( "Age in Days" ) }, - { "<status>", I18N_NOOP( "Message Status" ) }, + { "<status>", I18N_NOOP( "Message tqStatus" ) }, { "Subject", I18N_NOOP( "Subject" ) }, { "From", I18N_NOOP( "From" ) }, { "To", I18N_NOOP( "To" ) }, @@ -54,10 +54,10 @@ static const int SpecialRuleFieldsCount = // //============================================================================= -KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *parent, KMSearchRule *aRule, +KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *tqparent, KMSearchRule *aRule, const char *name, bool headersOnly, bool absoluteDates ) - : TQWidget( parent, name ), + : TQWidget( tqparent, name ), mRuleField( 0 ), mFunctionStack( 0 ), mValueStack( 0 ), @@ -88,7 +88,7 @@ void KMSearchRuleWidget::setHeadersOnly( bool headersOnly ) ( currentText != "<body>")) mRuleField->changeItem( TQString::fromAscii( currentText ), 0 ); else - mRuleField->changeItem( TQString::null, 0 ); + mRuleField->changeItem( TQString(), 0 ); } void KMSearchRuleWidget::initWidget() @@ -146,7 +146,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule ) mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 ); i = 0; } else { // found in the list of predefined fields - mRuleField->changeItem( TQString::null, 0 ); + mRuleField->changeItem( TQString(), 0 ); } mRuleField->setCurrentItem( i ); @@ -282,8 +282,8 @@ void KMSearchRuleWidget::slotRuleFieldChanged( const TQString & field ) // //============================================================================= -KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *parent, const char* name, bool headersOnly, bool absoluteDates ) - : KWidgetLister( 2, FILTER_MAX_RULES, parent, name ) +KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *tqparent, const char* name, bool headersOnly, bool absoluteDates ) + : KWidgetLister( 2, FILTER_MAX_RULES, tqparent, name ) { mRuleList = 0; mHeadersOnly = headersOnly; @@ -321,10 +321,10 @@ void KMSearchRuleWidgetLister::setRuleList( TQPtrList<KMSearchRule> *aList ) mRuleList->removeLast(); } - // HACK to workaround regression in Qt 3.1.3 and Qt 3.2.0 (fixes bug #63537) - setNumberOfShownWidgetsTo( QMAX((int)mRuleList->count(),mMinWidgets)+1 ); + // HACK to workaround regression in TQt 3.1.3 and TQt 3.2.0 (fixes bug #63537) + setNumberOfShownWidgetsTo( TQMAX((int)mRuleList->count(),mMinWidgets)+1 ); // set the right number of widgets - setNumberOfShownWidgetsTo( QMAX((int)mRuleList->count(),mMinWidgets) ); + setNumberOfShownWidgetsTo( TQMAX((int)mRuleList->count(),mMinWidgets) ); // load the actions into the widgets TQPtrListIterator<KMSearchRule> rIt( *mRuleList ); @@ -357,9 +357,9 @@ void KMSearchRuleWidgetLister::reset() slotClear(); } -TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *parent ) +TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *tqparent ) { - return new KMSearchRuleWidget(parent, 0, 0, mHeadersOnly, mAbsoluteDates); + return new KMSearchRuleWidget(tqparent, 0, 0, mHeadersOnly, mAbsoluteDates); } void KMSearchRuleWidgetLister::clearWidget( TQWidget *aWidget ) @@ -391,15 +391,15 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets() // //============================================================================= -KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates ) - : TQGroupBox( 1/*columns*/, Horizontal, parent, name ) +KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates ) + : TQGroupBox( 1/*columns*/, Horizontal, tqparent, name ) { setTitle( i18n("Search Criteria") ); initLayout( headersOnly, absoluteDates ); } -KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates) - : TQGroupBox( 1/*column*/, Horizontal, title, parent, name ) +KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates) + : TQGroupBox( 1/*column*/, Horizontal, title, tqparent, name ) { initLayout( headersOnly, absoluteDates ); } diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index 3fee81e1b..307a7ae2f 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -37,15 +37,16 @@ class KMSearchPatternEdit; @author Marc Mutz <Marc@Mutz.com> */ -class KMSearchRuleWidget : public QWidget +class KMSearchRuleWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** Constructor. You can give a KMSearchRule as parameter, which will be used to initialize the widget. */ - KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); + KMSearchRuleWidget( TQWidget* tqparent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); - enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, Status, + enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus, Subject, From, To, CC, ReplyTo, Organization }; /** Set whether only header fields can be searched. If @p is true only @@ -105,11 +106,12 @@ private: class KMSearchRuleWidgetLister : public KWidgetLister { Q_OBJECT + TQ_OBJECT friend class ::KMSearchPatternEdit; public: - KMSearchRuleWidgetLister( TQWidget *parent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); + KMSearchRuleWidgetLister( TQWidget *tqparent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); virtual ~KMSearchRuleWidgetLister(); @@ -121,7 +123,7 @@ public slots: protected: virtual void clearWidget( TQWidget *aWidget ); - virtual TQWidget* createWidget( TQWidget *parent ); + virtual TQWidget* createWidget( TQWidget *tqparent ); private: void regenerateRuleListFromWidgets(); @@ -165,13 +167,14 @@ private: class KMSearchPatternEdit : public TQGroupBox { Q_OBJECT + TQ_OBJECT public: - /** Constructor. The parent and name parameters are passed to the underlying + /** Constructor. The tqparent and name parameters are passed to the underlying TQGroupBox, as usual. */ - KMSearchPatternEdit(TQWidget *parent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); + KMSearchPatternEdit(TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); /** Constructor. This one allows you to set a title different from i18n("Search Criteria"). */ - KMSearchPatternEdit(const TQString & title, TQWidget *parent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); + KMSearchPatternEdit(const TQString & title, TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false); ~KMSearchPatternEdit(); /** Set the search pattern. Rules are inserted regardless of the diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 208bf5746..1d267d88c 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -80,7 +80,7 @@ KMSender::~KMSender() void KMSender::seStatusMsg(const TQString &msg) { if ( mProgressItem ) - mProgressItem->seStatus(msg); + mProgressItem->setqStatus(msg); } //----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) KMFolder * const outbox = kmkernel->outboxFolder(); const KMFolderOpener openOutbox( outbox, "outbox" ); - aMsg->seStatus(KMMsgStatusQueued); + aMsg->setqStatus(KMMsgStatusQueued); if ( const int err = outbox->addMsg(aMsg) ) { Q_UNUSED( err ); @@ -178,7 +178,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) * the mail is in a sane state before sending. The unGet makes the * attached unencrypted version of the mail (if there is one ) disappear. * though, so we need to make sure to keep it around and restore it - * afterwards. The real fix would be to tqreplace the unGet with + * afterwards. The real fix would be to replace the unGet with * whatever parsing is triggered by it, but I'm too chicken to do that, * in this branch. * Note that the unencrypted mail will be lost if the mail remains in @@ -293,7 +293,7 @@ void KMSender::doSendMsg() { mCurrentMsg->setTransferInProgress( false ); if( mCurrentMsg->hasUnencryptedMsg() ) { - kdDebug(5006) << "KMSender::doSendMsg() post-processing: tqreplace mCurrentMsg body by unencryptedMsg data" << endl; + kdDebug(5006) << "KMSender::doSendMsg() post-processing: replace mCurrentMsg body by unencryptedMsg data" << endl; // delete all current body parts mCurrentMsg->deleteBodyParts(); // copy Content-[..] headers from unencrypted message to current one @@ -314,8 +314,8 @@ void KMSender::doSendMsg() mCurrentMsg->addBodyPart( &msgPart ); } } - mCurrentMsg->seStatus(KMMsgStatusSent); - mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap + mCurrentMsg->setqStatus(KMMsgStatusSent); + mCurrentMsg->setqStatus(KMMsgStatusRead); // otherwise it defaults to new on imap mCurrentMsg->updateAttachmentState(); mCurrentMsg->updateInvitationState(); @@ -363,9 +363,9 @@ void KMSender::doSendMsg() // Disable the emitting of msgAdded signal, because the message is taken out of the // current folder (outbox) and re-added, to make filter actions changing the message // work. We don't want that to screw up message counts. - if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( true ); + if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( true ); const int processResult = kmkernel->filterMgr()->process(mCurrentMsg,KMFilterMgr::Outbound); - if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( false ); + if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( false ); // 0==processed ok, 1==no filter matched, 2==critical error, abort! switch (processResult) { @@ -401,13 +401,13 @@ void KMSender::doSendMsg() break; } seStatusByLink( mCurrentMsg ); - if (mCurrentMsg->parent() && !imapSentFolder) { + if (mCurrentMsg->tqparent() && !imapSentFolder) { // for speed optimization, this code assumes that mCurrentMsg is the - // last one in it's parent folder; make sure that's really the case: - assert( mCurrentMsg->parent()->find( mCurrentMsg ) - == mCurrentMsg->parent()->count() - 1 ); + // last one in it's tqparent folder; make sure that's really the case: + assert( mCurrentMsg->tqparent()->tqfind( mCurrentMsg ) + == mCurrentMsg->tqparent()->count() - 1 ); // unGet this message: - mCurrentMsg->parent()->unGetMsg( mCurrentMsg->parent()->count() -1 ); + mCurrentMsg->tqparent()->unGetMsg( mCurrentMsg->tqparent()->count() -1 ); } mCurrentMsg = 0; @@ -710,7 +710,7 @@ void KMSender::slotIdle() mFailedMessages++; // reset cached password TQMapIterator <TQString,TQString> pc; - if ( (pc = mPasswdCache.find( mMethodStr )) != mPasswdCache.end() ) { + if ( (pc = mPasswdCache.tqfind( mMethodStr )) != mPasswdCache.end() ) { mPasswdCache.erase(pc); } // Sending of message failed. @@ -788,7 +788,7 @@ void KMSender::setSendQuotedPrintable(bool aSendQuotedPrintable) //----------------------------------------------------------------------------- KMSendProc* KMSender::createSendProcFromString( const TQString & transport ) { - mTransportInfo->type = TQString::null; + mTransportInfo->type = TQString(); int nr = KMTransportInfo::findTransport(transport); if (nr) { @@ -800,7 +800,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport ) mTransportInfo->auth = false; mTransportInfo->encryption = "NONE"; TQString serverport = transport.mid(7); - int colon = serverport.find(':'); + int colon = serverport.tqfind(':'); if (colon != -1) { mTransportInfo->host = serverport.left(colon); mTransportInfo->port = serverport.mid(colon + 1); @@ -815,7 +815,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport ) mTransportInfo->auth = false; mTransportInfo->encryption = "ssl"; TQString serverport = transport.mid(7); - int colon = serverport.find(':'); + int colon = serverport.tqfind(':'); if (colon != -1) { mTransportInfo->host = serverport.left(colon); mTransportInfo->port = serverport.mid(colon + 1); @@ -850,7 +850,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) int n = 0; while (1) { ulong msn; - KMMsgStatus status; + KMMsgtqStatus status; aMsg->getLink(n, &msn, &status); if (!msn || !status) break; @@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) new KMDeleteMsgCommand( folder, folder->getMsg( index ) ); cmd->start(); } else { - folder->seStatus(index, status); + folder->setqStatus(index, status); } } else { kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl; @@ -891,7 +891,7 @@ void KMSendProc::reset() { mSending = false; mSendOk = false; - mLastErrorMessage = TQString::null; + mLastErrorMessage = TQString(); } //----------------------------------------------------------------------------- @@ -1082,8 +1082,8 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const if (ti->auth) { - TQMapIterator<TQString,TQString> tpc = mSender->mPasswdCache.find( ti->name ); - TQString tpwd = ( tpc != mSender->mPasswdCache.end() )?(*tpc):TQString::null; + TQMapIterator<TQString,TQString> tpc = mSender->mPasswdCache.tqfind( ti->name ); + TQString tpwd = ( tpc != mSender->mPasswdCache.end() )?(*tpc):TQString(); if ( ti->passwd().isEmpty() ) ti->setPasswd( tpwd ); @@ -1098,7 +1098,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const TQString passwd = ti->passwd(); result = KIO::PasswordDialog::getNameAndPassword(ti->user, passwd, &b, i18n("You need to supply a username and a password to use this " - "SMTP server."), false, TQString::null, ti->name, TQString::null); + "SMTP server."), false, TQString(), ti->name, TQString()); if ( result != TQDialog::Accepted ) { @@ -1188,7 +1188,7 @@ void KMSendSMTP::doFinish() { void KMSendSMTP::dataReq(KIO::Job *, TQByteArray &array) { // Send it by 32K chuncks - const int chunkSize = QMIN( mMessageLength - mMessageOffset, 32*1024 ); + const int chunkSize = TQMIN( mMessageLength - mMessageOffset, 32*1024 ); if ( chunkSize > 0 ) { array.duplicate(mMessage.data() + mMessageOffset, chunkSize); mMessageOffset += chunkSize; diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 600737fe4..3c7c6c0ec 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -53,6 +53,7 @@ namespace KPIM { class KMSender: public TQObject, public KMail::MessageSender { Q_OBJECT + TQ_OBJECT friend class ::KMSendProc; friend class ::KMSendSendmail; friend class ::KMSendSMTP; diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index a842027a1..a541e1530 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -20,9 +20,10 @@ namespace KIO { class Slave; } -class KMSendProc: public QObject +class KMSendProc: public TQObject { Q_OBJECT + TQ_OBJECT public: KMSendProc(KMSender*); @@ -86,6 +87,7 @@ protected: class KMSendSendmail: public KMSendProc { Q_OBJECT + TQ_OBJECT public: KMSendSendmail(KMSender*); ~KMSendSendmail(); @@ -116,6 +118,7 @@ private: class KMSendSMTP : public KMSendProc { Q_OBJECT + TQ_OBJECT public: KMSendSMTP(KMSender *sender); ~KMSendSMTP(); diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index c184e6dfc..b99e1cc95 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -112,17 +112,17 @@ void KMServerTest::slotData(KIO::Job *, const TQString &data) void KMServerTest::slotMetaData( const KIO::MetaData & md ) { - KIO::MetaData::const_iterator it = md.find( "PLAIN AUTH METHODS" ); + KIO::MetaData::const_iterator it = md.tqfind( "PLAIN AUTH METHODS" ); if ( it != md.end() ) { mAuthNone = it.data(); kdDebug(5006) << "mAuthNone: " << mAuthNone << endl; } - it = md.find( "TLS AUTH METHODS" ); + it = md.tqfind( "TLS AUTH METHODS" ); if ( it != md.end() ) { mAuthTLS = it.data(); kdDebug(5006) << "mAuthTLS: " << mAuthTLS << endl; } - it = md.find( "SSL AUTH METHODS" ); + it = md.tqfind( "SSL AUTH METHODS" ); if ( it != md.end() ) { mAuthSSL = it.data(); kdDebug(5006) << "mAuthSSL: " << mAuthSSL << endl; @@ -142,7 +142,7 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error, if (aSlave != mSlave) return; if ( mSSL && error == 0 ) { // add a dummy entry to the list of SSL capabilities so that the receiver - // of the capabilities signal can use mListSSL.isEmpty() in order to find + // of the capabilities signal can use mListSSL.isEmpty() in order to tqfind // out whether SSL is supported mListSSL.append("SSL"); } diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h index 6c19da1ce..ca2392a7a 100644 --- a/kmail/kmservertest.h +++ b/kmail/kmservertest.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,9 +44,10 @@ namespace KIO { class MetaData; } -class KMServerTest : public QObject +class KMServerTest : public TQObject { Q_OBJECT + TQ_OBJECT public: KMServerTest( const TQString & protocol, const TQString & host, int port ); @@ -65,7 +66,7 @@ protected slots: void slotResult(KIO::Job *job); void slotMetaData( const KIO::MetaData & ); void slotSlaveResult(KIO::Slave *aSlave, int error, - const TQString &errorText = TQString::null); + const TQString &errorText = TQString()); protected: KIO::MetaData slaveConfig() const; diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 9007fe1a5..943a3a2d7 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -43,7 +43,7 @@ #include <unistd.h> #include <tqfile.h> -#undef Status // stupid X headers +#undef tqStatus // stupid X headers extern "C" { @@ -160,7 +160,7 @@ void lockOrDie() { first_instance = true; else if (hostName == oldHostName && oldPid != getpid()) { // check if the lock file is stale -#ifdef Q_OS_LINUX +#ifdef TQ_OS_LINUX if ( ::access("/proc", X_OK ) == 0 ) { // On linux with /proc we can even check that it's really kmail and not something else char path_buffer[MAXPATHLEN + 1]; @@ -200,8 +200,8 @@ void lockOrDie() { "can cause the loss of mail. You should not start %1 " "unless you are sure that it is not already running.") .arg( programName, programName ); - // TQString::arg( st ) only tqreplaces the first occurrence of %1 - // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences + // TQString::arg( st ) only replaces the first occurrence of %1 + // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't // even think about changing the above to .arg( programName ). else @@ -228,7 +228,7 @@ void lockOrDie() { KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == - KMessageBox::warningYesNo( 0, msg, TQString::null, + KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Start %1").arg( programName ), i18n("Exit") ) ) { exit(1); diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index f10faabe6..3a5840a85 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -57,8 +57,8 @@ using KMail::AccountManager; * with its count of unread messages, allowing the user to jump * to the first unread message in each folder. */ -KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) - : KSystemTray( parent, name ), +KMSystemTray::KMSystemTray(TQWidget *tqparent, const char *name) + : KSystemTray( tqparent, name ), mParentVisible( true ), mPosOfMainWin( 0, 0 ), mDesktopOfMainWin( 0 ), @@ -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 - // (apparently the alpha channel isn't changed when the text is drawn). + // (aptqparently 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: @@ -225,11 +225,11 @@ void KMSystemTray::updateCount() // unread messages, but every other approach I tried failed miserably. // IK, 2003-09-22 TQPixmap numberPixmap( oldPixmapWidth, oldPixmapHeight ); - numberPixmap.fill( Qt::white ); + numberPixmap.fill( TQt::white ); TQPainter p( &numberPixmap ); p.setFont( countFont ); - p.setPen( Qt::blue ); - p.drawText( numberPixmap.rect(), Qt::AlignCenter, countString ); + p.setPen( TQt::blue ); + p.drawText( numberPixmap.rect(), TQt::AlignCenter, countString ); numberPixmap.setMask( numberPixmap.createHeuristicMask() ); TQImage numberImage = numberPixmap.convertToImage(); @@ -483,7 +483,7 @@ void KMSystemTray::updateNewMessages() int unread = fldr->countUnread(); TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it = - mFoldersWithUnread.find(fldr); + mFoldersWithUnread.tqfind(fldr); bool unmapped = (it == mFoldersWithUnread.end()); /** If the folder is not mapped yet, increment count by numUnread diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h index 62707464c..1fa144b65 100644 --- a/kmail/kmsystemtray.h +++ b/kmail/kmsystemtray.h @@ -41,9 +41,10 @@ class TQPoint; class KMSystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: /** construtor */ - KMSystemTray(TQWidget* parent=0, const char *name=0); + KMSystemTray(TQWidget* tqparent=0, const char *name=0); /** destructor */ ~KMSystemTray(); diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index dce1ccf07..335025b7d 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -243,9 +243,9 @@ void KMTransportInfo::readPassword() const } -KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name, +KMTransportSelDlg::KMTransportSelDlg( TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok ) + : KDialogBase( tqparent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok ) { TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); @@ -282,9 +282,9 @@ int KMTransportSelDlg::selected( void ) const KMTransportDialog::KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ), + : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ), mServerTest( 0 ), mTransportInfo( transportInfo ), mAuthNone( AllAuth ), mAuthSSL( AllAuth ), mAuthTLS( AllAuth ) @@ -498,7 +498,7 @@ void KMTransportDialog::makeSmtpPage() TQWidget *page2 = new TQWidget( tabWidget ); tabWidget->addTab( page2, i18n("S&ecurity") ); TQVBoxLayout *vlay = new TQVBoxLayout( page2, spacingHint() ); - mSmtp.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mSmtp.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mSmtp.encryptionNone = new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup ); @@ -510,7 +510,7 @@ void KMTransportDialog::makeSmtpPage() TQT_SLOT(slotSmtpEncryptionChanged(int))); vlay->addWidget( mSmtp.encryptionGroup ); - mSmtp.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mSmtp.authLogin = new TQRadioButton( i18n("Please translate this " "authentication method only if you have a good reason", "&LOGIN"), @@ -615,7 +615,7 @@ void KMTransportDialog::saveSettings() void KMTransportDialog::slotSendmailChooser() { - KFileDialog dialog("/", TQString::null, this, 0, true ); + KFileDialog dialog("/", TQString(), this, 0, true ); dialog.setCaption(i18n("Choose sendmail Location") ); if( dialog.exec() == TQDialog::Accepted ) @@ -735,7 +735,7 @@ void KMTransportDialog::checkHighest(TQButtonGroup *btnGroup) { for ( int i = btnGroup->count() - 1; i >= 0 ; --i ) { - TQButton * btn = btnGroup->find(i); + TQButton * btn = btnGroup->tqfind(i); if (btn && btn->isEnabled()) { btn->animateClick(); diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h index bbddedf50..901401e33 100644 --- a/kmail/kmtransport.h +++ b/kmail/kmtransport.h @@ -29,7 +29,7 @@ class TQRadioButton; class KMServerTest; class TQButtonGroup; -class KMTransportInfo : public QObject +class KMTransportInfo : public TQObject { public: KMTransportInfo(); @@ -64,9 +64,10 @@ public: class KMTransportSelDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + KMTransportSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=TRUE ); int selected() const; private slots: @@ -79,10 +80,11 @@ private: class KMTransportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + TQWidget *tqparent=0, const char *name=0, bool modal=TRUE ); virtual ~KMTransportDialog(); private slots: diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp index adec13992..4c17f2344 100644 --- a/kmail/korghelper.cpp +++ b/kmail/korghelper.cpp @@ -29,18 +29,18 @@ void KMail::KorgHelper::ensureRunning() { TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService ); + int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString(), TQString(), &error, &dcopService ); if ( result == 0 ) { // OK, so korganizer (or kontact) is running. Now ensure the object we want is available // [that's not the case when kontact was already running, but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { + if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { kdDebug() << "Loaded " << dcopService << " successfully" << endl; - Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); + Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else kdWarning() << "Error loading " << dcopService << endl; } diff --git a/kmail/kwindowpositioner.h b/kmail/kwindowpositioner.h index d85f5ceec..efb653901 100644 --- a/kmail/kwindowpositioner.h +++ b/kmail/kwindowpositioner.h @@ -23,11 +23,12 @@ #include <tqobject.h> -class QWindow; +class TQWindow; -class KWindowPositioner : public QObject +class KWindowPositioner : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Mode { Right, Bottom }; diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 07d118b22..3c1e1304a 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -101,7 +101,7 @@ void ListJob::execute() ImapAccountBase::jobData jd; jd.total = 1; jd.done = 0; jd.cancellable = true; - jd.parent = mDestFolder; + jd.tqparent = mDestFolder; jd.onlySubscribed = ( mType == ImapAccountBase::ListSubscribed || mType == ImapAccountBase::ListSubscribedNoCheck || mType == ImapAccountBase::ListFolderOnlySubscribed ); @@ -109,16 +109,16 @@ void ListJob::execute() jd.curNamespace = mNamespace; if ( mParentProgressItem ) { - TQString escapedStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() ) - : TQString::null; + TQString escapedtqStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() ) + : TQString(); jd.progressItem = ProgressManager::createProgressItem( mParentProgressItem, "ListDir" + ProgressManager::getUniqueID(), - escapedStatus, + escapedtqStatus, i18n("retrieving folders"), false, mAccount->useSSL() || mAccount->useTLS() ); - mParentProgressItem->seStatus( escapedStatus ); + mParentProgressItem->setqStatus( escapedtqStatus ); } // make the URL @@ -203,8 +203,8 @@ void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds ) for ( KIO::UDSEntryList::ConstIterator udsIt = uds.begin(); udsIt != uds.end(); udsIt++ ) { - mimeType = TQString::null; - attributes = TQString::null; + mimeType = TQString(); + attributes = TQString(); for ( KIO::UDSEntry::ConstIterator eIt = (*udsIt).begin(); eIt != (*udsIt).end(); eIt++ ) { diff --git a/kmail/listjob.h b/kmail/listjob.h index f1adcba61..d12da6bbf 100644 --- a/kmail/listjob.h +++ b/kmail/listjob.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -54,19 +54,20 @@ namespace KMail { class ListJob : public FolderJob { Q_OBJECT + TQ_OBJECT public: /** * Create a new job - * @param storage the parent folder, either provide this or a path + * @param storage the tqparent folder, either provide this or a path * @param account the ImapAccountBase * @param type Type of subscription * @param complete list all folders or only next level * @param path the listing path; * if empty the path of the folder will be taken - * @param item a parent ProgressItem + * @param item a tqparent ProgressItem */ ListJob( ImapAccountBase* account, ImapAccountBase::ListType type, - FolderStorage* storage = 0, const TQString& path = TQString::null, + FolderStorage* storage = 0, const TQString& path = TQString(), bool complete = false, KPIM::ProgressItem* item = 0 ); virtual ~ListJob(); @@ -96,7 +97,7 @@ public: /** Set this to true for a complete listing */ void setComplete( bool complete ) { mComplete = complete; } - /** Set parent progress item */ + /** Set tqparent progress item */ void setParentProgressItem( KPIM::ProgressItem* it ) { mParentProgressItem = it; } diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index a020fa57b..f3ef1f1e4 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,9 +46,9 @@ namespace KMail { -LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *parent, const TQString &caption, +LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption, ImapAccountBase *acct, TQString startPath ) - : SubscriptionDialog( parent, caption, acct, startPath ), + : SubscriptionDialog( tqparent, caption, acct, startPath ), mAccount( acct ) { } diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h index 2061ab278..685bc5151 100644 --- a/kmail/localsubscriptiondialog.h +++ b/kmail/localsubscriptiondialog.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ namespace KMail { class LocalSubscriptionDialog: public SubscriptionDialog { Q_OBJECT + TQ_OBJECT public: - LocalSubscriptionDialog( TQWidget *parent, const TQString &caption, + LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption, ImapAccountBase* acct, - TQString startPath = TQString::null ); + TQString startPath = TQString() ); virtual ~LocalSubscriptionDialog(); protected: diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp index 5833cfe4e..9bf4d74d9 100644 --- a/kmail/maildirjob.cpp +++ b/kmail/maildirjob.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -64,9 +64,9 @@ MaildirJob::~MaildirJob() } //----------------------------------------------------------------------------- -void MaildirJob::setParentFolder( const KMFolderMaildir* parent ) +void MaildirJob::setParentFolder( const KMFolderMaildir* tqparent ) { - mParentFolder = const_cast<KMFolderMaildir*>( parent ); + mParentFolder = const_cast<KMFolderMaildir*>( tqparent ); } diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h index a2209f087..0ab122229 100644 --- a/kmail/maildirjob.h +++ b/kmail/maildirjob.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -41,13 +41,14 @@ namespace KMail { class MaildirJob : public FolderJob { Q_OBJECT + TQ_OBJECT public: MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 ); MaildirJob( TQPtrList<KMMessage>& msgList, const TQString& sets, JobType jt = tGetMessage, KMFolder *folder = 0 ); virtual ~MaildirJob(); - void setParentFolder( const KMFolderMaildir* parent ); + void setParentFolder( const KMFolderMaildir* tqparent ); protected: void execute(); protected slots: diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp index 4483323de..3c9efd147 100644 --- a/kmail/mailinglist-magic.cpp +++ b/kmail/mailinglist-magic.cpp @@ -25,18 +25,18 @@ static TQString check_sender(const KMMessage *message, TQString header = message->headerField( "Sender" ); if ( header.isEmpty() ) - return TQString::null; + return TQString(); if ( header.left( 6 ) == "owner-" ) { header_name = "Sender"; header_value = header; - header = header.mid( 6, header.find( '@' ) - 6 ); + header = header.mid( 6, header.tqfind( '@' ) - 6 ); } else { - int index = header.find( "-owner@ " ); + int index = header.tqfind( "-owner@ " ); if ( index == -1 ) - return TQString::null; + return TQString(); header.truncate( index ); header_name = "Sender"; @@ -52,12 +52,12 @@ static TQString check_x_beenthere(const KMMessage *message, TQString &header_value ) { TQString header = message->headerField( "X-BeenThere" ); - if ( header.isNull() || header.find( '@' ) == -1 ) - return TQString::null; + if ( header.isNull() || header.tqfind( '@' ) == -1 ) + return TQString(); header_name = "X-BeenThere"; header_value = header; - header.truncate( header.find( '@' ) ); + header.truncate( header.tqfind( '@' ) ); return header; } @@ -68,13 +68,13 @@ static TQString check_delivered_to(const KMMessage *message, { TQString header = message->headerField( "Delivered-To" ); if ( header.isNull() || header.left(13 ) != "mailing list" - || header.find( '@' ) == -1 ) - return TQString::null; + || header.tqfind( '@' ) == -1 ) + return TQString(); header_name = "Delivered-To"; header_value = header; - return header.mid( 13, header.find( '@' ) - 13 ); + return header.mid( 13, header.tqfind( '@' ) - 13 ); } /* X-Mailing-List: <?([^@]+) */ @@ -84,17 +84,17 @@ static TQString check_x_mailing_list(const KMMessage *message, { TQString header = message->headerField( "X-Mailing-List"); if ( header.isEmpty() ) - return TQString::null; + return TQString(); - if ( header.find( '@' ) < 1 ) - return TQString::null; + if ( header.tqfind( '@' ) < 1 ) + return TQString(); header_name = "X-Mailing-List"; header_value = header; if ( header[0] == '<' ) - header = header.mid(1, header.find( '@' ) - 1); + header = header.mid(1, header.tqfind( '@' ) - 1); else - header.truncate( header.find( '@' ) ); + header.truncate( header.tqfind( '@' ) ); return header; } @@ -106,15 +106,15 @@ static TQString check_list_id(const KMMessage *message, int lAnglePos, firstDotPos; TQString header = message->headerField( "List-Id" ); if ( header.isEmpty() ) - return TQString::null; + return TQString(); - lAnglePos = header.find( '<' ); + lAnglePos = header.tqfind( '<' ); if ( lAnglePos < 0 ) - return TQString::null; + return TQString(); - firstDotPos = header.find( '.', lAnglePos ); + firstDotPos = header.tqfind( '.', lAnglePos ); if ( firstDotPos < 0 ) - return TQString::null; + return TQString(); header_name = "List-Id"; header_value = header.mid( lAnglePos ); @@ -130,16 +130,16 @@ static TQString check_list_post(const KMMessage *message, { TQString header = message->headerField( "List-Post" ); if ( header.isEmpty() ) - return TQString::null; + return TQString(); - int lAnglePos = header.find( "<mailto:" ); + int lAnglePos = header.tqfind( "<mailto:" ); if ( lAnglePos < 0 ) - return TQString::null; + return TQString(); header_name = "List-Post"; header_value = header; header = header.mid( lAnglePos + 8, header.length()); - header.truncate( header.find('@') ); + header.truncate( header.tqfind('@') ); return header; } @@ -150,14 +150,14 @@ static TQString check_mailing_list(const KMMessage *message, { TQString header = message->headerField( "Mailing-List"); if ( header.isEmpty() ) - return TQString::null; + return TQString(); - if (header.left( 5 ) != "list " || header.find( '@' ) < 5 ) - return TQString::null; + if (header.left( 5 ) != "list " || header.tqfind( '@' ) < 5 ) + return TQString(); header_name = "Mailing-List"; header_value = header; - header = header.mid(5, header.find( '@' ) - 5); + header = header.mid(5, header.tqfind( '@' ) - 5); return header; } @@ -168,14 +168,14 @@ static TQString check_x_loop(const KMMessage *message, TQString &header_value ){ TQString header = message->headerField( "X-Loop"); if ( header.isEmpty() ) - return TQString::null; + return TQString(); - if (header.find( '@' ) < 2 ) - return TQString::null; + if (header.tqfind( '@' ) < 2 ) + return TQString(); header_name = "X-Loop"; header_value = header; - header.truncate(header.find( '@' )); + header.truncate(header.tqfind( '@' )); return header; } @@ -185,11 +185,11 @@ static TQString check_x_ml_name(const KMMessage *message, TQString &header_value ){ TQString header = message->headerField( "X-ML-Name"); if ( header.isEmpty() ) - return TQString::null; + return TQString(); header_name = "X-ML-Name"; header_value = header; - header.truncate(header.find( '@' )); + header.truncate(header.tqfind( '@' )); return header; } @@ -208,7 +208,7 @@ MagicDetectorFunc magic_detector[] = static const int num_detectors = sizeof (magic_detector) / sizeof (magic_detector[0]); -static QStringList +static TQStringList headerToAddress( const TQString& header ) { TQStringList addr; @@ -218,8 +218,8 @@ headerToAddress( const TQString& header ) if ( header.isEmpty() ) return addr; - while ( (start = header.find( "<", start )) != -1 ) { - if ( (end = header.find( ">", ++start ) ) == -1 ) { + while ( (start = header.tqfind( "<", start )) != -1 ) { + if ( (end = header.tqfind( ">", ++start ) ) == -1 ) { kdDebug(5006)<<k_funcinfo<<"Serious mailing list header parsing error !"<<endl; return addr; } @@ -249,16 +249,16 @@ MailingList::detect( const KMMessage *message ) return mlist; } -QString +TQString MailingList::name( const KMMessage *message, TQCString &header_name, TQString &header_value ) { TQString mlist; header_name = TQCString(); - header_value = TQString::null; + header_value = TQString(); if ( !message ) - return TQString::null; + return TQString(); for (int i = 0; i < num_detectors; i++) { mlist = magic_detector[i] (message, header_name, header_value); @@ -266,7 +266,7 @@ MailingList::name( const KMMessage *message, TQCString &header_name, return mlist; } - return TQString::null; + return TQString(); } MailingList::MailingList() @@ -379,7 +379,7 @@ MailingList::setId( const TQString& str ) mId = str; } -QString +TQString MailingList::id() const { return mId; diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 525faf3df..d05d64135 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -45,8 +45,8 @@ using namespace KMail; -MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* parent, KMFolder *folder ) - : KDialogBase( parent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ), +MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* tqparent, KMFolder *folder ) + : KDialogBase( tqparent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ), mFolder( folder ) @@ -59,7 +59,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); - mlGroup->setColumnLayout( 0, Qt::Vertical ); + mlGroup->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); @@ -87,7 +87,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* groupLayout->addMultiCellWidget( mMLId, 4, 4, 1, 2 ); mMLId->setEnabled( false ); - //FIXME: add QWhatsThis + //FIXME: add TQWhatsThis label = new TQLabel( i18n("Preferred handler:"), mlGroup ); label->setEnabled(false); TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), @@ -199,7 +199,7 @@ void MailingListFolderPropertiesDialog::slotDetectMailingList() /* FIXME Till - make work without the folder tree // first try the currently selected message - KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->parent() ); + KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->tqparent() ); int curMsgIdx = folderTree->mainWidget()->headers()->currentItemIndex(); if ( curMsgIdx > 0 ) { KMMessage *mes = mFolder->getMsg( curMsgIdx ); @@ -257,7 +257,7 @@ void MailingListFolderPropertiesDialog::fillMLFromWidgets() for ( TQStringList::ConstIterator it = oldList.begin(); it != oldList.end(); ++it ) { if ( !(*it).startsWith("http:") && !(*it).startsWith("https:") && - !(*it).startsWith("mailto:") && ( (*it).find('@') != -1 ) ) { + !(*it).startsWith("mailto:") && ( (*it).tqfind('@') != -1 ) ) { changed = true; newList << "mailto:" + *it; } diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h index 2a09dab74..f3aa13fa7 100644 --- a/kmail/mailinglistpropertiesdialog.h +++ b/kmail/mailinglistpropertiesdialog.h @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -45,8 +45,9 @@ namespace KMail class MailingListFolderPropertiesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder ); + MailingListFolderPropertiesDialog( TQWidget *tqparent, KMFolder *folder ); ~MailingListFolderPropertiesDialog() {}; protected: void load(); diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp index e7337e810..f5b810a3b 100644 --- a/kmail/mailserviceimpl.cpp +++ b/kmail/mailserviceimpl.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -86,7 +86,7 @@ bool MailServiceImpl::sendMessage( const TQString& to, { kdDebug(5006) << "DCOP call MailTransportServiceIface bool sendMessage(TQString to,TQString cc,TQString bcc,TQString subject,TQString body,KURL::List attachments)" << endl; kdDebug(5006) << "This DCOP call is deprecated. Use the corresponding DCOP call with the additional parameter TQString from instead." << endl; - return sendMessage( TQString::null, to, cc, bcc, subject, body, attachments ); + return sendMessage( TQString(), to, cc, bcc, subject, body, attachments ); } @@ -128,7 +128,7 @@ bool MailServiceImpl::sendMessage( const TQString& to, { kdDebug(5006) << "DCOP call MailTransportServiceIface bool sendMessage(TQString to,TQString cc,TQString bcc,TQString subject,TQString body,TQByteArray attachment)" << endl; kdDebug(5006) << "This DCOP call is deprecated. Use the corresponding DCOP call with the additional parameter TQString from instead." << endl; - return sendMessage( TQString::null, to, cc, bcc, subject, body, attachment ); + return sendMessage( TQString(), to, cc, bcc, subject, body, attachment ); } }//end namespace KMail diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h index 093d0f83f..0fbb415a9 100644 --- a/kmail/mailserviceimpl.h +++ b/kmail/mailserviceimpl.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp index 0cfa11bb3..6d5c4e38c 100644 --- a/kmail/mailsourceviewer.cpp +++ b/kmail/mailsourceviewer.cpp @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -53,13 +53,13 @@ int MailSourceHighlighter::highlightParagraph( const TQString& text, int ) { return 0; } -MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name ) - : KTextBrowser( parent, name ), mSourceHighLighter( 0 ) +MailSourceViewer::MailSourceViewer( TQWidget *tqparent, const char *name ) + : KTextBrowser( tqparent, name ), mSourceHighLighter( 0 ) { setWFlags( WDestructiveClose ); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( Qt::Key_Escape ), this , TQT_SLOT( close() )); - accel->connectItem( accel->insertItem( Qt::Key_W+CTRL ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQT_SLOT( close() )); setWordWrap( KTextBrowser::NoWrap ); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); } @@ -73,9 +73,9 @@ void MailSourceViewer::setText( const TQString& text ) { delete mSourceHighLighter; mSourceHighLighter = 0; if ( text.length() > 500000 ) { - setTextFormat( Qt::LogText ); + setTextFormat( TQt::LogText ); } else { - setTextFormat( Qt::PlainText ); + setTextFormat( TQt::PlainText ); mSourceHighLighter = new MailSourceHighlighter( this ); } KTextBrowser::setText( text ); diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h index 10d242584..d4e60253c 100644 --- a/kmail/mailsourceviewer.h +++ b/kmail/mailsourceviewer.h @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -46,7 +46,7 @@ */ namespace KMail { -class MailSourceHighlighter : public QSyntaxHighlighter +class MailSourceHighlighter : public TQSyntaxHighlighter { public: MailSourceHighlighter( TQTextEdit* edit ) @@ -59,7 +59,7 @@ public: class MailSourceViewer : public KTextBrowser { public: - MailSourceViewer( TQWidget *parent = 0, const char *name = 0 ); + MailSourceViewer( TQWidget *tqparent = 0, const char *name = 0 ); ~MailSourceViewer(); void setText( const TQString& text ); private: diff --git a/kmail/main.cpp b/kmail/main.cpp index b06bf8a45..0cca3cb20 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> -#undef Status // stupid X headers +#undef tqStatus // stupid X headers #include "aboutdata.h" @@ -41,11 +41,11 @@ class KMailApplication : public KUniqueApplication public: KMailApplication() : KUniqueApplication() { }; virtual int newInstance(); - void commitData(QSessionManager& sm); + void commitData(TQSessionManager& sm); }; -void KMailApplication::commitData(QSessionManager& sm) { +void KMailApplication::commitData(TQSessionManager& sm) { kmkernel->dumpDeadLetters(); kmkernel->setShuttingDown( true ); // Prevent further dumpDeadLetters calls KApplication::commitData( sm ); diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index dc8e42f44..b3018fea8 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -29,9 +29,9 @@ inline const TQCheckListItem * qcli_cast( const TQListViewItem * lvi ) { return lvi && lvi->rtti() == 1 ? static_cast<const TQCheckListItem*>( lvi ) : 0 ; } -KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, const char * name ) +KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * tqparent, const char * name ) : KDialogBase( Plain, i18n( "Manage Sieve Scripts" ), Close, Close, - parent, name, false ), + tqparent, name, false ), mSieveEditor( 0 ), mContextMenuItem( 0 ), mWasActive( false ) @@ -126,29 +126,29 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() { } void KMail::ManageSieveScriptsDialog::slotResult( KMail::SieveJob * job, bool success, const TQString &, bool ) { - TQCheckListItem * parent = mJobs[job]; - if ( !parent ) + TQCheckListItem * tqparent = mJobs[job]; + if ( !tqparent ) return; mJobs.remove( job ); - parent->setOpen( true ); + tqparent->setOpen( true ); if ( success ) return; - TQListViewItem * item = new TQListViewItem( parent, i18n( "Failed to fetch the list of scripts" ) ); + TQListViewItem * item = new TQListViewItem( tqparent, i18n( "Failed to fetch the list of scripts" ) ); item->setEnabled( false ); } void KMail::ManageSieveScriptsDialog::slotItem( KMail::SieveJob * job, const TQString & filename, bool isActive ) { - TQCheckListItem * parent = mJobs[job]; - if ( !parent ) + TQCheckListItem * tqparent = mJobs[job]; + if ( !tqparent ) return; - TQCheckListItem * item = new TQCheckListItem( parent, filename, TQCheckListItem::RadioButton ); + TQCheckListItem * item = new TQCheckListItem( tqparent, filename, TQCheckListItem::RadioButton ); if ( isActive ) { item->setOn( true ); - mSelectedItems[parent] = item; + mSelectedItems[tqparent] = item; } } @@ -178,12 +178,12 @@ void KMail::ManageSieveScriptsDialog::slotDeactivateScript() { if ( !mContextMenuItem ) return; - TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() ); - if ( !parent ) + TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() ); + if ( !tqparent ) return; if ( mContextMenuItem->isOn()) { - mSelectedItems[parent] = mContextMenuItem; - changeActiveScript( parent,false ); + mSelectedItems[tqparent] = mContextMenuItem; + changeActiveScript( tqparent,false ); } } @@ -191,12 +191,12 @@ void KMail::ManageSieveScriptsDialog::slotSelectionChanged( TQListViewItem * i ) TQCheckListItem * item = qcli_cast( i ); if ( !item ) return; - TQCheckListItem * parent = qcli_cast( item->parent() ); - if ( !parent ) + TQCheckListItem * tqparent = qcli_cast( item->tqparent() ); + if ( !tqparent ) return; - if ( item->isOn() && mSelectedItems[parent] != item ) { - mSelectedItems[parent] = item; - changeActiveScript( parent,true ); + if ( item->isOn() && mSelectedItems[tqparent] != item ) { + mSelectedItems[tqparent] = item; + changeActiveScript( tqparent,true ); } } @@ -240,14 +240,14 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { if ( !mContextMenuItem->depth() ) return; - TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() ); - if ( !parent ) + TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() ); + if ( !tqparent ) return; - if ( !mUrls.count( parent ) ) + if ( !mUrls.count( tqparent ) ) return; - KURL u = mUrls[parent]; + KURL u = mUrls[tqparent]; if ( u.isEmpty() ) return; @@ -268,10 +268,10 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() { return; if ( !mContextMenuItem->depth() ) return; - TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() ); - if ( !mUrls.count( parent ) ) + TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() ); + if ( !mUrls.count( tqparent ) ) return; - KURL url = mUrls[parent]; + KURL url = mUrls[tqparent]; if ( url.isEmpty() ) return; url.setFileName( mContextMenuItem->text( 0 ) ); @@ -285,7 +285,7 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() { if ( !mContextMenuItem ) return; if ( mContextMenuItem->depth() ) - mContextMenuItem = qcli_cast( mContextMenuItem->parent() ); + mContextMenuItem = qcli_cast( mContextMenuItem->tqparent() ); if ( !mContextMenuItem ) return; @@ -308,11 +308,11 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() { (void) new TQCheckListItem( mContextMenuItem, name, TQCheckListItem::RadioButton ); mCurrentURL = u; - slotGetResult( 0, true, TQString::null, false ); + slotGetResult( 0, true, TQString(), false ); } -KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) - : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, parent, name ) +KMail::SieveEditor::SieveEditor( TQWidget * tqparent, const char * name ) + : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, tqparent, name ) { TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, spacingHint() ); mTextEdit = new TQTextEdit( plainPage() ); diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h index 70c4f6978..73de8465f 100644 --- a/kmail/managesievescriptsdialog.h +++ b/kmail/managesievescriptsdialog.h @@ -15,8 +15,9 @@ class SieveEditor; class ManageSieveScriptsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 ); + ManageSieveScriptsDialog( TQWidget * tqparent=0, const char * name=0 ); ~ManageSieveScriptsDialog(); private slots: diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h index 2ae12ff53..c756ebe31 100644 --- a/kmail/managesievescriptsdialog_p.h +++ b/kmail/managesievescriptsdialog_p.h @@ -9,9 +9,10 @@ namespace KMail { class SieveEditor : public KDialogBase { Q_OBJECT - Q_PROPERTY( TQString script READ script WRITE setScript ) + TQ_OBJECT + TQ_PROPERTY( TQString script READ script WRITE setScript ) public: - SieveEditor( TQWidget * parent=0, const char * name=0 ); + SieveEditor( TQWidget * tqparent=0, const char * name=0 ); ~SieveEditor(); TQString script() const { return mTextEdit->text(); } diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp index 1b6b32233..93f94d43f 100644 --- a/kmail/mboxjob.cpp +++ b/kmail/mboxjob.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -72,9 +72,9 @@ MboxJob::execute() //----------------------------------------------------------------------------- void -MboxJob::setParent( const KMFolderMbox *parent ) +MboxJob::setParent( const KMFolderMbox *tqparent ) { - mParent = const_cast<KMFolderMbox*>( parent ); + mParent = const_cast<KMFolderMbox*>( tqparent ); } //----------------------------------------------------------------------------- @@ -82,14 +82,14 @@ void MboxJob::startJob() { KMMessage *msg = mMsgList.first(); - assert( (msg && ( mParent || msg->parent() )) ); + assert( (msg && ( mParent || msg->tqparent() )) ); switch( mType ) { case tGetMessage: { kdDebug(5006)<<msg<<endl; kdDebug(5006)<<this<<endl; kdDebug(5006)<<"Done"<<endl; - //KMMessage* msg = mParent->getMsg( mParent->find( mMsgList.first() ) ); + //KMMessage* msg = mParent->getMsg( mParent->tqfind( mMsgList.first() ) ); msg->setComplete( true ); emit messageRetrieved( msg ); } diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h index 406edef7d..df9609ae8 100644 --- a/kmail/mboxjob.h +++ b/kmail/mboxjob.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -41,6 +41,7 @@ namespace KMail { class MboxJob : public FolderJob { Q_OBJECT + TQ_OBJECT friend class ::KMFolderMbox; public: MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 ); @@ -49,7 +50,7 @@ public: virtual ~MboxJob(); protected: void execute(); - void setParent( const KMFolderMbox *parent ); + void setParent( const KMFolderMbox *tqparent ); protected slots: void startJob(); private: diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index c1f569925..d899972c2 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -32,9 +32,9 @@ using namespace KMail; -MessageActions::MessageActions( KActionCollection *ac, TQWidget * parent ) : - TQObject( parent ), - mParent( parent ), +MessageActions::MessageActions( KActionCollection *ac, TQWidget * tqparent ) : + TQObject( tqparent ), + mParent( tqparent ), mActionCollection( ac ), mCurrentMessage( 0 ), mMessageView( 0 ) @@ -139,13 +139,13 @@ void MessageActions::setSelectedVisibleSernums(const TQValueList< TQ_UINT32 > & void MessageActions::updateActions() { bool singleMsg = (mCurrentMessage != 0); - if ( mCurrentMessage && mCurrentMessage->parent() ) { - if ( mCurrentMessage->parent()->isTemplates() ) + if ( mCurrentMessage && mCurrentMessage->tqparent() ) { + if ( mCurrentMessage->tqparent()->isTemplates() ) singleMsg = false; } const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage; const bool flagsAvailable = GlobalSettings::self()->allowLocalFlags() || - !((mCurrentMessage && mCurrentMessage->parent()) ? mCurrentMessage->parent()->isReadOnly() : true); + !((mCurrentMessage && mCurrentMessage->tqparent()) ? mCurrentMessage->tqparent()->isReadOnly() : true); mCreateTodoAction->setEnabled( singleMsg ); mReplyActionMenu->setEnabled( singleMsg ); @@ -223,30 +223,30 @@ void MessageActions::slotNoQuoteReplyToMsg() void MessageActions::slotSetMsgStatusNew() { - setMessageStatus( KMMsgStatusNew ); + setMessagetqStatus( KMMsgStatusNew ); } void MessageActions::slotSetMsgStatusUnread() { - setMessageStatus( KMMsgStatusUnread ); + setMessagetqStatus( KMMsgStatusUnread ); } void MessageActions::slotSetMsgStatusRead() { - setMessageStatus( KMMsgStatusRead ); + setMessagetqStatus( KMMsgStatusRead ); } void MessageActions::slotSetMsgStatusFlag() { - setMessageStatus( KMMsgStatusFlag, true ); + setMessagetqStatus( KMMsgStatusFlag, true ); } void MessageActions::slotSetMsgStatusTodo() { - setMessageStatus( KMMsgStatusTodo, true ); + setMessagetqStatus( KMMsgStatusTodo, true ); } -void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle ) +void MessageActions::setMessagetqStatus( KMMsgtqStatus status, bool toggle ) { TQValueList<TQ_UINT32> serNums = mVisibleSernums; if ( serNums.isEmpty() && mCurrentMessage ) @@ -262,7 +262,7 @@ void MessageActions::editCurrentMessage() if ( !mCurrentMessage ) return; KMCommand *command = 0; - KMFolder *folder = mCurrentMessage->parent(); + KMFolder *folder = mCurrentMessage->tqparent(); // edit, unlike send again, removes the message from the folder // we only want that for templates and drafts folders if ( folder && ( kmkernel->folderIsDraftOrOutbox( folder ) || diff --git a/kmail/messageactions.h b/kmail/messageactions.h index fe040c2cf..0cf062562 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -36,11 +36,12 @@ namespace KMail { /** Manages common actions that can be performed on one or more messages. */ -class MessageActions : public QObject +class MessageActions : public TQObject { Q_OBJECT + TQ_OBJECT public: - MessageActions( KActionCollection* ac, TQWidget *parent ); + MessageActions( KActionCollection* ac, TQWidget *tqparent ); void setMessageView( KMReaderWin *msgView ); void setCurrentMessage( KMMessage *msg ); @@ -69,7 +70,7 @@ class MessageActions : public QObject private: void updateActions(); template<typename T> void replyCommand(); - void setMessageStatus( KMMsgStatus status, bool toggle = false ); + void setMessagetqStatus( KMMsgtqStatus status, bool toggle = false ); private slots: void slotReplyToMsg(); diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 2ff7cd6a0..897b03e67 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -521,7 +521,7 @@ void MessageComposer::readFromComposeWin() mEncryptWithChiasmus = mComposeWin->mEncryptWithChiasmus; - mIsRichText = mComposeWin->mEditor->textFormat() == Qt::RichText; + mIsRichText = mComposeWin->mEditor->textFormat() == TQt::RichText; mIdentityUid = mComposeWin->identityUid(); mText = breakLinesAndApplyCodec(); assert( mText.isEmpty() || mText[mText.size()-1] == '\n' ); @@ -1000,7 +1000,7 @@ void MessageComposer::composeMessage() } // -// These are tqreplacements for StructuringInfo(Wrapper): +// These are replacements for StructuringInfo(Wrapper): // // check whether to use multipart/{signed,encrypted} @@ -1137,7 +1137,7 @@ static inline GpgME::Context::SignatureMode signingMode( Kleo::CryptoMessageForm } // -// END tqreplacements for StructuringInfo(Wrapper) +// END replacements for StructuringInfo(Wrapper) // class EncryptMessageJob : public MessageComposerJob { @@ -1475,7 +1475,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage, newbody += "--"; newbody += boundaryCStr; newbody += "--\n"; - bodyData = KMail::Util::byteArrayFromQCStringNoDetach( newbody ); + bodyData = KMail::Util::byteArrayFromTQCStringNoDetach( newbody ); mOldBodyPart.setBodyEncodedBinary( bodyData ); mSaveBoundary = tmpCT.Boundary(); @@ -1527,7 +1527,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage, innerDwPart->Assemble(); TQByteArray tmpbody = KMail::Util::ByteArray( innerDwPart->AsString() ); if ( mIsRichText ) { // and add our mp/a boundary - int boundPos = tmpbody.find( '\n' ); + int boundPos = tmpbody.tqfind( '\n' ); if( -1 < boundPos ) { TQCString bStr( ";\n boundary=\"" ); bStr += mSaveBoundary.c_str(); @@ -1590,7 +1590,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage, // manually add a boundary definition to the Content-Type header if( !mMultipartMixedBoundary.isEmpty() ) { - int boundPos = mEncodedBody.find( '\n' ); + int boundPos = mEncodedBody.tqfind( '\n' ); if( -1 < boundPos ) { // insert new "boundary" parameter TQCString bStr( ";\n boundary=\"" ); @@ -1600,7 +1600,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage, } } - // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs + // replace simple LFs by CRLFs for all MIME supporting CryptPlugs // according to RfC 2633, 3.1.1 Canonicalization //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl; mEncodedBody = KMail::Util::lf2crlf( mEncodedBody ); @@ -1616,7 +1616,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage, mRc = false; return; } - mRc = processStructuringInfo( TQString::null, + mRc = processStructuringInfo( TQString(), mOldBodyPart.contentDescription(), mOldBodyPart.typeStr(), mOldBodyPart.subtypeStr(), @@ -1700,7 +1700,7 @@ void MessageComposer::encryptMessage( KMMessage* msg, } // now do the encrypting: - // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs + // replace simple LFs by CRLFs for all MIME supporting CryptPlugs // according to RfC 2633, 3.1.1 Canonicalization //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl; innerContent = KMail::Util::lf2crlf( innerContent ); @@ -1792,7 +1792,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg, delete innerDwPart; innerDwPart = 0; - // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs + // replace simple LFs by CRLFs for all MIME supporting CryptPlugs // according to RfC 2633, 3.1.1 Canonicalization //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl; encodedAttachment = KMail::Util::lf2crlf( encodedAttachment ); @@ -1992,7 +1992,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL, } if ( binaryHint( format ) ) { codeCStr += "Content-Transfer-Encoding: base64\n\n"; - codeCStr += KMime::Codec::codecForName( "base64" )->encodeToQCString( ciphertext ); + codeCStr += KMime::Codec::codecForName( "base64" )->encodeToTQCString( ciphertext ); } else codeCStr += '\n' + TQCString( ciphertext.data(), ciphertext.size() + 1 ); @@ -2051,7 +2051,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL, TQCString MessageComposer::plainTextFromMarkup( const TQString& markupText ) { TQTextEdit *hackConspiratorTextEdit = new TQTextEdit( markupText ); - hackConspiratorTextEdit->setTextFormat(Qt::PlainText); + hackConspiratorTextEdit->setTextFormat(TQt::PlainText); if ( !mDisableBreaking ) { hackConspiratorTextEdit->setWordWrap( TQTextEdit::FixedColumnWidth ); hackConspiratorTextEdit->setWrapColumnOrWidth( mLineBreakColumn ); @@ -2133,7 +2133,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec() kdDebug(5006) << "Added an <LF> on the last line" << endl; cText += "\n"; } - return KMail::Util::byteArrayFromQCStringNoDetach( cText ); + return KMail::Util::byteArrayFromTQCStringNoDetach( cText ); } diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h index 2284b04a8..f6392b838 100644 --- a/kmail/messagecomposer.h +++ b/kmail/messagecomposer.h @@ -18,11 +18,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -64,6 +64,7 @@ namespace KPIM { class MessageComposer : public TQObject { Q_OBJECT + TQ_OBJECT friend class ::MessageComposerJob; friend class ::EncryptMessageJob; friend class ::SetLastMessageAsUnencryptedVersionOfLastButOne; diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp index 4d9983308..84618ea87 100644 --- a/kmail/messagecopyhelper.cpp +++ b/kmail/messagecopyhelper.cpp @@ -27,8 +27,8 @@ using namespace KMail; using namespace KPIM; MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs, - KMFolder * dest, bool move, TQObject * parent ) : - TQObject( parent ) + KMFolder * dest, bool move, TQObject * tqparent ) : + TQObject( tqparent ) { if ( msgs.isEmpty() || !dest ) return; diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h index 419382cf8..1c24d890a 100644 --- a/kmail/messagecopyhelper.h +++ b/kmail/messagecopyhelper.h @@ -36,9 +36,10 @@ namespace KMail { Helper class to copy/move a set of messages defined by their serial numbers from arbitrary folders into a common destination folder. */ -class MessageCopyHelper : public QObject +class MessageCopyHelper : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -47,10 +48,10 @@ class MessageCopyHelper : public QObject @param msgs List of serial numbers. @param dest Destination folder. @param move If set to true, messages will be moved instead of copied - @param parent The parent object. + @param tqparent The tqparent object. */ MessageCopyHelper( const TQValueList<TQ_UINT32> &msgs, KMFolder *dest, - bool move, TQObject *parent = 0 ); + bool move, TQObject *tqparent = 0 ); /** Converts a MailList into a serial number list. diff --git a/kmail/messageproperty.cpp b/kmail/messageproperty.cpp index e9897cd64..91261540f 100644 --- a/kmail/messageproperty.cpp +++ b/kmail/messageproperty.cpp @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -66,7 +66,7 @@ void MessageProperty::setFiltering( const KMMsgBase *msgBase, bool filter ) KMFolder* MessageProperty::filterFolder( TQ_UINT32 serNum ) { - TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.find( serNum ); + TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.tqfind( serNum ); return it == sFolders.constEnd() ? 0 : (*it).operator->(); } @@ -87,7 +87,7 @@ void MessageProperty::setFilterFolder( const KMMsgBase *msgBase, KMFolder* folde ActionScheduler* MessageProperty::filterHandler( TQ_UINT32 serNum ) { - TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.find( serNum ); + TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.tqfind( serNum ); return it == sHandlers.constEnd() ? 0 : (*it).operator->(); } @@ -111,14 +111,14 @@ void MessageProperty::setFilterHandler( const KMMsgBase *msgBase, ActionSchedule bool MessageProperty::transferInProgress( TQ_UINT32 serNum ) { - TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum ); + TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.tqfind( serNum ); return it == sTransfers.constEnd() ? false : *it; } void MessageProperty::setTransferInProgress( TQ_UINT32 serNum, bool transfer, bool force ) { int transferInProgress = 0; - TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum ); + TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.tqfind( serNum ); if (it != sTransfers.constEnd()) transferInProgress = *it; if ( force && !transfer ) @@ -145,7 +145,7 @@ void MessageProperty::setTransferInProgress( const KMMsgBase *msgBase, bool tran TQ_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase ) { - TQMap<const KMMsgBase*, long >::const_iterator it = sSerialCache.find( msgBase ); + TQMap<const KMMsgBase*, long >::const_iterator it = sSerialCache.tqfind( msgBase ); return it == sSerialCache.constEnd() ? 0 : *it; } diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h index 0dd3f3b2d..bd040ef57 100644 --- a/kmail/messageproperty.h +++ b/kmail/messageproperty.h @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,9 +54,10 @@ class ActionScheduler; serialCache should only exist during the lifetime of a particular KMMsgBase based instance. */ -class MessageProperty : public QObject +class MessageProperty : public TQObject { Q_OBJECT + TQ_OBJECT public: /** If the message is being filtered */ diff --git a/kmail/messagesender.h b/kmail/messagesender.h index 0c45923b9..eac7995a3 100644 --- a/kmail/messagesender.h +++ b/kmail/messagesender.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -74,7 +74,7 @@ public: @return true on success. */ - bool sendQueued( const TQString & transport=TQString::null ) { return doSendQueued( transport ); } + bool sendQueued( const TQString & transport=TQString() ) { return doSendQueued( transport ); } virtual void readConfig() = 0; virtual void writeConfig( bool withSync = true ) = 0; diff --git a/kmail/mh2kmailr b/kmail/mh2kmailr index d88905aae..df76fec1e 100755 --- a/kmail/mh2kmailr +++ b/kmail/mh2kmailr @@ -14,13 +14,13 @@ fi MH_DIR=$1 -for d in `/usr/bin/find $MH_DIR -type d -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do +for d in `/usr/bin/tqfind $MH_DIR -type d -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do FOLDER=${d}.mbx # remove old kmail folder if any rm -f $FOLDER -for f in `/usr/bin/find $d -type f -maxdepth 1 -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do +for f in `/usr/bin/tqfind $d -type f -maxdepth 1 -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do echo "From ???@??? 00:00:00 1997 +0000" >> $FOLDER cat $f >> $FOLDER done diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index 4721e1e12..b0d56a509 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -49,8 +49,8 @@ namespace KMail { // for restricting number of concurrent connections to the same server static TQMap<TQString, int> s_serverConnections; - NetworkAccount::NetworkAccount( AccountManager * parent, const TQString & name, uint id ) - : KMAccount( parent, name, id ), + NetworkAccount::NetworkAccount( AccountManager * tqparent, const TQString & name, uint id ) + : KMAccount( tqparent, name, id ), mSlave( 0 ), mAuth( "*" ), mPort( 0 ), @@ -72,10 +72,10 @@ namespace KMail { KMAccount::init(); mSieveConfig = SieveConfig(); - mLogin = TQString::null; - mPasswd = TQString::null; + mLogin = TQString(); + mPasswd = TQString(); mAuth = "*"; - mHost = TQString::null; + mHost = TQString(); mPort = defaultPort(); mStorePasswd = false; mUseSSL = false; @@ -321,7 +321,7 @@ namespace KMail { if ( host().isEmpty() ) return; if ( checking ) { - if ( s_serverConnections.find( host() ) != s_serverConnections.end() ) + if ( s_serverConnections.tqfind( host() ) != s_serverConnections.end() ) s_serverConnections[host()] += 1; else s_serverConnections[host()] = 1; @@ -329,7 +329,7 @@ namespace KMail { << host() << " now is " << s_serverConnections[host()] << endl; } else { - if ( s_serverConnections.find( host() ) != s_serverConnections.end() && + if ( s_serverConnections.tqfind( host() ) != s_serverConnections.end() && s_serverConnections[host()] > 0 ) { s_serverConnections[host()] -= 1; kdDebug(5006) << "connections to server " << host() @@ -344,12 +344,12 @@ namespace KMail { kdDebug(5006) << "for host " << host() << " current connections=" - << (s_serverConnections.find(host())==s_serverConnections.end() ? 0 : s_serverConnections[host()]) + << (s_serverConnections.tqfind(host())==s_serverConnections.end() ? 0 : s_serverConnections[host()]) << " and limit is " << GlobalSettings::self()->maxConnectionsPerHost() << endl; bool connectionLimitForHostReached = !host().isEmpty() && GlobalSettings::self()->maxConnectionsPerHost() > 0 - && s_serverConnections.find( host() ) != s_serverConnections.end() + && s_serverConnections.tqfind( host() ) != s_serverConnections.end() && s_serverConnections[host()] >= GlobalSettings::self()->maxConnectionsPerHost(); kdDebug(5006) << "connection limit reached: " << connectionLimitForHostReached << endl; diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h index 868e20553..891e1edcc 100644 --- a/kmail/networkaccount.h +++ b/kmail/networkaccount.h @@ -45,8 +45,9 @@ namespace KMail { class NetworkAccount : public KMAccount { Q_OBJECT + TQ_OBJECT protected: - NetworkAccount( AccountManager * parent, const TQString & name, uint id ); + NetworkAccount( AccountManager * tqparent, const TQString & name, uint id ); public: virtual ~NetworkAccount(); diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index acd5b3321..6d1de7cda 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -55,8 +55,8 @@ using namespace KMail; -NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) - : KDialogBase( parent, "new_folder_dialog", false, i18n( "New Folder" ), +NewFolderDialog::NewFolderDialog( TQWidget* tqparent, KMFolder *folder ) + : KDialogBase( tqparent, "new_folder_dialog", false, i18n( "New Folder" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ), mFormatComboBox( 0 ), @@ -201,16 +201,16 @@ void NewFolderDialog::slotOk() return; } - // default parent is Top Level local folders + // default tqparent is Top Level local folders KMFolderDir * selectedFolderDir = &(kmkernel->folderMgr()->dir()); - // we got a parent, let's use that + // we got a tqparent, let's use that if ( mFolder ) selectedFolderDir = mFolder->createChildFolder(); // check if the folder already exists if( selectedFolderDir->hasNamedFolder( fldName ) && ( !( mFolder - && ( selectedFolderDir == mFolder->parent() ) + && ( selectedFolderDir == mFolder->tqparent() ) && ( mFolder->storage()->name() == fldName ) ) ) ) { const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName); diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h index 4744db3e2..e4a01f556 100644 --- a/kmail/newfolderdialog.h +++ b/kmail/newfolderdialog.h @@ -16,11 +16,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -47,9 +47,10 @@ namespace KMail { class NewFolderDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 ); + NewFolderDialog( TQWidget* tqparent = 0, KMFolder *folder = 0 ); ~NewFolderDialog() {}; TQLabel* mNameLabel; diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 132dc058e..80c182d98 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -97,7 +97,7 @@ #include <kiconloader.h> #include <kmdcodec.h> -// other Qt headers +// other TQt headers #include <tqtextcodec.h> #include <tqdir.h> #include <tqfile.h> @@ -208,24 +208,24 @@ namespace KMail { myBody->Headers().Parse(); } - partNode* parentNode = &startNode; + partNode* tqparentNode = &startNode; partNode* newNode = new partNode(false, myBody); - // Build the object tree of the new node before setting the parent, as otherwise - // buildObjectTree() would erronously modify the parents as well + // Build the object tree of the new node before setting the tqparent, as otherwise + // buildObjectTree() would erronously modify the tqparents as well newNode->buildObjectTree( false ); - if ( append && parentNode->firstChild() ) { - parentNode = parentNode->firstChild(); - while( parentNode->nextSibling() ) - parentNode = parentNode->nextSibling(); - parentNode->setNext( newNode ); + if ( append && tqparentNode->firstChild() ) { + tqparentNode = tqparentNode->firstChild(); + while( tqparentNode->nextSibling() ) + tqparentNode = tqparentNode->nextSibling(); + tqparentNode->setNext( newNode ); } else - parentNode->setFirstChild( newNode ); + tqparentNode->setFirstChild( newNode ); if ( startNode.mimePartTreeItem() ) { newNode->fillMimePartTree( startNode.mimePartTreeItem(), 0, - TQString::null, TQString::null, TQString::null, 0, + TQString(), TQString(), TQString(), 0, append ); } else { } @@ -260,7 +260,7 @@ namespace KMail { node->setProcessed( false, false ); if ( partNode * child = node->firstChild() ) child->setProcessed( false, true ); - } else if ( mReader && !node->parentNode() ) { + } else if ( mReader && !node->tqparentNode() ) { // ...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->parentNode() /* message is not an attachment */ ) { + node->tqparentNode() /* message is not an attachment */ ) { node->setDisplayedHidden( true ); return; } @@ -391,7 +391,7 @@ namespace KMail { ////////////////// ////////////////// - static int signatureToStatus( const GpgME::Signature &sig ) + static int signatureTotqStatus( const GpgME::Signature &sig ) { switch ( sig.status().code() ) { case GPG_ERR_NO_ERROR: @@ -461,7 +461,7 @@ namespace KMail { dumpToFile( "dat_01_reader_signedtext_before_canonicalization", cleartext.data(), cleartext.length() ); - // tqreplace simple LFs by CRLSs + // replace simple LFs by CRLSs // according to RfC 2633, 3.1.1 Canonicalization //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl; cleartext = Util::lf2crlf( cleartext ); @@ -586,10 +586,10 @@ namespace KMail { //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl; GpgME::Signature signature = signatures[0]; - messagePart.status_code = signatureToStatus( signature ); + messagePart.status_code = signatureTotqStatus( signature ); messagePart.status = TQString::fromUtf8( signature.status().asString() ); for ( uint i = 1; i < signatures.size(); ++i ) { - if ( signatureToStatus( signatures[i] ) != messagePart.status_code ) { + if ( signatureTotqStatus( signatures[i] ) != messagePart.status_code ) { messagePart.status_code = GPGME_SIG_STAT_DIFF; messagePart.status = i18n("Different results for signatures"); } @@ -667,7 +667,7 @@ namespace KMail { txt.append( i18n( "The crypto engine returned no cleartext data." ) ); txt.append( "</h2></b>" ); txt.append( "<br> <br>" ); - txt.append( i18n( "Status: " ) ); + txt.append( i18n( "tqStatus: " ) ); if ( !messagePart.status.isEmpty() ) { txt.append( "<i>" ); txt.append( messagePart.status ); @@ -785,9 +785,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, { passphraseError = false; decryptionStarted = false; - aErrorText = TQString::null; + aErrorText = TQString(); auditLogError = GpgME::Error(); - auditLog = TQString::null; + auditLog = TQString(); bool bDecryptionOk = false; enum { NO_PLUGIN, NOT_INITIALIZED, CANT_DECRYPT } cryptPlugError = NO_PLUGIN; @@ -804,9 +804,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, TQByteArray ciphertext( data.msgPart().bodyDecodedBinary() ); #ifdef MARCS_DEBUG TQCString cipherStr( ciphertext.data(), ciphertext.size() + 1 ); - bool cipherIsBinary = (-1 == cipherStr.find("BEGIN ENCRYPTED MESSAGE", 0, false) ) && - (-1 == cipherStr.find("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) && - (-1 == cipherStr.find("BEGIN PGP MESSAGE", 0, false) ); + bool cipherIsBinary = (-1 == cipherStr.tqfind("BEGIN ENCRYPTED MESSAGE", 0, false) ) && + (-1 == cipherStr.tqfind("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) && + (-1 == cipherStr.tqfind("BEGIN PGP MESSAGE", 0, false) ); dumpToFile( "dat_04_reader.encrypted", ciphertext.data(), ciphertext.size() ); @@ -829,7 +829,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, if ( mReader ) emit mReader->noDrag(); // in case pineentry pops up, don't let kmheaders start a drag afterwards - // Check whether the memento tqcontains a result from last time: + // Check whether the memento contains a result from last time: const DecryptVerifyBodyPartMemento * m = dynamic_cast<DecryptVerifyBodyPartMemento*>( data.bodyPartMemento( "decryptverify" ) ); if ( !m ) { @@ -916,9 +916,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, // ### while pinentry-qt appears) TQByteArray ciphertext( data.msgPart().bodyDecodedBinary() ); TQCString cipherStr( ciphertext.data(), ciphertext.size() + 1 ); - bool cipherIsBinary = (-1 == cipherStr.find("BEGIN ENCRYPTED MESSAGE", 0, false) ) && - (-1 == cipherStr.find("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) && - (-1 == cipherStr.find("BEGIN PGP MESSAGE", 0, false) ); + bool cipherIsBinary = (-1 == cipherStr.tqfind("BEGIN ENCRYPTED MESSAGE", 0, false) ) && + (-1 == cipherStr.tqfind("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) && + (-1 == cipherStr.tqfind("BEGIN PGP MESSAGE", 0, false) ); if ( !cipherIsBinary ) { decryptedData = cipherStr; } @@ -936,10 +936,10 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, } //static - bool ObjectTreeParser::tqcontainsExternalReferences( const TQCString & str ) + bool ObjectTreeParser::containsExternalReferences( const TQCString & str ) { TQRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:"); - int httpPos = str.find( httpRegExp, 0 ); + int httpPos = str.tqfind( httpRegExp, 0 ); while ( httpPos >= 0 ) { // look backwards for "href" @@ -952,7 +952,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, return true; } // find next occurrence of "http: or "https: - httpPos = str.find( httpRegExp, httpPos + 6 ); + httpPos = str.tqfind( httpRegExp, httpPos + 6 ); } return false; } @@ -990,12 +990,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, // ---Sven's strip </BODY> and </HTML> from end of attachment end- // Show the "external references" warning (with possibility to load // external references only if loading external references is disabled - // and the HTML code tqcontains obvious external references). For + // and the HTML code contains obvious external references). For // messages where the external references are obfuscated the user won't // have an easy way to load them but that shouldn't be a problem - // because only spam tqcontains obfuscated external references. + // because only spam contains obfuscated external references. if ( !mReader->htmlLoadExternal() && - tqcontainsExternalReferences( cstr ) ) { + containsExternalReferences( cstr ) ) { htmlWriter()->queue( "<div class=\"htmlWarn\">\n" ); htmlWriter()->queue( i18n("<b>Note:</b> This HTML message may contain external " "references to images etc. For security/privacy reasons " @@ -1031,7 +1031,7 @@ static bool isMailmanMessage( partNode * curNode ) { return true; if ( headers.HasField("X-Mailer") && 0 == TQCString( headers.FieldBody("X-Mailer").AsString().c_str() ) - .find("MAILMAN", 0, false) ) + .tqfind("MAILMAN", 0, false) ) return true; return false; } @@ -1047,21 +1047,21 @@ namespace KMail { const TQCString delimZ2("--__--__--\n\n_____________"); const TQCString delimZ1("--__--__--\r\n\r\n_____________"); TQCString partStr, digestHeaderStr; - int thisDelim = cstr.find(delim1, 0, false); + int thisDelim = cstr.tqfind(delim1, 0, false); if ( thisDelim == -1 ) - thisDelim = cstr.find(delim2, 0, false); + thisDelim = cstr.tqfind(delim2, 0, false); if ( thisDelim == -1 ) { kdDebug(5006) << " Sorry: Old style Mailman message but no delimiter found." << endl; return false; } - int nextDelim = cstr.find(delim1, thisDelim+1, false); + int nextDelim = cstr.tqfind(delim1, thisDelim+1, false); if ( -1 == nextDelim ) - nextDelim = cstr.find(delim2, thisDelim+1, false); + nextDelim = cstr.tqfind(delim2, thisDelim+1, false); if ( -1 == nextDelim ) - nextDelim = cstr.find(delimZ1, thisDelim+1, false); + nextDelim = cstr.tqfind(delimZ1, thisDelim+1, false); if ( -1 == nextDelim ) - nextDelim = cstr.find(delimZ2, thisDelim+1, false); + nextDelim = cstr.tqfind(delimZ2, thisDelim+1, false); if ( nextDelim < 0) return false; @@ -1081,15 +1081,15 @@ namespace KMail { curNode->setType( DwMime::kTypeMultipart ); curNode->setSubType( DwMime::kSubtypeDigest ); while( -1 < nextDelim ){ - int thisEoL = cstr.find("\nMessage:", thisDelim, false); + int thisEoL = cstr.tqfind("\nMessage:", thisDelim, false); if ( -1 < thisEoL ) thisDelim = thisEoL+1; else{ - thisEoL = cstr.find("\n_____________", thisDelim, false); + thisEoL = cstr.tqfind("\n_____________", thisDelim, false); if ( -1 < thisEoL ) thisDelim = thisEoL+1; } - thisEoL = cstr.find('\n', thisDelim); + thisEoL = cstr.tqfind('\n', thisDelim); if ( -1 < thisEoL ) thisDelim = thisEoL+1; else @@ -1101,10 +1101,10 @@ namespace KMail { partStr += cstr.mid( thisDelim, nextDelim-thisDelim ); TQCString subject("embedded message"); TQCString subSearch("\nSubject:"); - int subPos = partStr.find(subSearch, 0, false); + int subPos = partStr.tqfind(subSearch, 0, false); if ( -1 < subPos ){ subject = partStr.mid(subPos+subSearch.length()); - thisEoL = subject.find('\n'); + thisEoL = subject.tqfind('\n'); if ( -1 < thisEoL ) subject.truncate( thisEoL ); } @@ -1114,21 +1114,21 @@ namespace KMail { subject, true ); //mReader->queueHtml("<br><hr><br>"); thisDelim = nextDelim+1; - nextDelim = cstr.find(delim1, thisDelim, false); + nextDelim = cstr.tqfind(delim1, thisDelim, false); if ( -1 == nextDelim ) - nextDelim = cstr.find(delim2, thisDelim, false); + nextDelim = cstr.tqfind(delim2, thisDelim, false); if ( -1 == nextDelim ) - nextDelim = cstr.find(delimZ1, thisDelim, false); + nextDelim = cstr.tqfind(delimZ1, thisDelim, false); if ( -1 == nextDelim ) - nextDelim = cstr.find(delimZ2, thisDelim, false); + nextDelim = cstr.tqfind(delimZ2, thisDelim, false); } // reset curent node's Content-Type curNode->setType( DwMime::kTypeText ); curNode->setSubType( DwMime::kSubtypePlain ); - int thisEoL = cstr.find("_____________", thisDelim); + int thisEoL = cstr.tqfind("_____________", thisDelim); if ( -1 < thisEoL ){ thisDelim = thisEoL; - thisEoL = cstr.find('\n', thisDelim); + thisEoL = cstr.tqfind('\n', thisDelim); if ( -1 < thisEoL ) thisDelim = thisEoL+1; } @@ -1357,7 +1357,7 @@ namespace KMail { const Kleo::CryptoBackend::Protocol * useThisCryptProto = 0; /* - ATTENTION: This code is to be tqreplaced by the new 'auto-detect' feature. -------------------------------------- + ATTENTION: This code is to be replaced by the new 'auto-detect' feature. -------------------------------------- */ partNode * data = child->findType( DwMime::kTypeApplication, DwMime::kSubtypeOctetStream, false, true ); @@ -1544,9 +1544,9 @@ namespace KMail { } const Kleo::CryptoBackend::Protocol* oldUseThisCryptPlug = cryptoProtocol(); - if ( node->parentNode() - && DwMime::kTypeMultipart == node->parentNode()->type() - && DwMime::kSubtypeEncrypted == node->parentNode()->subType() ) { + if ( node->tqparentNode() + && DwMime::kTypeMultipart == node->tqparentNode()->type() + && DwMime::kSubtypeEncrypted == node->tqparentNode()->subType() ) { //kdDebug(5006) << "\n-----> Initially processing encrypted data\n" << endl; node->setEncryptionState( KMMsgFullyEncrypted ); if ( keepEncryptions() ) { @@ -1559,7 +1559,7 @@ namespace KMail { writeDeferredDecryptionBlock(); } else { /* - ATTENTION: This code is to be tqreplaced by the planned 'auto-detect' feature. + ATTENTION: This code is to be replaced by the planned 'auto-detect' feature. */ PartMetaData messagePart; setCryptoProtocol( Kleo::CryptoBackendFactory::instance()->openpgp() ); @@ -1720,7 +1720,7 @@ namespace KMail { bool isSigned = smimeType == "signed-data"; bool isEncrypted = smimeType == "enveloped-data"; - // Analyze "signTestNode" node to find/verify a signature. + // Analyze "signTestNode" node to tqfind/verify a signature. // If zero this verification was successfully done after // decrypting via recursion by insertAndParseNewChildNode(). partNode* signTestNode = isEncrypted ? 0 : node; @@ -2050,7 +2050,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR TQString comment = msgPart->contentDescription(); comment = KMMessage::quoteHtmlChars( comment, true ); - if ( label == comment ) comment = TQString::null; + if ( label == comment ) comment = TQString(); TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum ); @@ -2252,7 +2252,7 @@ TQString ObjectTreeParser::sigStatusToString( const Kleo::CryptoBackend::Protoco } /* // add i18n support for 3rd party plug-ins here: - else if (0 <= cryptPlug->libName().find( "yetanotherpluginname", 0, false )) { + else if (0 <= cryptPlug->libName().tqfind( "yetanotherpluginname", 0, false )) { } */ @@ -2320,7 +2320,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString & return "<a href=\"" + url.htmlURL() + "\">" + i18n("The Audit Log is a detailed error log from the gnupg backend", "Show Audit Log") + "</a>"; } - return TQString::null; + return TQString(); } static TQString endVerboseSigstatHeader( const PartMetaData & pmd ) @@ -2492,7 +2492,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, msgFrom + "<br />" + i18n("stored: "); - // We cannot use Qt's join() function here but + // We cannot use TQt's join() function here but // have to join the addresses manually to // extract the mail addresses (without '<''>') // before including it into our string: @@ -2591,7 +2591,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, htmlStr += "<br />"; if( !statusStr.isEmpty() ) { htmlStr += " <br />"; - htmlStr += i18n( "Status: " ); + htmlStr += i18n( "tqStatus: " ); htmlStr += statusStr; } } else { @@ -2634,7 +2634,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, "verified." ); if( !statusStr.isEmpty() ) { htmlStr += "<br />"; - htmlStr += i18n( "Status: " ); + htmlStr += i18n( "tqStatus: " ); htmlStr += "<i>"; htmlStr += statusStr; htmlStr += "</i>"; @@ -2795,7 +2795,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a bool goodSignature = false; Kpgp::Module* pgp = Kpgp::Module::getKpgp(); assert(pgp != 0); - bool isPgpMessage = false; // true if the message tqcontains at least one + bool isPgpMessage = false; // true if the message contains at least one // PGP MESSAGE or one PGP SIGNED MESSAGE block TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); TQString headerStr = TQString("<div dir=\"%1\">").arg(dir); @@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) TQString line; /* search next occurrence of '\n' */ - pos = s.find('\n', beg, FALSE); + pos = s.tqfind('\n', beg, FALSE); if (pos == (unsigned int)(-1)) pos = length; diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h index 5cfe1d0e7..2325b2423 100644 --- a/kmail/objecttreeparser.h +++ b/kmail/objecttreeparser.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -151,7 +151,7 @@ namespace KMail { mIncludeSignatures = include; } - // Controls whether Toltec invitations are displayed in their raw form or as a tqreplacement text, + // Controls whether Toltec invitations are displayed in their raw form or as a replacement text, // which is used in processToltecMail(). void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; } bool showRawToltecMail() const { return mShowRawToltecMail; } @@ -169,13 +169,13 @@ namespace KMail { KMail::CSSHelper * cssHelper() const { return mCSSHelper; } /** Parse beginning at a given node and recursively parsing - the children of that node and it's next sibling. */ + the tqchildren of that node and it's next sibling. */ // Function is called internally by "parseMsg(KMMessage* msg)" - // and it will be tqreplaced once KMime is alive. + // and it will be replaced once KMime is alive. void parseObjectTree( partNode * node ); private: - /** Standard children handling a.k.a. multipart/mixed (w/o + /** Standard tqchildren handling a.k.a. multipart/mixed (w/o kroupware hacks) */ void stdChildHandling( partNode * child ); @@ -193,7 +193,7 @@ namespace KMail { * Setting this to false is useful for encapsulated messages, as we * do not want the text in those to appear in the editor */ - // Function will be tqreplaced once KMime is alive. + // Function will be replaced once KMime is alive. void insertAndParseNewChildNode( partNode & node, const char * content, const char * cntDesc, @@ -252,11 +252,11 @@ namespace KMail { */ bool processToltecMail( partNode * node ); - /** Checks whether @p str tqcontains external references. To be precise, + /** Checks whether @p str contains external references. To be precise, we only check whether @p str tqcontains 'xxx="http[s]:' where xxx is not href. Obfuscated external references are ignored on purpose. */ - static bool tqcontainsExternalReferences( const TQCString & str ); + static bool containsExternalReferences( const TQCString & str ); public:// (during refactoring) diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h index d70cd8c70..5bac65f65 100644 --- a/kmail/objecttreeparser_p.h +++ b/kmail/objecttreeparser_p.h @@ -61,6 +61,7 @@ namespace KMail { public KMail::ISubject { Q_OBJECT + TQ_OBJECT public: CryptoBodyPartMemento(); ~CryptoBodyPartMemento(); @@ -87,6 +88,7 @@ namespace KMail { : public CryptoBodyPartMemento { Q_OBJECT + TQ_OBJECT public: DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText ); ~DecryptVerifyBodyPartMemento(); @@ -122,6 +124,7 @@ namespace KMail { : public CryptoBodyPartMemento { Q_OBJECT + TQ_OBJECT public: VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job, Kleo::KeyListJob * klj, @@ -161,6 +164,7 @@ namespace KMail { : public CryptoBodyPartMemento { Q_OBJECT + TQ_OBJECT public: VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job, Kleo::KeyListJob * klj, diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index b75c54e42..96bb32c59 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,7 +50,7 @@ =========================================================================== - N O T E : The partNode structure will most likely be tqreplaced by KMime. + N O T E : The partNode structure will most likely be replaced by KMime. It's purpose: Speed optimization for KDE 3. (khz, 28.11.01) =========================================================================== */ @@ -209,7 +209,7 @@ void partNode::buildObjectTree( bool processSiblings ) && curNode->dwPart()->Next() ) ) { curNode = curNode->mRoot; } - // we might have to leave when all children have been processed + // we might have to leave when all tqchildren have been processed if( this == curNode && !processSiblings ) return; // store next node @@ -236,8 +236,8 @@ TQCString partNode::subTypeString() const { const partNode* partNode::topLevelParent() const { const partNode *ret = this; - while ( ret->parentNode() ) - ret = ret->parentNode(); + while ( ret->tqparentNode() ) + ret = ret->tqparentNode(); return ret; } @@ -259,10 +259,10 @@ int partNode::totalChildCount() const { TQString partNode::contentTypeParameter( const char * name ) const { if ( !mDwPart || !mDwPart->hasHeaders() ) - return TQString::null; + return TQString(); DwHeaders & headers = mDwPart->Headers(); if ( !headers.HasContentType() ) - return TQString::null; + return TQString(); DwString attr = name; attr.ConvertToLowerCase(); for ( DwParameter * param = headers.ContentType().FirstParameter() ; param ; param = param->Next() ) { @@ -272,14 +272,14 @@ TQString partNode::contentTypeParameter( const char * name ) const { return TQString::tqfromLatin1( param->Value().data(), param->Value().size() ); // warning: misses rfc2231 handling! } - return TQString::null; + return TQString(); } KMMsgEncryptionState partNode::overallEncryptionState() const { KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown; if( mEncryptionState == KMMsgNotEncrypted ) { - // NOTE: children are tested ONLY when parent is not encrypted + // NOTE: tqchildren are tested ONLY when tqparent is not encrypted if( mChild ) myState = mChild->overallEncryptionState(); else @@ -320,7 +320,7 @@ KMMsgSignatureState partNode::overallSignatureState() const { KMMsgSignatureState myState = KMMsgSignatureStateUnknown; if( mSignatureState == KMMsgNotSigned ) { - // children are tested ONLY when parent is not signed + // tqchildren are tested ONLY when tqparent is not signed if( mChild ) myState = mChild->overallSignatureState(); else @@ -358,9 +358,9 @@ KMMsgSignatureState partNode::overallSignatureState() const TQCString partNode::path() const { - if ( !parentNode() ) + if ( !tqparentNode() ) return ':'; - const partNode * p = parentNode(); + const partNode * p = tqparentNode(); // 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* parentItem, +void partNode::fillMimePartTree( KMMimePartTreeItem* tqparentItem, KMMimePartTree* mimePartTree, TQString labelDescr, TQString labelCntType, @@ -471,11 +471,11 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem, KIO::filesize_t size, bool revertOrder ) { - if( parentItem || mimePartTree ) { + if( tqparentItem || mimePartTree ) { if( mNext ) - mNext->fillMimePartTree( parentItem, mimePartTree, - TQString::null, TQString::null, TQString::null, 0, + mNext->fillMimePartTree( tqparentItem, mimePartTree, + TQString(), TQString(), TQString(), 0, revertOrder ); TQString cntDesc, cntType, cntEnc; @@ -518,8 +518,8 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem, // remove linebreak+whitespace from folded Content-Description cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " ); - if( parentItem ) - mMimePartTreeItem = new KMMimePartTreeItem( parentItem, + if( tqparentItem ) + mMimePartTreeItem = new KMMimePartTreeItem( tqparentItem, this, cntDesc, cntType, @@ -536,7 +536,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem, mMimePartTreeItem->setOpen( true ); if( mChild ) mChild->fillMimePartTree( mMimePartTreeItem, 0, - TQString::null, TQString::null, TQString::null, 0, + TQString(), TQString(), TQString(), 0, revertOrder ); } @@ -595,7 +595,7 @@ partNode * partNode::next( bool allowChildren ) const { return c; if ( partNode * s = nextSibling() ) return s; - for ( partNode * p = parentNode() ; p ; p = p->parentNode() ) + for ( partNode * p = tqparentNode() ; p ; p = p->tqparentNode() ) 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->parentNode() ) { + while ( const partNode * p = root->tqparentNode() ) { 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 parentIsMessage = cur->parentNode() && - cur->parentNode()->msgPart().typeStr().lower() == "message"; - if ( parentIsMessage && cur->parentNode() != topLevel ) + const bool tqparentIsMessage = cur->tqparentNode() && + cur->tqparentNode()->msgPart().typeStr().lower() == "message"; + if ( tqparentIsMessage && cur->tqparentNode() != topLevel ) return true; - cur = cur->parentNode(); + cur = cur->tqparentNode(); } return false; } @@ -693,7 +693,7 @@ KMail::Interface::BodyPartMemento * partNode::internalBodyPartMemento( const TQC { assert( !reader() ); - const std::map<TQCString,KMail::Interface::BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.find( which.lower() ); + const std::map<TQCString,KMail::Interface::BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.tqfind( which.lower() ); return it != mBodyPartMementoMap.end() ? it->second : 0 ; } @@ -768,8 +768,8 @@ partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const typeBlacklisted = typeBlacklisted || this == topLevelParent(); bool firstTextChildOfEncapsulatedMsg = msgPart().typeStr().lower() == "text" && msgPart().subtypeStr().lower() == "plain" && - parentNode() && - parentNode()->msgPart().typeStr().lower() == "message"; + tqparentNode() && + tqparentNode()->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 6459a0a68..babd9a1b0 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -60,7 +60,7 @@ class KMReaderWin; =========================================================================== - N O T E : The partNode structure will most likely be tqreplaced by KMime. + N O T E : The partNode structure will most likely be replaced by KMime. It's purpose: Speed optimization for KDE 3. (khz, 28.11.01) =========================================================================== */ @@ -150,10 +150,10 @@ public: return mEncryptionState; } - // look at the encryption states of all children and return result + // look at the encryption states of all tqchildren and return result KMMsgEncryptionState overallEncryptionState() const ; - // look at the signature states of all children and return result + // look at the signature states of all tqchildren and return result KMMsgSignatureState overallSignatureState() const ; void setSignatureState( KMMsgSignatureState state ) { @@ -179,11 +179,11 @@ public: partNode* findNodeForDwPart( DwBodyPart* part ); - void fillMimePartTree( KMMimePartTreeItem* parentItem, + void fillMimePartTree( KMMimePartTreeItem* tqparentItem, KMMimePartTree* mimePartTree, - TQString labelDescr = TQString::null, - TQString labelCntType = TQString::null, - TQString labelEncoding = TQString::null, + TQString labelDescr = TQString(), + TQString labelCntType = TQString(), + TQString labelEncoding = TQString(), KIO::filesize_t size=0, bool revertOrder = false ); @@ -248,7 +248,7 @@ public: const TQString& trueFromAddress() const; const partNode * topLevelParent() const; - partNode * parentNode() const { return mRoot; } + partNode * tqparentNode() const { return mRoot; } partNode * nextSibling() const { return mNext; } partNode * firstChild() const { return mChild; } partNode * next( bool allowChildren=true ) const; diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp index f9a56316b..45ce28620 100644 --- a/kmail/partnodebodypart.cpp +++ b/kmail/partnodebodypart.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -55,7 +55,7 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const { TQString KMail::PartNodeBodyPart::asText() const { if ( mPartNode.type() != DwMime::kTypeText ) - return TQString::null; + return TQString(); return mPartNode.msgPart().bodyToUnicode( mCodec ); } @@ -73,7 +73,7 @@ TQString KMail::PartNodeBodyPart::contentDescription() const { TQString KMail::PartNodeBodyPart::contentDispositionParameter( const char * ) const { kdWarning( 5006 ) << "Sorry, not yet implemented: PartNodeBodyPart::contentDispositionParameter()" << endl; - return TQString::null; + return TQString(); } bool KMail::PartNodeBodyPart::hasCompleteBody() const { diff --git a/kmail/partnodebodypart.h b/kmail/partnodebodypart.h index 919d43a23..3591286e5 100644 --- a/kmail/partnodebodypart.h +++ b/kmail/partnodebodypart.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index 7bb830bc0..b2f55528f 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -27,7 +27,7 @@ #include "popaccount.h" #include "broadcaststatus.h" -using KPIM::BroadcasStatus; +using KPIM::BroadcastqStatus; #include "progressmanager.h" #include "kmfoldermgr.h" #include "kmfiltermgr.h" @@ -152,7 +152,7 @@ void PopAccount::processNewMail(bool _interactive) bool b = storePasswd(); if (KIO::PasswordDialog::getNameAndPassword(mLogin, passwd, &b, i18n("You need to supply a username and a password to access this " - "mailbox."), false, TQString::null, mName, i18n("Account:")) + "mailbox."), false, TQString(), mName, i18n("Account:")) != TQDialog::Accepted) { checkDone( false, CheckAborted ); @@ -673,7 +673,7 @@ void PopAccount::slotJobFinished() { kmkernel->folderMgr()->syncAllFolders(); KURL url = getUrl(); - TQMap< QPair<time_t, TQString>, int > idsToSave; + TQMap< TQPair<time_t, TQString>, int > idsToSave; idsToSave.clear(); // Check if we want to keep any messages if ( mLeaveOnServer && !idsOfMsgsToDelete.isEmpty() ) { @@ -692,7 +692,7 @@ void PopAccount::slotJobFinished() { if (msgTime >= timeLimit || !mTimeOfNextSeenMsgsMap[mUidForIdMap[*cur]]) { kdDebug() << "Saving msg id " << *cur << endl; - QPair<time_t, TQString> msg(msgTime, *cur); + TQPair<time_t, TQString> msg(msgTime, *cur); idsToSave.insert( msg, 1 ); } } @@ -702,7 +702,7 @@ void PopAccount::slotJobFinished() { int numToDelete = idsToSave.count() - mLeaveOnServerCount; kdDebug() << "numToDelete is " << numToDelete << endl; if ( numToDelete > 0 && (unsigned)numToDelete < idsToSave.count() ) { - TQMap< QPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin(); + TQMap< TQPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin(); for ( int deleted = 0; deleted < numToDelete && cur != idsToSave.end() ; deleted++, cur++ ) { kdDebug() << "deleting msg id " << cur.key().second << endl; @@ -715,7 +715,7 @@ void PopAccount::slotJobFinished() { // Delete more old messages until we're under mLeaveOnServerSize MBs if ( mLeaveOnServerSize > 0 ) { double sizeOnServer = 0; - TQMap< QPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin(); + TQMap< TQPair<time_t, TQString>, int >::Iterator cur = idsToSave.begin(); for ( ; cur != idsToSave.end(); cur++ ) { sizeOnServer += *mSizeOfNextSeenMsgsDict[ mUidForIdMap[ cur.key().second ] ]; @@ -730,7 +730,7 @@ void PopAccount::slotJobFinished() { } } // Save msgs from deletion - TQMap< QPair<time_t, TQString>, int >::Iterator it = idsToSave.begin(); + TQMap< TQPair<time_t, TQString>, int >::Iterator it = idsToSave.begin(); kdDebug() << "Going to save " << idsToSave.count() << endl; for ( ; it != idsToSave.end(); ++it ) { kdDebug() << "saving msg id " << it.key().second << endl; @@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() { if ( !idsOfMsgsToDelete.isEmpty() ) { stage = Dele; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from %1. Deleting messages from server...", "Fetched %n messages from %1. Deleting messages from server...", numMsgs ) @@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() { } else { stage = Quit; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) @@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() { } idsOfMsgsToDelete.clear(); if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) @@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() { if( mMailCheckProgressItem ) { // do this only once... bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled(); int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count(); - BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( + BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem ); // set mMailCheckProgressItem = 0 before calling setComplete() to prevent // a race condition @@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) .arg(numBytesToRead/1024).arg(mLogin).arg(mHost); } - mMailCheckProgressItem->seStatus( msg ); + mMailCheckProgressItem->setqStatus( msg ); mMailCheckProgressItem->setProgress( (numBytesToRead <= 100) ? 50 // We never know what the server tells us // This way of dividing is required for > 21MB of mail @@ -930,11 +930,11 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) // otherwise stage is List Or Uidl TQString qdata = data; qdata = qdata.simplifyWhiteSpace(); // Workaround for Maillennium POP3/UNIBOX - int spc = qdata.find( ' ' ); + int spc = qdata.tqfind( ' ' ); if ( stage == List ) { if ( spc > 0 ) { TQString length = qdata.mid(spc+1); - if (length.find(' ') != -1) length.truncate(length.find(' ')); + if (length.tqfind(' ') != -1) length.truncate(length.tqfind(' ')); int len = length.toInt(); numBytes += len; TQString id = qdata.left(spc); @@ -989,7 +989,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) int *size = new int; //malloc(size_of(int)); *size = mMsgsPendingDownload[id]; mSizeOfNextSeenMsgsDict.insert( uid, size ); - if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) { + if ( mUidsOfSeenMsgsDict.tqfind( uid ) != 0 ) { if ( mMsgsPendingDownload.tqcontains( id ) ) { mMsgsPendingDownload.remove( id ); } diff --git a/kmail/popaccount.h b/kmail/popaccount.h index 81fb153e5..4c8dfdd5a 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -27,6 +27,7 @@ namespace KMail { */ class PopAccount: public NetworkAccount { Q_OBJECT + TQ_OBJECT public: virtual ~PopAccount(); diff --git a/kmail/protocols.h b/kmail/protocols.h index b18155386..ab5aa38d3 100644 --- a/kmail/protocols.h +++ b/kmail/protocols.h @@ -20,11 +20,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp index 334e87e50..3dd5aa49e 100644 --- a/kmail/quotajobs.cpp +++ b/kmail/quotajobs.cpp @@ -19,11 +19,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index 31bd1ef58..e53a4f18e 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -19,18 +19,18 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. */ -#ifndef QUOTAJOBS_H -#define QUOTAJOBS_H +#ifndef TQUOTAJOBS_H +#define TQUOTAJOBS_H #include <tqvariant.h> @@ -48,7 +48,7 @@ namespace KMail { // the current value and the maximal value class QuotaInfo { public : - QuotaInfo() {} // for QValueVector + QuotaInfo() {} // for TQValueVector QuotaInfo( const TQString& _name, const TQString& _root, const TQVariant& _current, const TQVariant& _max ) : mName( _name ), mRoot( _root ), mCurrent( _current ),mMax( _max ) {} bool operator==( const QuotaInfo & other ) const { @@ -109,7 +109,7 @@ class QuotaInfo { typedef TQValueVector<QuotaInfo> QuotaInfoList; /** - * This namespace tqcontains functions that return jobs for quota operations. + * This namespace contains functions that return jobs for quota operations. * * The current implementation is tied to IMAP. * If someone wants to extend this to other protocols, turn the namespace into a class @@ -137,6 +137,7 @@ GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url ); class GetQuotarootJob : public KIO::SimpleJob { Q_OBJECT + TQ_OBJECT public: GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -163,6 +164,7 @@ protected slots: class GetStorageQuotaJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: GetStorageQuotaJob( KIO::Slave* slave, const KURL& url ); @@ -190,5 +192,5 @@ private: } // KMail namespace -#endif /* QUOTAJOBS_H */ +#endif /* TQUOTAJOBS_H */ diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 9f33a5016..273ba923c 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "recipientseditor.h" @@ -119,8 +119,8 @@ TQStringList Recipient::allTypeLabels() } -RecipientComboBox::RecipientComboBox( TQWidget *parent ) - : TQComboBox( parent ) +RecipientComboBox::RecipientComboBox( TQWidget *tqparent ) + : TQComboBox( tqparent ) { } @@ -145,8 +145,8 @@ void RecipientLineEdit::keyPressEvent( TQKeyEvent *ev ) } } -RecipientLine::RecipientLine( TQWidget *parent ) - : TQWidget( parent ), mRecipientsCount( 0 ), mModified( false ) +RecipientLine::RecipientLine( TQWidget *tqparent ) + : TQWidget( tqparent ), mRecipientsCount( 0 ), mModified( false ) { TQBoxLayout *topLayout = new TQHBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -288,7 +288,7 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev ) int RecipientLine::setComboWidth( int w ) { - w = QMAX( w, mCombo->tqsizeHint().width() ); + w = TQMAX( w, mCombo->tqsizeHint().width() ); mCombo->setFixedWidth( w ); mCombo->updateGeometry(); tqparentWidget()->updateGeometry(); @@ -320,8 +320,8 @@ void RecipientLine::setRemoveLineButtonEnabled( bool b ) // ------------ RecipientsView --------------------- -RecipientsView::RecipientsView( TQWidget *parent ) - : TQScrollView( parent ), mCurDelLine( 0 ), +RecipientsView::RecipientsView( TQWidget *tqparent ) + : TQScrollView( tqparent ), mCurDelLine( 0 ), mLineHeight( 0 ), mFirstColumnWidth( 0 ), mModified( false ) { @@ -456,7 +456,7 @@ void RecipientsView::slotReturnPressed( RecipientLine *line ) void RecipientsView::slotDownPressed( RecipientLine *line ) { - int pos = mLines.find( line ); + int pos = mLines.tqfind( line ); if ( pos >= (int)mLines.count() - 1 ) { emit focusDown(); } else if ( pos >= 0 ) { @@ -466,7 +466,7 @@ void RecipientsView::slotDownPressed( RecipientLine *line ) void RecipientsView::slotUpPressed( RecipientLine *line ) { - int pos = mLines.find( line ); + int pos = mLines.tqfind( line ); if ( pos > 0 ) { activateLine( mLines.at( pos - 1 ) ); } else { @@ -492,7 +492,7 @@ void RecipientsView::slotDeleteLine() return; RecipientLine *line = mCurDelLine; - int pos = mLines.find( line ); + int pos = mLines.tqfind( line ); int newPos; if ( pos == 0 ) newPos = pos + 1; @@ -698,8 +698,8 @@ void RecipientsView::moveCompletionPopup() } -RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *parent ) - : TQToolTip( parent ), mView( view ) +RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *tqparent ) + : TQToolTip( tqparent ), mView( view ) { } @@ -748,8 +748,8 @@ void RecipientsToolTip::maybeTip( const TQPoint & p ) } -SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) - : TQWidget( parent ), mView( view ), mRecipientPicker( 0 ) +SideWidget::SideWidget( RecipientsView *view, TQWidget *tqparent ) + : TQWidget( tqparent ), mView( view ), mRecipientPicker( 0 ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -837,8 +837,8 @@ void SideWidget::pickRecipient() } -RecipientsEditor::RecipientsEditor( TQWidget *parent ) - : TQWidget( parent ), mModified( false ) +RecipientsEditor::RecipientsEditor( TQWidget *tqparent ) + : TQWidget( tqparent ), mModified( false ) { TQBoxLayout *topLayout = new TQHBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index e6b7718b0..4e2e9069d 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef RECIPIENTSEDITOR_H #define RECIPIENTSEDITOR_H @@ -48,7 +48,7 @@ class Recipient enum Type { To, Cc, Bcc, Undefined }; - Recipient( const TQString &email = TQString::null, Type type = To ); + Recipient( const TQString &email = TQString(), Type type = To ); void setType( Type ); Type type() const; @@ -69,11 +69,12 @@ class Recipient Type mType; }; -class RecipientComboBox : public QComboBox +class RecipientComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - RecipientComboBox( TQWidget *parent ); + RecipientComboBox( TQWidget *tqparent ); signals: void rightPressed(); @@ -85,9 +86,10 @@ class RecipientComboBox : public QComboBox class RecipientLineEdit : public KMLineEdit { Q_OBJECT + TQ_OBJECT public: - RecipientLineEdit( TQWidget * parent ) : - KMLineEdit( true, parent ) {} + RecipientLineEdit( TQWidget * tqparent ) : + KMLineEdit( true, tqparent ) {} signals: void deleteMe(); @@ -98,11 +100,12 @@ class RecipientLineEdit : public KMLineEdit void keyPressEvent( TQKeyEvent *ev ); }; -class RecipientLine : public QWidget +class RecipientLine : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RecipientLine( TQWidget *parent ); + RecipientLine( TQWidget *tqparent ); void setRecipient( const Recipient & ); Recipient recipient() const; @@ -167,11 +170,12 @@ class RecipientLine : public QWidget bool mModified; }; -class RecipientsView : public QScrollView +class RecipientsView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - RecipientsView( TQWidget *parent ); + RecipientsView( TQWidget *tqparent ); TQSize tqminimumSizeHint() const; TQSize tqsizeHint() const; @@ -246,10 +250,10 @@ class RecipientsView : public QScrollView KGlobalSettings::Completion mCompletionMode; }; -class RecipientsToolTip : public QToolTip +class RecipientsToolTip : public TQToolTip { public: - RecipientsToolTip( RecipientsView *, TQWidget *parent ); + RecipientsToolTip( RecipientsView *, TQWidget *tqparent ); protected: void maybeTip( const TQPoint & p ); @@ -260,11 +264,12 @@ class RecipientsToolTip : public QToolTip RecipientsView *mView; }; -class SideWidget : public QWidget +class SideWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SideWidget( RecipientsView *view, TQWidget *parent ); + SideWidget( RecipientsView *view, TQWidget *tqparent ); ~SideWidget(); RecipientsPicker* picker() const; @@ -291,11 +296,12 @@ class SideWidget : public QWidget mutable KWindowPositioner *mPickerPositioner; }; -class RecipientsEditor : public QWidget +class RecipientsEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RecipientsEditor( TQWidget *parent ); + RecipientsEditor( TQWidget *tqparent ); ~RecipientsEditor(); void clear(); diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index adbf4c4a0..8ef12ed24 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "recipientseditortest.h" @@ -39,8 +39,8 @@ #include <tqlineedit.h> #include <tqtextedit.h> -Composer::Composer( TQWidget *parent ) - : TQWidget( parent ) +Composer::Composer( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQGridLayout *topLayout = new TQGridLayout( this ); topLayout->setMargin( 4 ); diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h index be468e833..ea2f1e9ef 100644 --- a/kmail/recipientseditortest.h +++ b/kmail/recipientseditortest.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef RECIPIENTSEDITORTEST_H #define RECIPIENTSEDITORTEST_H @@ -28,11 +28,12 @@ class RecipientsEditor; -class Composer : public QWidget +class Composer : public TQWidget { Q_OBJECT + TQ_OBJECT public: - Composer( TQWidget *parent ); + Composer( TQWidget *tqparent ); public slots: void slotClose(); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index a45a76830..38b00d14b 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -227,9 +227,9 @@ RecipientItem *RecipientViewItem::recipientItem() const } -RecipientsListToolTip::RecipientsListToolTip( TQWidget *parent, +RecipientsListToolTip::RecipientsListToolTip( TQWidget *tqparent, KListView *listView ) - : TQToolTip( parent ) + : TQToolTip( tqparent ) { mListView = listView; } @@ -294,13 +294,13 @@ RecipientItem::List RecipientsCollection::items() const bool RecipientsCollection::hasEquivalentItem( RecipientItem *item ) const { - return mKeyMap.find( item->key() ) != mKeyMap.end(); + return mKeyMap.tqfind( item->key() ) != mKeyMap.end(); } RecipientItem * RecipientsCollection::getEquivalentItem( RecipientItem *item) const { TQMap<TQString, RecipientItem *>::ConstIterator it; - it = mKeyMap.find( item->key() ); + it = mKeyMap.tqfind( item->key() ); if ( it == mKeyMap.end() ) return 0; return (*it); @@ -327,8 +327,8 @@ TQString RecipientsCollection::id() const return mId; } -SearchLine::SearchLine( TQWidget *parent, KListView *listView ) - : KListViewSearchLine( parent, listView ) +SearchLine::SearchLine( TQWidget *tqparent, KListView *listView ) + : KListViewSearchLine( tqparent, listView ) { } @@ -340,14 +340,14 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev ) } -RecipientsPicker::RecipientsPicker( TQWidget *parent ) - : TQDialog( parent, "RecipientsPicker" ) +RecipientsPicker::RecipientsPicker( TQWidget *tqparent ) + : TQDialog( tqparent, "RecipientsPicker" ) #ifndef KDEPIM_NEW_DISTRLISTS , mDistributionListManager( 0 ) #endif ,mLdapSearchDialog( 0 ) { -// KWin::setType( winId(), NET::Dock ); +// KWin::setType( winId(), NET::TQt::Dock ); setCaption( i18n("Select Recipient") ); @@ -505,7 +505,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) item->setAddressee( *it, *it3 ); TQMap<KABC::Resource *,RecipientsCollection *>::ConstIterator collIt; - collIt = collectionMap.find( it->resource() ); + collIt = collectionMap.tqfind( it->resource() ); if ( collIt != collectionMap.end() ) { (*collIt)->addItem( item ); } @@ -514,7 +514,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) TQStringList::ConstIterator catIt; for( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { TQMap<TQString, RecipientsCollection *>::ConstIterator catMapIt; - catMapIt = categoryMap.find( *catIt ); + catMapIt = categoryMap.tqfind( *catIt ); RecipientsCollection *collection; if ( catMapIt == categoryMap.end() ) { collection = new RecipientsCollection( *catIt ); @@ -838,7 +838,7 @@ void RecipientsPicker::setFocusList() void RecipientsPicker::resetSearch() { - mSearchLine->setText( TQString::null ); + mSearchLine->setText( TQString() ); } void RecipientsPicker::slotSearchLDAP() diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 2d25a87b7..9f989275c 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -114,10 +114,10 @@ class RecipientViewItem : public KListViewItem RecipientItem *mRecipientItem; }; -class RecipientsListToolTip : public QToolTip +class RecipientsListToolTip : public TQToolTip { public: - RecipientsListToolTip( TQWidget *parent, KListView * ); + RecipientsListToolTip( TQWidget *tqparent, KListView * ); protected: void maybeTip( const TQPoint &pos ); @@ -152,7 +152,7 @@ class RecipientsCollection TQString id() const; private: - // flag to indicate if this collection tqcontains just references + // flag to indicate if this collection contains just references // or should manage memory (de)allocation as well. bool mIsReferenceContainer; TQString mId; @@ -163,8 +163,9 @@ class RecipientsCollection class SearchLine : public KListViewSearchLine { Q_OBJECT + TQ_OBJECT public: - SearchLine( TQWidget *parent, KListView *listView ); + SearchLine( TQWidget *tqparent, KListView *listView ); signals: void downPressed(); @@ -175,11 +176,12 @@ class SearchLine : public KListViewSearchLine using namespace KABC; -class RecipientsPicker : public QDialog +class RecipientsPicker : public TQDialog { Q_OBJECT + TQ_OBJECT public: - RecipientsPicker( TQWidget *parent ); + RecipientsPicker( TQWidget *tqparent ); ~RecipientsPicker(); void setRecipients( const Recipient::List & ); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 275e623b1..7a3507efc 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,9 +52,9 @@ using KRecentAddress::RecentAddresses; using namespace KMail; -RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, +RedirectDialog::RedirectDialog( TQWidget *tqparent, const char *name, bool modal, bool immediate ) - : KDialogBase( parent, name, modal, i18n( "Redirect Message" ), + : KDialogBase( tqparent, name, modal, i18n( "Redirect Message" ), User1|User2|Cancel, ( immediate ? User1 : User2 ), false ) { TQVBox *vbox = makeVBoxMainWidget(); @@ -66,7 +66,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, mEditTo = new KMLineEdit( true, hbox, "toLine" ); mEditTo->setMinimumWidth( 300 ); - mBtnTo = new TQPushButton( TQString::null, hbox, "toBtn" ); + mBtnTo = new TQPushButton( TQString(), hbox, "toBtn" ); mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) ); mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 ); TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") ); diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h index 9be9f272e..d849b7a21 100644 --- a/kmail/redirectdialog.h +++ b/kmail/redirectdialog.h @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,16 +50,17 @@ namespace KMail { class RedirectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** Constructor - @param parent parent QWidget + @param tqparent tqparent TQWidget @param name dialog name @param modal dialog modal type @param immediate True, if the Send Now button should be default or false if the Queue button should be default */ - RedirectDialog( TQWidget *parent=0, const char *name=0, + RedirectDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false, bool immediate=true ); /** Return the addresses for the redirection */ diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 86e8df2d6..97aef16f3 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,8 +49,8 @@ namespace KMail { - RegExpLineEdit::RegExpLineEdit( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), + RegExpLineEdit::RegExpLineEdit( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mLineEdit( 0 ), mRegExpEditButton( 0 ), mRegExpEditDialog( 0 ) @@ -58,9 +58,9 @@ namespace KMail { initWidget(); } - RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *parent, + RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ), + : TQWidget( tqparent, name ), mLineEdit( 0 ), mRegExpEditButton( 0 ), mRegExpEditDialog( 0 ) @@ -120,7 +120,7 @@ namespace KMail { void RegExpLineEdit::slotEditRegExp() { if ( !mRegExpEditDialog ) - mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->qt_cast( "KRegExpEditorInterface" ) ); diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h index c0314e8a2..65a1b731c 100644 --- a/kmail/regexplineedit.h +++ b/kmail/regexplineedit.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,14 +44,15 @@ class TQDialog; namespace KMail { - class RegExpLineEdit : public QWidget + class RegExpLineEdit : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RegExpLineEdit( const TQString &str, TQWidget *parent = 0, + RegExpLineEdit( const TQString &str, TQWidget *tqparent = 0, const char *name = 0 ); - RegExpLineEdit( TQWidget *parent = 0, const char *name = 0 ); + RegExpLineEdit( TQWidget *tqparent = 0, const char *name = 0 ); TQString text() const; @@ -67,7 +68,7 @@ namespace KMail { void slotEditRegExp(); private: - void initWidget( const TQString & = TQString::null ); + void initWidget( const TQString & = TQString() ); KLineEdit * mLineEdit; TQPushButton * mRegExpEditButton; diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 0c220cf9d..d4aa76f59 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -96,7 +96,7 @@ void RenameJob::execute() { if ( mNewParent ) { - // move the folder to a different parent + // move the folder to a different tqparent KMFolderType type = mStorage->folderType(); if ( ( type == KMFolderTypeMbox || type == KMFolderTypeMaildir ) && mNewParent->type() == KMStandardDir && @@ -220,7 +220,7 @@ void RenameJob::folderCopyComplete(bool success) config->writeEntry( it.key(), it.data() ); } mNewFolder->readConfig( config ); - // make sure the children state is correct + // make sure the tqchildren state is correct if ( mNewFolder->child() && ( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) ) mNewFolder->storage()->updateChildrenState(); diff --git a/kmail/renamejob.h b/kmail/renamejob.h index 78102c3a6..7e968ec33 100644 --- a/kmail/renamejob.h +++ b/kmail/renamejob.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -51,12 +51,13 @@ class CopyFolderJob; class RenameJob : public FolderJob { Q_OBJECT + TQ_OBJECT public: /** * Create a new job * @param storage the folder that should be renames * @param newName the new name of the folder - * @param newParent the new parent if the folder should be moved, else 0 + * @param newParent the new tqparent if the folder should be moved, else 0 */ RenameJob( FolderStorage* storage, const TQString& newName, KMFolderDir* newParent = 0 ); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 75940e4ca..b3e211fa0 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -228,12 +228,12 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler } namespace { - /** Returns the number of immediate children of parent with the given object + /** Returns the number of immediate tqchildren of tqparent with the given object name. Used by RuleWidgetHandlerManager::createWidgets(). */ - int childCount( const TQObject *parent, const char *objName ) + int childCount( const TQObject *tqparent, const char *objName ) { - TQObjectList *list = parent->queryList( 0, objName, false, false ); + TQObjectList *list = tqparent->queryList( 0, objName, false, false ); if ( !list ) return 0; const int count = list->count(); @@ -302,7 +302,7 @@ TQString KMail::RuleWidgetHandlerManager::value( const TQCString& field, if ( !val.isEmpty() ) return val; } - return TQString::null; + return TQString(); } TQString KMail::RuleWidgetHandlerManager::prettyValue( const TQCString& field, @@ -314,7 +314,7 @@ TQString KMail::RuleWidgetHandlerManager::prettyValue( const TQCString& field, if ( !val.isEmpty() ) return val; } - return TQString::null; + return TQString(); } void KMail::RuleWidgetHandlerManager::reset( TQWidgetStack *functionStack, @@ -353,14 +353,14 @@ void KMail::RuleWidgetHandlerManager::update( const TQCString &field, //----------------------------------------------------------------------------- namespace { - // FIXME (Qt >= 4.0): + // FIXME (TQt >= 4.0): // This is a simplified and constified copy of TQObject::child(). According - // to a comment in tqobject.h TQObject::child() will be made const in Qt 4.0. - // So once we require Qt 4.0 this can be removed. - TQObject* QObject_child_const( const TQObject *parent, + // to a comment in tqobject.h TQObject::child() will be made const in TQt 4.0. + // So once we require TQt 4.0 this can be removed. + TQObject* TQObject_child_const( const TQObject *tqparent, const char *objName ) { - const TQObjectList *list = parent->children(); + const TQObjectList *list = tqparent->tqchildren(); if ( !list ) return 0; @@ -472,9 +472,9 @@ namespace { KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( QObject_child_const( functionStack, + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "textRuleFuncCombo" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "textRuleFuncCombo", // 0, false ) ); if ( funcCombo ) { @@ -499,13 +499,13 @@ namespace { TQString TextRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack, KMSearchRule::Function func ) const { - // here we gotta check the combobox which tqcontains the categories + // here we gotta check the combobox which contains the categories if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory ) { const TQComboBox *combo= - dynamic_cast<TQComboBox*>( QObject_child_const( valueStack, + dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack, "categoryCombo" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( valueStack->child( "categoryCombo", // 0, false ) ); if ( combo ) { @@ -514,15 +514,15 @@ namespace { else { kdDebug(5006) << "TextRuleWidgetHandler::currentValue: " "categoryCombo not found." << endl; - return TQString::null; + return TQString(); } } //in other cases of func it is a lineedit const RegExpLineEdit *lineEdit = - dynamic_cast<RegExpLineEdit*>( QObject_child_const( valueStack, + dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack, "regExpLineEdit" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit", // 0, false ) ); if ( lineEdit ) { @@ -533,7 +533,7 @@ namespace { "regExpLineEdit not found." << endl; // or anything else, like addressbook - return TQString::null; + return TQString(); } //--------------------------------------------------------------------------- @@ -794,9 +794,9 @@ namespace { KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( QObject_child_const( functionStack, + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "messageRuleFuncCombo" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "messageRuleFuncCombo", // 0, false ) ); if ( funcCombo ) { @@ -825,9 +825,9 @@ namespace { KMSearchRule::Function ) const { const RegExpLineEdit *lineEdit = - dynamic_cast<RegExpLineEdit*>( QObject_child_const( valueStack, + dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack, "regExpLineEdit" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit", // 0, false ) ); if ( lineEdit ) { @@ -837,7 +837,7 @@ namespace { kdDebug(5006) << "MessageRuleWidgetHandler::currentValue: " "regExpLineEdit not found." << endl; - return TQString::null; + return TQString(); } //--------------------------------------------------------------------------- @@ -847,7 +847,7 @@ namespace { const TQWidgetStack *valueStack ) const { if ( !handlesField( field ) ) - return TQString::null; + return TQString(); KMSearchRule::Function func = currentFunction( functionStack ); if ( func == KMSearchRule::FuncHasAttachment ) @@ -865,7 +865,7 @@ namespace { const TQWidgetStack *valueStack ) const { if ( !handlesField( field ) ) - return TQString::null; + return TQString(); KMSearchRule::Function func = currentFunction( functionStack ); if ( func == KMSearchRule::FuncHasAttachment ) @@ -1068,9 +1068,9 @@ namespace { KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( QObject_child_const( functionStack, + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "statusRuleFuncCombo" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "statusRuleFuncCombo", // 0, false ) ); if ( funcCombo ) { @@ -1098,9 +1098,9 @@ namespace { int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const { const TQComboBox *statusCombo = - dynamic_cast<TQComboBox*>( QObject_child_const( valueStack, + dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack, "statusRuleValueCombo" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( valueStack->child( "statusRuleValueCombo", // 0, false ) ); if ( statusCombo ) { @@ -1119,13 +1119,13 @@ namespace { const TQWidgetStack *valueStack ) const { if ( !handlesField( field ) ) - return TQString::null; + return TQString(); const int status = currenStatusValue( valueStack ); if ( status != -1 ) return TQString::tqfromLatin1( KMail::StatusValues[ status ].text ); else - return TQString::null; + return TQString(); } //--------------------------------------------------------------------------- @@ -1135,13 +1135,13 @@ namespace { const TQWidgetStack *valueStack ) const { if ( !handlesField( field ) ) - return TQString::null; + return TQString(); const int status = currenStatusValue( valueStack ); if ( status != -1 ) return i18n( KMail::StatusValues[ status ].text ); else - return TQString::null; + return TQString(); } //--------------------------------------------------------------------------- @@ -1323,9 +1323,9 @@ namespace { KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( QObject_child_const( functionStack, + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "numericRuleFuncCombo" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "numericRuleFuncCombo", // 0, false ) ); if ( funcCombo ) { @@ -1353,9 +1353,9 @@ namespace { TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const { const KIntNumInput *numInput = - dynamic_cast<KIntNumInput*>( QObject_child_const( valueStack, + dynamic_cast<KIntNumInput*>( TQObject_child_const( valueStack, "KIntNumInput" ) ); - // FIXME (Qt >= 4.0): Use the following when TQObject::child() is const. + // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<KIntNumInput*>( valueStack->child( "KIntNumInput", // 0, false ) ); if ( numInput ) { @@ -1364,7 +1364,7 @@ namespace { else kdDebug(5006) << "NumericRuleWidgetHandler::currentValue: " "KIntNumInput not found." << endl; - return TQString::null; + return TQString(); } //--------------------------------------------------------------------------- @@ -1374,7 +1374,7 @@ namespace { const TQWidgetStack *valueStack ) const { if ( !handlesField( field ) ) - return TQString::null; + return TQString(); return currentValue( valueStack ); } @@ -1386,7 +1386,7 @@ namespace { const TQWidgetStack *valueStack ) const { if ( !handlesField( field ) ) - return TQString::null; + return TQString(); return currentValue( valueStack ); } diff --git a/kmail/rulewidgethandlermanager.h b/kmail/rulewidgethandlermanager.h index 2e4043ebe..431731e46 100644 --- a/kmail/rulewidgethandlermanager.h +++ b/kmail/rulewidgethandlermanager.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/scalix.h b/kmail/scalix.h index 66f78e79b..ac07f504a 100644 --- a/kmail/scalix.h +++ b/kmail/scalix.h @@ -19,9 +19,9 @@ */ /** - * This file tqcontains helper classes for Scalix groupware support. + * This file contains helper classes for Scalix groupware support. * As the storage system of Scalix is quite similiar to Kolab we reuse some of - * the exsiting code and tqreplace other code by our own. + * the exsiting code and replace other code by our own. * * Differences between Kolab and Scalix: * diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index 50bf287d8..cabae0fd5 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -80,7 +80,7 @@ void SearchJob::searchCompleteFolder() TQString searchString = searchStringFromPattern( mSearchPattern ); if ( searchString.isEmpty() ) // skip imap search and download the messages - return slotSearchData( 0, TQString::null ); + return slotSearchData( 0, TQString() ); // do the IMAP search KURL url = mAccount->getUrl(); @@ -305,7 +305,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg ) // imap and local search have to match if ( mLocalSearchPattern->matches( msg ) && ( mImapSearchHits.isEmpty() || - mImapSearchHits.find( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) { + mImapSearchHits.tqfind( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) { TQ_UINT32 serNum = msg->getMsgSerNum(); mSearchSerNums.append( serNum ); matches = true; @@ -313,7 +313,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg ) } else if ( mLocalSearchPattern->op() == KMSearchPattern::OpOr ) { // imap or local search have to match if ( mLocalSearchPattern->matches( msg ) || - mImapSearchHits.find( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) { + mImapSearchHits.tqfind( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) { TQ_UINT32 serNum = msg->getMsgSerNum(); mSearchSerNums.append( serNum ); matches = true; @@ -368,7 +368,7 @@ void SearchJob::searchSingleMessage() if ( searchString.isEmpty() ) { // no imap search - slotSearchDataSingleMessage( 0, TQString::null ); + slotSearchDataSingleMessage( 0, TQString() ); } else { // imap search diff --git a/kmail/searchjob.h b/kmail/searchjob.h index 0fe6bdf88..7e59fb7f8 100644 --- a/kmail/searchjob.h +++ b/kmail/searchjob.h @@ -16,11 +16,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -53,6 +53,7 @@ class ImapAccountBase; class SearchJob : public FolderJob { Q_OBJECT + TQ_OBJECT public: /** * Creates a new job diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 2f4b3565d..ee7e090bf 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -71,8 +71,8 @@ const int SearchWindow::MSGID_COLUMN = 4; class MatchListView : public KListView { public: - MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) : - KListView( parent, name ), + MatchListView( TQWidget *tqparent, SearchWindow* sw, const char* name = 0 ) : + KListView( tqparent, name ), mSearchWindow( sw ) {} @@ -110,7 +110,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, KMFolder *curFolder, bool modal): KDialogBase(0, name, modal, i18n("Find Messages"), User1 | User2 | Close, User1, false, - KGuiItem( i18n("&Search"), "find" ), + KGuiItem( i18n("&Search"), "tqfind" ), KStdGuiItem::stop()), mStopped(false), mCloseRequested(false), @@ -275,7 +275,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true); mStatusBar->changeItem(i18n("Ready."), 0); mStatusBar->setItemAlignment(0, AlignLeft | AlignVCenter); - mStatusBar->insertItem(TQString::null, 1, 1, true); + mStatusBar->insertItem(TQString(), 1, 1, true); mStatusBar->setItemAlignment(1, AlignLeft | AlignVCenter); vbl->addWidget(mStatusBar); @@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); - connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus())); + connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updtqStatus())); connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), this, TQT_SLOT(folderInvalidated(KMFolder*))); @@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool) } //----------------------------------------------------------------------------- -void SearchWindow::updStatus(void) +void SearchWindow::updtqStatus(void) { TQString genMsg, detailMsg, procMsg; int numMatches = 0, numProcessed = 0; @@ -494,7 +494,7 @@ void SearchWindow::slotSearch() TQString fullName = baseName; int count = 0; KMFolder *folder; - while ((folder = mgr->find(fullName))) { + while ((folder = mgr->tqfind(fullName))) { if (folder->storage()->inherits("KMFolderSearch")) break; fullName = TQString("%1 %2").arg(baseName).arg(++count); @@ -541,7 +541,7 @@ void SearchWindow::slotSearch() void SearchWindow::searchDone() { mTimer->stop(); - updStatus(); + updtqStatus(); TQTimer::singleShot(0, this, TQT_SLOT(enableGUI())); if(mLastFocus) @@ -562,7 +562,7 @@ void SearchWindow::slotAddMsg(int idx) bool unget = !mFolder->isMessage(idx); KMMessage *msg = mFolder->getMsg(idx); TQString from, fName; - KMFolder *pFolder = msg->parent(); + KMFolder *pFolder = msg->tqparent(); if (!mFolders.tqcontains(pFolder)) { mFolders.append(pFolder); pFolder->open("searchwindow"); @@ -648,7 +648,7 @@ void SearchWindow::renameSearchFolder() int i = 1; TQString name = mSearchFolderEdt->text(); while (i < 100) { - if (!kmkernel->searchFolderMgr()->find( name )) { + if (!kmkernel->searchFolderMgr()->tqfind( name )) { mFolder->rename( name ); kmkernel->searchFolderMgr()->contentsChanged(); break; diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index c3c8cf854..f8da35d77 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -68,17 +68,18 @@ namespace KMail { class SearchWindow: public KDialogBase, virtual public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: /** * Creates a new search window. - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @param name The (widget) name of the dialog. * @param curFolder The folder which will be pre-selected as the base folder * of search operations. * @param modal Whether the dialog is to be shown modal. */ - SearchWindow( KMMainWidget* parent, const char* name=0, + SearchWindow( KMMainWidget* tqparent, const char* name=0, KMFolder *curFolder=0, bool modal=false ); virtual ~SearchWindow(); @@ -104,7 +105,7 @@ public: protected slots: /** Update status line widget. */ - virtual void updStatus(void); + virtual void updtqStatus(void); virtual void slotClose(); virtual void slotSearch(); @@ -161,7 +162,7 @@ protected: TQGuardedPtr<KMFolderSearch> mFolder; TQTimer *mTimer; - // GC'd by Qt + // GC'd by TQt TQRadioButton *mChkbxAllFolders; TQRadioButton *mChkbxSpecificFolders; KMail::FolderRequester *mCbxFolders; diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp index 272be70cd..d2296f435 100644 --- a/kmail/secondarywindow.cpp +++ b/kmail/secondarywindow.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h index 0502f0538..c17d604e6 100644 --- a/kmail/secondarywindow.h +++ b/kmail/secondarywindow.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,6 +44,7 @@ namespace KMail { class SecondaryWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: SecondaryWindow( const char * name = 0 ); diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index 2d320883a..e9d1fe969 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -53,8 +53,8 @@ namespace KMail { config.writeEntry( "sieve-vacation-filename", mVacationFileName ); } - SieveConfigEditor::SieveConfigEditor( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) + SieveConfigEditor::SieveConfigEditor( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { // tmp. vars: int row = -1; @@ -139,7 +139,7 @@ namespace KMail { return KURL(); if ( url.hasPass() ) - url.setPass( TQString::null ); + url.setPass( TQString() ); return url; } diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h index 17380eb0f..d426b998c 100644 --- a/kmail/sieveconfig.h +++ b/kmail/sieveconfig.h @@ -30,7 +30,7 @@ namespace KMail { public: SieveConfig( bool managesieveSupported=false, bool reuseConfig=true, unsigned int port=2000, const KURL & alternateURL=KURL(), - const TQString& vacationFileName = TQString::null ) + const TQString& vacationFileName = TQString() ) : mManagesieveSupported( managesieveSupported ), mReuseConfig( reuseConfig ), mPort( port ), @@ -87,8 +87,9 @@ namespace KMail { class SieveConfigEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SieveConfigEditor( TQWidget * parent=0, const char * name=0 ); + SieveConfigEditor( TQWidget * tqparent=0, const char * name=0 ); bool managesieveSupported() const; virtual void setManagesieveSupported( bool enable ); diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index bc5d2cca0..d29b732d5 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -186,8 +186,8 @@ private: namespace KMail { -SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name ) -: KDialogBase( parent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok, +SieveDebugDialog::SieveDebugDialog( TQWidget *tqparent, const char *name ) +: KDialogBase( tqparent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok, KDialogBase::Ok, true ), mSieveJob( 0 ) { diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h index f8b0803b8..6457280bc 100644 --- a/kmail/sievedebugdialog.h +++ b/kmail/sievedebugdialog.h @@ -50,9 +50,10 @@ class SieveJob; class SieveDebugDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 ); + SieveDebugDialog( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~SieveDebugDialog(); protected: diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index fa32dea6e..23517b533 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -34,8 +34,8 @@ namespace KMail { SieveJob::SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, - TQObject * parent, const char * name ) - : TQObject( parent, name ), + TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), mUrl( url ), mJob( 0 ), mDec( 0 ), mScript( script ), mFileExists( DontKnow ), mCommands( commands ), mShowProgressInfo(true) @@ -47,8 +47,8 @@ namespace KMail { SieveJob::SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, bool showProgressInfo, - TQObject * parent, const char * name ) - : TQObject( parent, name ), + TQObject * tqparent, const char * name ) + : TQObject( tqparent, name ), mUrl( url ), mJob( 0 ), mDec( 0 ), mScript( script ), mFileExists( DontKnow ), mCommands( commands ), mShowProgressInfo(showProgressInfo) @@ -149,12 +149,12 @@ namespace KMail { // Convert mScript into UTF-8: data = mScript.utf8(); - // "data" tqcontains a trailing NUL, remove: + // "data" contains a trailing NUL, remove: if ( data.size() > 0 && data[(int)data.size() - 1] == '\0' ) data.resize( data.size() - 1 ); // mark mScript sent: - mScript = TQString::null; + mScript = TQString(); } void SieveJob::slotEntries( Job *, const UDSEntryList & l ) { @@ -224,7 +224,7 @@ namespace KMail { if ( !mCommands.empty() ) { // Don't fail get'ting a non-existant script: if ( mCommands.top() == Get && mFileExists == No ) { - mScript = TQString::null; + mScript = TQString(); mCommands.pop(); } } @@ -261,18 +261,18 @@ namespace KMail { TQValueStack<Command> commands; commands.push( Get ); commands.push( SearchActive ); - return new SieveJob( src, TQString::null, commands, showProgressInfo ); + return new SieveJob( src, TQString(), commands, showProgressInfo ); } SieveJob * SieveJob::list( const KURL & src ) { TQValueStack<Command> commands; commands.push( List ); - return new SieveJob( src, TQString::null, commands ); + return new SieveJob( src, TQString(), commands ); } SieveJob * SieveJob::del( const KURL & url ) { TQValueStack<Command> commands; commands.push( Delete ); - return new SieveJob( url, TQString::null, commands ); + return new SieveJob( url, TQString(), commands ); } SieveJob * SieveJob::desactivate( const KURL & url ) { @@ -284,7 +284,7 @@ namespace KMail { SieveJob * SieveJob::activate( const KURL & url ) { TQValueStack<Command> commands; commands.push( Activate ); - return new SieveJob( url, TQString::null, commands ); + return new SieveJob( url, TQString(), commands ); } } // namespace KMail diff --git a/kmail/sievejob.h b/kmail/sievejob.h index ed8fb5d8c..b2ec73d0a 100644 --- a/kmail/sievejob.h +++ b/kmail/sievejob.h @@ -33,15 +33,16 @@ namespace KMail { class SieveJob : public TQObject { Q_OBJECT + TQ_OBJECT protected: enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete }; SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, - TQObject * parent=0, const char * name=0 ); + TQObject * tqparent=0, const char * name=0 ); SieveJob( const KURL & url, const TQString & script, const TQValueStack<Command> & commands, bool showProgressInfo, - TQObject * parent=0, const char * name=0 ); + TQObject * tqparent=0, const char * name=0 ); virtual ~SieveJob(); public: diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index c566da007..7785b45f1 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -42,8 +42,8 @@ using namespace KMail; namespace KMail { - SignatureConfigurator::SignatureConfigurator( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) + SignatureConfigurator::SignatureConfigurator( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { // tmp. vars: TQLabel * label; @@ -107,7 +107,7 @@ namespace KMail { widgetStack->addWidget( mTextEdit, pageno ); mTextEdit->setFont( KGlobalSettings::fixedFont() ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); - mTextEdit->setTextFormat( Qt::PlainText ); + mTextEdit->setTextFormat( TQt::PlainText ); widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0 @@ -119,7 +119,7 @@ namespace KMail { hlay = new TQHBoxLayout( page_vlay ); // inherits spacing mFileRequester = new KURLRequester( page ); TQWhatsThis::add(mFileRequester, - i18n("Use this requester to specify a text file that tqcontains your " + i18n("Use this requester to specify a text file that contains your " "signature. It will be read every time you create a new mail or " "append a new signature.")); hlay->addWidget( new TQLabel( mFileRequester, @@ -244,11 +244,11 @@ namespace KMail { if ( sig.type() == Signature::FromFile ) setFileURL( sig.url() ); else - setFileURL( TQString::null ); + setFileURL( TQString() ); if ( sig.type() == Signature::FromCommand ) setCommandURL( sig.url() ); else - setCommandURL( TQString::null ); + setCommandURL( TQString() ); } void SignatureConfigurator::slotEnableEditButton( const TQString & url ) { diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h index afd33f760..e9f0fdf0a 100644 --- a/kmail/signatureconfigurator.h +++ b/kmail/signatureconfigurator.h @@ -33,8 +33,9 @@ namespace KMail { class SignatureConfigurator : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SignatureConfigurator( TQWidget * parent=0, const char * name=0 ); + SignatureConfigurator( TQWidget * tqparent=0, const char * name=0 ); virtual ~SignatureConfigurator(); bool isSignatureEnabled() const; diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h index 6bfc3eb33..92545c665 100644 --- a/kmail/simplefoldertree.h +++ b/kmail/simplefoldertree.h @@ -50,7 +50,7 @@ static int recurseFilter( TQListViewItem * item, const TQString& filter, int col } if ( filter.length() == 0 || - item->text( column ).find( filter, 0, false ) >= 0 ) { + item->text( column ).tqfind( filter, 0, false ) >= 0 ) { item->setVisible( true ); ++enabled; } @@ -133,9 +133,9 @@ template <class T> class SimpleFolderTreeBase : public TreeBase public: - inline SimpleFolderTreeBase( TQWidget * parent, KMFolderTree *folderTree, + inline SimpleFolderTreeBase( TQWidget * tqparent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ) - : TreeBase( parent, folderTree, preSelection, mustBeReadWrite ) + : TreeBase( tqparent, folderTree, preSelection, mustBeReadWrite ) { assert( folderTree ); setFolderColumn( addColumn( i18n( "Folder" ) ) ); @@ -148,24 +148,24 @@ template <class T> class SimpleFolderTreeBase : public TreeBase } - virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent ) + virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent ) { - return new SimpleFolderTreeItem<T>( parent ); + return new SimpleFolderTreeItem<T>( tqparent ); } - virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent, TQListViewItem* afterListViewItem ) + virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent, TQListViewItem* afterListViewItem ) { - return new SimpleFolderTreeItem<T>( parent, afterListViewItem ); + return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem ); } - virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent, TQListViewItem* afterListViewItem ) + virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent, TQListViewItem* afterListViewItem ) { - return new SimpleFolderTreeItem<T>( parent, afterListViewItem ); + return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem ); } - virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent ) + virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent ) { - return new SimpleFolderTreeItem<T>( parent ); + return new SimpleFolderTreeItem<T>( tqparent ); } inline void keyPressEvent( TQKeyEvent *e ) diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index 4d42f4d43..4ab24f69a 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -56,14 +56,14 @@ static inline TQListBoxItem * findSelectedItem( TQListBox * lb ) { return item; } -SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, +SimpleStringListEditor::SimpleStringListEditor( TQWidget * tqparent, const char * name, ButtonCode buttons, const TQString & addLabel, const TQString & removeLabel, const TQString & modifyLabel, const TQString & addDialogLabel ) - : TQWidget( parent, name ), + : TQWidget( tqparent, name ), mAddButton(0), mRemoveButton(0), mModifyButton(0), mUpButton(0), mDownButton(0), mAddDialogLabel( addDialogLabel.isEmpty() ? @@ -121,7 +121,7 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, if ( !(buttons & Down) ) kdDebug(5006) << "Are you sure you want to use an Up button " "without a Down button??" << endl; - mUpButton = new KPushButton( TQString::null, this ); + mUpButton = new KPushButton( TQString(), this ); mUpButton->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) ); mUpButton->setAutoDefault( false ); mUpButton->setEnabled( false ); // no selection yet @@ -134,7 +134,7 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, if ( !(buttons & Up) ) kdDebug(5006) << "Are you sure you want to use a Down button " "without an Up button??" << endl; - mDownButton = new KPushButton( TQString::null, this ); + mDownButton = new KPushButton( TQString(), this ); mDownButton->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) ); mDownButton->setAutoDefault( false ); mDownButton->setEnabled( false ); // no selection yet @@ -166,7 +166,7 @@ TQStringList SimpleStringListEditor::stringList() const { return result; } -bool SimpleStringListEditor::tqcontainsString( const TQString & str ) { +bool SimpleStringListEditor::containsString( const TQString & str ) { for ( TQListBoxItem * item = mListBox->firstItem() ; item ; item = item->next() ) { if ( item->text() == str ) @@ -193,7 +193,7 @@ void SimpleStringListEditor::setButtonText( ButtonCode button, case Up: case Down: kdDebug(5006) << "SimpleStringListEditor: Cannot change text of " - "Up and Down buttons: they don't tqcontains text!" << endl; + "Up and Down buttons: they don't contains text!" << endl; return; default: if ( button & All ) @@ -212,11 +212,11 @@ void SimpleStringListEditor::setButtonText( ButtonCode button, void SimpleStringListEditor::slotAdd() { bool ok = false; TQString newEntry = KInputDialog::getText( i18n("New Value"), - mAddDialogLabel, TQString::null, + mAddDialogLabel, TQString(), &ok, this ); // let the user verify the string before adding emit aboutToAdd( newEntry ); - if ( ok && !newEntry.isEmpty() && !tqcontainsString( newEntry )) { + if ( ok && !newEntry.isEmpty() && !containsString( newEntry )) { mListBox->insertItem( newEntry ); emit changed(); } diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h index afa8593c3..edcd2a7c2 100644 --- a/kmail/simplestringlisteditor.h +++ b/kmail/simplestringlisteditor.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,6 +47,7 @@ class TQPushButton; class SimpleStringListEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum ButtonCode { None = 0x00, Add = 0x01, @@ -57,12 +58,12 @@ public: }; /** Constructor. Populates the list with @p strings. */ - SimpleStringListEditor( TQWidget * parent=0, const char * name=0, + SimpleStringListEditor( TQWidget * tqparent=0, const char * name=0, ButtonCode buttons=Unsorted, - const TQString & addLabel=TQString::null, - const TQString & removeLabel=TQString::null, - const TQString & modifyLabel=TQString::null, - const TQString & addDialogLabel=TQString::null ); + const TQString & addLabel=TQString(), + const TQString & removeLabel=TQString(), + const TQString & modifyLabel=TQString(), + const TQString & addDialogLabel=TQString() ); /** Sets the list of strings displayed to @p strings */ void setStringList( const TQStringList & strings ); @@ -76,7 +77,7 @@ public: signals: /** Connected slots can alter the argument to be added or set the - argument to TQString::null to suppress adding. + argument to TQString() to suppress adding. */ void aboutToAdd(TQString&); void changed(void); @@ -91,7 +92,7 @@ protected slots: void slotSelectionChanged(); protected: - bool tqcontainsString( const TQString & str ); + bool containsString( const TQString & str ); TQListBox *mListBox; TQPushButton *mAddButton; TQPushButton *mRemoveButton; diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index d82d06a30..4c32daba8 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SMimeConfiguration</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SMimeConfiguration</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>CRLRB</cstring> </property> @@ -30,7 +30,7 @@ <string>If this option is selected, S/MIME certificates are validated using Certificate Revocation Lists (CRLs).</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>OCSPRB</cstring> </property> @@ -38,10 +38,10 @@ <string>Validate certificates online (OCSP)</string> </property> <property name="whatsThis" stdset="0"> - <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP responder below.</string> + <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates tqStatus Protocol (OCSP). Fill in the URL of the OCSP responder below.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>OCSPGroupBox</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout4</cstring> </property> @@ -60,7 +60,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ <string>OCSP responder URL:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>OCSPResponderURL</cstring> </property> @@ -78,7 +78,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout5</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -118,7 +118,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ignoreServiceURLCB</cstring> </property> @@ -128,7 +128,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>doNotCheckCertPolicyCB</cstring> </property> @@ -139,7 +139,7 @@ <string>By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate policy is allowed. If this option is selected, policies are not checked.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>neverConsultCB</cstring> </property> @@ -150,7 +150,7 @@ <string>If this option is checked, Certificate Revocation Lists are never used to validate S/MIME certificates.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>fetchMissingCB</cstring> </property> @@ -161,7 +161,7 @@ <string>If this option is checked, missing issuer certificates are fetched when necessary (this applies to both validation methods, CRLs and OCSP)</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>HTTPGroupBox</cstring> </property> @@ -172,7 +172,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disableHTTPCB</cstring> </property> @@ -183,7 +183,7 @@ <string>Entirely disables the use of HTTP for S/MIME.</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameHTTP</cstring> </property> @@ -200,7 +200,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>tqlayout5</cstring> </property> @@ -208,7 +208,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>systemHTTPProxy</cstring> </property> @@ -216,7 +216,7 @@ <string>no proxy</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>useCustomHTTPProxyRB</cstring> </property> @@ -224,7 +224,7 @@ <string>Use this proxy for HTTP requests: </string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>honorHTTPProxyRB</cstring> </property> @@ -235,7 +235,7 @@ <string>If this option is selected, the value of the HTTP proxy shown on the right (which comes from the environment variable http_proxy) will be used for any HTTP request.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>customHTTPProxy</cstring> </property> @@ -245,7 +245,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>ignoreHTTPDPCB</cstring> </property> @@ -253,14 +253,14 @@ <string>Ignore HTTP CRL distribution point of certificates</string> </property> <property name="whatsThis" stdset="0"> - <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used. With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string> + <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used. With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string> </property> </widget> </grid> </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>LDAPGroupBox</cstring> </property> @@ -271,7 +271,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disableLDAPCB</cstring> </property> @@ -282,7 +282,7 @@ <string>Entirely disables the use of LDAP for S/MIME.</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameLDAP</cstring> </property> @@ -299,7 +299,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ignoreLDAPDPCB</cstring> </property> @@ -307,10 +307,10 @@ <string>Ignore LDAP CRL distribution point of certificates</string> </property> <property name="whatsThis" stdset="0"> - <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used. With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string> + <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used. With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout5</cstring> </property> @@ -318,7 +318,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>customLDAPLabel</cstring> </property> @@ -326,7 +326,7 @@ <string>Primary host for LDAP requests:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>customLDAPProxy</cstring> </property> diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 5e26319ff..2229a7633 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -26,14 +26,14 @@ #include "kmessagebox.h" /* - * Constructs a SnippetDlg as a child of 'parent', with the + * Constructs a SnippetDlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) - : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac ) +SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : SnippetDlgBase( tqparent, name, modal, fl ), actionCollection( ac ) { if ( !name ) setName( "SnippetDlg" ); @@ -66,7 +66,7 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam */ SnippetDlg::~SnippetDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index efd7bc534..e6ac0511d 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -19,9 +19,10 @@ class KShortcut; class SnippetDlg : public SnippetDlgBase { Q_OBJECT + TQ_OBJECT public: - SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SnippetDlg( KActionCollection* ac, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SnippetDlg(); void setShowShortcut( bool show ); diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 0df0e226f..ec9454c93 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SnippetDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SnippetDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>tqlayout5</cstring> </property> @@ -62,7 +62,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout3</cstring> </property> @@ -92,7 +92,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -103,7 +103,7 @@ <cstring>snippetName</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -117,7 +117,7 @@ <cstring>snippetText</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabelGroup</cstring> </property> diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp index f9f3aa871..9d835d639 100644 --- a/kmail/snippetitem.cpp +++ b/kmail/snippetitem.cpp @@ -17,8 +17,8 @@ #include <tqstring.h> -SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text ) - : TQListViewItem( parent, name ), action(0) +SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text ) + : TQListViewItem( tqparent, name ), action(0) { strName = name; strText = text; @@ -26,12 +26,12 @@ SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text ) setOpen( true ); } -SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text) - : TQListViewItem( parent, name ), action(0) +SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text) + : TQListViewItem( tqparent, name ), action(0) { strName = name; strText = text; - iParent = ((SnippetGroup *)parent)->getId(); + iParent = ((SnippetGroup *)tqparent)->getId(); setOpen( true ); } @@ -81,7 +81,7 @@ void SnippetItem::setName(TQString name) void SnippetItem::resetParent() { - SnippetGroup * group = dynamic_cast<SnippetGroup*>(parent()); + SnippetGroup * group = dynamic_cast<SnippetGroup*>(tqparent()); if (group) iParent = group->getId(); } @@ -129,8 +129,8 @@ Deklaration for class SnippetGroup int SnippetGroup::iMaxId = 1; -SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id) - : SnippetItem(parent, name, i18n("GROUP")) +SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id) + : SnippetItem(tqparent, name, i18n("GROUP")) { if (id > 0) { iId = id; diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index b61a553ad..2ddc609f8 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -33,13 +33,14 @@ class SnippetItem : public TQObject, public TQListViewItem { friend class SnippetGroup; Q_OBJECT + TQ_OBJECT public: - SnippetItem(TQListViewItem * parent, TQString name, TQString text); + SnippetItem(TQListViewItem * tqparent, TQString name, TQString text); ~SnippetItem(); TQString getName(); TQString getText(); - using TQListViewItem::parent; + using TQListViewItem::tqparent; int getParent() { return iParent; } void resetParent(); void setText(TQString text); @@ -54,7 +55,7 @@ public slots: void slotExecute(); private: - SnippetItem(TQListView * parent, TQString name, TQString text); + SnippetItem(TQListView * tqparent, TQString name, TQString text); TQString strName; TQString strText; int iParent; @@ -69,7 +70,7 @@ it in the main TQPtrList<SnippetItem>. */ class SnippetGroup : public SnippetItem { public: - SnippetGroup(TQListView * parent, TQString name, int id); + SnippetGroup(TQListView * tqparent, TQString name, int id); ~SnippetGroup(); int getId() { return iId; } diff --git a/kmail/snippetsettings.cpp b/kmail/snippetsettings.cpp index e61ebf43c..8dce0d31c 100644 --- a/kmail/snippetsettings.cpp +++ b/kmail/snippetsettings.cpp @@ -20,14 +20,14 @@ #include "snippetwidget.h" -SnippetSettings::SnippetSettings(TQWidget *parent, const char *name) - : SnippetSettingsBase(parent, name) +SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name) + : SnippetSettingsBase(tqparent, name) { _widget = NULL; } -SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name) - : SnippetSettingsBase(parent, name) +SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name) + : SnippetSettingsBase(tqparent, name) { _cfg = w->getSnippetConfig(); _widget = w; diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h index f6362d969..05ce99a56 100644 --- a/kmail/snippetsettings.h +++ b/kmail/snippetsettings.h @@ -29,9 +29,10 @@ same named .ui file class SnippetSettings : public SnippetSettingsBase { Q_OBJECT + TQ_OBJECT public: - SnippetSettings(TQWidget *parent = 0, const char *name = 0); - SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0); + SnippetSettings(TQWidget *tqparent = 0, const char *name = 0); + SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0); ~SnippetSettings(); diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index 62ca4a483..79667821f 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SnippetSettingsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SnippetSettingsBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>cbToolTip</cstring> </property> @@ -63,7 +63,7 @@ </size> </property> </spacer> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -74,7 +74,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>btnGroup</cstring> </property> @@ -85,7 +85,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rbSingle</cstring> </property> @@ -102,7 +102,7 @@ <string>An input dialog will be displayed for every variable within a snippet</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rbAll</cstring> </property> @@ -121,7 +121,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -129,7 +129,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index ef0e07930..ac8d0ebf4 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -44,11 +44,11 @@ #include <cassert> -SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent) - : KListView(parent, "snippet widget"), TQToolTip( viewport() ), +SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent) + : KListView(tqparent, "snippet widget"), TQToolTip( viewport() ), mEditor( editor ), mActionCollection( actionCollection ) { - // init the QPtrList + // init the TQPtrList _list.setAutoDelete(TRUE); // init the KListView @@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget() writeConfig(); delete _cfg; - /* We need to delete the child items before the parent items + /* We need to delete the child items before the tqparent items otherwise KDevelop would crash on exiting */ SnippetItem * item; while (_list.count() > 0) { @@ -111,7 +111,7 @@ void SnippetWidget::slotAdd() which the selected item is a child of*/ SnippetGroup * group = dynamic_cast<SnippetGroup*>(selectedItem()); if ( !group && selectedItem() ) - group = dynamic_cast<SnippetGroup*>(selectedItem()->parent()); + group = dynamic_cast<SnippetGroup*>(selectedItem()->tqparent()); /* still no group, let's make a default one */ if (!group ) { @@ -139,12 +139,12 @@ void SnippetWidget::slotAdd() } /*! - \fn SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text ) + \fn SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text ) Helper factory method. */ -SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ) +SnippetItem* SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut ) { - SnippetItem * item = new SnippetItem(parent, name, text); + SnippetItem * item = new SnippetItem(tqparent, name, text); const TQString actionName = i18n("Snippet %1").arg(name); const TQString normalizedName = TQString(actionName).tqreplace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8() ) ) { @@ -194,7 +194,7 @@ void SnippetWidget::slotRemove() if (group) { if (group->childCount() > 0 && - KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString::null,KStdGuiItem::del()) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove this group and all its snippets?"),TQString(),KStdGuiItem::del()) == KMessageBox::Cancel) return; @@ -255,10 +255,10 @@ void SnippetWidget::slotEdit( TQListViewItem* item ) pSnippet->setText( dlg.snippetText->text() ); pSnippet->getAction()->setShortcut( dlg.keyButton->shortcut()); - /* if the user changed the parent we need to move the snippet */ + /* if the user changed the tqparent we need to move the snippet */ if ( SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName() != dlg.cbGroup->currentText() ) { SnippetGroup * newGroup = dynamic_cast<SnippetGroup*>(SnippetItem::findItemByName(dlg.cbGroup->currentText(), _list)); - pSnippet->parent()->takeItem(pSnippet); + pSnippet->tqparent()->takeItem(pSnippet); newGroup->insertItem(pSnippet); pSnippet->resetParent(); } @@ -486,7 +486,7 @@ void SnippetWidget::initConfig() iCount = _cfg->readNumEntry("snippetSavedCount", 0); - for ( int i=1; i<=iCount; i++) { //read the saved-values and store in QMap + for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap strKeyName=TQString("snippetSavedName_%1").arg(i); strKeyText=TQString("snippetSavedVal_%1").arg(i); @@ -562,7 +562,7 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int // fn SnippetWidget::parseText(TQString text, TQString del) /*! This function is used to parse the given TQString for variables. If found the user will be prompted - for a tqreplacement value. It returns the string text with all tqreplacements made + for a replacement value. It returns the string text with all replacements made */ TQString SnippetWidget::parseText(TQString text, TQString del) { @@ -578,9 +578,9 @@ TQString SnippetWidget::parseText(TQString text, TQString del) TQRect rMulti = _SnippetConfig.getMultiRect(); do { - iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this QRegExp + iFound = text.tqfind(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this TQRegExp if (iFound >= 0) { - iEnd = text.find(del, iFound+1)+1; + iEnd = text.tqfind(del, iFound+1)+1; strName = text.mid(iFound, iEnd-iFound); if ( strName != del+del ) { //if not doubel-delimiter @@ -597,7 +597,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) strNew = ""; //for inputmode "multi" just reset new valaue } } else { - strNew = del; //if double-delimiter -> tqreplace by single character + strNew = del; //if double-delimiter -> replace by single character } if (iInMeth == 0) { //if input-method "single" is selected @@ -615,14 +615,14 @@ TQString SnippetWidget::parseText(TQString text, TQString del) oh = rMulti.top(); if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog TQMap<TQString, TQString>::Iterator it; - for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the tqreplacement + for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the replacement str.tqreplace(it.key(), it.data()); } } else { return ""; } - rMulti.setWidth(w); //this is a hack to save the dialog's dimensions in only one QRect + rMulti.setWidth(w); //this is a hack to save the dialog's dimensions in only one TQRect rMulti.setHeight(bh); rMulti.setTop(oh); rMulti.setLeft(0); @@ -637,7 +637,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) // fn SnippetWidget::showMultiVarDialog() /*! - This function constructs a dialog which tqcontains a label and a linedit for every + This function constructs a dialog which contains a label and a linedit for every variable that is stored in the given map except the double-delimiter entry It return true if everything was ok and false if the user hit cancel */ @@ -672,7 +672,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ labTop = new TQLabel( &dlg, "label" ); labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); - labTop->setText(i18n("Enter the tqreplacement values for these variables:")); + labTop->setText(i18n("Enter the replacement values for these variables:")); tqlayoutTop->addWidget(labTop, 0, 0); tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); @@ -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, Qt::AlignTop ); + tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop ); te = new KTextEdit( &dlg, "teVar" ); - tqlayoutVar->addWidget( te, i, 1, Qt::AlignTop ); + tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { cb->setChecked( TRUE ); @@ -779,7 +779,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // fn SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave) /*! - This function constructs a dialog which tqcontains a label and a linedit for the given variable + This function constructs a dialog which contains a label and a linedit for the given variable It return either the entered value or an empty string if the user hit cancel */ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize) @@ -799,7 +799,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri labTop = new TQLabel( &dlg, "label" ); tqlayoutTop->addWidget(labTop, 0, 0); - labTop->setText(i18n("Enter the tqreplacement values for %1:").arg( var )); + labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 ); @@ -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, Qt::AlignTop); - tqlayoutVar->addWidget( cb, 1, 1, Qt::AlignTop); + tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop); + tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { cb->setChecked( TRUE ); te->setText((*mapSave)[var]); @@ -909,7 +909,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2); if (!group) - group = dynamic_cast<SnippetGroup *>(item2->parent()); + group = dynamic_cast<SnippetGroup *>(item2->tqparent()); TQCString dropped; TQByteArray data = e->tqencodedData("text/plain"); diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index cd7d09d39..bc45d6d48 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -39,15 +39,16 @@ class KActionCollection; /** This is the widget which gets added to the right TreeToolView. It inherits KListView and TQToolTip which is needed for showing the -tooltips which tqcontains the text of the snippet +tooltips which contains the text of the snippet @author Robert Gruber */ -class SnippetWidget : public KListView, public QToolTip +class SnippetWidget : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT public: - SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0); + SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent = 0); ~SnippetWidget(); TQPtrList<SnippetItem> * getList() { return (&_list); } void writeConfig(); @@ -67,7 +68,7 @@ private: bool showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave, int & iWidth, int & iBasicHeight, int & iOneHeight); TQString showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize); - SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ); + SnippetItem* makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut ); TQPtrList<SnippetItem> _list; TQMap<TQString, TQString> _mapSaved; diff --git a/kmail/spamheaderanalyzer.cpp b/kmail/spamheaderanalyzer.cpp index ad77605ea..427aa4d16 100644 --- a/kmail/spamheaderanalyzer.cpp +++ b/kmail/spamheaderanalyzer.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/spamheaderanalyzer.h b/kmail/spamheaderanalyzer.h index 76ac50de1..ddb9bf1b1 100644 --- a/kmail/spamheaderanalyzer.h +++ b/kmail/spamheaderanalyzer.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/stl_util.h b/kmail/stl_util.h index 5e3e5ce6f..4b549a352 100644 --- a/kmail/stl_util.h +++ b/kmail/stl_util.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index bb9c5c6c9..346cfa8c8 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,9 +45,9 @@ namespace KMail { -SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString &caption, +SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *tqparent, const TQString &caption, KAccount *acct, TQString startPath ) - : KSubscription( parent, caption, acct, User1, TQString::null, false ), + : KSubscription( tqparent, caption, acct, User1, TQString(), false ), mStartPath( startPath ), mSubscribed( false ), mForceSubscriptionEnable( false) { // hide unneeded checkboxes @@ -100,7 +100,7 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI { oldItem->takeItem(cur); item->insertItem(cur); - if ( cur->isSelected() ) // we have new parents so open them + if ( cur->isSelected() ) // we have new tqparents so open them folderTree()->ensureItemVisible( cur ); ++it; } @@ -111,19 +111,19 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI void SubscriptionDialogBase::createListViewItem( int i ) { GroupItem *item = 0; - GroupItem *parent = 0; + GroupItem *tqparent = 0; - // get the parent + // get the tqparent GroupItem *oldItem = 0; - TQString parentPath; - findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &parent, &oldItem ); + TQString tqparentPath; + findParentItem( mFolderNames[i], mFolderPaths[i], tqparentPath, &tqparent, &oldItem ); - if (!parent && parentPath != "/") + if (!tqparent && tqparentPath != "/") { - // the parent is not available and it's no root-item + // 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 parent in advance - TQStringList folders = TQStringList::split(mDelimiter, parentPath); + // so we create each tqparent in advance + TQStringList folders = TQStringList::split(mDelimiter, tqparentPath); uint i = 0; for ( TQStringList::Iterator it = folders.begin(); it != folders.end(); ++it ) { @@ -154,17 +154,17 @@ void SubscriptionDialogBase::createListViewItem( int i ) // as these items are "dummies" we create them non-checkable if (!item) { - if (parent) - item = new GroupItem(parent, info, this, false); + if (tqparent) + item = new GroupItem(tqparent, info, this, false); else item = new GroupItem(folderTree(), info, this, false); mItemDict.insert(info.path, item); } - parent = item; + tqparent = item; ++i; } // folders - } // parent + } // tqparent KGroupInfo info(mFolderNames[i]); if (mFolderNames[i].upper() == "INBOX" && @@ -175,8 +175,8 @@ void SubscriptionDialogBase::createListViewItem( int i ) // only checkable when the folder is selectable bool checkable = ( mFolderMimeTypes[i] == "inode/directory" ) ? false : true; // create a new item - if (parent) - item = new GroupItem(parent, info, this, checkable); + if (tqparent) + item = new GroupItem(tqparent, info, this, checkable); else item = new GroupItem(folderTree(), info, this, checkable); @@ -198,18 +198,18 @@ void SubscriptionDialogBase::createListViewItem( int i ) //------------------------------------------------------------------------------ -void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &parentPath, - GroupItem **parent, GroupItem **oldItem ) +void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &tqparentPath, + GroupItem **tqparent, GroupItem **oldItem ) { - // remove the name (and the separator) from the path to get the parent path + // 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; - parentPath = path; - parentPath.remove(start, length); + tqparentPath = path; + tqparentPath.remove(start, length); - // find the parent by it's path - *parent = mItemDict[parentPath]; + // find the tqparent by it's path + *tqparent = mItemDict[tqparentPath]; // check if the item already exists *oldItem = mItemDict[path]; @@ -303,9 +303,9 @@ void SubscriptionDialogBase::loadingComplete() // implementation for server side subscription //------------------------------------------------------------------------------ -SubscriptionDialog::SubscriptionDialog( TQWidget *parent, const TQString &caption, +SubscriptionDialog::SubscriptionDialog( TQWidget *tqparent, const TQString &caption, KAccount *acct, TQString startPath ) - : SubscriptionDialogBase( parent, caption, acct, startPath ) + : SubscriptionDialogBase( tqparent, caption, acct, startPath ) { } diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h index 1d5a01481..4d3a01db7 100644 --- a/kmail/subscriptiondialog.h +++ b/kmail/subscriptiondialog.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,22 +47,23 @@ namespace KMail { class SubscriptionDialogBase : public KSubscription { Q_OBJECT + TQ_OBJECT public: - SubscriptionDialogBase( TQWidget *parent, + SubscriptionDialogBase( TQWidget *tqparent, const TQString &caption, KAccount* acct, - TQString startPath = TQString::null ); + TQString startPath = TQString() ); virtual ~SubscriptionDialogBase() {} void show(); protected: /** - * Find the parent item + * Find the tqparent item */ void findParentItem ( TQString &name, TQString &path, TQString &compare, - GroupItem **parent, GroupItem **oldItem ); + GroupItem **tqparent, GroupItem **oldItem ); /** * Process the next prefix in mPrefixList @@ -127,12 +128,13 @@ namespace KMail { class SubscriptionDialog : public SubscriptionDialogBase { Q_OBJECT + TQ_OBJECT public: - SubscriptionDialog( TQWidget *parent, + SubscriptionDialog( TQWidget *tqparent, const TQString &caption, KAccount* acct, - TQString startPath = TQString::null ); + TQString startPath = TQString() ); virtual ~SubscriptionDialog(); protected: /** reimpl */ diff --git a/kmail/teehtmlwriter.cpp b/kmail/teehtmlwriter.cpp index 05d9969c9..b162059e6 100644 --- a/kmail/teehtmlwriter.cpp +++ b/kmail/teehtmlwriter.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/teehtmlwriter.h b/kmail/teehtmlwriter.h index 411c1a960..a55fd5899 100644 --- a/kmail/teehtmlwriter.h +++ b/kmail/teehtmlwriter.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 26355ac5b..d497f1846 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -126,7 +126,7 @@ TQString TemplateParser::getFName( const TQString &str ) // last resort -- return 'name' from 'name@domain' int sep_pos; TQString res; - if ( ( sep_pos = str.find( '@' ) ) > 0 ) { + if ( ( sep_pos = str.tqfind( '@' ) ) > 0 ) { int i; for ( i = (sep_pos - 1); i >= 0; --i ) { TQChar c = str[i]; @@ -136,7 +136,7 @@ TQString TemplateParser::getFName( const TQString &str ) break; } } - } else if ( ( sep_pos = str.find(',') ) > 0 ) { + } else if ( ( sep_pos = str.tqfind(',') ) > 0 ) { unsigned int i; bool begin = false; for ( i = sep_pos; i < str.length(); ++i ) { @@ -169,7 +169,7 @@ TQString TemplateParser::getLName( const TQString &str ) // else format is 'First Last' int sep_pos; TQString res; - if ( ( sep_pos = str.find(',') ) > 0 ) { + if ( ( sep_pos = str.tqfind(',') ) > 0 ) { int i; for ( i = sep_pos; i >= 0; --i ) { TQChar c = str[i]; @@ -180,7 +180,7 @@ TQString TemplateParser::getLName( const TQString &str ) } } } else { - if ( ( sep_pos = str.find( ' ' ) ) > 0 ) { + if ( ( sep_pos = str.tqfind( ' ' ) ) > 0 ) { unsigned int i; bool begin = false; for ( i = sep_pos; i < str.length(); ++i ) { @@ -297,11 +297,11 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) arg( path ).arg(file.errorString() )); } - } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) { + } else if ( cmd.startsWith( "TQUOTEPIPE=" ) ) { // pipe message body throw command and insert it as quotation - kdDebug() << "Command: QUOTEPIPE=" << endl; + kdDebug() << "Command: TQUOTEPIPE=" << endl; TQString q; - int len = parseQuotes( "QUOTEPIPE=", cmd, q ); + int len = parseQuotes( "TQUOTEPIPE=", cmd, q ); i += len; TQString pipe_cmd = q; if ( mOrigMsg ) { @@ -311,18 +311,18 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) body.append( quote ); } - } else if ( cmd.startsWith( "QUOTE" ) ) { - kdDebug() << "Command: QUOTE" << endl; - i += strlen( "QUOTE" ); + } else if ( cmd.startsWith( "TQUOTE" ) ) { + kdDebug() << "Command: TQUOTE" << endl; + i += strlen( "TQUOTE" ); if ( mOrigMsg ) { TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, messageText( true ), shouldStripSignature(), mAllowDecryption ); body.append( quote ); } - } else if ( cmd.startsWith( "QHEADERS" ) ) { - kdDebug() << "Command: QHEADERS" << endl; - i += strlen( "QHEADERS" ); + } else if ( cmd.startsWith( "TQHEADERS" ) ) { + kdDebug() << "Command: TQHEADERS" << endl; + i += strlen( "TQHEADERS" ); if ( mOrigMsg ) { TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, mOrigMsg->headerAsSendableString(), @@ -1004,10 +1004,10 @@ TQString TemplateParser::findTemplate() TQString tmpl; if ( !mFolder ) { // find folder message belongs to - mFolder = mMsg->parent(); + mFolder = mMsg->tqparent(); if ( !mFolder ) { if ( mOrigMsg ) { - mFolder = mOrigMsg->parent(); + mFolder = mOrigMsg->tqparent(); } if ( !mFolder ) { kdDebug(5006) << "Oops! No folder for message" << endl; diff --git a/kmail/templateparser.h b/kmail/templateparser.h index 48bdbf578..679cbd00f 100644 --- a/kmail/templateparser.h +++ b/kmail/templateparser.h @@ -32,11 +32,11 @@ class KProcess; /** * The TemplateParser transforms a message with a given template. * - * A template tqcontains text and commands, such as %QUOTE or %ODATE, which will be - * tqreplaced with the real values in process(). + * A template contains text and commands, such as %TQUOTE or %ODATE, which will be + * replaced with the real values in process(). * * The message given in the constructor is the message that is being transformed. - * The message text will be tqreplaced by the processed text of the template, but other + * The message text will be replaced by the processed text of the template, but other * properties, such as the attachments or the subject, are preserved. * * There are two different kind of commands: Those that work on the message that is @@ -54,6 +54,7 @@ class KProcess; class TemplateParser : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Mode { @@ -71,7 +72,7 @@ class TemplateParser : public TQObject /** * Sets the selection. If this is set, only the selection will be added to commands such - * as %QUOTE. Otherwise, the whole message is quoted. + * as %TQUOTE. Otherwise, the whole message is quoted. * If this is not called at all, the whole message is quoted as well. * Call this before calling process(). */ @@ -79,7 +80,7 @@ class TemplateParser : public TQObject /** * Sets whether the template parser is allowed to decrypt the original message when needing - * its message text, for example for the %QUOTE command. + * its message text, for example for the %TQUOTE command. * If true, it will tell the ObjectTreeParser it uses internally to decrypt the message, * and that will possibly show a password request dialog to the user. * @@ -147,14 +148,14 @@ class TemplateParser : public TQObject * * In append mode, this will simply append the text to the body. * - * Otherwise, the content of the old message is deleted and tqreplaced with @p body. + * Otherwise, the content of the old message is deleted and replaced with @p body. * Attachments of the original message are also added back to the new message. */ void addProcessedBodyToMessage( const TQString &body ); /** * Determines whether the signature should be stripped when getting the text of the original - * message, e.g. for commands such as %QUOTE + * message, e.g. for commands such as %TQUOTE */ bool shouldStripSignature() const; diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 70dd926b6..0e52599c4 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -38,8 +38,8 @@ #include "templatesconfiguration.h" -TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *name ) - :TemplatesConfigurationBase( parent, name ) +TemplatesConfiguration::TemplatesConfiguration( TQWidget *tqparent, const char *name ) + :TemplatesConfigurationBase( tqparent, name ) { TQFont f = KGlobalSettings::fixedFont(); textEdit_new->setFont( f ); @@ -323,7 +323,7 @@ void TemplatesConfiguration::loadFromPhrases() str = replyPhrases.phraseReplySender(); if ( !str.isEmpty() ) { - textEdit_reply->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" ); + textEdit_reply->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" ); } else { textEdit_reply->setText( defaultReply() ); @@ -331,7 +331,7 @@ void TemplatesConfiguration::loadFromPhrases() str = replyPhrases.phraseReplyAll(); if ( !str.isEmpty() ) { - textEdit_reply_all->setText( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" ); + textEdit_reply_all->setText( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" ); } else { textEdit_reply_all->setText( defaultReplyAll() ); @@ -372,7 +372,7 @@ void TemplatesConfiguration::importFromPhrases() str = replyPhrases.phraseReplySender(); if ( !str.isEmpty() ) { - GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" ); + GlobalSettings::self()->setTemplateReply( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" ); } else { GlobalSettings::self()->setTemplateReply( defaultReply() ); @@ -380,7 +380,7 @@ void TemplatesConfiguration::importFromPhrases() str = replyPhrases.phraseReplyAll(); if ( !str.isEmpty() ) { - GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%QUOTE\n%CURSOR\n" ); + GlobalSettings::self()->setTemplateReplyAll( convertPhrases( str ) + "\n%TQUOTE\n%CURSOR\n" ); } else { GlobalSettings::self()->setTemplateReplyAll( defaultReplyAll() ); @@ -521,7 +521,7 @@ TQString TemplatesConfiguration::defaultReply() { "%BLANK\n" "%REM=\"Default reply template\"%-\n" "On %ODATEEN %OTIMELONGEN you wrote:\n" - "%QUOTE\n" + "%TQUOTE\n" ); } @@ -531,7 +531,7 @@ TQString TemplatesConfiguration::defaultReplyAll() { "%BLANK\n" "%REM=\"Default reply all template\"%-\n" "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n" - "%QUOTE\n" + "%TQUOTE\n" ); } diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h index b1479af31..48293a06e 100644 --- a/kmail/templatesconfiguration.h +++ b/kmail/templatesconfiguration.h @@ -29,10 +29,11 @@ class TemplatesConfiguration : public TemplatesConfigurationBase { Q_OBJECT + TQ_OBJECT public: - TemplatesConfiguration( TQWidget *parent = 0, const char *name = 0 ); + TemplatesConfiguration( TQWidget *tqparent = 0, const char *name = 0 ); void loadFromGlobal(); void saveToGlobal(); diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index 69c451b42..278567247 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TemplatesConfigurationBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TemplatesConfigurationBase</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolBox"> + <widget class="TQToolBox"> <property name="name"> <cstring>toolBox1</cstring> </property> @@ -60,7 +60,7 @@ <property name="currentIndex"> <number>3</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page_new</cstring> </property> @@ -74,7 +74,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit_new</cstring> </property> @@ -118,7 +118,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page_reply</cstring> </property> @@ -132,7 +132,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit_reply</cstring> </property> @@ -161,7 +161,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page_reply_all</cstring> </property> @@ -175,7 +175,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit_reply_all</cstring> </property> @@ -204,7 +204,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page_forward</cstring> </property> @@ -218,7 +218,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit_forward</cstring> </property> @@ -256,7 +256,7 @@ <string>How does this work?</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout5</cstring> </property> @@ -269,7 +269,7 @@ <cstring>mInsertCommand</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -291,7 +291,7 @@ <cstring>lineEdit_quote</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineEdit_quote</cstring> </property> diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index c2f794dd0..2a33f3aaf 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -30,9 +30,9 @@ #include "templatesinsertcommand.h" -TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, +TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *tqparent, const char *name ) - : TQPushButton( parent, name ) + : TQPushButton( tqparent, name ) { setText( i18n( "&Insert Command..." ) ); connect( this, TQT_SIGNAL( clicked() ), @@ -148,7 +148,7 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, menu->insert( action ); action = new KAction( i18n( "Quoted Headers" ), 0, mapper, TQT_SLOT( map() ), menu ); - mapper->setMapping( action, CQHeaders ); + mapper->setMapping( action, CTQHeaders ); menu->insert( action ); action = new KAction( i18n( "Headers as Is" ), 0, mapper, TQT_SLOT( map() ), menu ); @@ -334,7 +334,7 @@ void TemplatesInsertCommand::slotMapped( int cmd ) emit insertCommand( static_cast<Command>( cmd ) ); switch( cmd ) { - case TemplatesInsertCommand::CQuote: emit insertCommand("%QUOTE"); break; + case TemplatesInsertCommand::CQuote: emit insertCommand("%TQUOTE"); break; case TemplatesInsertCommand::CText: emit insertCommand("%TEXT"); break; case TemplatesInsertCommand::COMsgId: emit insertCommand("%OMSGID"); break; case TemplatesInsertCommand::CODate: emit insertCommand("%ODATE"); break; @@ -357,7 +357,7 @@ void TemplatesInsertCommand::slotMapped( int cmd ) case TemplatesInsertCommand::COFromFName: emit insertCommand("%OFROMFNAME"); break; case TemplatesInsertCommand::COFromLName: emit insertCommand("%OFROMLNAME"); break; case TemplatesInsertCommand::COFullSubject: emit insertCommand("%OFULLSUBJECT"); break; - case TemplatesInsertCommand::CQHeaders: emit insertCommand("%QHEADERS"); break; + case TemplatesInsertCommand::CTQHeaders: emit insertCommand("%TQHEADERS"); break; case TemplatesInsertCommand::CHeaders: emit insertCommand("%HEADERS"); break; case TemplatesInsertCommand::COHeader: emit insertCommand("%OHEADER=\"\"", -1); break; case TemplatesInsertCommand::CMsgId: emit insertCommand("%MSGID"); break; @@ -384,7 +384,7 @@ void TemplatesInsertCommand::slotMapped( int cmd ) case TemplatesInsertCommand::CFullSubject: emit insertCommand("%FULLSUBJECT"); break; case TemplatesInsertCommand::CHeader: emit insertCommand("%HEADER=\"\"", -1); break; case TemplatesInsertCommand::CSystem: emit insertCommand("%SYSTEM=\"\"", -1); break; - case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%QUOTEPIPE=\"\"", -1); break; + case TemplatesInsertCommand::CQuotePipe: emit insertCommand("%TQUOTEPIPE=\"\"", -1); break; case TemplatesInsertCommand::CTextPipe: emit insertCommand("%TEXTPIPE=\"\"", -1); break; case TemplatesInsertCommand::CMsgPipe: emit insertCommand("%MSGPIPE=\"\"", -1); break; case TemplatesInsertCommand::CBodyPipe: emit insertCommand("%BODYPIPE=\"\"", -1); break; diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h index 04878136f..512552448 100644 --- a/kmail/templatesinsertcommand.h +++ b/kmail/templatesinsertcommand.h @@ -27,16 +27,17 @@ class KActionMenu; -class TemplatesInsertCommand : public QPushButton +class TemplatesInsertCommand : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - TemplatesInsertCommand( TQWidget *parent, const char *name = 0 ); + TemplatesInsertCommand( TQWidget *tqparent, const char *name = 0 ); ~TemplatesInsertCommand(); public: - enum Command {CDnl = 1, CRem, CInsert, CSystem, CQuotePipe, CQuote, CQHeaders, CHeaders, + enum Command {CDnl = 1, CRem, CInsert, CSystem, CQuotePipe, CQuote, CTQHeaders, CHeaders, CTextPipe, CMsgPipe, CBodyPipe, CClearPipe, CText, CToAddr, CToName, CFromAddr, CFromName, CFullSubject, CMsgId, COHeader, CHeader, COToAddr, COToName, COFromAddr, COFromName, COFullSubject, diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp index e6b4b899b..e11bc3915 100644 --- a/kmail/tests/messagedicttests.cpp +++ b/kmail/tests/messagedicttests.cpp @@ -42,7 +42,7 @@ void MessageDictTester::testKMDictInsert() p("Insert: "); KMDictItem *item = new KMDictItem(); m_dict->insert( 12345, item ); - KMDictItem *found = m_dict->find( 12345 ); + KMDictItem *found = m_dict->tqfind( 12345 ); CHECK( item, found); } @@ -50,7 +50,7 @@ void MessageDictTester::testKMDictRemove() { p("Remove: "); m_dict->remove( 12345 ); - KMDictItem *item = m_dict->find( 12345 ); + KMDictItem *item = m_dict->tqfind( 12345 ); CHECK( item, (KMDictItem*)0 ); } @@ -71,7 +71,7 @@ void MessageDictTester::testKMDictReplace() KMDictItem *newItem = new KMDictItem(); m_dict->insert( 12345, oldItem ); m_dict->tqreplace( 12345, newItem ); - KMDictItem *found = m_dict->find( 12345 ); + KMDictItem *found = m_dict->tqfind( 12345 ); CHECK( found, newItem ); } diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h index 81385efff..52a09cc62 100644 --- a/kmail/tests/messagedicttests.h +++ b/kmail/tests/messagedicttests.h @@ -14,6 +14,7 @@ class KMDict; class MessageDictTester : public KUnitTest::SlotTester { Q_OBJECT + TQ_OBJECT public slots: void setUp(); diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h index e12bc15f6..ef9a4b966 100644 --- a/kmail/tests/mimelibtests.h +++ b/kmail/tests/mimelibtests.h @@ -26,6 +26,7 @@ class DwString; class MimeLibTester : public KUnitTest::SlotTester { Q_OBJECT + TQ_OBJECT public slots: void setUp(); diff --git a/kmail/tests/signedmail.mbox b/kmail/tests/signedmail.mbox index 1df5f3eed..5d1a286ab 100644 --- a/kmail/tests/signedmail.mbox +++ b/kmail/tests/signedmail.mbox @@ -31,7 +31,7 @@ Content-Type: multipart/signed; Message-Id: <20070403084156.C961269606@smtp4-g19.free.fr> To: undisclosed-recipients:; X-Virus-Scanned: by amavisd-new at kdab.net -X-Spam-Status: Yes, score=7.598 tagged_above=3 required=6.3 +X-Spam-tqStatus: Yes, score=7.598 tagged_above=3 required=6.3 tests=[BAYES_50=0.001, DATE_IN_PAST_96_XX=2.02, DNS_FROM_AHBL_RHSBL=0.231, DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_DSN=2.597, DNS_FROM_RFC_POST=1.708, UNDISC_RECIPS=0.841] @@ -41,8 +41,8 @@ X-Spam-Flag: YES X-Kolab-Scheduling-Message: FALSE X-UID: 68768 X-Length: 3235 -Status: RO -X-Status: RPT +tqStatus: RO +X-tqStatus: RPT X-KMail-EncryptionState: X-KMail-SignatureState: X-KMail-MDN-Sent: diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp index 195758b87..ec6c13543 100644 --- a/kmail/tests/utiltests.cpp +++ b/kmail/tests/utiltests.cpp @@ -49,7 +49,7 @@ void UtilTester::test_lf2crlf() COMPARE( KMail::Util::lf2crlf( TQCString("") ), TQCString("") ); // TQByteArray version - TQByteArray arr; KMail::Util::setFromQCString( arr, src ); + TQByteArray arr; KMail::Util::setFromTQCString( arr, src ); COMPARE( arr[arr.size()-1], '\r' ); TQByteArray arrConv = KMail::Util::lf2crlf( arr ); COMPARE( arrConv[arrConv.size()-1], '\r' ); @@ -81,14 +81,14 @@ void UtilTester::test_append() TQCString test; TQCString str = "foo"; COMPARE( (int)str.size(), 4 ); // trailing nul included - TQByteArray s1 = KMail::Util::byteArrayFromQCStringNoDetach( str ); + TQByteArray s1 = KMail::Util::byteArrayFromTQCStringNoDetach( str ); COMPARE( (int)s1.size(), 3 ); COMPARE( (int)str.size(), 3 ); // trailing nul got removed COMPARE( s1.data(), str.data() ); // yes, no detach COMPARE( s1[2], 'o' ); TQCString bar( "bar" ); - TQByteArray s2 = KMail::Util::byteArrayFromQCStringNoDetach( bar ); + TQByteArray s2 = KMail::Util::byteArrayFromTQCStringNoDetach( bar ); COMPARE( (int)s2.size(), 3 ); KMail::Util::append( s1, s2 ); @@ -123,7 +123,7 @@ void UtilTester::test_insert() TQCString str = "foo"; COMPARE( (int)str.size(), 4 ); // trailing nul included TQByteArray s1; - KMail::Util::setFromQCString( s1, str ); + KMail::Util::setFromTQCString( s1, str ); KMail::Util::insert( s1, 1, "bar" ); COMPARE( (int)s1.size(), 6 ); @@ -140,7 +140,7 @@ void UtilTester::test_insert() void UtilTester::test_DwStringConversions( const TQCString& cstr ) { - // QCString->DwString->QCString + // TQCString->DwString->TQCString COMPARE( (int)cstr.size(), 8 ); DwString dwstr = KMail::Util::dwString( cstr ); COMPARE( (int)dwstr.size(), 7 ); @@ -150,16 +150,16 @@ void UtilTester::test_DwStringConversions( const TQCString& cstr ) COMPARE( cstr2, cstr ); COMPARE( cstr2[6], 'r' ); - // And also QCString->QByteArray + // And also TQCString->TQByteArray TQByteArray arr; - KMail::Util::setFromQCString( arr, cstr ); + KMail::Util::setFromTQCString( arr, cstr ); COMPARE( (int)arr.size(), 7 ); COMPARE( arr[6], 'r' ); - KMail::Util::setFromQCString( arr, TQCString() ); + KMail::Util::setFromTQCString( arr, TQCString() ); COMPARE( (int)arr.size(), 0 ); - // DwString->QByteArray + // DwString->TQByteArray TQByteArray ba = KMail::Util::ByteArray( dwstr ); COMPARE( (int)ba.size(), 7 ); COMPARE( ba[6], 'r' ); @@ -186,17 +186,17 @@ void UtilTester::test_DwStringConversions() VERIFY( dwstr.empty() ); } -void UtilTester::test_QByteArrayQCString() +void UtilTester::test_TQByteArrayTQCString() { TQCString str = "foobar"; COMPARE( (int)str.size(), 7 ); // trailing nul included - TQByteArray s1 = KMail::Util::byteArrayFromQCStringNoDetach( str ); + TQByteArray s1 = KMail::Util::byteArrayFromTQCStringNoDetach( str ); COMPARE( (int)str.size(), 6 ); // trailing nul got removed COMPARE( s1.data(), str.data() ); // yes, no detach COMPARE( s1[5], 'r' ); COMPARE( str[5], 'r' ); - KMail::Util::restoreQCString( str ); + KMail::Util::restoreTQCString( str ); COMPARE( (int)str.size(), 7 ); // trailing nul included COMPARE( str[5], 'r' ); COMPARE( str[6], '\0' ); diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h index 2270cbcfd..cb6c225a9 100644 --- a/kmail/tests/utiltests.h +++ b/kmail/tests/utiltests.h @@ -12,6 +12,7 @@ class UtilTester : public KUnitTest::SlotTester { Q_OBJECT + TQ_OBJECT public slots: void setUp(); @@ -22,7 +23,7 @@ public slots: void test_append(); void test_insert(); void test_DwStringConversions(); - void test_QByteArrayQCString(); + void test_TQByteArrayTQCString(); private: void test_DwStringConversions( const TQCString& cstr ); }; diff --git a/kmail/textsource.cpp b/kmail/textsource.cpp index 6649565a9..2ac83d0c4 100644 --- a/kmail/textsource.cpp +++ b/kmail/textsource.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/textsource.h b/kmail/textsource.h index e02509202..58c9612c2 100644 --- a/kmail/textsource.h +++ b/kmail/textsource.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/tips b/kmail/tips index 1defde798..9aef85361 100644 --- a/kmail/tips +++ b/kmail/tips @@ -18,7 +18,7 @@ subject and mailing lists with <em>Tools->Create Filter</em>?</p> added to the subject of some mailing lists by using the <em>rewrite header</em> filter action? Just use <pre>rewrite header "Subject" - replace "\s*\[mailing list name\]\s*" + tqreplace "\s*\[mailing list name\]\s*" with ""</pre> </p> </html> @@ -60,7 +60,7 @@ in the first edit field of a search rule?</p> <tip category="KMail|Filters"> <html> <p>...that you can filter out HTML only messages with the rule -<pre>"Content-type" contains "text/html"?</pre> +<pre>"Content-type" tqcontains "text/html"?</pre> </p> </html> </tip> diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp index e80d1cb27..bde290905 100644 --- a/kmail/transportmanager.cpp +++ b/kmail/transportmanager.cpp @@ -60,7 +60,7 @@ namespace KMail { do { newId = kapp->random(); - } while ( usedIds.find(newId) != usedIds.end() ); + } while ( usedIds.tqfind(newId) != usedIds.end() ); return newId; } diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 74afe85ba..a2a823370 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -27,9 +27,9 @@ using namespace KMail; -TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree, +TreeBase::TreeBase( TQWidget *tqparent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ) - : KListView( parent ), mFolderTree( folderTree ) + : KListView( tqparent ), mFolderTree( folderTree ) { Q_UNUSED( preSelection ); Q_UNUSED( mustBeReadWrite ); @@ -116,13 +116,13 @@ void TreeBase::recolorRows() TQListViewItem * item = it.current() ; if ( item->isVisible() ) { bool visible = true; - TQListViewItem * parent = item->parent(); - while ( parent ) { - if (!parent->isOpen()) { + TQListViewItem * tqparent = item->tqparent(); + while ( tqparent ) { + if (!tqparent->isOpen()) { visible = false; break; } - parent = parent->parent(); + tqparent = tqparent->tqparent(); } if ( visible ) { @@ -174,7 +174,7 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde } else { if ( depth > lastDepth ) { - // next lower level - parent node will get opened + // next lower level - tqparent node will get opened item = createItem( lastItem ); lastItem->setOpen( true ); } @@ -183,15 +183,15 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde path = path.section( '/', 0, -2 - (lastDepth-depth) ); if ( depth == lastDepth ) // same level - behind previous item - item = createItem( lastItem->parent(), lastItem ); + item = createItem( lastItem->tqparent(), lastItem ); else if ( depth < lastDepth ) { // above previous level - might be more than one level difference // but highest possibility is top level - while ( ( depth <= --lastDepth ) && lastItem->parent() ) { - lastItem = static_cast<TQListViewItem *>( lastItem->parent() ); + while ( ( depth <= --lastDepth ) && lastItem->tqparent() ) { + lastItem = static_cast<TQListViewItem *>( lastItem->tqparent() ); } - if ( lastItem->parent() ) - item = createItem( lastItem->parent(), lastItem ); + if ( lastItem->tqparent() ) + item = createItem( lastItem->tqparent(), lastItem ); else { // chain somehow broken - what does cause this ??? kdDebug( 5006 ) << "You shouldn't get here: depth=" << depth diff --git a/kmail/treebase.h b/kmail/treebase.h index 3822add20..e11a518c6 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -33,8 +33,9 @@ class TreeItemBase; class TreeBase : public KListView { Q_OBJECT + TQ_OBJECT public: - TreeBase( TQWidget * parent, KMFolderTree *folderTree, + TreeBase( TQWidget * tqparent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ); virtual ~TreeBase() {} @@ -49,7 +50,7 @@ class TreeBase : public KListView } void reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolders, - const TQString& preSelection = TQString::null ); + const TQString& preSelection = TQString() ); int folderColumn() const { return mFolderColumn; } void setFolderColumn( const int folderCol ) { mFolderColumn = folderCol; } diff --git a/kmail/undostack.h b/kmail/undostack.h index 11a3a9898..d1e9408aa 100644 --- a/kmail/undostack.h +++ b/kmail/undostack.h @@ -41,9 +41,10 @@ public: KMFolder *destFolder; }; -class UndoStack : public QObject +class UndoStack : public TQObject { Q_OBJECT + TQ_OBJECT public: UndoStack(int size); diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index d788add0f..e1707b1ba 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,7 +53,7 @@ #include <algorithm> using std::for_each; using std::remove; -using std::find; +using std::tqfind; KMail::URLHandlerManager * KMail::URLHandlerManager::self = 0; @@ -116,7 +116,7 @@ namespace { bool handleContextMenuRequest( const KURL &, const TQPoint &, KMReaderWin * ) const { return false; } - TQString statusBarMessage( const KURL &, KMReaderWin * ) const { return TQString::null; } + TQString statusBarMessage( const KURL &, KMReaderWin * ) const { return TQString(); } }; class AttachmentURLHandler : public KMail::URLHandler { @@ -274,7 +274,7 @@ TQString KMail::URLHandlerManager::BodyPartURLHandlerManager::statusBarMessage( TQString path; partNode * node = partNodeFromXKMailUrl( url, w, &path ); if ( !node ) - return TQString::null; + return TQString(); KMail::PartNodeBodyPart part( *node, w->overrideCodec() ); for ( BodyPartHandlerList::const_iterator it = mHandlers.begin() ; it != mHandlers.end() ; ++it ) { @@ -282,7 +282,7 @@ TQString KMail::URLHandlerManager::BodyPartURLHandlerManager::statusBarMessage( if ( !msg.isEmpty() ) return msg; } - return TQString::null; + return TQString(); } // @@ -377,7 +377,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW if ( !msg.isEmpty() ) return msg; } - return TQString::null; + return TQString(); } @@ -495,7 +495,7 @@ namespace { if ( url.path() == "showAttachmentQuicklist" ) return i18n( "Show attachment list" ); } - return TQString::null ; + return TQString() ; } } @@ -532,7 +532,7 @@ namespace { } } } - return TQString::null ; + return TQString() ; } } @@ -560,7 +560,7 @@ namespace { TQString SMimeURLHandler::statusBarMessage( const KURL & url, KMReaderWin * ) const { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) - return TQString::null; + return TQString(); return i18n("Show certificate 0x%1").arg( keyId ); } } @@ -578,7 +578,7 @@ namespace { namespace { TQString MailToURLHandler::statusBarMessage( const KURL & url, KMReaderWin * ) const { if ( url.protocol() != "mailto" ) - return TQString::null; + return TQString(); return KMMessage::decodeMailtoUrl( url.url() ); } } @@ -605,7 +605,7 @@ namespace { { bool inHeader = false; const TQString place = url.queryItem( "place" ).lower(); - if ( place != TQString::null ) { + if ( place != TQString() ) { inHeader = ( place == "header" ); } return inHeader; @@ -682,7 +682,7 @@ namespace { { partNode * node = partNodeForUrl( url, w ); if ( !node ) - return TQString::null; + return TQString(); const KMMessagePart & msgPart = node->msgPart(); TQString name = msgPart.fileName(); @@ -752,7 +752,7 @@ namespace { namespace { bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const { if ( w ) - w->emitUrlClicked( url, Qt::LeftButton ); + w->emitUrlClicked( url, TQt::LeftButton ); return true; } diff --git a/kmail/urlhandlermanager.h b/kmail/urlhandlermanager.h index 815952593..2e0959ed0 100644 --- a/kmail/urlhandlermanager.h +++ b/kmail/urlhandlermanager.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kmail/util.cpp b/kmail/util.cpp index ca1b54b6e..9586f70d1 100644 --- a/kmail/util.cpp +++ b/kmail/util.cpp @@ -25,11 +25,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -60,7 +60,7 @@ size_t KMail::Util::crlf2lf( char* str, const size_t strLen ) return strLen; } - // tqreplace all occurrences of "\r\n" with "\n" (in place) + // replace all occurrences of "\r\n" with "\n" (in place) char* target = const_cast<char*>( source ); // target points to '\r' ++source; // source points to '\n' for ( ; source < sourceEnd; ++source ) { diff --git a/kmail/util.h b/kmail/util.h index 341f65df9..9f291a2e0 100644 --- a/kmail/util.h +++ b/kmail/util.h @@ -25,11 +25,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -54,7 +54,7 @@ class TQWidget; namespace KMail { /** - * The Util namespace tqcontains a collection of helper functions use in + * The Util namespace contains a collection of helper functions use in * various places. */ namespace Util { @@ -93,21 +93,21 @@ namespace Util { TQByteArray ByteArray( const DwString& str ); /** - * Construct a DwString from a QCString + * Construct a DwString from a TQCString */ DwString dwString( const TQCString& str ); /** - * Construct a DwString from a QByteArray + * Construct a DwString from a TQByteArray */ DwString dwString( const TQByteArray& str ); /** * Fills a TQByteArray from a TQCString - removing the trailing null. */ - void setFromQCString( TQByteArray& arr, const TQCString& cstr ); + void setFromTQCString( TQByteArray& arr, const TQCString& cstr ); - inline void setFromQCString( TQByteArray& arr, const TQCString& cstr ) + inline void setFromTQCString( TQByteArray& arr, const TQCString& cstr ) { if ( cstr.size() ) arr.duplicate( cstr.data(), cstr.size()-1 ); @@ -120,8 +120,8 @@ namespace Util { * Fast, but be careful, the TQCString gets modified by this; this is only good for * the case where the TQCString is going to be thrown away afterwards anyway. */ - TQByteArray byteArrayFromQCStringNoDetach( TQCString& cstr ); - inline TQByteArray byteArrayFromQCStringNoDetach( TQCString& cstr ) + TQByteArray byteArrayFromTQCStringNoDetach( TQCString& cstr ); + inline TQByteArray byteArrayFromTQCStringNoDetach( TQCString& cstr ) { TQByteArray arr = cstr; if ( arr.size() ) @@ -130,10 +130,10 @@ namespace Util { } /** - * Restore the TQCString after byteArrayFromQCStringNoDetach modified it + * Restore the TQCString after byteArrayFromTQCStringNoDetach modified it */ - void restoreQCString( TQCString& str ); - inline void restoreQCString( TQCString& str ) + void restoreTQCString( TQCString& str ); + inline void restoreTQCString( TQCString& str ) { if ( str.data() ) str.resize( str.size() + 1 ); diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index e706243cf..edce8d854 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -156,7 +156,7 @@ namespace { const std::map<TQString,TQString> & results() const { return mResults; } private: - void process( BuilderMethod method, const TQString & string=TQString::null ) { + void process( BuilderMethod method, const TQString & string=TQString() ) { doProcess( method, string ); mRecursionGuard.clear(); } @@ -232,7 +232,7 @@ namespace { { 0, GIE::TestEnd, 0, 16, 0, 0 }, // 15 - // block of command, find "stop", take nested if's into account: + // block of command, tqfind "stop", take nested if's into account: { 0, GIE::BlockStart, 0, 17, 0, 0 }, // 16 { 1, GIE::CommandStart, "stop", 20, 19, "stop" }, // 17 { -1, GIE::Any, 0, 17, 0, 0 }, // 18 @@ -265,7 +265,7 @@ namespace { { 0, GIE::TestStart, "not", 2, 0, 0, }, // 1 { 0, GIE::TestStart, "address", 3, 0, 0 }, // 2 - // :domain and :tqcontains in arbitrary order: + // :domain and :contains in arbitrary order: { 0, GIE::TaggedArgument, "domain", 4, 5, 0 }, // 3 { 0, GIE::TaggedArgument, "tqcontains", 7, 0, 0 }, // 4 { 0, GIE::TaggedArgument, "tqcontains", 6, 0, 0 }, // 5 @@ -288,7 +288,7 @@ namespace { { 0, GIE::TestEnd, 0, 18, 0, 0 }, // 17 { 0, GIE::TestEnd, 0, 19, 0, 0 }, // 18 - // block of commands, find "stop", take nested if's into account: + // block of commands, tqfind "stop", take nested if's into account: { 0, GIE::BlockStart, 0, 20, 0, 0 }, // 19 { 1, GIE::CommandStart, "stop", 23, 22, "stop" }, // 20 { -1, GIE::Any, 0, 20, 0, 0 }, // 21 @@ -308,7 +308,7 @@ namespace { TQString domainName() /*not const, since map::op[] isn't const*/ { return mResults.count( "stop" ) && mResults.count( "from" ) - ? mResults["domainName"] : TQString::null ; + ? mResults["domainName"] : TQString() ; } }; @@ -420,7 +420,7 @@ namespace { mContext = None; mNotificationInterval = 0; mAliases.clear(); - mMessageText = TQString::null; + mMessageText = TQString(); } }; @@ -428,8 +428,8 @@ namespace { namespace KMail { - Vacation::Vacation( TQObject * parent, bool checkOnly, const char * name ) - : TQObject( parent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly ) + Vacation::Vacation( TQObject * tqparent, bool checkOnly, const char * name ) + : TQObject( tqparent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly ) { mUrl = findURL(); kdDebug(5006) << "Vacation: found url \"" << mUrl.prettyURL() << "\"" << endl; @@ -565,9 +565,9 @@ namespace KMail { TQString Vacation::defaultMessageText() { return i18n("I am out of office till %1.\n" "\n" - "In urgent cases, please contact Mrs. <vacation tqreplacement>\n" + "In urgent cases, please contact Mrs. <vacation replacement>\n" "\n" - "email: <email address of vacation tqreplacement>\n" + "email: <email address of vacation replacement>\n" "phone: +49 711 1111 11\n" "fax.: +49 711 1111 12\n" "\n" diff --git a/kmail/vacation.h b/kmail/vacation.h index cf6f5a8c5..5913548be 100644 --- a/kmail/vacation.h +++ b/kmail/vacation.h @@ -37,8 +37,9 @@ namespace KMail { class Vacation : public TQObject { Q_OBJECT + TQ_OBJECT public: - Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 ); + Vacation( TQObject * tqparent=0, bool checkOnly = false, const char * name=0 ); virtual ~Vacation(); bool isUsable() const { return !mUrl.isEmpty(); } diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index 50dea24e2..9e782adf7 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -39,9 +39,9 @@ using KMime::HeaderParsing::parseAddressList; namespace KMail { - VacationDialog::VacationDialog( const TQString & caption, TQWidget * parent, + VacationDialog::VacationDialog( const TQString & caption, TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal ) + : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, tqparent, name, modal ) { KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); @@ -166,7 +166,7 @@ namespace KMail { } TQString VacationDialog::domainName() const { - return mDomainCheck->isChecked() ? mDomainEdit->text() : TQString::null ; + return mDomainCheck->isChecked() ? mDomainEdit->text() : TQString() ; } void VacationDialog::setDomainName( const TQString & domain ) { diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h index a971b1182..9cedf4efa 100644 --- a/kmail/vacationdialog.h +++ b/kmail/vacationdialog.h @@ -36,8 +36,9 @@ namespace KMail { class VacationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - VacationDialog( const TQString & caption, TQWidget * parent=0, + VacationDialog( const TQString & caption, TQWidget * tqparent=0, const char * name=0, bool modal=true ); virtual ~VacationDialog(); diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp index 0e34f72cc..0fd71d94e 100644 --- a/kmail/vcardviewer.cpp +++ b/kmail/vcardviewer.cpp @@ -38,11 +38,11 @@ using KABC::Addressee; #include <tqstring.h> #if defined(KABC_VCARD_ENCODING_FIX) -KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name ) +KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name ) #else -KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQString &vCard, const char *name ) +KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name ) #endif - : KDialogBase( parent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close, + : KDialogBase( tqparent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close, true, i18n("&Import"), i18n("&Next Card"), i18n("&Previous Card") ) { mAddresseeView = new AddresseeView(this); diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h index 48da60ba3..3da13c395 100644 --- a/kmail/vcardviewer.h +++ b/kmail/vcardviewer.h @@ -37,11 +37,12 @@ namespace KMail { class VCardViewer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: #if defined(KABC_VCARD_ENCODING_FIX) - VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name ); + VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name ); #else - VCardViewer( TQWidget *parent, const TQString &vCard, const char *name ); + VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name ); #endif virtual ~VCardViewer(); diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index c2a4deb04..eb7984057 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>WarningConfiguration</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WarningConfiguration</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mWarnUnsigned</cstring> </property> @@ -38,7 +38,7 @@ It is recommended to leave this option turned on for maximum integrity. </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>warnUnencryptedCB</cstring> </property> @@ -60,7 +60,7 @@ It is recommended to leave this option turned on for maximum integrity. </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>warnReceiverNotInCertificateCB</cstring> </property> @@ -82,7 +82,7 @@ It is recommended to leave this option turned on for maximum security. </qt></string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>warnGroupBox</cstring> </property> @@ -96,7 +96,7 @@ It is recommended to leave this option turned on for maximum security. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -107,7 +107,7 @@ It is recommended to leave this option turned on for maximum security. <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -118,7 +118,7 @@ It is recommended to leave this option turned on for maximum security. <set>AlignCenter</set> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>mWarnSignKeyExpiresSB</cstring> </property> @@ -146,7 +146,7 @@ The recommended SPHINX setting is 14 days. </qt></string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>mWarnEncrKeyExpiresSB</cstring> </property> @@ -174,7 +174,7 @@ The recommended SPHINX setting is 14 days. </qt></string> </property> </widget> - <widget class="QSpinBox" row="2" column="2"> + <widget class="TQSpinBox" row="2" column="2"> <property name="name"> <cstring>mWarnEncrChainCertExpiresSB</cstring> </property> @@ -202,7 +202,7 @@ The recommended SPHINX setting is 14 days. </qt></string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>mWarnSignChainCertExpiresSB</cstring> </property> @@ -230,7 +230,7 @@ The recommended SPHINX setting is 14 days. </qt></string> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>mWarnSignRootCertExpiresSB</cstring> </property> @@ -258,7 +258,7 @@ The recommended SPHINX setting is 14 days. </qt></string> </property> </widget> - <widget class="QSpinBox" row="3" column="2"> + <widget class="TQSpinBox" row="3" column="2"> <property name="name"> <cstring>mWarnEncrRootCertExpiresSB</cstring> </property> @@ -286,7 +286,7 @@ The recommended SPHINX setting is 14 days. </qt></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -297,7 +297,7 @@ The recommended SPHINX setting is 14 days. <cstring>mWarnSignRootCertExpiresSB</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -308,7 +308,7 @@ The recommended SPHINX setting is 14 days. <cstring>mWarnSignChainCertExpiresSB</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -355,7 +355,7 @@ The recommended SPHINX setting is 14 days. </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout1</cstring> </property> @@ -380,7 +380,7 @@ The recommended SPHINX setting is 14 days. </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>enableAllWarningsPB</cstring> </property> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index fee9b269f..1110641d5 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -70,8 +70,8 @@ using namespace KPIM; namespace KMail { - XFaceConfigurator::XFaceConfigurator( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) + XFaceConfigurator::XFaceConfigurator( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { // tmp. vars: TQLabel * label; @@ -93,7 +93,7 @@ namespace KMail { i18n( "Check this box if you want KMail to add a so-called X-Face header to messages " "written with this identity. An X-Face is a small (48x48 pixels) black and " "white image that some mail clients are able to display." ) ); - hlay->addWidget( mEnableCheck, Qt::AlignLeft | Qt::AlignVCenter ); + hlay->addWidget( mEnableCheck, TQt::AlignLeft | TQt::AlignVCenter ); mXFaceLabel = new TQLabel( this ); TQWhatsThis::add(mXFaceLabel, @@ -180,7 +180,7 @@ namespace KMail { TQWhatsThis::add( mTextEdit, i18n( "Use this field to enter an arbitrary X-Face string." ) ); mTextEdit->setFont( KGlobalSettings::fixedFont() ); mTextEdit->setWrapPolicy( TQTextEdit::Anywhere ); - mTextEdit->setTextFormat( Qt::PlainText ); + mTextEdit->setTextFormat( TQt::PlainText ); label2 = new KActiveLabel( i18n("Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."), page ); page_vlay->addWidget( label2 ); @@ -225,7 +225,7 @@ namespace KMail { { TQStringList mimeTypes = KImageIO::mimeTypes (KImageIO::Reading); TQString filter = mimeTypes.join (" "); - KURL url = KFileDialog::getOpenURL( TQString::null, filter, this, TQString::null ); + KURL url = KFileDialog::getOpenURL( TQString(), filter, this, TQString() ); if ( !url.isEmpty() ) setXfaceFromFile( url ); } diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index 9d0d6332f..8d0792c86 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -31,8 +31,9 @@ namespace KMail { class XFaceConfigurator : public TQWidget { Q_OBJECT + TQ_OBJECT public: - XFaceConfigurator( TQWidget * parent=0, const char * name=0 ); + XFaceConfigurator( TQWidget * tqparent=0, const char * name=0 ); virtual ~XFaceConfigurator(); bool isXFaceEnabled() const; |