summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/Mainpage.dox44
-rw-r--r--kmail/accountcombobox.cpp4
-rw-r--r--kmail/accountcombobox.h2
-rw-r--r--kmail/accountdialog.cpp12
-rw-r--r--kmail/accountdialog.h6
-rw-r--r--kmail/accountwizard.cpp12
-rw-r--r--kmail/accountwizard.h6
-rw-r--r--kmail/actionscheduler.cpp16
-rw-r--r--kmail/antispamwizard.cpp24
-rw-r--r--kmail/antispamwizard.h14
-rw-r--r--kmail/archivefolderdialog.cpp6
-rw-r--r--kmail/archivefolderdialog.h2
-rw-r--r--kmail/attachmentlistview.cpp4
-rw-r--r--kmail/attachmentlistview.h2
-rw-r--r--kmail/backupjob.cpp12
-rw-r--r--kmail/backupjob.h2
-rw-r--r--kmail/bodyvisitor.cpp16
-rw-r--r--kmail/cachedimapjob.cpp16
-rw-r--r--kmail/cachedimapjob.h2
-rw-r--r--kmail/chiasmuskeyselector.cpp4
-rw-r--r--kmail/chiasmuskeyselector.h2
-rw-r--r--kmail/colorlistbox.cpp4
-rw-r--r--kmail/colorlistbox.h2
-rw-r--r--kmail/configuredialog.cpp122
-rw-r--r--kmail/configuredialog.h2
-rw-r--r--kmail/configuredialog_p.cpp24
-rw-r--r--kmail/configuredialog_p.h78
-rw-r--r--kmail/copyfolderjob.h4
-rw-r--r--kmail/customtemplates.cpp4
-rw-r--r--kmail/customtemplates.h2
-rw-r--r--kmail/dictionarycombobox.cpp4
-rw-r--r--kmail/dictionarycombobox.h2
-rw-r--r--kmail/distributionlistdialog.cpp4
-rw-r--r--kmail/distributionlistdialog.h2
-rw-r--r--kmail/editorwatcher.cpp10
-rw-r--r--kmail/editorwatcher.h8
-rw-r--r--kmail/expirypropertiesdialog.cpp2
-rw-r--r--kmail/favoritefolderview.cpp12
-rw-r--r--kmail/favoritefolderview.h4
-rw-r--r--kmail/filterimporterexporter.cpp8
-rw-r--r--kmail/filterimporterexporter.h4
-rw-r--r--kmail/filterlogdlg.cpp4
-rw-r--r--kmail/filterlogdlg.h2
-rw-r--r--kmail/folderIface.cpp2
-rw-r--r--kmail/folderdiaacltab.cpp16
-rw-r--r--kmail/folderdiaacltab.h4
-rw-r--r--kmail/folderdiaquotatab.cpp4
-rw-r--r--kmail/folderdiaquotatab.h2
-rw-r--r--kmail/folderdiaquotatab_p.cpp4
-rw-r--r--kmail/folderdiaquotatab_p.h2
-rw-r--r--kmail/folderjob.h6
-rw-r--r--kmail/folderrequester.cpp4
-rw-r--r--kmail/folderrequester.h4
-rw-r--r--kmail/foldersetselector.cpp4
-rw-r--r--kmail/foldersetselector.h2
-rw-r--r--kmail/foldershortcutdialog.cpp4
-rw-r--r--kmail/foldershortcutdialog.h2
-rw-r--r--kmail/folderstorage.cpp26
-rw-r--r--kmail/folderstorage.h4
-rw-r--r--kmail/foldertreebase.cpp6
-rw-r--r--kmail/foldertreebase.h2
-rw-r--r--kmail/folderutil.cpp12
-rw-r--r--kmail/folderutil.h8
-rw-r--r--kmail/folderviewtooltip.h6
-rw-r--r--kmail/headeritem.cpp28
-rw-r--r--kmail/headeritem.h12
-rw-r--r--kmail/headerlistquicksearch.cpp12
-rw-r--r--kmail/headerlistquicksearch.h2
-rw-r--r--kmail/htmlstatusbar.cpp4
-rw-r--r--kmail/htmlstatusbar.h2
-rw-r--r--kmail/identitydialog.cpp4
-rw-r--r--kmail/identitydialog.h2
-rw-r--r--kmail/identitylistview.cpp12
-rw-r--r--kmail/identitylistview.h6
-rw-r--r--kmail/imapaccountbase.cpp86
-rw-r--r--kmail/imapaccountbase.h20
-rw-r--r--kmail/imapjob.cpp60
-rw-r--r--kmail/imapjob.h2
-rw-r--r--kmail/importarchivedialog.cpp6
-rw-r--r--kmail/importarchivedialog.h2
-rw-r--r--kmail/importjob.cpp16
-rw-r--r--kmail/importjob.h10
-rw-r--r--kmail/index.cpp8
-rw-r--r--kmail/index.h2
-rw-r--r--kmail/interfaces/bodyparturlhandler.h2
-rw-r--r--kmail/interfaces/urlhandler.h2
-rw-r--r--kmail/jobscheduler.cpp6
-rw-r--r--kmail/jobscheduler.h2
-rw-r--r--kmail/kcm_kmail.cpp24
-rw-r--r--kmail/khtmlparthtmlwriter.cpp4
-rw-r--r--kmail/khtmlparthtmlwriter.h2
-rw-r--r--kmail/klistboxdialog.cpp4
-rw-r--r--kmail/klistboxdialog.h2
-rw-r--r--kmail/klistviewindexedsearchline.cpp4
-rw-r--r--kmail/klistviewindexedsearchline.h2
-rw-r--r--kmail/kmaccount.cpp14
-rw-r--r--kmail/kmaccount.h2
-rw-r--r--kmail/kmacctcachedimap.cpp8
-rw-r--r--kmail/kmacctfolder.h2
-rw-r--r--kmail/kmacctimap.cpp18
-rw-r--r--kmail/kmacctseldlg.cpp4
-rw-r--r--kmail/kmacctseldlg.h2
-rw-r--r--kmail/kmail.kcfg4
-rw-r--r--kmail/kmail_part.cpp8
-rw-r--r--kmail/kmail_part.h4
-rw-r--r--kmail/kmailicalIface.h4
-rw-r--r--kmail/kmailicalifaceimpl.cpp40
-rw-r--r--kmail/kmailicalifaceimpl.h2
-rw-r--r--kmail/kmatmlistview.cpp4
-rw-r--r--kmail/kmatmlistview.h2
-rw-r--r--kmail/kmcommands.cpp286
-rw-r--r--kmail/kmcommands.h114
-rw-r--r--kmail/kmcomposewin.cpp10
-rw-r--r--kmail/kmcomposewin.h4
-rw-r--r--kmail/kmedit.cpp4
-rw-r--r--kmail/kmedit.h2
-rw-r--r--kmail/kmfawidgets.cpp8
-rw-r--r--kmail/kmfawidgets.h4
-rw-r--r--kmail/kmfilteraction.cpp74
-rw-r--r--kmail/kmfilteraction.h16
-rw-r--r--kmail/kmfilterdlg.cpp30
-rw-r--r--kmail/kmfilterdlg.h12
-rw-r--r--kmail/kmfiltermgr.cpp18
-rw-r--r--kmail/kmfiltermgr.h2
-rw-r--r--kmail/kmfolder.cpp24
-rw-r--r--kmail/kmfolder.h6
-rw-r--r--kmail/kmfoldercachedimap.cpp54
-rw-r--r--kmail/kmfoldercachedimap.h12
-rw-r--r--kmail/kmfoldercombobox.cpp8
-rw-r--r--kmail/kmfoldercombobox.h4
-rw-r--r--kmail/kmfolderdia.cpp32
-rw-r--r--kmail/kmfolderdia.h10
-rw-r--r--kmail/kmfolderdir.cpp16
-rw-r--r--kmail/kmfolderdir.h2
-rw-r--r--kmail/kmfolderimap.cpp66
-rw-r--r--kmail/kmfolderimap.h10
-rw-r--r--kmail/kmfolderindex.h6
-rw-r--r--kmail/kmfoldermaildir.cpp2
-rw-r--r--kmail/kmfoldermaildir.h4
-rw-r--r--kmail/kmfoldermbox.cpp2
-rw-r--r--kmail/kmfoldermbox.h4
-rw-r--r--kmail/kmfoldermgr.cpp24
-rw-r--r--kmail/kmfoldermgr.h2
-rw-r--r--kmail/kmfoldernode.cpp8
-rw-r--r--kmail/kmfoldernode.h8
-rw-r--r--kmail/kmfoldersearch.cpp14
-rw-r--r--kmail/kmfoldersearch.h2
-rw-r--r--kmail/kmfolderseldlg.cpp14
-rw-r--r--kmail/kmfolderseldlg.h6
-rw-r--r--kmail/kmfoldertree.cpp90
-rw-r--r--kmail/kmfoldertree.h14
-rw-r--r--kmail/kmheaders.cpp210
-rw-r--r--kmail/kmheaders.h8
-rw-r--r--kmail/kmkernel.cpp8
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmlineeditspell.cpp8
-rw-r--r--kmail/kmlineeditspell.h6
-rw-r--r--kmail/kmmainwidget.cpp24
-rw-r--r--kmail/kmmainwidget.h4
-rw-r--r--kmail/kmmainwin.h2
-rw-r--r--kmail/kmmessage.cpp32
-rw-r--r--kmail/kmmessage.h6
-rw-r--r--kmail/kmmimeparttree.cpp20
-rw-r--r--kmail/kmmimeparttree.h6
-rw-r--r--kmail/kmmsgbase.h12
-rw-r--r--kmail/kmmsgdict.cpp2
-rw-r--r--kmail/kmmsginfo.h2
-rw-r--r--kmail/kmmsgpart.h6
-rw-r--r--kmail/kmmsgpartdlg.cpp8
-rw-r--r--kmail/kmmsgpartdlg.h4
-rw-r--r--kmail/kmreadermainwin.cpp38
-rw-r--r--kmail/kmreaderwin.cpp18
-rw-r--r--kmail/kmreaderwin.h2
-rw-r--r--kmail/kmsearchpatternedit.cpp20
-rw-r--r--kmail/kmsearchpatternedit.h12
-rw-r--r--kmail/kmsender.cpp14
-rw-r--r--kmail/kmsystemtray.cpp4
-rw-r--r--kmail/kmsystemtray.h2
-rw-r--r--kmail/kmtransport.cpp10
-rw-r--r--kmail/kmtransport.h4
-rw-r--r--kmail/listjob.cpp2
-rw-r--r--kmail/listjob.h6
-rw-r--r--kmail/localsubscriptiondialog.cpp4
-rw-r--r--kmail/localsubscriptiondialog.h2
-rw-r--r--kmail/maildirjob.cpp4
-rw-r--r--kmail/maildirjob.h2
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp6
-rw-r--r--kmail/mailinglistpropertiesdialog.h2
-rw-r--r--kmail/mailsourceviewer.cpp4
-rw-r--r--kmail/mailsourceviewer.h2
-rw-r--r--kmail/managesievescriptsdialog.cpp58
-rw-r--r--kmail/managesievescriptsdialog.h2
-rw-r--r--kmail/managesievescriptsdialog_p.h2
-rw-r--r--kmail/mboxjob.cpp6
-rw-r--r--kmail/mboxjob.h2
-rw-r--r--kmail/messageactions.cpp14
-rw-r--r--kmail/messageactions.h2
-rw-r--r--kmail/messagecopyhelper.cpp4
-rw-r--r--kmail/messagecopyhelper.h4
-rw-r--r--kmail/networkaccount.cpp4
-rw-r--r--kmail/networkaccount.h2
-rw-r--r--kmail/newfolderdialog.cpp10
-rw-r--r--kmail/newfolderdialog.h2
-rw-r--r--kmail/objecttreeparser.cpp2
-rw-r--r--kmail/partNode.cpp4
-rw-r--r--kmail/recipientseditor.cpp24
-rw-r--r--kmail/recipientseditor.h16
-rw-r--r--kmail/recipientseditortest.cpp4
-rw-r--r--kmail/recipientseditortest.h2
-rw-r--r--kmail/recipientspicker.cpp12
-rw-r--r--kmail/recipientspicker.h6
-rw-r--r--kmail/redirectdialog.cpp4
-rw-r--r--kmail/redirectdialog.h4
-rw-r--r--kmail/regexplineedit.cpp8
-rw-r--r--kmail/regexplineedit.h4
-rw-r--r--kmail/renamejob.cpp2
-rw-r--r--kmail/renamejob.h2
-rw-r--r--kmail/rulewidgethandlermanager.cpp10
-rw-r--r--kmail/searchwindow.cpp6
-rw-r--r--kmail/searchwindow.h4
-rw-r--r--kmail/sieveconfig.cpp4
-rw-r--r--kmail/sieveconfig.h2
-rw-r--r--kmail/sievedebugdialog.cpp4
-rw-r--r--kmail/sievedebugdialog.h2
-rw-r--r--kmail/sievejob.cpp8
-rw-r--r--kmail/sievejob.h4
-rw-r--r--kmail/signatureconfigurator.cpp4
-rw-r--r--kmail/signatureconfigurator.h2
-rw-r--r--kmail/simplefoldertree.h20
-rw-r--r--kmail/simplestringlisteditor.cpp4
-rw-r--r--kmail/simplestringlisteditor.h2
-rw-r--r--kmail/snippetdlg.cpp6
-rw-r--r--kmail/snippetdlg.h2
-rw-r--r--kmail/snippetitem.cpp16
-rw-r--r--kmail/snippetitem.h8
-rw-r--r--kmail/snippetsettings.cpp8
-rw-r--r--kmail/snippetsettings.h4
-rw-r--r--kmail/snippetwidget.cpp20
-rw-r--r--kmail/snippetwidget.h4
-rw-r--r--kmail/subscriptiondialog.cpp40
-rw-r--r--kmail/subscriptiondialog.h8
-rw-r--r--kmail/templateparser.cpp4
-rw-r--r--kmail/templatesconfiguration.cpp4
-rw-r--r--kmail/templatesconfiguration.h2
-rw-r--r--kmail/templatesinsertcommand.cpp4
-rw-r--r--kmail/templatesinsertcommand.h2
-rw-r--r--kmail/treebase.cpp24
-rw-r--r--kmail/treebase.h2
-rw-r--r--kmail/vacation.cpp4
-rw-r--r--kmail/vacation.h2
-rw-r--r--kmail/vacationdialog.cpp4
-rw-r--r--kmail/vacationdialog.h2
-rw-r--r--kmail/vcardviewer.cpp6
-rw-r--r--kmail/vcardviewer.h4
-rw-r--r--kmail/xfaceconfigurator.cpp4
-rw-r--r--kmail/xfaceconfigurator.h2
256 files changed, 1566 insertions, 1566 deletions
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index ab239109..cc111158 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -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 tqparent, the length of its
+ For each message, its serial number, that of its parent, 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 tqparent.
+ another message. This is called a perfect parent.
- 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 tqparent by looking for messages with the same
+ an attempt is made to find a parent 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,22 +578,22 @@ 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 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
+ 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
current folder anymore. -1 and -2 are special values that can show up
- 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
+ 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
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 tqparent. This is also used for the non-threaded
+ to even try to find a parent. 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 tqparent, the current sort cache item is
+ In case there is a perfect parent, the current sort cache item is
appended to the parents list of unsorted tqchildren, or to that of
root, if there is not. A sort cache item is created in the mSortCache
- for the tqparent, if it is not already there. Messages with a tqparent of
+ 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 tqparent are tqchildren of
+ its elements threaded. Messages with -2 as the parent 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
@@ -612,7 +612,7 @@ Strategy:
well.
The next step is finding parents for those messages that are either new, or
- had a tqparent of -1 in the .sorted file. To that end, a dict of all sort
+ had a parent 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
@@ -638,7 +638,7 @@ Strategy:
- since the above is a common special case, it is worth trying. I think. ;)
- If the tqparent found is perfect (In-Reply-To), the sort cache items is marked
+ If the parent 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.
@@ -647,29 +647,29 @@ Strategy:
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 tqparent closest
+ threading by subjects. These lists are sorted by date, so the parent 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 tqparent is needed for a message with a certain subject, the list of
+ If now a parent 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 tqparent. Parents more than six weeks
+ older than our message is chosen as it's parent. 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 tqparent after this ends up at toplevel, no further
+ Everthing that still has no parent 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 tqparent/child relations of all
+ happened yet. Now that we have established the parent/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. ;)
@@ -706,14 +706,14 @@ 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 tqparent. The message is also
+ thread, those status bits are inherited from the parent. 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.
After those house keeping tasks are performed, the list of as of yet imper-
fectly threaded messages is traversed and our newly arrived message is
- considered as a new tqparent for each item on it. This is especially important
+ considered as a new parent for each item on it. This is especially important
to ensure that parents arriving out of order after their tqchildren still end
up as parents. If necessary, the entries in the .sorted file of rethreaded
messages are updated. An entry for the new message itself is appended to the
@@ -735,7 +735,7 @@ What happens when a message is removed from the folder?
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
+ root at top level, because there is no need to find a parent 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 tqchildren is then traversed and a new tqparent found for each one
+ That list of tqchildren is then traversed and a new parent 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.
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index 252a49c8..7ae3d2a3 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -34,8 +34,8 @@
using namespace KMail;
-AccountComboBox::AccountComboBox( TQWidget* tqparent, const char* name )
- : TQComboBox( tqparent, name )
+AccountComboBox::AccountComboBox( TQWidget* parent, const char* name )
+ : TQComboBox( parent, name )
{
connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ),
this, TQT_SLOT( slotRefreshAccounts() ) );
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index 04a8bc07..48c5d6a8 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -45,7 +45,7 @@ class AccountComboBox : public TQComboBox
TQ_OBJECT
public:
- AccountComboBox( TQWidget* tqparent, const char* name = 0 );
+ AccountComboBox( TQWidget* parent, const char* name = 0 );
void setCurrentAccount( KMAccount* account );
KMAccount* currentAccount() const;
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index de168ceb..93616ac8 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -268,8 +268,8 @@ ProcmailRCParser::expandVars(const TQString &s)
AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
- TQWidget *tqparent, const char *name, bool modal )
- : KDialogBase( tqparent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
+ TQWidget *parent, const char *name, bool modal )
+ : KDialogBase( parent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
mAccount( account ),
mServerTest( 0 ),
mCurCapa( AllCapa ),
@@ -2267,8 +2267,8 @@ void AccountDialog::slotEditSharedNamespace()
}
}
-NamespaceLineEdit::NamespaceLineEdit( TQWidget* tqparent )
- : KLineEdit( tqparent )
+NamespaceLineEdit::NamespaceLineEdit( TQWidget* parent )
+ : KLineEdit( parent )
{
}
@@ -2278,9 +2278,9 @@ void NamespaceLineEdit::setText( const TQString& text )
KLineEdit::setText( text );
}
-NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
+NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map )
- : KDialogBase( tqparent, "edit_namespace", false, TQString(),
+ : KDialogBase( parent, "edit_namespace", false, TQString(),
Ok|Cancel, Ok, true ), mType( type ), mNamespaceMap( map )
{
TQVBox *page = makeVBoxMainWidget();
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 060b576a..8a65d418 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -59,7 +59,7 @@ class AccountDialog : public KDialogBase
public:
AccountDialog( const TQString & caption, KMAccount *account,
- TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~AccountDialog();
private:
struct LocalWidgets
@@ -306,7 +306,7 @@ class NamespaceLineEdit: public KLineEdit
TQ_OBJECT
public:
- NamespaceLineEdit( TQWidget* tqparent );
+ NamespaceLineEdit( TQWidget* parent );
const TQString& lastText() { return mLastText; }
@@ -323,7 +323,7 @@ class NamespaceEditDialog: public KDialogBase
TQ_OBJECT
public:
- NamespaceEditDialog( TQWidget* tqparent, ImapAccountBase::imapNamespace type,
+ NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type,
ImapAccountBase::nsDelimMap* map );
protected slots:
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index be69edd0..6a188fbb 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -81,8 +81,8 @@ class AccountTypeBox : public KListBox
public:
enum Type { Local, POP3, IMAP, dIMAP, Maildir };
- AccountTypeBox( TQWidget *tqparent )
- : KListBox( tqparent, "AccountTypeBox" )
+ AccountTypeBox( TQWidget *parent )
+ : KListBox( parent, "AccountTypeBox" )
{
mTypeList << i18n( "Local mailbox" );
mTypeList << i18n( "POP3" );
@@ -107,8 +107,8 @@ class AccountTypeBox : public KListBox
TQStringList mTypeList;
};
-AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent )
- : KWizard( tqparent, "KWizard" ), mKernel( kernel ),
+AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
+ : KWizard( parent, "KWizard" ), mKernel( kernel ),
mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 )
{
setupWelcomePage();
@@ -118,12 +118,12 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent )
setupServerInformationPage();
}
-void AccountWizard::start( KMKernel *kernel, TQWidget *tqparent )
+void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
{
KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
- AccountWizard wizard( kernel, tqparent );
+ AccountWizard wizard( kernel, parent );
int result = wizard.exec();
if ( result == TQDialog::Accepted ) {
wizardConfig.writeEntry( "ShowOnStartup", false );
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index 6a05fc65..6e77dd6e 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -53,9 +53,9 @@ class AccountWizard : public KWizard
run successfully before.
@param kernel The mail kernel the wizard should work on.
- @param tqparent The tqparent widget of the dialog.
+ @param parent The parent widget of the dialog.
*/
- static void start( KMKernel *kernel, TQWidget *tqparent = 0 );
+ static void start( KMKernel *kernel, TQWidget *parent = 0 );
/**
Reimplemented
@@ -63,7 +63,7 @@ class AccountWizard : public KWizard
void showPage( TQWidget *page );
protected:
- AccountWizard( KMKernel *kernel, TQWidget *tqparent );
+ AccountWizard( KMKernel *kernel, TQWidget *parent );
~AccountWizard() {};
void setupWelcomePage();
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 913245e9..71475a93 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -421,7 +421,7 @@ void ActionScheduler::fetchMessage()
} else if (msg) {
fetchTimeOutTime = TQTime::currentTime();
fetchTimeOutTimer->start( 60 * 1000, true );
- FolderJob *job = msg->tqparent()->createJob( msg );
+ FolderJob *job = msg->parent()->createJob( msg );
connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
TQT_SLOT(messageFetched( KMMessage* )) );
lastJob = job;
@@ -461,8 +461,8 @@ void ActionScheduler::messageFetched( KMMessage *msg )
} else {
fetchMessageTimer->start( 0, true );
}
- if (mFetchUnget && msg->tqparent())
- msg->tqparent()->unGetMsg( msg->tqparent()->find( msg ));
+ if (mFetchUnget && msg->parent())
+ msg->parent()->unGetMsg( msg->parent()->find( msg ));
return;
}
@@ -562,7 +562,7 @@ void ActionScheduler::processMessage()
return;
}
if (msg) {
- FolderJob *job = msg->tqparent()->createJob( msg );
+ FolderJob *job = msg->parent()->createJob( msg );
connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
TQT_SLOT(messageRetrieved( KMMessage* )) );
job->start();
@@ -665,7 +665,7 @@ void ActionScheduler::moveMessage()
if (mOriginalSerNum)
orgMsg = message( mOriginalSerNum );
mResult = mOldReturnCode; // ignore errors in deleting original message
- if (!orgMsg || !orgMsg->tqparent()) {
+ if (!orgMsg || !orgMsg->parent()) {
// Original message is gone, no point filtering it anymore
mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
kdDebug(5006) << "The original serial number is missing. "
@@ -675,11 +675,11 @@ void ActionScheduler::moveMessage()
return;
} else {
if (!folder) // no filter folder specified leave in current place
- folder = orgMsg->tqparent();
+ folder = orgMsg->parent();
}
mIgnore = true;
- assert( msg->tqparent() == mSrcFolder.operator->() );
+ assert( msg->parent() == mSrcFolder.operator->() );
mSrcFolder->take( mSrcFolder->find( 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->tqparent()) {
+ if (msg && msg->parent()) {
cmd = new KMMoveCommand( 0, msg );
// cmd->start(); // Note: sensitive logic here.
}
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index dccca6a8..4091c715 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -57,8 +57,8 @@
using namespace KMail;
AntiSpamWizard::AntiSpamWizard( WizardMode mode,
- TQWidget* tqparent, KMFolderTree * mainFolderTree )
- : KWizard( tqparent ),
+ TQWidget* parent, KMFolderTree * mainFolderTree )
+ : KWizard( parent ),
mInfoPage( 0 ),
mSpamRulesPage( 0 ),
mVirusRulesPage( 0 ),
@@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList()
//---------------------------------------------------------------------------
-ASWizPage::ASWizPage( TQWidget * tqparent, const char * name,
+ASWizPage::ASWizPage( TQWidget * parent, const char * name,
const TQString *bannerName )
- : TQWidget( tqparent, name )
+ : TQWidget( parent, name )
{
TQString banner = "kmwizard.png";
if ( bannerName && !bannerName->isEmpty() )
@@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * tqparent, const char * name,
//---------------------------------------------------------------------------
ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
- TQWidget * tqparent, const char * name )
- : ASWizPage( tqparent, name )
+ TQWidget * parent, const char * name )
+ : ASWizPage( parent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
@@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange()
//---------------------------------------------------------------------------
-ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name,
+ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
KMFolderTree * mainFolderTree )
- : ASWizPage( tqparent, name )
+ : ASWizPage( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
@@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled )
//---------------------------------------------------------------------------
-ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name,
+ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name,
KMFolderTree * mainFolderTree )
- : ASWizPage( tqparent, name )
+ : ASWizPage( parent, name )
{
TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() );
@@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange()
//---------------------------------------------------------------------------
-ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name )
- : ASWizPage( tqparent, name )
+ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
+ : ASWizPage( parent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index a17e341a..04ec4104 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -115,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 tqparent The tqparent widget for the wizard.
+ @param parent The parent 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 * tqparent, KMFolderTree * mainFolderTree );
+ TQWidget * parent, KMFolderTree * mainFolderTree );
protected:
/**
@@ -284,7 +284,7 @@ namespace KMail {
class ASWizPage : public TQWidget
{
public:
- ASWizPage( TQWidget *tqparent, const char *name,
+ ASWizPage( TQWidget *parent, const char *name,
const TQString *bannerName = 0);
protected:
@@ -303,7 +303,7 @@ namespace KMail {
public:
ASWizInfoPage( AntiSpamWizard::WizardMode mode,
- TQWidget *tqparent, const char *name );
+ TQWidget *parent, const char *name );
void setScanProgressText( const TQString &toolName );
void addAvailableTool( const TQString &visibleName );
@@ -329,7 +329,7 @@ namespace KMail {
TQ_OBJECT
public:
- ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
+ ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
bool markAsReadSelected() const;
bool moveSpamSelected() const;
@@ -362,7 +362,7 @@ namespace KMail {
TQ_OBJECT
public:
- ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
+ ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
bool pipeRulesSelected() const;
bool moveRulesSelected() const;
@@ -389,7 +389,7 @@ namespace KMail {
TQ_OBJECT
public:
- ASWizSummaryPage( TQWidget * tqparent, const char * name );
+ ASWizSummaryPage( TQWidget * parent, const char * name );
void setSummaryText( const TQString & text );
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index f6cfac62..21c345fb 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -49,11 +49,11 @@ static TQString standardArchivePath( const TQString &folderName )
"_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2";
}
-ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
+ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
+ : KDialogBase( parent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true ),
- mParentWidget( tqparent )
+ mParentWidget( parent )
{
TQWidget *mainWidget = new TQWidget( this );
TQGridLayout *mainLayout = new TQGridLayout( mainWidget );
diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
index cc469959..b38d0aee 100644
--- a/kmail/archivefolderdialog.h
+++ b/kmail/archivefolderdialog.h
@@ -37,7 +37,7 @@ class ArchiveFolderDialog : public KDialogBase
public:
- ArchiveFolderDialog( TQWidget *tqparent = 0 );
+ ArchiveFolderDialog( TQWidget *parent = 0 );
void setFolder( KMFolder *defaultFolder );
protected slots:
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 7eebbbb2..18e8ddaf 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -47,9 +47,9 @@ using KPIM::MailListDrag;
namespace KMail {
AttachmentListView::AttachmentListView( KMail::Composer * composer,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name )
- : KListView( tqparent, name ),
+ : KListView( parent, name ),
mComposer( composer )
{
setAcceptDrops( true );
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index a25d792e..3f1f83fe 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -32,7 +32,7 @@ class AttachmentListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- AttachmentListView( KMail::Composer * composer = 0, TQWidget* tqparent = 0,
+ AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
const char* name = 0 );
virtual ~AttachmentListView();
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index e3a2ac0d..43209ca7 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -36,12 +36,12 @@
using namespace KMail;
-BackupJob::BackupJob( TQWidget *tqparent )
- : TQObject( tqparent ),
+BackupJob::BackupJob( TQWidget *parent )
+ : TQObject( parent ),
mArchiveType( Zip ),
mRootFolder( 0 ),
mArchive( 0 ),
- mParentWidget( tqparent ),
+ mParentWidget( parent ),
mCurrentFolderOpen( false ),
mArchivedMessages( 0 ),
mArchivedSize( 0 ),
@@ -236,8 +236,8 @@ void BackupJob::archiveNextMessage()
mCurrentMessage = message;
TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) );
}
- else if ( message->tqparent() ) {
- mCurrentJob = message->tqparent()->createJob( message );
+ else if ( message->parent() ) {
+ mCurrentJob = message->parent()->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 tqparent!" << endl;
+ << " is neither complete nor has a parent!" << endl;
abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
.tqarg( mCurrentFolder->name() ) );
}
diff --git a/kmail/backupjob.h b/kmail/backupjob.h
index 500e671a..7a56be17 100644
--- a/kmail/backupjob.h
+++ b/kmail/backupjob.h
@@ -55,7 +55,7 @@ class BackupJob : public TQObject
// 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 *tqparent = 0 );
+ explicit BackupJob( TQWidget *parent = 0 );
~BackupJob();
void setRootFolder( KMFolder *rootFolder );
void setSaveLocation( const KURL &savePath );
diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 8a40d744..04b7a98b 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 tqparent part is already loading
- if ( part->tqparent() &&
- selected.contains( part->tqparent() ) &&
+ // skip this part if the parent part is already loading
+ if ( part->parent() &&
+ selected.contains( part->parent() ) &&
part->loadPart() )
continue;
@@ -114,7 +114,7 @@ namespace KMail {
headerCheck = false;
// check whether to load this part or not:
- // look at the basic list, ask the subclass and check the tqparent
+ // look at the basic list, ask the subclass and check the parent
if ( mBasicList.contains( part->originalContentTypeStr() ) ||
parentNeedsLoading( part ) ||
addPartToList( part ) )
@@ -142,13 +142,13 @@ namespace KMail {
KMMessagePart *part = msgPart;
while ( part )
{
- if ( part->tqparent() &&
- ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
+ if ( part->parent() &&
+ ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" &&
- part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
+ part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
return true;
- part = part->tqparent();
+ part = part->parent();
}
return false;
}
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index d1338251..6dcae58c 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -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).tqparent->storage())->silentUpload();
- static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->setSilentUpload( false );
+ bool silentUpload = static_cast<KMFolderCachedImap*>((*it).parent->storage())->silentUpload();
+ static_cast<KMFolderCachedImap*>((*it).parent->storage())->setSilentUpload( false );
if ( job->error() && !silentUpload ) {
TQString myError = "<p><b>" + i18n("Error while uploading folder")
@@ -549,7 +549,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
return;
} else {
KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() );
- KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() );
+ KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).parent->storage() );
Q_ASSERT( storage );
Q_ASSERT( parentStorage );
if ( storage->imapPath().isEmpty() ) {
@@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
url.setPath( path );
if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) {
- // Associate the jobData with the tqparent folder, not with the child
+ // Associate the jobData with the parent folder, not with the child
// This is necessary in case of an error while creating the subfolder,
- // so that folderComplete is called on the tqparent (and the sync resetted).
+ // so that folderComplete is called on the parent (and the sync resetted).
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.items << folder->label(); // for the err msg
jd.current = folder->folder();
@@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
if( job->error() ) {
mErrorCode = job->error();
- mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).tqparent->label() ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' );
delete this;
return;
}
@@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job )
}
//-----------------------------------------------------------------------------
-void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent )
+void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent )
{
- mParentFolder = const_cast<KMFolderCachedImap*>( tqparent );
+ mParentFolder = const_cast<KMFolderCachedImap*>( parent );
}
}
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index cf9dab57..9931df70 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -95,7 +95,7 @@ public:
virtual ~CachedImapJob();
- void setParentFolder( const KMFolderCachedImap* tqparent );
+ void setParentFolder( const KMFolderCachedImap* parent );
signals:
// only emitted for uid validity checking jobs with PERMANENTFLAGS responses
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index d88c3164..475ddd44 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -7,10 +7,10 @@
#include <tqlayout.h>
#include <tqlabel.h>
-ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
+ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
const TQStringList& keys, const TQString& currentKey,
const TQString& lastOptions )
- : KDialogBase( tqparent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
+ : KDialogBase( parent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
{
TQWidget *page = makeMainWidget();
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 3402fd37..d136305f 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -12,7 +12,7 @@ class ChiasmusKeySelector : public KDialogBase
TQ_OBJECT
public:
- ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
+ ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
const TQStringList& keys, const TQString& currentKey,
const TQString& lastOptions );
diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp
index a0ebc825..a813a910 100644
--- a/kmail/colorlistbox.cpp
+++ b/kmail/colorlistbox.cpp
@@ -29,8 +29,8 @@
#include "colorlistbox.h"
-ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
- :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
+ :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{
connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
setAcceptDrops( true);
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index bb9e5b17..384647f6 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -29,7 +29,7 @@ class ColorListBox : public KListBox
TQ_OBJECT
public:
- ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
+ ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
void setColor( uint index, const TQColor &color );
TQColor color( uint index ) const;
signals:
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c0d775cf..771f7a75 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -214,9 +214,9 @@ namespace {
}
-ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal )
+ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, KGuiItem( i18n( "&Load Profile..." ) ),
- KGuiItem(), User2, i18n( "Configure" ), tqparent, name, modal )
+ KGuiItem(), User2, i18n( "Configure" ), parent, 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 * tqparent, const char * name )
- : ConfigModule( tqparent, name ),
+IdentityPage::IdentityPage( TQWidget * parent, const char * name )
+ : ConfigModule( parent, 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 * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+AccountsPage::AccountsPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "Receiving" tab:
@@ -581,8 +581,8 @@ TQString AccountsPage::SendingTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts-sending");
}
-AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
mTransportInfoList.setAutoDelete( true );
// temp. vars:
@@ -1056,8 +1056,8 @@ TQString AccountsPage::ReceivingTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts-receiving");
}
-AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
// temp. vars:
TQVBoxLayout *vlay;
@@ -1481,8 +1481,8 @@ TQString AppearancePage::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance");
}
-AppearancePage::AppearancePage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+AppearancePage::AppearancePage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "Fonts" tab:
@@ -1551,8 +1551,8 @@ static const struct {
};
static const int numFontNames = sizeof fontNames / sizeof *fontNames;
-AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name ), mActiveFontIndex( -1 )
+AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name ), mActiveFontIndex( -1 )
{
assert( numFontNames == sizeof mFont / sizeof *mFont );
// tmp. vars:
@@ -1729,8 +1729,8 @@ static const struct {
};
static const int numColorNames = sizeof colorNames / sizeof *colorNames;
-AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -1900,8 +1900,8 @@ static const EnumConfigEntry readerWindowMode = {
readerWindowModes, DIM(readerWindowModes), 1
};
-AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout * vlay;
@@ -1992,8 +1992,8 @@ static const struct {
static const int numDateDisplayConfig =
sizeof dateDisplayConfig / sizeof *dateDisplayConfig;
-AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name ),
+AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name ),
mCustomDateFormatEdit( 0 )
{
// tmp. vars:
@@ -2249,9 +2249,9 @@ TQString AppearancePage::ReaderTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance-reader");
}
-AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * tqparent,
+AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
const char * name )
- : ConfigModuleTab( tqparent, name )
+ : ConfigModuleTab( parent, name )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@@ -2475,9 +2475,9 @@ TQString AppearancePage::SystemTrayTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance-systemtray");
}
-AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * tqparent,
+AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
const char * name )
- : ConfigModuleTab( tqparent, name )
+ : ConfigModuleTab( parent, 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 * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+ComposerPage::ComposerPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "General" tab:
@@ -2599,8 +2599,8 @@ TQString ComposerPage::GeneralTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-general");
}
-ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -2913,8 +2913,8 @@ TQString ComposerPage::PhrasesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-phrases");
}
-ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQGridLayout *glay;
@@ -3125,8 +3125,8 @@ TQString ComposerPage::TemplatesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-templates");
}
-ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, 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 * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, 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 * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3257,8 +3257,8 @@ TQString ComposerPage::CharsetTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-charset");
}
-ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3352,8 +3352,8 @@ TQString ComposerPage::HeadersTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-headers");
}
-ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3567,9 +3567,9 @@ TQString ComposerPage::AttachmentsTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-attachments");
}
-ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * tqparent,
+ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
const char * name )
- : ConfigModuleTab( tqparent, name ) {
+ : ConfigModuleTab( parent, name ) {
// tmp. vars:
TQVBoxLayout *vlay;
TQLabel *label;
@@ -3672,8 +3672,8 @@ TQString SecurityPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-security");
}
-SecurityPage::SecurityPage( TQWidget * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+SecurityPage::SecurityPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, name )
{
//
// "Reading" tab:
@@ -3719,8 +3719,8 @@ TQString SecurityPage::GeneralTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-reading");
}
-SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3996,8 +3996,8 @@ TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-composing");
}
-SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * tqparent, const char * name )
- : ConfigModuleTab ( tqparent, name )
+SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab ( parent, 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 * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, 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 * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, 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 * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, 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 * tqparent, const char * name )
- : ConfigModuleWithTabs( tqparent, name )
+MiscPage::MiscPage( TQWidget * parent, const char * name )
+ : ConfigModuleWithTabs( parent, 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 * tqparent, const char * name )
- : ConfigModuleTab( tqparent, name )
+MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
+ : ConfigModuleTab( parent, name )
{
// temp. vars:
TQVBoxLayout *vlay;
@@ -4800,8 +4800,8 @@ TQString MiscPage::GroupwareTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc-groupware");
}
-MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name )
- : ConfigModuleTab( tqparent, name )
+MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
+ : ConfigModuleTab( parent, name )
{
TQBoxLayout* vlay = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -4866,7 +4866,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name
this, TQT_SLOT( slotEmitChanged( void ) ) );
mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format
- toolTip = i18n( "Set the tqparent of the resource folders" );
+ toolTip = i18n( "Set the parent of the resource folders" );
whatsThis = i18n( GlobalSettings::self()->theIMAPResourceFolderParentItem()->whatsThis().utf8() );
TQToolTip::add( mFolderComboLabel, toolTip );
TQWhatsThis::add( mFolderComboLabel, whatsThis );
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index a44f5db1..ece1d83f 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -37,7 +37,7 @@ class ConfigureDialog : public KCMultiDialog
TQ_OBJECT
public:
- ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
~ConfigureDialog();
signals:
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 7a882023..a7fe2041 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -38,9 +38,9 @@
NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
- TQWidget *tqparent, const char *name,
+ TQWidget *parent, const char *name,
bool modal )
- : KDialogBase( tqparent, name, modal, i18n("New Identity"),
+ : KDialogBase( parent, 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 *tqparent, const char *name,
+ListView::ListView( TQWidget *parent, const char *name,
int visibleItem )
- : KListView( tqparent, name )
+ : KListView( parent, name )
{
setVisibleItem(visibleItem);
}
@@ -191,9 +191,9 @@ TQSize ListView::tqsizeHint() const
static TQString flagPng = TQString::tqfromLatin1("/flag.png");
NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
- TQWidget *tqparent, const char *name,
+ TQWidget *parent, const char *name,
bool modal )
- : KDialogBase( tqparent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
+ : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
{
// tqlayout the page (a combobox with label):
TQWidget *page = makeMainWidget();
@@ -244,8 +244,8 @@ TQString NewLanguageDialog::language() const
}
-LanguageComboBox::LanguageComboBox( bool rw, TQWidget *tqparent, const char *name )
- : TQComboBox( rw, tqparent, name )
+LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name )
+ : TQComboBox( rw, parent, name )
{
}
@@ -284,8 +284,8 @@ void LanguageComboBox::setLanguage( const TQString & language )
//
//
-ProfileDialog::ProfileDialog( TQWidget * tqparent, const char * name, bool modal )
- : KDialogBase( tqparent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
+ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal )
+ : KDialogBase( parent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
{
// tmp. vars:
TQWidget * page = makeMainWidget();
@@ -364,9 +364,9 @@ void ProfileDialog::slotOk() {
}
-ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * tqparent,
+ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent,
const char * name )
- : ConfigModule( tqparent, name )
+ : ConfigModule( parent, 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 b1c34379..455f8579 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -84,7 +84,7 @@ public:
enum DuplicateMode { Empty, ControlCenter, ExistingEntry };
NewIdentityDialog( const TQStringList & identities,
- TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ TQWidget *parent=0, const char *name=0, bool modal=true );
TQString identityName() const { return mLineEdit->text(); }
TQString duplicateIdentity() const { return mComboBox->currentText(); }
@@ -127,7 +127,7 @@ class NewLanguageDialog : public KDialogBase
TQ_OBJECT
public:
- NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *tqparent=0,
+ NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0,
const char *name=0, bool modal=true );
TQString language() const;
@@ -142,7 +142,7 @@ class LanguageComboBox : public TQComboBox
TQ_OBJECT
public:
- LanguageComboBox( bool rw, TQWidget *tqparent=0, const char *name=0 );
+ LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 );
int insertLanguage( const TQString & language );
TQString language() const;
void setLanguage( const TQString & language );
@@ -158,7 +158,7 @@ class ProfileDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ProfileDialog( TQWidget * tqparent=0, const char * name=0, bool modal=false );
+ ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
signals:
void profileSelected( KConfig * profile );
@@ -180,8 +180,8 @@ class ConfigModule : public KCModule {
Q_OBJECT
TQ_OBJECT
public:
- ConfigModule( TQWidget * tqparent=0, const char * name=0 )
- : KCModule ( tqparent, name )
+ ConfigModule( TQWidget * parent=0, const char * name=0 )
+ : KCModule ( parent, name )
{}
~ConfigModule() {}
@@ -208,8 +208,8 @@ class ConfigModuleTab : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
- ConfigModuleTab( TQWidget *tqparent=0, const char* name=0 )
- :TQWidget( tqparent, name )
+ ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
+ :TQWidget( parent, name )
{}
~ConfigModuleTab() {}
void load();
@@ -243,7 +243,7 @@ class ConfigModuleWithTabs : public ConfigModule {
Q_OBJECT
TQ_OBJECT
public:
- ConfigModuleWithTabs( TQWidget * tqparent=0, const char * name=0 );
+ ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
~ConfigModuleWithTabs() {}
// don't reimplement any of those methods
@@ -271,7 +271,7 @@ class KDE_EXPORT IdentityPage : public ConfigModule {
Q_OBJECT
TQ_OBJECT
public:
- IdentityPage( TQWidget * tqparent=0, const char * name=0 );
+ IdentityPage( TQWidget * parent=0, const char * name=0 );
~IdentityPage() {}
TQString helpAnchor() const;
@@ -322,7 +322,7 @@ class AccountsPageSendingTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPageSendingTab( TQWidget * tqparent=0, const char * name=0 );
+ AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -360,7 +360,7 @@ class AccountsPageReceivingTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPageReceivingTab( TQWidget * tqparent=0, const char * name=0 );
+ AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
~AccountsPageReceivingTab();
TQString helpAnchor() const;
void save();
@@ -405,7 +405,7 @@ class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPage( TQWidget * tqparent=0, const char * name=0 );
+ AccountsPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -433,7 +433,7 @@ class AppearancePageFontsTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageFontsTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -461,7 +461,7 @@ class AppearancePageColorsTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageColorsTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -483,7 +483,7 @@ class AppearancePageLayoutTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageLayoutTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -506,7 +506,7 @@ class AppearancePageHeadersTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -533,7 +533,7 @@ class AppearancePageReaderTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageReaderTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -565,7 +565,7 @@ class AppearancePageSystemTrayTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePageSystemTrayTab( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -584,7 +584,7 @@ class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- AppearancePage( TQWidget * tqparent=0, const char * name=0 );
+ AppearancePage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -615,7 +615,7 @@ class ComposerPageGeneralTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -649,7 +649,7 @@ class ComposerPagePhrasesTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPagePhrasesTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -681,7 +681,7 @@ class ComposerPageTemplatesTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -699,7 +699,7 @@ class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageCustomTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -717,7 +717,7 @@ class ComposerPageSubjectTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageSubjectTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -736,7 +736,7 @@ class ComposerPageCharsetTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageCharsetTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -758,7 +758,7 @@ class ComposerPageHeadersTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -791,7 +791,7 @@ class ComposerPageAttachmentsTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPageAttachmentsTab( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -813,7 +813,7 @@ class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- ComposerPage( TQWidget * tqparent=0, const char * name=0 );
+ ComposerPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -848,7 +848,7 @@ class SecurityPageGeneralTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -874,7 +874,7 @@ class SecurityPageComposerCryptoTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageComposerCryptoTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -894,7 +894,7 @@ class SecurityPageWarningTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageWarningTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -918,7 +918,7 @@ class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
TQ_OBJECT
K_DCOP
public:
- SecurityPageSMimeTab( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 );
~SecurityPageSMimeTab();
TQString helpAnchor() const;
@@ -945,7 +945,7 @@ class SecurityPageCryptPlugTab : public ConfigModuleTab
Q_OBJECT
TQ_OBJECT
public:
- SecurityPageCryptPlugTab( TQWidget * tqparent = 0, const char* name = 0 );
+ SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
~SecurityPageCryptPlugTab();
TQString helpAnchor() const;
@@ -964,7 +964,7 @@ class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- SecurityPage( TQWidget * tqparent=0, const char * name=0 );
+ SecurityPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -996,7 +996,7 @@ class MiscPageFolderTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- MiscPageFolderTab( TQWidget * tqparent=0, const char * name=0 );
+ MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
void save();
TQString helpAnchor() const;
@@ -1027,7 +1027,7 @@ class MiscPageGroupwareTab : public ConfigModuleTab {
Q_OBJECT
TQ_OBJECT
public:
- MiscPageGroupwareTab( TQWidget * tqparent=0, const char * name=0 );
+ MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
void save();
TQString helpAnchor() const;
@@ -1069,7 +1069,7 @@ class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
Q_OBJECT
TQ_OBJECT
public:
- MiscPage( TQWidget * tqparent=0, const char * name=0 );
+ MiscPage( TQWidget * parent=0, const char * name=0 );
TQString helpAnchor() const;
typedef MiscPageFolderTab FolderTab;
@@ -1090,7 +1090,7 @@ class ListView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- ListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
+ ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void resizeColums();
void setVisibleItem( int visibleItem, bool updateSize=true );
diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h
index 743d8b61..61726cdc 100644
--- a/kmail/copyfolderjob.h
+++ b/kmail/copyfolderjob.h
@@ -55,7 +55,7 @@ public:
/**
* Create a new job
* @param storage of the folder that should be copied
- * @param newParent the target tqparent folder
+ * @param newParent the target parent folder
*/
CopyFolderJob( FolderStorage* const storage, KMFolderDir* const newParent = 0 );
@@ -70,7 +70,7 @@ public:
protected slots:
- /** Create the target directory under the new tqparent. Returns success or failure.*/
+ /** Create the target directory under the new parent. Returns success or failure.*/
bool createTargetDir();
/** Copy all messages from the original folder to mNewFolder */
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 4f168490..279c71ae 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -52,8 +52,8 @@
#include "customtemplates.h"
-CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name )
- :CustomTemplatesBase( tqparent, name ),
+CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
+ :CustomTemplatesBase( parent, name ),
mCurrentItem( 0 ),
mBlockChangeSignal( false )
{
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index 21695824..c850723f 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -43,7 +43,7 @@ class CustomTemplates : public CustomTemplatesBase
public:
- CustomTemplates( TQWidget *tqparent = 0, const char *name = 0 );
+ CustomTemplates( TQWidget *parent = 0, const char *name = 0 );
~CustomTemplates();
void load();
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index 85c82b92..6eb1b493 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -42,8 +42,8 @@
namespace KMail {
- DictionaryComboBox::DictionaryComboBox( TQWidget * tqparent, const char * name )
- : TQComboBox( false, tqparent, name ),
+ DictionaryComboBox::DictionaryComboBox( TQWidget * parent, const char * name )
+ : TQComboBox( false, parent, name ),
mSpellConfig( 0 ),
mDefaultDictionary( 0 )
{
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 48160502..c847baa0 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -49,7 +49,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- DictionaryComboBox( TQWidget * tqparent=0, const char * name=0 );
+ DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
~DictionaryComboBox();
TQString currentDictionaryName() const;
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 6ee1492a..cc947e8e 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -93,9 +93,9 @@ class DistributionListItem : public TQCheckListItem
};
-DistributionListDialog::DistributionListDialog( TQWidget *tqparent )
+DistributionListDialog::DistributionListDialog( TQWidget *parent )
: KDialogBase( Plain, i18n("Save Distribution List"), User1 | Cancel,
- User1, tqparent, 0, false, false, i18n("Save List") )
+ User1, parent, 0, false, false, i18n("Save List") )
{
TQFrame *topFrame = plainPage();
diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h
index 8d57b6dc..6643557c 100644
--- a/kmail/distributionlistdialog.h
+++ b/kmail/distributionlistdialog.h
@@ -31,7 +31,7 @@ class KListView;
class DistributionListDialog : public KDialogBase
{
public:
- DistributionListDialog( TQWidget *tqparent );
+ DistributionListDialog( TQWidget *parent );
void setRecipients( const Recipient::List & );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index ae12c124..48facf1f 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 * tqparent, TQWidget *parentWidget) :
- TQObject( tqparent ),
+ TQObject * parent, TQWidget *parentWidget) :
+ TQObject( parent ),
mUrl( url ),
mMimeType( mimeType ),
mOpenWith( openWith ),
@@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent()
struct inotify_event *event = (struct inotify_event *) &buffer[offset];
size -= sizeof( struct inotify_event ) + event->len;
offset += sizeof( struct inotify_event ) + event->len;
- if ( event->tqmask & IN_OPEN )
+ if ( event->mask & IN_OPEN )
mFileOpen = true;
- if ( event->tqmask & IN_CLOSE )
+ if ( event->mask & IN_CLOSE )
mFileOpen = false;
- if ( event->tqmask & IN_MODIFY )
+ if ( event->mask & IN_MODIFY )
mFileModified = true;
}
}
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index daa35d8a..d98faa4e 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -42,13 +42,13 @@ class EditorWatcher : public TQObject
public:
/**
* Constructs an EditorWatcher.
- * @param tqparent the tqparent object of this EditorWatcher, which will take care of deleting
- * this EditorWatcher if the tqparent is deleted.
- * @param parentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent
+ * @param parent the parent object of this EditorWatcher, which will take care of deleting
+ * this EditorWatcher if the parent is deleted.
+ * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent
* widget for message dialogs.
*/
EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
- TQObject *tqparent, TQWidget *parentWidget );
+ TQObject *parent, TQWidget *parentWidget );
bool start();
bool fileChanged() const { return mFileModified; }
signals:
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index c43cefc1..e992eace 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -23,7 +23,7 @@
using namespace KMail;
/*
- * Constructs a ExpiryPropertiesDialog as a child of 'tqparent', with the
+ * Constructs a ExpiryPropertiesDialog as a child of 'parent', with the
* name 'name'.
*
*/
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 9de9271e..148c2278 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -49,8 +49,8 @@
using namespace KMail;
-FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * tqparent, const TQString & name, KMFolder * folder)
- : KMFolderTreeItem( tqparent, name, folder ),
+FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, const TQString & name, KMFolder * folder)
+ : KMFolderTreeItem( parent, 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 * tqparent) :
- FolderTreeBase( mainWidget, tqparent ),
+FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * parent) :
+ FolderTreeBase( mainWidget, parent ),
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->tqparent() )
- accountFti = accountFti->tqparent();
+ while ( accountFti->parent() )
+ accountFti = accountFti->parent();
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 e0e34d26..2119f13d 100644
--- a/kmail/favoritefolderview.h
+++ b/kmail/favoritefolderview.h
@@ -30,7 +30,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
Q_OBJECT
TQ_OBJECT
public:
- FavoriteFolderViewItem( FavoriteFolderView *tqparent, const TQString & name, KMFolder* folder );
+ FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
protected:
bool useTopLevelIcon() const { return false; }
@@ -49,7 +49,7 @@ class FavoriteFolderView : public FolderTreeBase
TQ_OBJECT
public:
- FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *tqparent = 0 );
+ FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 );
~FavoriteFolderView();
void readConfig();
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index 3299d1df..d63278ad 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -46,8 +46,8 @@
using namespace KMail;
-FilterSelectionDialog::FilterSelectionDialog( TQWidget * tqparent )
- :KDialogBase( tqparent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
+FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent )
+ :KDialogBase( parent, "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* tqparent, bool popFilter )
-:mParent( tqparent), mPopFilter( popFilter )
+FilterImporterExporter::FilterImporterExporter( TQWidget* parent, bool popFilter )
+:mParent( parent), mPopFilter( popFilter )
{
}
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 8c92e769..0c11d34b 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -47,7 +47,7 @@ namespace KMail
class FilterImporterExporter
{
public:
- FilterImporterExporter( TQWidget* tqparent, bool popFilter = false );
+ FilterImporterExporter( TQWidget* parent, bool popFilter = false );
virtual ~FilterImporterExporter();
/** Export the given filter rules to a file which
@@ -70,7 +70,7 @@ class FilterSelectionDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- FilterSelectionDialog( TQWidget * tqparent = 0 );
+ FilterSelectionDialog( TQWidget * parent = 0 );
virtual ~FilterSelectionDialog();
virtual void slotCancel();
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index c387b2e1..bd0d15d6 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -52,8 +52,8 @@
using namespace KMail;
-FilterLogDialog::FilterLogDialog( TQWidget * tqparent )
-: KDialogBase( tqparent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
+FilterLogDialog::FilterLogDialog( TQWidget * parent )
+: KDialogBase( parent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
User1|User2|Close, Close, true, KStdGuiItem::clear(), KStdGuiItem::saveAs() )
{
setWFlags( WDestructiveClose );
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index 927edb6e..724c6214 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -52,7 +52,7 @@ namespace KMail {
public:
/** constructor */
- FilterLogDialog( TQWidget * tqparent );
+ FilterLogDialog( TQWidget * parent );
protected slots:
void slotLogEntryAdded( TQString logEntry );
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index bcd4201f..d6dd6daa 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -136,7 +136,7 @@ FolderIface::messageRefs()
for( int i = 0; i < messageCache.size(); ++i ) {
KMMsgBase *msg = messageCache[i];
if ( msg ) {
- KMMessage *fmsg = msg->tqparent()->getMsg( msg->tqparent()->find( msg ) );
+ KMMessage *fmsg = msg->parent()->getMsg( msg->parent()->find( msg ) );
refList.append( DCOPRef( new MessageIface( fmsg ) ) );
}
}
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 3b64254c..5ba25472 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -83,8 +83,8 @@ static const struct {
};
-KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name )
- : KDialogBase( tqparent, name, true /*modal*/, caption,
+KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name )
+ : KDialogBase( parent, 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 tqparent folder." ), page );
+ TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page );
topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 );
connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
@@ -192,7 +192,7 @@ unsigned int KMail::ACLEntryDialog::permissions() const
// class KMail::FolderDiaACLTab::ListView : public KListView
// {
// public:
-// ListView( TQWidget* tqparent, const char* name = 0 ) : KListView( tqparent, name ) {}
+// ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
// };
class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem
@@ -313,8 +313,8 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
////
-KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
- : FolderDiaTab( tqparent, name ),
+KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
+ : FolderDiaTab( parent, name ),
mImapAccount( 0 ),
mUserRights( 0 ),
mUserRightsState( KMail::ACLJobs::NotFetchedYet ),
@@ -505,7 +505,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
void KMail::FolderDiaACLTab::startListing()
{
- // List ACLs of folder - or its tqparent, if creating a new folder
+ // List ACLs of folder - or its parent, if creating a new folder
mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
@@ -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.tqparent = 0;
+ jd.total = 1; jd.done = 0; jd.parent = 0;
mImapAccount->insertJob(job, jd);
connect(job, TQT_SIGNAL(result(KIO::Job *)),
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 85565517..901e12d1 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -62,7 +62,7 @@ class ACLEntryDialog :public KDialogBase {
TQ_OBJECT
public:
- ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name = 0 );
+ ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 );
void setValues( const TQString& userId, unsigned int permissions );
@@ -90,7 +90,7 @@ class FolderDiaACLTab : public FolderDiaTab
TQ_OBJECT
public:
- FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
+ FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
virtual void load();
virtual bool save();
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 7c893851..195a00b1 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -50,8 +50,8 @@
using namespace KMail;
-KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
- : FolderDiaTab( tqparent, name ),
+KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
+ : FolderDiaTab( parent, name ),
mImapAccount( 0 ),
mDlg( dlg )
{
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 570c7e82..9d2d968d 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -56,7 +56,7 @@ class FolderDiaQuotaTab : public FolderDiaTab
TQ_OBJECT
public:
- FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
+ FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
virtual void load();
virtual bool save();
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index d8f8f44c..859b31a6 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -51,8 +51,8 @@ using namespace KMail;
struct QuotaInfo;
-QuotaWidget::QuotaWidget( TQWidget* tqparent, const char* name )
- :TQWidget( tqparent, name )
+QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
+ :TQWidget( parent, name )
{
TQVBoxLayout *box = new TQVBoxLayout(this);
TQWidget *stuff = new TQWidget( this );
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 776ae1d7..669e2190 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -47,7 +47,7 @@ class QuotaWidget : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
- QuotaWidget( TQWidget* tqparent, const char* name = 0 );
+ QuotaWidget( TQWidget* parent, const char* name = 0 );
virtual ~QuotaWidget() { }
void setQuotaInfo( const KMail::QuotaInfo& info );
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 52778bb6..c3e54e68 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -53,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 tqparent folder @p folder.
+ * @p jt and with a parent folder @p folder.
*/
FolderJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0,
TQString partSpecifier = TQString() );
/**
* Constructs a new job, operating on a message list @p msgList,
- * set @sets, JobType @p jt and with the tqparent folder @p folder.
+ * set @sets, JobType @p jt and with the parent 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 tqparent
+ * does something internal and needs to construct an empty parent
* FolderJob
*/
FolderJob( JobType jt );
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 93472437..23636e36 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -41,8 +41,8 @@
namespace KMail {
-FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree )
- : TQWidget( tqparent ), mFolder( 0 ), mFolderTree( tree ),
+FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
+ : TQWidget( parent ), mFolder( 0 ), mFolderTree( tree ),
mMustBeReadWrite( true ), mShowOutbox( true ), mShowImapFolders( true )
{
TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index a13ab6d2..4c32aaf8 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -51,10 +51,10 @@ namespace KMail {
public:
/**
* Constructor
- * @param tqparent the tqparent widget
+ * @param parent the parent widget
* @param tree the KMFolderTree to get the folders
*/
- FolderRequester( TQWidget *tqparent, KMFolderTree* tree );
+ FolderRequester( TQWidget *parent, KMFolderTree* tree );
virtual ~FolderRequester();
/** Returns selected folder */
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index 8ae2618e..c35fd0c1 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -27,8 +27,8 @@
using namespace KMail;
-FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * tqparent )
- : KDialogBase( tqparent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
+FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * parent )
+ : KDialogBase( parent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
{
assert( ft );
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index 97cc3860..9c352fc2 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -32,7 +32,7 @@ class FolderSetSelector : public KDialogBase
TQ_OBJECT
public:
- FolderSetSelector( KMFolderTree *ft, TQWidget *tqparent = 0 );
+ FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 );
TQValueList<int> selectedFolders();
void setSelectedFolders( const TQValueList<int> &folderIds );
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index f9bbed20..9095a647 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -53,9 +53,9 @@ using namespace KMail;
FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
KMMainWidget *mainwidget,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name )
-: KDialogBase( tqparent, name, true,
+: KDialogBase( parent, name, true,
i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ),
KDialogBase::Ok | KDialogBase::Cancel ),
mFolder( folder ), mMainWidget( mainwidget )
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index da249e1a..c3b76073 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -54,7 +54,7 @@ Q_OBJECT
TQ_OBJECT
public:
FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
~FolderShortcutDialog();
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 25fc6c0f..63dc91fb 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -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->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.
+ 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.
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->tqparent();
+ KMFolder *aFolder = aMsg->parent();
int index;
ulong serNum = aMsg->getMsgSerNum();
bool undo = aMsg->enableUndo();
@@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList)
{
for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() )
{
- if (msg->tqparent())
+ if (msg->parent())
{
- int idx = msg->tqparent()->find(msg);
+ int idx = msg->parent()->find(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->tqparent();
+ KMFolder* msgParent = aMsg->parent();
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->tqparent();
+ KMFolder* msgParent = aMsg->parent();
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()->tqparent();
+ oldParent = folder()->parent();
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 tqparent
+ // the associated subfolder directory node to the new parent
if (newParent) {
if (oldParent->findRef( folder() ) != -1)
oldParent->take();
newParent->inSort( folder() );
if ( child ) {
- if ( child->tqparent()->findRef( child ) != -1 )
- child->tqparent()->take();
+ if ( child->parent()->findRef( child ) != -1 )
+ child->parent()->take();
newParent->inSort( child );
child->setParent( newParent );
}
@@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
{
if (idx < 0)
- idx = aMsg->tqparent()->find( aMsg );
+ idx = aMsg->parent()->find( aMsg );
if (idx >= 0 )
{
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 45a40282..550b45e5 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -84,8 +84,8 @@ class FolderStorage : public TQObject
public:
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent 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();
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 87084b7b..0363f1fc 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -39,8 +39,8 @@ using KPIM::MailListDrag;
using namespace KMail;
-FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * tqparent, const char * name) :
- KFolderTree( tqparent, name ),
+FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * parent, const char * name) :
+ KFolderTree( parent, 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->tqparent() && !fti->tqparent()->isOpen())
+ if (fti->parent() && !fti->parent()->isOpen())
tqrepaint = false; // we're not visible
if (tqrepaint) {
fti->setNeedsRepaint( true );
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index b2c48c70..3a1b21aa 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -31,7 +31,7 @@ class FolderTreeBase : public KFolderTree
Q_OBJECT
TQ_OBJECT
public:
- FolderTreeBase( KMMainWidget *mainWidget, TQWidget *tqparent = 0, const char *name = 0 );
+ FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 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 6e1a2f88..40b543be 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -41,16 +41,16 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
if (anAccount->makeConnection() == ImapAccountBase::Connected) {
newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir );
if ( newFolder ) {
- TQString imapPath, tqparent;
+ TQString imapPath, parent;
if ( !namespaceName.isEmpty() ) {
// create folder with namespace
- tqparent = anAccount->addPathToNamespace( namespaceName );
- imapPath = anAccount->createImapPath( tqparent, folderName );
+ parent = anAccount->addPathToNamespace( namespaceName );
+ imapPath = anAccount->createImapPath( parent, folderName );
} else {
imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName );
}
KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() );
- selectedStorage->createFolder(folderName, tqparent); // create it on the server
+ selectedStorage->createFolder(folderName, parent); // create it on the server
newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() );
return newFolder;
@@ -82,14 +82,14 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
return newFolder;
}
-void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent )
+void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent )
{
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(tqparent,
+ KMessageBox::information(parent,
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>").tqarg( (*it)->name()));
diff --git a/kmail/folderutil.h b/kmail/folderutil.h
index 25592987..fbb4d069 100644
--- a/kmail/folderutil.h
+++ b/kmail/folderutil.h
@@ -35,9 +35,9 @@ namespace FolderUtil
/**
* Low-level function to create a subfolder for a folder of any kind.
*
- * @param parentFolder tqparent folder of the folder that should be created. Can be 0 in case of
+ * @param parentFolder parent folder of the folder that should be created. Can be 0 in case of
* local folders
- * @param parentDir tqparent folder directory, which should be the folder directory of parentFolder
+ * @param parentDir parent folder directory, which should be the folder directory of parentFolder
* @param folderName the name the newly created folder should have
* @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty.
* @param localFolderType for local folders, this determines if the folder should be MBOX or maildir
@@ -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 tqparent the tqparent widget, which is used when displaying a messagebox,
+ * @param parent the parent widget, which is used when displaying a messagebox,
* which happens when removing a folder with an associated account
*/
-void deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent );
+void deleteFolder( KMFolder *folderToDelete, TQWidget *parent );
}
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 5846cd82..8e4f56dd 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -10,9 +10,9 @@ namespace KMail {
class FolderViewToolTip : public TQToolTip
{
public:
- FolderViewToolTip( TQListView* tqparent ) :
- TQToolTip( tqparent->viewport() ),
- mListView( tqparent ) {}
+ FolderViewToolTip( TQListView* parent ) :
+ TQToolTip( parent->viewport() ),
+ mListView( parent ) {}
protected:
void maybeTip( const TQPoint &point )
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 7742e3ba..81a4252c 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -42,8 +42,8 @@
using namespace KMail;
// Constuction a new list view item with the given colors and pixmap
-HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key )
- : KListViewItem( tqparent ),
+HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
+ : KListViewItem( parent ),
mMsgId( msgId ),
mKey( key ),
mAboutToBeDeleted( false ),
@@ -52,9 +52,9 @@ HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key )
irefresh();
}
-// Constuction a new list view item with the given tqparent, colors, & pixmap
-HeaderItem::HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key )
- : KListViewItem( tqparent ),
+// Constuction a new list view item with the given parent, colors, & pixmap
+HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key )
+ : KListViewItem( parent ),
mMsgId( msgId ),
mKey( key ),
mAboutToBeDeleted( false ),
@@ -92,7 +92,7 @@ void HeaderItem::irefresh()
return; //default to closed
// otherwise threadingPolicy == OpenUnread
- if (tqparent() && tqparent()->isOpen()) {
+ if (parent() && parent()->isOpen()) {
setOpen(true);
return;
}
@@ -103,8 +103,8 @@ void HeaderItem::irefresh()
|| mMsgBase->isImportant() || mMsgBase->isTodo() || mMsgBase->isWatched() ) {
setOpen(true);
HeaderItem * topOfThread = this;
- while(topOfThread->tqparent())
- topOfThread = (HeaderItem*)topOfThread->tqparent();
+ while(topOfThread->parent())
+ topOfThread = (HeaderItem*)topOfThread->parent();
topOfThread->setOpenRecursive(true);
}
}
@@ -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->tqparent()->folderType() == KMFolderTypeImap ) {
+ if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
} else {
tmp = KIO::convertSize( mMsgBase->msgSize() );
@@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
}
TQPixmap res( width, height );
- TQBitmap tqmask( width, height, true );
+ TQBitmap mask( width, height, true );
int x = 0;
for ( PixmapList::ConstIterator it = pixmaps.begin();
it != pixmaps.end(); ++it ) {
bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) );
- bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() );
+ bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() );
x += (*it).width();
}
- res.setMask( tqmask );
+ res.setMask( mask );
return res;
}
@@ -490,7 +490,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
}
else if (column == paintInfo->sizeCol) {
TQString len;
- if ( msg->tqparent()->folderType() == KMFolderTypeImap )
+ if ( msg->parent()->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->tqparent() && !ascending)
+ if (i->parent() && !ascending)
res = -res;
} else if ( col == headers->paintInfo()->subCol ||
col == headers->paintInfo()->senderCol ||
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index c4a9a930..2142cf71 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -63,14 +63,14 @@ public:
mImperfectlyThreaded (true), mSubjThreadingList(0) { }
~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); }
- /** The tqparent node of the item in the threading hierarchy. 0 if the item
+ /** 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 *tqparent() const { return mParent; }
+ SortCacheItem *parent() 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 tqparent. */
+ * the perfect parent. */
bool isImperfectlyThreaded() const
{ return mImperfectlyThreaded; }
/** Set whether the item is currently imperfectly threaded (by References
@@ -130,7 +130,7 @@ public:
void setOffset(int x) { mSortOffset = x; }
void updateSortFile( FILE *sortStream, KMFolder *folder,
- bool waiting_for_tqparent = false,
+ bool waiting_for_parent = 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* tqparent, int msgId, const TQString& key = TQString() );
- HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key = TQString() );
+ HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString() );
+ HeaderItem( TQListViewItem* parent, int msgId, const TQString& key = TQString() );
~HeaderItem ();
/** Set the message id of this item, which is the offset/index in the folder
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 605e86f8..c576cc46 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -47,11 +47,11 @@
namespace KMail {
-HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
+HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
KListView *listView,
KActionCollection *actionCollection,
const char *name )
- : KListViewSearchLine(tqparent, listView, name), mStatusCombo(0), mtqStatus(0), statusList()
+ : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0), statusList()
{
KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
TQApplication::reverseLayout()
@@ -61,14 +61,14 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
TQT_SLOT( reset() ),
actionCollection,
"reset_quicksearch" );
- resetQuickSearch->plug( tqparent );
+ resetQuickSearch->plug( parent );
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:"), tqparent, "kde toolbar widget" );
+ TQLabel *label = new TQLabel( i18n("Stat&us:"), parent, "kde toolbar widget" );
- mStatusCombo = new TQComboBox( tqparent, "quick search status combo box" );
+ mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
mStatusCombo->setSizeLimit( 12 );
mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") );
@@ -89,7 +89,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
label->setBuddy( mStatusCombo );
- KToolBarButton * btn = new KToolBarButton( "mail_find", 0, tqparent,
+ KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent,
0, i18n( "Open Full Search" ) );
connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) );
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index df326a0a..e0589c7d 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -47,7 +47,7 @@ class HeaderListQuickSearch : public KListViewSearchLine
Q_OBJECT
TQ_OBJECT
public:
- HeaderListQuickSearch( TQWidget *tqparent,
+ HeaderListQuickSearch( TQWidget *parent,
KListView *listView,
KActionCollection *actionCollection,
const char *name = 0 );
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 371a48d1..79af6597 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -48,8 +48,8 @@
#include <tqcolor.h>
#include <tqstring.h>
-KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * tqparent, const char * name, WFlags f )
- : TQLabel( tqparent, name, f ),
+KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlags f )
+ : TQLabel( parent, name, f ),
mMode( Normal )
{
tqsetAlignment( AlignHCenter|AlignTop );
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index c23193fa..20954b82 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -62,7 +62,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- HtmlStatusBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
+ HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
virtual ~HtmlStatusBar();
enum Mode {
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index ca8fa8dc..ec0559fc 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -89,9 +89,9 @@ using namespace KPIM;
namespace KMail {
- IdentityDialog::IdentityDialog( TQWidget * tqparent, const char * name )
+ IdentityDialog::IdentityDialog( TQWidget * parent, const char * name )
: KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok,
- tqparent, name )
+ parent, name )
{
// tmp. vars:
TQWidget * tab;
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index 82bca1c4..61716983 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -63,7 +63,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- IdentityDialog( TQWidget * tqparent=0, const char * name = 0 );
+ IdentityDialog( TQWidget * parent=0, const char * name = 0 );
virtual ~IdentityDialog();
void setIdentity( /*_not_ const*/ KPIM::Identity & ident );
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index 695c8da7..5ce6f38c 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -52,13 +52,13 @@ namespace KMail {
//
//
- IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident )
- : KListViewItem( tqparent ), mUOID( ident.uoid() ) {
+ IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident )
+ : KListViewItem( parent ), mUOID( ident.uoid() ) {
init( ident );
}
- IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident )
- : KListViewItem( tqparent, after ), mUOID( ident.uoid() ) {
+ IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident )
+ : KListViewItem( parent, after ), mUOID( ident.uoid() ) {
init( ident );
}
@@ -95,8 +95,8 @@ namespace KMail {
//
//
- IdentityListView::IdentityListView( TQWidget * tqparent, const char * name )
- : KListView( tqparent, name )
+ IdentityListView::IdentityListView( TQWidget * parent, const char * name )
+ : KListView( parent, name )
{
setFullWidth( true );
setDragEnabled( true );
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index b2c48418..31b80a77 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -47,9 +47,9 @@ namespace KMail {
**/
class IdentityListViewItem : public KListViewItem {
public:
- IdentityListViewItem( IdentityListView * tqparent,
+ IdentityListViewItem( IdentityListView * parent,
const KPIM::Identity & ident );
- IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after,
+ IdentityListViewItem( IdentityListView * parent, TQListViewItem * after,
const KPIM::Identity & ident );
uint uoid() const { return mUOID; }
@@ -70,7 +70,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- IdentityListView( TQWidget * tqparent=0, const char * name=0 );
+ IdentityListView( TQWidget * parent=0, const char * name=0 );
virtual ~IdentityListView() {}
public slots:
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index a0616379..977090dd 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -79,8 +79,8 @@ namespace KMail {
//
//
- ImapAccountBase::ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id )
- : NetworkAccount( tqparent, name, id ),
+ ImapAccountBase::ImapAccountBase( AccountManager * parent, const TQString & name, uint id )
+ : NetworkAccount( parent, name, id ),
mIdleTimer( 0, "mIdleTimer" ),
mNoopTimer( 0, "mNoopTimer" ),
mTotal( 0 ),
@@ -412,19 +412,19 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- // TODO imapPath can be removed once tqparent can be a KMFolderImapBase or whatever
- void ImapAccountBase::getUserRights( KMFolder* tqparent, const TQString& imapPath )
+ // TODO imapPath can be removed once parent can be a KMFolderImapBase or whatever
+ void ImapAccountBase::getUserRights( KMFolder* parent, 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
// don't even allow removing one's own admin permission, so this code won't hurt either).
if ( imapPath == "/INBOX/" ) {
- 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
+ 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
return;
}
@@ -433,7 +433,7 @@ namespace KMail {
ACLJobs::GetUserRightsJob* job = ACLJobs::getUserRights( mSlave, url );
- jobData jd( url.url(), tqparent );
+ jobData jd( url.url(), parent );
jd.cancellable = true;
insertJob(job, jd);
@@ -447,7 +447,7 @@ namespace KMail {
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- KMFolder* folder = (*it).tqparent;
+ KMFolder* folder = (*it).parent;
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* tqparent, const TQString& imapPath )
+ void ImapAccountBase::getACL( KMFolder* parent, const TQString& imapPath )
{
KURL url = getUrl();
url.setPath(imapPath);
ACLJobs::GetACLJob* job = ACLJobs::getACL( mSlave, url );
- jobData jd( url.url(), tqparent );
+ jobData jd( url.url(), parent );
jd.cancellable = true;
insertJob(job, jd);
@@ -491,21 +491,21 @@ namespace KMail {
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- KMFolder* folder = (*it).tqparent;
+ KMFolder* folder = (*it).parent;
emit receivedACL( folder, job, job->entries() );
if (mSlave) removeJob(job);
}
//-----------------------------------------------------------------------------
- // Do not remove imapPath, FolderDiaQuotaTab needs to call this with tqparent==0.
- void ImapAccountBase::getStorageQuotaInfo( KMFolder* tqparent, const TQString& imapPath )
+ // Do not remove imapPath, FolderDiaQuotaTab needs to call this with parent==0.
+ void ImapAccountBase::getStorageQuotaInfo( KMFolder* parent, const TQString& imapPath )
{
if ( !mSlave ) return;
KURL url = getUrl();
url.setPath(imapPath);
QuotaJobs::GetStorageQuotaJob* job = QuotaJobs::getStorageQuota( mSlave, url );
- jobData jd( url.url(), tqparent );
+ jobData jd( url.url(), parent );
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).tqparent; // can be 0
+ KMFolder* folder = (*it).parent; // can be 0
emit receivedStorageQuotaInfo( folder, job, job->storageQuotaInfo() );
if (mSlave) removeJob(job);
}
@@ -900,7 +900,7 @@ namespace KMail {
TQString quotaAsString( i18n("No detailed quota information available.") );
bool readOnly = false;
if (it != mapJobData.end()) {
- const KMFolder * const folder = (*it).tqparent;
+ const KMFolder * const folder = (*it).parent;
if( !folder ) return _error;
const KMFolderCachedImap * const imap = dynamic_cast<const KMFolderCachedImap*>( folder->storage() );
if ( imap ) {
@@ -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->tqparent()->createJob(
+ FolderJob *job = msg->parent()->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->tqparent()->createJob(
+ FolderJob *job = msg->parent()->createJob(
msg, FolderJob::tGetMessage, 0, part->partSpecifier()+".MIME" );
job->start();
}
if ( part->loadPart() )
{
kdDebug(5006) << "load Part" << endl;
- FolderJob *job = msg->tqparent()->createJob(
+ FolderJob *job = msg->parent()->createJob(
msg, FolderJob::tGetMessage, 0, part->partSpecifier() );
job->start();
}
@@ -1139,7 +1139,7 @@ namespace KMail {
//-----------------------------------------------------------------------------
void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
- DwBodyPart * tqparent, const DwMessage * dwmsg )
+ DwBodyPart * parent, const DwMessage * dwmsg )
{
int tqchildren;
for (int i = 0; i < count; i++)
@@ -1152,12 +1152,12 @@ namespace KMail {
<< " of type " << part->originalContentTypeStr() << endl;
DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part );
- if ( tqparent )
+ if ( parent )
{
- // add to tqparent body
- tqparent->Body().AddBodyPart( dwpart );
+ // add to parent body
+ parent->Body().AddBodyPart( dwpart );
dwpart->Parse();
-// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
+// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
// << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl;
} else if ( part->partSpecifier() != "0" &&
!part->partSpecifier().endsWith(".HEADER") )
@@ -1165,7 +1165,7 @@ namespace KMail {
// add to message
dwmsg->Body().AddBodyPart( dwpart );
dwpart->Parse();
-// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
+// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
// << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl;
} else
dwpart = 0;
@@ -1175,20 +1175,20 @@ namespace KMail {
if (tqchildren > 0)
{
- DwBodyPart* newtqparent = dwpart;
+ DwBodyPart* newparent = dwpart;
const DwMessage* newmsg = dwmsg;
if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart &&
dwpart->Body().Message() )
{
// set the encapsulated message as the new message
- newtqparent = 0;
+ newparent = 0;
newmsg = dwpart->Body().Message();
}
KMMessagePart* newParentKMPart = part;
- if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent
+ if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent
newParentKMPart = parentKMPart;
- constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg );
+ constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg );
}
}
}
@@ -1246,16 +1246,16 @@ namespace KMail {
ImapAccountBase::JobIterator it = findJob(job);
if ( it == jobsEnd() ) return;
int errorCode = job->error();
- KMFolder * const tqparent = (*it).tqparent;
+ KMFolder * const parent = (*it).parent;
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( tqparent, path, cont );
+ emit imapStatusChanged( parent, path, cont );
}
else
{
- emit imapStatusChanged( tqparent, path, true );
+ emit imapStatusChanged( parent, path, true );
removeJob(it);
}
}
@@ -1370,11 +1370,11 @@ namespace KMail {
}
//------------------------------------------------------------------------------
- TQString ImapAccountBase::createImapPath( const TQString& tqparent,
+ TQString ImapAccountBase::createImapPath( const TQString& parent,
const TQString& folderName )
{
- kdDebug(5006) << "createImapPath tqparent="<<tqparent<<", folderName="<<folderName<<endl;
- TQString newName = tqparent;
+ kdDebug(5006) << "createImapPath parent="<<parent<<", folderName="<<folderName<<endl;
+ TQString newName = parent;
// strip / at the end
if ( newName.endsWith("/") ) {
newName = newName.left( newName.length() - 1 );
@@ -1399,14 +1399,14 @@ namespace KMail {
}
//------------------------------------------------------------------------------
- TQString ImapAccountBase::createImapPath( FolderStorage* tqparent,
+ TQString ImapAccountBase::createImapPath( FolderStorage* parent,
const TQString& folderName )
{
TQString path;
- if ( tqparent->folderType() == KMFolderTypeImap ) {
- path = static_cast<KMFolderImap*>( tqparent )->imapPath();
- } else if ( tqparent->folderType() == KMFolderTypeCachedImap ) {
- path = static_cast<KMFolderCachedImap*>( tqparent )->imapPath();
+ if ( parent->folderType() == KMFolderTypeImap ) {
+ path = static_cast<KMFolderImap*>( parent )->imapPath();
+ } else if ( parent->folderType() == KMFolderTypeCachedImap ) {
+ path = static_cast<KMFolderCachedImap*>( parent )->imapPath();
} else {
// error
return path;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index c533171d..533be483 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -60,7 +60,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
protected:
- ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id );
+ ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
public:
virtual ~ImapAccountBase();
@@ -142,13 +142,13 @@ namespace KMail {
struct jobData
{
// Needed by TQMap, don't use
- jobData() : url(TQString()), tqparent(0), current(0), total(1), done(0), offset(0), progressItem(0),
+ jobData() : url(TQString()), parent(0), current(0), total(1), done(0), offset(0), progressItem(0),
onlySubscribed(false), quiet(false), cancellable(false) {}
// Real constructor
- jobData( const TQString& _url, KMFolder *_tqparent = 0,
+ jobData( const TQString& _url, KMFolder *_parent = 0,
int _total = 1, int _done = 0, bool _quiet = false,
bool _cancelable = false )
- : url(_url), tqparent(_tqparent), current(0), total(_total), done(_done), offset(0),
+ : url(_url), parent(_parent), current(0), total(_total), done(_done), offset(0),
progressItem(0), quiet(_quiet), cancellable(_cancelable) {}
TQString path;
@@ -157,7 +157,7 @@ namespace KMail {
TQByteArray data;
TQCString cdata;
TQStringList items;
- KMFolder *tqparent, *current;
+ KMFolder *parent, *current;
TQPtrList<KMMessage> msgList;
int total, done, offset;
KPIM::ProgressItem *progressItem;
@@ -401,16 +401,16 @@ namespace KMail {
return mCapabilities.contains( capa ); }
/**
- * Create an IMAP path for a tqparent folder and a foldername
+ * Create an IMAP path for a parent folder and a foldername
* Parent and folder are separated with the delimiter of the account
* The path starts and ends with '/'
*/
- TQString createImapPath( FolderStorage* tqparent, const TQString& folderName );
+ TQString createImapPath( FolderStorage* parent, const TQString& folderName );
/**
- * Create an IMAP path for a tqparent imapPath and a folderName
+ * Create an IMAP path for a parent imapPath and a folderName
*/
- TQString createImapPath( const TQString& tqparent, const TQString& folderName );
+ TQString createImapPath( const TQString& parent, const TQString& folderName );
public slots:
@@ -511,7 +511,7 @@ namespace KMail {
* Build KMMessageParts and DwBodyParts from the bodystructure-stream
*/
void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
- DwBodyPart * tqparent, const DwMessage * dwmsg );
+ DwBodyPart * parent, const DwMessage * dwmsg );
/** Migrate the prefix */
void migratePrefix();
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index c25b2909..3ddb93f3 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
if (folder) {
folder->open("imapjobdest");
}
- KMFolder *msg_tqparent = msg->tqparent();
- if (msg_tqparent) {
- msg_tqparent->open("imapjobsrc");
+ KMFolder *msg_parent = msg->parent();
+ if (msg_parent) {
+ msg_parent->open("imapjobsrc");
}
- mSrcFolder = msg_tqparent;
+ mSrcFolder = msg_parent;
// 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_tqparent && msg_tqparent->storage() )
- account = static_cast<KMFolderImap*>(msg_tqparent->storage())->account();
+ if ( msg_parent && msg_parent->storage() )
+ account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
}
if ( !account ||
account->makeConnection() == ImapAccountBase::Error ) {
@@ -125,7 +125,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() );
url.setPath( folder->imapPath() + ";SECTION=" + flags );
ImapAccountBase::jobData jd;
- jd.tqparent = 0; jd.offset = 0; jd.done = 0;
+ jd.parent = 0; jd.offset = 0; jd.done = 0;
jd.total = ( curMsg->msgSizeServer() > 0 ) ?
curMsg->msgSizeServer() : curMsg->msgSize();
jd.msgList.append( curMsg );
@@ -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_tqparent->storage());
+ KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_parent->storage());
url.setPath( imapDestFolder->imapPath() + ";UID=" + sets );
ImapAccountBase::jobData jd;
- jd.tqparent = 0; jd.offset = 0;
+ jd.parent = 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")
- .tqarg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
+ .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ),
TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
true,
account->useSSL() || account->useTLS() );
@@ -285,7 +285,7 @@ void ImapJob::slotGetNextMessage()
KURL url = account->getUrl();
TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID());
ImapAccountBase::jobData jd;
- jd.tqparent = 0; jd.offset = 0;
+ jd.parent = 0; jd.offset = 0;
jd.total = 1; jd.done = 0;
jd.msgList.append( msg );
if ( !mPartSpecifier.isEmpty() )
@@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage()
void ImapJob::slotGetMessageResult( KIO::Job * job )
{
KMMessage *msg = mMsgList.first();
- if (!msg || !msg->tqparent() || !job) {
+ if (!msg || !msg->parent() || !job) {
emit messageRetrieved( 0 );
deleteLater();
return;
}
- KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
+ KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
if (msg->transferInProgress())
msg->setTransferInProgress( false );
- KMAcctImap *account = tqparent->account();
+ KMAcctImap *account = parent->account();
if ( !account ) {
emit messageRetrieved( 0 );
deleteLater();
@@ -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->tqparent()->storage()->blockSignals( true );
+ msg->parent()->storage()->blockSignals( true );
msg->fromByteArray( (*it).data );
// now let others react
- msg->tqparent()->storage()->blockSignals( false );
+ msg->parent()->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 );
- tqparent->ignoreJobsForMessage( msg );
- int idx = tqparent->find( msg );
- if (idx != -1) tqparent->removeMsg( idx, true );
+ parent->ignoreJobsForMessage( msg );
+ int idx = parent->find( msg );
+ if (idx != -1) parent->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->tqparent() || !job) {
+ if (!msg || !msg->parent() || !job) {
deleteLater();
return;
}
- KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
+ KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
if (msg->transferInProgress())
msg->setTransferInProgress( false );
- KMAcctImap *account = tqparent->account();
+ KMAcctImap *account = parent->account();
if ( !account ) {
deleteLater();
return;
@@ -678,9 +678,9 @@ void ImapJob::execute()
}
//-----------------------------------------------------------------------------
-void ImapJob::setParentFolder( const KMFolderImap* tqparent )
+void ImapJob::setParentFolder( const KMFolderImap* parent )
{
- mParentFolder = const_cast<KMFolderImap*>( tqparent );
+ mParentFolder = const_cast<KMFolderImap*>( parent );
}
//-----------------------------------------------------------------------------
@@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
if (!msg || !job) {
return;
}
- KMFolderImap* tqparent = 0;
- if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap )
- tqparent = static_cast<KMFolderImap*>(msg->tqparent()->storage());
+ KMFolderImap* parent = 0;
+ if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap )
+ parent = static_cast<KMFolderImap*>(msg->parent()->storage());
else if (mDestFolder) // put
- tqparent = static_cast<KMFolderImap*>(mDestFolder->storage());
- if (!tqparent) return;
- KMAcctImap *account = tqparent->account();
+ parent = static_cast<KMFolderImap*>(mDestFolder->storage());
+ if (!parent) return;
+ KMAcctImap *account = parent->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 76174b5f..04438eb6 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -64,7 +64,7 @@ public:
JobType jt = tGetMessage, KMFolderImap *folder = 0 );
virtual ~ImapJob();
- void setParentFolder( const KMFolderImap* tqparent );
+ void setParentFolder( const KMFolderImap* parent );
KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; }
void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index e820f113..eeea23d7 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -32,11 +32,11 @@
using namespace KMail;
-ImportArchiveDialog::ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags )
- : KDialogBase( tqparent, "import_archive_dialog", false, i18n( "Import Archive" ),
+ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags )
+ : KDialogBase( parent, "import_archive_dialog", false, i18n( "Import Archive" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true ),
- mParentWidget( tqparent )
+ mParentWidget( parent )
{
setWFlags( flags );
TQWidget *mainWidget = new TQWidget( this );
diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h
index f8c15bab..c5b8a227 100644
--- a/kmail/importarchivedialog.h
+++ b/kmail/importarchivedialog.h
@@ -36,7 +36,7 @@ class ImportArchiveDialog : public KDialogBase
public:
- ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags );
+ ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags );
void setFolder( KMFolder *defaultFolder );
protected slots:
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index fc41a46b..96ea86b5 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 *tqparent, const TQString &folderName, mode_t permissions )
+KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions )
{
- KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(),
+ KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(),
KMFolderTypeMaildir );
if ( !newFolder ) {
- abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparent->name() ) );
+ abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->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.tqparent = folder;
+ messagesToQueue.parent = 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.tqparent;
+ KMFolder *folder = messages.parent;
if ( folder != mCurrentFolder ) {
kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl;
if ( mCurrentFolder ) {
@@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory()
}
Folder folder = mQueuedDirectories.first();
- KMFolder *currentFolder = folder.tqparent;
+ KMFolder *currentFolder = folder.parent;
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.tqparent = subFolder;
+ newFolder.parent = 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.tqparent = mRootFolder;
+ nextFolder.parent = mRootFolder;
mQueuedDirectories.push_back( nextFolder );
importNextDirectory();
}
diff --git a/kmail/importjob.h b/kmail/importjob.h
index d0f4fe48..74d1d9f5 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -72,13 +72,13 @@ class ImportJob : public TQObject
struct Folder
{
- KMFolder *tqparent;
+ KMFolder *parent;
const KArchiveDirectory *archiveDir;
};
struct Messages
{
- KMFolder *tqparent;
+ KMFolder *parent;
TQPtrList<KArchiveFile> files;
};
@@ -86,7 +86,7 @@ class ImportJob : public TQObject
void abort( const TQString &errorMessage );
void queueFolders();
void importNextDirectory();
- KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions );
+ KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions );
KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName,
mode_t subFolderPermissions );
void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder );
@@ -102,11 +102,11 @@ class ImportJob : public TQObject
KURL mArchiveFile;
int mNumberOfImportedMessages;
- // List of archive folders with their corresponding KMail tqparent folder that are awaiting
+ // List of archive folders with their corresponding KMail parent folder that are awaiting
// processing
TQValueList<Folder> mQueuedDirectories;
- // List of list of messages and their tqparent folders which are awaiting processing
+ // List of list of messages and their parent 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 a71d27e9..5604003d 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -77,8 +77,8 @@ std::vector<TQ_UINT32> TQValueListToVector( const TQValueList<int>& input ) {
}
#endif
-KMMsgIndex::KMMsgIndex( TQObject* tqparent ):
- TQObject( tqparent, "index" ),
+KMMsgIndex::KMMsgIndex( TQObject* parent ):
+ TQObject( parent, "index" ),
mState( s_idle ),
#ifdef HAVE_INDEXLIB
mLockFile( std::string( static_cast<const char*>( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ),
@@ -152,8 +152,8 @@ KMMsgIndex::~KMMsgIndex() {
}
bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
- if ( !folder || !folder->tqparent() ) return false;
- const KMFolderMgr* manager = folder->tqparent()->manager();
+ if ( !folder || !folder->parent() ) return false;
+ const KMFolderMgr* manager = folder->parent()->manager();
return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr();
}
diff --git a/kmail/index.h b/kmail/index.h
index f24dc47b..bd774944 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -53,7 +53,7 @@ class KMMsgIndex : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- explicit KMMsgIndex( TQObject* tqparent );
+ explicit KMMsgIndex( TQObject* parent );
~KMMsgIndex();
public:
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index 01f64adb..78d566c1 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -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 tqparent.
+ specified widget as parent.
@return true if the right-click was handled by this handler,
false otherwise.
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index 702efa41..1eb0e365 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -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 tqparent.
+ widget as parent.
@return true if the right-click was handled by this
URLHandler, false otherwise.
diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp
index caf4759f..d5374fe4 100644
--- a/kmail/jobscheduler.cpp
+++ b/kmail/jobscheduler.cpp
@@ -34,8 +34,8 @@
using namespace KMail;
-JobScheduler::JobScheduler( TQObject* tqparent, const char* name )
- : TQObject( tqparent, name ), mTimer( this, "mTimer" ),
+JobScheduler::JobScheduler( TQObject* parent, const char* name )
+ : TQObject( parent, 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 tqparent job just because it opens a folder...
+ // Then that command shouldn't kill its own parent job just because it opens a folder...
if ( mCurrentJob->isCancellable() )
interruptCurrentTask();
}
diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h
index c35121dd..c0feed34 100644
--- a/kmail/jobscheduler.h
+++ b/kmail/jobscheduler.h
@@ -98,7 +98,7 @@ class JobScheduler : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- JobScheduler( TQObject* tqparent, const char* name = 0 );
+ JobScheduler( TQObject* parent, 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 6cb28374..3ba43637 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 *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
{
- MiscPage *page = new MiscPage( tqparent, "kcmkmail_config_misc" );
+ MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
{
AppearancePage *page =
- new AppearancePage( tqparent, "kcmkmail_config_appearance" );
+ new AppearancePage( parent, "kcmkmail_config_appearance" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
{
- ComposerPage *page = new ComposerPage( tqparent, "kcmkmail_config_composer" );
+ ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
{
- IdentityPage *page = new IdentityPage( tqparent, "kcmkmail_config_identity" );
+ IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
{
- AccountsPage *page = new AccountsPage( tqparent, "kcmkmail_config_accounts" );
+ AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *tqparent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
{
- SecurityPage *page = new SecurityPage( tqparent, "kcmkmail_config_security" );
+ SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
return page;
}
}
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 174c2c3a..2b53e609 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -47,8 +47,8 @@
namespace KMail {
KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
- TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ), HtmlWriter(),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ), HtmlWriter(),
mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
{
assert( part );
diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h
index 3db102f7..7a551584 100644
--- a/kmail/khtmlparthtmlwriter.h
+++ b/kmail/khtmlparthtmlwriter.h
@@ -50,7 +50,7 @@ namespace KMail {
// Key is Content-Id, value is URL
typedef TQMap<TQString, TQString> EmbeddedPartMap;
KHtmlPartHtmlWriter( KHTMLPart * part,
- TQObject * tqparent=0, const char * name = 0 );
+ TQObject * parent=0, const char * name = 0 );
virtual ~KHtmlPartHtmlWriter();
void begin( const TQString & cssDefs );
diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp
index 530ffaf4..7027edd6 100644
--- a/kmail/klistboxdialog.cpp
+++ b/kmail/klistboxdialog.cpp
@@ -11,10 +11,10 @@
KListBoxDialog::KListBoxDialog( TQString& _selectedString,
const TQString& caption,
const TQString& labelText,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name,
bool modal )
- : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ),
+ : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ),
selectedString( _selectedString )
{
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index cf155075..efb73caf 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -15,7 +15,7 @@ public:
KListBoxDialog( TQString& _selectedString,
const TQString& caption,
const TQString& labelText,
- TQWidget* tqparent = 0,
+ TQWidget* parent = 0,
const char* name = 0,
bool modal = true );
~KListBoxDialog();
diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp
index f556c07d..9f0e2635 100644
--- a/kmail/klistviewindexedsearchline.cpp
+++ b/kmail/klistviewindexedsearchline.cpp
@@ -38,8 +38,8 @@
using KMail::HeaderListQuickSearch;
-KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* tqparent, KListView* listView, KActionCollection* actionCollection, const char* name ):
- HeaderListQuickSearch( tqparent, listView, actionCollection, name ),
+KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ):
+ HeaderListQuickSearch( parent, listView, actionCollection, name ),
mFiltering( false )
{
}
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index f8aaf176..6cf00bc1 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -53,7 +53,7 @@ class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSear
public:
- explicit KListViewIndexedSearchLine(TQWidget *tqparent, KListView *listView, KActionCollection* action, const char *name = 0);
+ explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0);
~KListViewIndexedSearchLine();
public slots:
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 20105acd..7cadcba9 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -42,8 +42,8 @@ using KMail::FolderJob;
#include "kmaccount.moc"
//-----------------------------------------------------------------------------
-KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
- : TQObject(tqparent), mPrecommand(precommand)
+KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
+ : TQObject(parent), mPrecommand(precommand)
{
BroadcastStatus::instance()->seStatusMsg(
i18n("Executing precommand %1").tqarg(precommand ));
@@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
assert(aMsg != 0);
// Save this one for readding
- KMFolderCachedImap* tqparent = 0;
+ KMFolderCachedImap* parent = 0;
if( type() == "cachedimap" )
- tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() );
+ parent = static_cast<KMFolderCachedImap*>( aMsg->storage() );
// checks whether we should send delivery receipts
// and sends them.
@@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
else if (processResult == 1)
{
if( type() == "cachedimap" )
- ; // already done by caller: tqparent->addMsgInternal( aMsg, false );
+ ; // already done by caller: parent->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" ) ? tqparent->folder()->idString()
+ folderId = ( type() == "cachedimap" ) ? parent->folder()->idString()
: mFolder->idString();
}
else {
- folderId = aMsg->tqparent()->idString();
+ folderId = aMsg->parent()->idString();
}
addToNewInFolder( folderId, 1 );
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 86e2f695..43f3aca3 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -55,7 +55,7 @@ class KMPrecommand : public TQObject
TQ_OBJECT
public:
- KMPrecommand(const TQString &precommand, TQObject *tqparent = 0);
+ KMPrecommand(const TQString &precommand, TQObject *parent = 0);
virtual ~KMPrecommand();
bool start();
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 76339dd6..9066941c 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -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).tqparent)
- folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
+ if ((*it).parent)
+ folderList << static_cast<KMFolderCachedImap*>((*it).parent->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).tqparent )
- folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
+ if ( (*it).cancellable && (*it).parent )
+ folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
}
// Kill jobs
ImapAccountBase::cancelMailCheck();
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 488142a9..97dca0d7 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -48,7 +48,7 @@ public:
void clearAccountList();
private:
- KMAcctFolder( KMFolderDir* tqparent, const TQString& name,
+ KMAcctFolder( KMFolderDir* parent, const TQString& name,
KMFolderType aFolderType );
};
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index d889b65b..fe74bc80 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
msg->setTransferInProgress( false );
}
}
- if ((*it).tqparent)
+ if ((*it).parent)
{
// clear folder state
- KMFolderImap *fld = static_cast<KMFolderImap*>((*it).tqparent->storage());
+ KMFolderImap *fld = static_cast<KMFolderImap*>((*it).parent->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()->tqparent() == folder )
+ if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == 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).tqparent ) {
- if ( (*i).tqparent == folder ) {
+ if ( (*i).parent ) {
+ if ( (*i).parent == 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).tqparent ) {
- folderList << static_cast<KMFolderImap*>((*it).tqparent->storage());
+ if ( (*it).cancellable && (*it).parent ) {
+ folderList << static_cast<KMFolderImap*>((*it).parent->storage());
}
}
// Kill jobs
@@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno)));
return 2;
}
- if (msg->tqparent()) { // unGet this msg
+ if (msg->parent()) { // unGet this msg
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->tqparent() ); assert( idx >= 0 );
+ assert( p == msg->parent() ); assert( idx >= 0 );
p->unGetMsg( idx );
}
diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp
index caa2a215..44df37c6 100644
--- a/kmail/kmacctseldlg.cpp
+++ b/kmail/kmacctseldlg.cpp
@@ -32,8 +32,8 @@
#include "kmacctseldlg.moc"
-KMAcctSelDlg::KMAcctSelDlg( TQWidget *tqparent, const char *name, bool modal )
- : KDialogBase( tqparent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
+KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal )
+ : KDialogBase( parent, 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 62a0012b..1430fe15 100644
--- a/kmail/kmacctseldlg.h
+++ b/kmail/kmacctseldlg.h
@@ -33,7 +33,7 @@ class KMAcctSelDlg: public KDialogBase
TQ_OBJECT
public:
- KMAcctSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
/**
* Returns selected button from the account selection group:
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 8054b9d8..11f0ede4 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -97,7 +97,7 @@
</group>
<group name="General">
- <entry name="disregardUtqmask" type="Bool">
+ <entry name="disregardUmask" 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>&lt;p&gt;This chooses the tqparent of the IMAP resource folders.&lt;/p&gt;&lt;p&gt;By default, the Kolab server sets the IMAP inbox to be the tqparent.&lt;/p&gt;</whatsthis>
+ <whatsthis>&lt;p&gt;This chooses the parent of the IMAP resource folders.&lt;/p&gt;&lt;p&gt;By default, the Kolab server sets the IMAP inbox to be the parent.&lt;/p&gt;</whatsthis>
<default>inbox</default>
</entry>
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 63a6df14..f14a6faa 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -61,8 +61,8 @@ typedef KParts::GenericFactory< KMailPart > KMailFactory;
K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &) :
- DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name),
+ TQObject *parent, const char *name, const TQStringList &) :
+ DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
mParentWidget( parentWidget )
{
kdDebug(5006) << "KMailPart()" << endl;
@@ -237,8 +237,8 @@ TQWidget* KMailPart::parentWidget() const
}
-KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent )
- : KParts::StatusBarExtension( tqparent ), mParent( tqparent )
+KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
+ : KParts::StatusBarExtension( parent ), mParent( parent )
{
}
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index d47041cc..ff80c19b 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -55,7 +55,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
TQ_OBJECT
public:
KMailPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &);
+ TQObject *parent, const char *name, const TQStringList &);
virtual ~KMailPart();
TQWidget* parentWidget() const;
@@ -89,7 +89,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
class KMailStatusBarExtension : public KParts::StatusBarExtension
{
public:
- KMailStatusBarExtension( KMailPart *tqparent );
+ KMailStatusBarExtension( KMailPart *parent );
KMainWindow *mainWindow() const;
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index cd4ef29c..bc92d39a 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -115,11 +115,11 @@ k_dcop:
/**
* Trigger the creation of a new resource folder with name @param resource
- * under tqparent @param.
+ * under parent @param.
* @return success or failure
*/
virtual bool addSubresource( const TQString& resource,
- const TQString& tqparent,
+ const TQString& parent,
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 82084b13..1376932e 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
{
if( !msg ) return;
- KMFolder *tqparent = msg->tqparent();
- Q_ASSERT( tqparent );
+ KMFolder *parent = msg->parent();
+ Q_ASSERT( parent );
TQ_UINT32 sernum = msg->getMsgSerNum();
// do we have an accumulator for this folder?
- Accumulator *ac = mAccumulators.find( tqparent->location() );
+ Accumulator *ac = mAccumulators.find( parent->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->tqparent(), msg->getMsgSerNum() );
+ slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
}
if ( mTheUnGetMes.contains( 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 *tqparent = folder;
- while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) {
- tqparent = tqparent->tqparent()->owner();
- if ( tqparent->isSystemFolder() ) {
+ const KMFolder *parent = folder;
+ while ( parent->parent() && parent->parent()->owner() ) {
+ parent = parent->parent()->owner();
+ if ( parent->isSystemFolder() ) {
TQStringList remainder(parts);
remainder.pop_front();
remainder.pop_front();
@@ -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->tqparent()->createJob( msg );
+ FolderJob *job = msg->parent()->createJob( msg );
connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) );
job->start();
@@ -1385,8 +1385,8 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg )
{
if( !msg ) return;
// Commands are now delayed; can't use that anymore, we need immediate deletion
- //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start();
- KMFolder *srcFolder = msg->tqparent();
+ //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start();
+ KMFolder *srcFolder = msg->parent();
int idx = srcFolder->find(msg);
assert(idx != -1);
// kill existing jobs since we are about to delete the message
@@ -1704,7 +1704,7 @@ void KMailICalIfaceImpl::readConfig()
const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders();
TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
- // Find the folder tqparent
+ // Find the folder parent
KMFolderDir* folderParentDir;
KMFolderType folderType;
KMFolder* folderParent = kmkernel->findFolderById( parentName );
@@ -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 tqparent has the subdirs
+ // Make sure the folder parent 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
@@ -2287,13 +2287,13 @@ bool KMailICalIfaceImpl::isResourceQuiet() const
bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
- const TQString& tqparent,
+ const TQString& parent,
const TQString& contentsType )
{
- kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl;
+ kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl;
kdDebug(5006) << "contents type: " << contentsType << endl;
- KMFolder *folder = findResourceFolder( tqparent );
- KMFolderDir *parentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+ KMFolder *folder = findResourceFolder( parent );
+ KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
TQString msg;
@@ -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 tqparent as well to create it
+ // check if the folder exists already, otherwise sync its parent as well to create it
if ( dimapFolder->imapPath().isEmpty() ) {
- if ( folder->tqparent() && folder->tqparent()->owner() )
- syncFolder( folder->tqparent()->owner() );
+ if ( folder->parent() && folder->parent()->owner() )
+ syncFolder( folder->parent()->owner() );
else
return;
}
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index 3cec23c6..90765ed7 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -136,7 +136,7 @@ public:
bool removeSubresource( const TQString& );
bool addSubresource( const TQString& resource,
- const TQString& tqparent,
+ const TQString& parent,
const TQString& contentsType );
// tell KOrganizer about messages to be deleted
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index 7a507c3f..d1300f84 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -9,9 +9,9 @@
#include <tqcheckbox.h>
#include <tqheader.h>
-KMAtmListViewItem::KMAtmListViewItem( TQListView *tqparent )
+KMAtmListViewItem::KMAtmListViewItem( TQListView *parent )
: TQObject(),
- TQListViewItem( tqparent )
+ TQListViewItem( parent )
{
mCBCompress = new TQCheckBox( listView()->viewport() );
mCBEncrypt = new TQCheckBox( listView()->viewport() );
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index 72ae6e25..f69ea96a 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -18,7 +18,7 @@ class KMAtmListViewItem : public TQObject, public TQListViewItem
TQ_OBJECT
public:
- KMAtmListViewItem( TQListView *tqparent );
+ KMAtmListViewItem( TQListView *parent );
virtual ~KMAtmListViewItem();
//A custom compare function is needed because the size column is
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index bdd700bf..5990a487 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -156,28 +156,28 @@ private:
};
-KMCommand::KMCommand( TQWidget *tqparent )
+KMCommand::KMCommand( TQWidget *parent )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent )
+ mEmitsCompletedItself( false ), mParent( parent )
{
}
-KMCommand::KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList )
+KMCommand::KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent ), mMsgList( msgList )
+ mEmitsCompletedItself( false ), mParent( parent ), mMsgList( msgList )
{
}
-KMCommand::KMCommand( TQWidget *tqparent, KMMsgBase *msgBase )
+KMCommand::KMCommand( TQWidget *parent, KMMsgBase *msgBase )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent )
+ mEmitsCompletedItself( false ), mParent( parent )
{
mMsgList.append( msgBase );
}
-KMCommand::KMCommand( TQWidget *tqparent, KMMessage *msg )
+KMCommand::KMCommand( TQWidget *parent, KMMessage *msg )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( tqparent )
+ mEmitsCompletedItself( false ), mParent( parent )
{
if (msg)
mMsgList.append( &msg->toMsgBase() );
@@ -236,7 +236,7 @@ void KMCommand::slotStart()
if ((mMsgList.count() == 1) &&
(mMsgList.getFirst()->isMessage()) &&
- (mMsgList.getFirst()->tqparent() == 0))
+ (mMsgList.getFirst()->parent() == 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->tqparent() ) {
+ if ( !mb->parent() ) {
emit messagesTransfered( Failed );
return;
} else {
- keepFolderOpen( mb->tqparent() );
+ keepFolderOpen( mb->parent() );
}
}
}
@@ -271,7 +271,7 @@ void KMCommand::slotPostTransfer( KMCommand::Result result )
while ( (msg = it.current()) != 0 )
{
++it;
- if (msg->tqparent())
+ if (msg->parent())
msg->setTransferInProgress(false);
}
kmkernel->filterMgr()->deref();
@@ -315,27 +315,27 @@ void KMCommand::transferSelectedMsgs()
thisMsg = static_cast<KMMessage*>(mb);
else
{
- KMFolder *folder = mb->tqparent();
+ KMFolder *folder = mb->parent();
int idx = folder->find(mb);
if (idx < 0) continue;
thisMsg = folder->getMsg(idx);
}
if (!thisMsg) continue;
if ( thisMsg->transferInProgress() &&
- thisMsg->tqparent()->folderType() == KMFolderTypeImap )
+ thisMsg->parent()->folderType() == KMFolderTypeImap )
{
thisMsg->setTransferInProgress( false, true );
- thisMsg->tqparent()->ignoreJobsForMessage( thisMsg );
+ thisMsg->parent()->ignoreJobsForMessage( thisMsg );
}
- if ( thisMsg->tqparent() && !thisMsg->isComplete() &&
+ if ( thisMsg->parent() && !thisMsg->isComplete() &&
( !mProgressDialog || !mProgressDialog->wasCancelled() ) )
{
kdDebug(5006)<<"### INCOMPLETE\n";
// the message needs to be transferred first
complete = false;
KMCommand::mCountJobs++;
- FolderJob *job = thisMsg->tqparent()->createJob(thisMsg);
+ FolderJob *job = thisMsg->parent()->createJob(thisMsg);
job->setCancellable( false );
totalSize += thisMsg->msgSizeServer();
// emitted when the message was transferred successfully
@@ -436,7 +436,7 @@ void KMCommand::slotTransferCancelled()
KMMessage* msg;
while ( (msg = it.current()) != 0 )
{
- KMFolder *folder = msg->tqparent();
+ KMFolder *folder = msg->parent();
++it;
if (!folder)
continue;
@@ -465,8 +465,8 @@ KMCommand::Result KMMailtoComposeCommand::execute()
KMMessage *msg = new KMMessage;
uint id = 0;
- if ( mMessage && mMessage->tqparent() )
- id = mMessage->tqparent()->identity();
+ if ( mMessage && mMessage->parent() )
+ id = mMessage->parent()->identity();
msg->initHeader(id);
msg->setCharset("utf-8");
@@ -481,9 +481,9 @@ KMCommand::Result KMMailtoComposeCommand::execute()
}
-KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *tqparent,
+KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *parent,
const KURL &url, KMMessage *msg, const TQString &selection )
- :KMCommand( tqparent, msg ), mUrl( url ), mSelection( selection )
+ :KMCommand( parent, msg ), mUrl( url ), mSelection( selection )
{
}
@@ -506,9 +506,9 @@ KMCommand::Result KMMailtoReplyCommand::execute()
}
-KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *tqparent,
+KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *parent,
const KURL &url, KMMessage *msg )
- :KMCommand( tqparent, msg ), mUrl( url )
+ :KMCommand( parent, msg ), mUrl( url )
{
}
@@ -530,8 +530,8 @@ KMCommand::Result KMMailtoForwardCommand::execute()
}
-KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -550,8 +550,8 @@ KMCommand::Result KMAddBookmarksCommand::execute()
}
KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
- TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+ TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -565,8 +565,8 @@ KMCommand::Result KMMailtoAddAddrBookCommand::execute()
KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
- TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+ TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -623,8 +623,8 @@ KMCommand::Result KMUrlOpenCommand::execute()
}
-KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *tqparent )
- : KMCommand( tqparent ), mUrl( url )
+KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *parent )
+ : KMCommand( parent ), mUrl( url )
{
}
@@ -664,45 +664,45 @@ void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
}
-KMEditMsgCommand::KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg )
- :KMCommand( tqparent, msg )
+KMEditMsgCommand::KMEditMsgCommand( TQWidget *parent, KMMessage *msg )
+ :KMCommand( parent, msg )
{
}
KMCommand::Result KMEditMsgCommand::execute()
{
KMMessage *msg = retrievedMessage();
- if ( !msg || !msg->tqparent() ||
- ( !kmkernel->folderIsDraftOrOutbox( msg->tqparent() ) &&
- !kmkernel->folderIsTemplates( msg->tqparent() ) ) )
+ if ( !msg || !msg->parent() ||
+ ( !kmkernel->folderIsDraftOrOutbox( msg->parent() ) &&
+ !kmkernel->folderIsTemplates( msg->parent() ) ) )
return Failed;
- // Remember the old tqparent, we need it a bit further down to be able
+ // Remember the old parent, 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 *tqparent = msg->tqparent();
- if ( tqparent )
- tqparent->take( tqparent->find( msg ) );
+ KMFolder *parent = msg->parent();
+ if ( parent )
+ parent->take( parent->find( 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( tqparent );
+ win->setFolder( parent );
win->show();
return OK;
}
-KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg )
- :KMCommand( tqparent, msg )
+KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *parent, KMMessage *msg )
+ :KMCommand( parent, msg )
{
}
KMCommand::Result KMUseTemplateCommand::execute()
{
KMMessage *msg = retrievedMessage();
- if ( !msg || !msg->tqparent() ||
- !kmkernel->folderIsTemplates( msg->tqparent() ) )
+ if ( !msg || !msg->parent() ||
+ !kmkernel->folderIsTemplates( msg->parent() ) )
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 *tqparent,
+KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *parent,
KMMessage *msg, bool fixedFont )
- :KMCommand( tqparent, msg ), mFixedFont( fixedFont )
+ :KMCommand( parent, msg ), mFixedFont( fixedFont )
{
// remember complete state
mMsgWasComplete = msg->isComplete();
@@ -782,8 +782,8 @@ static KURL subjectToUrl( const TQString & subject )
return KFileDialog::getSaveURL( cleanSubject, filter );
}
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
- : KMCommand( tqparent ),
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
+ : KMCommand( parent ),
mMsgListIndex( 0 ),
mStandAloneMessage( 0 ),
mOffset( 0 ),
@@ -797,8 +797,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
// from an .eml file.
if ( msg->getMsgSerNum() != 0 ) {
mMsgList.append( msg->getMsgSerNum() );
- if ( msg->tqparent() ) {
- msg->tqparent()->open( "kmsavemsgcommand" );
+ if ( msg->parent() ) {
+ msg->parent()->open( "kmsavemsgcommand" );
}
} else {
mStandAloneMessage = msg;
@@ -806,9 +806,9 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
mUrl = subjectToUrl( msg->cleanSubject() );
}
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent,
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList )
- : KMCommand( tqparent ),
+ : KMCommand( parent ),
mMsgListIndex( 0 ),
mStandAloneMessage( 0 ),
mOffset( 0 ),
@@ -826,8 +826,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent,
while ( it.current() ) {
mMsgList.append( (*it)->getMsgSerNum() );
mTotalSize += (*it)->msgSize();
- if ((*it)->tqparent() != 0)
- (*it)->tqparent()->open("kmcommand");
+ if ((*it)->parent() != 0)
+ (*it)->parent()->open("kmcommand");
++it;
}
mMsgListIndex = 0;
@@ -895,8 +895,8 @@ void KMSaveMsgCommand::slotSaveDataReq()
slotMessageRetrievedForSaving( msg );
} else {
// retrieve Message first
- if ( msg->tqparent() && !msg->isComplete() ) {
- FolderJob *job = msg->tqparent()->createJob( msg );
+ if ( msg->parent() && !msg->isComplete() ) {
+ FolderJob *job = msg->parent()->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->tqparent() && msg->getMsgSerNum() &&
+ if ( msg && msg->parent() && msg->getMsgSerNum() &&
mUngetMsgs.contains( msg ) ) {
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->tqparent() ); assert( idx >= 0 );
+ assert( p == msg->parent() ); assert( idx >= 0 );
p->unGetMsg( idx );
p->close("kmcommand");
}
@@ -993,9 +993,9 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
//-----------------------------------------------------------------------------
-KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *tqparent, const KURL & url,
+KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *parent, const KURL & url,
const TQString & encoding )
- : KMCommand( tqparent ),
+ : KMCommand( parent ),
mUrl( url ),
mEncoding( encoding )
{
@@ -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 *tqparent, KMMessage *msg,
+KMReplyToCommand::KMReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection )
- : KMCommand( tqparent, msg ), mSelection( selection )
+ : KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1125,9 +1125,9 @@ KMCommand::Result KMReplyToCommand::execute()
}
-KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *tqparent,
+KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *parent,
KMMessage *msg )
- : KMCommand( tqparent, msg )
+ : KMCommand( parent, msg )
{
}
@@ -1148,9 +1148,9 @@ KMCommand::Result KMNoQuoteReplyToCommand::execute()
}
-KMReplyListCommand::KMReplyListCommand( TQWidget *tqparent,
+KMReplyListCommand::KMReplyListCommand( TQWidget *parent,
KMMessage *msg, const TQString &selection )
- : KMCommand( tqparent, msg ), mSelection( selection )
+ : KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1171,9 +1171,9 @@ KMCommand::Result KMReplyListCommand::execute()
}
-KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *tqparent,
+KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *parent,
KMMessage *msg, const TQString &selection )
- :KMCommand( tqparent, msg ), mSelection( selection )
+ :KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1194,9 +1194,9 @@ KMCommand::Result KMReplyToAllCommand::execute()
}
-KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
+KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection )
- : KMCommand( tqparent, msg ), mSelection( selection )
+ : KMCommand( parent, msg ), mSelection( selection )
{
}
@@ -1217,16 +1217,16 @@ KMCommand::Result KMReplyAuthorCommand::execute()
}
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList, uint identity )
- : KMCommand( tqparent, msgList ),
+ : KMCommand( parent, msgList ),
mIdentity( identity )
{
}
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
KMMessage *msg, uint identity )
- : KMCommand( tqparent, msg ),
+ : KMCommand( parent, msg ),
mIdentity( identity )
{
}
@@ -1290,16 +1290,16 @@ KMCommand::Result KMForwardInlineCommand::execute()
}
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msgList ), mIdentity( identity ),
+ : KMCommand( parent, msgList ), mIdentity( identity ),
mWin( TQGuardedPtr<KMail::Composer>( win ))
{
}
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
KMMessage * msg, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msg ), mIdentity( identity ),
+ : KMCommand( parent, msg ), mIdentity( identity ),
mWin( TQGuardedPtr< KMail::Composer >( win ))
{
}
@@ -1353,16 +1353,16 @@ KMCommand::Result KMForwardAttachedCommand::execute()
}
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msgList ), mIdentity( identity ),
+ : KMCommand( parent, msgList ), mIdentity( identity ),
mWin( TQGuardedPtr<KMail::Composer>( win ))
{
}
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
KMMessage * msg, uint identity, KMail::Composer *win )
- : KMCommand( tqparent, msg ), mIdentity( identity ),
+ : KMCommand( parent, msg ), mIdentity( identity ),
mWin( TQGuardedPtr< KMail::Composer >( win ))
{
}
@@ -1440,9 +1440,9 @@ KMCommand::Result KMForwardDigestCommand::execute()
return OK;
}
-KMRedirectCommand::KMRedirectCommand( TQWidget *tqparent,
+KMRedirectCommand::KMRedirectCommand( TQWidget *parent,
KMMessage *msg )
- : KMCommand( tqparent, msg )
+ : KMCommand( parent, msg )
{
}
@@ -1470,10 +1470,10 @@ KMCommand::Result KMRedirectCommand::execute()
}
-KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl )
- : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
+ : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
{
}
@@ -1495,10 +1495,10 @@ KMCommand::Result KMCustomReplyToCommand::execute()
}
-KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
+KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl )
- : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
+ : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
{
}
@@ -1520,16 +1520,16 @@ KMCommand::Result KMCustomReplyAllToCommand::execute()
}
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl )
- : KMCommand( tqparent, msgList ),
+ : KMCommand( parent, msgList ),
mIdentity( identity ), mTemplate( tmpl )
{
}
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
KMMessage *msg, uint identity, const TQString &tmpl )
- : KMCommand( tqparent, msg ),
+ : KMCommand( parent, msg ),
mIdentity( identity ), mTemplate( tmpl )
{
}
@@ -1593,12 +1593,12 @@ KMCommand::Result KMCustomForwardCommand::execute()
}
-KMPrintCommand::KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
+KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
const KMail::HeaderStyle *headerStyle,
const KMail::HeaderStrategy *headerStrategy,
bool htmlOverride, bool htmlLoadExtOverride,
bool useFixedFont, const TQString & encoding )
- : KMCommand( tqparent, msg ),
+ : KMCommand( parent, msg ),
mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
mHtmlOverride( htmlOverride ),
mHtmlLoadExtOverride( htmlLoadExtOverride ),
@@ -1653,7 +1653,7 @@ KMCommand::Result KMSeStatusCommand::execute()
bool parentqStatus = false;
// Toggle actions on threads toggle the whole thread
- // depending on the state of the tqparent.
+ // depending on the state of the parent.
if (mToggle) {
KMMsgBase *msg;
KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx );
@@ -1712,10 +1712,10 @@ KMCommand::Result KMFilterCommand::execute()
}
-KMFilterActionCommand::KMFilterActionCommand( TQWidget *tqparent,
+KMFilterActionCommand::KMFilterActionCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList,
KMFilter *filter )
- : KMCommand( tqparent, msgList ), mFilter( filter )
+ : KMCommand( parent, msgList ), mFilter( filter )
{
TQPtrListIterator<KMMsgBase> it(msgList);
while ( it.current() ) {
@@ -1821,9 +1821,9 @@ void FolderShortcutCommand::setAction( KAction* action )
mAction = action;
}
-KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *tqparent,
+KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *parent,
KMMessage *msg )
- : KMCommand( tqparent, msg )
+ : KMCommand( parent, msg )
{
}
@@ -1984,7 +1984,7 @@ KMCommand::Result KMCopyCommand::execute()
for (msgBase = mMsgList.first(); msgBase; msgBase = mMsgList.next() )
{
- KMFolder *srcFolder = msgBase->tqparent();
+ KMFolder *srcFolder = msgBase->parent();
if (( isMessage = msgBase->isMessage() ))
{
msg = static_cast<KMMessage*>(msgBase);
@@ -2020,7 +2020,7 @@ KMCommand::Result KMCopyCommand::execute()
if (srcFolder && !newMsg->isComplete())
{
// imap => others
- newMsg->setParent(msg->tqparent());
+ newMsg->setParent(msg->parent());
FolderJob *job = srcFolder->createJob(newMsg);
job->setCancellable( false );
mPendingJobs << job;
@@ -2473,19 +2473,19 @@ KMCommand::Result KMUrlClickedCommand::execute()
return OK;
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg )
- : KMCommand( tqparent, msg ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg )
+ : KMCommand( parent, msg ), mImplicitAttachments( true ), mEncoded( false )
{
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs )
- : KMCommand( tqparent, msgs ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs )
+ : KMCommand( parent, msgs ), mImplicitAttachments( true ), mEncoded( false )
{
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode>& attachments,
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode>& attachments,
KMMessage *msg, bool encoded )
- : KMCommand( tqparent ), mImplicitAttachments( false ), mEncoded( encoded )
+ : KMCommand( parent ), mImplicitAttachments( false ), mEncoded( encoded )
{
for ( TQPtrListIterator<partNode> it( attachments ); it.current(); ++it ) {
mAttachmentMap.insert( it.current(), msg );
@@ -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()->disregardUtqmask() )
+ if ( GlobalSettings::self()->disregardUmask() )
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()->tqparent();
+ KMFolder* curFolder = it.data()->parent();
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 tqparent" << endl;
+ kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl;
}
}
if ( mNeedsRetrieval == 0 )
@@ -2860,9 +2860,9 @@ KMCommand::Result KMLoadPartsCommand::execute()
return OK;
}
-KMResendMessageCommand::KMResendMessageCommand( TQWidget *tqparent,
+KMResendMessageCommand::KMResendMessageCommand( TQWidget *parent,
KMMessage *msg )
- :KMCommand( tqparent, msg )
+ :KMCommand( parent, msg )
{
}
@@ -2892,8 +2892,8 @@ KMCommand::Result KMResendMessageCommand::execute()
return OK;
}
-KMMailingListCommand::KMMailingListCommand( TQWidget *tqparent, KMFolder *folder )
- : KMCommand( tqparent ), mFolder( folder )
+KMMailingListCommand::KMMailingListCommand( TQWidget *parent, KMFolder *folder )
+ : KMCommand( parent ), mFolder( folder )
{
}
@@ -2931,8 +2931,8 @@ void KMMailingListCommand::commandCompleted( KMCommand *command )
deleteLater();
}
-KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListPostCommand::urls() const
@@ -2940,8 +2940,8 @@ KURL::List KMMailingListPostCommand::urls() const
return mFolder->mailingList().postURLS();
}
-KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListSubscribeCommand::urls() const
@@ -2949,8 +2949,8 @@ KURL::List KMMailingListSubscribeCommand::urls() const
return mFolder->mailingList().subscribeURLS();
}
-KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListUnsubscribeCommand::urls() const
@@ -2958,8 +2958,8 @@ KURL::List KMMailingListUnsubscribeCommand::urls() const
return mFolder->mailingList().unsubscribeURLS();
}
-KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListArchivesCommand::urls() const
@@ -2967,8 +2967,8 @@ KURL::List KMMailingListArchivesCommand::urls() const
return mFolder->mailingList().archiveURLS();
}
-KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder )
- : KMMailingListCommand( tqparent, folder )
+KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder )
+ : KMMailingListCommand( parent, folder )
{
}
KURL::List KMMailingListHelpCommand::urls() const
@@ -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* tqparent )
-: KMCommand( tqparent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
+ AttachmentAction action, KService::Ptr offer, TQWidget* parent )
+: KMCommand( parent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
mAction( action ), mOffer( offer ), mJob( 0 )
{
}
@@ -3349,15 +3349,15 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job
}
-AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
- KMCommand( tqparent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
+ KMCommand( parent, msg ),
mPartIndex( node->nodeId() ),
mSernum( 0 )
{
}
-AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
- : KMCommand( tqparent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent )
+ : KMCommand( parent, msg ),
mPartIndex( nodeId ),
mSernum( 0 )
{
@@ -3374,7 +3374,7 @@ KMCommand::Result AttachmentModifyCommand::execute()
return Failed;
mSernum = msg->getMsgSerNum();
- mFolder = msg->tqparent();
+ mFolder = msg->parent();
if ( !mFolder || !mFolder->storage() )
return Failed;
@@ -3427,14 +3427,14 @@ void AttachmentModifyCommand::messageDeleteResult(KMCommand * cmd)
deleteLater();
}
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
- AttachmentModifyCommand( node, msg, tqparent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
+ AttachmentModifyCommand( node, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
}
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
- : AttachmentModifyCommand( nodeId, msg, tqparent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
+ : AttachmentModifyCommand( nodeId, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
}
@@ -3459,15 +3459,15 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
}
-KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
- AttachmentModifyCommand( node, msg, tqparent )
+KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
+ AttachmentModifyCommand( node, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
mTempFile.setAutoDelete( true );
}
-KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
- : AttachmentModifyCommand( nodeId, msg, tqparent )
+KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
+ : AttachmentModifyCommand( nodeId, msg, parent )
{
kdDebug(5006) << k_funcinfo << endl;
mTempFile.setAutoDelete( true );
@@ -3549,8 +3549,8 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
}
-CreateTodoCommand::CreateTodoCommand(TQWidget * tqparent, KMMessage * msg)
- : KMCommand( tqparent, msg )
+CreateTodoCommand::CreateTodoCommand(TQWidget * parent, KMMessage * msg)
+ : KMCommand( parent, msg )
{
}
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 8ebe68b1..4bc86ec0 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -58,13 +58,13 @@ public:
enum Result { Undefined, OK, Canceled, Failed };
// Trival constructor, don't retrieve any messages
- KMCommand( TQWidget *tqparent = 0 );
+ KMCommand( TQWidget *parent = 0 );
// Retrieve all messages in msgList when start is called.
- KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList );
+ KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
// Retrieve the single message msgBase when start is called.
- KMCommand( TQWidget *tqparent, KMMsgBase *msgBase );
+ KMCommand( TQWidget *parent, KMMsgBase *msgBase );
// Retrieve the single message msgBase when start is called.
- KMCommand( TQWidget *tqparent, KMMessage *message );
+ KMCommand( TQWidget *parent, KMMessage *message );
virtual ~KMCommand();
/** These folders will be closed by the dtor, handy, if you need to keep
@@ -98,7 +98,7 @@ protected:
const TQPtrList<KMMessage> retrievedMsgs() const;
// Returns the single message retrieved
KMMessage *retrievedMessage() const;
- // Returns the tqparent widget
+ // Returns the parent widget
TQWidget *parentWidget() const;
bool deletesItself() { return mDeletesItself; }
@@ -183,7 +183,7 @@ class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url,
+ KMMailtoReplyCommand( TQWidget *parent, const KURL &url,
KMMessage *msg, const TQString &selection );
private:
@@ -199,7 +199,7 @@ class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url,
+ KMMailtoForwardCommand( TQWidget *parent, const KURL &url,
KMMessage *msg );
private:
@@ -214,7 +214,7 @@ class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *tqparent );
+ KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent );
private:
virtual Result execute();
@@ -228,7 +228,7 @@ class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
TQ_OBJECT
public:
- KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent );
+ KMAddBookmarksCommand( const KURL &url, TQWidget *parent );
private:
virtual Result execute();
@@ -243,7 +243,7 @@ class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
TQ_OBJECT
public:
- KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *tqparent );
+ KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent );
private:
virtual Result execute();
@@ -287,7 +287,7 @@ class KDE_EXPORT KMUrlSaveCommand : public KMCommand
TQ_OBJECT
public:
- KMUrlSaveCommand( const KURL &url, TQWidget *tqparent );
+ KMUrlSaveCommand( const KURL &url, TQWidget *parent );
private slots:
void slotUrlSaveResult( KIO::Job *job );
@@ -304,7 +304,7 @@ class KDE_EXPORT KMEditMsgCommand : public KMCommand
TQ_OBJECT
public:
- KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg );
+ KMEditMsgCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -316,7 +316,7 @@ class KDE_EXPORT KMUseTemplateCommand : public KMCommand
TQ_OBJECT
public:
- KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg );
+ KMUseTemplateCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -328,7 +328,7 @@ class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand
TQ_OBJECT
public:
- KMShowMsgSrcCommand( TQWidget *tqparent, KMMessage *msg,
+ KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg,
bool fixedFont );
virtual Result execute();
@@ -343,8 +343,8 @@ class KDE_EXPORT KMSaveMsgCommand : public KMCommand
TQ_OBJECT
public:
- KMSaveMsgCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList );
- KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg );
+ KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
+ KMSaveMsgCommand( TQWidget *parent, KMMessage * msg );
KURL url();
private:
@@ -375,7 +375,7 @@ class KDE_EXPORT KMOpenMsgCommand : public KMCommand
TQ_OBJECT
public:
- KMOpenMsgCommand( TQWidget *tqparent, const KURL & url = KURL(),
+ KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(),
const TQString & encoding = TQString() );
private:
@@ -399,24 +399,24 @@ class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand
TQ_OBJECT
public:
/** Use this to save all attachments of the given message.
- @param tqparent The tqparent widget of the command used for message boxes.
+ @param parent The parent widget of the command used for message boxes.
@param msg The message of which the attachments should be saved.
*/
- KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg );
+ KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg );
/** Use this to save all attachments of the given messages.
- @param tqparent The tqparent widget of the command used for message boxes.
+ @param parent The parent widget of the command used for message boxes.
@param msgs The messages of which the attachments should be saved.
*/
- KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs );
+ KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs );
/** Use this to save the specified attachments of the given message.
- @param tqparent The tqparent widget of the command used for message
+ @param parent The parent 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 *tqparent, TQPtrList<partNode> &attachments,
+ KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode> &attachments,
KMMessage *msg, bool encoded = false );
private slots:
@@ -438,7 +438,7 @@ class KDE_EXPORT KMReplyToCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -454,7 +454,7 @@ class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand
TQ_OBJECT
public:
- KMNoQuoteReplyToCommand( TQWidget *tqparent, KMMessage *msg );
+ KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -466,7 +466,7 @@ class KMReplyListCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyListCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyListCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -482,7 +482,7 @@ class KDE_EXPORT KMReplyToAllCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyToAllCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyToAllCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -498,7 +498,7 @@ class KDE_EXPORT KMReplyAuthorCommand : public KMCommand
TQ_OBJECT
public:
- KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
+ KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection = TQString() );
private:
@@ -514,9 +514,9 @@ class KDE_EXPORT KMForwardInlineCommand : public KMCommand
TQ_OBJECT
public:
- KMForwardInlineCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
+ KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
uint identity = 0 );
- KMForwardInlineCommand( TQWidget *tqparent, KMMessage * msg,
+ KMForwardInlineCommand( TQWidget *parent, KMMessage * msg,
uint identity = 0 );
private:
@@ -532,9 +532,9 @@ class KDE_EXPORT KMForwardAttachedCommand : public KMCommand
TQ_OBJECT
public:
- KMForwardAttachedCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
+ KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
uint identity = 0, KMail::Composer *win = 0 );
- KMForwardAttachedCommand( TQWidget *tqparent, KMMessage * msg,
+ KMForwardAttachedCommand( TQWidget *parent, KMMessage * msg,
uint identity = 0, KMail::Composer *win = 0 );
private:
@@ -550,9 +550,9 @@ class KDE_EXPORT KMForwardDigestCommand : public KMCommand
TQ_OBJECT
public:
- KMForwardDigestCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
+ KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
uint identity = 0, KMail::Composer *win = 0 );
- KMForwardDigestCommand( TQWidget *tqparent, KMMessage * msg,
+ KMForwardDigestCommand( TQWidget *parent, KMMessage * msg,
uint identity = 0, KMail::Composer *win = 0 );
private:
@@ -568,7 +568,7 @@ class KDE_EXPORT KMRedirectCommand : public KMCommand
TQ_OBJECT
public:
- KMRedirectCommand( TQWidget *tqparent, KMMessage *msg );
+ KMRedirectCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -580,7 +580,7 @@ class KDE_EXPORT KMCustomReplyToCommand : public KMCommand
TQ_OBJECT
public:
- KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
+ KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl );
@@ -598,7 +598,7 @@ class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand
TQ_OBJECT
public:
- KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
+ KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl );
@@ -616,9 +616,9 @@ class KDE_EXPORT KMCustomForwardCommand : public KMCommand
TQ_OBJECT
public:
- KMCustomForwardCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList,
+ KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
uint identity, const TQString &tmpl );
- KMCustomForwardCommand( TQWidget *tqparent, KMMessage * msg,
+ KMCustomForwardCommand( TQWidget *parent, KMMessage * msg,
uint identity, const TQString &tmpl );
private:
@@ -634,7 +634,7 @@ class KDE_EXPORT KMPrintCommand : public KMCommand
TQ_OBJECT
public:
- KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
+ KMPrintCommand( TQWidget *parent, KMMessage *msg,
const KMail::HeaderStyle *headerStyle = 0,
const KMail::HeaderStrategy *headerStrategy = 0,
bool htmlOverride = false,
@@ -697,7 +697,7 @@ class KDE_EXPORT KMFilterActionCommand : public KMCommand
TQ_OBJECT
public:
- KMFilterActionCommand( TQWidget *tqparent,
+ KMFilterActionCommand( TQWidget *parent,
const TQPtrList<KMMsgBase> &msgList,
KMFilter *filter );
@@ -755,7 +755,7 @@ class KDE_EXPORT KMMailingListFilterCommand : public KMCommand
TQ_OBJECT
public:
- KMMailingListFilterCommand( TQWidget *tqparent, KMMessage *msg );
+ KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg );
private:
virtual Result execute();
@@ -910,7 +910,7 @@ class KDE_EXPORT KMResendMessageCommand : public KMCommand
TQ_OBJECT
public:
- KMResendMessageCommand( TQWidget *tqparent, KMMessage *msg=0 );
+ KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 );
private:
virtual Result execute();
@@ -921,7 +921,7 @@ class KDE_EXPORT KMMailingListCommand : public KMCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListCommand( TQWidget *parent, KMFolder *folder );
private:
virtual Result execute();
private slots:
@@ -937,7 +937,7 @@ class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListPostCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -947,7 +947,7 @@ class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -957,7 +957,7 @@ class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -967,7 +967,7 @@ class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -977,7 +977,7 @@ class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand
Q_OBJECT
TQ_OBJECT
public:
- KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder );
+ KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder );
protected:
virtual KURL::List urls() const;
};
@@ -1029,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* tqparent );
+ const TQString& atmName, AttachmentAction action, KService::Ptr offer, TQWidget* parent );
signals:
@@ -1095,8 +1095,8 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
Q_OBJECT
TQ_OBJECT
public:
- AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
- AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
+ AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent );
+ AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent );
~AttachmentModifyCommand();
protected:
@@ -1123,8 +1123,8 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
Q_OBJECT
TQ_OBJECT
public:
- KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
- KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
+ KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
+ KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
~KMDeleteAttachmentCommand();
protected:
@@ -1137,8 +1137,8 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
Q_OBJECT
TQ_OBJECT
public:
- KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *tqparent );
- KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent );
+ KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
+ KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
~KMEditAttachmentCommand();
protected:
@@ -1156,7 +1156,7 @@ class KDE_EXPORT CreateTodoCommand : public KMCommand
Q_OBJECT
TQ_OBJECT
public:
- CreateTodoCommand( TQWidget *tqparent, KMMessage *msg );
+ CreateTodoCommand( TQWidget *parent, KMMessage *msg );
private:
Result execute();
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 45daa0c3..2e090639 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -971,7 +971,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
void KMComposeWin::rethinkFields(bool fromSlot)
{
//This sucks even more but again no ids. sorry (sven)
- int tqmask, row, numRows;
+ int mask, row, numRows;
long showHeaders;
if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
else
showHeaders = mShowHeaders;
- for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
- if ((showHeaders&tqmask) != 0) mNumHeaders++;
+ for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
+ if ((showHeaders&mask) != 0) mNumHeaders++;
numRows = mNumHeaders + 1;
@@ -4091,7 +4091,7 @@ void KMComposeWin::slotContinuePrint( bool rc )
}
//----------------------------------------------------------------------------
-bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addresses )
+bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addresses )
{
TQString brokenAddress;
KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress );
@@ -4099,7 +4099,7 @@ bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addr
TQString errorMsg( "<qt><p><b>" + brokenAddress +
"</b></p><p>" + KPIM::emailParseResultToString( errorCode ) +
"</p></qt>" );
- KMessageBox::sorry( tqparent, errorMsg, i18n("Invalid Email Address") );
+ KMessageBox::sorry( parent, errorMsg, i18n("Invalid Email Address") );
return false;
}
return true;
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 874789b2..bd15cbbd 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -556,7 +556,7 @@ private:
const TQString &toolTip = TQString(),
const TQString &whatsThis = TQString() );
- void rethinkHeaderLine( int value, int tqmask, int& row,
+ void rethinkHeaderLine( int value, int mask, int& row,
TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk );
/**
@@ -716,7 +716,7 @@ private:
* @return true if all addresses are valid.
* @return false if one or several addresses are invalid.
*/
- static bool validateAddresses( TQWidget * tqparent, const TQString & addresses );
+ static bool validateAddresses( TQWidget * parent, const TQString & addresses );
/**
* Sets the transport combobox to @p transport. If @p transport is empty
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 336901b3..c77250c5 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -209,10 +209,10 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
}
}
-KMEdit::KMEdit(TQWidget *tqparent, KMComposeWin* composer,
+KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer,
KSpellConfig* autoSpellConfig,
const char *name)
- : KEdit( tqparent, name ),
+ : KEdit( parent, name ),
mComposer( composer ),
mKSpellForDialog( 0 ),
mSpeller( 0 ),
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index 08ed687d..a27a4480 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -67,7 +67,7 @@ class KMEdit : public KEdit {
Q_OBJECT
TQ_OBJECT
public:
- KMEdit(TQWidget *tqparent=0,KMComposeWin* composer=0,
+ KMEdit(TQWidget *parent=0,KMComposeWin* composer=0,
KSpellConfig* spellConfig = 0,
const char *name=0);
~KMEdit();
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index c495ffbb..a4efae48 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -25,8 +25,8 @@
//
//=============================================================================
-KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* tqparent, const char* name )
- : TQWidget( tqparent, name )
+KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* parent, const char* name )
+ : TQWidget( parent, name )
{
TQHBoxLayout *hbl = new TQHBoxLayout(this);
hbl->setSpacing(4);
@@ -69,8 +69,8 @@ void KMFilterActionWithAddressWidget::slotAddrBook()
mLineEdit->setText( txt + addrList.join(",") );
}
-KMSoundTestWidget::KMSoundTestWidget(TQWidget *tqparent, const char *name)
- : TQWidget( tqparent, name)
+KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name)
+ : TQWidget( parent, name)
{
TQHBoxLayout *lay1 = new TQHBoxLayout( this );
m_playButton = new TQPushButton( this, "m_playButton" );
diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h
index c0605874..2528f2ba 100644
--- a/kmail/kmfawidgets.h
+++ b/kmail/kmfawidgets.h
@@ -20,7 +20,7 @@ class KMFilterActionWithAddressWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- KMFilterActionWithAddressWidget( TQWidget* tqparent=0, const char* name=0 );
+ KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 );
void clear() { mLineEdit->clear(); }
TQString text() const { return mLineEdit->text(); }
@@ -43,7 +43,7 @@ class KMSoundTestWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- KMSoundTestWidget( TQWidget * tqparent, const char * name=0 );
+ KMSoundTestWidget( TQWidget * parent, const char * name=0 );
~KMSoundTestWidget();
TQString url() const;
void setUrl( const TQString & url );
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 49378e9d..d10a509b 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -88,9 +88,9 @@ KMFilterAction* KMFilterAction::newAction()
return 0;
}
-TQWidget* KMFilterAction::createParamWidget(TQWidget* tqparent) const
+TQWidget* KMFilterAction::createParamWidget(TQWidget* parent) const
{
- return new TQWidget(tqparent);
+ return new TQWidget(parent);
}
void KMFilterAction::applyParamWidgetValue(TQWidget*)
@@ -201,9 +201,9 @@ KMFilterActionWithString::KMFilterActionWithString( const char* aName, const TQS
{
}
-TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithString::createParamWidget( TQWidget* parent ) const
{
- TQLineEdit *le = new KLineEdit(tqparent);
+ TQLineEdit *le = new KLineEdit(parent);
le->setText( mParameter );
return le;
}
@@ -251,9 +251,9 @@ KMFilterActionWithStringList::KMFilterActionWithStringList( const char* aName, c
{
}
-TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithStringList::createParamWidget( TQWidget* parent ) const
{
- TQComboBox *cb = new TQComboBox( false, tqparent );
+ TQComboBox *cb = new TQComboBox( false, parent );
cb->insertStringList( mParameterList );
setParamWidgetValue( cb );
return cb;
@@ -298,9 +298,9 @@ KMFilterActionWithFolder::KMFilterActionWithFolder( const char* aName, const TQS
mFolder = 0;
}
-TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithFolder::createParamWidget( TQWidget* parent ) const
{
- FolderRequester *req = new FolderRequester( tqparent,
+ FolderRequester *req = new FolderRequester( parent,
kmkernel->getKMMainWidget()->folderTree() );
setParamWidgetValue( req );
return req;
@@ -380,9 +380,9 @@ KMFilterActionWithAddress::KMFilterActionWithAddress( const char* aName, const T
{
}
-TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithAddress::createParamWidget( TQWidget* parent ) const
{
- KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(tqparent);
+ KMFilterActionWithAddressWidget *w = new KMFilterActionWithAddressWidget(parent);
w->setText( mParameter );
return w;
}
@@ -413,9 +413,9 @@ KMFilterActionWithCommand::KMFilterActionWithCommand( const char* aName, const T
{
}
-TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithCommand::createParamWidget( TQWidget* parent ) const
{
- return KMFilterActionWithUrl::createParamWidget( tqparent );
+ return KMFilterActionWithUrl::createParamWidget( parent );
}
void KMFilterActionWithCommand::applyParamWidgetValue( TQWidget* paramWidget )
@@ -689,9 +689,9 @@ public:
virtual ReturnCode process(KMMessage* msg) const;
static KMFilterAction* newAction();
- TQWidget * createParamWidget( TQWidget * tqparent ) const;
- void applyParamWidgetValue( TQWidget * tqparent );
- void setParamWidgetValue( TQWidget * tqparent ) const;
+ TQWidget * createParamWidget( TQWidget * parent ) const;
+ void applyParamWidgetValue( TQWidget * parent );
+ void setParamWidgetValue( TQWidget * parent ) const;
void clearParamWidget( TQWidget * param ) const;
};
@@ -712,9 +712,9 @@ KMFilterAction::ReturnCode KMFilterActionIdentity::process(KMMessage* msg) const
return GoOn;
}
-TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * tqparent ) const
+TQWidget * KMFilterActionIdentity::createParamWidget( TQWidget * parent ) const
{
- KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), tqparent );
+ KPIM::IdentityCombo * ic = new KPIM::IdentityCombo( kmkernel->identityManager(), parent );
ic->setCurrentIdentity( mParameter );
return ic;
}
@@ -951,7 +951,7 @@ class KMFilterActionRemoveHeader: public KMFilterActionWithStringList
public:
KMFilterActionRemoveHeader();
virtual ReturnCode process(KMMessage* msg) const;
- virtual TQWidget* createParamWidget( TQWidget* tqparent ) const;
+ virtual TQWidget* createParamWidget( TQWidget* parent ) const;
virtual void setParamWidgetValue( TQWidget* paramWidget ) const;
static KMFilterAction* newAction();
@@ -974,9 +974,9 @@ KMFilterActionRemoveHeader::KMFilterActionRemoveHeader()
mParameter = *mParameterList.at(0);
}
-TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionRemoveHeader::createParamWidget( TQWidget* parent ) const
{
- TQComboBox *cb = new TQComboBox( true/*editable*/, tqparent );
+ TQComboBox *cb = new TQComboBox( true/*editable*/, parent );
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* tqparent ) const;
+ virtual TQWidget* createParamWidget( TQWidget* parent ) 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* tqparent ) const
+TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const
{
- TQWidget *w = new TQWidget( tqparent );
+ TQWidget *w = new TQWidget( parent );
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* tqparent ) const;
+ virtual TQWidget* createParamWidget( TQWidget* parent ) const;
virtual void setParamWidgetValue( TQWidget* paramWidget ) const;
virtual void applyParamWidgetValue( TQWidget* paramWidget );
virtual void clearParamWidget( TQWidget* paramWidget ) const;
@@ -1203,9 +1203,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg)
return GoOn;
}
-TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) const
{
- TQWidget *w = new TQWidget( tqparent );
+ TQWidget *w = new TQWidget( parent );
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->tqparent()->folderMgr;
+ return false; //iff mFolder->folderMgr == msgBase->parent()->folderMgr;
}
@@ -1443,7 +1443,7 @@ class KMFilterActionForward: public KMFilterActionWithAddress
public:
KMFilterActionForward();
virtual ReturnCode process( KMMessage* msg ) const;
- virtual TQWidget* createParamWidget( TQWidget* tqparent ) const;
+ virtual TQWidget* createParamWidget( TQWidget* parent ) 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* tqparent ) const
+TQWidget* KMFilterActionForward::createParamWidget( TQWidget* parent ) const
{
- TQWidget *addressAndTemplate = new TQWidget( tqparent );
+ TQWidget *addressAndTemplate = new TQWidget( parent );
TQHBoxLayout *hBox = new TQHBoxLayout( addressAndTemplate );
TQWidget *addressEdit = KMFilterActionWithAddress::createParamWidget( addressAndTemplate );
addressEdit->setName( "addressEdit" );
@@ -1699,8 +1699,8 @@ KMFilterAction::ReturnCode KMFilterActionExec::process(KMMessage *aMsg) const
class PipeJob : public KPIM::ThreadWeaver::Job
{
public:
- PipeJob(TQObject* tqparent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 )
- : Job (tqparent, name),
+ PipeJob(TQObject* parent = 0 , const char* name = 0, KMMessage* aMsg = 0, TQString cmd = 0, TQString tempFileName = 0 )
+ : Job (parent, name),
mTempFileName(tempFileName),
mCmd(cmd),
mMsg( aMsg )
@@ -1737,7 +1737,7 @@ class PipeJob : public KPIM::ThreadWeaver::Job
pclose(p);
if ( !ba.isEmpty() ) {
KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", TQString(ba).latin1() );
- KMFolder *filterFolder = mMsg->tqparent();
+ KMFolder *filterFolder = mMsg->parent();
ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() );
mMsg->fromByteArray( ba );
@@ -1842,9 +1842,9 @@ KMFilterActionWithTest::~KMFilterActionWithTest()
{
}
-TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithTest::createParamWidget( TQWidget* parent ) const
{
- KMSoundTestWidget *le = new KMSoundTestWidget(tqparent);
+ KMSoundTestWidget *le = new KMSoundTestWidget(parent);
le->setUrl( mParameter );
return le;
}
@@ -1919,9 +1919,9 @@ KMFilterActionWithUrl::~KMFilterActionWithUrl()
{
}
-TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* tqparent ) const
+TQWidget* KMFilterActionWithUrl::createParamWidget( TQWidget* parent ) const
{
- KURLRequester *le = new KURLRequester(tqparent);
+ KURLRequester *le = new KURLRequester(parent);
le->setURL( mParameter );
return le;
}
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index 21fa0e73..451c9b5b 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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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
@@ -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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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
@@ -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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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* tqparent) const;
+ virtual TQWidget* createParamWidget(TQWidget* parent) 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
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 02abff7b..c730375e 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -128,10 +128,10 @@ const char * KMPopFilterDlgHelpAnchor = "popfilters-id" ;
//
//=============================================================================
-KMFilterDlg::KMFilterDlg(TQWidget* tqparent, const char* name, bool popFilter, bool createDummyFilter )
- : KDialogBase( tqparent, name, false /* modality */,
+KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter )
+ : KDialogBase( parent, name, false /* modality */,
(popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/,
- Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */,
+ Help|Ok|Apply|Cancel|User1|User2 /* button mask */,
Ok /* default btn */, false /* separator */),
bPopFilter(popFilter)
{
@@ -577,8 +577,8 @@ void KMFilterDlg::slotUpdateAccountList()
//
//=============================================================================
-KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *tqparent, const char* name, bool popFilter )
- : TQGroupBox( 1, Qt::Horizontal, title, tqparent, name ),
+KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter )
+ : TQGroupBox( 1, Qt::Horizontal, title, parent, name ),
bPopFilter(popFilter)
{
mFilterList.setAutoDelete( true );
@@ -1108,8 +1108,8 @@ void KMFilterListBox::swapFilters( int from, int to )
//
//=============================================================================
-KMFilterActionWidget::KMFilterActionWidget( TQWidget *tqparent, const char* name )
- : TQHBox( tqparent, name )
+KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
+ : TQHBox( parent, name )
{
int i;
mActionList.setAutoDelete( true );
@@ -1209,8 +1209,8 @@ KMFilterAction * KMFilterActionWidget::action()
//
//=============================================================================
-KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *tqparent, const char* name )
- : KWidgetLister( 1, FILTER_MAX_ACTIONS, tqparent, name )
+KMFilterActionWidgetLister::KMFilterActionWidgetLister( TQWidget *parent, const char* name )
+ : KWidgetLister( 1, FILTER_MAX_ACTIONS, parent, name )
{
mActionList = 0;
}
@@ -1228,7 +1228,7 @@ void KMFilterActionWidgetLister::setActionList( TQPtrList<KMFilterAction> *aList
mActionList = aList;
- ((TQWidget*)tqparent())->setEnabled( true );
+ ((TQWidget*)parent())->setEnabled( true );
if ( aList->count() == 0 ) {
slotClear();
@@ -1262,12 +1262,12 @@ void KMFilterActionWidgetLister::reset()
mActionList = 0;
slotClear();
- ((TQWidget*)tqparent())->setEnabled( false );
+ ((TQWidget*)parent())->setEnabled( false );
}
-TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *tqparent )
+TQWidget* KMFilterActionWidgetLister::createWidget( TQWidget *parent )
{
- return new KMFilterActionWidget(tqparent);
+ return new KMFilterActionWidget(parent);
}
void KMFilterActionWidgetLister::clearWidget( TQWidget *aWidget )
@@ -1297,8 +1297,8 @@ void KMFilterActionWidgetLister::regenerateActionListFromWidgets()
//
//=============================================================================
-KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *tqparent, const char* name )
- : TQVButtonGroup( title, tqparent, name )
+KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidget *parent, const char* name )
+ : TQVButtonGroup( title, parent, 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 a664fad9..ed72d991 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -63,7 +63,7 @@ class KMFilterListBox : public TQGroupBox
TQ_OBJECT
public:
/** Constuctor. */
- KMFilterListBox( const TQString & title, TQWidget* tqparent=0, const char* name=0, bool popFilter = false);
+ KMFilterListBox( const TQString & title, TQWidget* parent=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
@@ -200,7 +200,7 @@ class KMFilterActionWidget : public TQHBox
public:
/** Constructor. Creates a filter action widget with no type
selected. */
- KMFilterActionWidget( TQWidget* tqparent=0, const char* name=0 );
+ KMFilterActionWidget( TQWidget* parent=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
@@ -232,7 +232,7 @@ class KMPopFilterActionWidget : public TQVButtonGroup
Q_OBJECT
TQ_OBJECT
public:
- KMPopFilterActionWidget( const TQString &title, TQWidget* tqparent=0, const char* name=0 );
+ KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 );
void setAction( KMPopFilterAction aAction );
KMPopFilterAction action();
@@ -257,7 +257,7 @@ class KMFilterActionWidgetLister : public KWidgetLister
Q_OBJECT
TQ_OBJECT
public:
- KMFilterActionWidgetLister( TQWidget *tqparent=0, const char* name=0 );
+ KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 );
virtual ~KMFilterActionWidgetLister();
@@ -271,7 +271,7 @@ public slots:
protected:
virtual void clearWidget( TQWidget *aWidget );
- virtual TQWidget* createWidget( TQWidget *tqparent );
+ virtual TQWidget* createWidget( TQWidget *parent );
private:
void regenerateActionListFromWidgets();
@@ -344,7 +344,7 @@ 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* tqparent=0, const char* name=0, bool popFilter=false,
+ KMFilterDlg( TQWidget* parent=0, const char* name=0, bool popFilter=false,
bool createDummyFilter=true );
/** Called from KMFilterMgr. Creates a new filter and presets
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 565bbcc0..9118d14c 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -125,16 +125,16 @@ int KMFilterMgr::moveMessage(KMMessage *msg) const
void KMFilterMgr::endFiltering(KMMsgBase *msgBase) const
{
- KMFolder *tqparent = msgBase->tqparent();
- if ( tqparent ) {
- if ( tqparent == MessageProperty::filterFolder( msgBase ) ) {
- tqparent->take( tqparent->find( msgBase ) );
+ KMFolder *parent = msgBase->parent();
+ if ( parent ) {
+ if ( parent == MessageProperty::filterFolder( msgBase ) ) {
+ parent->take( parent->find( msgBase ) );
}
else if ( ! MessageProperty::filterFolder( msgBase ) ) {
- int index = tqparent->find( msgBase );
- KMMessage *msg = tqparent->getMsg( index );
- tqparent->take( index );
- tqparent->addMsgKeepUID( msg );
+ int index = parent->find( msgBase );
+ KMMessage *msg = parent->getMsg( index );
+ parent->take( index );
+ parent->addMsgKeepUID( msg );
}
}
MessageProperty::setFiltering( msgBase, false );
@@ -392,7 +392,7 @@ void KMFilterMgr::openDialog( TQWidget *, bool checkForEmptyFilterList )
if( !mEditDialog )
{
//
- // We can't use the tqparent as long as the dialog is modeless
+ // We can't use the parent as long as the dialog is modeless
// and there is one shared dialog for all top level windows.
//
mEditDialog = new KMFilterDlg( 0, "filterdialog", bPopFilter,
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 4aae1991..6b0130af 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -55,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 *tqparent, bool checkForEmptyFilterList = true );
+ void openDialog( TQWidget *parent, bool checkForEmptyFilterList = true );
/** Open an edit dialog, create a new filter and preset the first
rule with "field equals value" */
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 08fe43e0..df8b4daf 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 ) ),
- tqparent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+ parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
- tqparent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
+ parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
- tqparent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
+ parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ),
- tqparent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
+ parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
}
// Resend all mStorage signals
@@ -284,11 +284,11 @@ KMFolderDir* KMFolder::createChildFolder()
else if( folderType() == KMFolderTypeImap )
newType = KMImapDir;
- mChild = new KMFolderDir( this, tqparent(), childName, newType );
+ mChild = new KMFolderDir( this, parent(), childName, newType );
if( !mChild )
return 0;
mChild->reload();
- tqparent()->append( mChild );
+ parent()->append( mChild );
return mChild;
}
@@ -593,8 +593,8 @@ TQString KMFolder::label() const
TQString KMFolder::prettyURL() const
{
TQString parentUrl;
- if ( tqparent() )
- parentUrl = tqparent()->prettyURL();
+ if ( parent() )
+ parentUrl = parent()->prettyURL();
if ( !parentUrl.isEmpty() )
return parentUrl + '/' + label();
else
@@ -704,11 +704,11 @@ void KMFolder::correctUnreadMsgsCount()
TQString KMFolder::idString() const
{
- KMFolderNode* folderNode = tqparent();
+ KMFolderNode* folderNode = parent();
if (!folderNode)
return "";
- while ( folderNode->tqparent() )
- folderNode = folderNode->tqparent();
+ while ( folderNode->parent() )
+ folderNode = folderNode->parent();
TQString myPath = path();
int pathLen = myPath.length() - folderNode->path().length();
TQString relativePath = myPath.right( pathLen );
@@ -890,7 +890,7 @@ void KMFolder::slotContentsTypeChanged( KMail::FolderContentsType type )
void KMFolder::slotFolderSizeChanged()
{
emit folderSizeChanged( this );
- KMFolder* papa = tqparent()->manager()->parentFolder( this );
+ KMFolder* papa = parent()->manager()->parentFolder( this );
if ( papa && papa != this ) {
papa->slotFolderSizeChanged();
}
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 67e77665..60db2666 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -74,9 +74,9 @@ public:
/**
* Constructs a new Folder object.
- * @param tqparent The directory in the folder storage hierarchy under which
+ * @param parent 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 tqparent directory, because
+ * @param name If name of the folder. In case there is no parent 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.
@@ -87,7 +87,7 @@ public:
* the global MsgDict for lookup.
* @return A new folder instance.
*/
- KMFolder( KMFolderDir* tqparent, const TQString& name,
+ KMFolder( KMFolderDir* parent, const TQString& name,
KMFolderType aFolderType, bool withIndex = true,
bool exportedSernums = true );
~KMFolder();
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index d23a6ea5..10dfff5a 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -102,10 +102,10 @@ static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString
return KMFolderCachedImap::IncForAdmins; // by default
}
-DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* tqparent,
+DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent,
const char* name )
: KDialogBase( Plain, i18n( "Troubleshooting IMAP Cache" ),
- Ok | Cancel, Cancel, tqparent, name, true ),
+ Ok | Cancel, Cancel, parent, name, true ),
rc( None )
{
TQFrame* page = plainPage();
@@ -239,13 +239,13 @@ void KMFolderCachedImap::reallyDoClose( const char* owner )
KMFolderMaildir::reallyDoClose( owner );
}
-void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* tqparent )
+void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent )
{
- setAccount( tqparent->account() );
+ setAccount( parent->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( tqparent->userRights(), tqparent->userRightsState() );
+ setUserRights( parent->userRights(), parent->userRightsState() );
}
void KMFolderCachedImap::readConfig()
@@ -2264,11 +2264,11 @@ void KMFolderCachedImap::listDirectory2()
}
if ( root && !mSubfolderNames.isEmpty() ) {
- KMFolderCachedImap* tqparent =
+ KMFolderCachedImap* parent =
findParent( mSubfolderPaths.first(), mSubfolderNames.first() );
- if ( tqparent ) {
+ if ( parent ) {
kdDebug(5006) << "KMFolderCachedImap::listDirectory2 - pass listing to "
- << tqparent->label() << endl;
+ << parent->label() << endl;
mSubfolderNames.clear();
}
}
@@ -2392,18 +2392,18 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue
KMFolderCachedImap* KMFolderCachedImap::findParent( const TQString& path,
const TQString& name )
{
- TQString tqparent = path.left( path.length() - name.length() - 2 );
- if ( tqparent.length() > 1 )
+ TQString parent = path.left( path.length() - name.length() - 2 );
+ if ( parent.length() > 1 )
{
- // extract name of the tqparent
- tqparent = tqparent.right( tqparent.length() - 1 );
- if ( tqparent != label() )
+ // extract name of the parent
+ parent = parent.right( parent.length() - 1 );
+ if ( parent != label() )
{
KMFolderNode *node = folder()->child()->first();
- // look for a better tqparent
+ // look for a better parent
while ( node )
{
- if ( node->name() == tqparent )
+ if ( node->name() == parent )
{
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).tqparent != folder() ) return; // Shouldn't happen
+ if ( (*it).parent != folder() ) return; // Shouldn't happen
if ( job->error() )
// Display error but don't abort the sync just for this
@@ -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()->tqparent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent()
+ if ( folder()->parent()->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.
mAnnotationFolderType = type;
- kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: tqparent folder is " << folder()->tqparent()->owner()->idString() << " => truncating annotation to " << value << endl;
+ kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: parent folder is " << folder()->parent()->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).tqparent == folder() );
- if ( (*it).tqparent != folder() ) return; // Shouldn't happen
+ Q_ASSERT( (*it).parent == folder() );
+ if ( (*it).parent != 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).tqparent == folder() );
- if ( (*it).tqparent != folder() ) return; // Shouldn't happen
+ Q_ASSERT( (*it).parent == folder() );
+ if ( (*it).parent != folder() ) return; // Shouldn't happen
TQValueVector<int> folders;
AnnotationJobs::MultiUrlGetAnnotationJob* annjob
@@ -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).tqparent == folder() );
- if ( (*it).tqparent != folder() ) return; // Shouldn't happen
+ Q_ASSERT( (*it).parent == folder() );
+ if ( (*it).parent != 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).tqparent == folder() );
- if ( (*it).tqparent != folder() ) return; // Shouldn't happen
+ Q_ASSERT( (*it).parent == folder() );
+ if ( (*it).parent != folder() ) return; // Shouldn't happen
mAccount->setAnnotationCheckPassed( true );
if ( job->error() ) {
@@ -2940,7 +2940,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
{
KMAcctCachedImap::JobIterator it = mAccount->findJob(job);
if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen
- if ( (*it).tqparent != folder() ) return; // Shouldn't happen
+ if ( (*it).parent != folder() ) return; // Shouldn't happen
bool cont = true;
if ( job->error() ) {
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 87c15f75..dfef783a 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -76,7 +76,7 @@ public:
RefreshCache
};
- DImapTroubleShootDialog( TQWidget* tqparent=0, const char* name=0 );
+ DImapTroubleShootDialog( TQWidget* parent=0, const char* name=0 );
static int run();
@@ -100,8 +100,8 @@ public:
return locateLocal("data", "kmail/dimap" );
}
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent 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();
@@ -110,7 +110,7 @@ public:
void reallyDoClose(const char* owner);
/** Initialize this storage from another one. Used when creating a child folder */
- void initializeFrom( KMFolderCachedImap* tqparent );
+ void initializeFrom( KMFolderCachedImap* parent );
virtual void readConfig();
virtual void writeConfig();
@@ -324,7 +324,7 @@ public:
/**
* Specify an imap path that is used to create the folder on the server
- * Otherwise the tqparent folder is used to construct the path
+ * Otherwise the parent folder is used to construct the path
*/
const TQString& imapPathForCreation() { return mImapPathCreation; }
void setImapPathForCreation( const TQString& path ) { mImapPathCreation = path; }
@@ -407,7 +407,7 @@ protected:
/* update progress status */
void newState( int progress, const TQString& synctqStatus );
- /** See if there is a better tqparent then this folder */
+ /** See if there is a better parent then this folder */
KMFolderCachedImap* findParent( const TQString& path, const TQString& name );
diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp
index 1135b25b..499d444f 100644
--- a/kmail/kmfoldercombobox.cpp
+++ b/kmail/kmfoldercombobox.cpp
@@ -8,8 +8,8 @@
//-----------------------------------------------------------------------------
-KMFolderComboBox::KMFolderComboBox( TQWidget *tqparent, char *name )
- : TQComboBox( tqparent, name )
+KMFolderComboBox::KMFolderComboBox( TQWidget *parent, char *name )
+ : TQComboBox( parent, name )
{
init();
}
@@ -17,8 +17,8 @@ KMFolderComboBox::KMFolderComboBox( TQWidget *tqparent, char *name )
//-----------------------------------------------------------------------------
-KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *tqparent, char *name )
- : TQComboBox( rw, tqparent, name )
+KMFolderComboBox::KMFolderComboBox( bool rw, TQWidget *parent, char *name )
+ : TQComboBox( rw, parent, name )
{
init();
}
diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h
index b5351902..7537c5af 100644
--- a/kmail/kmfoldercombobox.h
+++ b/kmail/kmfoldercombobox.h
@@ -17,8 +17,8 @@ class KMFolderComboBox : public TQComboBox
TQ_OBJECT
public:
- KMFolderComboBox( TQWidget *tqparent = 0, char *name = 0 );
- KMFolderComboBox( bool rw, TQWidget *tqparent = 0, char *name = 0 );
+ KMFolderComboBox( TQWidget *parent = 0, char *name = 0 );
+ KMFolderComboBox( bool rw, TQWidget *parent = 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 a7ebe5c1..d10e8cfa 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -105,7 +105,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir,
true, false, true, false);
if( mFolderDir ) {
- // search the tqparent folder of the folder
+ // search the parent folder of the folder
FolderList::ConstIterator it;
int i = 1;
for( it = folders.begin(); it != folders.end(); ++it, ++i ) {
@@ -234,9 +234,9 @@ void KMFolderDialog::setFolder( KMFolder* folder )
mFolder = folder;
}
-static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout )
+static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
{
- TQFrame *line = new TQFrame( tqparent, "line" );
+ TQFrame *line = new TQFrame( parent, "line" );
line->setGeometry( TQRect( 80, 150, 250, 20 ) );
line->setFrameShape( TQFrame::HLine );
line->setFrameShadow( TQFrame::Sunken );
@@ -247,8 +247,8 @@ static void addLine( TQWidget *tqparent, TQVBoxLayout* tqlayout )
//----------------------------------------------------------------------------
KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
const TQString& aName,
- TQWidget* tqparent, const char* name )
- : FolderDiaTab( tqparent, name ),
+ TQWidget* parent, const char* name )
+ : FolderDiaTab( parent, name ),
mSharedSeenFlagsCheckBox( 0 ),
mDlg( dlg )
{
@@ -294,20 +294,20 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
bool parentRightsOk = false;
bool folderRightsOk = false;
if ( imap ) {
- KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() );
+ KMFolderImap * const parent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() );
folderRights = imap->userRights();
folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok;
- if ( tqparent ) {
- parentRights = tqparent->userRights();
- parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok;
+ if ( parent ) {
+ parentRights = parent->userRights();
+ parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok;
}
} else if ( dimap ) {
- KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() );
+ KMFolderCachedImap * const parent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() );
folderRights = dimap->userRights();
folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok;
- if ( tqparent ) {
- parentRights = tqparent->userRights();
- parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok;
+ if ( parent ) {
+ parentRights = parent->userRights();
+ parentRightsOk = parent->userRightsState() == KMail::ACLJobs::Ok;
}
}
@@ -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 tqparent folder doesn't have write support.\n"
+ "The parent folder doesn't have write support.\n"
"A sync is needed after changing the permissions." ) );
}
mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
@@ -796,8 +796,8 @@ void FolderDiaGeneralTab::slotChangeIcon( TQString icon ) // can't use a const-r
//----------------------------------------------------------------------------
KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg,
- TQWidget* tqparent )
- : FolderDiaTab( tqparent, 0 ), mDlg( dlg )
+ TQWidget* parent )
+ : FolderDiaTab( parent, 0 ), mDlg( dlg )
{
mIsLocalSystemFolder = mDlg->folder()->isSystemFolder();
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 56436ece..230b4526 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -72,8 +72,8 @@ class FolderDiaTab : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- FolderDiaTab( TQWidget *tqparent=0, const char* name=0 )
- : TQWidget( tqparent, name ) {}
+ FolderDiaTab( TQWidget *parent=0, const char* name=0 )
+ : TQWidget( parent, name ) {}
virtual void load() = 0;
@@ -117,7 +117,7 @@ class FolderDiaGeneralTab : public FolderDiaTab
public:
FolderDiaGeneralTab( KMFolderDialog* dlg,
const TQString& aName,
- TQWidget* tqparent, const char* name = 0 );
+ TQWidget* parent, const char* name = 0 );
virtual void load();
virtual bool save();
@@ -167,7 +167,7 @@ class FolderDiaTemplatesTab : public FolderDiaTab
TQ_OBJECT
public:
- FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *tqparent );
+ FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent );
virtual void load();
virtual bool save();
@@ -203,7 +203,7 @@ class KMFolderDialog : public KDialogBase
public:
KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir,
- KMFolderTree* tqparent, const TQString& caption,
+ KMFolderTree* parent, const TQString& caption,
const TQString& name = TQString() );
KMFolder* folder() const { return mFolder; }
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 1fd5dcd5..77390e61 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -75,9 +75,9 @@ KMFolderMgr* KMFolderRootDir::manager() const
//=============================================================================
//=============================================================================
-KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* tqparent,
+KMFolderDir::KMFolderDir( KMFolder * owner, KMFolderDir* parent,
const TQString& name, KMFolderDirType dirType )
- : KMFolderNode( tqparent, name ), KMFolderNodeList(),
+ : KMFolderNode( parent, name ), KMFolderNodeList(),
mOwner( owner ), mDirType( dirType )
{
setAutoDelete( true );
@@ -129,9 +129,9 @@ TQString KMFolderDir::path() const
{
static TQString p;
- if (tqparent())
+ if (parent())
{
- p = tqparent()->path();
+ p = parent()->path();
p.append("/");
p.append(name());
}
@@ -155,8 +155,8 @@ TQString KMFolderDir::label() const
TQString KMFolderDir::prettyURL() const
{
TQString parentUrl;
- if ( tqparent() )
- parentUrl = tqparent()->prettyURL();
+ if ( parent() )
+ parentUrl = parent()->prettyURL();
if ( !parentUrl.isEmpty() )
return parentUrl + '/' + label();
else
@@ -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 tqparent folder, which can only happen with maildir-like folders
+ // without a parent folder, which can only happen with maildir-like folders
case KMStandardDir: return KMFolderTypeMaildir;
case KMImapDir: return KMFolderTypeImap;
@@ -354,7 +354,7 @@ KMFolderNode* KMFolderDir::hasNamedFolder(const TQString& aName)
//-----------------------------------------------------------------------------
KMFolderMgr* KMFolderDir::manager() const
{
- return tqparent()->manager();
+ return parent()->manager();
}
diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index b78e82e8..687f9563 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -18,7 +18,7 @@ class KMFolderDir: public KMFolderNode, public KMFolderNodeList
TQ_OBJECT
public:
- KMFolderDir( KMFolder * owner, KMFolderDir * tqparent = 0,
+ KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0,
const TQString& path = TQString(),
KMFolderDirType = KMStandardDir );
virtual ~KMFolderDir();
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 21fb82d1..05a7864d 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -153,14 +153,14 @@ KMMessage* KMFolderImap::getMsg(int idx)
KMAcctImap* KMFolderImap::account() const
{
if ( !mAccount ) {
- KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->tqparent() );
+ KMFolderDir *parentFolderDir = dynamic_cast<KMFolderDir*>( folder()->parent() );
if ( !parentFolderDir ) {
- kdWarning() << k_funcinfo << "No tqparent folder dir found for " << name() << endl;
+ kdWarning() << k_funcinfo << "No parent folder dir found for " << name() << endl;
return 0;
}
KMFolder *parentFolder = parentFolderDir->owner();
if ( !parentFolder ) {
- kdWarning() << k_funcinfo << "No tqparent folder found for " << name() << endl;
+ kdWarning() << k_funcinfo << "No parent folder found for " << name() << endl;
return 0;
}
KMFolderImap *parentStorage = dynamic_cast<KMFolderImap*>( parentFolder->storage() );
@@ -321,7 +321,7 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent )
//-----------------------------------------------------------------------------
void KMFolderImap::addMsgQuiet(KMMessage* aMsg)
{
- KMFolder *aFolder = aMsg->tqparent();
+ KMFolder *aFolder = aMsg->parent();
TQ_UINT32 serNum = 0;
aMsg->setTransferInProgress( false );
if (aFolder) {
@@ -351,7 +351,7 @@ void KMFolderImap::addMsgQuiet(TQPtrList<KMMessage> msgList)
mAddMessageProgressItem->setComplete();
mAddMessageProgressItem = 0;
}
- KMFolder *aFolder = msgList.first()->tqparent();
+ KMFolder *aFolder = msgList.first()->parent();
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 tqparent" << endl;
+ kdDebug(5006) << k_funcinfo << "no parent" << 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->tqparent();
+ KMFolder *msgParent = aMsg->parent();
ImapJob *imapJob = 0;
if (msgParent)
@@ -483,7 +483,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
imapJob = new ImapJob( msgList, TQString(), ImapJob::tPutMessage, this );
if ( !mAddMessageProgressItem && msgList.count() > 1 )
{
- // use a tqparent progress if we have more than 1 message
+ // use a parent 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 tqparent
+ // see if we have a better parent
// 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* tqparent = findParent( subfolderPaths.first(), subfolderNames.first() );
- if ( tqparent )
+ KMFolderImap* parent = findParent( subfolderPaths.first(), subfolderNames.first() );
+ if ( parent )
{
kdDebug(5006) << "KMFolderImap::slotListResult - pass listing to "
- << tqparent->label() << endl;
- tqparent->slotListResult( subfolderNames, subfolderPaths,
+ << parent->label() << endl;
+ parent->slotListResult( subfolderNames, subfolderPaths,
subfolderMimeTypes, subfolderAttributes, jobData );
// cleanup
TQStringList list;
@@ -914,18 +914,18 @@ void KMFolderImap::initInbox()
//-----------------------------------------------------------------------------
KMFolderImap* KMFolderImap::findParent( const TQString& path, const TQString& name )
{
- TQString tqparent = path.left( path.length() - name.length() - 2 );
- if ( tqparent.length() > 1 )
+ TQString parent = path.left( path.length() - name.length() - 2 );
+ if ( parent.length() > 1 )
{
- // extract name of the tqparent
- tqparent = tqparent.right( tqparent.length() - 1 );
- if ( tqparent != label() )
+ // extract name of the parent
+ parent = parent.right( parent.length() - 1 );
+ if ( parent != label() )
{
KMFolderNode *node = folder()->child()->first();
- // look for a better tqparent
+ // look for a better parent
while ( node )
{
- if ( node->name() == tqparent )
+ if ( node->name() == parent )
{
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* tqparent, TQString folderPath,
+void KMFolderImap::initializeFrom( KMFolderImap* parent, TQString folderPath,
TQString mimeType )
{
- setAccount( tqparent->account() );
+ setAccount( parent->account() );
setImapPath( folderPath );
setNoContent( mimeType == "inode/directory" );
setNoChildren( mimeType == "message/digest" );
@@ -1060,10 +1060,10 @@ void KMFolderImap::checkValidity()
}
// otherwise we already are inside a mailcheck
if ( !mMailCheckProgressItem ) {
- ProgressItem* tqparent = ( account()->checkingSingleFolder() ? 0 :
+ ProgressItem* parent = ( account()->checkingSingleFolder() ? 0 :
account()->mailCheckProgressItem() );
mMailCheckProgressItem = ProgressManager::createProgressItem(
- tqparent,
+ parent,
"MailCheck" + folder()->prettyURL(),
TQStyleSheet::escape( folder()->prettyURL() ),
i18n("checking"),
@@ -1327,7 +1327,7 @@ 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(), (*it).tqparent );
+ ImapAccountBase::jobData jd( TQString(), (*it).parent );
jd.total = (*it).items.count();
if (jd.total == 0)
{
@@ -1509,7 +1509,7 @@ void
KMFolderImap::ignoreJobsForMessage( KMMessage* msg )
{
if ( !msg || msg->transferInProgress() ||
- !msg->tqparent() || msg->tqparent()->folderType() != KMFolderTypeImap )
+ !msg->parent() || msg->parent()->folderType() != KMFolderTypeImap )
return;
KMAcctImap *account;
if ( !(account = static_cast<KMFolderImap*>(msg->storage())->account()) )
@@ -1721,15 +1721,15 @@ void KMFolderImap::slotGetMessagesResult(KIO::Job * job)
void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath,
bool askUser)
{
- kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",tqparent=" <<
+ kdDebug(5006) << "KMFolderImap::createFolder - name=" << name << ",parent=" <<
parentPath << ",askUser=" << askUser << endl;
if ( account()->makeConnection() != ImapAccountBase::Connected ) {
kdWarning(5006) << "KMFolderImap::createFolder - got no connection" << endl;
return;
}
KURL url = account()->getUrl();
- TQString tqparent = ( parentPath.isEmpty() ? imapPath() : parentPath );
- TQString path = account()->createImapPath( tqparent, name );
+ TQString parent = ( parentPath.isEmpty() ? imapPath() : parentPath );
+ TQString path = account()->createImapPath( parent, 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_tqparent = static_cast<KMFolderImap*>(msg->storage());
+ KMFolderImap *msg_parent = 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_tqparent->imapPath() + ";UID=" + TQString::number(uid) );
+ url.setPath(msg_parent->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_tqparent = static_cast<KMFolderImap*>(msgList.getFirst()->storage());
+ KMFolderImap *msg_parent = 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_tqparent->imapPath() + ";UID=" + uid);
+ url.setPath(msg_parent->imapPath() + ";UID=" + uid);
if ( account()->makeConnection() != ImapAccountBase::Connected )
return;
KIO::SimpleJob *job = KIO::file_delete(url, false);
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index f303325b..c7b31588 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -99,8 +99,8 @@ public:
virtual imapState getSubfolderState() { return mSubfolderState; }
virtual void setSubfolderState(imapState state);
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent 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();
@@ -321,7 +321,7 @@ public:
virtual bool isMoveable() const;
/** Initialize this storage from another one. Used when creating a child folder */
- void initializeFrom( KMFolderImap* tqparent, TQString path, TQString mimeType );
+ void initializeFrom( KMFolderImap* parent, TQString path, TQString mimeType );
/** Returns the IMAP flags that can be stored on the server. */
int permanentFlags() const { return mPermanentFlags; }
@@ -363,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* tqparent*/);
+ void copyMsg(TQPtrList<KMMessage>& msgList/*, KMFolder* parent*/);
/** Detach message from this folder. Usable to call addMsg() afterwards.
@@ -438,7 +438,7 @@ protected:
/** Create or find the INBOX and initialize it */
void initInbox();
- /** See if there is a better tqparent then this folder */
+ /** See if there is a better parent then this folder */
KMFolderImap* findParent( const TQString& path, const TQString& name );
/** See if all folders are still present on server, otherwise delete them */
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 28743c49..b0682ff0 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -39,7 +39,7 @@ 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::tqparent() can be a plain KMFolder
+ //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder
//rather than a KMFolderIndex. Need this for database indices.
friend class ::KMMsgBase;
public:
@@ -53,8 +53,8 @@ public:
IndexTooOld
};
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent 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();
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 8c54e3c2..8390de4f 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -375,7 +375,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
int rc;
// take message out of the folder it is currently in, if any
- msgParent = aMsg->tqparent();
+ msgParent = aMsg->parent();
if (msgParent)
{
if (msgParent==folder() && !kmkernel->folderIsDraftOrOutbox(folder()))
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 83cb0b68..ea02d9b1 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -27,8 +27,8 @@ class KMFolderMaildir : public KMFolderIndex
TQ_OBJECT
friend class ::KMail::MaildirJob;
public:
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent 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();
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index d77a8ae4..3aebc8f3 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -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->tqparent();
+ msgParent = aMsg->parent();
if (msgParent)
{
if ( msgParent== folder() )
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index cf887137..d3741144 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -52,8 +52,8 @@ class KMFolderMbox : public KMFolderIndex
public:
- /** Usually a tqparent is given. But in some cases there is no
- fitting tqparent object available. Then the name of the folder
+ /** Usually a parent is given. But in some cases there is no
+ fitting parent 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();
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index e66e7776..c4df4904 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -368,17 +368,17 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder)
KMFolder* KMFolderMgr::parentFolder( KMFolder* folder )
{
- // find the tqparent folder by stripping "." and ".directory" from the name
- KMFolderDir* fdir = folder->tqparent();
+ // 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* tqparent = fdir->hasNamedFolder( parentName );
- if ( !tqparent && fdir->tqparent() ) // dimap obviously has a different structure
- tqparent = fdir->tqparent()->hasNamedFolder( parentName );
+ KMFolderNode* parent = fdir->hasNamedFolder( parentName );
+ if ( !parent && fdir->parent() ) // dimap obviously has a different structure
+ parent = fdir->parent()->hasNamedFolder( parentName );
KMFolder* parentF = 0;
- if ( tqparent )
- parentF = dynamic_cast<KMFolder*>( tqparent );
+ if ( parent )
+ parentF = dynamic_cast<KMFolder*>( parent );
return parentF;
}
@@ -389,7 +389,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
return;
}
- KMFolderDir* fdir = aFolder->tqparent();
+ KMFolderDir* fdir = aFolder->parent();
KMFolderNode* fN;
for (fN = fdir->first(); fN != 0; fN = fdir->next()) {
if (fN->isDir() && (fN->name() == "." + aFolder->fileName() + ".directory")) {
@@ -400,7 +400,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
KMFolder* parentF = parentFolder( aFolder );
// aFolder will be deleted by the next call!
- aFolder->tqparent()->remove(aFolder);
+ aFolder->parent()->remove(aFolder);
// update the tqchildren state
if ( parentF )
@@ -411,10 +411,10 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
}
}
else
- kdWarning(5006) << "Can not find tqparent folder" << endl;
+ kdWarning(5006) << "Can not find parent folder" << endl;
if (aFolder == mRemoveOrig) {
- // call only if we're removing the original tqparent folder
+ // call only if we're removing the original parent folder
contentsChanged();
mRemoveOrig = 0;
}
@@ -425,7 +425,7 @@ void KMFolderMgr::removeDirAux(KMFolderDir* aFolderDir)
TQDir dir;
TQString folderDirLocation = aFolderDir->path();
aFolderDir->clear();
- aFolderDir->tqparent()->remove(aFolderDir);
+ aFolderDir->parent()->remove(aFolderDir);
dir.rmdir(folderDirLocation);
}
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index 01009347..2a0808bb 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -122,7 +122,7 @@ public:
/** Copy a folder */
void copyFolder( KMFolder* folder, KMFolderDir* newParent );
- /** Returns the tqparent Folder for the given folder or 0 on failure. */
+ /** Returns the parent Folder for the given folder or 0 on failure. */
KMFolder* parentFolder( KMFolder* folder );
public slots:
diff --git a/kmail/kmfoldernode.cpp b/kmail/kmfoldernode.cpp
index e8ba86f5..fee6c2a2 100644
--- a/kmail/kmfoldernode.cpp
+++ b/kmail/kmfoldernode.cpp
@@ -7,9 +7,9 @@
#include "kmfolderdir.h"
//-----------------------------------------------------------------------------
-KMFolderNode::KMFolderNode( KMFolderDir * tqparent, const TQString & name )
+KMFolderNode::KMFolderNode( KMFolderDir * parent, const TQString & name )
: mName( name ),
- mParent( tqparent ),
+ mParent( parent ),
mDir( false ),
mId( 0 )
{
@@ -31,7 +31,7 @@ bool KMFolderNode::isDir(void) const
//-----------------------------------------------------------------------------
TQString KMFolderNode::path() const
{
- if (tqparent()) return tqparent()->path();
+ if (parent()) return parent()->path();
return TQString();
}
@@ -42,7 +42,7 @@ TQString KMFolderNode::label(void) const
}
//-----------------------------------------------------------------------------
-KMFolderDir* KMFolderNode::tqparent(void) const
+KMFolderDir* KMFolderNode::parent(void) const
{
return mParent;
}
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index a3bb03c3..aec47e3b 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -32,7 +32,7 @@ class KMFolderNode: public TQObject
TQ_OBJECT
public:
- KMFolderNode( KMFolderDir * tqparent, const TQString & name );
+ KMFolderNode( KMFolderDir * parent, const TQString & name );
virtual ~KMFolderNode();
/** Is it a directory where mail folders are stored or is it a folder that
@@ -44,12 +44,12 @@ public:
/** Returns ptr to owning directory object or 0 if none. This
is just a wrapper for convenient access. */
- KMFolderDir* tqparent(void) const ;
+ KMFolderDir* parent(void) const ;
void setParent( KMFolderDir* aParent );
- // { return (KMFolderDir*)KMFolderNodeInherited::tqparent(); }
+ // { return (KMFolderDir*)KMFolderNodeInherited::parent(); }
/** Returns full path to the directory where this node is stored or 0
- if the node has no tqparent. Example: if this object represents a folder
+ if the node has no parent. 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 d2345dce..819d5ff8 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -69,8 +69,8 @@
#define IDS_SEARCH_HEADER_LEN 30
-KMSearch::KMSearch(TQObject * tqparent, const char * name)
- :TQObject(tqparent, name)
+KMSearch::KMSearch(TQObject * parent, const char * name)
+ :TQObject(parent, name)
{
mRemainingFolders = -1;
mRecursive = true;
@@ -135,11 +135,11 @@ bool KMSearch::inScope(KMFolder* folder) const
return false;
KMFolderDir *rootDir = mRoot->child();
- KMFolderDir *ancestorDir = folder->tqparent();
+ KMFolderDir *ancestorDir = folder->parent();
while ( ancestorDir ) {
if ( ancestorDir == rootDir )
return true;
- ancestorDir = ancestorDir->tqparent();
+ ancestorDir = ancestorDir->parent();
}
return false;
}
@@ -688,7 +688,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg )
this folder via the inherited method, then clear the imap ones. */
FolderStorage::ignoreJobsForMessage( msg );
- if (msg->tqparent()->folderType() == KMFolderTypeImap) {
+ if (msg->parent()->folderType() == KMFolderTypeImap) {
KMAcctImap *account =
static_cast<KMFolderImap*>( msg->storage() )->account();
if( !account )
@@ -787,7 +787,7 @@ int KMFolderSearch::writeIndex( bool )
DwString KMFolderSearch::getDwString(int idx)
{
- return getMsgBase(idx)->tqparent()->getDwString( idx );
+ return getMsgBase(idx)->parent()->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->tqparent()->find(msg), msg);
+ return msg->storage()->setIndexEntry(msg->parent()->find(msg), msg);
}
void KMFolderSearch::clearIndex(bool, bool)
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index 728eb684..3dc9462e 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -55,7 +55,7 @@ class KMSearch: public TQObject
TQ_OBJECT
public:
- KMSearch(TQObject * tqparent = 0, const char * name = 0);
+ KMSearch(TQObject * parent = 0, const char * name = 0);
~KMSearch();
bool write(TQString location) const;
diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp
index b1df389a..fd841ae6 100644
--- a/kmail/kmfolderseldlg.cpp
+++ b/kmail/kmfolderseldlg.cpp
@@ -18,16 +18,16 @@
using namespace KMail;
//-----------------------------------------------------------------------------
-KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption,
+KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * parent, const TQString& caption,
bool mustBeReadWrite, bool useGlobalSettings )
- : KDialogBase( tqparent, "folder dialog", true, caption,
+ : KDialogBase( parent, "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 tqparent, modal
+ ), // mainwin as parent, modal
mUseGlobalSettings( useGlobalSettings )
{
- KMFolderTree * ft = tqparent->folderTree();
+ KMFolderTree * ft = parent->folderTree();
assert( ft );
TQString preSelection = mUseGlobalSettings ?
@@ -40,13 +40,13 @@ KMFolderSelDlg::KMFolderSelDlg( KMMainWidget * tqparent, const TQString& caption
}
//----------------------------------------------------------------------------
-KMFolderSelDlg::KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree,
+KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree,
const TQString& caption, bool mustBeReadWrite, bool useGlobalSettings )
- : KDialogBase( tqparent, "folder dialog", true, caption,
+ : KDialogBase( parent, "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 tqparent, modal
+ ), // mainwin as parent, modal
mUseGlobalSettings( useGlobalSettings )
{
TQString preSelection = mUseGlobalSettings ?
diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h
index 81bdd7eb..edc5f6a7 100644
--- a/kmail/kmfolderseldlg.h
+++ b/kmail/kmfolderseldlg.h
@@ -26,13 +26,13 @@ namespace KMail {
public:
/**
* Constructor with KMMainWidget
- * @p tqparent @em must be a KMMainWin, because we
+ * @p parent @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 * tqparent, const TQString& caption,
+ KMFolderSelDlg( KMMainWidget * parent, const TQString& caption,
bool mustBeReadWrite, bool useGlobalSettings = true );
/**
* Constructor with separate KMFolderTree
@@ -40,7 +40,7 @@ namespace KMail {
* @param useGlobalSettings if true, the current folder is read and
* written to GlobalSettings
*/
- KMFolderSelDlg( TQWidget * tqparent, KMFolderTree * tree,
+ KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree,
const TQString& caption, bool mustBeReadWrite,
bool useGlobalSettings = true );
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 6a280856..aef19abe 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -51,10 +51,10 @@ using namespace KPIM;
//=============================================================================
-KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
+KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name,
KFolderTreeItem::Protocol protocol )
- : TQObject( tqparent, name.latin1() ),
- KFolderTreeItem( tqparent, name, protocol, Root ),
+ : TQObject( parent, name.latin1() ),
+ KFolderTreeItem( parent, name, protocol, Root ),
mFolder( 0 ), mNeedsRepaint( true )
{
init();
@@ -62,10 +62,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name
}
//-----------------------------------------------------------------------------
-KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
+KMFolderTreeItem::KMFolderTreeItem( KFolderTree *parent, const TQString & name,
KMFolder* folder )
- : TQObject( tqparent, name.latin1() ),
- KFolderTreeItem( tqparent, name ),
+ : TQObject( parent, name.latin1() ),
+ KFolderTreeItem( parent, name ),
mFolder( folder ), mNeedsRepaint( true )
{
init();
@@ -73,10 +73,10 @@ KMFolderTreeItem::KMFolderTreeItem( KFolderTree *tqparent, const TQString & name
}
//-----------------------------------------------------------------------------
-KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *tqparent, const TQString & name,
+KMFolderTreeItem::KMFolderTreeItem( KFolderTreeItem *parent, const TQString & name,
KMFolder* folder )
: TQObject( 0, name.latin1() ),
- KFolderTreeItem( tqparent, name ),
+ KFolderTreeItem( parent, name ),
mFolder( folder ), mNeedsRepaint( true )
{
init();
@@ -373,9 +373,9 @@ void KMFolderTreeItem::updateCount()
//=============================================================================
-KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent,
+KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent,
const char *name )
- : KMail::FolderTreeBase( mainWidget, tqparent, name )
+ : KMail::FolderTreeBase( mainWidget, parent, 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* tqparent )
+void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
{
for ( KMFolderNode * node = fdir->first() ; node ; node = fdir->next() ) {
if ( node->isDir() )
@@ -720,7 +720,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent )
KMFolder * folder = static_cast<KMFolder*>(node);
KMFolderTreeItem * fti = 0;
- if (!tqparent)
+ if (!parent)
{
// create new root-item, but only if this is not the root of a
// "groupware folders only" account
@@ -742,7 +742,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent )
}
// create new child
- fti = new KMFolderTreeItem( tqparent, folder->label(), folder );
+ fti = new KMFolderTreeItem( parent, 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
@@ -757,7 +757,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* tqparent )
addDirectory( folder->child(), fti );
}
- // Check if this is an IMAP resource folder or a no-content tqparent only
+ // Check if this is an IMAP resource folder or a no-content parent 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 * tqparent = fti->tqparent() ; tqparent ; tqparent = tqparent->tqparent() )
- tqparent->setOpen( true );
+ for ( TQListViewItem * parent = fti->parent() ; parent ; parent = parent->parent() )
+ parent->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->tqparent())))
+ && !fti->parent())))
{
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->tqparent() && !multiFolder)
+ if (fti->folder() && fti->parent() && !multiFolder)
{
folderMenu->insertItem(SmallIconSet("configure_shortcuts"),
i18n("&Assign Shortcut..."),
@@ -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 * tqparent )
+void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent )
{
KMFolder *aFolder = folder;
if ( !aFolder ) {
@@ -1286,8 +1286,8 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * tqparent )
}
}
- if ( tqparent )
- ( new KMail::NewFolderDialog( tqparent, aFolder ) )->exec();
+ if ( parent )
+ ( new KMail::NewFolderDialog( parent, aFolder ) )->exec();
else
( new KMail::NewFolderDialog( this, aFolder ) )->show();
return;
@@ -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 tqparent, set fti to 0 so nothing is done
- if (source == fti->folder() || source->tqparent()->owner() == fti->folder()) fti = 0;
+ // 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 (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->tqparent() ) )
+ fti->parent() ) )
return;
if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation )
{
// check if all parents are expanded
- TQListViewItem *tqparent = item->tqparent();
- while ( tqparent )
+ TQListViewItem *parent = item->parent();
+ while ( parent )
{
- if ( !tqparent->isOpen() )
+ if ( !parent->isOpen() )
return;
- tqparent = tqparent->tqparent();
+ parent = parent->parent();
}
// the tree will be reloaded after that
bool success = folder->listDirectory();
if (!success) fti->setOpen( false );
- if ( fti->childCount() == 0 && fti->tqparent() )
+ if ( fti->childCount() == 0 && fti->parent() )
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* tqparent = &(kmkernel->folderMgr()->dir());
+ KMFolderDir* parent = &(kmkernel->folderMgr()->dir());
if ( destination )
- tqparent = destination->createChildFolder();
+ parent = destination->createChildFolder();
TQStringList sourceFolderNames;
@@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
if ( source )
sourceFolderName = source->label();
- if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) {
+ if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( 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>")
.tqarg( sourceFolderName ) );
setDragEnabled( true );
@@ -2002,19 +2002,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
setDragEnabled( true );
return;
}
- if ( f->tqparent() )
- f = f->tqparent()->owner();
+ if ( f->parent() )
+ f = f->parent()->owner();
}
TQString message =
i18n( "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>" ).
arg( sourceFolderName );
- KMFolderDir* folderDir = tqparent;
+ KMFolderDir* folderDir = parent;
// check that the folder can be moved
if ( source && source->child() )
{
while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) &&
- ( folderDir != source->tqparent() ) )
+ ( folderDir != source->parent() ) )
{
if ( folderDir->findRef( source ) != -1 )
{
@@ -2022,19 +2022,19 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
setDragEnabled( true );
return;
}
- folderDir = folderDir->tqparent();
+ folderDir = folderDir->parent();
}
}
- if( source && source->child() && tqparent &&
- ( tqparent->path().find( source->child()->path() + "/" ) == 0 ) ) {
+ if( source && source->child() && parent &&
+ ( parent->path().find( source->child()->path() + "/" ) == 0 ) ) {
KMessageBox::error( this, message );
setDragEnabled( true );
return;
}
if( source && source->child()
- && ( tqparent == source->child() ) ) {
+ && ( parent == source->child() ) ) {
KMessageBox::error( this, message );
setDragEnabled( true );
return;
@@ -2049,14 +2049,14 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
for ( TQValueList<TQGuardedPtr<KMFolder> >::ConstIterator it2 = sources.constBegin(); it2 != sources.constEnd(); ++it2 ) {
if ( *it == *it2 )
continue;
- KMFolderDir *childDir = (*it2)->tqparent();
+ KMFolderDir *childDir = (*it2)->parent();
do {
if ( parentDir == childDir || parentDir->findRef( childDir->owner() ) != -1 ) {
KMessageBox::error( this, i18n("Moving the selected folders is not possible") );
setDragEnabled( true );
return;
}
- childDir = childDir->tqparent();
+ childDir = childDir->parent();
}
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, tqparent );
+ kmkernel->folderMgr()->moveFolder( source, parent );
} else {
- kmkernel->folderMgr()->copyFolder( source, tqparent );
+ kmkernel->folderMgr()->copyFolder( source, parent );
}
}
}
@@ -2085,7 +2085,7 @@ TQDragObject * KMFolderTree::dragObject()
{
KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>
(itemAt(viewport()->mapFromGlobal(TQCursor::pos())));
- if ( !item || !item->tqparent() || !item->folder() ) // top-level items or something invalid
+ if ( !item || !item->parent() || !item->folder() ) // top-level items or something invalid
return 0;
mCopySourceFolders = selectedFolders();
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 73704df4..f953f029 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -48,15 +48,15 @@ class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
TQ_OBJECT
public:
/** Construct a root item _without_ folder */
- KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
+ KMFolderTreeItem( KFolderTree *parent, const TQString & name,
KFolderTreeItem::Protocol protocol=KFolderTreeItem::NONE );
/** Construct a root item _with_ folder */
- KMFolderTreeItem( KFolderTree *tqparent, const TQString & name,
+ KMFolderTreeItem( KFolderTree *parent, const TQString & name,
KMFolder* folder );
/** Construct a child item */
- KMFolderTreeItem( KFolderTreeItem* tqparent, const TQString & name,
+ KMFolderTreeItem( KFolderTreeItem* parent, const TQString & name,
KMFolder* folder );
virtual ~KMFolderTreeItem();
@@ -68,7 +68,7 @@ public:
/** associated folder */
KMFolder* folder() const { return mFolder; }
- TQListViewItem* tqparent() const { return KFolderTreeItem::tqparent(); }
+ TQListViewItem* parent() const { return KFolderTreeItem::parent(); }
/** Adjust the unread count from the folder and update the
* pixmaps accordingly. */
@@ -112,14 +112,14 @@ class KMFolderTree : public KMail::FolderTreeBase
TQ_OBJECT
public:
- KMFolderTree( KMMainWidget *mainWidget, TQWidget *tqparent=0,
+ KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=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* tqparent );
+ virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent );
/** create a folderlist */
void createFolderList( TQStringList *str,
@@ -226,7 +226,7 @@ public slots:
void slotResetFolderList( TQListViewItem* item = 0, bool startList = true );
/** Create a child folder */
- void addChildFolder( KMFolder *folder = 0, TQWidget * tqparent = 0 );
+ void addChildFolder( KMFolder *folder = 0, TQWidget * parent = 0 );
/** Copies the currently selected folder. */
void copyFolder();
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index d8c30d07..9d721e9d 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -92,9 +92,9 @@ TQPixmap* KMHeaders::pixReadFwdReplied = 0;
//-----------------------------------------------------------------------------
-KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *tqparent,
+KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
const char *name) :
- KListView( tqparent, name ),
+ KListView( parent, name ),
mIgnoreSortOrderChanges( false )
{
static bool pixmapsLoaded = false;
@@ -920,26 +920,26 @@ void KMHeaders::msgAdded(int id)
msgId = "";
TQString replyToId = mFolder->getMsgBase(id)->replyToIdMD5();
- 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
+ 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
// 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(tqparent->item()->msgId())->replyToIdMD5()
- || msgId == mFolder->getMsgBase(tqparent->item()->msgId())->replyToAuxIdMD5())
- tqparent = NULL;
+ if (msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToIdMD5()
+ || msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToAuxIdMD5())
+ parent = NULL;
}
}
- if (tqparent && mFolder->getMsgBase(tqparent->id())->isWatched())
+ if (parent && mFolder->getMsgBase(parent->id())->isWatched())
mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched );
- else if (tqparent && mFolder->getMsgBase(tqparent->id())->isIgnored())
+ else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored );
- if (tqparent)
- hi = new HeaderItem( tqparent->item(), id );
+ if (parent)
+ hi = new HeaderItem( parent->item(), id );
else
hi = new HeaderItem( this, id );
@@ -955,7 +955,7 @@ void KMHeaders::msgAdded(int id)
mSortCacheItems.replace(msgId, sci);
/* Add to the list of potential parents for subject threading. But only if
* we are top level. */
- if (mSubjThreading && tqparent) {
+ if (mSubjThreading && parent) {
TQString subjMD5 = mFolder->getMsgBase(id)->strippedSubjectMD5();
if (subjMD5.isEmpty()) {
mFolder->getMsgBase(id)->initStrippedSubjectMD5();
@@ -977,7 +977,7 @@ void KMHeaders::msgAdded(int id)
sci->setSubjectThreadingList( mSubjectLists[subjMD5] );
}
}
- // The message we just added might be a better tqparent for one of the as of
+ // The message we just added might be a better parent 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
@@ -1017,8 +1017,8 @@ void KMHeaders::msgAdded(int id)
TQListViewItem *newParent = mItems[id];
TQListViewItem *msg = mItems[tryMe];
- if (msg->tqparent())
- msg->tqparent()->takeItem(msg);
+ if (msg->parent())
+ msg->parent()->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 tqparent
+ // The item was imperfectly thread before, now it's parent
// is there. Update the .sorted file accordingly.
TQString sortFile = KMAIL_SORT_FILE(mFolder);
FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+");
@@ -1115,12 +1115,12 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() )
removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() );
- // Retqparent tqchildren of item.
+ // Reparent tqchildren of item.
TQListViewItem *myParent = removedItem;
TQListViewItem *myChild = myParent->firstChild();
TQListViewItem *threadRoot = myParent;
- while (threadRoot->tqparent())
- threadRoot = threadRoot->tqparent();
+ while (threadRoot->parent())
+ threadRoot = threadRoot->parent();
TQString key = static_cast<HeaderItem*>(threadRoot)->key(mSortCol, !mSortDescending);
TQPtrList<TQListViewItem> childList;
@@ -1148,25 +1148,25 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
TQListViewItem *lvi = *it;
HeaderItem *item = static_cast<HeaderItem*>(lvi);
SortCacheItem *sci = item->sortCacheItem();
- SortCacheItem *tqparent = findParent( sci );
- if ( !tqparent && mSubjThreading )
- tqparent = findParentBySubject( sci );
+ SortCacheItem *parent = findParent( sci );
+ if ( !parent && mSubjThreading )
+ parent = findParentBySubject( sci );
- Q_ASSERT( !tqparent || tqparent->item() != removedItem );
+ Q_ASSERT( !parent || parent->item() != removedItem );
myParent->takeItem(lvi);
- if ( tqparent && tqparent->item() != item && tqparent->item() != removedItem ) {
- tqparent->item()->insertItem(lvi);
- tqparent->addSortedChild( sci );
+ if ( parent && parent->item() != item && parent->item() != removedItem ) {
+ parent->item()->insertItem(lvi);
+ parent->addSortedChild( sci );
} else {
insertItem(lvi);
mRoot->addSortedChild( sci );
}
- if ((!tqparent || sci->isImperfectlyThreaded())
+ if ((!parent || sci->isImperfectlyThreaded())
&& !mImperfectlyThreadedList.containsRef(item))
mImperfectlyThreadedList.append(item);
- if (tqparent && !sci->isImperfectlyThreaded()
+ if (parent && !sci->isImperfectlyThreaded()
&& mImperfectlyThreadedList.containsRef(item))
mImperfectlyThreadedList.removeRef(item);
}
@@ -1242,8 +1242,8 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const
// ...find the top-level item:
TQListViewItem *topOfThread = curItem;
- while ( topOfThread->tqparent() )
- topOfThread = topOfThread->tqparent();
+ while ( topOfThread->parent() )
+ topOfThread = topOfThread->parent();
// collect the items in this thread:
TQPtrList<TQListViewItem> list;
@@ -1266,8 +1266,8 @@ void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle)
if (item->isSelected() ) {
// ...find the top-level item:
TQListViewItem *top = item;
- while ( top->tqparent() )
- top = top->tqparent();
+ while ( top->parent() )
+ top = top->parent();
if (!topOfThreads.contains(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->tqparent()) { // unGet this msg
+ if (msg->parent()) { // unGet this msg
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->tqparent() ); assert( idx >= 0 );
+ assert( p == msg->parent() ); 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 tqparent of currentItem().
+ // find top-level parent of currentItem().
TQListViewItem *item = currentItem();
if ( !item ) return;
clearSelection();
item->setSelected( true );
- while ( item->tqparent() )
- item = item->tqparent();
+ while ( item->parent() )
+ item = item->parent();
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->tqparent() )
- item = item->tqparent();
+ while ( item->parent() )
+ item = item->parent();
setCurrentMsg( static_cast<HeaderItem*>(item)->msgId() );
}
}
@@ -1713,7 +1713,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected )
if ( item->isVisible() )
KListView::setSelected( item, selected );
- // If the item is the tqparent of a closed thread recursively select
+ // If the item is the parent of a closed thread recursively select
// tqchildren .
if ( isThreaded() && !item->isOpen() && item->firstChild() ) {
TQListViewItem *nextRoot = item->itemBelow();
@@ -1826,7 +1826,7 @@ void KMHeaders::selectNextMessage()
if (lvi && below ) {
while (temp) {
temp->firstChild();
- temp = temp->tqparent();
+ temp = temp->parent();
}
lvi->tqrepaint();
/* test to see if we need to unselect messages on back track */
@@ -1864,7 +1864,7 @@ void KMHeaders::selectPrevMessage()
if (lvi && above) {
while (temp) {
temp->firstChild();
- temp = temp->tqparent();
+ temp = temp->parent();
}
lvi->tqrepaint();
/* test to see if we need to unselect messages on back track */
@@ -2000,8 +2000,8 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept
// root and recursively sort all of that ancestors tqchildren.
if (item) {
TQListViewItem *next = item;
- while (next->tqparent())
- next = next->tqparent();
+ while (next->parent())
+ next = next->parent();
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->tqparent();
+ next = next->parent();
if (next == item)
break;
if (next && next->nextSibling()) {
@@ -2288,7 +2288,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
&& ( mPressPos.x() >= header()->cellPos( header()->mapToActual( 0 ) ) );
if ( rootDecoClicked ) {
- // Check if our item is the tqparent of a closed thread and if so, if the root
+ // Check if our item is the parent 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 tqchildren, so opening the thread
// doesn't cause a flicker.
@@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
}
if ( rootDecoClicked ) {
- // select the thread's tqchildren after closing if the tqparent is selected
+ // select the thread's tqchildren after closing if the parent is selected
if ( lvi && !lvi->isOpen() && lvi->isSelected() )
setSelected( lvi, true );
}
@@ -2324,12 +2324,12 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
if ( lvi != currentItem() )
highlightMessage( lvi );
/* Explicitely set selection state. This is necessary because we want to
- * also select all tqchildren of closed threads when the tqparent is selected. */
+ * also select all tqchildren of closed threads when the parent is selected. */
- // unless ctrl tqmask, set selected if it isn't already
+ // unless ctrl mask, set selected if it isn't already
if ( !( e->state() & ControlButton ) && !wasSelected )
setSelected( lvi, true );
- // if ctrl tqmask, toggle selection
+ // if ctrl mask, toggle selection
if ( e->state() & ControlButton )
setSelected( lvi, !wasSelected );
@@ -2768,7 +2768,7 @@ bool KMHeaders::writeSortOrder()
KMMsgBase *kmb;
while(HeaderItem *i = items.pop()) {
- int parent_id = -1; //no tqparent, top level
+ int parent_id = -1; //no parent, top level
if (threaded) {
kmb = mFolder->getMsgBase( i->msgId() );
assert(kmb); // I have seen 0L come out of this, called from
@@ -2782,7 +2782,7 @@ bool KMHeaders::writeSortOrder()
if (p)
parent_id = p->id();
- // We now have either found a tqparent, or set it to -1, which means that
+ // We now have either found a parent, 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
@@ -2792,7 +2792,7 @@ bool KMHeaders::writeSortOrder()
&& !kmb->subjectIsPrefixed() )
parent_id = -2;
// FIXME also mark messages with -1 as -2 a certain amount of time after
- // their arrival, since it becomes very unlikely that a new tqparent for
+ // their arrival, since it becomes very unlikely that a new parent for
// them will show up. (Ingo suggests a month.) -till
}
internalWriteItem(sortStream, mFolder, i->msgId(), parent_id,
@@ -2828,13 +2828,13 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
{
TQString sortFile = KMAIL_SORT_FILE(mFolder);
if(FILE *sortStream = fopen(TQFile::encodeName(sortFile), "r+")) {
- int parent_id = -1; //no tqparent, top level
+ int parent_id = -1; //no parent, top level
if (isThreaded()) {
SortCacheItem *sci = khi->sortCacheItem();
KMMsgBase *kmb = mFolder->getMsgBase( khi->msgId() );
- if(sci->tqparent() && !sci->isImperfectlyThreaded())
- parent_id = sci->tqparent()->id();
+ if(sci->parent() && !sci->isImperfectlyThreaded())
+ parent_id = sci->parent()->id();
else if(kmb->replyToIdMD5().isEmpty()
&& kmb->replyToAuxIdMD5().isEmpty()
&& !kmb->subjectIsPrefixed())
@@ -2872,7 +2872,7 @@ void KMHeaders::dirtySortOrder(int column)
// -----------------
void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder,
- bool waiting_for_tqparent, bool update_discover)
+ bool waiting_for_parent, bool update_discover)
{
if(mSortOffset == -1) {
fseek(sortStream, 0, SEEK_END);
@@ -2882,7 +2882,7 @@ void SortCacheItem::updateSortFile( FILE *sortStream, KMFolder *folder,
}
int parent_id = -1;
- if(!waiting_for_tqparent) {
+ if(!waiting_for_parent) {
if(mParent && !isImperfectlyThreaded())
parent_id = mParent->id();
}
@@ -2931,9 +2931,9 @@ void KMHeaders::printThreadingTree()
}
for (int i = 0; i < (int)mItems.size(); ++i) {
HeaderItem *item = mItems[i];
- int parentCacheId = item->sortCacheItem()->tqparent()?item->sortCacheItem()->tqparent()->id():0;
- kdDebug( 5006 ) << "SortCacheItem: " << item->sortCacheItem()->id() << " tqparent: " << parentCacheId << endl;
- kdDebug( 5006 ) << "Item: " << item << " sortCache: " << item->sortCacheItem() << " tqparent: " << item->sortCacheItem()->tqparent() << endl;
+ 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;
}
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]->tqparent()
- && sortCache[x]->tqparent()->id() != -666 ) continue;
+ if ( sortCache[x]->parent()
+ && sortCache[x]->parent()->id() != -666 ) continue;
KMMsgBase *mi = mFolder->getMsgBase(x);
TQString subjMD5 = mi->strippedSubjectMD5();
if (subjMD5.isEmpty()) {
@@ -2996,19 +2996,19 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray<SortCacheItem *> sortCache
SortCacheItem* KMHeaders::findParent(SortCacheItem *item)
{
- SortCacheItem *tqparent = NULL;
- if (!item) return tqparent;
+ SortCacheItem *parent = NULL;
+ if (!item) return parent;
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()) {
- tqparent = mSortCacheItems[replyToIdMD5];
- if (tqparent)
+ parent = mSortCacheItems[replyToIdMD5];
+ if (parent)
item->setImperfectlyThreaded(false);
}
- if (!tqparent) {
+ if (!parent) {
// 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
@@ -3017,15 +3017,15 @@ SortCacheItem* KMHeaders::findParent(SortCacheItem *item)
// contains the second to last one.
TQString ref = msg->replyToAuxIdMD5();
if (!ref.isEmpty())
- tqparent = mSortCacheItems[ref];
+ parent = mSortCacheItems[ref];
}
- return tqparent;
+ return parent;
}
SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item)
{
- SortCacheItem *tqparent = NULL;
- if (!item) return tqparent;
+ SortCacheItem *parent = NULL;
+ if (!item) return parent;
KMMsgBase *msg = mFolder->getMsgBase(item->id());
@@ -3033,7 +3033,7 @@ 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 tqparent;
+ return parent;
TQString replyToIdMD5 = msg->replyToIdMD5();
TQString subjMD5 = msg->strippedSubjectMD5();
@@ -3043,7 +3043,7 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item)
for (TQPtrListIterator<SortCacheItem> it2(*mSubjectLists[subjMD5]);
it2.current(); ++it2) {
KMMsgBase *mb = mFolder->getMsgBase((*it2)->id());
- if ( !mb ) return tqparent;
+ if ( !mb ) return parent;
// make sure it's not ourselves
if ( item == (*it2) ) continue;
int delta = msg->date() - mb->date();
@@ -3052,12 +3052,12 @@ SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item)
if (delta > 0 ) {
// Don't use parents more than 6 weeks older than us.
if (delta < 3628899)
- tqparent = (*it2);
+ parent = (*it2);
break;
}
}
}
- return tqparent;
+ return parent;
}
bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
@@ -3118,7 +3118,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
SortCacheItem *item;
unsigned long serNum, parentSerNum;
- int id, len, tqparent, x;
+ int id, len, parent, x;
TQChar *tmp_qchar = 0;
int tmp_qchar_len = 0;
const int mFolderCount = mFolder->count();
@@ -3158,14 +3158,14 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
continue;
}
if (parentSerNum < KMAIL_RESERVED) {
- tqparent = (int)parentSerNum - KMAIL_RESERVED;
+ parent = (int)parentSerNum - KMAIL_RESERVED;
} else {
- KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &tqparent);
+ KMMsgDict::instance()->getLocation(parentSerNum - KMAIL_RESERVED, &folder, &parent);
if (folder != mFolder)
- tqparent = -1;
+ parent = -1;
}
if ((id < 0) || (id >= mFolderCount) ||
- (tqparent < -2) || (tqparent >= mFolderCount)) { // sanity checking
+ (parent < -2) || (parent >= 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 && tqparent != -2) {
- if(tqparent == -1) {
+ if (threaded && parent != -2) {
+ if(parent == -1) {
unparented.append(item);
mRoot->addUnsortedChild(item);
} else {
- if( ! sortCache[tqparent] ) {
- sortCache[tqparent] = new SortCacheItem;
+ if( ! sortCache[parent] ) {
+ sortCache[parent] = new SortCacheItem;
}
- sortCache[tqparent]->addUnsortedChild(item);
+ sortCache[parent]->addUnsortedChild(item);
}
} else {
if(x < sorted_count )
@@ -3258,8 +3258,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
SHOW_TIMER(holes);
}
- // 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.
+ // 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.
if (threaded) buildThreadingTree( sortCache );
TQPtrList<SortCacheItem> toBeSubjThreaded;
@@ -3269,10 +3269,10 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
for(TQPtrListIterator<SortCacheItem> it(unparented); it.current(); ++it) {
SortCacheItem *item = (*it);
- SortCacheItem *tqparent = findParent( item );
- // If we have a tqparent, make sure it's not ourselves
- if ( tqparent && (tqparent != (*it)) ) {
- tqparent->addUnsortedChild((*it));
+ SortCacheItem *parent = findParent( item );
+ // If we have a parent, make sure it's not ourselves
+ if ( parent && (parent != (*it)) ) {
+ parent->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 *tqparent = findParentBySubject( item );
+ SortCacheItem *parent = findParentBySubject( item );
- if ( tqparent ) {
- tqparent->addUnsortedChild((*it));
+ if ( parent ) {
+ parent->addUnsortedChild((*it));
if(sortStream)
(*it)->updateSortFile(sortStream, mFolder);
} else {
@@ -3348,11 +3348,11 @@ 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->tqparent() != i) //could happen if you reparent
+ if(new_kci->item() || new_kci->parent() != i) //could happen if you reparent
continue;
if(threaded && i->item()) {
- // If the tqparent is watched or ignored, propagate that to it's
+ // If the parent is watched or ignored, propagate that to it's
// tqchildren
if (mFolder->getMsgBase(i->id())->isWatched())
mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched);
@@ -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 tqparent.
+ // reevaluated when a new message arrives which might be a better parent.
// Important for messages arriving out of order.
if (threaded && sortCache[x]->isImperfectlyThreaded()) {
mImperfectlyThreadedList.append(sortCache[x]->item());
@@ -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()->tqparent() && ( !it.current()->tqparent()->isOpen() ) ) {
- // the item's tqparent is closed, don't traverse any more of this subtree
- TQListViewItem * lastAncestorWithSiblings = it.current()->tqparent();
+ 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();
// travel towards the root until we find an ancestor with siblings
while ( ( lastAncestorWithSiblings->depth() > 0 ) && !lastAncestorWithSiblings->nextSibling() )
- lastAncestorWithSiblings = lastAncestorWithSiblings->tqparent();
+ lastAncestorWithSiblings = lastAncestorWithSiblings->parent();
// 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 e6bbe422..f504c3f3 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -53,7 +53,7 @@ class KMHeaders : public KListView
friend class ::KMail::HeaderItem; // For easy access to the pixmaps
public:
- KMHeaders(KMMainWidget *owner, TQWidget *tqparent=0, const char *name=0);
+ KMHeaders(KMMainWidget *owner, TQWidget *parent=0, const char *name=0);
virtual ~KMHeaders();
/** A new folder has been selected update the list of headers shown
@@ -114,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 tqparent, not hidden by
+ /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by
eg. the quick search) selected items.
*/
TQValueList<TQ_UINT32> selectedVisibleSernums();
@@ -285,12 +285,12 @@ public slots:
virtual void ensureCurrentItemVisible();
- /** Select an item and if it is the tqparent of a closed thread, also
+ /** Select an item and if it is the parent 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 tqparent of a closed thread, also
+ * and if they are the parent of a closed thread, also
* recursively select their tqchildren. */
void setSelectedByIndex(TQValueList<int> items, bool selected);
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 7a05280e..f93f4ae5 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -98,8 +98,8 @@ static bool s_askingToGoOnline = false;
/********************************************************************/
/* Constructor and destructor */
/********************************************************************/
-KMKernel::KMKernel (TQObject *tqparent, const char *name) :
- DCOPObject("KMailIface"), TQObject(tqparent, name),
+KMKernel::KMKernel (TQObject *parent, const char *name) :
+ DCOPObject("KMailIface"), TQObject(parent, name),
mIdentityManager(0), mConfigureDialog(0),
mContextMenuShown( false ), mWallet( 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->tqparent() );
+ newMessage->setParent( msg->parent() );
newMessage->setMsgSerNum( msg->getMsgSerNum() );
newMessage->setReadyToShow( true );
win->showMsg( GlobalSettings::self()->overrideCharacterEncoding(), newMessage );
@@ -2464,7 +2464,7 @@ Wallet *KMKernel::wallet() {
if ( !Wallet::isEnabled() || walletOpenFailed )
return 0;
- // find an appropriate tqparent window for the wallet dialog
+ // find an appropriate parent 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 871582ac..d9445123 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -86,7 +86,7 @@ class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface
TQ_OBJECT
public:
- KMKernel (TQObject *tqparent=0, const char *name=0);
+ KMKernel (TQObject *parent=0, const char *name=0);
~KMKernel ();
/** dcop callable stuff */
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index e43f8cce..2b17d217 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -30,8 +30,8 @@
KMLineEdit::KMLineEdit(bool useCompletion,
- TQWidget *tqparent, const char *name)
- : KPIM::AddresseeLineEdit(tqparent,useCompletion,name)
+ TQWidget *parent, const char *name)
+ : KPIM::AddresseeLineEdit(parent,useCompletion,name)
{
allowSemiColonAsSeparator( GlobalSettings::allowSemicolonAsAddressSeparator() );
}
@@ -210,8 +210,8 @@ void KMLineEdit::loadContacts()
KMLineEditSpell::KMLineEditSpell(bool useCompletion,
- TQWidget *tqparent, const char *name)
- : KMLineEdit(useCompletion,tqparent,name)
+ TQWidget *parent, const char *name)
+ : KMLineEdit(useCompletion,parent,name)
{
}
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index 70c8316f..5537b006 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -14,7 +14,7 @@ class KMLineEdit : public KPIM::AddresseeLineEdit
Q_OBJECT
TQ_OBJECT
public:
- KMLineEdit(bool useCompletion, TQWidget *tqparent = 0,
+ KMLineEdit(bool useCompletion, TQWidget *parent = 0,
const char *name = 0);
signals:
@@ -22,7 +22,7 @@ signals:
void focusDown();
protected:
- // Inherited. Always called by the tqparent when this widget is created.
+ // Inherited. Always called by the parent when this widget is created.
virtual void loadContacts();
virtual void keyPressEvent(TQKeyEvent*);
@@ -43,7 +43,7 @@ class KMLineEditSpell : public KMLineEdit
Q_OBJECT
TQ_OBJECT
public:
- KMLineEditSpell(bool useCompletion, TQWidget *tqparent = 0,
+ KMLineEditSpell(bool useCompletion, TQWidget *parent = 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 a32c61c9..88884b69 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -135,10 +135,10 @@ TQValueList<KMMainWidget*>* KMMainWidget::s_mainWidgetList = 0;
static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
//-----------------------------------------------------------------------------
-KMMainWidget::KMMainWidget(TQWidget *tqparent, const char *name,
+KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
KXMLGUIClient *aGUIClient,
KActionCollection *actionCollection, KConfig* config ) :
- TQWidget(tqparent, name),
+ TQWidget(parent, name),
mFavoritesCheckMailAction( 0 ),
mFavoriteFolderView( 0 ),
mFolderView( 0 ),
@@ -1096,7 +1096,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem )
{
KMFolder* folder = folderItem->folder();
KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() );
- KMFolderDialog props( folder, folder->tqparent(), folderTree,
+ KMFolderDialog props( folder, folder->parent(), folderTree,
i18n("Properties of Folder %1").tqarg( folder->label() ) );
props.exec();
updateFolderMenu();
@@ -1763,7 +1763,7 @@ void KMMainWidget::slotDebugSieve()
void KMMainWidget::slotStartCertManager()
{
KProcess certManagerProc; // save to create on the heap, since
- // there is no tqparent
+ // there is no parent
certManagerProc << "kleopatra";
if( !certManagerProc.start( KProcess::DontCare ) )
@@ -2120,7 +2120,7 @@ void KMMainWidget::showOfflinePage()
//-----------------------------------------------------------------------------
void KMMainWidget::slotMsgSelected(KMMessage *msg)
{
- if ( msg && msg->tqparent() && !msg->isComplete() )
+ if ( msg && msg->parent() && !msg->isComplete() )
{
if ( msg->transferInProgress() )
return;
@@ -2131,7 +2131,7 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg)
disconnect( mJob, 0, mMsgView, 0 );
delete mJob;
}
- mJob = msg->tqparent()->createJob( msg, FolderJob::tGetMessage, 0,
+ mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0,
"STRUCTURE", mMsgView->attachmentStrategy() );
connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)),
mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*)));
@@ -2316,8 +2316,8 @@ void KMMainWidget::slotDisplayCurrentMessage()
void KMMainWidget::slotMsgActivated(KMMessage *msg)
{
if ( !msg ) return;
- if ( msg->tqparent() && !msg->isComplete() ) {
- FolderJob *job = msg->tqparent()->createJob( msg );
+ if ( msg->parent() && !msg->isComplete() ) {
+ FolderJob *job = msg->parent()->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->tqparent() );
+ newMessage->setParent( msg->parent() );
newMessage->setMsgSerNum( msg->getMsgSerNum() );
newMessage->setReadyToShow( true );
win->showMsg( overrideEncoding(), newMessage );
@@ -2703,7 +2703,7 @@ void KMMainWidget::setupActions()
KAction *act;
//----- Tools menu
- if (tqparent()->inherits("KMMainWin")) {
+ if (parent()->inherits("KMMainWin")) {
act = new KAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
if (KStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
@@ -3328,7 +3328,7 @@ void KMMainWidget::updateMessageActions()
for ( TQPtrListIterator<TQListViewItem> it( selectedItems ) ;
it.current() ; ++ it ) {
TQListViewItem * item = *it;
- if ( item->tqparent()==0 && item->childCount()==0 ) {
+ if ( item->parent()==0 && item->childCount()==0 ) {
allSelectedInCommonThread = false;
break;
}
@@ -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->tqparent() )
+ for ( TQListViewItem * item = i ; item ; item = item->parent() )
names.prepend( item->text(0) );
emit captionChangeRequest( names.join( "/" ) );
}
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 1bb3ee06..26e5eee3 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -85,7 +85,7 @@ class KDE_EXPORT KMMainWidget : public TQWidget
TQ_OBJECT
public:
- KMMainWidget(TQWidget *tqparent, const char *name,
+ KMMainWidget(TQWidget *parent, const char *name,
KXMLGUIClient *aGUIClient,
KActionCollection *actionCollection,
KConfig*config = KMKernel::config() );
@@ -262,7 +262,7 @@ protected:
KActionCollection * actionCollection() const { return mActionCollection; }
- /** @return the correct config dialog depending on whether the tqparent of the mainWidget
+ /** @return the correct config dialog depending on whether the parent of the mainWidget
* is a KPart or a KMMainWindow. When dealing with geometries, use this pointer
*/
KConfig * config();
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index 006020e8..1cafbc3d 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -40,7 +40,7 @@ class KMMainWin : public KMainWindow
public:
// the main window needs to have a name since else restoring the window
// settings by kwin doesn't work
- KMMainWin(TQWidget *tqparent = 0);
+ KMMainWin(TQWidget *parent = 0);
virtual ~KMMainWin();
KMMainWidget *mainKMWidget() const { return mKMMainWidget; };
StatusbarProgressWidget* progressWidget() const { return mLittleProgress; }
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index d4ef0ec4..45ab5887 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -97,7 +97,7 @@ KMMessage::KMMessage(DwMessage* aMsg)
}
//-----------------------------------------------------------------------------
-KMMessage::KMMessage(KMFolder* tqparent): KMMsgBase(tqparent)
+KMMessage::KMMessage(KMFolder* parent): KMMsgBase(parent)
{
init();
}
@@ -248,10 +248,10 @@ void KMMessage::setTransferInProgress(bool value, bool force)
MessageProperty::setTransferInProgress( getMsgSerNum(), value, force );
if ( !transferInProgress() && sPendingDeletes.contains( this ) ) {
sPendingDeletes.remove( this );
- if ( tqparent() ) {
- int idx = tqparent()->find( this );
+ if ( parent() ) {
+ int idx = parent()->find( this );
if ( idx > 0 ) {
- tqparent()->removeMsg( idx );
+ parent()->removeMsg( idx );
}
}
}
@@ -883,9 +883,9 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
msg->setCharset("utf-8");
// determine the mailing list posting address
- if ( tqparent() && tqparent()->isMailingListEnabled() &&
- !tqparent()->mailingListPostAddress().isEmpty() ) {
- mailingListAddresses << tqparent()->mailingListPostAddress();
+ if ( parent() && parent()->isMailingListEnabled() &&
+ !parent()->mailingListPostAddress().isEmpty() ) {
+ mailingListAddresses << parent()->mailingListPostAddress();
}
if ( headerField("List-Post").find( "mailto:", 0, false ) != -1 ) {
TQString listPost = headerField("List-Post");
@@ -1084,8 +1084,8 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
// setqStatus(KMMsgStatusReplied);
msg->link(this, KMMsgStatusReplied);
- if ( tqparent() && tqparent()->putRepliesInSameFolder() )
- msg->setFcc( tqparent()->idString() );
+ if ( parent() && parent()->putRepliesInSameFolder() )
+ msg->setFcc( parent()->idString() );
// replies to an encrypted message should be encrypted as well
if ( encryptionState() == KMMsgPartiallyEncrypted ||
@@ -1729,8 +1729,8 @@ uint KMMessage::identityUoid() const {
if ( !ok || id == 0 )
id = kmkernel->identityManager()->identityForAddress( to() + ", " + cc() ).uoid();
- if ( id == 0 && tqparent() )
- id = tqparent()->identity();
+ if ( id == 0 && parent() )
+ id = parent()->identity();
return id;
}
@@ -4275,7 +4275,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray &
TQString specifier = partSpecifier;
if ( partSpecifier.endsWith(".HEADER") ||
partSpecifier.endsWith(".MIME") ) {
- // get the tqparent bodypart
+ // get the parent bodypart
specifier = partSpecifier.section( '.', 0, -2 );
}
@@ -4309,16 +4309,16 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray &
TQString parentSpec = partSpecifier.section( '.', 0, -2 );
if ( !parentSpec.isEmpty() )
{
- DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), parentSpec );
- if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() )
+ DwBodyPart* parent = findDwBodyPart( getFirstDwBodyPart(), parentSpec );
+ if ( parent && parent->hasHeaders() && parent->Headers().HasContentType() )
{
- const DwMediaType& contentType = tqparent->Headers().ContentType();
+ const DwMediaType& contentType = parent->Headers().ContentType();
if ( contentType.Type() == DwMime::kTypeMessage &&
contentType.Subtype() == DwMime::kSubtypeRfc822 )
{
// an embedded message that is not multipart
// update this directly
- tqparent->Body().Message()->Body().FromString( content );
+ parent->Body().Message()->Body().FromString( content );
}
}
}
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index e15732b9..8f870f44 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::tqparent;
+ using KMMsgBase::parent;
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* tqparent=0);
+ KMMessage(KMFolder* parent=0);
/** Constructor from a DwMessage. KMMessage takes possession of the
DwMessage, so don't dare to delete it.
@@ -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::tqparent() folder for a default.
+ and if that fails queries the KMMsgBase::parent() folder for a default.
**/
uint identityUoid() const;
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 730ad54d..cd05ee38 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -55,9 +55,9 @@
KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name )
- : KListView( tqparent, name ),
+ : KListView( parent, name ),
mReaderWin( readerWin ), mSizeColumn(0)
{
setStyleDependantFrameWidth();
@@ -245,8 +245,8 @@ void KMMimePartTree::correctSize( TQListViewItem * item )
}
if ( totalSize > static_cast<KMMimePartTreeItem*>(item)->origSize() )
item->setText( mSizeColumn, KIO::convertSize(totalSize) );
- if ( item->tqparent() )
- correctSize( item->tqparent() );
+ if ( item->parent() )
+ correctSize( item->parent() );
}
void KMMimePartTree::slotDelete()
@@ -313,13 +313,13 @@ void KMMimePartTree::slotCopy()
}
//=============================================================================
-KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * tqparent,
+KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * parent,
partNode* node,
const TQString & description,
const TQString & mimetype,
const TQString & encoding,
KIO::filesize_t size )
- : TQListViewItem( tqparent, description,
+ : TQListViewItem( parent, description,
TQString(), // set by setIconAndTextForType()
encoding,
KIO::convertSize( size ) ),
@@ -328,18 +328,18 @@ KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTree * tqparent,
if( node )
node->setMimePartTreeItem( this );
setIconAndTextForType( mimetype );
- if ( tqparent )
- tqparent->correctSize(this);
+ if ( parent )
+ parent->correctSize(this);
}
-KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * tqparent,
+KMMimePartTreeItem::KMMimePartTreeItem( KMMimePartTreeItem * parent,
partNode* node,
const TQString & description,
const TQString & mimetype,
const TQString & encoding,
KIO::filesize_t size,
bool revertOrder )
- : TQListViewItem( tqparent, description,
+ : TQListViewItem( parent, description,
TQString(), // set by setIconAndTextForType()
encoding,
KIO::convertSize( size ) ),
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index f520a795..c8d3c598 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -52,7 +52,7 @@ class KMMimePartTree : public KListView
public:
KMMimePartTree( KMReaderWin* readerWin,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name = 0 );
virtual ~KMMimePartTree();
@@ -98,13 +98,13 @@ protected:
class KMMimePartTreeItem :public TQListViewItem
{
public:
- KMMimePartTreeItem( KMMimePartTree * tqparent,
+ KMMimePartTreeItem( KMMimePartTree * parent,
partNode* node,
const TQString & labelDescr,
const TQString & labelCntType = TQString(),
const TQString & labelEncoding = TQString(),
KIO::filesize_t size=0 );
- KMMimePartTreeItem( KMMimePartTreeItem * tqparent,
+ KMMimePartTreeItem( KMMimePartTreeItem * parent,
partNode* node,
const TQString & labelDescr,
const TQString & labelCntType = TQString(),
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 94d5d966..43a10102 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -152,7 +152,7 @@ public:
KMFolderIndex* storage() const;
/** Return owning folder. */
- KMFolder* tqparent() const { return mParent; }
+ KMFolder* parent() const { return mParent; }
/** Set owning folder. */
void setParent(KMFolder* p) { mParent = p; }
@@ -219,7 +219,7 @@ public:
virtual KMMsgtqStatus status(void) const = 0;
/** Set status and mark dirty. Optional optimization: @p idx may
- * specify the index of this message within the tqparent folder. */
+ * specify the index of this message within the parent 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);
@@ -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 tqparent folder. */
+ * the parent 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 tqparent folder. */
+ * the parent 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 tqparent folder. */
+ * the parent 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 tqparent folder. */
+ * the parent folder. */
virtual void setSignatureStateChar( TQChar status, int idx = -1 );
/** Important header fields of the message that are also kept in the index. */
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index f4943792..729a3663 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -303,7 +303,7 @@ unsigned long KMMsgDict::remove(const KMMsgBase *msg)
void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex)
{
- KMMsgDictREntry *rentry = msg->tqparent()->storage()->rDict();
+ KMMsgDictREntry *rentry = msg->parent()->storage()->rDict();
if (rentry) {
KMMsgDictEntry *entry = rentry->get(index);
if (entry) {
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index 56735448..a3d50c44 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -29,7 +29,7 @@ class KMMessage;
class KMMsgInfo: public KMMsgBase
{
public:
- KMMsgInfo(KMFolder* tqparent, off_t off=0, short len=0);
+ KMMsgInfo(KMFolder* parent, off_t off=0, short len=0);
virtual ~KMMsgInfo();
/** left for old style index files */
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 8ab55358..e4c41a40 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -212,10 +212,10 @@ public:
/** If this part is complete (contains a body) */
bool isComplete() { return (!mBody.isNull()); }
- /** Returns the tqparent part */
- KMMessagePart* tqparent() { return mParent; }
+ /** Returns the parent part */
+ KMMessagePart* parent() { return mParent; }
- /** Set the tqparent of this part */
+ /** Set the parent 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 167ff8de..4a1b94fb 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -44,10 +44,10 @@ static const int numEncodingTypes =
sizeof encodingTypes / sizeof *encodingTypes;
KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
- TQWidget * tqparent, const char * name )
+ TQWidget * parent, const char * name )
: KDialogBase( Plain,
caption.isEmpty() ? i18n("Message Part Properties") : caption,
- Ok|Cancel|Help, Ok, tqparent, name, true, true)
+ Ok|Cancel|Help, Ok, parent, name, true, true)
{
// tmp vars:
TQGridLayout * glay;
@@ -331,8 +331,8 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) {
-KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * tqparent, const char *, bool readOnly)
- : KMMsgPartDialog(TQString(), tqparent ), mMsgPart( 0 )
+KMMsgPartDialogCompat::KMMsgPartDialogCompat( TQWidget * parent, const char *, bool readOnly)
+ : KMMsgPartDialog(TQString(), parent ), mMsgPart( 0 )
{
setShownEncodings( SevenBit|EightBit|QuotedPrintable|Base64 );
if (readOnly)
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index eb69c0be..723ebda7 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -43,7 +43,7 @@ class KMMsgPartDialog: public KDialogBase
public:
KMMsgPartDialog( const TQString & caption=TQString(),
- TQWidget * tqparent=0, const char * name=0 );
+ TQWidget * parent=0, const char * name=0 );
virtual ~KMMsgPartDialog();
/** Get the currently selected mimetype */
@@ -142,7 +142,7 @@ class KMMsgPartDialogCompat : public KMMsgPartDialog {
Q_OBJECT
TQ_OBJECT
public:
- KMMsgPartDialogCompat( TQWidget * tqparent=0, const char * caption=0, bool=FALSE );
+ KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE );
virtual ~KMMsgPartDialogCompat();
/** Display information about this message part. */
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index f07ba8fe..af62b411 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->tqparent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) );
+ connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) );
}
void KMReaderMainWin::slotFolderRemoved( TQObject* folderPtr )
{
assert(mMsg);
- assert(folderPtr == mMsg->tqparent());
- if( mMsg && folderPtr == mMsg->tqparent() )
+ assert(folderPtr == mMsg->parent());
+ if( mMsg && folderPtr == mMsg->parent() )
mMsg->setParent( 0 );
}
@@ -181,18 +181,18 @@ void KMReaderMainWin::slotTrashMsg()
if ( !mMsg )
return;
// find the real msg by its sernum
- KMFolder* tqparent;
+ KMFolder* parent;
int index;
- KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &tqparent, &index );
- if ( tqparent && !tqparent->isTrash() ) {
+ KMMsgDict::instance()->getLocation( mMsg->getMsgSerNum(), &parent, &index );
+ if ( parent && !parent->isTrash() ) {
// open the folder (ref counted)
- tqparent->open("trashmsg");
- KMMessage *msg = tqparent->getMsg( index );
+ parent->open("trashmsg");
+ KMMessage *msg = parent->getMsg( index );
if (msg) {
- KMDeleteMsgCommand *command = new KMDeleteMsgCommand( tqparent, msg );
+ KMDeleteMsgCommand *command = new KMDeleteMsgCommand( parent, msg );
command->start();
}
- tqparent->close("trashmsg");
+ parent->close("trashmsg");
}
close();
}
@@ -235,9 +235,9 @@ void KMReaderMainWin::slotPrintMsg()
void KMReaderMainWin::slotForwardInlineMsg()
{
KMCommand *command = 0;
- if ( mReaderWin->message() && mReaderWin->message()->tqparent() ) {
+ if ( mReaderWin->message() && mReaderWin->message()->parent() ) {
command = new KMForwardInlineCommand( this, mReaderWin->message(),
- mReaderWin->message()->tqparent()->identity() );
+ mReaderWin->message()->parent()->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()->tqparent() ) {
+ if ( mReaderWin->message() && mReaderWin->message()->parent() ) {
command = new KMForwardAttachedCommand( this, mReaderWin->message(),
- mReaderWin->message()->tqparent()->identity() );
+ mReaderWin->message()->parent()->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()->tqparent() ) {
+ if ( mReaderWin->message() && mReaderWin->message()->parent() ) {
command = new KMForwardDigestCommand( this, mReaderWin->message(),
- mReaderWin->message()->tqparent()->identity() );
+ mReaderWin->message()->parent()->identity() );
} else {
command = new KMForwardDigestCommand( this, mReaderWin->message() );
}
@@ -487,9 +487,9 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
return;
}
- if ( ! ( aMsg.tqparent() && ( aMsg.tqparent()->isSent() ||
- aMsg.tqparent()->isDrafts() ||
- aMsg.tqparent()->isTemplates() ) ) ) {
+ if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() ||
+ aMsg.parent()->isDrafts() ||
+ aMsg.parent()->isTemplates() ) ) ) {
// add the reply and forward actions only if we are not in a sent-mail,
// templates or drafts folder
//
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 19f0410a..342b0fb3 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1465,7 +1465,7 @@ void KMReaderWin::displayMessage() {
htmlWriter()->begin( mCSSHelper->cssDefinitions( isFixedFont() ) );
htmlWriter()->queue( mCSSHelper->htmlHead( isFixedFont() ) );
- if (!tqparent())
+ if (!parent())
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->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() = " << (aMsg->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder()) << endl;
+kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != 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->tqparent() && aMsg->tqparent() != kmkernel->outboxFolder() )
+ && ( aMsg->parent() && aMsg->parent() != 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
@@ -1814,7 +1814,7 @@ void KMReaderWin::slotTouchMessage()
message()->encryptionState() != KMMsgEncryptionStateUnknown )
return;
- KMFolder *folder = message()->tqparent();
+ KMFolder *folder = message()->parent();
if (folder &&
(folder->isOutbox() || folder->isSent() || folder->isTrash() ||
folder->isDrafts() || folder->isTemplates() ) )
@@ -1940,7 +1940,7 @@ void KMReaderWin::slotUrlPopup(const TQString &aUrl, const TQPoint& aPos)
}
}
-// Checks if the given node has a tqparent node that is a DIV which has an ID attribute
+// Checks if the given node has a parent 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 )
{
@@ -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()->tqparent() ? !message()->tqparent()->isReadOnly() : false;
+ const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : false;
if ( GlobalSettings::self()->allowAttachmentEditing() && canChange )
menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 );
if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange )
@@ -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()->tqparent() );
+ msg->setParent( message()->parent() );
msg->setUID(message()->UID());
msg->setReadyToShow(true);
KMReaderMainWin *win = new KMReaderMainWin();
@@ -2476,8 +2476,8 @@ void KMReaderWin::slotUrlClicked()
{
KMMainWidget *mainWidget = dynamic_cast<KMMainWidget*>(mMainWindow);
uint identity = 0;
- if ( message() && message()->tqparent() ) {
- identity = message()->tqparent()->identity();
+ if ( message() && message()->parent() ) {
+ identity = message()->parent()->identity();
}
KMCommand *command = new KMUrlClickedCommand( mClickedUrl, identity, this,
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 4db8f05d..7d72cd78 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -86,7 +86,7 @@ class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
friend class KMail::KHtmlPartHtmlWriter;
public:
- KMReaderWin( TQWidget *tqparent,
+ KMReaderWin( TQWidget *parent,
TQWidget *mainWindow,
KActionCollection *actionCollection,
const char *name=0,
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 55df4d5e..5477f3f6 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -54,10 +54,10 @@ static const int SpecialRuleFieldsCount =
//
//=============================================================================
-KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *tqparent, KMSearchRule *aRule,
+KMSearchRuleWidget::KMSearchRuleWidget( TQWidget *parent, KMSearchRule *aRule,
const char *name, bool headersOnly,
bool absoluteDates )
- : TQWidget( tqparent, name ),
+ : TQWidget( parent, name ),
mRuleField( 0 ),
mFunctionStack( 0 ),
mValueStack( 0 ),
@@ -282,8 +282,8 @@ void KMSearchRuleWidget::slotRuleFieldChanged( const TQString & field )
//
//=============================================================================
-KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *tqparent, const char* name, bool headersOnly, bool absoluteDates )
- : KWidgetLister( 2, FILTER_MAX_RULES, tqparent, name )
+KMSearchRuleWidgetLister::KMSearchRuleWidgetLister( TQWidget *parent, const char* name, bool headersOnly, bool absoluteDates )
+ : KWidgetLister( 2, FILTER_MAX_RULES, parent, name )
{
mRuleList = 0;
mHeadersOnly = headersOnly;
@@ -357,9 +357,9 @@ void KMSearchRuleWidgetLister::reset()
slotClear();
}
-TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *tqparent )
+TQWidget* KMSearchRuleWidgetLister::createWidget( TQWidget *parent )
{
- return new KMSearchRuleWidget(tqparent, 0, 0, mHeadersOnly, mAbsoluteDates);
+ return new KMSearchRuleWidget(parent, 0, 0, mHeadersOnly, mAbsoluteDates);
}
void KMSearchRuleWidgetLister::clearWidget( TQWidget *aWidget )
@@ -391,15 +391,15 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets()
//
//=============================================================================
-KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates )
- : TQGroupBox( 1/*columns*/, Qt::Horizontal, tqparent, name )
+KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates )
+ : TQGroupBox( 1/*columns*/, Qt::Horizontal, parent, name )
{
setTitle( i18n("Search Criteria") );
initLayout( headersOnly, absoluteDates );
}
-KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates)
- : TQGroupBox( 1/*column*/, Qt::Horizontal, title, tqparent, name )
+KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates)
+ : TQGroupBox( 1/*column*/, Qt::Horizontal, title, parent, name )
{
initLayout( headersOnly, absoluteDates );
}
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index 307a7ae2..e42ae080 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -44,7 +44,7 @@ class KMSearchRuleWidget : public TQWidget
public:
/** Constructor. You can give a KMSearchRule as parameter, which will
be used to initialize the widget. */
- KMSearchRuleWidget( TQWidget* tqparent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
+ KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus,
Subject, From, To, CC, ReplyTo, Organization };
@@ -111,7 +111,7 @@ class KMSearchRuleWidgetLister : public KWidgetLister
friend class ::KMSearchPatternEdit;
public:
- KMSearchRuleWidgetLister( TQWidget *tqparent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
+ KMSearchRuleWidgetLister( TQWidget *parent=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false );
virtual ~KMSearchRuleWidgetLister();
@@ -123,7 +123,7 @@ public slots:
protected:
virtual void clearWidget( TQWidget *aWidget );
- virtual TQWidget* createWidget( TQWidget *tqparent );
+ virtual TQWidget* createWidget( TQWidget *parent );
private:
void regenerateRuleListFromWidgets();
@@ -169,12 +169,12 @@ class KMSearchPatternEdit : public TQGroupBox {
Q_OBJECT
TQ_OBJECT
public:
- /** Constructor. The tqparent and name parameters are passed to the underlying
+ /** Constructor. The parent and name parameters are passed to the underlying
TQGroupBox, as usual. */
- KMSearchPatternEdit(TQWidget *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false);
+ KMSearchPatternEdit(TQWidget *parent=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 *tqparent=0, const char *name=0, bool headersOnly = false, bool absoluteDates = false);
+ KMSearchPatternEdit(const TQString & title, TQWidget *parent=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 987e4928..86e931cf 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -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->tqparent() ) mCurrentMsg->tqparent()->quiet( true );
+ if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->quiet( true );
const int processResult = kmkernel->filterMgr()->process(mCurrentMsg,KMFilterMgr::Outbound);
- if ( mCurrentMsg->tqparent() ) mCurrentMsg->tqparent()->quiet( false );
+ if ( mCurrentMsg->parent() ) mCurrentMsg->parent()->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->tqparent() && !imapSentFolder) {
+ if (mCurrentMsg->parent() && !imapSentFolder) {
// for speed optimization, this code assumes that mCurrentMsg is the
- // last one in it's tqparent folder; make sure that's really the case:
- assert( mCurrentMsg->tqparent()->find( mCurrentMsg )
- == mCurrentMsg->tqparent()->count() - 1 );
+ // last one in it's parent folder; make sure that's really the case:
+ assert( mCurrentMsg->parent()->find( mCurrentMsg )
+ == mCurrentMsg->parent()->count() - 1 );
// unGet this message:
- mCurrentMsg->tqparent()->unGetMsg( mCurrentMsg->tqparent()->count() -1 );
+ mCurrentMsg->parent()->unGetMsg( mCurrentMsg->parent()->count() -1 );
}
mCurrentMsg = 0;
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 1c6bc036..6bd99f99 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 *tqparent, const char *name)
- : KSystemTray( tqparent, name ),
+KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
+ : KSystemTray( parent, name ),
mParentVisible( true ),
mPosOfMainWin( 0, 0 ),
mDesktopOfMainWin( 0 ),
diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h
index 1fa144b6..5e02b15b 100644
--- a/kmail/kmsystemtray.h
+++ b/kmail/kmsystemtray.h
@@ -44,7 +44,7 @@ class KMSystemTray : public KSystemTray
TQ_OBJECT
public:
/** construtor */
- KMSystemTray(TQWidget* tqparent=0, const char *name=0);
+ KMSystemTray(TQWidget* parent=0, const char *name=0);
/** destructor */
~KMSystemTray();
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index e5afc1c6..c74c87f8 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -243,9 +243,9 @@ void KMTransportInfo::readPassword() const
}
-KMTransportSelDlg::KMTransportSelDlg( TQWidget *tqparent, const char *name,
+KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name,
bool modal )
- : KDialogBase( tqparent, name, modal, i18n("Add Transport"), Ok|Cancel, Ok )
+ : KDialogBase( parent, 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 *tqparent, const char *name,
+ TQWidget *parent, const char *name,
bool modal )
- : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ),
+ : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ),
mServerTest( 0 ),
mTransportInfo( transportInfo ),
mAuthNone( AllAuth ), mAuthSSL( AllAuth ), mAuthTLS( AllAuth )
@@ -479,7 +479,7 @@ void KMTransportDialog::makeSmtpPage()
"a custom hostname when identifying itself "
"to the mail server."
"<p>This is useful when your system's hostname "
- "may not be set correctly or to tqmask your "
+ "may not be set correctly or to mask your "
"system's true hostname."));
mSmtp.localHostnameLabel = new TQLabel( i18n("Hos&tname:"), page1 );
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index 901401e3..ba43ebc0 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -67,7 +67,7 @@ class KMTransportSelDlg : public KDialogBase
TQ_OBJECT
public:
- KMTransportSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=TRUE );
+ KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE );
int selected() const;
private slots:
@@ -84,7 +84,7 @@ class KMTransportDialog : public KDialogBase
public:
KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo,
- TQWidget *tqparent=0, const char *name=0, bool modal=TRUE );
+ TQWidget *parent=0, const char *name=0, bool modal=TRUE );
virtual ~KMTransportDialog();
private slots:
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index e6726a9a..29dd8d8b 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -101,7 +101,7 @@ void ListJob::execute()
ImapAccountBase::jobData jd;
jd.total = 1; jd.done = 0;
jd.cancellable = true;
- jd.tqparent = mDestFolder;
+ jd.parent = mDestFolder;
jd.onlySubscribed = ( mType == ImapAccountBase::ListSubscribed ||
mType == ImapAccountBase::ListSubscribedNoCheck ||
mType == ImapAccountBase::ListFolderOnlySubscribed );
diff --git a/kmail/listjob.h b/kmail/listjob.h
index d12da6bb..8f4ac73d 100644
--- a/kmail/listjob.h
+++ b/kmail/listjob.h
@@ -58,13 +58,13 @@ class ListJob : public FolderJob
public:
/**
* Create a new job
- * @param storage the tqparent folder, either provide this or a path
+ * @param storage the parent 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 tqparent ProgressItem
+ * @param item a parent ProgressItem
*/
ListJob( ImapAccountBase* account, ImapAccountBase::ListType type,
FolderStorage* storage = 0, const TQString& path = TQString(),
@@ -97,7 +97,7 @@ public:
/** Set this to true for a complete listing */
void setComplete( bool complete ) { mComplete = complete; }
- /** Set tqparent progress item */
+ /** Set parent progress item */
void setParentProgressItem( KPIM::ProgressItem* it ) {
mParentProgressItem = it; }
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index f3ef1f1e..ca5f2cc9 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -46,9 +46,9 @@
namespace KMail {
-LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption,
+LocalSubscriptionDialog::LocalSubscriptionDialog( TQWidget *parent, const TQString &caption,
ImapAccountBase *acct, TQString startPath )
- : SubscriptionDialog( tqparent, caption, acct, startPath ),
+ : SubscriptionDialog( parent, caption, acct, startPath ),
mAccount( acct )
{
}
diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h
index 685bc515..d7f3dd0b 100644
--- a/kmail/localsubscriptiondialog.h
+++ b/kmail/localsubscriptiondialog.h
@@ -43,7 +43,7 @@ namespace KMail {
TQ_OBJECT
public:
- LocalSubscriptionDialog( TQWidget *tqparent, const TQString &caption,
+ LocalSubscriptionDialog( TQWidget *parent, const TQString &caption,
ImapAccountBase* acct,
TQString startPath = TQString() );
virtual ~LocalSubscriptionDialog();
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index 9bf4d74d..ac595900 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -64,9 +64,9 @@ MaildirJob::~MaildirJob()
}
//-----------------------------------------------------------------------------
-void MaildirJob::setParentFolder( const KMFolderMaildir* tqparent )
+void MaildirJob::setParentFolder( const KMFolderMaildir* parent )
{
- mParentFolder = const_cast<KMFolderMaildir*>( tqparent );
+ mParentFolder = const_cast<KMFolderMaildir*>( parent );
}
diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h
index 0ab12222..d31635cc 100644
--- a/kmail/maildirjob.h
+++ b/kmail/maildirjob.h
@@ -48,7 +48,7 @@ public:
JobType jt = tGetMessage, KMFolder *folder = 0 );
virtual ~MaildirJob();
- void setParentFolder( const KMFolderMaildir* tqparent );
+ void setParentFolder( const KMFolderMaildir* parent );
protected:
void execute();
protected slots:
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 7caa9817..85c0c340 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -45,8 +45,8 @@
using namespace KMail;
-MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* tqparent, KMFolder *folder )
- : KDialogBase( tqparent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ),
+MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* parent, KMFolder *folder )
+ : KDialogBase( parent, "mailinglist_properties", false, i18n( "Mailinglist Folder Properties" ),
KDialogBase::Ok|KDialogBase::Cancel,
KDialogBase::Ok, true ),
mFolder( folder )
@@ -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->tqparent() );
+ KMFolderTree *folderTree = static_cast<KMFolderTree *>( mDlg->parent() );
int curMsgIdx = folderTree->mainWidget()->headers()->currentItemIndex();
if ( curMsgIdx > 0 ) {
KMMessage *mes = mFolder->getMsg( curMsgIdx );
diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h
index f3aa13fa..ed7073a6 100644
--- a/kmail/mailinglistpropertiesdialog.h
+++ b/kmail/mailinglistpropertiesdialog.h
@@ -47,7 +47,7 @@ class MailingListFolderPropertiesDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- MailingListFolderPropertiesDialog( TQWidget *tqparent, KMFolder *folder );
+ MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder );
~MailingListFolderPropertiesDialog() {};
protected:
void load();
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index 6d5c4e38..0f0d0536 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -53,8 +53,8 @@ int MailSourceHighlighter::highlightParagraph( const TQString& text, int ) {
return 0;
}
-MailSourceViewer::MailSourceViewer( TQWidget *tqparent, const char *name )
- : KTextBrowser( tqparent, name ), mSourceHighLighter( 0 )
+MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name )
+ : KTextBrowser( parent, name ), mSourceHighLighter( 0 )
{
setWFlags( WDestructiveClose );
TQAccel *accel = new TQAccel( this, "browser close-accel" );
diff --git a/kmail/mailsourceviewer.h b/kmail/mailsourceviewer.h
index d4e60253..0c29175b 100644
--- a/kmail/mailsourceviewer.h
+++ b/kmail/mailsourceviewer.h
@@ -59,7 +59,7 @@ public:
class MailSourceViewer : public KTextBrowser
{
public:
- MailSourceViewer( TQWidget *tqparent = 0, const char *name = 0 );
+ MailSourceViewer( TQWidget *parent = 0, const char *name = 0 );
~MailSourceViewer();
void setText( const TQString& text );
private:
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index e306c777..317429d5 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 * tqparent, const char * name )
+KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, const char * name )
: KDialogBase( Plain, i18n( "Manage Sieve Scripts" ), Close, Close,
- tqparent, name, false ),
+ parent, 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 * tqparent = mJobs[job];
- if ( !tqparent )
+ TQCheckListItem * parent = mJobs[job];
+ if ( !parent )
return;
mJobs.remove( job );
- tqparent->setOpen( true );
+ parent->setOpen( true );
if ( success )
return;
- TQListViewItem * item = new TQListViewItem( tqparent, i18n( "Failed to fetch the list of scripts" ) );
+ TQListViewItem * item = new TQListViewItem( parent, i18n( "Failed to fetch the list of scripts" ) );
item->setEnabled( false );
}
void KMail::ManageSieveScriptsDialog::slotItem( KMail::SieveJob * job, const TQString & filename, bool isActive ) {
- TQCheckListItem * tqparent = mJobs[job];
- if ( !tqparent )
+ TQCheckListItem * parent = mJobs[job];
+ if ( !parent )
return;
- TQCheckListItem * item = new TQCheckListItem( tqparent, filename, TQCheckListItem::RadioButton );
+ TQCheckListItem * item = new TQCheckListItem( parent, filename, TQCheckListItem::RadioButton );
if ( isActive ) {
item->setOn( true );
- mSelectedItems[tqparent] = item;
+ mSelectedItems[parent] = item;
}
}
@@ -178,12 +178,12 @@ void KMail::ManageSieveScriptsDialog::slotDeactivateScript() {
if ( !mContextMenuItem )
return;
- TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() );
- if ( !tqparent )
+ TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() );
+ if ( !parent )
return;
if ( mContextMenuItem->isOn()) {
- mSelectedItems[tqparent] = mContextMenuItem;
- changeActiveScript( tqparent,false );
+ mSelectedItems[parent] = mContextMenuItem;
+ changeActiveScript( parent,false );
}
}
@@ -191,12 +191,12 @@ void KMail::ManageSieveScriptsDialog::slotSelectionChanged( TQListViewItem * i )
TQCheckListItem * item = qcli_cast( i );
if ( !item )
return;
- TQCheckListItem * tqparent = qcli_cast( item->tqparent() );
- if ( !tqparent )
+ TQCheckListItem * parent = qcli_cast( item->parent() );
+ if ( !parent )
return;
- if ( item->isOn() && mSelectedItems[tqparent] != item ) {
- mSelectedItems[tqparent] = item;
- changeActiveScript( tqparent,true );
+ if ( item->isOn() && mSelectedItems[parent] != item ) {
+ mSelectedItems[parent] = item;
+ changeActiveScript( parent,true );
}
}
@@ -240,14 +240,14 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() {
if ( !mContextMenuItem->depth() )
return;
- TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() );
- if ( !tqparent )
+ TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() );
+ if ( !parent )
return;
- if ( !mUrls.count( tqparent ) )
+ if ( !mUrls.count( parent ) )
return;
- KURL u = mUrls[tqparent];
+ KURL u = mUrls[parent];
if ( u.isEmpty() )
return;
@@ -268,10 +268,10 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() {
return;
if ( !mContextMenuItem->depth() )
return;
- TQCheckListItem * tqparent = qcli_cast( mContextMenuItem->tqparent() );
- if ( !mUrls.count( tqparent ) )
+ TQCheckListItem * parent = qcli_cast( mContextMenuItem->parent() );
+ if ( !mUrls.count( parent ) )
return;
- KURL url = mUrls[tqparent];
+ KURL url = mUrls[parent];
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->tqparent() );
+ mContextMenuItem = qcli_cast( mContextMenuItem->parent() );
if ( !mContextMenuItem )
return;
@@ -311,8 +311,8 @@ void KMail::ManageSieveScriptsDialog::slotNewScript() {
slotGetResult( 0, true, TQString(), false );
}
-KMail::SieveEditor::SieveEditor( TQWidget * tqparent, const char * name )
- : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, tqparent, name )
+KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
+ : KDialogBase( Plain, i18n( "Edit Sieve Script" ), Ok|Cancel, Ok, parent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, spacingHint() );
mTextEdit = new TQTextEdit( plainPage() );
diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h
index 73de8465..048fbcdd 100644
--- a/kmail/managesievescriptsdialog.h
+++ b/kmail/managesievescriptsdialog.h
@@ -17,7 +17,7 @@ class ManageSieveScriptsDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ManageSieveScriptsDialog( TQWidget * tqparent=0, const char * name=0 );
+ ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 );
~ManageSieveScriptsDialog();
private slots:
diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h
index c756ebe3..f860ffb5 100644
--- a/kmail/managesievescriptsdialog_p.h
+++ b/kmail/managesievescriptsdialog_p.h
@@ -12,7 +12,7 @@ class SieveEditor : public KDialogBase {
TQ_OBJECT
TQ_PROPERTY( TQString script READ script WRITE setScript )
public:
- SieveEditor( TQWidget * tqparent=0, const char * name=0 );
+ SieveEditor( TQWidget * parent=0, const char * name=0 );
~SieveEditor();
TQString script() const { return mTextEdit->text(); }
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index 0d46fe8b..2205e86f 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -72,9 +72,9 @@ MboxJob::execute()
//-----------------------------------------------------------------------------
void
-MboxJob::setParent( const KMFolderMbox *tqparent )
+MboxJob::setParent( const KMFolderMbox *parent )
{
- mParent = const_cast<KMFolderMbox*>( tqparent );
+ mParent = const_cast<KMFolderMbox*>( parent );
}
//-----------------------------------------------------------------------------
@@ -82,7 +82,7 @@ void
MboxJob::startJob()
{
KMMessage *msg = mMsgList.first();
- assert( (msg && ( mParent || msg->tqparent() )) );
+ assert( (msg && ( mParent || msg->parent() )) );
switch( mType ) {
case tGetMessage:
{
diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h
index df9609ae..656a3928 100644
--- a/kmail/mboxjob.h
+++ b/kmail/mboxjob.h
@@ -50,7 +50,7 @@ public:
virtual ~MboxJob();
protected:
void execute();
- void setParent( const KMFolderMbox *tqparent );
+ void setParent( const KMFolderMbox *parent );
protected slots:
void startJob();
private:
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index d899972c..6dc248e7 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -32,9 +32,9 @@
using namespace KMail;
-MessageActions::MessageActions( KActionCollection *ac, TQWidget * tqparent ) :
- TQObject( tqparent ),
- mParent( tqparent ),
+MessageActions::MessageActions( KActionCollection *ac, TQWidget * parent ) :
+ TQObject( parent ),
+ mParent( parent ),
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->tqparent() ) {
- if ( mCurrentMessage->tqparent()->isTemplates() )
+ if ( mCurrentMessage && mCurrentMessage->parent() ) {
+ if ( mCurrentMessage->parent()->isTemplates() )
singleMsg = false;
}
const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage;
const bool flagsAvailable = GlobalSettings::self()->allowLocalFlags() ||
- !((mCurrentMessage && mCurrentMessage->tqparent()) ? mCurrentMessage->tqparent()->isReadOnly() : true);
+ !((mCurrentMessage && mCurrentMessage->parent()) ? mCurrentMessage->parent()->isReadOnly() : true);
mCreateTodoAction->setEnabled( singleMsg );
mReplyActionMenu->setEnabled( singleMsg );
@@ -262,7 +262,7 @@ void MessageActions::editCurrentMessage()
if ( !mCurrentMessage )
return;
KMCommand *command = 0;
- KMFolder *folder = mCurrentMessage->tqparent();
+ KMFolder *folder = mCurrentMessage->parent();
// 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 0cf06256..a99e555b 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -41,7 +41,7 @@ class MessageActions : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- MessageActions( KActionCollection* ac, TQWidget *tqparent );
+ MessageActions( KActionCollection* ac, TQWidget *parent );
void setMessageView( KMReaderWin *msgView );
void setCurrentMessage( KMMessage *msg );
diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp
index 91692016..0257aa0b 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 * tqparent ) :
- TQObject( tqparent )
+ KMFolder * dest, bool move, TQObject * parent ) :
+ TQObject( parent )
{
if ( msgs.isEmpty() || !dest )
return;
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 1c24d890..05627e17 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -48,10 +48,10 @@ class MessageCopyHelper : public TQObject
@param msgs List of serial numbers.
@param dest Destination folder.
@param move If set to true, messages will be moved instead of copied
- @param tqparent The tqparent object.
+ @param parent The parent object.
*/
MessageCopyHelper( const TQValueList<TQ_UINT32> &msgs, KMFolder *dest,
- bool move, TQObject *tqparent = 0 );
+ bool move, TQObject *parent = 0 );
/**
Converts a MailList into a serial number list.
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index fa719c53..23ebea55 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 * tqparent, const TQString & name, uint id )
- : KMAccount( tqparent, name, id ),
+ NetworkAccount::NetworkAccount( AccountManager * parent, const TQString & name, uint id )
+ : KMAccount( parent, name, id ),
mSlave( 0 ),
mAuth( "*" ),
mPort( 0 ),
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 891e1edc..433e30af 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -47,7 +47,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
protected:
- NetworkAccount( AccountManager * tqparent, const TQString & name, uint id );
+ NetworkAccount( AccountManager * parent, const TQString & name, uint id );
public:
virtual ~NetworkAccount();
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 11a52043..e6fed27b 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -55,8 +55,8 @@
using namespace KMail;
-NewFolderDialog::NewFolderDialog( TQWidget* tqparent, KMFolder *folder )
- : KDialogBase( tqparent, "new_folder_dialog", false, i18n( "New Folder" ),
+NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
+ : KDialogBase( parent, "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 tqparent is Top Level local folders
+ // default parent is Top Level local folders
KMFolderDir * selectedFolderDir = &(kmkernel->folderMgr()->dir());
- // we got a tqparent, let's use that
+ // we got a parent, let's use that
if ( mFolder )
selectedFolderDir = mFolder->createChildFolder();
// check if the folder already exists
if( selectedFolderDir->hasNamedFolder( fldName )
&& ( !( mFolder
- && ( selectedFolderDir == mFolder->tqparent() )
+ && ( selectedFolderDir == mFolder->parent() )
&& ( mFolder->storage()->name() == fldName ) ) ) )
{
const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName);
diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h
index e4a01f55..485bf910 100644
--- a/kmail/newfolderdialog.h
+++ b/kmail/newfolderdialog.h
@@ -50,7 +50,7 @@ class NewFolderDialog : public KDialogBase
TQ_OBJECT
public:
- NewFolderDialog( TQWidget* tqparent = 0, KMFolder *folder = 0 );
+ NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 );
~NewFolderDialog() {};
TQLabel* mNameLabel;
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index db27f7f5..b3d9c74b 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -211,7 +211,7 @@ namespace KMail {
partNode* parentNode = &startNode;
partNode* newNode = new partNode(false, myBody);
- // Build the object tree of the new node before setting the tqparent, as otherwise
+ // Build the object tree of the new node before setting the parent, as otherwise
// buildObjectTree() would erronously modify the parents as well
newNode->buildObjectTree( false );
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index e4cb5922..333d14b0 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -279,7 +279,7 @@ KMMsgEncryptionState partNode::overallEncryptionState() const
{
KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown;
if( mEncryptionState == KMMsgNotEncrypted ) {
- // NOTE: tqchildren are tested ONLY when tqparent is not encrypted
+ // NOTE: tqchildren are tested ONLY when parent is not encrypted
if( mChild )
myState = mChild->overallEncryptionState();
else
@@ -320,7 +320,7 @@ KMMsgSignatureState partNode::overallSignatureState() const
{
KMMsgSignatureState myState = KMMsgSignatureStateUnknown;
if( mSignatureState == KMMsgNotSigned ) {
- // tqchildren are tested ONLY when tqparent is not signed
+ // tqchildren are tested ONLY when parent is not signed
if( mChild )
myState = mChild->overallSignatureState();
else
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 2bdfe399..04a695a9 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -119,8 +119,8 @@ TQStringList Recipient::allTypeLabels()
}
-RecipientComboBox::RecipientComboBox( TQWidget *tqparent )
- : TQComboBox( tqparent )
+RecipientComboBox::RecipientComboBox( TQWidget *parent )
+ : TQComboBox( parent )
{
}
@@ -145,8 +145,8 @@ void RecipientLineEdit::keyPressEvent( TQKeyEvent *ev )
}
}
-RecipientLine::RecipientLine( TQWidget *tqparent )
- : TQWidget( tqparent ), mRecipientsCount( 0 ), mModified( false )
+RecipientLine::RecipientLine( TQWidget *parent )
+ : TQWidget( parent ), mRecipientsCount( 0 ), mModified( false )
{
TQBoxLayout *topLayout = new TQHBoxLayout( this );
topLayout->setSpacing( KDialog::spacingHint() );
@@ -320,8 +320,8 @@ void RecipientLine::setRemoveLineButtonEnabled( bool b )
// ------------ RecipientsView ---------------------
-RecipientsView::RecipientsView( TQWidget *tqparent )
- : TQScrollView( tqparent ), mCurDelLine( 0 ),
+RecipientsView::RecipientsView( TQWidget *parent )
+ : TQScrollView( parent ), mCurDelLine( 0 ),
mLineHeight( 0 ), mFirstColumnWidth( 0 ),
mModified( false )
{
@@ -698,8 +698,8 @@ void RecipientsView::moveCompletionPopup()
}
-RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *tqparent )
- : TQToolTip( tqparent ), mView( view )
+RecipientsToolTip::RecipientsToolTip( RecipientsView *view, TQWidget *parent )
+ : TQToolTip( parent ), mView( view )
{
}
@@ -748,8 +748,8 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
}
-SideWidget::SideWidget( RecipientsView *view, TQWidget *tqparent )
- : TQWidget( tqparent ), mView( view ), mRecipientPicker( 0 )
+SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
+ : TQWidget( parent ), mView( view ), mRecipientPicker( 0 )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
@@ -837,8 +837,8 @@ void SideWidget::pickRecipient()
}
-RecipientsEditor::RecipientsEditor( TQWidget *tqparent )
- : TQWidget( tqparent ), mModified( false )
+RecipientsEditor::RecipientsEditor( TQWidget *parent )
+ : TQWidget( parent ), mModified( false )
{
TQBoxLayout *topLayout = new TQHBoxLayout( this );
topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index 7bd9d13b..0c4aafbc 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -74,7 +74,7 @@ class RecipientComboBox : public TQComboBox
Q_OBJECT
TQ_OBJECT
public:
- RecipientComboBox( TQWidget *tqparent );
+ RecipientComboBox( TQWidget *parent );
signals:
void rightPressed();
@@ -88,8 +88,8 @@ class RecipientLineEdit : public KMLineEdit
Q_OBJECT
TQ_OBJECT
public:
- RecipientLineEdit( TQWidget * tqparent ) :
- KMLineEdit( true, tqparent ) {}
+ RecipientLineEdit( TQWidget * parent ) :
+ KMLineEdit( true, parent ) {}
signals:
void deleteMe();
@@ -105,7 +105,7 @@ class RecipientLine : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- RecipientLine( TQWidget *tqparent );
+ RecipientLine( TQWidget *parent );
void setRecipient( const Recipient & );
Recipient recipient() const;
@@ -175,7 +175,7 @@ class RecipientsView : public TQScrollView
Q_OBJECT
TQ_OBJECT
public:
- RecipientsView( TQWidget *tqparent );
+ RecipientsView( TQWidget *parent );
TQSize tqminimumSizeHint() const;
TQSize tqsizeHint() const;
@@ -253,7 +253,7 @@ class RecipientsView : public TQScrollView
class RecipientsToolTip : public TQToolTip
{
public:
- RecipientsToolTip( RecipientsView *, TQWidget *tqparent );
+ RecipientsToolTip( RecipientsView *, TQWidget *parent );
protected:
void maybeTip( const TQPoint & p );
@@ -269,7 +269,7 @@ class SideWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- SideWidget( RecipientsView *view, TQWidget *tqparent );
+ SideWidget( RecipientsView *view, TQWidget *parent );
~SideWidget();
RecipientsPicker* picker() const;
@@ -301,7 +301,7 @@ class RecipientsEditor : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- RecipientsEditor( TQWidget *tqparent );
+ RecipientsEditor( TQWidget *parent );
~RecipientsEditor();
void clear();
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 8ef12ed2..05e55253 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -39,8 +39,8 @@
#include <tqlineedit.h>
#include <tqtextedit.h>
-Composer::Composer( TQWidget *tqparent )
- : TQWidget( tqparent )
+Composer::Composer( TQWidget *parent )
+ : TQWidget( parent )
{
TQGridLayout *topLayout = new TQGridLayout( this );
topLayout->setMargin( 4 );
diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h
index ea2f1e9e..77387218 100644
--- a/kmail/recipientseditortest.h
+++ b/kmail/recipientseditortest.h
@@ -33,7 +33,7 @@ class Composer : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- Composer( TQWidget *tqparent );
+ Composer( TQWidget *parent );
public slots:
void slotClose();
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 11b2cec6..097cedd0 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -227,9 +227,9 @@ RecipientItem *RecipientViewItem::recipientItem() const
}
-RecipientsListToolTip::RecipientsListToolTip( TQWidget *tqparent,
+RecipientsListToolTip::RecipientsListToolTip( TQWidget *parent,
KListView *listView )
- : TQToolTip( tqparent )
+ : TQToolTip( parent )
{
mListView = listView;
}
@@ -327,8 +327,8 @@ TQString RecipientsCollection::id() const
return mId;
}
-SearchLine::SearchLine( TQWidget *tqparent, KListView *listView )
- : KListViewSearchLine( tqparent, listView )
+SearchLine::SearchLine( TQWidget *parent, KListView *listView )
+ : KListViewSearchLine( parent, listView )
{
}
@@ -340,8 +340,8 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev )
}
-RecipientsPicker::RecipientsPicker( TQWidget *tqparent )
- : TQDialog( tqparent, "RecipientsPicker" )
+RecipientsPicker::RecipientsPicker( TQWidget *parent )
+ : TQDialog( parent, "RecipientsPicker" )
#ifndef KDEPIM_NEW_DISTRLISTS
, mDistributionListManager( 0 )
#endif
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 9f989275..6e3d7998 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -117,7 +117,7 @@ class RecipientViewItem : public KListViewItem
class RecipientsListToolTip : public TQToolTip
{
public:
- RecipientsListToolTip( TQWidget *tqparent, KListView * );
+ RecipientsListToolTip( TQWidget *parent, KListView * );
protected:
void maybeTip( const TQPoint &pos );
@@ -165,7 +165,7 @@ class SearchLine : public KListViewSearchLine
Q_OBJECT
TQ_OBJECT
public:
- SearchLine( TQWidget *tqparent, KListView *listView );
+ SearchLine( TQWidget *parent, KListView *listView );
signals:
void downPressed();
@@ -181,7 +181,7 @@ class RecipientsPicker : public TQDialog
Q_OBJECT
TQ_OBJECT
public:
- RecipientsPicker( TQWidget *tqparent );
+ RecipientsPicker( TQWidget *parent );
~RecipientsPicker();
void setRecipients( const Recipient::List & );
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index 7a3507ef..4027375b 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -52,9 +52,9 @@ using KRecentAddress::RecentAddresses;
using namespace KMail;
-RedirectDialog::RedirectDialog( TQWidget *tqparent, const char *name,
+RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
bool modal, bool immediate )
- : KDialogBase( tqparent, name, modal, i18n( "Redirect Message" ),
+ : KDialogBase( parent, name, modal, i18n( "Redirect Message" ),
User1|User2|Cancel, ( immediate ? User1 : User2 ), false )
{
TQVBox *vbox = makeVBoxMainWidget();
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index d849b7a2..c3480313 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -54,13 +54,13 @@ namespace KMail {
public:
/** Constructor
- @param tqparent tqparent TQWidget
+ @param parent parent 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 *tqparent=0, const char *name=0,
+ RedirectDialog( TQWidget *parent=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 1d4d3b99..0b2b2fb5 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -49,8 +49,8 @@
namespace KMail {
- RegExpLineEdit::RegExpLineEdit( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name ),
+ RegExpLineEdit::RegExpLineEdit( TQWidget *parent, const char *name )
+ : TQWidget( parent, name ),
mLineEdit( 0 ),
mRegExpEditButton( 0 ),
mRegExpEditDialog( 0 )
@@ -58,9 +58,9 @@ namespace KMail {
initWidget();
}
- RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *tqparent,
+ RegExpLineEdit::RegExpLineEdit( const TQString &str, TQWidget *parent,
const char *name )
- : TQWidget( tqparent, name ),
+ : TQWidget( parent, name ),
mLineEdit( 0 ),
mRegExpEditButton( 0 ),
mRegExpEditDialog( 0 )
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index 65a1b731..2cfeaa4a 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -50,9 +50,9 @@ namespace KMail {
TQ_OBJECT
public:
- RegExpLineEdit( const TQString &str, TQWidget *tqparent = 0,
+ RegExpLineEdit( const TQString &str, TQWidget *parent = 0,
const char *name = 0 );
- RegExpLineEdit( TQWidget *tqparent = 0, const char *name = 0 );
+ RegExpLineEdit( TQWidget *parent = 0, const char *name = 0 );
TQString text() const;
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 8f69e6f6..ed8aa5cb 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -96,7 +96,7 @@ void RenameJob::execute()
{
if ( mNewParent )
{
- // move the folder to a different tqparent
+ // move the folder to a different parent
KMFolderType type = mStorage->folderType();
if ( ( type == KMFolderTypeMbox || type == KMFolderTypeMaildir ) &&
mNewParent->type() == KMStandardDir &&
diff --git a/kmail/renamejob.h b/kmail/renamejob.h
index 7e968ec3..9389fc0c 100644
--- a/kmail/renamejob.h
+++ b/kmail/renamejob.h
@@ -57,7 +57,7 @@ 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 tqparent if the folder should be moved, else 0
+ * @param newParent the new parent 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 42ef1ca4..9cc9e3ec 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -228,12 +228,12 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler
}
namespace {
- /** Returns the number of immediate tqchildren of tqparent with the given object
+ /** Returns the number of immediate tqchildren of parent with the given object
name. Used by RuleWidgetHandlerManager::createWidgets().
*/
- int childCount( const TQObject *tqparent, const char *objName )
+ int childCount( const TQObject *parent, const char *objName )
{
- TQObjectList *list = tqparent->queryList( 0, objName, false, false );
+ TQObjectList *list = parent->queryList( 0, objName, false, false );
if ( !list )
return 0;
const int count = list->count();
@@ -357,10 +357,10 @@ namespace {
// This is a simplified and constified copy of TQObject::child(). According
// 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,
+ TQObject* TQObject_child_const( const TQObject *parent,
const char *objName )
{
- const TQObjectList list = tqparent->childrenListObject();
+ const TQObjectList list = parent->childrenListObject();
if ( list.isEmpty() )
return 0;
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 6250d761..8714109c 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 *tqparent, SearchWindow* sw, const char* name = 0 ) :
- KListView( tqparent, name ),
+ MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) :
+ KListView( parent, name ),
mSearchWindow( sw )
{}
@@ -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->tqparent();
+ KMFolder *pFolder = msg->parent();
if (!mFolders.contains(pFolder)) {
mFolders.append(pFolder);
pFolder->open("searchwindow");
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index f8da35d7..6ea4adf8 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -73,13 +73,13 @@ class SearchWindow: public KDialogBase, virtual public KXMLGUIClient
public:
/**
* Creates a new search window.
- * @param tqparent The tqparent widget.
+ * @param parent The parent 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* tqparent, const char* name=0,
+ SearchWindow( KMMainWidget* parent, const char* name=0,
KMFolder *curFolder=0, bool modal=false );
virtual ~SearchWindow();
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index e9d1fe96..9c22539c 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -53,8 +53,8 @@ namespace KMail {
config.writeEntry( "sieve-vacation-filename", mVacationFileName );
}
- SieveConfigEditor::SieveConfigEditor( TQWidget * tqparent, const char * name )
- : TQWidget( tqparent, name )
+ SieveConfigEditor::SieveConfigEditor( TQWidget * parent, const char * name )
+ : TQWidget( parent, name )
{
// tmp. vars:
int row = -1;
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index d426b998..2765f6a5 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -89,7 +89,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- SieveConfigEditor( TQWidget * tqparent=0, const char * name=0 );
+ SieveConfigEditor( TQWidget * parent=0, const char * name=0 );
bool managesieveSupported() const;
virtual void setManagesieveSupported( bool enable );
diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp
index 75d07495..1d33e2aa 100644
--- a/kmail/sievedebugdialog.cpp
+++ b/kmail/sievedebugdialog.cpp
@@ -186,8 +186,8 @@ private:
namespace KMail
{
-SieveDebugDialog::SieveDebugDialog( TQWidget *tqparent, const char *name )
-: KDialogBase( tqparent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok,
+SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name )
+: KDialogBase( parent, name, true, i18n( "Sieve Diagnostics" ), KDialogBase::Ok,
KDialogBase::Ok, true ),
mSieveJob( 0 )
{
diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h
index 6457280b..669a13d5 100644
--- a/kmail/sievedebugdialog.h
+++ b/kmail/sievedebugdialog.h
@@ -53,7 +53,7 @@ class SieveDebugDialog : public KDialogBase
TQ_OBJECT
public:
- SieveDebugDialog( TQWidget *tqparent = 0, const char *name = 0 );
+ SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 );
virtual ~SieveDebugDialog();
protected:
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 23517b53..6993f8f6 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 * tqparent, const char * name )
- : TQObject( tqparent, name ),
+ TQObject * parent, const char * name )
+ : TQObject( parent, 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 * tqparent, const char * name )
- : TQObject( tqparent, name ),
+ TQObject * parent, const char * name )
+ : TQObject( parent, name ),
mUrl( url ), mJob( 0 ), mDec( 0 ),
mScript( script ), mFileExists( DontKnow ), mCommands( commands ),
mShowProgressInfo(showProgressInfo)
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index b2ec73d0..ddf3e6a9 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -38,11 +38,11 @@ namespace KMail {
enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete };
SieveJob( const KURL & url, const TQString & script,
const TQValueStack<Command> & commands,
- TQObject * tqparent=0, const char * name=0 );
+ TQObject * parent=0, const char * name=0 );
SieveJob( const KURL & url, const TQString & script,
const TQValueStack<Command> & commands,
bool showProgressInfo,
- TQObject * tqparent=0, const char * name=0 );
+ TQObject * parent=0, const char * name=0 );
virtual ~SieveJob();
public:
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 7785b45f..fb3c7c40 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -42,8 +42,8 @@ using namespace KMail;
namespace KMail {
- SignatureConfigurator::SignatureConfigurator( TQWidget * tqparent, const char * name )
- : TQWidget( tqparent, name )
+ SignatureConfigurator::SignatureConfigurator( TQWidget * parent, const char * name )
+ : TQWidget( parent, name )
{
// tmp. vars:
TQLabel * label;
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index e9f0fdf0..2d46ac5d 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -35,7 +35,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- SignatureConfigurator( TQWidget * tqparent=0, const char * name=0 );
+ SignatureConfigurator( TQWidget * parent=0, const char * name=0 );
virtual ~SignatureConfigurator();
bool isSignatureEnabled() const;
diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h
index 00632fbd..6bfc3eb3 100644
--- a/kmail/simplefoldertree.h
+++ b/kmail/simplefoldertree.h
@@ -133,9 +133,9 @@ template <class T> class SimpleFolderTreeBase : public TreeBase
public:
- inline SimpleFolderTreeBase( TQWidget * tqparent, KMFolderTree *folderTree,
+ inline SimpleFolderTreeBase( TQWidget * parent, KMFolderTree *folderTree,
const TQString &preSelection, bool mustBeReadWrite )
- : TreeBase( tqparent, folderTree, preSelection, mustBeReadWrite )
+ : TreeBase( parent, 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 * tqparent )
+ virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent )
{
- return new SimpleFolderTreeItem<T>( tqparent );
+ return new SimpleFolderTreeItem<T>( parent );
}
- virtual SimpleFolderTreeItem<T>* createItem( TQListView * tqparent, TQListViewItem* afterListViewItem )
+ virtual SimpleFolderTreeItem<T>* createItem( TQListView * parent, TQListViewItem* afterListViewItem )
{
- return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem );
+ return new SimpleFolderTreeItem<T>( parent, afterListViewItem );
}
- virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent, TQListViewItem* afterListViewItem )
+ virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent, TQListViewItem* afterListViewItem )
{
- return new SimpleFolderTreeItem<T>( tqparent, afterListViewItem );
+ return new SimpleFolderTreeItem<T>( parent, afterListViewItem );
}
- virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * tqparent )
+ virtual SimpleFolderTreeItem<T>* createItem( TQListViewItem * parent )
{
- return new SimpleFolderTreeItem<T>( tqparent );
+ return new SimpleFolderTreeItem<T>( parent );
}
inline void keyPressEvent( TQKeyEvent *e )
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 4ab24f69..8520af84 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -56,14 +56,14 @@ static inline TQListBoxItem * findSelectedItem( TQListBox * lb ) {
return item;
}
-SimpleStringListEditor::SimpleStringListEditor( TQWidget * tqparent,
+SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent,
const char * name,
ButtonCode buttons,
const TQString & addLabel,
const TQString & removeLabel,
const TQString & modifyLabel,
const TQString & addDialogLabel )
- : TQWidget( tqparent, name ),
+ : TQWidget( parent, name ),
mAddButton(0), mRemoveButton(0), mModifyButton(0),
mUpButton(0), mDownButton(0),
mAddDialogLabel( addDialogLabel.isEmpty() ?
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index edcd2a7c..49169f7a 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -58,7 +58,7 @@ public:
};
/** Constructor. Populates the list with @p strings. */
- SimpleStringListEditor( TQWidget * tqparent=0, const char * name=0,
+ SimpleStringListEditor( TQWidget * parent=0, const char * name=0,
ButtonCode buttons=Unsorted,
const TQString & addLabel=TQString(),
const TQString & removeLabel=TQString(),
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 2229a763..25a64ae6 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -26,14 +26,14 @@
#include "kmessagebox.h"
/*
- * Constructs a SnippetDlg as a child of 'tqparent', with the
+ * Constructs a SnippetDlg as a child of 'parent', 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* tqparent, const char* name, bool modal, WFlags fl )
- : SnippetDlgBase( tqparent, name, modal, fl ), actionCollection( ac )
+SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl )
+ : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac )
{
if ( !name )
setName( "SnippetDlg" );
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index e6ac0511..6aa62d0f 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase
TQ_OBJECT
public:
- SnippetDlg( KActionCollection* ac, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~SnippetDlg();
void setShowShortcut( bool show );
diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp
index 9d835d63..f9f3aa87 100644
--- a/kmail/snippetitem.cpp
+++ b/kmail/snippetitem.cpp
@@ -17,8 +17,8 @@
#include <tqstring.h>
-SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text )
- : TQListViewItem( tqparent, name ), action(0)
+SnippetItem::SnippetItem(TQListView * parent, TQString name, TQString text )
+ : TQListViewItem( parent, name ), action(0)
{
strName = name;
strText = text;
@@ -26,12 +26,12 @@ SnippetItem::SnippetItem(TQListView * tqparent, TQString name, TQString text )
setOpen( true );
}
-SnippetItem::SnippetItem(TQListViewItem * tqparent, TQString name, TQString text)
- : TQListViewItem( tqparent, name ), action(0)
+SnippetItem::SnippetItem(TQListViewItem * parent, TQString name, TQString text)
+ : TQListViewItem( parent, name ), action(0)
{
strName = name;
strText = text;
- iParent = ((SnippetGroup *)tqparent)->getId();
+ iParent = ((SnippetGroup *)parent)->getId();
setOpen( true );
}
@@ -81,7 +81,7 @@ void SnippetItem::setName(TQString name)
void SnippetItem::resetParent()
{
- SnippetGroup * group = dynamic_cast<SnippetGroup*>(tqparent());
+ SnippetGroup * group = dynamic_cast<SnippetGroup*>(parent());
if (group)
iParent = group->getId();
}
@@ -129,8 +129,8 @@ Deklaration for class SnippetGroup
int SnippetGroup::iMaxId = 1;
-SnippetGroup::SnippetGroup(TQListView * tqparent, TQString name, int id)
- : SnippetItem(tqparent, name, i18n("GROUP"))
+SnippetGroup::SnippetGroup(TQListView * parent, TQString name, int id)
+ : SnippetItem(parent, name, i18n("GROUP"))
{
if (id > 0) {
iId = id;
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index 2ddc609f..f15fb07d 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -35,12 +35,12 @@ friend class SnippetGroup;
Q_OBJECT
TQ_OBJECT
public:
- SnippetItem(TQListViewItem * tqparent, TQString name, TQString text);
+ SnippetItem(TQListViewItem * parent, TQString name, TQString text);
~SnippetItem();
TQString getName();
TQString getText();
- using TQListViewItem::tqparent;
+ using TQListViewItem::parent;
int getParent() { return iParent; }
void resetParent();
void setText(TQString text);
@@ -55,7 +55,7 @@ public slots:
void slotExecute();
private:
- SnippetItem(TQListView * tqparent, TQString name, TQString text);
+ SnippetItem(TQListView * parent, TQString name, TQString text);
TQString strName;
TQString strText;
int iParent;
@@ -70,7 +70,7 @@ it in the main TQPtrList<SnippetItem>.
*/
class SnippetGroup : public SnippetItem {
public:
- SnippetGroup(TQListView * tqparent, TQString name, int id);
+ SnippetGroup(TQListView * parent, TQString name, int id);
~SnippetGroup();
int getId() { return iId; }
diff --git a/kmail/snippetsettings.cpp b/kmail/snippetsettings.cpp
index 8dce0d31..e61ebf43 100644
--- a/kmail/snippetsettings.cpp
+++ b/kmail/snippetsettings.cpp
@@ -20,14 +20,14 @@
#include "snippetwidget.h"
-SnippetSettings::SnippetSettings(TQWidget *tqparent, const char *name)
- : SnippetSettingsBase(tqparent, name)
+SnippetSettings::SnippetSettings(TQWidget *parent, const char *name)
+ : SnippetSettingsBase(parent, name)
{
_widget = NULL;
}
-SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *tqparent, const char *name)
- : SnippetSettingsBase(tqparent, name)
+SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name)
+ : SnippetSettingsBase(parent, name)
{
_cfg = w->getSnippetConfig();
_widget = w;
diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h
index 05ce99a5..ca0eccc8 100644
--- a/kmail/snippetsettings.h
+++ b/kmail/snippetsettings.h
@@ -31,8 +31,8 @@ class SnippetSettings : public SnippetSettingsBase
Q_OBJECT
TQ_OBJECT
public:
- SnippetSettings(TQWidget *tqparent = 0, const char *name = 0);
- SnippetSettings(SnippetWidget * w, TQWidget *tqparent = 0, const char *name = 0);
+ SnippetSettings(TQWidget *parent = 0, const char *name = 0);
+ SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0);
~SnippetSettings();
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 4dba053e..920434aa 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -44,8 +44,8 @@
#include <cassert>
-SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent)
- : KListView(tqparent, "snippet widget"), TQToolTip( viewport() ),
+SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent)
+ : KListView(parent, "snippet widget"), TQToolTip( viewport() ),
mEditor( editor ), mActionCollection( actionCollection )
{
// init the TQPtrList
@@ -85,7 +85,7 @@ SnippetWidget::~SnippetWidget()
writeConfig();
delete _cfg;
- /* We need to delete the child items before the tqparent items
+ /* We need to delete the child items before the parent 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()->tqparent());
+ group = dynamic_cast<SnippetGroup*>(selectedItem()->parent());
/* still no group, let's make a default one */
if (!group ) {
@@ -139,12 +139,12 @@ void SnippetWidget::slotAdd()
}
/*!
- \fn SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text )
+ \fn SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text )
Helper factory method.
*/
-SnippetItem* SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut )
+SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut )
{
- SnippetItem * item = new SnippetItem(tqparent, name, text);
+ SnippetItem * item = new SnippetItem(parent, name, text);
const TQString actionName = i18n("Snippet %1").tqarg(name);
const TQString normalizedName = TQString(actionName).replace(" ", "_");
if ( !mActionCollection->action(normalizedName.utf8().data() ) ) {
@@ -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 tqparent we need to move the snippet */
+ /* if the user changed the parent 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->tqparent()->takeItem(pSnippet);
+ pSnippet->parent()->takeItem(pSnippet);
newGroup->insertItem(pSnippet);
pSnippet->resetParent();
}
@@ -909,7 +909,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
SnippetGroup *group = dynamic_cast<SnippetGroup *>(item2);
if (!group)
- group = dynamic_cast<SnippetGroup *>(item2->tqparent());
+ group = dynamic_cast<SnippetGroup *>(item2->parent());
TQCString dropped;
TQByteArray data = e->tqencodedData("text/plain");
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index bc45d6d4..a55b91e0 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -48,7 +48,7 @@ class SnippetWidget : public KListView, public TQToolTip
TQ_OBJECT
public:
- SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* tqparent = 0);
+ SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0);
~SnippetWidget();
TQPtrList<SnippetItem> * getList() { return (&_list); }
void writeConfig();
@@ -68,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* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut );
+ SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut );
TQPtrList<SnippetItem> _list;
TQMap<TQString, TQString> _mapSaved;
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 49ece85d..5b9fbf7e 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -45,9 +45,9 @@
namespace KMail {
-SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *tqparent, const TQString &caption,
+SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString &caption,
KAccount *acct, TQString startPath )
- : KSubscription( tqparent, caption, acct, User1, TQString(), false ),
+ : KSubscription( parent, caption, acct, User1, TQString(), false ),
mStartPath( startPath ), mSubscribed( false ), mForceSubscriptionEnable( false)
{
// hide unneeded checkboxes
@@ -111,18 +111,18 @@ void SubscriptionDialogBase::moveChildrenToNewParent( GroupItem *oldItem, GroupI
void SubscriptionDialogBase::createListViewItem( int i )
{
GroupItem *item = 0;
- GroupItem *tqparent = 0;
+ GroupItem *parent = 0;
- // get the tqparent
+ // get the parent
GroupItem *oldItem = 0;
TQString parentPath;
- findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &tqparent, &oldItem );
+ findParentItem( mFolderNames[i], mFolderPaths[i], parentPath, &parent, &oldItem );
- if (!tqparent && parentPath != "/")
+ if (!parent && parentPath != "/")
{
- // the tqparent is not available and it's no root-item
+ // the parent is not available and it's no root-item
// this happens when the folders do not arrive in hierarchical order
- // so we create each tqparent in advance
+ // so we create each parent in advance
TQStringList folders = TQStringList::split(mDelimiter, parentPath);
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 (tqparent)
- item = new GroupItem(tqparent, info, this, false);
+ if (parent)
+ item = new GroupItem(parent, info, this, false);
else
item = new GroupItem(folderTree(), info, this, false);
mItemDict.insert(info.path, item);
}
- tqparent = item;
+ parent = item;
++i;
} // folders
- } // tqparent
+ } // parent
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 (tqparent)
- item = new GroupItem(tqparent, info, this, checkable);
+ if (parent)
+ item = new GroupItem(parent, info, this, checkable);
else
item = new GroupItem(folderTree(), info, this, checkable);
@@ -199,17 +199,17 @@ void SubscriptionDialogBase::createListViewItem( int i )
//------------------------------------------------------------------------------
void SubscriptionDialogBase::findParentItem( TQString &name, TQString &path, TQString &parentPath,
- GroupItem **tqparent, GroupItem **oldItem )
+ GroupItem **parent, GroupItem **oldItem )
{
- // remove the name (and the separator) from the path to get the tqparent path
+ // remove the name (and the separator) from the path to get the parent path
int start = path.length() - (name.length()+2);
int length = name.length()+1;
if (start < 0) start = 0;
parentPath = path;
parentPath.remove(start, length);
- // find the tqparent by it's path
- *tqparent = mItemDict[parentPath];
+ // find the parent by it's path
+ *parent = mItemDict[parentPath];
// check if the item already exists
*oldItem = mItemDict[path];
@@ -303,9 +303,9 @@ void SubscriptionDialogBase::loadingComplete()
// implementation for server side subscription
//------------------------------------------------------------------------------
-SubscriptionDialog::SubscriptionDialog( TQWidget *tqparent, const TQString &caption,
+SubscriptionDialog::SubscriptionDialog( TQWidget *parent, const TQString &caption,
KAccount *acct, TQString startPath )
- : SubscriptionDialogBase( tqparent, caption, acct, startPath )
+ : SubscriptionDialogBase( parent, caption, acct, startPath )
{
}
diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h
index 4d3a01db..9d16c9e2 100644
--- a/kmail/subscriptiondialog.h
+++ b/kmail/subscriptiondialog.h
@@ -50,7 +50,7 @@ namespace KMail {
TQ_OBJECT
public:
- SubscriptionDialogBase( TQWidget *tqparent,
+ SubscriptionDialogBase( TQWidget *parent,
const TQString &caption,
KAccount* acct,
TQString startPath = TQString() );
@@ -60,10 +60,10 @@ namespace KMail {
protected:
/**
- * Find the tqparent item
+ * Find the parent item
*/
void findParentItem ( TQString &name, TQString &path, TQString &compare,
- GroupItem **tqparent, GroupItem **oldItem );
+ GroupItem **parent, GroupItem **oldItem );
/**
* Process the next prefix in mPrefixList
@@ -131,7 +131,7 @@ namespace KMail {
TQ_OBJECT
public:
- SubscriptionDialog( TQWidget *tqparent,
+ SubscriptionDialog( TQWidget *parent,
const TQString &caption,
KAccount* acct,
TQString startPath = TQString() );
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index dab5665e..d5a8d375 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -1004,10 +1004,10 @@ TQString TemplateParser::findTemplate()
TQString tmpl;
if ( !mFolder ) { // find folder message belongs to
- mFolder = mMsg->tqparent();
+ mFolder = mMsg->parent();
if ( !mFolder ) {
if ( mOrigMsg ) {
- mFolder = mOrigMsg->tqparent();
+ mFolder = mOrigMsg->parent();
}
if ( !mFolder ) {
kdDebug(5006) << "Oops! No folder for message" << endl;
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 09614064..b3c05c29 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -38,8 +38,8 @@
#include "templatesconfiguration.h"
-TemplatesConfiguration::TemplatesConfiguration( TQWidget *tqparent, const char *name )
- :TemplatesConfigurationBase( tqparent, name )
+TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *name )
+ :TemplatesConfigurationBase( parent, name )
{
TQFont f = KGlobalSettings::fixedFont();
textEdit_new->setFont( f );
diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h
index 48293a06..47dbdea5 100644
--- a/kmail/templatesconfiguration.h
+++ b/kmail/templatesconfiguration.h
@@ -33,7 +33,7 @@ class TemplatesConfiguration : public TemplatesConfigurationBase
public:
- TemplatesConfiguration( TQWidget *tqparent = 0, const char *name = 0 );
+ TemplatesConfiguration( TQWidget *parent = 0, const char *name = 0 );
void loadFromGlobal();
void saveToGlobal();
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 269c40c0..82558563 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -30,9 +30,9 @@
#include "templatesinsertcommand.h"
-TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *tqparent,
+TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
const char *name )
- : TQPushButton( tqparent, name )
+ : TQPushButton( parent, name )
{
setText( i18n( "&Insert Command..." ) );
connect( this, TQT_SIGNAL( clicked() ),
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index 51255244..2251340d 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -33,7 +33,7 @@ class TemplatesInsertCommand : public TQPushButton
TQ_OBJECT
public:
- TemplatesInsertCommand( TQWidget *tqparent, const char *name = 0 );
+ TemplatesInsertCommand( TQWidget *parent, const char *name = 0 );
~TemplatesInsertCommand();
public:
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 137dbfcd..19aff315 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -27,9 +27,9 @@
using namespace KMail;
-TreeBase::TreeBase( TQWidget *tqparent, KMFolderTree *folderTree,
+TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree,
const TQString &preSelection, bool mustBeReadWrite )
- : KListView( tqparent ), mFolderTree( folderTree )
+ : KListView( parent ), 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 * tqparent = item->tqparent();
- while ( tqparent ) {
- if (!tqparent->isOpen()) {
+ TQListViewItem * parent = item->parent();
+ while ( parent ) {
+ if (!parent->isOpen()) {
visible = false;
break;
}
- tqparent = tqparent->tqparent();
+ parent = parent->parent();
}
if ( visible ) {
@@ -174,7 +174,7 @@ void TreeBase::reload( bool mustBeReadWrite, bool showOutbox, bool showImapFolde
}
else {
if ( depth > lastDepth ) {
- // next lower level - tqparent node will get opened
+ // next lower level - parent 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->tqparent(), lastItem );
+ item = createItem( lastItem->parent(), 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->tqparent() ) {
- lastItem = static_cast<TQListViewItem *>( lastItem->tqparent() );
+ while ( ( depth <= --lastDepth ) && lastItem->parent() ) {
+ lastItem = static_cast<TQListViewItem *>( lastItem->parent() );
}
- if ( lastItem->tqparent() )
- item = createItem( lastItem->tqparent(), lastItem );
+ if ( lastItem->parent() )
+ item = createItem( lastItem->parent(), 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 e11a518c..f786377b 100644
--- a/kmail/treebase.h
+++ b/kmail/treebase.h
@@ -35,7 +35,7 @@ class TreeBase : public KListView
Q_OBJECT
TQ_OBJECT
public:
- TreeBase( TQWidget * tqparent, KMFolderTree *folderTree,
+ TreeBase( TQWidget * parent, KMFolderTree *folderTree,
const TQString &preSelection, bool mustBeReadWrite );
virtual ~TreeBase() {}
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index cee3a3cb..fbcf46c8 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -428,8 +428,8 @@ namespace {
namespace KMail {
- Vacation::Vacation( TQObject * tqparent, bool checkOnly, const char * name )
- : TQObject( tqparent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly )
+ Vacation::Vacation( TQObject * parent, bool checkOnly, const char * name )
+ : TQObject( parent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly )
{
mUrl = findURL();
kdDebug(5006) << "Vacation: found url \"" << mUrl.prettyURL() << "\"" << endl;
diff --git a/kmail/vacation.h b/kmail/vacation.h
index 5913548b..c7a9980a 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -39,7 +39,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- Vacation( TQObject * tqparent=0, bool checkOnly = false, const char * name=0 );
+ Vacation( TQObject * parent=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 e2ca8e0c..87e1d841 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 * tqparent,
+ VacationDialog::VacationDialog( const TQString & caption, TQWidget * parent,
const char * name, bool modal )
- : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, tqparent, name, modal )
+ : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal )
{
KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index 9cedf4ef..bbb2a2c1 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -38,7 +38,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- VacationDialog( const TQString & caption, TQWidget * tqparent=0,
+ VacationDialog( const TQString & caption, TQWidget * parent=0,
const char * name=0, bool modal=true );
virtual ~VacationDialog();
diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp
index 0fd71d94..0e34f72c 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 *tqparent, const TQByteArray &vCard, const char *name )
+KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name )
#else
-KMail::VCardViewer::VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name )
+KMail::VCardViewer::VCardViewer( TQWidget *parent, const TQString &vCard, const char *name )
#endif
- : KDialogBase( tqparent, name, false, i18n("VCard Viewer"), User1|User2|User3|Close, Close,
+ : KDialogBase( parent, 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 3da13c39..87a6611a 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -40,9 +40,9 @@ class VCardViewer : public KDialogBase
TQ_OBJECT
public:
#if defined(KABC_VCARD_ENCODING_FIX)
- VCardViewer( TQWidget *tqparent, const TQByteArray &vCard, const char *name );
+ VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name );
#else
- VCardViewer( TQWidget *tqparent, const TQString &vCard, const char *name );
+ VCardViewer( TQWidget *parent, const TQString &vCard, const char *name );
#endif
virtual ~VCardViewer();
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index b49394dc..5b56e291 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -70,8 +70,8 @@ using namespace KPIM;
namespace KMail {
- XFaceConfigurator::XFaceConfigurator( TQWidget * tqparent, const char * name )
- : TQWidget( tqparent, name )
+ XFaceConfigurator::XFaceConfigurator( TQWidget * parent, const char * name )
+ : TQWidget( parent, name )
{
// tmp. vars:
TQLabel * label;
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index 8d0792c8..e8fa1b0e 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -33,7 +33,7 @@ namespace KMail {
Q_OBJECT
TQ_OBJECT
public:
- XFaceConfigurator( TQWidget * tqparent=0, const char * name=0 );
+ XFaceConfigurator( TQWidget * parent=0, const char * name=0 );
virtual ~XFaceConfigurator();
bool isXFaceEnabled() const;