summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kmail
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail')
-rw-r--r--kmail/ChangeLog10
-rw-r--r--kmail/Mainpage.dox104
-rw-r--r--kmail/TODO2
-rw-r--r--kmail/aboutdata.cpp10
-rw-r--r--kmail/aboutdata.h6
-rw-r--r--kmail/accountcombobox.cpp10
-rw-r--r--kmail/accountcombobox.h11
-rw-r--r--kmail/accountdialog.cpp66
-rw-r--r--kmail/accountdialog.h9
-rw-r--r--kmail/accountmanager.cpp14
-rw-r--r--kmail/accountmanager.h7
-rw-r--r--kmail/accountwizard.cpp22
-rw-r--r--kmail/accountwizard.h13
-rw-r--r--kmail/acljobs.cpp8
-rw-r--r--kmail/acljobs.h14
-rw-r--r--kmail/actionscheduler.cpp32
-rw-r--r--kmail/actionscheduler.h9
-rw-r--r--kmail/annotationjobs.cpp6
-rw-r--r--kmail/annotationjobs.h14
-rw-r--r--kmail/antispamconfig.cpp8
-rw-r--r--kmail/antispamconfig.h6
-rw-r--r--kmail/antispamwizard.cpp74
-rw-r--r--kmail/antispamwizard.h29
-rw-r--r--kmail/app_octetstream.cpp6
-rw-r--r--kmail/archivefolderdialog.cpp8
-rw-r--r--kmail/archivefolderdialog.h3
-rw-r--r--kmail/attachmentcollector.cpp8
-rw-r--r--kmail/attachmentcollector.h6
-rw-r--r--kmail/attachmentlistview.cpp6
-rw-r--r--kmail/attachmentlistview.h3
-rw-r--r--kmail/attachmentstrategy.cpp6
-rw-r--r--kmail/attachmentstrategy.h6
-rw-r--r--kmail/backupjob.cpp16
-rw-r--r--kmail/backupjob.h3
-rw-r--r--kmail/bodypartformatter.cpp8
-rw-r--r--kmail/bodypartformatter.h6
-rw-r--r--kmail/bodypartformatterfactory.cpp20
-rw-r--r--kmail/bodypartformatterfactory.h6
-rw-r--r--kmail/bodypartformatterfactory_p.h6
-rw-r--r--kmail/bodyvisitor.cpp20
-rw-r--r--kmail/bodyvisitor.h10
-rw-r--r--kmail/cachedimapjob.cpp56
-rw-r--r--kmail/cachedimapjob.h15
-rw-r--r--kmail/callback.cpp12
-rw-r--r--kmail/callback.h6
-rw-r--r--kmail/chiasmuskeyselector.cpp6
-rw-r--r--kmail/chiasmuskeyselector.h3
-rw-r--r--kmail/colorlistbox.cpp6
-rw-r--r--kmail/colorlistbox.h7
-rw-r--r--kmail/compactionjob.cpp16
-rw-r--r--kmail/compactionjob.h8
-rw-r--r--kmail/composer.h1
-rw-r--r--kmail/composercryptoconfiguration.ui20
-rw-r--r--kmail/configuredialog.cpp196
-rw-r--r--kmail/configuredialog.h4
-rw-r--r--kmail/configuredialog_p.cpp36
-rw-r--r--kmail/configuredialog_p.h125
-rw-r--r--kmail/copyfolderjob.cpp16
-rw-r--r--kmail/copyfolderjob.h11
-rw-r--r--kmail/csshelper.cpp6
-rw-r--r--kmail/csshelper.h6
-rw-r--r--kmail/customtemplates.cpp4
-rw-r--r--kmail/customtemplates.h3
-rw-r--r--kmail/customtemplates_base.ui34
-rw-r--r--kmail/dictionarycombobox.cpp10
-rw-r--r--kmail/dictionarycombobox.h9
-rw-r--r--kmail/distributionlistdialog.cpp14
-rw-r--r--kmail/distributionlistdialog.h2
-rw-r--r--kmail/editorwatcher.cpp8
-rw-r--r--kmail/editorwatcher.h11
-rw-r--r--kmail/encodingdetector.cpp16
-rw-r--r--kmail/encodingdetector.h2
-rw-r--r--kmail/encodingdetector_ja.cpp2
-rw-r--r--kmail/encodingdetector_ja_p.h4
-rw-r--r--kmail/expirejob.cpp14
-rw-r--r--kmail/expirejob.h7
-rw-r--r--kmail/expirypropertiesdialog.cpp4
-rw-r--r--kmail/expirypropertiesdialog.h1
-rw-r--r--kmail/favoritefolderview.cpp12
-rw-r--r--kmail/favoritefolderview.h8
-rw-r--r--kmail/filehtmlwriter.cpp6
-rw-r--r--kmail/filehtmlwriter.h6
-rw-r--r--kmail/filterimporterexporter.cpp18
-rw-r--r--kmail/filterimporterexporter.h11
-rw-r--r--kmail/filterlog.cpp6
-rw-r--r--kmail/filterlog.h11
-rw-r--r--kmail/filterlogdlg.cpp12
-rw-r--r--kmail/filterlogdlg.h9
-rw-r--r--kmail/folderIface.cpp18
-rw-r--r--kmail/folderIface.h7
-rw-r--r--kmail/folderdiaacltab.cpp68
-rw-r--r--kmail/folderdiaacltab.h14
-rw-r--r--kmail/folderdiaquotatab.cpp26
-rw-r--r--kmail/folderdiaquotatab.h17
-rw-r--r--kmail/folderdiaquotatab_p.cpp12
-rw-r--r--kmail/folderdiaquotatab_p.h15
-rw-r--r--kmail/folderjob.cpp6
-rw-r--r--kmail/folderjob.h19
-rw-r--r--kmail/folderpropertiesdialog.ui46
-rw-r--r--kmail/folderpropertiesdialog.ui.h2
-rw-r--r--kmail/folderrequester.cpp12
-rw-r--r--kmail/folderrequester.h15
-rw-r--r--kmail/foldersetselector.cpp4
-rw-r--r--kmail/foldersetselector.h3
-rw-r--r--kmail/foldershortcutdialog.cpp10
-rw-r--r--kmail/foldershortcutdialog.h9
-rw-r--r--kmail/folderstorage.cpp70
-rw-r--r--kmail/folderstorage.h45
-rw-r--r--kmail/foldertreebase.cpp6
-rw-r--r--kmail/foldertreebase.h3
-rw-r--r--kmail/folderutil.cpp32
-rw-r--r--kmail/folderutil.h10
-rw-r--r--kmail/folderviewtooltip.h8
-rw-r--r--kmail/globalsettings.cpp4
-rw-r--r--kmail/globalsettings.h5
-rw-r--r--kmail/headeritem.cpp50
-rw-r--r--kmail/headeritem.h32
-rw-r--r--kmail/headerlistquicksearch.cpp58
-rw-r--r--kmail/headerlistquicksearch.h27
-rw-r--r--kmail/headerstrategy.cpp6
-rw-r--r--kmail/headerstrategy.h6
-rw-r--r--kmail/headerstyle.cpp46
-rw-r--r--kmail/headerstyle.h6
-rw-r--r--kmail/htmlstatusbar.cpp24
-rw-r--r--kmail/htmlstatusbar.h9
-rw-r--r--kmail/identitydialog.cpp24
-rw-r--r--kmail/identitydialog.h9
-rw-r--r--kmail/identitydrag.cpp6
-rw-r--r--kmail/identitydrag.h9
-rw-r--r--kmail/identitylistview.cpp18
-rw-r--r--kmail/identitylistview.h15
-rw-r--r--kmail/imapaccountbase.cpp154
-rw-r--r--kmail/imapaccountbase.h33
-rw-r--r--kmail/imapjob.cpp90
-rw-r--r--kmail/imapjob.h13
-rw-r--r--kmail/importarchivedialog.cpp8
-rw-r--r--kmail/importarchivedialog.h3
-rw-r--r--kmail/importjob.cpp32
-rw-r--r--kmail/importjob.h13
-rw-r--r--kmail/index.cpp32
-rw-r--r--kmail/index.h10
-rw-r--r--kmail/interfaces/bodypart.h14
-rw-r--r--kmail/interfaces/bodypartformatter.h6
-rw-r--r--kmail/interfaces/bodyparturlhandler.h10
-rw-r--r--kmail/interfaces/htmlwriter.h6
-rw-r--r--kmail/interfaces/observable.h6
-rw-r--r--kmail/interfaces/observer.h6
-rw-r--r--kmail/interfaces/rulewidgethandler.h6
-rw-r--r--kmail/interfaces/urlhandler.h8
-rw-r--r--kmail/isubject.h6
-rw-r--r--kmail/jobscheduler.cpp12
-rw-r--r--kmail/jobscheduler.h11
-rw-r--r--kmail/kcm_kmail.cpp24
-rw-r--r--kmail/kcursorsaver.h4
-rw-r--r--kmail/keyresolver.cpp28
-rw-r--r--kmail/keyresolver.h10
-rw-r--r--kmail/khtmlparthtmlwriter.cpp12
-rw-r--r--kmail/khtmlparthtmlwriter.h9
-rw-r--r--kmail/kleo_util.h10
-rw-r--r--kmail/klistboxdialog.cpp6
-rw-r--r--kmail/klistboxdialog.h3
-rw-r--r--kmail/klistviewindexedsearchline.cpp10
-rw-r--r--kmail/klistviewindexedsearchline.h11
-rw-r--r--kmail/kmaccount.cpp34
-rw-r--r--kmail/kmaccount.h14
-rw-r--r--kmail/kmacctcachedimap.cpp36
-rw-r--r--kmail/kmacctcachedimap.h9
-rw-r--r--kmail/kmacctfolder.h4
-rw-r--r--kmail/kmacctimap.cpp34
-rw-r--r--kmail/kmacctimap.h1
-rw-r--r--kmail/kmacctlocal.cpp30
-rw-r--r--kmail/kmacctmaildir.cpp26
-rw-r--r--kmail/kmacctseldlg.cpp4
-rw-r--r--kmail/kmacctseldlg.h3
-rw-r--r--kmail/kmaddrbook.cpp18
-rw-r--r--kmail/kmail.antispamrc10
-rw-r--r--kmail/kmail.kcfg8
-rw-r--r--kmail/kmail_part.cpp14
-rw-r--r--kmail/kmail_part.h9
-rw-r--r--kmail/kmail_part.rc2
-rw-r--r--kmail/kmailicalIface.h12
-rw-r--r--kmail/kmailicalifaceimpl.cpp132
-rw-r--r--kmail/kmailicalifaceimpl.h15
-rw-r--r--kmail/kmatmlistview.cpp6
-rw-r--r--kmail/kmatmlistview.h5
-rw-r--r--kmail/kmcommands.cpp382
-rw-r--r--kmail/kmcommands.h188
-rw-r--r--kmail/kmcomposewin.cpp100
-rw-r--r--kmail/kmcomposewin.h13
-rw-r--r--kmail/kmdict.cpp2
-rw-r--r--kmail/kmdict.h4
-rw-r--r--kmail/kmedit.cpp38
-rw-r--r--kmail/kmedit.h5
-rw-r--r--kmail/kmfawidgets.cpp10
-rw-r--r--kmail/kmfawidgets.h10
-rw-r--r--kmail/kmfilter.cpp8
-rw-r--r--kmail/kmfilteraction.cpp142
-rw-r--r--kmail/kmfilteraction.h24
-rw-r--r--kmail/kmfilterdlg.cpp60
-rw-r--r--kmail/kmfilterdlg.h27
-rw-r--r--kmail/kmfiltermgr.cpp24
-rw-r--r--kmail/kmfiltermgr.h7
-rw-r--r--kmail/kmfolder.cpp64
-rw-r--r--kmail/kmfolder.h35
-rw-r--r--kmail/kmfoldercachedimap.cpp178
-rw-r--r--kmail/kmfoldercachedimap.h36
-rw-r--r--kmail/kmfoldercombobox.cpp8
-rw-r--r--kmail/kmfoldercombobox.h7
-rw-r--r--kmail/kmfolderdia.cpp60
-rw-r--r--kmail/kmfolderdia.h30
-rw-r--r--kmail/kmfolderdir.cpp38
-rw-r--r--kmail/kmfolderdir.h12
-rw-r--r--kmail/kmfolderimap.cpp218
-rw-r--r--kmail/kmfolderimap.h41
-rw-r--r--kmail/kmfolderindex.cpp10
-rw-r--r--kmail/kmfolderindex.h17
-rw-r--r--kmail/kmfoldermaildir.cpp56
-rw-r--r--kmail/kmfoldermaildir.h21
-rw-r--r--kmail/kmfoldermbox.cpp70
-rw-r--r--kmail/kmfoldermbox.h9
-rw-r--r--kmail/kmfoldermgr.cpp56
-rw-r--r--kmail/kmfoldermgr.h15
-rw-r--r--kmail/kmfoldernode.cpp10
-rw-r--r--kmail/kmfoldernode.h13
-rw-r--r--kmail/kmfoldersearch.cpp22
-rw-r--r--kmail/kmfoldersearch.h8
-rw-r--r--kmail/kmfolderseldlg.cpp22
-rw-r--r--kmail/kmfolderseldlg.h9
-rw-r--r--kmail/kmfoldertree.cpp106
-rw-r--r--kmail/kmfoldertree.h18
-rw-r--r--kmail/kmgroupware.cpp6
-rw-r--r--kmail/kmgroupware.h6
-rw-r--r--kmail/kmheaders.cpp372
-rw-r--r--kmail/kmheaders.h21
-rw-r--r--kmail/kmkernel.cpp88
-rw-r--r--kmail/kmkernel.h11
-rw-r--r--kmail/kmlineeditspell.cpp10
-rw-r--r--kmail/kmlineeditspell.h8
-rw-r--r--kmail/kmmainwidget.cpp140
-rw-r--r--kmail/kmmainwidget.h19
-rw-r--r--kmail/kmmainwin.cpp2
-rw-r--r--kmail/kmmainwin.h3
-rw-r--r--kmail/kmmainwin.rc2
-rw-r--r--kmail/kmmessage.cpp242
-rw-r--r--kmail/kmmessage.h60
-rw-r--r--kmail/kmmimeparttree.cpp34
-rw-r--r--kmail/kmmimeparttree.h23
-rw-r--r--kmail/kmmsgbase.cpp254
-rw-r--r--kmail/kmmsgbase.h48
-rw-r--r--kmail/kmmsgdict.cpp18
-rw-r--r--kmail/kmmsginfo.cpp34
-rw-r--r--kmail/kmmsginfo.h12
-rw-r--r--kmail/kmmsgpart.cpp30
-rw-r--r--kmail/kmmsgpart.h16
-rw-r--r--kmail/kmmsgpartdlg.cpp14
-rw-r--r--kmail/kmmsgpartdlg.h8
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp14
-rw-r--r--kmail/kmpopfiltercnfrmdlg.h2
-rw-r--r--kmail/kmreadermainwin.cpp42
-rw-r--r--kmail/kmreadermainwin.h1
-rw-r--r--kmail/kmreaderwin.cpp104
-rw-r--r--kmail/kmreaderwin.h13
-rw-r--r--kmail/kmsearchpattern.cpp56
-rw-r--r--kmail/kmsearchpattern.h30
-rw-r--r--kmail/kmsearchpatternedit.cpp32
-rw-r--r--kmail/kmsearchpatternedit.h19
-rw-r--r--kmail/kmsender.cpp48
-rw-r--r--kmail/kmsender.h1
-rw-r--r--kmail/kmsender_p.h5
-rw-r--r--kmail/kmservertest.cpp14
-rw-r--r--kmail/kmservertest.h11
-rw-r--r--kmail/kmstartup.cpp10
-rw-r--r--kmail/kmsystemtray.cpp14
-rw-r--r--kmail/kmsystemtray.h3
-rw-r--r--kmail/kmtransport.cpp16
-rw-r--r--kmail/kmtransport.h8
-rw-r--r--kmail/korghelper.cpp6
-rw-r--r--kmail/kwindowpositioner.h5
-rw-r--r--kmail/listjob.cpp20
-rw-r--r--kmail/listjob.h15
-rw-r--r--kmail/localsubscriptiondialog.cpp10
-rw-r--r--kmail/localsubscriptiondialog.h11
-rw-r--r--kmail/maildirjob.cpp10
-rw-r--r--kmail/maildirjob.h9
-rw-r--r--kmail/mailinglist-magic.cpp84
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp18
-rw-r--r--kmail/mailinglistpropertiesdialog.h9
-rw-r--r--kmail/mailserviceimpl.cpp10
-rw-r--r--kmail/mailserviceimpl.h6
-rw-r--r--kmail/mailsourceviewer.cpp18
-rw-r--r--kmail/mailsourceviewer.h10
-rw-r--r--kmail/main.cpp6
-rw-r--r--kmail/managesievescriptsdialog.cpp60
-rw-r--r--kmail/managesievescriptsdialog.h3
-rw-r--r--kmail/managesievescriptsdialog_p.h5
-rw-r--r--kmail/mboxjob.cpp14
-rw-r--r--kmail/mboxjob.h9
-rw-r--r--kmail/messageactions.cpp26
-rw-r--r--kmail/messageactions.h7
-rw-r--r--kmail/messagecomposer.cpp32
-rw-r--r--kmail/messagecomposer.h7
-rw-r--r--kmail/messagecopyhelper.cpp4
-rw-r--r--kmail/messagecopyhelper.h7
-rw-r--r--kmail/messageproperty.cpp16
-rw-r--r--kmail/messageproperty.h9
-rw-r--r--kmail/messagesender.h8
-rwxr-xr-xkmail/mh2kmailr4
-rw-r--r--kmail/networkaccount.cpp18
-rw-r--r--kmail/networkaccount.h3
-rw-r--r--kmail/newfolderdialog.cpp16
-rw-r--r--kmail/newfolderdialog.h9
-rw-r--r--kmail/objecttreeparser.cpp136
-rw-r--r--kmail/objecttreeparser.h20
-rw-r--r--kmail/objecttreeparser_p.h4
-rw-r--r--kmail/partNode.cpp60
-rw-r--r--kmail/partNode.h22
-rw-r--r--kmail/partnodebodypart.cpp10
-rw-r--r--kmail/partnodebodypart.h6
-rw-r--r--kmail/popaccount.cpp30
-rw-r--r--kmail/popaccount.h1
-rw-r--r--kmail/protocols.h6
-rw-r--r--kmail/quotajobs.cpp6
-rw-r--r--kmail/quotajobs.h18
-rw-r--r--kmail/recipientseditor.cpp36
-rw-r--r--kmail/recipientseditor.h40
-rw-r--r--kmail/recipientseditortest.cpp8
-rw-r--r--kmail/recipientseditortest.h9
-rw-r--r--kmail/recipientspicker.cpp24
-rw-r--r--kmail/recipientspicker.h14
-rw-r--r--kmail/redirectdialog.cpp12
-rw-r--r--kmail/redirectdialog.h11
-rw-r--r--kmail/regexplineedit.cpp16
-rw-r--r--kmail/regexplineedit.h15
-rw-r--r--kmail/renamejob.cpp10
-rw-r--r--kmail/renamejob.h9
-rw-r--r--kmail/rulewidgethandlermanager.cpp88
-rw-r--r--kmail/rulewidgethandlermanager.h6
-rw-r--r--kmail/scalix.h4
-rw-r--r--kmail/searchjob.cpp14
-rw-r--r--kmail/searchjob.h7
-rw-r--r--kmail/searchwindow.cpp20
-rw-r--r--kmail/searchwindow.h9
-rw-r--r--kmail/secondarywindow.cpp6
-rw-r--r--kmail/secondarywindow.h7
-rw-r--r--kmail/sieveconfig.cpp6
-rw-r--r--kmail/sieveconfig.h5
-rw-r--r--kmail/sievedebugdialog.cpp4
-rw-r--r--kmail/sievedebugdialog.h3
-rw-r--r--kmail/sievejob.cpp22
-rw-r--r--kmail/sievejob.h5
-rw-r--r--kmail/signatureconfigurator.cpp12
-rw-r--r--kmail/signatureconfigurator.h3
-rw-r--r--kmail/simplefoldertree.h22
-rw-r--r--kmail/simplestringlisteditor.cpp22
-rw-r--r--kmail/simplestringlisteditor.h21
-rw-r--r--kmail/smimeconfiguration.ui64
-rw-r--r--kmail/snippetdlg.cpp8
-rw-r--r--kmail/snippetdlg.h3
-rw-r--r--kmail/snippetdlgbase.ui12
-rw-r--r--kmail/snippetitem.cpp16
-rw-r--r--kmail/snippetitem.h9
-rw-r--r--kmail/snippetsettings.cpp8
-rw-r--r--kmail/snippetsettings.h5
-rw-r--r--kmail/snippetsettingsbase.ui18
-rw-r--r--kmail/snippetwidget.cpp54
-rw-r--r--kmail/snippetwidget.h9
-rw-r--r--kmail/spamheaderanalyzer.cpp6
-rw-r--r--kmail/spamheaderanalyzer.h6
-rw-r--r--kmail/stl_util.h6
-rw-r--r--kmail/subscriptiondialog.cpp58
-rw-r--r--kmail/subscriptiondialog.h20
-rw-r--r--kmail/teehtmlwriter.cpp6
-rw-r--r--kmail/teehtmlwriter.h6
-rw-r--r--kmail/templateparser.cpp30
-rw-r--r--kmail/templateparser.h15
-rw-r--r--kmail/templatesconfiguration.cpp16
-rw-r--r--kmail/templatesconfiguration.h3
-rw-r--r--kmail/templatesconfiguration_base.ui26
-rw-r--r--kmail/templatesinsertcommand.cpp12
-rw-r--r--kmail/templatesinsertcommand.h7
-rw-r--r--kmail/tests/messagedicttests.cpp6
-rw-r--r--kmail/tests/messagedicttests.h1
-rw-r--r--kmail/tests/mimelibtests.h1
-rw-r--r--kmail/tests/signedmail.mbox6
-rw-r--r--kmail/tests/utiltests.cpp24
-rw-r--r--kmail/tests/utiltests.h3
-rw-r--r--kmail/textsource.cpp6
-rw-r--r--kmail/textsource.h6
-rw-r--r--kmail/tips4
-rw-r--r--kmail/transportmanager.cpp2
-rw-r--r--kmail/treebase.cpp24
-rw-r--r--kmail/treebase.h5
-rw-r--r--kmail/undostack.h3
-rw-r--r--kmail/urlhandlermanager.cpp30
-rw-r--r--kmail/urlhandlermanager.h6
-rw-r--r--kmail/util.cpp8
-rw-r--r--kmail/util.h26
-rw-r--r--kmail/vacation.cpp20
-rw-r--r--kmail/vacation.h3
-rw-r--r--kmail/vacationdialog.cpp6
-rw-r--r--kmail/vacationdialog.h3
-rw-r--r--kmail/vcardviewer.cpp6
-rw-r--r--kmail/vcardviewer.h5
-rw-r--r--kmail/warningconfiguration.ui36
-rw-r--r--kmail/xfaceconfigurator.cpp16
-rw-r--r--kmail/xfaceconfigurator.h3
406 files changed, 4864 insertions, 4582 deletions
diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index e9c2eaa1..bd7c2908 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -184,7 +184,7 @@ please visit http://webcvs.kde.org
Do the right thing when sending to "me@there (John Doe)"
Waldo's folderless-acount-segv-fix
More against destroyed last char in message
- Better long/normal folder-list geometry bugfix
+ Better long/normal folder-list tqgeometry bugfix
Don't quit while sending, and show a label while you send.
1999-02-03 Sven Radej <radej@kde.org> (KMail-1.0.16)
@@ -245,7 +245,7 @@ please visit http://webcvs.kde.org
1999-01-23 Stefan Taferner <taferner@kde.org> (KMail-1.0.14)
- * New feature: layout can now be switched between
+ * New feature: tqlayout can now be switched between
"long folder list" and "short folder list". Option
setable in settings->appearance.
@@ -264,7 +264,7 @@ please visit http://webcvs.kde.org
Now it is possible to have more folders than the screen
is high and still select them in the filter dialog.
* Filter Dialog: changed folder combo box to (semi) auto
- resize. Changed layout of dialog to better display all
+ resize. Changed tqlayout of dialog to better display all
elements. Also enabled vertical resizing of dialog.
1999-01-17 Stefan Taferner <taferner@kde.org> (KMail-1.0.12)
@@ -494,7 +494,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org>
ignored.
* Finetuning: added missing pixmaps to makefile and
- repainted pixmap for queued and sent messages.
+ tqrepainted pixmap for queued and sent messages.
* Composer: changed behaviour of email completion a bit.
Now it is possible to add multiple recipients with comma
@@ -553,7 +553,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org>
quoted text to catch smileys at the beginning of the
line ;-)
- * Main window configuration (geometry, etc.) is now
+ * Main window configuration (tqgeometry, etc.) is now
stored again.
* Composer: changed completion key from Ctrl-. to Ctrl-T
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 0b15ebfb..8f7a6503 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to
function that want to use the identity reference. Store the UOID
instead if you need to keep track of the identity. You may also want
to connect to one of the KPIM::IdentityManager::changed() or ::deleted()
-signals, if you want to do special processing in case the identity
+Q_SIGNALS, if you want to do special processing in case the identity
changes.
Thus, in the ConfigureDialog, you will see non-const KPIM::Identity
@@ -271,13 +271,13 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are :
folder manager. In dimap, both the headers and a copy of the full message
are cached locally.
4) KMFolderMgr *searchFolderMgr() - which returns the folder manager
- for search folders (folders created by using the "find
+ for search folders (folders created by using the "tqfind
messages" tool). Other email clients call this type of folder
"virtual folders".
FolderJob classes - These classes allow asynchronous operations on
KMFolder's. You create a Job on the heap, connect to one of its
-signals and wait for the job to finish. Folders serve as FolderJob
+Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob
factories. For example, to retrieve the full message from a folder
you do :
@@ -316,9 +316,9 @@ with questions...
length := Q_UINT16 ; little endian (native?)
- value := unicode-string-value / ulong-value
+ value := tqunicode-string-value / ulong-value
- unicode-string-value := 0*256QChar ; network-byte-order
+ tqunicode-string-value := 0*256QChar ; network-byte-order
ulong-value := unsigned_long ; little endian
@@ -334,7 +334,7 @@ Currently defined tag values are:
IdMD5 5 u msgIdMD5().stripWhiteSpace()
XMark 6 u xmark().stripWhiteSpace()
Offset 7 l folderOffset() (not only mbox!)
- LegacyStatus 8 l mLegacyStatus
+ LegacytqStatus 8 l mLegacytqStatus
Size 9 l msgSize()
Date 10 l date()
File 11 u fileName() (not only maildir!)
@@ -342,9 +342,9 @@ Currently defined tag values are:
MDNSent 13 l mdnSentState()
ReplyToAuxIdMD5 14 u replyToAuxIdMD5()
StrippedSubject 15 u strippedSubjectMD5().stripWhiteSpace()
- Status 16 l status()
+ tqStatus 16 l status()
- u: unicode-string-value; l: ulong-value
+ u: tqunicode-string-value; l: ulong-value
Proposed new (KDE 3.2 / KMail 1.6) entry format:
@@ -446,20 +446,20 @@ Currently defined tags are:
MBoxOffset Offset(64) Offset in mbox file (pointing to From_)
MBoxLength Size(64) Length of message in mbox file (incl. From_)
Size Size(64) rfc2822-size of message (in mbox: excl. From_)
- Status BitField (see below)
+ tqStatus BitField (see below)
MessageIdMD5 MD5Hash MD5Hash of _normalized_ Message-Id:
MDNLink SerialNumber SerNum of MDN received for this message
DNSLink SerialNumber SerNUm of DSN received for this message
ThreadHeads SerialNumberList MD5Hash's of all (so far discovered)
- _top-level thread parents_
+ _top-level thread tqparents_
ThreadParents SerialNumberList MD5Hash's of all (so far discovered)
- thread parents
+ thread tqparents
"String" is either Utf8String or (Utf16String or Latin1String),
depending on content
-Currently allocated bits for the Status BitField are:
+Currently allocated bits for the tqStatus BitField are:
Bit Value: on(/off) (\\imapflag)
@@ -527,7 +527,7 @@ class SortCacheItem:
folder) messages is cached on disk in a file named .$FOLDER.index.sorted
so if, for example the name of a folder is foo, the associated sorting
cache file would be called ".foo.index.sorted".
- For each message, its serial number, that of its parent, the length of its
+ For each message, its serial number, that of its tqparent, the length of its
sorting key, and the key itself are written to this file. At the start of
the file several per folder counts and flags are cached additionally,
immediately after a short file headers. The entries from the start of the
@@ -544,13 +544,13 @@ class SortCacheItem:
What is used for figuring out threading?
- messages can have an In-Reply-To header that contains the message id of
- another message. This is called a perfect parent.
+ another message. This is called a perfect tqparent.
- additionally there is the References header which, if present, holds a
list of message ids that the current message is a follow up to. We
currently use the second to last entry in that list only. See further
down for the reasoning behind that.
- If the above two fail and the message is prefixed (Re: foo, Fwd: foo etc.)
- an attempt is made to find a parent by looking for messages with the same
+ an attempt is made to find a tqparent by looking for messages with the same
subject. How that is done is explained below as well.
For all these comparisons of header contents, the md5 hashes of the headers
@@ -578,27 +578,27 @@ Strategy:
has been moved away in the meantime (possibly by outside forces such as
other clients) and a deleted counter is incremented and all further
processing stopped for this message.
- The messages parent serial number, as read from the sorted file is then
- used to look up the parent and reset it to -1 should it not be in the
+ The messages tqparent serial number, as read from the sorted file is then
+ used to look up the tqparent and reset it to -1 should it not be in the
current folder anymore. -1 and -2 are special values that can show up
- as parent serial numbers and are used to encode the following:
- -1 means this message has no perfect parent, a parent for it needs to
+ as tqparent serial numbers and are used to encode the following:
+ -1 means this message has no perfect tqparent, a tqparent for it needs to
be found from among the other messages, if there is a suitable one
-2 means this message is top level and will forever stay so, no need
- to even try to find a parent. This is also used for the non-threaded
+ to even try to find a tqparent. This is also used for the non-threaded
case. These are messages that have neither an In-Reply-To header nor
a References header and have a subject that is not prefixed.
- In case there is a perfect parent, the current sort cache item is
- appended to the parents list of unsorted children, or to that of
+ In case there is a perfect tqparent, the current sort cache item is
+ appended to the tqparents list of unsorted tqchildren, or to that of
root, if there is not. A sort cache item is created in the mSortCache
- for the parent, if it is not already there. Messages with a parent of
- -1 are appended to the "unparented" list, which is later traversed and
- its elements threaded. Messages with -2 as the parent are children of
+ for the tqparent, if it is not already there. Messages with a tqparent of
+ -1 are appended to the "untqparented" list, which is later traversed and
+ its elements threaded. Messages with -2 as the tqparent are tqchildren of
root as well, as noted above, and will remain so.
Once the end of the file is reached, we should have a nicely filled
mSortCache, containing a sort cache item for each message that was in the
- sorted file. Messages with perfect parents know about them, top level
+ sorted file. Messages with perfect tqparents know about them, top level
messages know about that as well, all others are on a list and will be
threaded later.
@@ -608,16 +608,16 @@ Strategy:
to mFolder->count() are looked at and a SortCacheItem is created for the
ones that do not have one yet. This is where all sort cache items are created
if there was no sorted file. The items created here are by definition un-
- sorted as well as unparented. On creation their sort key is figured out as
+ sorted as well as untqparented. On creation their sort key is figured out as
well.
- The next step is finding parents for those messages that are either new, or
- had a parent of -1 in the .sorted file. To that end, a dict of all sort
+ The next step is finding tqparents for those messages that are either new, or
+ had a tqparent of -1 in the .sorted file. To that end, a dict of all sort
cache items indexed by the md5 hash of their messsage id headers is created,
that will be used for looking up sort cache items by message id. The list of
- yet unparented messages is then traversed and findParent() called for each
+ yet untqparented messages is then traversed and findParent() called for each
element wihch checks In-Reply-To and References headers and looks up the
- sort cache item of those parents in the above mentioned dict. Should none be
+ sort cache item of those tqparents in the above mentioned dict. Should none be
found, the item is added to a second list the items of which will be subject
threaded.
@@ -638,7 +638,7 @@ Strategy:
- since the above is a common special case, it is worth trying. I think. ;)
- If the parent found is perfect (In-Reply-To), the sort cache items is marked
+ If the tqparent found is perfect (In-Reply-To), the sort cache items is marked
as such. mIsImperfectlyThreaded is used for that purposer, we will soon see
why that flag is needed.
@@ -646,30 +646,30 @@ Strategy:
the messages that are now top-level, the current thread heads, so to speak,
are collected into a second dict ( QDict< QPtrList< SortCacheItem > > )
that contains for each different subject an entry holding a list of (so far
- top level) messages with that subject, that are potential parents for
- threading by subjects. These lists are sorted by date, so the parent closest
+ top level) messages with that subject, that are potential tqparents for
+ threading by subjects. These lists are sorted by date, so the tqparent closest
by date can be chosen. Sorting of these lists happens via insertion sort
while they are built because not only are they expected to be short (apart
from hard corner cases such as cvs commit lists, for which subject threading
makes little sense anyhow and where it should be turned off), but also since
the messages should be roughly pre sorted by date in the store already.
Some cursory benchmarking supports that assumption.
- If now a parent is needed for a message with a certain subject, the list of
+ If now a tqparent is needed for a message with a certain subject, the list of
top level messages with that subject is traversed and the first one that is
- older than our message is chosen as it's parent. Parents more than six weeks
+ older than our message is chosen as it's tqparent. Parents more than six weeks
older than the message are not accepted. The reasoning being that if a new
message with the same subject turns up after such a long time, the chances
that it is still part of the same thread are slim. The value of six weeks
is chosen as a result of a poll conducted on #kde-devel, so it's probably
bogus. :) All of this happens in the aptly named: findParentBySubject().
- Everthing that still has no parent after this ends up at toplevel, no further
+ Everthing that still has no tqparent after this ends up at toplevel, no further
attemp is made at finding one. If you are reading this because you want to
implement threading by body search or somesuch, please go away, I don't like
you. :)
Ok, so far we have only operated on sort cache items, nothing ui wise has
- happened yet. Now that we have established the parent/child relations of all
+ happened yet. Now that we have established the tqparent/child relations of all
messages, it's time to create HeaderItems for them for use in the header
list. But wait, you say, what about sorting? Wouldn't it make sense to do
that first? Exactly, you're a clever bugger, ey? Here, have a cookie. ;)
@@ -677,13 +677,13 @@ Strategy:
cache items happen at the same time.
As previously mentioned (or not) each sort cache item holds a list of its
- sorted and one of its unsorted children. Starting with the root node the
+ sorted and one of its unsorted tqchildren. Starting with the root node the
unsorted list is first qsorted, and then merged with the list of already
- sorted children. To achieve that, the heads of both lists are compared and
+ sorted tqchildren. To achieve that, the heads of both lists are compared and
the one with the "better" key is added to the list view next by creating a
KMHeaderListItem for it. That header item receives both its sort key as well
as its id from the sort cache item. Should the current sort cache item have
- children, it is added to the end of a queue of nodes to repeat these steps
+ tqchildren, it is added to the end of a queue of nodes to repeat these steps
on after the current level is sorted. This way, a breadth first merge sort
is performed on the sort cache items and header items are created at each
node.
@@ -706,16 +706,16 @@ What happens when a message arrives in the folder?
structures described above are updated accordingly. If threading is enabled,
the new message is threaded using the same findParent and findParentBySubject
methods used on folder open. If the message ends up in a watched or ignored
- thread, those status bits are inherited from the parent. The message is also
+ thread, those status bits are inherited from the tqparent. The message is also
added to the dict of header items, the index of messages by message id and,
if applicable and if the message is threaded at top level, to the list of
- potential parents for subject threading.
+ potential tqparents for subject threading.
After those house keeping tasks are performed, the list of as of yet imper-
fectly threaded messages is traversed and our newly arrived message is
- considered as a new parent for each item on it. This is especially important
- to ensure that parents arriving out of order after their children still end
- up as parents. If necessary, the entries in the .sorted file of rethreaded
+ considered as a new tqparent for each item on it. This is especially important
+ to ensure that tqparents arriving out of order after their tqchildren still end
+ up as tqparents. If necessary, the entries in the .sorted file of rethreaded
messages are updated. An entry for the new message itself is appended to the
.sorted file as well.
@@ -732,10 +732,10 @@ What happens when a message is removed from the folder?
In this case the msgRemoved slot kicks in and updates the headers list. First
the sort cache item and header item representing our message are removed from
the data structures and the ids of all items after it in the store decre-
- mented. Then a list of children of the message is assembled containing those
- children that have to be reparented now that our message has gone away. If
- one of those children has been marked as toBeDeleted, it is simply added to
- root at top level, because there is no need to find a parent for it if it is
+ mented. Then a list of tqchildren of the message is assembled containing those
+ tqchildren that have to be reparented now that our message has gone away. If
+ one of those tqchildren has been marked as toBeDeleted, it is simply added to
+ root at top level, because there is no need to find a tqparent for it if it is
to go away as well. This is an optimization to avoid rethreading all
messages in a thread when deleting several messages in a thread, or even the
whole thread. The KMMoveCommand marks all messages that will be moved out of
@@ -743,7 +743,7 @@ What happens when a message is removed from the folder?
can be avoided. Note that that does not work when moving messages via filter
action.
- That list of children is then traversed and a new parent found for each one
+ That list of tqchildren is then traversed and a new tqparent found for each one
using, again, findParent and findParentBySubject. When a message becomes
imperfectly threaded in the process, it is added to the corresponding list.
@@ -859,7 +859,7 @@ public:
QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) );
}
-private slots:
+private Q_SLOTS:
void slotTimeout() { notify(): }
private:
diff --git a/kmail/TODO b/kmail/TODO
index cf5792a1..e16a9116 100644
--- a/kmail/TODO
+++ b/kmail/TODO
@@ -29,7 +29,7 @@ DS: Zero-copy downloading from pop server
DS: Set color action
DS: XML GUI context menus to support KMail plugins
DS: IMAP body searching
-??: Dock Windows
+??: TQt::Dock Windows
Groupware:
KHZ: Make groupware use a real vCal parser
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index 19d25574..0fa29906 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -156,7 +156,7 @@ namespace KMail {
};
static const about_data credits[] = {
- { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons tqreplacement
+ { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
{ "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
{ "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
{ "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
@@ -175,7 +175,7 @@ namespace KMail {
"heiko@ist.eigentlich.net", 0 },
{ "Torsten Kasch", 0, 0, 0 }, // crash fix for Solaris (cf. bug:68801)
{ "Jason 'vanRijn' Kasper", 0, 0, 0 }, // implemented wish 79938 (configurable font for new/unread/important messages)
- { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the Status combo of the quick search
+ { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the tqStatus combo of the quick search
{ "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field)
{ "Martin Koller", 0, 0, 0 }, // optional columns in the message list
{ "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index b7c82f11..513f9483 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp
index c89ed360..252a49c8 100644
--- a/kmail/accountcombobox.cpp
+++ b/kmail/accountcombobox.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -34,8 +34,8 @@
using namespace KMail;
-AccountComboBox::AccountComboBox( TQWidget* parent, const char* name )
- : TQComboBox( parent, name )
+AccountComboBox::AccountComboBox( TQWidget* tqparent, const char* name )
+ : TQComboBox( tqparent, name )
{
connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ),
this, TQT_SLOT( slotRefreshAccounts() ) );
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index 9229cb33..04a8bc07 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -39,12 +39,13 @@ namespace KMail {
* WARNING: this widget is hardcoded to only display disconnected imap
* accounts, in this branch.
*/
-class AccountComboBox : public QComboBox
+class AccountComboBox : public TQComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- AccountComboBox( TQWidget* parent, const char* name = 0 );
+ AccountComboBox( TQWidget* tqparent, const char* name = 0 );
void setCurrentAccount( KMAccount* account );
KMAccount* currentAccount() const;
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 51c72977..4dab221b 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -85,7 +85,7 @@ namespace KMail {
class ProcmailRCParser
{
public:
- ProcmailRCParser(TQString fileName = TQString::null);
+ ProcmailRCParser(TQString fileName = TQString());
~ProcmailRCParser();
TQStringList getLockFilesList() const { return mLockFiles; }
@@ -133,7 +133,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
int commentPos = -1;
- if( (commentPos = s.find('#')) > -1 ) {
+ if( (commentPos = s.tqfind('#')) > -1 ) {
// get rid of trailing comment
s.truncate(commentPos);
s = s.stripWhiteSpace();
@@ -143,7 +143,7 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
processGlobalLock(s);
} else if( lockFileLocal.search(s) != -1 ) {
processLocalLock(s);
- } else if( int i = s.find('=') ) {
+ } else if( int i = s.tqfind('=') ) {
processVariableSetting(s,i);
}
}
@@ -172,7 +172,7 @@ ProcmailRCParser::~ProcmailRCParser()
void
ProcmailRCParser::processGlobalLock(const TQString &s)
{
- TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace());
+ TQString val = expandVars(s.mid(s.tqfind('=') + 1).stripWhiteSpace());
if ( !mLockFiles.tqcontains(val) )
mLockFiles << val;
}
@@ -190,7 +190,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
// user specified a lockfile, so process it
//
val = expandVars(val);
- if( val[0] != '/' && mVars.find("MAILDIR") )
+ if( val[0] != '/' && mVars.tqfind("MAILDIR") )
val.insert(0, *(mVars["MAILDIR"]) + '/');
} // else we'll deduce the lockfile name one we
// get the spoolfile name
@@ -211,7 +211,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
line = expandVars(line);
// prepend default MAILDIR if needed
- if( line[0] != '/' && mVars.find("MAILDIR") )
+ if( line[0] != '/' && mVars.tqfind("MAILDIR") )
line.insert(0, *(mVars["MAILDIR"]) + '/');
// now we have the spoolfile name
@@ -224,7 +224,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
val = line;
// append lock extension
- if( mVars.find("LOCKEXT") )
+ if( mVars.tqfind("LOCKEXT") )
val += *(mVars["LOCKEXT"]);
else
val += ".lock";
@@ -248,7 +248,7 @@ ProcmailRCParser::processVariableSetting(const TQString &s, int eqPos)
mVars.insert(varName.latin1(), new TQString(varValue));
}
-QString
+TQString
ProcmailRCParser::expandVars(const TQString &s)
{
if( s.isEmpty()) return s;
@@ -268,8 +268,8 @@ ProcmailRCParser::expandVars(const TQString &s)
AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
- TQWidget *parent, const char *name, bool modal )
- : KDialogBase( parent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
+ TQWidget *tqparent, const char *name, bool modal )
+ : KDialogBase( tqparent, name, modal, caption, Ok|Cancel|Help, Ok, true ),
mAccount( account ),
mServerTest( 0 ),
mCurCapa( AllCapa ),
@@ -357,11 +357,11 @@ void AccountDialog::makeLocalAccountPage()
topLayout->addWidget( choose, 3, 2 );
TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
- group->setColumnLayout(0, Qt::Horizontal);
+ group->setColumnLayout(0, TQt::Horizontal);
group->tqlayout()->setSpacing( 0 );
group->tqlayout()->setMargin( 0 );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
- groupLayout->tqsetAlignment( Qt::AlignTop );
+ groupLayout->tqsetAlignment( TQt::AlignTop );
groupLayout->setSpacing( 6 );
groupLayout->setMargin( 11 );
@@ -778,7 +778,7 @@ void AccountDialog::makePopAccountPage()
vlay->addSpacing( KDialog::spacingHint() );
- mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Encryption"), page2 );
mPop.encryptionNone =
new TQRadioButton( i18n("&None"), mPop.encryptionGroup );
@@ -792,7 +792,7 @@ void AccountDialog::makePopAccountPage()
TQT_SLOT(slotPopEncryptionChanged(int)));
vlay->addWidget( mPop.encryptionGroup );
- mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Authentication Method"), page2 );
mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup,
"auth clear text" );
@@ -1093,7 +1093,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
vlay->addSpacing( KDialog::spacingHint() );
- mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Encryption"), page2 );
mImap.encryptionNone =
new TQRadioButton( i18n("&None"), mImap.encryptionGroup );
@@ -1107,7 +1107,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
TQT_SLOT(slotImapEncryptionChanged(int)));
vlay->addWidget( mImap.encryptionGroup );
- mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
+ mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
i18n("Authentication Method"), page2 );
mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup );
mImap.authLogin = new TQRadioButton( i18n("Please translate this "
@@ -1490,7 +1490,7 @@ void AccountDialog::slotPipeliningClicked()
"Supports\" button at the bottom of the dialog;\n"
"if your server does not announce it, but you want more speed, then "
"you should do some testing first by sending yourself a batch "
- "of mail and downloading it."), TQString::null,
+ "of mail and downloading it."), TQString(),
"pipelining");
}
@@ -1764,7 +1764,7 @@ void AccountDialog::checkHighest( TQButtonGroup *btnGroup )
{
kdDebug(5006) << "checkHighest( " << btnGroup << " )" << endl;
for ( int i = btnGroup->count() - 1; i >= 0 ; --i ) {
- TQButton * btn = btnGroup->find( i );
+ TQButton * btn = btnGroup->tqfind( i );
if ( btn && btn->isEnabled() ) {
btn->animateClick();
return;
@@ -1972,7 +1972,7 @@ void AccountDialog::saveSettings()
// get the new account and register the new destination folder
// this is the target folder for local or pop accounts and the root folder
// of the account for (d)imap
- KMAccount* newAcct = kmkernel->acctMgr()->find(mAccount->id());
+ KMAccount* newAcct = kmkernel->acctMgr()->tqfind(mAccount->id());
if (newAcct)
{
if( accountType == "local" ) {
@@ -1994,7 +1994,7 @@ void AccountDialog::slotLocationChooser()
{
static TQString directory( "/" );
- KFileDialog dialog( directory, TQString::null, this, 0, true );
+ KFileDialog dialog( directory, TQString(), this, 0, true );
dialog.setCaption( i18n("Choose Location") );
bool result = dialog.exec();
@@ -2117,8 +2117,8 @@ void AccountDialog::slotReloadNamespaces()
{
initAccountForConnect();
mImap.personalNS->setText( i18n("Fetching Namespaces...") );
- mImap.otherUsersNS->setText( TQString::null );
- mImap.sharedNS->setText( TQString::null );
+ mImap.otherUsersNS->setText( TQString() );
+ mImap.sharedNS->setText( TQString() );
ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount );
connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
@@ -2136,16 +2136,16 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& )
this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ),
this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
- mImap.personalNS->setText( TQString::null );
+ mImap.personalNS->setText( TQString() );
}
}
void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map )
{
disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) );
- mImap.personalNS->setText( TQString::null );
- mImap.otherUsersNS->setText( TQString::null );
- mImap.sharedNS->setText( TQString::null );
+ mImap.personalNS->setText( TQString() );
+ mImap.otherUsersNS->setText( TQString() );
+ mImap.sharedNS->setText( TQString() );
mImap.nsMap = map;
ImapAccountBase::namespaceDelim ns = map[ImapAccountBase::PersonalNS];
@@ -2267,8 +2267,8 @@ void AccountDialog::slotEditSharedNamespace()
}
}
-NamespaceLineEdit::NamespaceLineEdit( TQWidget* parent )
- : KLineEdit( parent )
+NamespaceLineEdit::NamespaceLineEdit( TQWidget* tqparent )
+ : KLineEdit( tqparent )
{
}
@@ -2278,9 +2278,9 @@ void NamespaceLineEdit::setText( const TQString& text )
KLineEdit::setText( text );
}
-NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
+NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
ImapAccountBase::imapNamespace type, ImapAccountBase::nsDelimMap* map )
- : KDialogBase( parent, "edit_namespace", false, TQString::null,
+ : KDialogBase( tqparent, "edit_namespace", false, TQString(),
Ok|Cancel, Ok, true ), mType( type ), mNamespaceMap( map )
{
TQVBox *page = makeVBoxMainWidget();
@@ -2298,7 +2298,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
mBg = new TQButtonGroup( 0 );
connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) );
- mDelimMap = mNamespaceMap->find( mType ).data();
+ mDelimMap = mNamespaceMap->tqfind( mType ).data();
ImapAccountBase::namespaceDelim::Iterator it;
for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) {
NamespaceLineEdit* edit = new NamespaceLineEdit( grid );
@@ -2325,9 +2325,9 @@ void NamespaceEditDialog::slotRemoveEntry( int id )
mLineEditMap.remove( id );
delete edit;
}
- if ( mBg->find( id ) ) {
+ if ( mBg->tqfind( id ) ) {
// delete the button
- delete mBg->find( id );
+ delete mBg->tqfind( id );
}
adjustSize();
}
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 085e40d9..060b576a 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -55,10 +55,11 @@ class FolderRequester;
class AccountDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
AccountDialog( const TQString & caption, KMAccount *account,
- TQWidget *parent=0, const char *name=0, bool modal=true );
+ TQWidget *tqparent=0, const char *name=0, bool modal=true );
virtual ~AccountDialog();
private:
struct LocalWidgets
@@ -302,9 +303,10 @@ class AccountDialog : public KDialogBase
class NamespaceLineEdit: public KLineEdit
{
Q_OBJECT
+ TQ_OBJECT
public:
- NamespaceLineEdit( TQWidget* parent );
+ NamespaceLineEdit( TQWidget* tqparent );
const TQString& lastText() { return mLastText; }
@@ -318,9 +320,10 @@ class NamespaceLineEdit: public KLineEdit
class NamespaceEditDialog: public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type,
+ NamespaceEditDialog( TQWidget* tqparent, ImapAccountBase::imapNamespace type,
ImapAccountBase::nsDelimMap* map );
protected slots:
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 5484c66d..d62280fd 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -149,13 +149,13 @@ void AccountManager::processNextCheck( bool _newMail )
kdDebug(5006) << "account " << acct->name() << " finished check" << endl;
mAcctChecking.remove( acct );
kmkernel->filterMgr()->deref();
- disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ disconnect( acct, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( processNextCheck( bool ) ) );
}
if ( mAcctChecking.isEmpty() ) {
// all checks finished, display summary
if ( mDisplaySummary )
- KPIM::BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
+ KPIM::BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
mTotalNewMailsArrived );
emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
mTotalNewMailsArrived = 0;
@@ -219,10 +219,10 @@ void AccountManager::processNextCheck( bool _newMail )
}
}
- connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( processNextCheck( bool ) ) );
- KPIM::BroadcasStatus::instance()->seStatusMsg(
+ KPIM::BroadcastqStatus::instance()->seStatusMsg(
i18n("Checking account %1 for new mail").arg(curAccount->name()));
kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
@@ -293,7 +293,7 @@ KMAccount* AccountManager::findByName(const TQString &aName) const
//-----------------------------------------------------------------------------
-KMAccount* AccountManager::find( const uint id ) const
+KMAccount* AccountManager::tqfind( const uint id ) const
{
if (id == 0) return 0;
for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it ) {
@@ -397,7 +397,7 @@ void AccountManager::addToTotalNewMailCount( const TQMap<TQString, int> & newInF
for ( TQMap<TQString, int>::const_iterator it = newInFolder.begin();
it != newInFolder.end(); ++it ) {
mTotalNewMailsArrived += it.data();
- if ( mTotalNewInFolder.find( it.key() ) == mTotalNewInFolder.end() )
+ if ( mTotalNewInFolder.tqfind( it.key() ) == mTotalNewInFolder.end() )
mTotalNewInFolder[it.key()] = it.data();
else
mTotalNewInFolder[it.key()] += it.data();
@@ -417,7 +417,7 @@ uint AccountManager::createId()
do
{
newId = kapp->random();
- } while ( usedIds.find(newId) != usedIds.end() );
+ } while ( usedIds.tqfind(newId) != usedIds.end() );
return newId;
}
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index f693180f..c88aab92 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -32,9 +32,10 @@ namespace KMail {
* The account manager is responsible for creating accounts of various types
* via the factory method create() and for keeping track of them.
*/
-class KDE_EXPORT AccountManager: public QObject
+class KDE_EXPORT AccountManager: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class ::KMAccount;
public:
@@ -52,7 +53,7 @@ public:
/** Create a new account of given type with given name. Currently
the types "local" for local mail folders and "pop" are supported. */
KMAccount* create( const TQString& type,
- const TQString& name = TQString::null,
+ const TQString& name = TQString(),
uint id = 0);
/** Adds an account to the list of accounts */
@@ -64,7 +65,7 @@ public:
/** Find account by id. Returns 0 if account does not exist.
*/
- KMAccount* find( const uint id ) const;
+ KMAccount* tqfind( const uint id ) const;
/** Physically remove account. Also deletes the given account object !
Returns FALSE and does nothing if the account cannot be removed. */
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 0dfb503d..e4e8b833 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -16,11 +16,11 @@
**
** In addition, as a special exception, the copyright holders give
** permission to link the code of this program with any edition of
-** the Qt library by Trolltech AS, Norway (or with modified versions
-** of Qt that use the same license as Qt), and distribute linked
+** the TQt library by Trolltech AS, Norway (or with modified versions
+** of TQt that use the same license as TQt), and distribute linked
** combinations including the two. You must obey the GNU General
** Public License in all respects for all of the code used other than
-** Qt. If you modify this file, you may extend this exception to
+** TQt. If you modify this file, you may extend this exception to
** your version of the file, but you are not obligated to do so. If
** you do not wish to do so, delete this exception statement from
** your version.
@@ -81,8 +81,8 @@ class AccountTypeBox : public KListBox
public:
enum Type { Local, POP3, IMAP, dIMAP, Maildir };
- AccountTypeBox( TQWidget *parent )
- : KListBox( parent, "AccountTypeBox" )
+ AccountTypeBox( TQWidget *tqparent )
+ : KListBox( tqparent, "AccountTypeBox" )
{
mTypeList << i18n( "Local mailbox" );
mTypeList << i18n( "POP3" );
@@ -107,8 +107,8 @@ class AccountTypeBox : public KListBox
TQStringList mTypeList;
};
-AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
- : KWizard( parent, "KWizard" ), mKernel( kernel ),
+AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *tqparent )
+ : KWizard( tqparent, "KWizard" ), mKernel( kernel ),
mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 )
{
setupWelcomePage();
@@ -118,12 +118,12 @@ AccountWizard::AccountWizard( KMKernel *kernel, TQWidget *parent )
setupServerInformationPage();
}
-void AccountWizard::start( KMKernel *kernel, TQWidget *parent )
+void AccountWizard::start( KMKernel *kernel, TQWidget *tqparent )
{
KConfigGroup wizardConfig( KMKernel::config(), "AccountWizard" );
if ( wizardConfig.readBoolEntry( "ShowOnStartup", true ) ) {
- AccountWizard wizard( kernel, parent );
+ AccountWizard wizard( kernel, tqparent );
int result = wizard.exec();
if ( result == TQDialog::Accepted ) {
wizardConfig.writeEntry( "ShowOnStartup", false );
@@ -153,7 +153,7 @@ void AccountWizard::showPage( TQWidget *page )
if ( mLoginName->text().isEmpty() ) {
// try to extract login from email address
TQString email = mEMailAddress->text();
- int pos = email.find( '@' );
+ int pos = email.tqfind( '@' );
if ( pos != -1 )
mLoginName->setText( email.left( pos ) );
@@ -329,7 +329,7 @@ TQString AccountWizard::accountName() const
TQString name( i18n( "None" ) );
TQString email = mEMailAddress->text();
- int pos = email.find( '@' );
+ int pos = email.tqfind( '@' );
if ( pos != -1 ) {
name = email.mid( pos + 1 );
name[ 0 ] = name[ 0 ].upper();
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index 51e19b10..6a05fc65 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -16,11 +16,11 @@
**
** In addition, as a special exception, the copyright holders give
** permission to link the code of this program with any edition of
-** the Qt library by Trolltech AS, Norway (or with modified versions
-** of Qt that use the same license as Qt), and distribute linked
+** the TQt library by Trolltech AS, Norway (or with modified versions
+** of TQt that use the same license as TQt), and distribute linked
** combinations including the two. You must obey the GNU General
** Public License in all respects for all of the code used other than
-** Qt. If you modify this file, you may extend this exception to
+** TQt. If you modify this file, you may extend this exception to
** your version of the file, but you are not obligated to do so. If
** you do not wish to do so, delete this exception statement from
** your version.
@@ -45,6 +45,7 @@ class KMTransportInfo;
class AccountWizard : public KWizard
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -52,9 +53,9 @@ class AccountWizard : public KWizard
run successfully before.
@param kernel The mail kernel the wizard should work on.
- @param parent The parent widget of the dialog.
+ @param tqparent The tqparent widget of the dialog.
*/
- static void start( KMKernel *kernel, TQWidget *parent = 0 );
+ static void start( KMKernel *kernel, TQWidget *tqparent = 0 );
/**
Reimplemented
@@ -62,7 +63,7 @@ class AccountWizard : public KWizard
void showPage( TQWidget *page );
protected:
- AccountWizard( KMKernel *kernel, TQWidget *parent );
+ AccountWizard( KMKernel *kernel, TQWidget *tqparent );
~AccountWizard() {};
void setupWelcomePage();
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 9926cc46..33a7e583 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -198,7 +198,7 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray
void ACLJobs::GetUserRightsJob::slotInfoMessage( KIO::Job*, const TQString& str )
{
// Parse the result
- m_permissions = IMAPRightsToPermission( str, url(), TQString::null );
+ m_permissions = IMAPRightsToPermission( str, url(), TQString() );
}
ACLJobs::DeleteACLJob::DeleteACLJob( const KURL& url, const TQString& userId,
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index d6a9b245..d548c621 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -39,7 +39,7 @@ namespace KMail {
/// One entry in the ACL list: user and permissions
struct ACLListEntry {
- ACLListEntry() {} // for QValueVector
+ ACLListEntry() {} // for TQValueVector
ACLListEntry( const TQString& u, const TQString& irl, int p )
: userId( u ), internalRightsList( irl ), permissions( p ), changed( false ) {}
TQString userId;
@@ -51,7 +51,7 @@ namespace KMail {
typedef TQValueVector<ACLListEntry> ACLList;
/**
- * This namespace tqcontains functions that return jobs for ACL operations.
+ * This namespace contains functions that return jobs for ACL operations.
*
* The current implementation is tied to IMAP.
* If someone wants to extend this to other protocols, turn the class into a namespace
@@ -108,6 +108,7 @@ namespace ACLJobs {
class GetACLJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
GetACLJob( const KURL& url, const TQByteArray &packedArgs,
bool showProgressInfo );
@@ -124,6 +125,7 @@ namespace ACLJobs {
class GetUserRightsJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
bool showProgressInfo );
@@ -140,6 +142,7 @@ namespace ACLJobs {
class DeleteACLJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
DeleteACLJob( const KURL& url, const TQString& userId,
const TQByteArray &packedArgs,
@@ -154,6 +157,7 @@ namespace ACLJobs {
/// Set and delete a list of permissions for different users on a given url
class MultiSetACLJob : public KIO::Job {
Q_OBJECT
+ TQ_OBJECT
public:
MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 6975b3fc..77685ee4 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -18,11 +18,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -421,7 +421,7 @@ void ActionScheduler::fetchMessage()
} else if (msg) {
fetchTimeOutTime = TQTime::currentTime();
fetchTimeOutTimer->start( 60 * 1000, true );
- FolderJob *job = msg->parent()->createJob( msg );
+ FolderJob *job = msg->tqparent()->createJob( msg );
connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
TQT_SLOT(messageFetched( KMMessage* )) );
lastJob = job;
@@ -454,15 +454,15 @@ void ActionScheduler::messageFetched( KMMessage *msg )
serNumS.setNum( msg->getMsgSerNum() );
KMMessage *newMsg = new KMMessage;
newMsg->fromString(msg->asString());
- newMsg->seStatus(msg->status());
+ newMsg->setqStatus(msg->status());
newMsg->setComplete(msg->isComplete());
newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
mSrcFolder->addMsg( newMsg );
} else {
fetchMessageTimer->start( 0, true );
}
- if (mFetchUnget && msg->parent())
- msg->parent()->unGetMsg( msg->parent()->find( msg ));
+ if (mFetchUnget && msg->tqparent())
+ msg->tqparent()->unGetMsg( msg->tqparent()->tqfind( msg ));
return;
}
@@ -562,7 +562,7 @@ void ActionScheduler::processMessage()
return;
}
if (msg) {
- FolderJob *job = msg->parent()->createJob( msg );
+ FolderJob *job = msg->tqparent()->createJob( msg );
connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )),
TQT_SLOT(messageRetrieved( KMMessage* )) );
job->start();
@@ -665,9 +665,9 @@ void ActionScheduler::moveMessage()
if (mOriginalSerNum)
orgMsg = message( mOriginalSerNum );
mResult = mOldReturnCode; // ignore errors in deleting original message
- if (!orgMsg || !orgMsg->parent()) {
+ if (!orgMsg || !orgMsg->tqparent()) {
// Original message is gone, no point filtering it anymore
- mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
+ mSrcFolder->removeMsg( mSrcFolder->tqfind( msg ) );
kdDebug(5006) << "The original serial number is missing. "
<< "Cannot complete the filtering." << endl;
mExecutingLock = false;
@@ -675,12 +675,12 @@ void ActionScheduler::moveMessage()
return;
} else {
if (!folder) // no filter folder specified leave in current place
- folder = orgMsg->parent();
+ folder = orgMsg->tqparent();
}
mIgnore = true;
- assert( msg->parent() == mSrcFolder.operator->() );
- mSrcFolder->take( mSrcFolder->find( msg ) );
+ assert( msg->tqparent() == mSrcFolder.operator->() );
+ mSrcFolder->take( mSrcFolder->tqfind( msg ) );
mSrcFolder->addMsg( msg );
mIgnore = false;
@@ -719,7 +719,7 @@ void ActionScheduler::moveMessageFinished( KMCommand *command )
mResult = mOldReturnCode; // ignore errors in deleting original message
KMCommand *cmd = 0;
- if (msg && msg->parent()) {
+ if (msg && msg->tqparent()) {
cmd = new KMMoveCommand( 0, msg );
// cmd->start(); // Note: sensitive logic here.
}
@@ -787,10 +787,10 @@ TQString ActionScheduler::debug()
int i = 1;
for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) {
res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) );
- if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) {
+ if ((*it)->mAccount && kmkernel->tqfind( (*it)->mAccountId )) {
res.append( TQString( "Account %1, Name %2.\n" )
.arg( (*it)->mAccountId )
- .arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) );
+ .arg( kmkernel->acctMgr()->tqfind( (*it)->mAccountId )->name() ) );
}
res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) );
res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) );
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index 3c989450..797b9963 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -46,9 +46,10 @@ class KMHeaders;
namespace KMail {
/* A class for asynchronous filtering of messages */
-class ActionScheduler : public QObject
+class ActionScheduler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ReturnCode { ResultOk, ResultError, ResultCriticalError };
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index 4e5dc201..6fb6645e 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index df3da1ad..c700a4b4 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -39,7 +39,7 @@ namespace KMail {
/// One entry in the annotation list: attribute name and attribute value
struct AnnotationAttribute {
- AnnotationAttribute() {} // for QValueVector
+ AnnotationAttribute() {} // for TQValueVector
AnnotationAttribute( const TQString& e, const TQString& n, const TQString& v )
: entry( e ), name( n ), value( v ) {}
TQString entry; // e.g. /comment
@@ -50,7 +50,7 @@ struct AnnotationAttribute {
typedef TQValueVector<AnnotationAttribute> AnnotationList;
/**
- * This namespace tqcontains functions that return jobs for annotation operations.
+ * This namespace contains functions that return jobs for annotation operations.
*
* The current implementation is tied to IMAP.
* If someone wants to extend this to other protocols, turn the namespace into a class
@@ -108,6 +108,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
class GetAnnotationJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs,
bool showProgressInfo );
@@ -125,6 +126,7 @@ private:
class MultiGetAnnotationJob : public KIO::Job
{
Q_OBJECT
+ TQ_OBJECT
public:
MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
@@ -148,6 +150,7 @@ private:
class MultiUrlGetAnnotationJob : public KIO::Job
{
Q_OBJECT
+ TQ_OBJECT
public:
MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
@@ -172,6 +175,7 @@ private:
class MultiSetAnnotationJob : public KIO::Job
{
Q_OBJECT
+ TQ_OBJECT
public:
MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 9a5b4a23..384752c2 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -89,7 +89,7 @@ const SpamAgents AntiSpamConfig::uniqueAgents() const
SpamAgents::ConstIterator end( mAgents.end() );
for ( ; it != end ; ++it ) {
const TQString agent( ( *it ).name() );
- if ( seenAgents.find( agent ) == seenAgents.end() ) {
+ if ( seenAgents.tqfind( agent ) == seenAgents.end() ) {
agents.append( *it );
seenAgents.append( agent );
}
diff --git a/kmail/antispamconfig.h b/kmail/antispamconfig.h
index e2aa2eca..9c344993 100644
--- a/kmail/antispamconfig.h
+++ b/kmail/antispamconfig.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 15b3e7f7..af32ec48 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -57,8 +57,8 @@
using namespace KMail;
AntiSpamWizard::AntiSpamWizard( WizardMode mode,
- TQWidget* parent, KMFolderTree * mainFolderTree )
- : KWizard( parent ),
+ TQWidget* tqparent, KMFolderTree * mainFolderTree )
+ : KWizard( tqparent ),
mInfoPage( 0 ),
mSpamRulesPage( 0 ),
mVirusRulesPage( 0 ),
@@ -150,7 +150,7 @@ void AntiSpamWizard::accept()
KMFilterActionDict dict;
TQValueList<KMFilter*> filterList;
- bool tqreplaceExistingFilters = false;
+ bool replaceExistingFilters = false;
// Let's start with virus detection and handling,
// so we can avoid spam checks for viral messages
@@ -227,10 +227,10 @@ void AntiSpamWizard::accept()
}
}
else { // AntiSpam mode
- // TODO Existing filters with same name are tqreplaced. This is hardcoded
- // ATM and needs to be tqreplaced with a value from a (still missing)
- // checkbox in the GUI. At least, the tqreplacement is announced in the GUI.
- tqreplaceExistingFilters = true;
+ // TODO Existing filters with same name are replaced. This is hardcoded
+ // ATM and needs to be replaced with a value from a (still missing)
+ // checkbox in the GUI. At least, the replacement is announced in the GUI.
+ replaceExistingFilters = true;
for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin();
it != mToolList.end(); ++it ) {
if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
@@ -245,7 +245,7 @@ void AntiSpamWizard::accept()
pipeFilterAction->argsFromString( (*it).getDetectCmd() );
pipeFilterActions->append( pipeFilterAction );
KMSearchPattern* pipeFilterPattern = pipeFilter->pattern();
- if ( tqreplaceExistingFilters )
+ if ( replaceExistingFilters )
pipeFilterPattern->setName( (*it).getFilterName() );
else
pipeFilterPattern->setName( uniqueNameFor( (*it).getFilterName() ) );
@@ -279,7 +279,7 @@ void AntiSpamWizard::accept()
spamFilterActions->append( spamFilterAction3 );
}
KMSearchPattern* spamFilterPattern = spamFilter->pattern();
- if ( tqreplaceExistingFilters )
+ if ( replaceExistingFilters )
spamFilterPattern->setName( i18n( "Spam handling" ) );
else
spamFilterPattern->setName( uniqueNameFor( i18n( "Spam handling" ) ) );
@@ -320,7 +320,7 @@ void AntiSpamWizard::accept()
unsureFilterAction1->argsFromString( mSpamRulesPage->selectedUnsureFolderName() );
unsureFilterActions->append( unsureFilterAction1 );
KMSearchPattern* unsureFilterPattern = unsureFilter->pattern();
- if ( tqreplaceExistingFilters )
+ if ( replaceExistingFilters )
unsureFilterPattern->setName( i18n( "Semi spam (unsure) handling" ) );
else
unsureFilterPattern->setName( uniqueNameFor( i18n( "Semi spam (unsure) handling" ) ) );
@@ -382,7 +382,7 @@ void AntiSpamWizard::accept()
}
KMSearchPattern* classSpamFilterPattern = classSpamFilter->pattern();
- if ( tqreplaceExistingFilters )
+ if ( replaceExistingFilters )
classSpamFilterPattern->setName( i18n( "Classify as spam" ) );
else
classSpamFilterPattern->setName( uniqueNameFor( i18n( "Classify as spam" ) ) );
@@ -414,7 +414,7 @@ void AntiSpamWizard::accept()
}
}
KMSearchPattern* classHamFilterPattern = classHamFilter->pattern();
- if ( tqreplaceExistingFilters )
+ if ( replaceExistingFilters )
classHamFilterPattern->setName( i18n( "Classify as NOT spam" ) );
else
classHamFilterPattern->setName( uniqueNameFor( i18n( "Classify as NOT spam" ) ) );
@@ -441,7 +441,7 @@ void AntiSpamWizard::accept()
* initialized. This should happend only once. */
if ( !filterList.isEmpty() )
KMKernel::self()->filterMgr()->appendFilters(
- filterList, tqreplaceExistingFilters );
+ filterList, replaceExistingFilters );
TQDialog::accept();
}
@@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary()
{
TQString text;
TQString newFilters;
- TQString tqreplaceFilters;
+ TQString replaceFilters;
if ( mMode == AntiVirus ) {
text = ""; // TODO add summary for the virus part
@@ -571,10 +571,10 @@ void AntiSpamWizard::slotBuildSummary()
it != mToolList.end(); ++it ) {
if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
(*it).isSpamTool() && !(*it).isDetectionOnly() ) {
- sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters );
+ sortFilterOnExistance( (*it).getFilterName(), newFilters, replaceFilters );
}
}
- sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters );
+ sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters );
// The need for a andling of status "probably spam" depends on the tools chosen
if ( mSpamRulesPage->moveUnsureSelected() ) {
@@ -588,7 +588,7 @@ void AntiSpamWizard::slotBuildSummary()
}
if ( atLeastOneUnsurePattern ) {
sortFilterOnExistance( i18n( "Semi spam (unsure) handling" ),
- newFilters, tqreplaceFilters );
+ newFilters, replaceFilters );
text += i18n( "<p>The folder for messages classified as unsure (probably spam) is <i>" )
+ mSpamRulesPage->selectedUnsureFolderName() + "</i>.</p>";
}
@@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary()
// Manual classification via toolbar icon / manually applied filter action
sortFilterOnExistance( i18n( "Classify as spam" ),
- newFilters, tqreplaceFilters );
+ newFilters, replaceFilters );
sortFilterOnExistance( i18n( "Classify as NOT spam" ),
- newFilters, tqreplaceFilters );
+ newFilters, replaceFilters );
// Show the filters in the summary
if ( !newFilters.isEmpty() )
text += i18n( "<p>The wizard will create the following filters:<ul>" )
+ newFilters + "</ul></p>";
- if ( !tqreplaceFilters.isEmpty() )
- text += i18n( "<p>The wizard will tqreplace the following filters:<ul>" )
- + tqreplaceFilters + "</ul></p>";
+ if ( !replaceFilters.isEmpty() )
+ text += i18n( "<p>The wizard will replace the following filters:<ul>" )
+ + replaceFilters + "</ul></p>";
}
mSummaryPage->setSummaryText( text );
@@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name )
void AntiSpamWizard::sortFilterOnExistance(
const TQString & intendedFilterName,
- TQString & newFilters, TQString & tqreplaceFilters )
+ TQString & newFilters, TQString & replaceFilters )
{
if ( uniqueNameFor( intendedFilterName ) == intendedFilterName )
newFilters += "<li>" + intendedFilterName + "</li>";
else
- tqreplaceFilters += "<li>" + intendedFilterName + "</li>";
+ replaceFilters += "<li>" + intendedFilterName + "</li>";
}
@@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList()
//---------------------------------------------------------------------------
-ASWizPage::ASWizPage( TQWidget * parent, const char * name,
+ASWizPage::ASWizPage( TQWidget * tqparent, const char * name,
const TQString *bannerName )
- : TQWidget( parent, name )
+ : TQWidget( tqparent, name )
{
TQString banner = "kmwizard.png";
if ( bannerName && !bannerName->isEmpty() )
@@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * parent, const char * name,
//---------------------------------------------------------------------------
ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
- TQWidget * parent, const char * name )
- : ASWizPage( parent, name )
+ TQWidget * tqparent, const char * name )
+ : ASWizPage( tqparent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
@@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange()
//---------------------------------------------------------------------------
-ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
+ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name,
KMFolderTree * mainFolderTree )
- : ASWizPage( parent, name )
+ : ASWizPage( tqparent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
@@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled )
//---------------------------------------------------------------------------
-ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name,
+ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name,
KMFolderTree * mainFolderTree )
- : ASWizPage( parent, name )
+ : ASWizPage( tqparent, name )
{
TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() );
@@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange()
//---------------------------------------------------------------------------
-ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
- : ASWizPage( parent, name )
+ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name )
+ : ASWizPage( tqparent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index e8023426..a17e341a 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -104,6 +104,7 @@ namespace KMail {
class AntiSpamWizard : public KWizard
{
Q_OBJECT
+ TQ_OBJECT
public:
/** The wizard can be used for setting up anti-spam tools and for
@@ -114,13 +115,13 @@ namespace KMail {
/** Constructor that needs to initialize from the main folder tree
of KMail.
@param mode The mode the wizard should run in.
- @param parent The parent widget for the wizard.
+ @param tqparent The tqparent widget for the wizard.
@param mainFolderTree The main folder tree from which the folders
are copied to allow the selection of a spam folder in a tree
within one of the wizard pages.
*/
AntiSpamWizard( WizardMode mode,
- TQWidget * parent, KMFolderTree * mainFolderTree );
+ TQWidget * tqparent, KMFolderTree * mainFolderTree );
protected:
/**
@@ -259,7 +260,7 @@ namespace KMail {
/* convenience method to sort out new and existing filters */
void sortFilterOnExistance( const TQString & intendedFilterName,
TQString & newFilters,
- TQString & tqreplaceFilters );
+ TQString & replaceFilters );
/* The pages in the wizard */
ASWizInfoPage * mInfoPage;
@@ -280,10 +281,10 @@ namespace KMail {
//---------------------------------------------------------------------------
- class ASWizPage : public QWidget
+ class ASWizPage : public TQWidget
{
public:
- ASWizPage( TQWidget *parent, const char *name,
+ ASWizPage( TQWidget *tqparent, const char *name,
const TQString *bannerName = 0);
protected:
@@ -298,10 +299,11 @@ namespace KMail {
class ASWizInfoPage : public ASWizPage
{
Q_OBJECT
+ TQ_OBJECT
public:
ASWizInfoPage( AntiSpamWizard::WizardMode mode,
- TQWidget *parent, const char *name );
+ TQWidget *tqparent, const char *name );
void setScanProgressText( const TQString &toolName );
void addAvailableTool( const TQString &visibleName );
@@ -324,9 +326,10 @@ namespace KMail {
class ASWizSpamRulesPage : public ASWizPage
{
Q_OBJECT
+ TQ_OBJECT
public:
- ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
+ ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
bool markAsReadSelected() const;
bool moveSpamSelected() const;
@@ -356,9 +359,10 @@ namespace KMail {
class ASWizVirusRulesPage : public ASWizPage
{
Q_OBJECT
+ TQ_OBJECT
public:
- ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
+ ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree );
bool pipeRulesSelected() const;
bool moveRulesSelected() const;
@@ -382,9 +386,10 @@ namespace KMail {
class ASWizSummaryPage : public ASWizPage
{
Q_OBJECT
+ TQ_OBJECT
public:
- ASWizSummaryPage( TQWidget * parent, const char * name );
+ ASWizSummaryPage( TQWidget * tqparent, const char * name );
void setSummaryText( const TQString & text );
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index c740f02d..9a5db05b 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 979065e4..ca10bd44 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -49,11 +49,11 @@ static TQString standardArchivePath( const TQString &folderName )
"_" + TQDate::tqcurrentDate().toString( TQt::ISODate ) + ".tar.bz2";
}
-ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
- : KDialogBase( parent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
+ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent )
+ : KDialogBase( tqparent, "archive_folder_dialog", false, i18n( "Archive Folder" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true ),
- mParentWidget( parent )
+ mParentWidget( tqparent )
{
TQWidget *mainWidget = new TQWidget( this );
TQGridLayout *mainLayout = new TQGridLayout( mainWidget );
@@ -65,7 +65,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
// TODO: better label for "Ok" button
// TODO: Explaination label
- // TODO: Use QFormLayout in KDE4
+ // TODO: Use TQFormLayout in KDE4
TQLabel *folderLabel = new TQLabel( i18n( "&Folder:" ), mainWidget );
mainLayout->addWidget( folderLabel, row, 0 );
diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
index 806d5b12..cc469959 100644
--- a/kmail/archivefolderdialog.h
+++ b/kmail/archivefolderdialog.h
@@ -33,10 +33,11 @@ class FolderRequester;
class ArchiveFolderDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ArchiveFolderDialog( TQWidget *parent = 0 );
+ ArchiveFolderDialog( TQWidget *tqparent = 0 );
void setFolder( KMFolder *defaultFolder );
protected slots:
diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp
index 7114242c..688af623 100644
--- a/kmail/attachmentcollector.cpp
+++ b/kmail/attachmentcollector.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) {
continue;
}
if ( isInSkipList( node ) ) {
- node = node->next( false ); // skip even the children
+ node = node->next( false ); // skip even the tqchildren
continue;
}
if ( isInExclusionList( node ) ) {
diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h
index e7449607..6930e07e 100644
--- a/kmail/attachmentcollector.h
+++ b/kmail/attachmentcollector.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 49fc3935..7eebbbb2 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -33,7 +33,7 @@ using KPIM::MailListDrag;
// other KDE headers
#include <kurldrag.h>
-// other Qt headers
+// other TQt headers
#include <tqevent.h>
#include <tqcstring.h>
#include <tqbuffer.h>
@@ -47,9 +47,9 @@ using KPIM::MailListDrag;
namespace KMail {
AttachmentListView::AttachmentListView( KMail::Composer * composer,
- TQWidget* parent,
+ TQWidget* tqparent,
const char* name )
- : KListView( parent, name ),
+ : KListView( tqparent, name ),
mComposer( composer )
{
setAcceptDrops( true );
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index 2c8f2800..a25d792e 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -30,8 +30,9 @@ class Composer;
class AttachmentListView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
+ AttachmentListView( KMail::Composer * composer = 0, TQWidget* tqparent = 0,
const char* name = 0 );
virtual ~AttachmentListView();
diff --git a/kmail/attachmentstrategy.cpp b/kmail/attachmentstrategy.cpp
index 6e147b94..23bd0595 100644
--- a/kmail/attachmentstrategy.cpp
+++ b/kmail/attachmentstrategy.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/attachmentstrategy.h b/kmail/attachmentstrategy.h
index 83576894..268a4330 100644
--- a/kmail/attachmentstrategy.h
+++ b/kmail/attachmentstrategy.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index a20e4118..3953f3bc 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -36,12 +36,12 @@
using namespace KMail;
-BackupJob::BackupJob( TQWidget *parent )
- : TQObject( parent ),
+BackupJob::BackupJob( TQWidget *tqparent )
+ : TQObject( tqparent ),
mArchiveType( Zip ),
mRootFolder( 0 ),
mArchive( 0 ),
- mParentWidget( parent ),
+ mParentWidget( tqparent ),
mCurrentFolderOpen( false ),
mArchivedMessages( 0 ),
mArchivedSize( 0 ),
@@ -165,7 +165,7 @@ void BackupJob::finish()
}
}
- mProgressItem->seStatus( i18n( "Archiving finished" ) );
+ mProgressItem->setqStatus( i18n( "Archiving finished" ) );
mProgressItem->setComplete();
mProgressItem = 0;
@@ -236,8 +236,8 @@ void BackupJob::archiveNextMessage()
mCurrentMessage = message;
TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) );
}
- else if ( message->parent() ) {
- mCurrentJob = message->parent()->createJob( message );
+ else if ( message->tqparent() ) {
+ mCurrentJob = message->tqparent()->createJob( message );
mCurrentJob->setCancellable( false );
connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( messageRetrieved( KMMessage* ) ) );
@@ -247,7 +247,7 @@ void BackupJob::archiveNextMessage()
}
else {
kdWarning(5006) << "Message with subject " << mCurrentMessage->subject()
- << " is neither complete nor has a parent!" << endl;
+ << " is neither complete nor has a tqparent!" << endl;
abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
.arg( mCurrentFolder->name() ) );
}
@@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder()
mCurrentFolder = mPendingFolders.take( 0 );
kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
- mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
+ mProgressItem->setqStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) );
return;
diff --git a/kmail/backupjob.h b/kmail/backupjob.h
index f6383d66..500e671a 100644
--- a/kmail/backupjob.h
+++ b/kmail/backupjob.h
@@ -48,13 +48,14 @@ namespace KMail
class BackupJob : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
// These enum values have to stay in sync with the format combobox of ArchiveFolderDialog!
enum ArchiveType { Zip = 0, Tar = 1, TarBz2 = 2, TarGz = 3 };
- explicit BackupJob( TQWidget *parent = 0 );
+ explicit BackupJob( TQWidget *tqparent = 0 );
~BackupJob();
void setRootFolder( KMFolder *rootFolder );
void setSaveLocation( const KURL &savePath );
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index a69c01bf..bd6da060 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -302,7 +302,7 @@ static const KMail::BodyPartFormatter * createForApplication( const char * subty
return AnyTypeBodyPartFormatter::create();
}
-// OK, tqreplace this with a factory with plugin support later on...
+// OK, replace this with a factory with plugin support later on...
const KMail::BodyPartFormatter * KMail::BodyPartFormatter::createFor( const char * type, const char * subtype ) {
if ( type && *type )
switch ( type[0] ) {
diff --git a/kmail/bodypartformatter.h b/kmail/bodypartformatter.h
index eda28a90..1c296582 100644
--- a/kmail/bodypartformatter.h
+++ b/kmail/bodypartformatter.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp
index 680d0c48..f11690d5 100644
--- a/kmail/bodypartformatterfactory.cpp
+++ b/kmail/bodypartformatterfactory.cpp
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -44,7 +44,7 @@ using namespace KMail::BodyPartFormatterFactoryPrivate;
// KDE
#include <kdebug.h>
-// Qt
+// TQt
#include <tqstring.h>
#include <tqcstring.h>
#include <tqstringlist.h>
@@ -83,7 +83,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype,
if ( !type || !*type || !subtype || !*subtype || !formatter || !all )
return;
- TypeRegistry::iterator type_it = all->find( type );
+ TypeRegistry::iterator type_it = all->tqfind( type );
if ( type_it == all->end() ) {
kdDebug( 5006 ) << "BodyPartFormatterFactory: instantiating new Subtype Registry for \""
<< type << "\"" << endl;
@@ -92,7 +92,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype,
}
SubtypeRegistry & subtype_reg = type_it->second;
- SubtypeRegistry::iterator subtype_it = subtype_reg.find( subtype );
+ SubtypeRegistry::iterator subtype_it = subtype_reg.tqfind( subtype );
if ( subtype_it != subtype_reg.end() ) {
kdDebug( 5006 ) << "BodyPartFormatterFactory: overwriting previously registered formatter for \""
<< type << "/" << subtype << "\"" << endl;
@@ -159,9 +159,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre
if ( all->empty() )
return 0;
- TypeRegistry::const_iterator type_it = all->find( type );
+ TypeRegistry::const_iterator type_it = all->tqfind( type );
if ( type_it == all->end() )
- type_it = all->find( "*" );
+ type_it = all->tqfind( "*" );
if ( type_it == all->end() )
return 0;
@@ -169,9 +169,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre
if ( subtype_reg.empty() )
return 0;
- SubtypeRegistry::const_iterator subtype_it = subtype_reg.find( subtype );
+ SubtypeRegistry::const_iterator subtype_it = subtype_reg.tqfind( subtype );
if ( subtype_it == subtype_reg.end() )
- subtype_it = subtype_reg.find( "*" );
+ subtype_it = subtype_reg.tqfind( "*" );
if ( subtype_it == subtype_reg.end() )
return 0;
diff --git a/kmail/bodypartformatterfactory.h b/kmail/bodypartformatterfactory.h
index 90217153..dd89eb34 100644
--- a/kmail/bodypartformatterfactory.h
+++ b/kmail/bodypartformatterfactory.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h
index 7ca101ab..f18bc22a 100644
--- a/kmail/bodypartformatterfactory_p.h
+++ b/kmail/bodypartformatterfactory_p.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 5c920584..337c843c 100644
--- a/kmail/bodyvisitor.cpp
+++ b/kmail/bodyvisitor.cpp
@@ -76,9 +76,9 @@ namespace KMail {
while ( (part = it.current()) != 0 )
{
++it;
- // skip this part if the parent part is already loading
- if ( part->parent() &&
- selected.tqcontains( part->parent() ) &&
+ // skip this part if the tqparent part is already loading
+ if ( part->tqparent() &&
+ selected.tqcontains( part->tqparent() ) &&
part->loadPart() )
continue;
@@ -114,9 +114,9 @@ namespace KMail {
headerCheck = false;
// check whether to load this part or not:
- // look at the basic list, ask the subclass and check the parent
+ // look at the basic list, ask the subclass and check the tqparent
if ( mBasicList.tqcontains( part->originalContentTypeStr() ) ||
- parentNeedsLoading( part ) ||
+ tqparentNeedsLoading( part ) ||
addPartToList( part ) )
{
if ( part->typeStr() != "MULTIPART" ||
@@ -137,18 +137,18 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- bool BodyVisitor::parentNeedsLoading( KMMessagePart *msgPart )
+ bool BodyVisitor::tqparentNeedsLoading( KMMessagePart *msgPart )
{
KMMessagePart *part = msgPart;
while ( part )
{
- if ( part->parent() &&
- ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
+ if ( part->tqparent() &&
+ ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" ||
( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" &&
- part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
+ part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) )
return true;
- part = part->parent();
+ part = part->tqparent();
}
return false;
}
diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h
index 519dd86c..4ccd1659 100644
--- a/kmail/bodyvisitor.h
+++ b/kmail/bodyvisitor.h
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -60,10 +60,10 @@ namespace KMail {
protected:
/**
- * Checks if one of the parents needs loaded children
+ * Checks if one of the tqparents needs loaded tqchildren
* This is e.g. needed for multipart/signed where all parts have to be loaded
*/
- static bool parentNeedsLoading( KMMessagePart * part );
+ static bool tqparentNeedsLoading( KMMessagePart * part );
protected:
TQPtrList<KMMessagePart> mParts;
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index f80f5674..2b9ab2a8 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -20,11 +20,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -70,7 +70,7 @@ CachedImapJob::CachedImapJob( const TQValueList<MsgForDownload>& msgs,
// Put messages
CachedImapJob::CachedImapJob( const TQPtrList<KMMessage>& msgs, JobType type,
KMFolderCachedImap* folder )
- : FolderJob( msgs, TQString::null, type, folder?folder->folder():0 ), mFolder( folder ),
+ : FolderJob( msgs, TQString(), type, folder?folder->folder():0 ), mFolder( folder ),
mTotalBytes( msgs.count() ), // we abuse it as "total number of messages"
mMsg( 0 ), mParentFolder( 0 )
{
@@ -78,7 +78,7 @@ CachedImapJob::CachedImapJob( const TQPtrList<KMMessage>& msgs, JobType type,
CachedImapJob::CachedImapJob( const TQValueList<unsigned long>& msgs,
JobType type, KMFolderCachedImap* folder )
- : FolderJob( TQPtrList<KMMessage>(), TQString::null, type, folder?folder->folder():0 ),
+ : FolderJob( TQPtrList<KMMessage>(), TQString(), type, folder?folder->folder():0 ),
mFolder( folder ), mSerNumMsgList( msgs ), mTotalBytes( msgs.count() ), mMsg( 0 ),
mParentFolder ( 0 )
{
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
mFolder->addMsgInternal( mMsg, true, &index );
if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
- mFolder->seStatus( index, KMMsgStatusRead, false );
+ mFolder->setqStatus( index, KMMsgStatusRead, false );
}
emit messageRetrieved( mMsg );
@@ -339,7 +339,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
mMsg->setUID(mfd.uid);
mMsg->setMsgSizeServer(mfd.size);
if( mfd.flags > 0 )
- KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
+ KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
KURL url = mAccount->getUrl();
url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid));
@@ -401,9 +401,9 @@ void CachedImapJob::slotPutNextMessage()
mMsg->setUID( 0 ); // for the index
TQCString cstr(mMsg->asString());
- int a = cstr.find("\nX-UID: ");
- int b = cstr.find('\n', a);
- if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
+ int a = cstr.tqfind("\nX-UID: ");
+ int b = cstr.tqfind('\n', a);
+ if (a != -1 && b != -1 && cstr.tqfind("\n\n") > a) cstr.remove(a, b-a);
TQCString mData(cstr.length() + cstr.tqcontains('\n'));
unsigned int i = 0;
for( char *ch = cstr.data(); *ch; ch++ ) {
@@ -462,7 +462,7 @@ void CachedImapJob::slotPutMessageInfoData( KIO::Job *job, const TQString &data
return;
}
- if ( data.find( "UID" ) != -1 && mMsg ) {
+ if ( data.tqfind( "UID" ) != -1 && mMsg ) {
int uid = ( data.right( data.length() - 4 ) ).toInt();
kdDebug( 5006 ) << k_funcinfo << "Server told us uid is: " << uid << endl;
mMsg->setUID( uid );
@@ -498,7 +498,7 @@ void CachedImapJob::slotPutMessageResult(KIO::Job *job)
emit progress( mSentBytes, mTotalBytes );
int i;
- if( ( i = mFolder->find(mMsg) ) != -1 ) {
+ if( ( i = mFolder->tqfind(mMsg) ) != -1 ) {
/*
* If we have aquired a uid during upload the server supports the uidnext
* extension and there is no need to redownload this mail, we already have
@@ -534,8 +534,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
}
// make copy of setting, to reset it before potentially destroying 'it'
- bool silentUpload = static_cast<KMFolderCachedImap*>((*it).parent->storage())->silentUpload();
- static_cast<KMFolderCachedImap*>((*it).parent->storage())->setSilentUpload( false );
+ bool silentUpload = static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->silentUpload();
+ static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->setSilentUpload( false );
if ( job->error() && !silentUpload ) {
TQString myError = "<p><b>" + i18n("Error while uploading folder")
@@ -549,11 +549,11 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
return;
} else {
KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() );
- KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).parent->storage() );
+ KMFolderCachedImap* tqparentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() );
Q_ASSERT( storage );
- Q_ASSERT( parentStorage );
+ Q_ASSERT( tqparentStorage );
if ( storage->imapPath().isEmpty() ) {
- TQString path = mAccount->createImapPath( parentStorage->imapPath(), storage->folder()->name() );
+ TQString path = mAccount->createImapPath( tqparentStorage->imapPath(), storage->folder()->name() );
if ( !storage->imapPathForCreation().isEmpty() )
path = storage->imapPathForCreation();
storage->setImapPath( path );
@@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
url.setPath( path );
if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) {
- // Associate the jobData with the parent folder, not with the child
+ // Associate the jobData with the tqparent folder, not with the child
// This is necessary in case of an error while creating the subfolder,
- // so that folderComplete is called on the parent (and the sync resetted).
+ // so that folderComplete is called on the tqparent (and the sync resetted).
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.items << folder->label(); // for the err msg
jd.current = folder->folder();
@@ -679,14 +679,14 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
if( job->error() ) {
mErrorCode = job->error();
- mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).tqparent->label() ) + '\n' );
delete this;
return;
}
// Check the uidValidity
TQCString cstr((*it).data.data(), (*it).data.size() + 1);
- int a = cstr.find("X-uidValidity: ");
+ int a = cstr.tqfind("X-uidValidity: ");
if (a < 0) {
// Something is seriously rotten here!
// TODO: Tell the user that he has a problem
@@ -694,7 +694,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
<< mFolder->name() << endl;
}
else {
- int b = cstr.find("\r\n", a);
+ int b = cstr.tqfind("\r\n", a);
if ( (b - a - 15) >= 0 ) {
TQString uidv = cstr.mid(a + 15, b - a - 15);
// kdDebug(5006) << "New uidv = " << uidv << ", old uidv = "
@@ -711,11 +711,11 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
<< mFolder->name() << endl;
}
- a = cstr.find( "X-PermanentFlags: " );
+ a = cstr.tqfind( "X-PermanentFlags: " );
if ( a < 0 ) {
kdDebug(5006) << "no PERMANENTFLAGS response? assumming custom flags are not available" << endl;
} else {
- int b = cstr.find( "\r\n", a );
+ int b = cstr.tqfind( "\r\n", a );
if ( (b - a - 18) >= 0 ) {
int flags = cstr.mid( a + 18, b - a - 18 ).toInt();
emit permanentFlags( flags );
@@ -767,7 +767,7 @@ static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage());
if ( !imapFolder->imapPath().isEmpty() )
// Only rename folders that have been accepted by the server
- if( imapFolder->imapPath().find( oldPath ) == 0 ) {
+ if( imapFolder->imapPath().tqfind( oldPath ) == 0 ) {
TQString p = imapFolder->imapPath();
p = p.mid( oldPath.length() );
p.prepend( newPath );
@@ -782,7 +782,7 @@ static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath,
void CachedImapJob::revertLabelChange()
{
- TQMap<TQString, KMAcctCachedImap::RenamedFolder>::ConstIterator renit = mAccount->renamedFolders().find( mFolder->imapPath() );
+ TQMap<TQString, KMAcctCachedImap::RenamedFolder>::ConstIterator renit = mAccount->renamedFolders().tqfind( mFolder->imapPath() );
Q_ASSERT( renit != mAccount->renamedFolders().end() );
if ( renit != mAccount->renamedFolders().end() ) {
mFolder->folder()->setLabel( (*renit).mOldLabel );
@@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job )
}
//-----------------------------------------------------------------------------
-void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent )
+void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent )
{
- mParentFolder = const_cast<KMFolderCachedImap*>( parent );
+ mParentFolder = const_cast<KMFolderCachedImap*>( tqparent );
}
}
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index 4a2885b0..cf9dab57 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -20,22 +20,22 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -60,6 +60,7 @@ namespace KMail {
class CachedImapJob : public FolderJob {
Q_OBJECT
+ TQ_OBJECT
public:
/** Information about a message to be downloaded (from the 'IMAP envelope') */
struct MsgForDownload {
@@ -94,7 +95,7 @@ public:
virtual ~CachedImapJob();
- void setParentFolder( const KMFolderCachedImap* parent );
+ void setParentFolder( const KMFolderCachedImap* tqparent );
signals:
// only emitted for uid validity checking jobs with PERMANENTFLAGS responses
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 6f563699..037f8090 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -64,7 +64,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const
return transports.first();
const TQString defaultTransport = GlobalSettings::self()->defaultTransport();
- const int defaultIndex = QMAX( 0, transports.findIndex( defaultTransport ) );
+ const int defaultIndex = TQMAX( 0, transports.findIndex( defaultTransport ) );
TQString text;
if ( nullIdentity )
@@ -227,14 +227,14 @@ TQString Callback::receiver() const
// select default identity by default
const TQString defaultAddr = kmkernel->identityManager()->defaultIdentity().primaryEmailAddress();
- const int defaultIndex = QMAX( 0, addrs.findIndex( defaultAddr ) );
+ const int defaultIndex = TQMAX( 0, addrs.findIndex( defaultAddr ) );
mReceiver =
KInputDialog::getItem( i18n( "Select Address" ),
selectMessage,
addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() );
if( !ok )
- mReceiver = TQString::null;
+ mReceiver = TQString();
}
return mReceiver;
diff --git a/kmail/callback.h b/kmail/callback.h
index c7f26058..a7e9af79 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index ac4d3278..d88c3164 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -7,10 +7,10 @@
#include <tqlayout.h>
#include <tqlabel.h>
-ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
+ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
const TQStringList& keys, const TQString& currentKey,
const TQString& lastOptions )
- : KDialogBase( parent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
+ : KDialogBase( tqparent, "chiasmusKeySelector", true, caption, Ok|Cancel, Ok, true )
{
TQWidget *page = makeMainWidget();
@@ -22,7 +22,7 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
mListBox = new KListBox( page );
mListBox->insertStringList( keys );
const int current = keys.findIndex( currentKey );
- mListBox->setSelected( QMAX( 0, current ), true );
+ mListBox->setSelected( TQMAX( 0, current ), true );
mListBox->ensureCurrentVisible();
tqlayout->addWidget( mListBox, 1 );
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index 8ee24c71..3402fd37 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -9,9 +9,10 @@ class TQLabel;
class ChiasmusKeySelector : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
+ ChiasmusKeySelector( TQWidget* tqparent, const TQString& caption,
const TQStringList& keys, const TQString& currentKey,
const TQString& lastOptions );
diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp
index 0e6b3a40..a0ebc825 100644
--- a/kmail/colorlistbox.cpp
+++ b/kmail/colorlistbox.cpp
@@ -29,8 +29,8 @@
#include "colorlistbox.h"
-ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
- :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
+ :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
{
connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
setAcceptDrops( true);
@@ -178,7 +178,7 @@ void ColorListItem::paint( TQPainter *p )
p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() );
- p->setPen( Qt::black );
+ p->setPen( TQt::black );
p->drawRect( 3, 1, mBoxWidth, h-1 );
p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor );
}
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index 13db01af..bb9e5b17 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -26,9 +26,10 @@
class ColorListBox : public KListBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
+ ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
void setColor( uint index, const TQColor &color );
TQColor color( uint index ) const;
signals:
@@ -52,10 +53,10 @@ signals:
};
-class ColorListItem : public QListBoxItem
+class ColorListItem : public TQListBoxItem
{
public:
- ColorListItem( const TQString &text, const TQColor &color=Qt::black );
+ ColorListItem( const TQString &text, const TQColor &color=TQt::black );
const TQColor &color( void );
void setColor( const TQColor &color );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 183b7216..3d3dd6ac 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -28,7 +28,7 @@
#include "compactionjob.h"
#include "kmfolder.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "kmfoldermbox.h"
#include "kmfoldermaildir.h"
@@ -97,13 +97,13 @@ int MboxCompactionJob::executeNow( bool silent )
kdDebug(5006) << storage->location() << " compaction skipped." << endl;
if ( !mSilent ) {
TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
- BroadcasStatus::instance()->seStatusMsg( str );
+ BroadcastqStatus::instance()->seStatusMsg( str );
}
return 0;
}
kdDebug(5006) << "Compacting " << mSrcFolder->idString() << endl;
- if (KMFolderIndex::IndexOk != mbox->indexStatus()) {
+ if (KMFolderIndex::IndexOk != mbox->indextqStatus()) {
kdDebug(5006) << "Critical error: " << storage->location() <<
" has been modified by an external application while KMail was running." << endl;
// exit(1); backed out due to broken nfs
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
mErrorCode = rc;
if ( !mSilent )
- BroadcasStatus::instance()->seStatusMsg( str );
+ BroadcastqStatus::instance()->seStatusMsg( str );
mFolderOpen = false;
deleteLater(); // later, because of the "return mErrorCode"
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
if ( storage->isOpened() )
storage->updateIndex();
if ( !mSilent )
- BroadcasStatus::instance()->seStatusMsg( str );
+ BroadcastqStatus::instance()->seStatusMsg( str );
mFolderOpen = false;
deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h
index bb234a04..e11e6ece 100644
--- a/kmail/compactionjob.h
+++ b/kmail/compactionjob.h
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -39,6 +39,7 @@ namespace KMail {
class MboxCompactionJob : public ScheduledJob
{
Q_OBJECT
+ TQ_OBJECT
public:
/// @p folder should be a folder with a KMFolderMbox storage.
MboxCompactionJob( KMFolder* folder, bool immediate );
@@ -72,6 +73,7 @@ private:
class MaildirCompactionJob : public ScheduledJob
{
Q_OBJECT
+ TQ_OBJECT
public:
/// @p folder should be a folder with a KMFolderMaildir storage.
MaildirCompactionJob( KMFolder* folder, bool immediate );
diff --git a/kmail/composer.h b/kmail/composer.h
index 91c47344..ac903b37 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -35,6 +35,7 @@ namespace KMail {
class Composer : public KMail::SecondaryWindow {
Q_OBJECT
+ TQ_OBJECT
protected:
Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {}
public: // mailserviceimpl
diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui
index 696334e1..ac1c3055 100644
--- a/kmail/composercryptoconfiguration.ui
+++ b/kmail/composercryptoconfiguration.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>ComposerCryptoConfiguration</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ComposerCryptoConfiguration</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>optionsGroup_2</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mAutoSignature</cstring>
</property>
@@ -40,7 +40,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>optionsGroup</cstring>
</property>
@@ -51,7 +51,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mEncToSelf</cstring>
</property>
@@ -62,7 +62,7 @@
<string>When this option is enabled, the message/file will not only be encrypted with the receiver's public key, but also with your key. This will enable you to decrypt the message/file at a later time. This is generally a good idea.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mShowEncryptionResult</cstring>
</property>
@@ -73,7 +73,7 @@
<string>When this option is enabled, the signed/encrypted text will be shown in a separate window, enabling you to know how it will look before it is sent. This is a good idea when you are verifying that your encryption system works.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mStoreEncrypted</cstring>
</property>
@@ -95,7 +95,7 @@ However, there may be local rules that require you to turn this option on. When
&lt;/qt&gt;</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mShowKeyApprovalDlg</cstring>
</property>
@@ -106,7 +106,7 @@ However, there may be local rules that require you to turn this option on. When
<string>When this option is enabled, the application will always show you a list of public keys from which you can choose the one it will use for encryption. If it is off, the application will only show the dialog if it cannot find the right key or if there are several which could be used.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mAutoEncrypt</cstring>
</property>
@@ -117,7 +117,7 @@ However, there may be local rules that require you to turn this option on. When
<string>When this option is enabled, every message you send will be encrypted whenever encryption is possible and desired; of course, it is still possible to disable the automatic encryption for each message individually.</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>mNeverEncryptWhenSavingInDrafts</cstring>
</property>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c5824ead..bc415a88 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -101,7 +101,7 @@ using KMime::DateFormatter;
#include <kcmultidialog.h>
#include <kcombobox.h>
-// Qt headers:
+// TQt headers:
#include <tqvalidator.h>
#include <tqwhatsthis.h>
#include <tqvgroupbox.h>
@@ -214,9 +214,9 @@ namespace {
}
-ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
+ConfigureDialog::ConfigureDialog( TQWidget *tqparent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, KGuiItem( i18n( "&Load Profile..." ) ),
- KGuiItem(), User2, i18n( "Configure" ), parent, name, modal )
+ KGuiItem(), User2, i18n( "Configure" ), tqparent, name, modal )
, mProfileDialog( 0 )
{
KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
@@ -284,8 +284,8 @@ TQString IdentityPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-identity");
}
-IdentityPage::IdentityPage( TQWidget * parent, const char * name )
- : ConfigModule( parent, name ),
+IdentityPage::IdentityPage( TQWidget * tqparent, const char * name )
+ : ConfigModule( tqparent, name ),
mIdentityDialog( 0 )
{
TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
@@ -555,8 +555,8 @@ TQString AccountsPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts");
}
-AccountsPage::AccountsPage( TQWidget * parent, const char * name )
- : ConfigModuleWithTabs( parent, name )
+AccountsPage::AccountsPage( TQWidget * tqparent, const char * name )
+ : ConfigModuleWithTabs( tqparent, name )
{
//
// "Receiving" tab:
@@ -581,8 +581,8 @@ TQString AccountsPage::SendingTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts-sending");
}
-AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
mTransportInfoList.setAutoDelete( true );
// temp. vars:
@@ -649,7 +649,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
btn_vlay->addStretch( 1 ); // spacer
// "Common options" groupbox:
- group = new TQGroupBox( 0, Qt::Vertical,
+ group = new TQGroupBox( 0, TQt::Vertical,
i18n("Common Options"), this );
vlay->addWidget(group);
@@ -739,7 +739,7 @@ static inline TQString uniqueName( const TQStringList & list,
{
int suffix = 1;
TQString result = name;
- while ( list.find( result ) != list.end() ) {
+ while ( list.tqfind( result ) != list.end() ) {
result = i18n("%1: name; %2: number appended to it to make it unique "
"among a list of names", "%1 %2")
.arg( name ).arg( suffix );
@@ -911,7 +911,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
KPIM::IdentityManager * im = kmkernel->identityManager();
for ( KPIM::IdentityManager::Iterator it = im->modifyBegin(); it != im->modifyEnd(); ++it ) {
if ( item->text( 0 ) == (*it).transport() ) {
- (*it).setTransport( TQString::null );
+ (*it).setTransport( TQString() );
changedIdents += (*it).identityName();
}
}
@@ -919,7 +919,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
// if the deleted transport is the currently used transport reset it to default
const TQString& currentTransport = GlobalSettings::self()->currentTransport();
if ( item->text( 0 ) == currentTransport ) {
- GlobalSettings::self()->setCurrentTransport( TQString::null );
+ GlobalSettings::self()->setCurrentTransport( TQString() );
}
if ( !changedIdents.isEmpty() ) {
@@ -952,7 +952,7 @@ void AccountsPage::SendingTab::slotRemoveSelectedTransport()
newCurrent->setText( 1, i18n("sendmail (Default)" ));
}
} else {
- GlobalSettings::self()->setDefaultTransport( TQString::null );
+ GlobalSettings::self()->setDefaultTransport( TQString() );
}
}
delete item;
@@ -1056,8 +1056,8 @@ TQString AccountsPage::ReceivingTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-accounts-receiving");
}
-AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
- : ConfigModuleTab ( parent, name )
+AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab ( tqparent, name )
{
// temp. vars:
TQVBoxLayout *vlay;
@@ -1223,7 +1223,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() {
default:
// ### FIXME: How should this happen???
- // tqreplace with assert.
+ // replace with assert.
KMessageBox::sorry( this, i18n("Unknown account type selected") );
return;
}
@@ -1481,8 +1481,8 @@ TQString AppearancePage::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance");
}
-AppearancePage::AppearancePage( TQWidget * parent, const char * name )
- : ConfigModuleWithTabs( parent, name )
+AppearancePage::AppearancePage( TQWidget * tqparent, const char * name )
+ : ConfigModuleWithTabs( tqparent, name )
{
//
// "Fonts" tab:
@@ -1551,8 +1551,8 @@ static const struct {
};
static const int numFontNames = sizeof fontNames / sizeof *fontNames;
-AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name ), mActiveFontIndex( -1 )
+AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name ), mActiveFontIndex( -1 )
{
assert( numFontNames == sizeof mFont / sizeof *mFont );
// tmp. vars:
@@ -1722,15 +1722,15 @@ static const struct {
{ "PGPMessageErr", I18N_NOOP("OpenPGP Message - Bad Signature") },
{ "HTMLWarningColor", I18N_NOOP("Border Around Warning Prepending HTML Messages") },
{ "CloseToQuotaColor", I18N_NOOP("Folder Name and Size When Close to Quota") },
- { "ColorbarBackgroundPlain", I18N_NOOP("HTML Status Bar Background - No HTML Message") },
- { "ColorbarForegroundPlain", I18N_NOOP("HTML Status Bar Foreground - No HTML Message") },
- { "ColorbarBackgroundHTML", I18N_NOOP("HTML Status Bar Background - HTML Message") },
- { "ColorbarForegroundHTML", I18N_NOOP("HTML Status Bar Foreground - HTML Message") },
+ { "ColorbarBackgroundPlain", I18N_NOOP("HTML tqStatus Bar Background - No HTML Message") },
+ { "ColorbarForegroundPlain", I18N_NOOP("HTML tqStatus Bar Foreground - No HTML Message") },
+ { "ColorbarBackgroundHTML", I18N_NOOP("HTML tqStatus Bar Background - HTML Message") },
+ { "ColorbarForegroundHTML", I18N_NOOP("HTML tqStatus Bar Foreground - HTML Message") },
};
static const int numColorNames = sizeof colorNames / sizeof *colorNames;
-AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -1801,22 +1801,22 @@ void AppearancePage::ColorsTab::doLoadOther() {
TQColor( 0x00, 0x60, 0x00 ), // quoted l3
KGlobalSettings::linkColor(), // link
KGlobalSettings::visitedLinkColor(), // visited link
- Qt::red, // misspelled words
- Qt::red, // new msg
- Qt::blue, // unread mgs
+ TQt::red, // misspelled words
+ TQt::red, // new msg
+ TQt::blue, // unread mgs
TQColor( 0x00, 0x7F, 0x00 ), // important msg
- Qt::blue, // todo mgs
+ TQt::blue, // todo mgs
TQColor( 0x00, 0x80, 0xFF ), // light blue // pgp encrypted
TQColor( 0x40, 0xFF, 0x40 ), // light green // pgp ok, trusted key
TQColor( 0xFF, 0xFF, 0x40 ), // light yellow // pgp ok, untrusted key
TQColor( 0xFF, 0xFF, 0x40 ), // light yellow // pgp unchk
- Qt::red, // pgp bad
+ TQt::red, // pgp bad
TQColor( 0xFF, 0x40, 0x40 ), // warning text color: light red
- Qt::red, // close to quota
- Qt::lightGray, // colorbar plain bg
- Qt::black, // colorbar plain fg
- Qt::black, // colorbar html bg
- Qt::white, // colorbar html fg
+ TQt::red, // close to quota
+ TQt::lightGray, // colorbar plain bg
+ TQt::black, // colorbar plain fg
+ TQt::black, // colorbar html bg
+ TQt::white, // colorbar html fg
};
for ( int i = 0 ; i < numColorNames ; i++ ) {
@@ -1900,8 +1900,8 @@ static const EnumConfigEntry readerWindowMode = {
readerWindowModes, DIM(readerWindowModes), 1
};
-AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQVBoxLayout * vlay;
@@ -1992,8 +1992,8 @@ static const struct {
static const int numDateDisplayConfig =
sizeof dateDisplayConfig / sizeof *dateDisplayConfig;
-AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name ),
+AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name ),
mCustomDateFormatEdit( 0 )
{
// tmp. vars:
@@ -2094,8 +2094,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
"<li>ss - the seconds with a leading zero (00-59)</li>"
"<li>z - the milliseconds without leading zeroes (0-999)</li>"
"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
- "<li>AP - switch to AM/PM display. AP will be tqreplaced by either \"AM\" or \"PM\".</li>"
- "<li>ap - switch to AM/PM display. ap will be tqreplaced by either \"am\" or \"pm\".</li>"
+ "<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or \"PM\".</li>"
+ "<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li>"
"<li>Z - time zone in numeric form (-0500)</li>"
"</ul>"
"<p><strong>All other input characters will be ignored."
@@ -2184,7 +2184,7 @@ void AppearancePage::HeadersTab::save() {
int result = KMessageBox::warningContinueCancel( this,
i18n("Changing the global threading setting will override "
"all folder specific values."),
- TQString::null, KStdGuiItem::cont(), "threadOverride" );
+ TQString(), KStdGuiItem::cont(), "threadOverride" );
if ( result == KMessageBox::Continue ) {
tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
// remove all threadMessagesOverride keys from all [Folder-*] groups:
@@ -2226,7 +2226,7 @@ static const BoolConfigEntry showColorbarMode = {
};
static const BoolConfigEntry showSpamStatusMode = {
- "Reader", "showSpamStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
+ "Reader", "showSpamtqStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
};
static const BoolConfigEntry showEmoticons = {
@@ -2249,9 +2249,9 @@ TQString AppearancePage::ReaderTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance-reader");
}
-AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
+AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * tqparent,
const char * name )
- : ConfigModuleTab( parent, name )
+ : ConfigModuleTab( tqparent, name )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@@ -2276,7 +2276,7 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ),
this, TQT_SLOT( slotEmitChanged() ) );
- // "tqreplace smileys by emoticons" check box;
+ // "replace smileys by emoticons" check box;
populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons );
vlay->addWidget( mShowEmoticonsCheck );
connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ),
@@ -2415,7 +2415,7 @@ void AppearancePage::ReaderTab::readCurrentOverrideCodec()
kdWarning(5006) << "Unknown override character encoding \"" << currentOverrideEncoding
<< "\". Resetting to Auto." << endl;
mOverrideCharsetCombo->setCurrentItem( 0 );
- GlobalSettings::self()->setOverrideCharacterEncoding( TQString::null );
+ GlobalSettings::self()->setOverrideCharacterEncoding( TQString() );
}
}
@@ -2475,9 +2475,9 @@ TQString AppearancePage::SystemTrayTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-appearance-systemtray");
}
-AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
+AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * tqparent,
const char * name )
- : ConfigModuleTab( parent, name )
+ : ConfigModuleTab( tqparent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -2540,8 +2540,8 @@ TQString ComposerPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer");
}
-ComposerPage::ComposerPage( TQWidget * parent, const char * name )
- : ConfigModuleWithTabs( parent, name )
+ComposerPage::ComposerPage( TQWidget * tqparent, const char * name )
+ : ConfigModuleWithTabs( tqparent, name )
{
//
// "General" tab:
@@ -2599,8 +2599,8 @@ TQString ComposerPage::GeneralTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-general");
}
-ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -2796,7 +2796,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
mEditorRequester, TQT_SLOT(setEnabled(bool)) );
- label = new TQLabel( i18n("<b>%f</b> will be tqreplaced with the "
+ label = new TQLabel( i18n("<b>%f</b> will be replaced with the "
"filename to edit."), group );
label->setEnabled( false ); // see above
connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
@@ -2913,8 +2913,8 @@ TQString ComposerPage::PhrasesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-phrases");
}
-ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQGridLayout *glay;
@@ -3037,7 +3037,7 @@ void ComposerPage::PhrasesTab::slotAddNewLanguage( const TQString& lang )
locale.translate("Forwarded Message"),
locale.translate(">%_") ) );
mRemoveButton->setEnabled( true );
- slotLanguageChanged( TQString::null );
+ slotLanguageChanged( TQString() );
}
void ComposerPage::PhrasesTab::slotRemoveLanguage()
@@ -3125,8 +3125,8 @@ TQString ComposerPage::TemplatesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-templates");
}
-ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
- : ConfigModuleTab ( parent, name )
+ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab ( tqparent, name )
{
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -3149,8 +3149,8 @@ TQString ComposerPage::CustomTemplatesTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-custom-templates");
}
-ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
- : ConfigModuleTab ( parent, name )
+ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab ( tqparent, name )
{
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -3173,8 +3173,8 @@ TQString ComposerPage::SubjectTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-subject");
}
-ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3257,8 +3257,8 @@ TQString ComposerPage::CharsetTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-charset");
}
-ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3268,7 +3268,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char *
label = new TQLabel( i18n("This list is checked for every outgoing message "
"from the top to the bottom for a charset that "
- "tqcontains all required characters."), this );
+ "contains all required characters."), this );
label->tqsetAlignment( WordBreak);
vlay->addWidget( label );
@@ -3316,7 +3316,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
}
KMessageBox::sorry( this, i18n("This charset is not supported.") );
- charset = TQString::null;
+ charset = TQString();
}
void ComposerPage::CharsetTab::doLoadOther() {
@@ -3352,8 +3352,8 @@ TQString ComposerPage::HeadersTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-headers");
}
-ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3567,9 +3567,9 @@ TQString ComposerPage::AttachmentsTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-composer-attachments");
}
-ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
+ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * tqparent,
const char * name )
- : ConfigModuleTab( parent, name ) {
+ : ConfigModuleTab( tqparent, name ) {
// tmp. vars:
TQVBoxLayout *vlay;
TQLabel *label;
@@ -3672,8 +3672,8 @@ TQString SecurityPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-security");
}
-SecurityPage::SecurityPage( TQWidget * parent, const char * name )
- : ConfigModuleWithTabs( parent, name )
+SecurityPage::SecurityPage( TQWidget * tqparent, const char * name )
+ : ConfigModuleWithTabs( tqparent, name )
{
//
// "Reading" tab:
@@ -3719,8 +3719,8 @@ TQString SecurityPage::GeneralTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-reading");
}
-SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
- : ConfigModuleTab ( parent, name )
+SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab ( tqparent, name )
{
// tmp. vars:
TQVBoxLayout *vlay;
@@ -3733,7 +3733,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
- // QWhat'sThis texts
+ // TQWhat'sThis texts
TQString htmlWhatsThis = i18n( "<qt><p>Messages sometimes come in both formats. "
"This option controls whether you want the HTML part or the plain "
"text part to be displayed.</p>"
@@ -3855,7 +3855,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
mMDNGroup->insert( radio );
for ( int i = 0 ; i < mMDNGroup->count() ; ++i )
- TQWhatsThis::add( mMDNGroup->find( i ), receiptWhatsThis );
+ TQWhatsThis::add( mMDNGroup->tqfind( i ), receiptWhatsThis );
w = new TQWidget( hbox ); // spacer
hbox->setStretchFactor( w, 1 );
@@ -3961,7 +3961,7 @@ void SecurityPage::GeneralTab::save() {
if (reader.readBoolEntry( "htmlMail", false ) != mHtmlMailCheck->isChecked())
{
if (KMessageBox::warningContinueCancel(this, i18n("Changing the global "
- "HTML setting will override all folder specific values."), TQString::null,
+ "HTML setting will override all folder specific values."), TQString(),
KStdGuiItem::cont(), "htmlMailOverride") == KMessageBox::Continue)
{
reader.writeEntry( "htmlMail", mHtmlMailCheck->isChecked() );
@@ -3996,8 +3996,8 @@ TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-composing");
}
-SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
- : ConfigModuleTab ( parent, name )
+SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab ( tqparent, name )
{
// the margins are inside mWidget itself
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4071,8 +4071,8 @@ TQString SecurityPage::WarningTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-warnings");
}
-SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// the margins are inside mWidget itself
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4180,8 +4180,8 @@ TQString SecurityPage::SMimeTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-smime-validation");
}
-SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// the margins are inside mWidget itself
TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 );
@@ -4498,8 +4498,8 @@ TQString SecurityPage::CryptPlugTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-security-crypto-backends");
}
-SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
@@ -4531,8 +4531,8 @@ TQString MiscPage::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc");
}
-MiscPage::MiscPage( TQWidget * parent, const char * name )
- : ConfigModuleWithTabs( parent, name )
+MiscPage::MiscPage( TQWidget * tqparent, const char * name )
+ : ConfigModuleWithTabs( tqparent, name )
{
mFolderTab = new FolderTab();
addTab( mFolderTab, i18n("&Folders") );
@@ -4546,8 +4546,8 @@ TQString MiscPage::FolderTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc-folders");
}
-MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
- : ConfigModuleTab( parent, name )
+MiscPageFolderTab::MiscPageFolderTab( TQWidget * tqparent, const char * name )
+ : ConfigModuleTab( tqparent, name )
{
// temp. vars:
TQVBoxLayout *vlay;
@@ -4781,7 +4781,7 @@ void MiscPage::FolderTab::save() {
general.writeEntry( "confirm-before-empty", mEmptyFolderConfirmCheck->isChecked() );
general.writeEntry( "default-mailbox-format", mMailboxPrefCombo->currentItem() );
general.writeEntry( "startupFolder", mOnStartupOpenFolder->folder() ?
- mOnStartupOpenFolder->folder()->idString() : TQString::null );
+ mOnStartupOpenFolder->folder()->idString() : TQString() );
GlobalSettings::self()->setDelayedMarkAsRead( mDelayedMarkAsRead->isChecked() );
GlobalSettings::self()->setDelayedMarkTime( mDelayedMarkTime->value() );
@@ -4800,8 +4800,8 @@ TQString MiscPage::GroupwareTab::helpAnchor() const {
return TQString::tqfromLatin1("configure-misc-groupware");
}
-MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
- : ConfigModuleTab( parent, name )
+MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* tqparent, const char* name )
+ : ConfigModuleTab( tqparent, name )
{
TQBoxLayout* vlay = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
@@ -4866,7 +4866,7 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
this, TQT_SLOT( slotEmitChanged( void ) ) );
mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format
- toolTip = i18n( "Set the parent of the resource folders" );
+ toolTip = i18n( "Set the tqparent of the resource folders" );
whatsThis = i18n( GlobalSettings::self()->theIMAPResourceFolderParentItem()->whatsThis().utf8() );
TQToolTip::add( mFolderComboLabel, toolTip );
TQWhatsThis::add( mFolderComboLabel, whatsThis );
@@ -4999,7 +4999,7 @@ void MiscPageGroupwareTab::slotLegacyBodyInvitesToggled( bool on )
"resulting messages look very odd.<br>People that have email "
"programs that do understand invitations will still "
"be able to work with this.</qt>" );
- KMessageBox::information( this, txt, TQString::null,
+ KMessageBox::information( this, txt, TQString(),
"LegacyBodyInvitesWarning" );
}
// Invitations in the body are autosent in any case (no point in editing raw ICAL)
@@ -5051,7 +5051,7 @@ void MiscPage::GroupwareTab::doLoadFromGlobalSettings() {
KMAccount* selectedAccount = 0;
int accountId = GlobalSettings::self()->theIMAPResourceAccount();
if ( accountId )
- selectedAccount = kmkernel->acctMgr()->find( accountId );
+ selectedAccount = kmkernel->acctMgr()->tqfind( accountId );
else {
// Fallback: iterate over accounts to select folderId if found (as an inbox folder)
for( KMAccount *a = kmkernel->acctMgr()->first(); a!=0;
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index 062bbf78..a44f5db1 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -34,9 +34,10 @@ namespace KMail {
class ConfigureDialog : public KCMultiDialog
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
+ ConfigureDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
~ConfigureDialog();
signals:
@@ -78,6 +79,7 @@ private:
*/
class AccountUpdater : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
AccountUpdater(KMail::ImapAccountBase *account);
void update();
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index e17e800e..ff473f66 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -1,5 +1,5 @@
#ifndef KDE_USE_FINAL
-#define QT_NO_CAST_ASCII
+#define TQT_NO_CAST_ASCII
#endif
// configuredialog_p.cpp: classes internal to ConfigureDialog
// see configuredialog.cpp for details.
@@ -25,7 +25,7 @@
#include <klocale.h>
#include <kdebug.h>
-// Qt headers:
+// TQt headers:
#include <tqheader.h>
#include <tqtabwidget.h>
#include <tqradiobutton.h>
@@ -38,9 +38,9 @@
NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
- TQWidget *parent, const char *name,
+ TQWidget *tqparent, const char *name,
bool modal )
- : KDialogBase( parent, name, modal, i18n("New Identity"),
+ : KDialogBase( tqparent, name, modal, i18n("New Identity"),
Ok|Cancel|Help, Ok, true )
{
setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
@@ -122,9 +122,9 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) {
enableButtonOK( true );
}
-ListView::ListView( TQWidget *parent, const char *name,
+ListView::ListView( TQWidget *tqparent, const char *name,
int visibleItem )
- : KListView( parent, name )
+ : KListView( tqparent, name )
{
setVisibleItem(visibleItem);
}
@@ -166,7 +166,7 @@ void ListView::resizeColums()
void ListView::setVisibleItem( int visibleItem, bool updateSize )
{
- mVisibleItem = QMAX( 1, visibleItem );
+ mVisibleItem = TQMAX( 1, visibleItem );
if( updateSize == true )
{
TQSize s = tqsizeHint();
@@ -191,9 +191,9 @@ TQSize ListView::tqsizeHint() const
static TQString flagPng = TQString::tqfromLatin1("/flag.png");
NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
- TQWidget *parent, const char *name,
+ TQWidget *tqparent, const char *name,
bool modal )
- : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
+ : KDialogBase( tqparent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
{
// tqlayout the page (a combobox with label):
TQWidget *page = makeMainWidget();
@@ -222,7 +222,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
// we extract it from the path: "/prefix/de/entry.desktop" -> "de"
TQString acronym = (*it).section( '/', -2, -2 );
- if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
+ if ( suppressedAcronyms.tqfind( acronym ) == suppressedAcronyms.end() ) {
// not found:
TQString displayname = TQString::tqfromLatin1("%1 (%2)")
.arg( name ).arg( acronym );
@@ -244,8 +244,8 @@ TQString NewLanguageDialog::language() const
}
-LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name )
- : TQComboBox( rw, parent, name )
+LanguageComboBox::LanguageComboBox( bool rw, TQWidget *tqparent, const char *name )
+ : TQComboBox( rw, tqparent, name )
{
}
@@ -269,10 +269,10 @@ TQString LanguageComboBox::language() const
void LanguageComboBox::setLanguage( const TQString & language )
{
- TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
+ TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
for (int i = 0; i < count(); i++)
// ### FIXME: use .endWith():
- if ( text(i).find( parenthizedLanguage ) >= 0 ) {
+ if ( text(i).tqfind( tqparenthizedLanguage ) >= 0 ) {
setCurrentItem(i);
return;
}
@@ -284,8 +284,8 @@ void LanguageComboBox::setLanguage( const TQString & language )
//
//
-ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal )
- : KDialogBase( parent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
+ProfileDialog::ProfileDialog( TQWidget * tqparent, const char * name, bool modal )
+ : KDialogBase( tqparent, name, modal, i18n("Load Profile"), Ok|Cancel, Ok, true )
{
// tmp. vars:
TQWidget * page = makeMainWidget();
@@ -364,9 +364,9 @@ void ProfileDialog::slotOk() {
}
-ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent,
+ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * tqparent,
const char * name )
- : ConfigModule( parent, name )
+ : ConfigModule( tqparent, name )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
mTabWidget = new TQTabWidget( this );
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index f12c39ba..b1c34379 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -78,12 +78,13 @@ namespace Kleo {
class NewIdentityDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
enum DuplicateMode { Empty, ControlCenter, ExistingEntry };
NewIdentityDialog( const TQStringList & identities,
- TQWidget *parent=0, const char *name=0, bool modal=true );
+ TQWidget *tqparent=0, const char *name=0, bool modal=true );
TQString identityName() const { return mLineEdit->text(); }
TQString duplicateIdentity() const { return mComboBox->currentText(); }
@@ -108,10 +109,10 @@ private:
struct LanguageItem
{
LanguageItem() {}
- LanguageItem( const TQString & language, const TQString & reply=TQString::null,
- const TQString & replyAll=TQString::null,
- const TQString & forward=TQString::null,
- const TQString & indentPrefix=TQString::null ) :
+ LanguageItem( const TQString & language, const TQString & reply=TQString(),
+ const TQString & replyAll=TQString(),
+ const TQString & forward=TQString(),
+ const TQString & indentPrefix=TQString() ) :
mLanguage( language ), mReply( reply ), mReplyAll( replyAll ),
mForward( forward ), mIndentPrefix( indentPrefix ) {}
@@ -123,9 +124,10 @@ typedef TQValueList<LanguageItem> LanguageItemList;
class NewLanguageDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0,
+ NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *tqparent=0,
const char *name=0, bool modal=true );
TQString language() const;
@@ -134,12 +136,13 @@ class NewLanguageDialog : public KDialogBase
};
-class LanguageComboBox : public QComboBox
+class LanguageComboBox : public TQComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 );
+ LanguageComboBox( bool rw, TQWidget *tqparent=0, const char *name=0 );
int insertLanguage( const TQString & language );
TQString language() const;
void setLanguage( const TQString & language );
@@ -153,8 +156,9 @@ class LanguageComboBox : public QComboBox
class ProfileDialog : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
+ ProfileDialog( TQWidget * tqparent=0, const char * name=0, bool modal=false );
signals:
void profileSelected( KConfig * profile );
@@ -174,9 +178,10 @@ private:
#include <kdialog.h>
class ConfigModule : public KCModule {
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigModule( TQWidget * parent=0, const char * name=0 )
- : KCModule ( parent, name )
+ ConfigModule( TQWidget * tqparent=0, const char * name=0 )
+ : KCModule ( tqparent, name )
{}
~ConfigModule() {}
@@ -201,9 +206,10 @@ signals:
// Individual tab of a ConfigModuleWithTabs
class ConfigModuleTab : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
- :TQWidget( parent, name )
+ ConfigModuleTab( TQWidget *tqparent=0, const char* name=0 )
+ :TQWidget( tqparent, name )
{}
~ConfigModuleTab() {}
void load();
@@ -235,8 +241,9 @@ private:
*/
class ConfigModuleWithTabs : public ConfigModule {
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
+ ConfigModuleWithTabs( TQWidget * tqparent=0, const char * name=0 );
~ConfigModuleWithTabs() {}
// don't reimplement any of those methods
@@ -262,8 +269,9 @@ private:
class KDE_EXPORT IdentityPage : public ConfigModule {
Q_OBJECT
+ TQ_OBJECT
public:
- IdentityPage( TQWidget * parent=0, const char * name=0 );
+ IdentityPage( TQWidget * tqparent=0, const char * name=0 );
~IdentityPage() {}
TQString helpAnchor() const;
@@ -312,8 +320,9 @@ private: // data members
// subclasses: one class per tab:
class AccountsPageSendingTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
+ AccountsPageSendingTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -349,8 +358,9 @@ private:
class AccountsPageReceivingTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
+ AccountsPageReceivingTab( TQWidget * tqparent=0, const char * name=0 );
~AccountsPageReceivingTab();
TQString helpAnchor() const;
void save();
@@ -393,8 +403,9 @@ private:
class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
Q_OBJECT
+ TQ_OBJECT
public:
- AccountsPage( TQWidget * parent=0, const char * name=0 );
+ AccountsPage( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -420,8 +431,9 @@ private:
class AppearancePageFontsTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
+ AppearancePageFontsTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -447,8 +459,9 @@ private:
class AppearancePageColorsTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
+ AppearancePageColorsTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -468,8 +481,9 @@ private:
class AppearancePageLayoutTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
+ AppearancePageLayoutTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -490,8 +504,9 @@ private: // data
class AppearancePageHeadersTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
+ AppearancePageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -516,8 +531,9 @@ private: // data
class AppearancePageReaderTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
+ AppearancePageReaderTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -547,8 +563,9 @@ private: // data
class AppearancePageSystemTrayTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
+ AppearancePageSystemTrayTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -565,8 +582,9 @@ private: // data
class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
Q_OBJECT
+ TQ_OBJECT
public:
- AppearancePage( TQWidget * parent=0, const char * name=0 );
+ AppearancePage( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -595,8 +613,9 @@ private:
class ComposerPageGeneralTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -628,8 +647,9 @@ private:
class ComposerPagePhrasesTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPagePhrasesTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -659,8 +679,9 @@ private:
class ComposerPageTemplatesTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -676,8 +697,9 @@ private:
class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageCustomTemplatesTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -693,8 +715,9 @@ private:
class ComposerPageSubjectTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageSubjectTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -711,8 +734,9 @@ private:
class ComposerPageCharsetTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageCharsetTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -732,8 +756,9 @@ private:
class ComposerPageHeadersTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageHeadersTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -764,8 +789,9 @@ private:
class ComposerPageAttachmentsTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
+ ComposerPageAttachmentsTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -785,8 +811,9 @@ private:
class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
Q_OBJECT
+ TQ_OBJECT
public:
- ComposerPage( TQWidget * parent=0, const char * name=0 );
+ ComposerPage( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -819,8 +846,9 @@ private:
class SecurityPageGeneralTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
+ SecurityPageGeneralTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
void save();
@@ -844,8 +872,9 @@ private:
class SecurityPageComposerCryptoTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
+ SecurityPageComposerCryptoTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -863,8 +892,9 @@ private:
class SecurityPageWarningTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
+ SecurityPageWarningTab( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -885,9 +915,10 @@ private:
class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
- SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 );
+ SecurityPageSMimeTab( TQWidget * tqparent=0, const char * name=0 );
~SecurityPageSMimeTab();
TQString helpAnchor() const;
@@ -912,8 +943,9 @@ private:
class SecurityPageCryptPlugTab : public ConfigModuleTab
{
Q_OBJECT
+ TQ_OBJECT
public:
- SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
+ SecurityPageCryptPlugTab( TQWidget * tqparent = 0, const char* name = 0 );
~SecurityPageCryptPlugTab();
TQString helpAnchor() const;
@@ -930,8 +962,9 @@ private:
class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
Q_OBJECT
+ TQ_OBJECT
public:
- SecurityPage( TQWidget * parent=0, const char * name=0 );
+ SecurityPage( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
@@ -961,8 +994,9 @@ private:
class MiscPageFolderTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
+ MiscPageFolderTab( TQWidget * tqparent=0, const char * name=0 );
void save();
TQString helpAnchor() const;
@@ -991,8 +1025,9 @@ private:
class MiscPageGroupwareTab : public ConfigModuleTab {
Q_OBJECT
+ TQ_OBJECT
public:
- MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
+ MiscPageGroupwareTab( TQWidget * tqparent=0, const char * name=0 );
void save();
TQString helpAnchor() const;
@@ -1032,8 +1067,9 @@ private:
class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
Q_OBJECT
+ TQ_OBJECT
public:
- MiscPage( TQWidget * parent=0, const char * name=0 );
+ MiscPage( TQWidget * tqparent=0, const char * name=0 );
TQString helpAnchor() const;
typedef MiscPageFolderTab FolderTab;
@@ -1052,8 +1088,9 @@ private:
class ListView : public KListView {
Q_OBJECT
+ TQ_OBJECT
public:
- ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
+ ListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
void resizeColums();
void setVisibleItem( int visibleItem, bool updateSize=true );
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index ddfa6d25..9be07213 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob()
/*
* The basic strategy is to first create the target folder, then copy all the mail
- * from the source to the target folder, then recurse for each of the folder's children
+ * from the source to the target folder, then recurse for each of the folder's tqchildren
*/
void CopyFolderJob::execute()
{
@@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command )
rollback();
return;
}
- // if we have children, recurse
+ // if we have tqchildren, recurse
if ( mStorage->folder()->child() ) {
slotCopyNextChild();
} else {
@@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success )
mNextChildFolder = static_cast<KMFolder*>(node);
++mChildFolderNodeIterator;
} else {
- // no more children, we are done
+ // no more tqchildren, we are done
emit folderCopyComplete( true );
deleteLater();
return;
@@ -196,8 +196,8 @@ bool CopyFolderJob::createTargetDir()
KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() );
connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)),
this, TQT_SLOT(folderCreationDone(const TQString&, bool)) );
- selectedStorage->createFolder(mStorage->folder()->name(), TQString::null); // create it on the server
- newStorage->initializeFrom( selectedStorage, imapPath, TQString::null );
+ selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server
+ newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() );
waitForFolderCreation = true;
success = true;
diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h
index 73311a49..743d8b61 100644
--- a/kmail/copyfolderjob.h
+++ b/kmail/copyfolderjob.h
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -50,11 +50,12 @@ namespace KMail {
class CopyFolderJob : public FolderJob
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Create a new job
* @param storage of the folder that should be copied
- * @param newParent the target parent folder
+ * @param newParent the target tqparent folder
*/
CopyFolderJob( FolderStorage* const storage, KMFolderDir* const newParent = 0 );
@@ -69,7 +70,7 @@ public:
protected slots:
- /** Create the target directory under the new parent. Returns success or failure.*/
+ /** Create the target directory under the new tqparent. Returns success or failure.*/
bool createTargetDir();
/** Copy all messages from the original folder to mNewFolder */
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index fc411be7..3fe2fd78 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/csshelper.h b/kmail/csshelper.h
index 7015cec5..9e87f5df 100644
--- a/kmail/csshelper.h
+++ b/kmail/csshelper.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 6a0a7f4c..ef3668df 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -52,8 +52,8 @@
#include "customtemplates.h"
-CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
- :CustomTemplatesBase( parent, name ),
+CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name )
+ :CustomTemplatesBase( tqparent, name ),
mCurrentItem( 0 ),
mBlockChangeSignal( false )
{
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index a8c24061..21695824 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -35,6 +35,7 @@ class KShortcut;
class CustomTemplates : public CustomTemplatesBase
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -42,7 +43,7 @@ class CustomTemplates : public CustomTemplatesBase
public:
- CustomTemplates( TQWidget *parent = 0, const char *name = 0 );
+ CustomTemplates( TQWidget *tqparent = 0, const char *name = 0 );
~CustomTemplates();
void load();
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index ab8ecb84..cf068e9e 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CustomTemplatesBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="tqgeometry">
<rect>
<x>0</x>
@@ -13,7 +13,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
</property>
@@ -24,7 +24,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
</property>
@@ -72,7 +72,7 @@
</widget>
</hbox>
</widget>
- <widget class="QListView">
+ <widget class="TQListView">
<column>
<property name="text">
<string>Type</string>
@@ -120,7 +120,7 @@
</widget>
</vbox>
</widget>
- <widget class="QFrame" row="0" column="1">
+ <widget class="TQFrame" row="0" column="1">
<property name="name">
<cstring>mEditFrame</cstring>
</property>
@@ -145,7 +145,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
</property>
@@ -153,7 +153,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
</property>
@@ -161,7 +161,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>mToLabel</cstring>
</property>
@@ -169,7 +169,7 @@
<string>To:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>mCCLabel</cstring>
</property>
@@ -179,7 +179,7 @@
</widget>
</vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
</property>
@@ -201,7 +201,7 @@
</widget>
</hbox>
</widget>
- <widget class="QTextEdit">
+ <widget class="TQTextEdit">
<property name="name">
<cstring>mEdit</cstring>
</property>
@@ -220,7 +220,7 @@
<enum>NoWrap</enum>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
</property>
@@ -228,7 +228,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox" row="1" column="2">
+ <widget class="TQComboBox" row="1" column="2">
<item>
<property name="text">
<string>Universal</string>
@@ -253,7 +253,7 @@
<cstring>mType</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -267,7 +267,7 @@
<cstring>mKeyButton</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -351,10 +351,10 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
-<slots>
+<Q_SLOTS>
<slot>mAdd_clicked()</slot>
<slot>mRemove_clicked()</slot>
-</slots>
+</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp
index 947d1deb..85c82b92 100644
--- a/kmail/dictionarycombobox.cpp
+++ b/kmail/dictionarycombobox.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -42,8 +42,8 @@
namespace KMail {
- DictionaryComboBox::DictionaryComboBox( TQWidget * parent, const char * name )
- : TQComboBox( false, parent, name ),
+ DictionaryComboBox::DictionaryComboBox( TQWidget * tqparent, const char * name )
+ : TQComboBox( false, tqparent, name ),
mSpellConfig( 0 ),
mDefaultDictionary( 0 )
{
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index 1222e125..48160502 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -47,8 +47,9 @@ namespace KMail {
class DictionaryComboBox : public TQComboBox {
Q_OBJECT
+ TQ_OBJECT
public:
- DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
+ DictionaryComboBox( TQWidget * tqparent=0, const char * name=0 );
~DictionaryComboBox();
TQString currentDictionaryName() const;
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 5f590b3b..62b4fcee 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -43,11 +43,11 @@
#include <tqlabel.h>
#include <tqlineedit.h>
-class DistributionListItem : public QCheckListItem
+class DistributionListItem : public TQCheckListItem
{
public:
DistributionListItem( TQListView *list )
- : TQCheckListItem( list, TQString::null, CheckBox )
+ : TQCheckListItem( list, TQString(), CheckBox )
{
}
@@ -93,9 +93,9 @@ class DistributionListItem : public QCheckListItem
};
-DistributionListDialog::DistributionListDialog( TQWidget *parent )
+DistributionListDialog::DistributionListDialog( TQWidget *tqparent )
: KDialogBase( Plain, i18n("Save Distribution List"), User1 | Cancel,
- User1, parent, 0, false, false, i18n("Save List") )
+ User1, tqparent, 0, false, false, i18n("Save List") )
{
TQFrame *topFrame = plainPage();
@@ -112,7 +112,7 @@ DistributionListDialog::DistributionListDialog( TQWidget *parent )
mTitleEdit->setFocus();
mRecipientsList = new KListView( topFrame );
- mRecipientsList->addColumn( TQString::null );
+ mRecipientsList->addColumn( TQString() );
mRecipientsList->addColumn( i18n("Name") );
mRecipientsList->addColumn( i18n("Email") );
topLayout->addWidget( mRecipientsList );
@@ -131,7 +131,7 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients )
if ( !email.isEmpty() ) {
DistributionListItem *item = new DistributionListItem( mRecipientsList );
KABC::Addressee::List addressees =
- KABC::StdAddressBook::self( true )->tqfindByEmail( email );
+ KABC::StdAddressBook::self( true )->findByEmail( email );
if ( addressees.isEmpty() ) {
KABC::Addressee a;
a.setNameFromString( name );
@@ -182,7 +182,7 @@ void DistributionListDialog::slotUser1()
if ( name.isEmpty() ) {
bool ok = false;
name = KInputDialog::getText( i18n("New Distribution List"),
- i18n("Please enter name:"), TQString::null, &ok, this );
+ i18n("Please enter name:"), TQString(), &ok, this );
if ( !ok || name.isEmpty() )
return;
}
diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h
index 6643557c..8d57b6dc 100644
--- a/kmail/distributionlistdialog.h
+++ b/kmail/distributionlistdialog.h
@@ -31,7 +31,7 @@ class KListView;
class DistributionListDialog : public KDialogBase
{
public:
- DistributionListDialog( TQWidget *parent );
+ DistributionListDialog( TQWidget *tqparent );
void setRecipients( const Recipient::List & );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index bca75762..e16c19cb 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,8 +49,8 @@
using namespace KMail;
EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
- TQObject * parent, TQWidget *tqparentWidget) :
- TQObject( parent ),
+ TQObject * tqparent, TQWidget *tqparentWidget) :
+ TQObject( tqparent ),
mUrl( url ),
mMimeType( mimeType ),
mOpenWith( openWith ),
@@ -73,7 +73,7 @@ bool EditorWatcher::start()
list.append( mUrl );
KService::Ptr offer = KServiceTypeProfile::preferredService( mMimeType, "Application" );
if ( mOpenWith || !offer ) {
- KOpenWithDlg dlg( list, i18n("Edit with:"), TQString::null, 0 );
+ KOpenWithDlg dlg( list, i18n("Edit with:"), TQString(), 0 );
if ( !dlg.exec() )
return false;
offer = dlg.service();
@@ -118,7 +118,7 @@ void EditorWatcher::inotifyEvent()
char buffer[4096];
ioctl( mInotifyFd, FIONREAD, &pending );
while ( pending > 0 ) {
- int size = read( mInotifyFd, buffer, QMIN( pending, (int)sizeof(buffer) ) );
+ int size = read( mInotifyFd, buffer, TQMIN( pending, (int)sizeof(buffer) ) );
pending -= size;
if ( size < 0 )
break; // error
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index 35504d85..68fdb54e 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -35,19 +35,20 @@ namespace KMail {
as the edited file are watched to work with as many as possible
editors.
*/
-class EditorWatcher : public QObject
+class EditorWatcher : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructs an EditorWatcher.
- * @param parent the parent object of this EditorWatcher, which will take care of deleting
- * this EditorWatcher if the parent is deleted.
- * @param tqparentWidget the parent widget of this EditorWatcher, which will be used as the parent
+ * @param tqparent the tqparent object of this EditorWatcher, which will take care of deleting
+ * this EditorWatcher if the tqparent is deleted.
+ * @param tqparentWidget the tqparent widget of this EditorWatcher, which will be used as the tqparent
* widget for message dialogs.
*/
EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
- TQObject *parent, TQWidget *tqparentWidget );
+ TQObject *tqparent, TQWidget *tqparentWidget );
bool start();
bool fileChanged() const { return mFileModified; }
signals:
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index df595b36..cc19e3b1 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -1,5 +1,5 @@
/*
- This file was taken from the KDE 4.x libraries and backported to Qt 3.
+ This file was taken from the KDE 4.x libraries and backported to TQt 3.
Copyright (C) 1999 Lars Knoll (knoll@kde.org)
Copyright (C) 2003 Dirk Mueller (mueller@kde.org)
@@ -51,7 +51,7 @@
// Multiple scripts per language were removed and the entries were reordered so
// that simple substring matching will work. For example, bam was put before ba
// so that the first match will be likely the right match. Otherwise "ba" would
-// match "bam" but we would have to search on to find "bam" which is what we want.
+// match "bam" but we would have to search on to tqfind "bam" which is what we want.
// The original file is called pango-script-lang-table.h
/* pango-script-lang-table.h:
@@ -856,7 +856,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t
}
else
{
- //QString->QTextCodec
+ //TQString->TQTextCodec
enc = enc.lower();
// hebrew visually ordered
@@ -880,7 +880,7 @@ bool EncodingDetector::setEncoding(const char *_encoding, EncodingChoiceSource t
if (codec->mibEnum() == Mib8859_8)
{
- //We do NOT want to use Qt's TQHebrewCodec, since it tries to reorder itself.
+ //We do NOT want to use TQt's TQHebrewCodec, since it tries to reorder itself.
codec = TQTextCodec::codecForName("iso8859-8-i");
// visually ordered unless one of the following
@@ -1059,13 +1059,13 @@ bool EncodingDetector::analyze(const char *data, int len)
TQCString str( ptr, (end-ptr)+1);
str = str.lower();
int pos=0;
- //if( (pos = str.find("http-equiv", pos)) == -1) break;
- //if( (pos = str.find("content-type", pos)) == -1) break;
- if( (pos = str.find("charset")) == -1)
+ //if( (pos = str.tqfind("http-equiv", pos)) == -1) break;
+ //if( (pos = str.tqfind("content-type", pos)) == -1) break;
+ if( (pos = str.tqfind("charset")) == -1)
continue;
pos+=6;
// skip to '='
- if( (pos = str.find('=', pos)) == -1)
+ if( (pos = str.tqfind('=', pos)) == -1)
continue;
// skip whitespace before encoding itself
diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h
index b2dd9766..0f223178 100644
--- a/kmail/encodingdetector.h
+++ b/kmail/encodingdetector.h
@@ -1,5 +1,5 @@
/*
- This file was taken from the KDE 4.x libraries and backported to Qt 3.
+ This file was taken from the KDE 4.x libraries and backported to TQt 3.
Copyright (C) 1999 Lars Knoll (knoll@mpi-hd.mpg.de)
Copyright (C) 2007 Nick Shaforostoff (shafff@ukr.net)
diff --git a/kmail/encodingdetector_ja.cpp b/kmail/encodingdetector_ja.cpp
index d5eeb1e0..659661a0 100644
--- a/kmail/encodingdetector_ja.cpp
+++ b/kmail/encodingdetector_ja.cpp
@@ -23,7 +23,7 @@
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
diff --git a/kmail/encodingdetector_ja_p.h b/kmail/encodingdetector_ja_p.h
index 27cd067b..d5809c04 100644
--- a/kmail/encodingdetector_ja_p.h
+++ b/kmail/encodingdetector_ja_p.h
@@ -23,7 +23,7 @@
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
@@ -39,7 +39,7 @@
#define GUESS_JA_H
#include <tqglobal.h>
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#undef UNICODE
#endif
namespace khtml {
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 010a9d00..6d634d8f 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -31,7 +31,7 @@
#include "globalsettings.h"
#include "folderstorage.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "kmcommands.h"
#include <kdebug.h>
@@ -117,7 +117,7 @@ void ExpireJob::slotDoWork()
{
// No need to worry about mSrcFolder==0 here. The FolderStorage deletes the jobs on destruction.
FolderStorage* storage = mSrcFolder->storage();
- int stopIndex = mImmediate ? 0 : QMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES );
+ int stopIndex = mImmediate ? 0 : TQMAX( 0, mCurrentIndex - EXPIREJOB_NRMESSAGES );
#ifdef DEBUG_SCHEDULER
kdDebug(5006) << "ExpireJob: checking messages " << mCurrentIndex << " to " << stopIndex << endl;
#endif
@@ -190,7 +190,7 @@ void ExpireJob::done()
}
}
if ( !str.isEmpty() )
- BroadcasStatus::instance()->seStatusMsg( str );
+ BroadcastqStatus::instance()->seStatusMsg( str );
KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
}
default: ;
}
- BroadcasStatus::instance()->seStatusMsg( msg );
+ BroadcastqStatus::instance()->seStatusMsg( msg );
deleteLater();
}
diff --git a/kmail/expirejob.h b/kmail/expirejob.h
index 16e4c7bd..49a11a03 100644
--- a/kmail/expirejob.h
+++ b/kmail/expirejob.h
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -36,6 +36,7 @@ namespace KMail {
class ExpireJob : public ScheduledJob
{
Q_OBJECT
+ TQ_OBJECT
public:
ExpireJob( KMFolder* folder, bool immediate );
virtual ~ExpireJob();
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index 4913d1c6..c43cefc1 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -23,7 +23,7 @@
using namespace KMail;
/*
- * Constructs a ExpiryPropertiesDialog as a child of 'parent', with the
+ * Constructs a ExpiryPropertiesDialog as a child of 'tqparent', with the
* name 'name'.
*
*/
@@ -153,7 +153,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
*/
ExpiryPropertiesDialog::~ExpiryPropertiesDialog()
{
- // no need to delete child widgets, Qt does it all for us
+ // no need to delete child widgets, TQt does it all for us
}
void ExpiryPropertiesDialog::slotOk()
diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h
index d3ef7cfd..2fd55023 100644
--- a/kmail/expirypropertiesdialog.h
+++ b/kmail/expirypropertiesdialog.h
@@ -33,6 +33,7 @@ namespace KMail {
class ExpiryPropertiesDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* folder );
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index d7098687..7176cdeb 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -49,8 +49,8 @@
using namespace KMail;
-FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, const TQString & name, KMFolder * folder)
- : KMFolderTreeItem( parent, name, folder ),
+FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * tqparent, const TQString & name, KMFolder * folder)
+ : KMFolderTreeItem( tqparent, name, folder ),
mOldName( folder->label() )
{
// same stuff as in KMFolderTreeItem again, this time even with virtual methods working
@@ -81,8 +81,8 @@ void FavoriteFolderViewItem::nameChanged()
TQValueList<FavoriteFolderView*> FavoriteFolderView::mInstances;
-FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * parent) :
- FolderTreeBase( mainWidget, parent ),
+FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * tqparent) :
+ FolderTreeBase( mainWidget, tqparent ),
mContextMenuItem( 0 ),
mReadingConfig( false )
{
@@ -399,8 +399,8 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti)
assert( fti->folder() );
TQString name = fti->folder()->label();
TQListViewItem *accountFti = fti;
- while ( accountFti->parent() )
- accountFti = accountFti->parent();
+ while ( accountFti->tqparent() )
+ accountFti = accountFti->tqparent();
if ( fti->type() == KFolderTreeItem::Inbox ) {
if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) {
name = i18n( "Local Inbox" );
diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h
index f19dd5d7..e0e34d26 100644
--- a/kmail/favoritefolderview.h
+++ b/kmail/favoritefolderview.h
@@ -28,8 +28,9 @@ class FavoriteFolderView;
class FavoriteFolderViewItem : public KMFolderTreeItem
{
Q_OBJECT
+ TQ_OBJECT
public:
- FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
+ FavoriteFolderViewItem( FavoriteFolderView *tqparent, const TQString & name, KMFolder* folder );
protected:
bool useTopLevelIcon() const { return false; }
@@ -45,15 +46,16 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
class FavoriteFolderView : public FolderTreeBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 );
+ FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *tqparent = 0 );
~FavoriteFolderView();
void readConfig();
void writeConfig();
- KMFolderTreeItem* addFolder( KMFolder *folder, const TQString &name = TQString::null,
+ KMFolderTreeItem* addFolder( KMFolder *folder, const TQString &name = TQString(),
TQListViewItem *after = 0 );
void addFolder( KMFolderTreeItem *fti );
diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp
index 7e937c46..479e6d3e 100644
--- a/kmail/filehtmlwriter.cpp
+++ b/kmail/filehtmlwriter.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h
index b9090c63..87914322 100644
--- a/kmail/filehtmlwriter.h
+++ b/kmail/filehtmlwriter.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index c5780431..3299d1df 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -46,8 +46,8 @@
using namespace KMail;
-FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent )
- :KDialogBase( parent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
+FilterSelectionDialog::FilterSelectionDialog( TQWidget * tqparent )
+ :KDialogBase( tqparent, "filterselection", true, i18n("Select Filters"), Ok|Cancel, Ok, true ),
wasCancelled( false )
{
TQWidget *w = new TQWidget( this );
@@ -199,8 +199,8 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList<KMFilter*>&
}
-FilterImporterExporter::FilterImporterExporter( TQWidget* parent, bool popFilter )
-:mParent( parent), mPopFilter( popFilter )
+FilterImporterExporter::FilterImporterExporter( TQWidget* tqparent, bool popFilter )
+:mParent( tqparent), mPopFilter( popFilter )
{
}
@@ -210,7 +210,7 @@ FilterImporterExporter::~FilterImporterExporter()
TQValueList<KMFilter*> FilterImporterExporter::importFilters()
{
- TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), TQString::null, mParent, i18n("Import Filters") );
+ TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), TQString(), mParent, i18n("Import Filters") );
if ( fileName.isEmpty() )
return TQValueList<KMFilter*>(); // cancel
@@ -232,7 +232,7 @@ TQValueList<KMFilter*> FilterImporterExporter::importFilters()
void FilterImporterExporter::exportFilters(const TQValueList<KMFilter*> & filters )
{
- KURL saveUrl = KFileDialog::getSaveURL( TQDir::homeDirPath(), TQString::null, mParent, i18n("Export Filters") );
+ KURL saveUrl = KFileDialog::getSaveURL( TQDir::homeDirPath(), TQString(), mParent, i18n("Export Filters") );
if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) )
return;
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 8b9a63bb..8c92e769 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -47,7 +47,7 @@ namespace KMail
class FilterImporterExporter
{
public:
- FilterImporterExporter( TQWidget* parent, bool popFilter = false );
+ FilterImporterExporter( TQWidget* tqparent, bool popFilter = false );
virtual ~FilterImporterExporter();
/** Export the given filter rules to a file which
@@ -68,8 +68,9 @@ private:
class FilterSelectionDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FilterSelectionDialog( TQWidget * parent = 0 );
+ FilterSelectionDialog( TQWidget * tqparent = 0 );
virtual ~FilterSelectionDialog();
virtual void slotCancel();
diff --git a/kmail/filterlog.cpp b/kmail/filterlog.cpp
index 7415c10d..b5e1d391 100644
--- a/kmail/filterlog.cpp
+++ b/kmail/filterlog.cpp
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index f336621a..83a2b383 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -50,9 +50,10 @@ namespace KMail {
A signal is emitted whenever a new logentry is added,
when the log was cleared or any log state was changed.
*/
- class FilterLog : public QObject
+ class FilterLog : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/** access to the singleton instance */
@@ -135,7 +136,7 @@ namespace KMail {
/** Non-public constructor needed by the singleton implementation */
FilterLog();
- /** The list tqcontains the single log pieces */
+ /** The list contains the single log pieces */
TQStringList mLogEntries;
/** the log status */
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 90eb5926..441390fb 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -52,8 +52,8 @@
using namespace KMail;
-FilterLogDialog::FilterLogDialog( TQWidget * parent )
-: KDialogBase( parent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
+FilterLogDialog::FilterLogDialog( TQWidget * tqparent )
+: KDialogBase( tqparent, "FilterLogDlg", false, i18n( "Filter Log Viewer" ),
User1|User2|Close, Close, true, KStdGuiItem::clear(), KStdGuiItem::saveAs() )
{
setWFlags( WDestructiveClose );
@@ -244,7 +244,7 @@ void FilterLogDialog::slotUser1()
void FilterLogDialog::slotUser2()
{
TQString fileName;
- KFileDialog fdlg( TQString::null, TQString::null, this, 0, true );
+ KFileDialog fdlg( TQString(), TQString(), this, 0, true );
fdlg.setMode( KFile::File );
fdlg.setSelection( "kmail-filter.log" );
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index af1be64e..927edb6e 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -17,11 +17,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -48,10 +48,11 @@ namespace KMail {
class FilterLogDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/** constructor */
- FilterLogDialog( TQWidget * parent );
+ FilterLogDialog( TQWidget * tqparent );
protected slots:
void slotLogEntryAdded( TQString logEntry );
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index 54df5167..4d1cb808 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -57,19 +57,19 @@ FolderIface::FolderIface( const TQString& vpath )
Q_ASSERT( mFolder );
}
-QString
+TQString
FolderIface::path() const
{
return mPath;
}
-QString
+TQString
FolderIface::displayName() const
{
return mFolder->label();
}
-QString
+TQString
FolderIface::displayPath() const
{
return mFolder->prettyURL();
@@ -81,13 +81,13 @@ FolderIface::usesCustomIcons() const
return mFolder->useCustomIcons();
}
-QString
+TQString
FolderIface::normalIconPath() const
{
return mFolder->normalIconPath();
}
-QString
+TQString
FolderIface::unreadIconPath() const
{
return mFolder->unreadIconPath();
@@ -136,7 +136,7 @@ FolderIface::messageRefs()
for( int i = 0; i < messageCache.size(); ++i ) {
KMMsgBase *msg = messageCache[i];
if ( msg ) {
- KMMessage *fmsg = msg->parent()->getMsg( msg->parent()->find( msg ) );
+ KMMessage *fmsg = msg->tqparent()->getMsg( msg->tqparent()->tqfind( msg ) );
refList.append( DCOPRef( new MessageIface( fmsg ) ) );
}
}
diff --git a/kmail/folderIface.h b/kmail/folderIface.h
index d43adedb..645ab541 100644
--- a/kmail/folderIface.h
+++ b/kmail/folderIface.h
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -43,6 +43,7 @@ namespace KMail {
public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 58130a05..90903fdb 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -20,11 +20,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -83,8 +83,8 @@ static const struct {
};
-KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name )
- : KDialogBase( parent, name, true /*modal*/, caption,
+KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name )
+ : KDialogBase( tqparent, name, true /*modal*/, caption,
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true /*sep*/ )
, mUserIdFormat( userIdFormat )
{
@@ -115,7 +115,7 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt
}
topLayout->setRowStretch(2, 10);
- TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page );
+ TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the tqparent folder." ), page );
topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 );
connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) );
@@ -139,7 +139,7 @@ static TQString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat
if ( userIdFormat == FullEmail )
return email;
else { // mUserIdFormat == UserName
- email.truncate( email.find( '@' ) );
+ email.truncate( email.tqfind( '@' ) );
return email;
}
}
@@ -192,7 +192,7 @@ unsigned int KMail::ACLEntryDialog::permissions() const
// class KMail::FolderDiaACLTab::ListView : public KListView
// {
// public:
-// ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {}
+// ListView( TQWidget* tqparent, const char* name = 0 ) : KListView( tqparent, name ) {}
// };
class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem
@@ -250,7 +250,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin
void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
{
mPermissions = permissions;
- setText( 1, permissionsToUserString( permissions, TQString::null ) );
+ setText( 1, permissionsToUserString( permissions, TQString() ) );
}
void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
@@ -260,7 +260,7 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
// It's ok in distribution list names though, that's why this check is only done here
// and also why there's no validator on the lineedit.
if ( entry.userId.tqcontains( ' ' ) )
- kdWarning(5006) << "Userid tqcontains a space!!! '" << entry.userId << "'" << endl;
+ kdWarning(5006) << "Userid contains a space!!! '" << entry.userId << "'" << endl;
setUserId( entry.userId );
mPermissions = entry.permissions;
@@ -297,14 +297,14 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
TQString email = (*it).email;
if ( email.isEmpty() )
email = addresseeToUserId( (*it).addressee, userIdFormat );
- ACLListEntry entry( email, TQString::null, mPermissions );
+ ACLListEntry entry( email, TQString(), mPermissions );
entry.changed = true;
aclList.append( entry );
}
} else { // it wasn't a distribution list
ACLListEntry entry( userId(), mInternalRightsList, mPermissions );
if ( mModified ) {
- entry.internalRightsList = TQString::null;
+ entry.internalRightsList = TQString();
entry.changed = true;
}
aclList.append( entry );
@@ -313,8 +313,8 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
////
-KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
- : FolderDiaTab( parent, name ),
+KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
+ : FolderDiaTab( tqparent, name ),
mImapAccount( 0 ),
mUserRights( 0 ),
mUserRightsState( KMail::ACLJobs::NotFetchedYet ),
@@ -363,7 +363,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) );
}
-// Warning before save() this will return the url of the _parent_ folder, when creating a new one
+// Warning before save() this will return the url of the _tqparent_ folder, when creating a new one
KURL KMail::FolderDiaACLTab::imapURL() const
{
KURL url = mImapAccount->getUrl();
@@ -398,9 +398,9 @@ void KMail::FolderDiaACLTab::load()
if ( mDlg->folder() ) {
// existing folder
initializeWithValuesFromFolder( mDlg->folder() );
- } else if ( mDlg->parentFolder() ) {
+ } else if ( mDlg->tqparentFolder() ) {
// new folder
- initializeWithValuesFromFolder( mDlg->parentFolder() );
+ initializeWithValuesFromFolder( mDlg->tqparentFolder() );
mChanged = true; // ensure that saving happens
}
@@ -412,7 +412,7 @@ void KMail::FolderDiaACLTab::load()
// but the default value is determined from the current user's own id.
TQString defaultFormat = "fullemail";
// warning mImapAccount can be 0 if creating a subsubsubfolder with dimap... (bug?)
- if ( mImapAccount && mImapAccount->login().find('@') == -1 )
+ if ( mImapAccount && mImapAccount->login().tqfind('@') == -1 )
defaultFormat = "username"; // no @ found, so we assume it's just the username
KConfigGroup configGroup( kmkernel->config(), "IMAP" );
TQString str = configGroup.readEntry( "UserIdFormat", defaultFormat );
@@ -421,7 +421,7 @@ void KMail::FolderDiaACLTab::load()
mUserIdFormat = UserName;
if ( mFolderType == KMFolderTypeCachedImap ) {
- KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+ KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() );
if ( mUserRightsState == KMail::ACLJobs::FetchFailed ||
folderImap->aclListState() == KMail::ACLJobs::FetchFailed ) {
@@ -450,18 +450,18 @@ void KMail::FolderDiaACLTab::load()
mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) );
return;
}
- KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+ KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
if ( folder && folder->storage() == mImapAccount->rootFolder() )
return; // nothing to be done for the (virtual) account folder
mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
- slotConnectionResult( -1, TQString::null );
+ slotConnectionResult( -1, TQString() );
} else if ( state == ImapAccountBase::Connecting ) {
connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
} else { // Connected
- slotConnectionResult( 0, TQString::null );
+ slotConnectionResult( 0, TQString() );
}
}
@@ -481,7 +481,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
if ( mUserRightsState != KMail::ACLJobs::Ok ) {
connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
- KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+ KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
mImapAccount->getUserRights( folder, mImapPath );
}
else
@@ -495,7 +495,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
return;
}
- if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
+ if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) {
KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
mUserRights = folderImap->userRights();
mUserRightsState = folderImap->userRightsState();
@@ -505,15 +505,15 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
void KMail::FolderDiaACLTab::startListing()
{
- // List ACLs of folder - or its parent, if creating a new folder
- mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
+ // List ACLs of folder - or its tqparent, if creating a new folder
+ mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(), mImapPath );
connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
}
void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
{
- if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
+ if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) ) {
disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
@@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
emit changed(true);
}
-KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept()
{
if ( !mChanged || !mImapAccount )
return Accepted; // (no change made), ok for accepting the dialog immediately
@@ -706,7 +706,7 @@ bool KMail::FolderDiaACLTab::save()
for ( TQStringList::ConstIterator rit = mRemovedACLs.begin(); rit != mRemovedACLs.end(); ++rit ) {
// We use permissions == -1 to signify deleting. At least on cyrus, setacl(0) or deleteacl are the same,
// but I'm not sure if that's true for all servers.
- ACLListEntry entry( *rit, TQString::null, -1 );
+ ACLListEntry entry( *rit, TQString(), -1 );
entry.changed = true;
aclList.append( entry );
}
@@ -723,15 +723,15 @@ bool KMail::FolderDiaACLTab::save()
mACLList = aclList;
- KMFolderImap* parentImap = mDlg->parentFolder() ? static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) : 0;
+ KMFolderImap* tqparentImap = mDlg->tqparentFolder() ? static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) : 0;
if ( mDlg->isNewFolder() ) {
// The folder isn't created yet, wait for it
// It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete
- connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
+ connect( tqparentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
} else {
- slotDirectoryListingFinished( parentImap );
+ slotDirectoryListingFinished( tqparentImap );
}
return true;
}
@@ -739,7 +739,7 @@ bool KMail::FolderDiaACLTab::save()
void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
{
if ( !f ||
- f != static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) ||
+ f != static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) ||
!mDlg->folder() ||
!mDlg->folder()->storage() ) {
emit readyForAccept();
@@ -754,7 +754,7 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
KIO::Job* job = ACLJobs::multiSetACL( mImapAccount->slave(), imapURL(), mACLList );
ImapAccountBase::jobData jd;
- jd.total = 1; jd.done = 0; jd.parent = 0;
+ jd.total = 1; jd.done = 0; jd.tqparent = 0;
mImapAccount->insertJob(job, jd);
connect(job, TQT_SIGNAL(result(KIO::Job *)),
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index d9116a6b..85565517 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -20,11 +20,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -59,9 +59,10 @@ class ImapAccountBase;
*/
class ACLEntryDialog :public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 );
+ ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* tqparent, const char* name = 0 );
void setValues( const TQString& userId, unsigned int permissions );
@@ -86,13 +87,14 @@ private:
class FolderDiaACLTab : public FolderDiaTab
{
Q_OBJECT
+ TQ_OBJECT
public:
- FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
+ FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
virtual void load();
virtual bool save();
- virtual AccepStatus accept();
+ virtual AcceptqStatus accept();
static bool supports( KMFolder* refFolder );
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 99954cc2..4215ba72 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -20,11 +20,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -50,8 +50,8 @@
using namespace KMail;
-KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
- : FolderDiaTab( parent, name ),
+KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
+ : FolderDiaTab( tqparent, name ),
mImapAccount( 0 ),
mDlg( dlg )
{
@@ -92,9 +92,9 @@ void KMail::FolderDiaQuotaTab::load()
if ( mDlg->folder() ) {
// existing folder
initializeWithValuesFromFolder( mDlg->folder() );
- } else if ( mDlg->parentFolder() ) {
+ } else if ( mDlg->tqparentFolder() ) {
// new folder
- initializeWithValuesFromFolder( mDlg->parentFolder() );
+ initializeWithValuesFromFolder( mDlg->tqparentFolder() );
}
if ( mFolderType == KMFolderTypeCachedImap ) {
@@ -114,18 +114,18 @@ void KMail::FolderDiaQuotaTab::load()
mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) );
return;
}
- KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+ KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
if ( folder && folder->storage() == mImapAccount->rootFolder() )
return; // nothing to be done for the (virtual) account folder
mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
- slotConnectionResult( -1, TQString::null );
+ slotConnectionResult( -1, TQString() );
} else if ( state == ImapAccountBase::Connecting ) {
connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
} else { // Connected
- slotConnectionResult( 0, TQString::null );
+ slotConnectionResult( 0, TQString() );
}
}
@@ -144,7 +144,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
}
connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ),
this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) );
- KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+ KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
mImapAccount->getStorageQuotaInfo( folder, mImapPath );
}
@@ -152,7 +152,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
KIO::Job* job,
const KMail::QuotaInfo& info )
{
- if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
+ if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) {
//KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )),
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
}
-KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept()
+KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept()
{
if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap )
return Accepted;
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index 2fc956e9..570c7e82 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -20,17 +20,17 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
*/
-#ifndef FOLDERDIAQUOTA_H
-#define FOLDERDIAQUOTA_H
+#ifndef FOLDERDIATQUOTA_H
+#define FOLDERDIATQUOTA_H
#include "kmfolderdia.h"
#include "kmfoldertype.h"
@@ -53,13 +53,14 @@ class ImapAccountBase;
class FolderDiaQuotaTab : public FolderDiaTab
{
Q_OBJECT
+ TQ_OBJECT
public:
- FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
+ FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name = 0 );
virtual void load();
virtual bool save();
- virtual AccepStatus accept();
+ virtual AcceptqStatus accept();
static bool supports( KMFolder* refFolder );
@@ -87,5 +88,5 @@ private:
} // end of namespace KMail
-#endif /* FOLDERDIAQUOTA_H */
+#endif /* FOLDERDIATQUOTA_H */
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index 86d399d8..d8f8f44c 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -51,8 +51,8 @@ using namespace KMail;
struct QuotaInfo;
-QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
- :TQWidget( parent, name )
+QuotaWidget::QuotaWidget( TQWidget* tqparent, const char* name )
+ :TQWidget( tqparent, name )
{
TQVBoxLayout *box = new TQVBoxLayout(this);
TQWidget *stuff = new TQWidget( this );
@@ -66,7 +66,7 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
tqlayout->addWidget( mRootLabel, 0, 1 );
tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
- //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
+ //tqlayout->addWidget( new TQLabel( i18n("tqStatus:"), stuff ), 2, 0 );
tqlayout->addWidget( mInfoLabel, 1, 1 );
tqlayout->addWidget( mProgressBar, 2, 1 );
box->addWidget( stuff );
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 68b5c19f..776ae1d7 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -19,19 +19,19 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
*/
-#ifndef FOLDERDIAQUOTA_P_H
-#define FOLDERDIAQUOTA_P_H
+#ifndef FOLDERDIATQUOTA_P_H
+#define FOLDERDIATQUOTA_P_H
#include <tqlabel.h>
@@ -45,8 +45,9 @@ namespace KMail {
class QuotaWidget : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
- QuotaWidget( TQWidget* parent, const char* name = 0 );
+ QuotaWidget( TQWidget* tqparent, const char* name = 0 );
virtual ~QuotaWidget() { }
void setQuotaInfo( const KMail::QuotaInfo& info );
@@ -60,4 +61,4 @@ private:
}//end of namespace KMail
-#endif /* FOLDERDIAQUOTA_H */
+#endif /* FOLDERDIATQUOTA_H */
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 69a1557a..655e18d7 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index 2988c925..3d662e76 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -41,9 +41,10 @@ class KMFolder;
namespace KMail {
-class FolderJob : public QObject
+class FolderJob : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
enum JobType { tListMessages, tGetFolder, tCreateFolder, tExpungeFolder,
@@ -52,21 +53,21 @@ public:
tCopyMessage, tMoveMessage, tOther /* used by subclasses */ };
/**
* Constructs a new job, operating on the message msg, of type
- * @p jt and with a parent folder @p folder.
+ * @p jt and with a tqparent folder @p folder.
*/
FolderJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0,
- TQString partSpecifier = TQString::null );
+ TQString partSpecifier = TQString() );
/**
* Constructs a new job, operating on a message list @p msgList,
- * set @sets, JobType @p jt and with the parent folder @p folder.
+ * set @sets, JobType @p jt and with the tqparent folder @p folder.
*
*/
FolderJob( const TQPtrList<KMMessage>& msgList, const TQString& sets,
JobType jt = tGetMessage, KMFolder *folder = 0 );
/**
* This one should ONLY be used in derived folders, when a job
- * does something internal and needs to construct an empty parent
+ * does something internal and needs to construct an empty tqparent
* FolderJob
*/
FolderJob( JobType jt );
@@ -153,7 +154,7 @@ signals:
void result( KMail::FolderJob* job );
/**
- * This progress signal tqcontains the "done" and the "total" numbers so
+ * This progress signal contains the "done" and the "total" numbers so
* that the caller can either make a % out of it, or combine it into
* a higher-level progress info.
*/
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index 45fa7015..984885c1 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KMFolderDialogUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KMFolderDialogUI</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox2</cstring>
</property>
@@ -33,7 +33,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="6">
+ <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="6">
<property name="name">
<cstring>mNameEdit</cstring>
</property>
@@ -44,7 +44,7 @@
<enum>Sunken</enum>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -55,7 +55,7 @@
<cstring>mNameEdit</cstring>
</property>
</widget>
- <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="8">
+ <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="8">
<property name="name">
<cstring>mHoldsMailingList</cstring>
</property>
@@ -80,7 +80,7 @@
</size>
</property>
</spacer>
- <widget class="QLabel" row="4" column="1" rowspan="1" colspan="3">
+ <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>TextLabel2_2</cstring>
</property>
@@ -111,7 +111,7 @@
</size>
</property>
</spacer>
- <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>TextLabel3</cstring>
</property>
@@ -204,7 +204,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="2" column="5">
+ <widget class="TQLabel" row="2" column="5">
<property name="name">
<cstring>TextLabel4</cstring>
</property>
@@ -235,7 +235,7 @@
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="8">
+ <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="8">
<property name="name">
<cstring>mIconsCheckBox</cstring>
</property>
@@ -243,7 +243,7 @@
<string>Use custom &amp;icons</string>
</property>
</widget>
- <widget class="QLineEdit" row="4" column="4" rowspan="1" colspan="4">
+ <widget class="TQLineEdit" row="4" column="4" rowspan="1" colspan="4">
<property name="name">
<cstring>mMailingListPostAddress</cstring>
</property>
@@ -261,7 +261,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox3</cstring>
</property>
@@ -272,7 +272,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>TextLabel2_3</cstring>
</property>
@@ -303,7 +303,7 @@
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>mExpireRead</cstring>
</property>
@@ -328,7 +328,7 @@
</size>
</property>
</spacer>
- <widget class="QLabel" row="3" column="1">
+ <widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>TextLabel2_3_2</cstring>
</property>
@@ -342,7 +342,7 @@
<cstring>mExpireUnreadNum</cstring>
</property>
</widget>
- <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="4">
+ <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>mExpireUnread</cstring>
</property>
@@ -443,7 +443,7 @@
</spacer>
</grid>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox1</cstring>
</property>
@@ -454,7 +454,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -465,7 +465,7 @@
<cstring>mIdentity</cstring>
</property>
</widget>
- <widget class="QComboBox" row="1" column="1">
+ <widget class="TQComboBox" row="1" column="1">
<property name="name">
<cstring>mIdentity</cstring>
</property>
@@ -475,7 +475,7 @@
<cstring>mMailboxType</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
@@ -486,7 +486,7 @@
<cstring>mMailboxType</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel1_3</cstring>
</property>
@@ -514,7 +514,7 @@
</size>
</property>
</spacer>
- <widget class="QComboBox" row="2" column="1">
+ <widget class="TQComboBox" row="2" column="1">
<item>
<property name="text">
<string>Sender</string>
@@ -630,9 +630,9 @@
<variable>QValueList&lt;QGuardedPtr&lt;KMFolder&gt; &gt; mFolders;</variable>
<variable>KMFolderDir *mFolderDIr;</variable>
</variables>
-<slots>
+<Q_SLOTS>
<slot access="protected">slotChangeIcon( QString )</slot>
-</slots>
+</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kmail/folderpropertiesdialog.ui.h b/kmail/folderpropertiesdialog.ui.h
index c7251124..99a956ab 100644
--- a/kmail/folderpropertiesdialog.ui.h
+++ b/kmail/folderpropertiesdialog.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions respectively slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 2be44c5a..06374664 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -41,8 +41,8 @@
namespace KMail {
-FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
- : TQWidget( parent ), mFolder( 0 ), mFolderTree( tree ),
+FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree )
+ : TQWidget( tqparent ), mFolder( 0 ), mFolderTree( tree ),
mMustBeReadWrite( true ), mShowOutbox( true ), mShowImapFolders( true )
{
TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
@@ -116,7 +116,7 @@ void FolderRequester::setFolder( const TQString &idString )
//-----------------------------------------------------------------------------
void FolderRequester::keyPressEvent( TQKeyEvent * e )
{
- if ( e->key() == Qt::Key_Space )
+ if ( e->key() == TQt::Key_Space )
slotOpenDialog();
else
e->ignore();
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 9d7493c8..a13ab6d2 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -38,22 +38,23 @@ class KMFolderTree;
namespace KMail {
/**
- * A widget that tqcontains a KLineEdit which shows the current folder
+ * A widget that contains a KLineEdit which shows the current folder
* and a button that fires a KMFolderSelDlg
* The dialog is set to disable readonly folders by default
* Search folders are excluded
*/
- class FolderRequester: public QWidget
+ class FolderRequester: public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor
- * @param parent the parent widget
+ * @param tqparent the tqparent widget
* @param tree the KMFolderTree to get the folders
*/
- FolderRequester( TQWidget *parent, KMFolderTree* tree );
+ FolderRequester( TQWidget *tqparent, KMFolderTree* tree );
virtual ~FolderRequester();
/** Returns selected folder */
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index 147d98a0..45748b2f 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -27,8 +27,8 @@
using namespace KMail;
-FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * parent )
- : KDialogBase( parent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
+FolderSetSelector::FolderSetSelector( KMFolderTree *ft, TQWidget * tqparent )
+ : KDialogBase( tqparent, "FolderSetSelector", true, TQString(), Ok|Cancel, Ok, true )
{
assert( ft );
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index 5d51db31..97cc3860 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -29,9 +29,10 @@ namespace KMail {
class FolderSetSelector : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 );
+ FolderSetSelector( KMFolderTree *ft, TQWidget *tqparent = 0 );
TQValueList<int> selectedFolders();
void setSelectedFolders( const TQValueList<int> &folderIds );
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 80e1b28f..b4897afe 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -25,11 +25,11 @@
**
** In addition, as a special exception, the copyright holders give
** permission to link the code of this program with any edition of
-** the Qt library by Trolltech AS, Norway (or with modified versions
-** of Qt that use the same license as Qt), and distribute linked
+** the TQt library by Trolltech AS, Norway (or with modified versions
+** of TQt that use the same license as TQt), and distribute linked
** combinations including the two. You must obey the GNU General
** Public License in all respects for all of the code used other than
-** Qt. If you modify this file, you may extend this exception to
+** TQt. If you modify this file, you may extend this exception to
** your version of the file, but you are not obligated to do so. If
** you do not wish to do so, delete this exception statement from
** your version.
@@ -53,9 +53,9 @@ using namespace KMail;
FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
KMMainWidget *mainwidget,
- TQWidget *parent,
+ TQWidget *tqparent,
const char *name )
-: KDialogBase( parent, name, true,
+: KDialogBase( tqparent, name, true,
i18n( "Shortcut for Folder %1" ).arg( folder->label() ),
KDialogBase::Ok | KDialogBase::Cancel ),
mFolder( folder ), mMainWidget( mainwidget )
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index 1934ad23..da249e1a 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -25,11 +25,11 @@
**
** In addition, as a special exception, the copyright holders give
** permission to link the code of this program with any edition of
-** the Qt library by Trolltech AS, Norway (or with modified versions
-** of Qt that use the same license as Qt), and distribute linked
+** the TQt library by Trolltech AS, Norway (or with modified versions
+** of TQt that use the same license as TQt), and distribute linked
** combinations including the two. You must obey the GNU General
** Public License in all respects for all of the code used other than
-** Qt. If you modify this file, you may extend this exception to
+** TQt. If you modify this file, you may extend this exception to
** your version of the file, but you are not obligated to do so. If
** you do not wish to do so, delete this exception statement from
** your version.
@@ -51,9 +51,10 @@ namespace KMail
class FolderShortcutDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw,
- TQWidget *parent=0, const char *name=0 );
+ TQWidget *tqparent=0, const char *name=0 );
~FolderShortcutDialog();
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 6744e136..e1a7f364 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -113,7 +113,7 @@ void FolderStorage::close( const char* owner, bool aForced )
TQString FolderStorage::dotEscape(const TQString& aStr)
{
if (aStr[0] != '.') return aStr;
- return aStr.left(aStr.find(TQRegExp("[^\\.]"))) + aStr;
+ return aStr.left(aStr.tqfind(TQRegExp("[^\\.]"))) + aStr;
}
void FolderStorage::addJob( FolderJob* job ) const
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
if (!(msgBase = getMsgBase(i))) continue;
if (msgBase->isNew())
{
- msgBase->seStatus(KMMsgStatusUnread);
+ msgBase->setqStatus(KMMsgStatusUnread);
msgBase->setDirty(true);
}
}
@@ -301,9 +301,9 @@ void FolderStorage::emitMsgAddedSignals(int idx)
bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret)
{
if (aIndex_ret) *aIndex_ret = -1;
- KMFolder *msgParent = aMsg->parent();
- // If the message has a parent and is in transfer, bail out. If it does not
- // have a parent we want to be able to add it even if it is in transfer.
+ KMFolder *msgParent = aMsg->tqparent();
+ // If the message has a tqparent and is in transfer, bail out. If it does not
+ // have a tqparent we want to be able to add it even if it is in transfer.
if (aMsg->transferInProgress() && msgParent)
return false;
if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap)
@@ -326,7 +326,7 @@ void FolderStorage::reallyAddMsg(KMMessage* aMsg)
return;
aMsg->setTransferInProgress( false );
aMsg->setComplete( true );
- KMFolder *aFolder = aMsg->parent();
+ KMFolder *aFolder = aMsg->tqparent();
int index;
ulong serNum = aMsg->getMsgSerNum();
bool undo = aMsg->enableUndo();
@@ -350,8 +350,8 @@ void FolderStorage::reallyAddCopyOfMsg(KMMessage* aMsg)
unGetMsg( count() - 1 );
}
-int FolderStorage::find( const KMMessage * msg ) const {
- return find( &msg->toMsgBase() );
+int FolderStorage::tqfind( const KMMessage * msg ) const {
+ return tqfind( &msg->toMsgBase() );
}
//-----------------------------------------------------------------------------
@@ -359,7 +359,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMsgBase>& msgList, bool imapQuie
{
for( TQPtrListIterator<KMMsgBase> it( msgList ); *it; ++it )
{
- int idx = find(it.current());
+ int idx = tqfind(it.current());
assert( idx != -1);
removeMsg(idx, imapQuiet);
}
@@ -370,7 +370,7 @@ void FolderStorage::removeMsg(const TQPtrList<KMMessage>& msgList, bool imapQuie
{
for( TQPtrListIterator<KMMessage> it( msgList ); *it; ++it )
{
- int idx = find(it.current());
+ int idx = tqfind(it.current());
assert( idx != -1);
removeMsg(idx, imapQuiet);
}
@@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList)
{
for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() )
{
- if (msg->parent())
+ if (msg->tqparent())
{
- int idx = msg->parent()->find(msg);
+ int idx = msg->tqparent()->tqfind(msg);
if ( idx >= 0 )
take(idx);
}
@@ -621,7 +621,7 @@ FolderJob* FolderStorage::createJob( TQPtrList<KMMessage>& msgList, const TQStri
int FolderStorage::moveMsg(KMMessage* aMsg, int* aIndex_ret)
{
assert(aMsg != 0);
- KMFolder* msgParent = aMsg->parent();
+ KMFolder* msgParent = aMsg->tqparent();
if (msgParent)
msgParent->open("moveMsgSrc");
@@ -641,7 +641,7 @@ int FolderStorage::moveMsg(TQPtrList<KMMessage> msglist, int* aIndex_ret)
{
KMMessage* aMsg = msglist.first();
assert(aMsg != 0);
- KMFolder* msgParent = aMsg->parent();
+ KMFolder* msgParent = aMsg->tqparent();
if (msgParent)
msgParent->open("foldermovemsg");
@@ -681,7 +681,7 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
close("rename", true);
oldName = folder()->fileName();
- oldParent = folder()->parent();
+ oldParent = folder()->tqparent();
if (newParent)
folder()->setParent( newParent );
@@ -723,14 +723,14 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
}
// if the folder is being moved then move its node and, if necessary, also
- // the associated subfolder directory node to the new parent
+ // the associated subfolder directory node to the new tqparent
if (newParent) {
if (oldParent->findRef( folder() ) != -1)
oldParent->take();
newParent->inSort( folder() );
if ( child ) {
- if ( child->parent()->findRef( child ) != -1 )
- child->parent()->take();
+ if ( child->tqparent()->findRef( child ) != -1 )
+ child->tqparent()->take();
newParent->inSort( child );
child->setParent( newParent );
}
@@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const
}
//-----------------------------------------------------------------------------
-void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
- const KMMsgStatus newStatus, int idx)
+void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
+ const KMMsgtqStatus newtqStatus, int idx)
{
int oldUnread = 0;
int newUnread = 0;
- if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) &&
- !(oldStatus & KMMsgStatusIgnored)) ||
+ if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) &&
+ !(oldtqStatus & KMMsgStatusIgnored)) ||
(folder() == kmkernel->outboxFolder()))
oldUnread = 1;
- if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) &&
- !(newStatus & KMMsgStatusIgnored)) ||
+ if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) &&
+ !(newtqStatus & KMMsgStatusIgnored)) ||
(folder() == kmkernel->outboxFolder()))
newUnread = 1;
int deltaUnread = newUnread - oldUnread;
@@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
{
if (idx < 0)
- idx = aMsg->parent()->find( aMsg );
+ idx = aMsg->tqparent()->tqfind( aMsg );
if (idx >= 0 )
{
@@ -1022,7 +1022,7 @@ int FolderStorage::appendToFolderIdsFile( int idx )
return ret;
}
-void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
+void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
{
if ( !mExportsSernums ) return;
KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
}
//-----------------------------------------------------------------------------
-void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle)
{
KMMsgBase *msg = getMsgBase(idx);
if ( msg ) {
if (toggle)
- msg->toggleStatus(status, idx);
+ msg->toggletqStatus(status, idx);
else
- msg->seStatus(status, idx);
+ msg->setqStatus(status, idx);
}
}
//-----------------------------------------------------------------------------
-void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
{
for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it )
{
- FolderStorage::seStatus(*it, status, toggle);
+ FolderStorage::setqStatus(*it, status, toggle);
}
}
@@ -1136,7 +1136,7 @@ void FolderStorage::slotProcessNextSearchBatch()
if ( !mSearchPattern )
return;
TQValueList<TQ_UINT32> matchingSerNums;
- const int end = QMIN( mCurrentSearchedMsg + 15, count() );
+ const int end = TQMIN( mCurrentSearchedMsg + 15, count() );
for ( int i = mCurrentSearchedMsg; i < end; ++i )
{
TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index b7effe08..ab58d4fd 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -71,20 +71,21 @@ typedef TQValueList<TQ_UINT32> SerNumList;
*
* @section Accounts
* The accounts (of KMail) that are fed into the folder are
- * represented as the children of the folder. They are only stored here
+ * represented as the tqchildren of the folder. They are only stored here
* during runtime to have a reference for which accounts point to a
* specific folder.
*/
-class FolderStorage : public QObject
+class FolderStorage : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- /** Usually a parent is given. But in some cases there is no
- fitting parent object available. Then the name of the folder
+ /** Usually a tqparent is given. But in some cases there is no
+ fitting tqparent object available. Then the name of the folder
is used as the absolute path to the folder file. */
FolderStorage( KMFolder* folder, const char* name=0 );
virtual ~FolderStorage();
@@ -108,10 +109,10 @@ public:
/** Specify, that the folder can't contain mails. */
virtual void setNoContent(bool aNoContent);
- /** Returns, if the folder can't have children */
+ /** Returns, if the folder can't have tqchildren */
virtual bool noChildren() const { return mNoChildren; }
- /** Specify, that the folder can't have children */
+ /** Specify, that the folder can't have tqchildren */
virtual void setNoChildren( bool aNoChildren );
enum ChildrenState {
@@ -119,11 +120,11 @@ public:
HasNoChildren,
ChildrenUnknown
};
- /** Returns if the folder has children,
- * has no children or we don't know */
+ /** Returns if the folder has tqchildren,
+ * has no tqchildren or we don't know */
virtual ChildrenState hasChildren() const { return mHasChildren; }
- /** Specify if the folder has children */
+ /** Specify if the folder has tqchildren */
virtual void setHasChildren( ChildrenState state )
{ mHasChildren = state; }
@@ -158,7 +159,7 @@ public:
* for each derived KMFolder).
*/
virtual FolderJob* createJob( KMMessage *msg, FolderJob::JobType jt = FolderJob::tGetMessage,
- KMFolder *folder = 0, TQString partSpecifier = TQString::null,
+ KMFolder *folder = 0, TQString partSpecifier = TQString(),
const AttachmentStrategy *as = 0 ) const;
virtual FolderJob* createJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
FolderJob::JobType jt = FolderJob::tGetMessage,
@@ -228,8 +229,8 @@ public:
virtual int moveMsg(TQPtrList<KMMessage>, int* index_return = 0);
/** Returns the index of the given message or -1 if not found. */
- virtual int find(const KMMsgBase* msg) const = 0;
- int find( const KMMessage * msg ) const;
+ virtual int tqfind(const KMMsgBase* msg) const = 0;
+ int tqfind( const KMMessage * msg ) const;
/** Number of messages in this folder. */
virtual int count(bool cache = false) const;
@@ -244,10 +245,10 @@ public:
* be reflected in the UI. */
virtual bool isCloseToQuota() const;
- /** Called by KMMsgBase::seStatus when status of a message has changed
+ /** Called by KMMsgBase::setqStatus when status of a message has changed
required to keep the number unread messages variable current. */
- virtual void msgStatusChanged( const KMMsgStatus oldStatus,
- const KMMsgStatus newStatus,
+ virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus,
+ const KMMsgtqStatus newtqStatus,
int idx);
/** Open folder for access.
@@ -324,7 +325,7 @@ public:
/** Change the dirty flag. */
void setDirty(bool f);
- /** Returns TRUE if the folder tqcontains deleted messages */
+ /** Returns TRUE if the folder contains deleted messages */
bool needsCompacting() const { return needsCompact; }
virtual void setNeedsCompacting(bool f) { needsCompact = f; }
@@ -363,10 +364,10 @@ public:
void deregisterFromMessageDict();
/** Set the status of the message at index @p idx to @p status. */
- virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
+ virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false);
/** Set the status of the message(s) in the TQValueList @p ids to @p status. */
- virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+ virtual void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false);
void removeJobs();
@@ -581,7 +582,7 @@ friend class KMMsgDict;
/** Replaces the serial number for the message @p msg at index @p idx with
* @p sernum */
- void tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
+ void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
/** Called when serial numbers for a folder are tqinvalidated,
tqinvalidates/recreates data structures dependent on the
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index e126263f..0397692a 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -39,8 +39,8 @@ using KPIM::MailListDrag;
using namespace KMail;
-FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * parent, const char * name) :
- KFolderTree( parent, name ),
+FolderTreeBase::FolderTreeBase(KMMainWidget *mainWidget, TQWidget * tqparent, const char * name) :
+ KFolderTree( tqparent, name ),
mMainWidget( mainWidget )
{
addAcceptableDropMimetype(MailListDrag::format(), false);
@@ -212,7 +212,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
fti->setFolderIsCloseToQuota( folder->storage()->isCloseToQuota() );
}
- if (fti->parent() && !fti->parent()->isOpen())
+ if (fti->tqparent() && !fti->tqparent()->isOpen())
tqrepaint = false; // we're not visible
if (tqrepaint) {
fti->setNeedsRepaint( true );
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index 0c8f9720..71018663 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -29,8 +29,9 @@ namespace KMail {
class FolderTreeBase : public KFolderTree
{
Q_OBJECT
+ TQ_OBJECT
public:
- FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 );
+ FolderTreeBase( KMMainWidget *mainWidget, TQWidget *tqparent = 0, const char *name = 0 );
/** Returns the main widget that this widget is a child of. */
KMMainWidget* mainWidget() const { return mMainWidget; }
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 8e65fff2..e5a604b8 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -28,39 +28,39 @@
using namespace KMail;
using namespace FolderUtil;
-KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
+KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir,
const TQString &folderName, const TQString &namespaceName,
KMFolderType localFolderType )
{
KMFolder *newFolder = 0;
- if ( parentFolder && parentFolder->folderType() == KMFolderTypeImap ) {
- KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( parentFolder->storage() );
+ if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeImap ) {
+ KMFolderImap* selectedStorage = static_cast<KMFolderImap*>( tqparentFolder->storage() );
KMAcctImap *anAccount = selectedStorage->account();
// check if a connection is available BEFORE creating the folder
if (anAccount->makeConnection() == ImapAccountBase::Connected) {
- newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, parentDir );
+ newFolder = kmkernel->imapFolderMgr()->createFolder( folderName, false, KMFolderTypeImap, tqparentDir );
if ( newFolder ) {
- TQString imapPath, parent;
+ TQString imapPath, tqparent;
if ( !namespaceName.isEmpty() ) {
// create folder with namespace
- parent = anAccount->addPathToNamespace( namespaceName );
- imapPath = anAccount->createImapPath( parent, folderName );
+ tqparent = anAccount->addPathToNamespace( namespaceName );
+ imapPath = anAccount->createImapPath( tqparent, folderName );
} else {
imapPath = anAccount->createImapPath( selectedStorage->imapPath(), folderName );
}
KMFolderImap* newStorage = static_cast<KMFolderImap*>( newFolder->storage() );
- selectedStorage->createFolder(folderName, parent); // create it on the server
- newStorage->initializeFrom( selectedStorage, imapPath, TQString::null );
- static_cast<KMFolderImap*>(parentFolder->storage())->setAccount( selectedStorage->account() );
+ selectedStorage->createFolder(folderName, tqparent); // create it on the server
+ newStorage->initializeFrom( selectedStorage, imapPath, TQString() );
+ static_cast<KMFolderImap*>(tqparentFolder->storage())->setAccount( selectedStorage->account() );
return newFolder;
}
}
- } else if ( parentFolder && parentFolder->folderType() == KMFolderTypeCachedImap ) {
+ } else if ( tqparentFolder && tqparentFolder->folderType() == KMFolderTypeCachedImap ) {
newFolder = kmkernel->dimapFolderMgr()->createFolder( folderName, false, KMFolderTypeCachedImap,
- parentDir );
+ tqparentDir );
if ( newFolder ) {
- KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( parentFolder->storage() );
+ KMFolderCachedImap* selectedStorage = static_cast<KMFolderCachedImap*>( tqparentFolder->storage() );
KMFolderCachedImap* newStorage = static_cast<KMFolderCachedImap*>( newFolder->storage() );
newStorage->initializeFrom( selectedStorage );
if ( !namespaceName.isEmpty() ) {
@@ -75,21 +75,21 @@ KMFolder *KMail::FolderUtil::createSubFolder( KMFolder *parentFolder, KMFolderDi
// local folder
Q_ASSERT( localFolderType == KMFolderTypeMaildir || localFolderType == KMFolderTypeMbox );
newFolder = kmkernel->folderMgr()->createFolder( folderName, false, localFolderType,
- parentDir );
+ tqparentDir );
return newFolder;
}
return newFolder;
}
-void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent )
+void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent )
{
if ( folderToDelete->hasAccounts() ) {
// this folder has an account, so we need to change that to the inbox
for ( AccountList::Iterator it (folderToDelete->acctList()->begin() ),
end( folderToDelete->acctList()->end() ); it != end; ++it ) {
(*it)->setFolder( kmkernel->inboxFolder() );
- KMessageBox::information(parent,
+ KMessageBox::information(tqparent,
i18n("<qt>The folder you deleted was associated with the account "
"<b>%1</b> which delivered mail into it. The folder the account "
"delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name()));
diff --git a/kmail/folderutil.h b/kmail/folderutil.h
index fbb4d069..9e1ac419 100644
--- a/kmail/folderutil.h
+++ b/kmail/folderutil.h
@@ -35,16 +35,16 @@ namespace FolderUtil
/**
* Low-level function to create a subfolder for a folder of any kind.
*
- * @param parentFolder parent folder of the folder that should be created. Can be 0 in case of
+ * @param tqparentFolder tqparent folder of the folder that should be created. Can be 0 in case of
* local folders
- * @param parentDir parent folder directory, which should be the folder directory of parentFolder
+ * @param tqparentDir tqparent folder directory, which should be the folder directory of tqparentFolder
* @param folderName the name the newly created folder should have
* @param namespaceName for (d)IMAP folders, the namespace the new folder should be in. Can be empty.
* @param localFolderType for local folders, this determines if the folder should be MBOX or maildir
*
* @return the newly created folder or 0 in case an error occured
*/
-KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
+KMFolder *createSubFolder( KMFolder *tqparentFolder, KMFolderDir *tqparentDir,
const TQString &folderName, const TQString &namespaceName,
KMFolderType localFolderType );
@@ -53,10 +53,10 @@ KMFolder *createSubFolder( KMFolder *parentFolder, KMFolderDir *parentDir,
* Handles all types of folders correctly, as well as folders with accounts
*
* @param folderToDelete the folder which is going to be deleted
- * @param parent the parent widget, which is used when displaying a messagebox,
+ * @param tqparent the tqparent widget, which is used when displaying a messagebox,
* which happens when removing a folder with an associated account
*/
-void deleteFolder( KMFolder *folderToDelete, TQWidget *parent );
+void deleteFolder( KMFolder *folderToDelete, TQWidget *tqparent );
}
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index ee813bf4..5ffac8d4 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -7,12 +7,12 @@
namespace KMail {
-class FolderViewToolTip : public QToolTip
+class FolderViewToolTip : public TQToolTip
{
public:
- FolderViewToolTip( TQListView* parent ) :
- TQToolTip( parent->viewport() ),
- mListView( parent ) {}
+ FolderViewToolTip( TQListView* tqparent ) :
+ TQToolTip( tqparent->viewport() ),
+ mListView( tqparent ) {}
protected:
void maybeTip( const TQPoint &point )
diff --git a/kmail/globalsettings.cpp b/kmail/globalsettings.cpp
index b7430949..c09b0591 100644
--- a/kmail/globalsettings.cpp
+++ b/kmail/globalsettings.cpp
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#include "globalsettings.h"
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index eedac97a..6b3df406 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef KMAIL_GLOBALSETTINGS_H
@@ -31,6 +31,7 @@ class TQTimer;
class GlobalSettings : public TQObject, public GlobalSettingsBase
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual ~GlobalSettings();
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 684dd590..230b6499 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -16,11 +16,11 @@
**
** In addition, as a special exception, the copyright holders give
** permission to link the code of this program with any edition of
-** the Qt library by Trolltech AS, Norway (or with modified versions
-** of Qt that use the same license as Qt), and distribute linked
+** the TQt library by Trolltech AS, Norway (or with modified versions
+** of TQt that use the same license as TQt), and distribute linked
** combinations including the two. You must obey the GNU General
** Public License in all respects for all of the code used other than
-** Qt. If you modify this file, you may extend this exception to
+** TQt. If you modify this file, you may extend this exception to
** your version of the file, but you are not obligated to do so. If
** you do not wish to do so, delete this exception statement from
** your version.
@@ -42,8 +42,8 @@
using namespace KMail;
// Constuction a new list view item with the given colors and pixmap
-HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
- : KListViewItem( parent ),
+HeaderItem::HeaderItem( TQListView* tqparent, int msgId, const TQString& key )
+ : KListViewItem( tqparent ),
mMsgId( msgId ),
mKey( key ),
mAboutToBeDeleted( false ),
@@ -52,9 +52,9 @@ HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key )
irefresh();
}
-// Constuction a new list view item with the given parent, colors, & pixmap
-HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key )
- : KListViewItem( parent ),
+// Constuction a new list view item with the given tqparent, colors, & pixmap
+HeaderItem::HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key )
+ : KListViewItem( tqparent ),
mMsgId( msgId ),
mKey( key ),
mAboutToBeDeleted( false ),
@@ -92,7 +92,7 @@ void HeaderItem::irefresh()
return; //default to closed
// otherwise threadingPolicy == OpenUnread
- if (parent() && parent()->isOpen()) {
+ if (tqparent() && tqparent()->isOpen()) {
setOpen(true);
return;
}
@@ -103,8 +103,8 @@ void HeaderItem::irefresh()
|| mMsgBase->isImportant() || mMsgBase->isTodo() || mMsgBase->isWatched() ) {
setOpen(true);
HeaderItem * topOfThread = this;
- while(topOfThread->parent())
- topOfThread = (HeaderItem*)topOfThread->parent();
+ while(topOfThread->tqparent())
+ topOfThread = (HeaderItem*)topOfThread->tqparent();
topOfThread->setOpenRecursive(true);
}
}
@@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const
// Update this item to summarise a new folder and message
-//Opens all children in the thread
+//Opens all tqchildren in the thread
void HeaderItem::setOpenRecursive( bool open )
{
if (open){
@@ -198,7 +198,7 @@ TQString HeaderItem::text( int col) const
tmp = headers->mDate.dateString( mMsgBase->date() );
} else if(col == headers->paintInfo()->sizeCol
&& headers->paintInfo()->showSize) {
- if ( mMsgBase->parent()->folderType() == KMFolderTypeImap ) {
+ if ( mMsgBase->tqparent()->folderType() == KMFolderTypeImap ) {
tmp = KIO::convertSize( mMsgBase->msgSizeServer() );
} else {
tmp = KIO::convertSize( mMsgBase->msgSize() );
@@ -212,8 +212,8 @@ void HeaderItem::setup()
widthChanged();
const int ph = KMHeaders::pixNew->height();
TQListView *v = listView();
- int h = QMAX( v->fontMetrics().height(), ph ) + 2*v->itemMargin();
- h = QMAX( h, TQApplication::globalStrut().height());
+ int h = TQMAX( v->fontMetrics().height(), ph ) + 2*v->itemMargin();
+ h = TQMAX( h, TQApplication::globalStrut().height());
if ( h % 2 > 0 )
h++;
setHeight( h );
@@ -228,7 +228,7 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
for ( PixmapList::ConstIterator it = pixmaps.begin();
it != pixmaps.end(); ++it ) {
width += (*it).width();
- height = QMAX( height, (*it).height() );
+ height = TQMAX( height, (*it).height() );
}
TQPixmap res( width, height );
@@ -309,7 +309,7 @@ const TQPixmap *HeaderItem::pixmap(int col) const
if ( msgBase->isWatched() ) pixmaps << *KMHeaders::pixWatched;
}
- if ( !headers->mPaintInfo.showStatus ) {
+ if ( !headers->mPaintInfo.showtqStatus ) {
const TQPixmap *pix = statusIcon(msgBase);
if ( pix ) pixmaps << *pix;
}
@@ -402,23 +402,23 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg,
if ( mMsgBase->isTodo() ) {
color = const_cast<TQColor*>( &headers->paintInfo()->colTodo );
font = headers->todoFont();
- weight = QMAX( weight, font.weight() );
+ weight = TQMAX( weight, font.weight() );
}
if ( mMsgBase->isUnread() ) {
color = const_cast<TQColor*>( &headers->paintInfo()->colUnread );
font = headers->unreadFont();
- weight = QMAX( weight, font.weight() );
+ weight = TQMAX( weight, font.weight() );
}
if ( mMsgBase->isNew() ) {
color = const_cast<TQColor*>( &headers->paintInfo()->colNew );
font = headers->newFont();
- weight = QMAX( weight, font.weight() );
+ weight = TQMAX( weight, font.weight() );
}
if ( mMsgBase->isImportant() ) {
color = const_cast<TQColor*>( &headers->paintInfo()->colFlag );
font = headers->importantFont();
- weight = QMAX( weight, font.weight() );
+ weight = TQMAX( weight, font.weight() );
}
if ( column == headers->paintInfo()->dateCol ) {
font = headers->dateFont();
@@ -451,10 +451,10 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
const KPaintInfo *paintInfo,
int sortOrder )
{
- // It appears, that TQListView in Qt-3.0 asks for the key
+ // It appears, that TQListView in TQt-3.0 asks for the key
// in TQListView::clear(), which is called from
// readSortOrder()
- if (!msg) return TQString::null;
+ if (!msg) return TQString();
int column = sortOrder & ((1 << 5) - 1);
TQString ret = TQChar( (char)sortOrder );
@@ -490,7 +490,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
}
else if (column == paintInfo->sizeCol) {
TQString len;
- if ( msg->parent()->folderType() == KMFolderTypeImap )
+ if ( msg->tqparent()->folderType() == KMFolderTypeImap )
{
len = TQString::number( msg->msgSizeServer() );
} else {
@@ -603,7 +603,7 @@ int HeaderItem::compare( TQListViewItem *i, int col, bool ascending ) const
res = key( col, ascending ).compare( i->key( col, ascending ) );
} else if ( col == headers->paintInfo()->dateCol ) {
res = key( col, ascending ).compare( i->key( col, ascending ) );
- if (i->parent() && !ascending)
+ if (i->tqparent() && !ascending)
res = -res;
} else if ( col == headers->paintInfo()->subCol ||
col == headers->paintInfo()->senderCol ||
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index 4ada5112..1912d901 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -16,11 +16,11 @@
**
** In addition, as a special exception, the copyright holders give
** permission to link the code of this program with any edition of
-** the Qt library by Trolltech AS, Norway (or with modified versions
-** of Qt that use the same license as Qt), and distribute linked
+** the TQt library by Trolltech AS, Norway (or with modified versions
+** of TQt that use the same license as TQt), and distribute linked
** combinations including the two. You must obey the GNU General
** Public License in all respects for all of the code used other than
-** Qt. If you modify this file, you may extend this exception to
+** TQt. If you modify this file, you may extend this exception to
** your version of the file, but you are not obligated to do so. If
** you do not wish to do so, delete this exception statement from
** your version.
@@ -63,14 +63,14 @@ public:
mImperfectlyThreaded (true), mSubjThreadingList(0) { }
~SortCacheItem() { if(mUnsortedChildren) free(mUnsortedChildren); }
- /** The parent node of the item in the threading hierarchy. 0 if the item
- * is at top level, which is the default. Can only be set by parents. */
- SortCacheItem *parent() const { return mParent; }
+ /** The tqparent node of the item in the threading hierarchy. 0 if the item
+ * is at top level, which is the default. Can only be set by tqparents. */
+ SortCacheItem *tqparent() const { return mParent; }
/**
* Returs whether the item is so far imperfectly threaded.
* If an item is imperfectly threaded (by References or subject, not by
* In-Reply-To) it will be reevalutated when a new mail comes in. It could be
- * the perfect parent. */
+ * the perfect tqparent. */
bool isImperfectlyThreaded() const
{ return mImperfectlyThreaded; }
/** Set whether the item is currently imperfectly threaded (by References
@@ -80,20 +80,20 @@ public:
/** Returns whether the item has other items below it. */
bool hasChildren() const
{ return mSortedChildren.count() || mUnsortedCount; }
- /** The sorted children are an array of sortcache items we know are below the
+ /** The sorted tqchildren are an array of sortcache items we know are below the
* current one and are already properly sorted (as read from the cache ) */
const TQPtrList<SortCacheItem> *sortedChildren() const
{ return &mSortedChildren; }
- /** The unsorted children are an array of sortcache items we know are below the
+ /** The unsorted tqchildren are an array of sortcache items we know are below the
* current one, but are yet to be threaded and sorted properly. */
SortCacheItem **unsortedChildren(int &count) const
{ count = mUnsortedCount; return mUnsortedChildren; }
- /** Add an item to this itme's list of already sorted children. */
+ /** Add an item to this itme's list of already sorted tqchildren. */
void addSortedChild(SortCacheItem *i) {
i->mParent = this;
mSortedChildren.append(i);
}
- /** Add an item to this itme's list of unsorted children. */
+ /** Add an item to this itme's list of unsorted tqchildren. */
void addUnsortedChild(SortCacheItem *i) {
i->mParent = this;
if(!mUnsortedChildren)
@@ -104,7 +104,7 @@ public:
mUnsortedChildren[mUnsortedCount++] = i;
}
- /** Clear the sorted and unsorted children datastructures. */
+ /** Clear the sorted and unsorted tqchildren datastructures. */
void clearChildren() {
mSortedChildren.clear();
free( mUnsortedChildren );
@@ -130,7 +130,7 @@ public:
void setOffset(int x) { mSortOffset = x; }
void updateSortFile( FILE *sortStream, KMFolder *folder,
- bool waiting_for_parent = false,
+ bool waiting_for_tqparent = false,
bool update_discovered_count = false);
/** Set the list of mails with a certain subject that this item is on.
@@ -163,8 +163,8 @@ private:
class HeaderItem : public KListViewItem
{
public:
- HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString::null );
- HeaderItem( TQListViewItem* parent, int msgId, const TQString& key = TQString::null );
+ HeaderItem( TQListView* tqparent, int msgId, const TQString& key = TQString() );
+ HeaderItem( TQListViewItem* tqparent, int msgId, const TQString& key = TQString() );
~HeaderItem ();
/** Set the message id of this item, which is the offset/index in the folder
@@ -185,7 +185,7 @@ public:
// Return the serial number of the message associated with this item;
TQ_UINT32 msgSerNum() const;
- /** Expands all children of the list view item. */
+ /** Expands all tqchildren of the list view item. */
void setOpenRecursive( bool open );
/** Returns the text of the list view item. */
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index a2262744..39df6dc9 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -18,11 +18,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -47,11 +47,11 @@
namespace KMail {
-HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
+HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
KListView *listView,
KActionCollection *actionCollection,
const char *name )
- : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0), statusList()
+ : KListViewSearchLine(tqparent, listView, name), mStatusCombo(0), mtqStatus(0), statusList()
{
KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
TQApplication::reverseLayout()
@@ -61,27 +61,27 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
TQT_SLOT( reset() ),
actionCollection,
"reset_quicksearch" );
- resetQuickSearch->plug( parent );
+ resetQuickSearch->plug( tqparent );
resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
"Resets the quick search so that "
"all messages are shown again." ) );
- TQLabel *label = new TQLabel( i18n("Stat&us:"), parent, "kde toolbar widget" );
+ TQLabel *label = new TQLabel( i18n("Stat&us:"), tqparent, "kde toolbar widget" );
- mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
+ mStatusCombo = new TQComboBox( tqparent, "quick search status combo box" );
mStatusCombo->setSizeLimit( 12 );
- mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
-
- inserStatus( StatusUnread );
- inserStatus( StatusNew );
- inserStatus( StatusImportant );
- inserStatus( StatusReplied );
- inserStatus( StatusForwarded );
- inserStatus( StatusToDo );
- inserStatus( StatusHasAttachment );
- inserStatus( StatusInvitation );
- inserStatus( StatusWatched );
- inserStatus( StatusIgnored );
+ mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") );
+
+ insertqStatus( StatusUnread );
+ insertqStatus( StatusNew );
+ insertqStatus( StatusImportant );
+ insertqStatus( StatusReplied );
+ insertqStatus( StatusForwarded );
+ insertqStatus( StatusToDo );
+ insertqStatus( StatusHasAttachment );
+ insertqStatus( StatusInvitation );
+ insertqStatus( StatusWatched );
+ insertqStatus( StatusIgnored );
mStatusCombo->setCurrentItem( 0 );
mStatusCombo->installEventFilter( this );
connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
@@ -89,7 +89,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
label->setBuddy( mStatusCombo );
- KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent,
+ KToolBarButton * btn = new KToolBarButton( "mail_tqfind", 0, tqparent,
0, i18n( "Open Full Search" ) );
connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) );
@@ -115,7 +115,7 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
if ( watched == mStatusCombo ) {
KMMainWidget *mainWidget = 0;
- // Travel up the parents list until we find the main widget
+ // Travel up the tqparents list until we find the main widget
for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) {
mainWidget = ::qt_cast<KMMainWidget *>( curWidget );
if ( mainWidget )
@@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const
{
mCurrentSearchTerm = s; // bit of a hack, but works
- if ( mStatus != 0 ) {
+ if ( mtqStatus != 0 ) {
KMHeaders *headers = static_cast<KMHeaders*>( item->listView() );
const KMMsgBase *msg = headers->getMsgBaseForItem( item );
- if ( !msg || ! ( msg->status() & mStatus ) )
+ if ( !msg || ! ( msg->status() & mtqStatus ) )
return false;
}
@@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset()
void HeaderListQuickSearch::sloStatusChanged( int index )
{
if ( index == 0 )
- mStatus = 0;
+ mtqStatus = 0;
else
- mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] );
+ mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] );
updateSearch();
}
-void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which)
{
mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
i18n( KMail::StatusValues[ which ].text ) );
@@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
}
-int HeaderListQuickSearch::currenStatus() const
+int HeaderListQuickSearch::currentqStatus() const
{
- return mStatus;
+ return mtqStatus;
}
} // namespace KMail
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index ddef0b40..df326a0a 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -18,20 +18,20 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
*/
-#ifndef KMAILHEADERLISQUICKSEARCH_H
-#define KMAILHEADERLISQUICKSEARCH_H
+#ifndef KMAILHEADERLISTQUICKSEARCH_H
+#define KMAILHEADERLISTQUICKSEARCH_H
-#include "kmmsgbase.h" // for KMMsgStatus
+#include "kmmsgbase.h" // for KMMsgtqStatus
#include "kmsearchpattern.h"
#include <klistviewsearchline.h>
#include <tqvaluevector.h>
@@ -45,8 +45,9 @@ namespace KMail {
class HeaderListQuickSearch : public KListViewSearchLine
{
Q_OBJECT
+ TQ_OBJECT
public:
- HeaderListQuickSearch( TQWidget *parent,
+ HeaderListQuickSearch( TQWidget *tqparent,
KListView *listView,
KActionCollection *actionCollection,
const char *name = 0 );
@@ -66,7 +67,7 @@ public:
/**
* Returns the currently selected status filter.
*/
- int currenStatus() const;
+ int currentqStatus() const;
public slots:
void reset();
@@ -76,23 +77,23 @@ signals:
protected:
/**
- * checks whether @param item tqcontains the search string and has the status
- * currently in mStatus
+ * checks whether @param item contains the search string and has the status
+ * currently in mtqStatus
*/
virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
private slots:
/**
- * cache the status in mStatus so as to avoid having to do the comparatively
+ * cache the status in mtqStatus so as to avoid having to do the comparatively
* expensive string comparison for each item in itemMatches
*/
void sloStatusChanged( int index );
private:
/** Helper method for the filling of the status combo. */
- void inserStatus(KMail::StatusValueTypes which);
+ void insertqStatus(KMail::StatusValueTypes which);
TQComboBox *mStatusCombo;
- KMMsgStatus mStatus;
+ KMMsgtqStatus mtqStatus;
TQValueVector<TQString> statusList;
mutable TQString mCurrentSearchTerm;
};
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index 3fed82ab..99cc4f5f 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/headerstrategy.h b/kmail/headerstrategy.h
index 4f49d549..ebb61012 100644
--- a/kmail/headerstrategy.h
+++ b/kmail/headerstrategy.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 3f3073ef..0b728444 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -119,7 +119,7 @@ namespace KMail {
const HeaderStrategy * strategy,
const TQString & vCardName, bool printing, bool topLevel ) const {
Q_UNUSED( topLevel );
- if ( !message ) return TQString::null;
+ if ( !message ) return TQString();
if ( !strategy )
strategy = HeaderStrategy::brief();
@@ -218,7 +218,7 @@ namespace KMail {
const HeaderStrategy * strategy,
const TQString & vCardName, bool printing, bool topLevel ) const {
Q_UNUSED( topLevel );
- if ( !message ) return TQString::null;
+ if ( !message ) return TQString();
if ( !strategy )
strategy = HeaderStrategy::rich();
@@ -400,7 +400,7 @@ namespace KMail {
meterBar.fill( 22 );
else {
meterBar.fill( 21 );
- int max = QMIN( 20, static_cast<int>( percent ) / 5 );
+ int max = TQMIN( 20, static_cast<int>( percent ) / 5 );
for ( int i = 0; i < max; ++i ) {
meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1],
gradient[i][2] ) );
@@ -419,7 +419,7 @@ namespace KMail {
const HeaderStrategy * strategy,
const TQString & vCardName, bool printing, bool topLevel ) const {
Q_UNUSED( topLevel );
- if ( !message ) return TQString::null;
+ if ( !message ) return TQString();
if ( !strategy )
strategy = HeaderStrategy::rich();
@@ -457,13 +457,13 @@ namespace KMail {
}
// Spam header display.
- // If the spamSpamStatus config value is true then we look for headers
+ // If the spamSpamtqStatus config value is true then we look for headers
// from a few spam filters and try to create visually meaningful graphics
// out of the spam scores.
TQString spamHTML;
- if ( configReader.readBoolEntry( "showSpamStatus", true ) ) {
+ if ( configReader.readBoolEntry( "showSpamtqStatus", true ) ) {
SpamScores scores = SpamHeaderAnalyzer::getSpamScores( message );
for ( SpamScoresIterator it = scores.begin(); it != scores.end(); ++it )
spamHTML += (*it).agent() + " " +
@@ -478,7 +478,7 @@ namespace KMail {
::KIMProxy *imProxy = KMKernel::self()->imProxy();
TQString kabcUid;
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
- KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+ KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
TQString photoURL;
int photoWidth = 60;
@@ -646,7 +646,7 @@ namespace KMail {
// kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl;
- TQTime currTime = TQTime::currentTime( Qt::UTC );
+ TQTime currTime = TQTime::currentTime( TQt::UTC );
// kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl;
@@ -662,7 +662,7 @@ namespace KMail {
color = "white";
bg_color = "#000B6B";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lEQVQI11WOsRGAQAzDOG/LHoz9"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lETQVQI11WOsRGATQAzDOG/LHoz9"
"kikIcF+kSBxbPs7LoNGVapAI0Zn+O+8NUwldozn6io7G7kdS/5zi7i+BvUM/5uSXlIfzMHx/bmWR"
"k++yj9rZAAAAAElFTkSuQmCC)";
}
@@ -671,8 +671,8 @@ namespace KMail {
color = "white";
bg_color = "#00A6FF";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI122OQQ7DMAzDaP3/dfuO"
- "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI122OQQ7DMAzDaP3/dfuO"
+ "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJTQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o"
"zu4uSh7kn67/DNv+C4tsZOtjAWEHAAAAAElFTkSuQmCC)";
}
else if ( currTime > TQTime( 12, 0, 0 ) && currTime <= TQTime( 18, 0, 0 ) ) {
@@ -680,8 +680,8 @@ namespace KMail {
color = "black";
bg_color = "#00A6FF";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlEQVQI132OwQ0AIAwCSfcfw91c"
- "QsCfRm399HFwoWjdDhMICQhxHSWMQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlETQVQI132OwQ0AIAwCSfcfw91c"
+ "QsCfRm399HFwoWjdDhMICQhxHSWMTQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E"
"rkJggg==)";
}
else {
@@ -689,8 +689,8 @@ namespace KMail {
color = "white";
bg_color = "#0014CC";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI11WOyRHAMAgDNQuUlBrS"
- "fyFpAfKwje0PwyEt0vN+hVsJpzS6QML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI11WOyRHAMAgDNQuUlBrS"
+ "fyFpAfKwje0PwyEt0vN+hVsJpzS6TQML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO"
"xx7JjrtshlbXlLDSD+WhJ+hwqWo8AAAAAElFTkSuQmCC)";
}
@@ -830,8 +830,8 @@ namespace KMail {
headerStr.append( TQString( "<tr><th>%1</th>\n"
"<td dir=\"%2\">%3</td></tr>\n")
.arg(i18n("Sender status: "))
- .arg( directionOf( onlineStatus ) )
- .arg(onlineStatus));
+ .arg( directionOf( onlinetqStatus ) )
+ .arg(onlinetqStatus));
*/
headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) );
headerStr.append(
@@ -841,7 +841,7 @@ namespace KMail {
if ( !spamHTML.isEmpty() )
headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n")
- .arg( subjectDir, i18n("Spam Status:"), spamHTML ) );
+ .arg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) );
headerStr += "</div>\n\n";
return headerStr;
@@ -877,7 +877,7 @@ namespace KMail {
TQString EnterpriseHeaderStyle::format( const KMMessage * message,
const HeaderStrategy * strategy,
const TQString & vCardName, bool printing, bool topLevel ) const {
- if ( !message ) return TQString::null;
+ if ( !message ) return TQString();
if ( !strategy )
strategy = HeaderStrategy::brief();
@@ -899,7 +899,7 @@ namespace KMail {
subjectDir = directionOf( i18n("No Subject") );
// colors depend on if its encapsulated or not
- TQColor fontColor(Qt::white);
+ TQColor fontColor(TQt::white);
TQString linkColor = "class =\"white\"";
const TQColor activeColor = tqApp->palette().active().highlight();
TQColor activeColorDark = activeColor.dark(130);
diff --git a/kmail/headerstyle.h b/kmail/headerstyle.h
index 2613f6be..ff7228d3 100644
--- a/kmail/headerstyle.h
+++ b/kmail/headerstyle.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 111ce6cd..371a48d1 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -48,8 +48,8 @@
#include <tqcolor.h>
#include <tqstring.h>
-KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlags f )
- : TQLabel( parent, name, f ),
+KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * tqparent, const char * name, WFlags f )
+ : TQLabel( tqparent, name, f ),
mMode( Normal )
{
tqsetAlignment( AlignHCenter|AlignTop );
@@ -96,7 +96,7 @@ TQString KMail::HtmlStatusBar::message() const {
"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>" );
default:
case Neutral:
- return TQString::null;
+ return TQString();
}
}
@@ -114,12 +114,12 @@ TQColor KMail::HtmlStatusBar::fgColor() const {
KConfigGroup conf( config(), "Reader" );
switch ( mode() ) {
case Html:
- return conf.readColorEntry( "ColorbarForegroundHTML", &Qt::white );
+ return conf.readColorEntry( "ColorbarForegroundHTML", &TQt::white );
case Normal:
- return conf.readColorEntry( "ColorbarForegroundPlain", &Qt::black );
+ return conf.readColorEntry( "ColorbarForegroundPlain", &TQt::black );
default:
case Neutral:
- return Qt::black;
+ return TQt::black;
}
}
@@ -128,12 +128,12 @@ TQColor KMail::HtmlStatusBar::bgColor() const {
switch ( mode() ) {
case Html:
- return conf.readColorEntry( "ColorbarBackgroundHTML", &Qt::black );
+ return conf.readColorEntry( "ColorbarBackgroundHTML", &TQt::black );
case Normal:
- return conf.readColorEntry( "ColorbarBackgroundPlain", &Qt::lightGray );
+ return conf.readColorEntry( "ColorbarBackgroundPlain", &TQt::lightGray );
default:
case Neutral:
- return Qt::white;
+ return TQt::white;
}
}
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index dd7da106..c23193fa 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -60,8 +60,9 @@ namespace KMail {
**/
class HtmlStatusBar : public TQLabel {
Q_OBJECT
+ TQ_OBJECT
public:
- HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
+ HtmlStatusBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 );
virtual ~HtmlStatusBar();
enum Mode {
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 5c3f7df6..1ec367ee 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -69,7 +69,7 @@ using KMail::FolderRequester;
#include <kdebug.h>
#include <kpushbutton.h>
-// Qt headers:
+// TQt headers:
#include <tqtabwidget.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
@@ -89,9 +89,9 @@ using namespace KPIM;
namespace KMail {
- IdentityDialog::IdentityDialog( TQWidget * parent, const char * name )
+ IdentityDialog::IdentityDialog( TQWidget * tqparent, const char * name )
: KDialogBase( Plain, i18n("Edit Identity"), Ok|Cancel|Help, Ok,
- parent, name )
+ tqparent, name )
{
// tmp. vars:
TQWidget * tab;
@@ -165,7 +165,7 @@ namespace KMail {
label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab );
glay->addWidget( label, row, 0, TQt::AlignTop );
msg = i18n("<qt><h3>Email aliases</h3>"
- "<p>This field tqcontains alias addresses that should also "
+ "<p>This field contains alias addresses that should also "
"be considered as belonging to this identity (as opposed "
"to representing a different identity).</p>"
"<p>Example:</p>"
@@ -490,7 +490,7 @@ namespace KMail {
TQString DoesntMatchEMailAddress::extractEmail( const char * e ) {
if ( !e || !*e )
- return TQString::null;
+ return TQString();
const TQString em = TQString::fromUtf8( e );
if ( e[0] == '<' )
return em.mid( 1, em.length() - 2 );
@@ -699,14 +699,14 @@ void IdentityDialog::slotOk() {
ident.setReplyToAddr( mReplyToEdit->text() );
ident.setBcc( mBccEdit->text() );
ident.setTransport( ( mTransportCheck->isChecked() ) ?
- mTransportCombo->currentText() : TQString::null );
+ mTransportCombo->currentText() : TQString() );
ident.setDictionary( mDictionaryCombo->currentDictionary() );
ident.setFcc( mFccCombo->folder() ?
- mFccCombo->folder()->idString() : TQString::null );
+ mFccCombo->folder()->idString() : TQString() );
ident.setDrafts( mDraftsCombo->folder() ?
- mDraftsCombo->folder()->idString() : TQString::null );
+ mDraftsCombo->folder()->idString() : TQString() );
ident.setTemplates( mTemplatesCombo->folder() ?
- mTemplatesCombo->folder()->idString() : TQString::null );
+ mTemplatesCombo->folder()->idString() : TQString() );
// "Templates" tab:
uint identity = ident.uoid();
TQString iid = TQString("IDENTITY_%1").arg( identity );
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index f8e71073..82bca1c4 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -61,8 +61,9 @@ namespace KMail {
class IdentityDialog : public KDialogBase {
Q_OBJECT
+ TQ_OBJECT
public:
- IdentityDialog( TQWidget * parent=0, const char * name = 0 );
+ IdentityDialog( TQWidget * tqparent=0, const char * name = 0 );
virtual ~IdentityDialog();
void setIdentity( /*_not_ const*/ KPIM::Identity & ident );
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index 85520637..106cb589 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index f48e1a3c..a93095ff 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -43,6 +43,7 @@ namespace KMail {
**/
class IdentityDrag : public TQDragObject {
Q_OBJECT
+ TQ_OBJECT
public:
IdentityDrag( const KPIM::Identity & ident,
TQWidget * dragSource=0, const char * name=0 );
@@ -50,7 +51,7 @@ namespace KMail {
public:
virtual ~IdentityDrag() {}
- const char * format( int i ) const; // reimp. QMimeSource
+ const char * format( int i ) const; // reimp. TQMimeSource
TQByteArray tqencodedData( const char * mimetype ) const; // dto.
static bool canDecode( const TQMimeSource * e );
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index d4067380..319bd32a 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -52,13 +52,13 @@ namespace KMail {
//
//
- IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident )
- : KListViewItem( parent ), mUOID( ident.uoid() ) {
+ IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, const KPIM::Identity & ident )
+ : KListViewItem( tqparent ), mUOID( ident.uoid() ) {
init( ident );
}
- IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident )
- : KListViewItem( parent, after ), mUOID( ident.uoid() ) {
+ IdentityListViewItem::IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after, const KPIM::Identity & ident )
+ : KListViewItem( tqparent, after ), mUOID( ident.uoid() ) {
init( ident );
}
@@ -95,8 +95,8 @@ namespace KMail {
//
//
- IdentityListView::IdentityListView( TQWidget * parent, const char * name )
- : KListView( parent, name )
+ IdentityListView::IdentityListView( TQWidget * tqparent, const char * name )
+ : KListView( tqparent, name )
{
setFullWidth( true );
setDragEnabled( true );
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index 556132bf..b2c48418 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -36,7 +36,7 @@
namespace KPIM { class Identity; }
class TQDropEvent;
-class QDragEvent;
+class TQDragEvent;
namespace KMail {
@@ -47,9 +47,9 @@ namespace KMail {
**/
class IdentityListViewItem : public KListViewItem {
public:
- IdentityListViewItem( IdentityListView * parent,
+ IdentityListViewItem( IdentityListView * tqparent,
const KPIM::Identity & ident );
- IdentityListViewItem( IdentityListView * parent, TQListViewItem * after,
+ IdentityListViewItem( IdentityListView * tqparent, TQListViewItem * after,
const KPIM::Identity & ident );
uint uoid() const { return mUOID; }
@@ -68,8 +68,9 @@ namespace KMail {
**/
class IdentityListView : public KListView {
Q_OBJECT
+ TQ_OBJECT
public:
- IdentityListView( TQWidget * parent=0, const char * name=0 );
+ IdentityListView( TQWidget * tqparent=0, const char * name=0 );
virtual ~IdentityListView() {}
public slots:
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 01e1324c..04dc2933 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -32,7 +32,7 @@ using KMail::SieveConfig;
using KMail::AccountManager;
#include "kmfolder.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "kmmainwin.h"
#include "kmfolderimap.h"
#include "kmmainwidget.h"
@@ -79,8 +79,8 @@ namespace KMail {
//
//
- ImapAccountBase::ImapAccountBase( AccountManager * parent, const TQString & name, uint id )
- : NetworkAccount( parent, name, id ),
+ ImapAccountBase::ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id )
+ : NetworkAccount( tqparent, name, id ),
mIdleTimer( 0, "mIdleTimer" ),
mNoopTimer( 0, "mNoopTimer" ),
mTotal( 0 ),
@@ -301,7 +301,7 @@ namespace KMail {
if (ret != TQDialog::Accepted ) {
mPasswordDialogIsActive = false;
mAskAgain = false;
- emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null );
+ emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
return Error;
}
mPasswordDialogIsActive = false;
@@ -354,7 +354,7 @@ namespace KMail {
checkDone( false, CheckOK );
}
if ( showStatusMsg )
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted(
name(), newMails);
}
@@ -412,19 +412,19 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- // TODO imapPath can be removed once parent can be a KMFolderImapBase or whatever
- void ImapAccountBase::getUserRights( KMFolder* parent, const TQString& imapPath )
+ // TODO imapPath can be removed once tqparent can be a KMFolderImapBase or whatever
+ void ImapAccountBase::getUserRights( KMFolder* tqparent, const TQString& imapPath )
{
// There isn't much point in asking the server about a user's rights on his own inbox,
// it might not be the effective permissions (at least with Cyrus, one can admin his own inbox,
- // even after a SETACL that removes the admin permissions. Other imap servers apparently
+ // even after a SETACL that removes the admin permissions. Other imap servers aptqparently
// don't even allow removing one's own admin permission, so this code won't hurt either).
if ( imapPath == "/INBOX/" ) {
- if ( parent->folderType() == KMFolderTypeImap )
- static_cast<KMFolderImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
- else if ( parent->folderType() == KMFolderTypeCachedImap )
- static_cast<KMFolderCachedImap*>( parent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
- emit receivedUserRights( parent ); // warning, you need to connect first to get that one
+ if ( tqparent->folderType() == KMFolderTypeImap )
+ static_cast<KMFolderImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
+ else if ( tqparent->folderType() == KMFolderTypeCachedImap )
+ static_cast<KMFolderCachedImap*>( tqparent->storage() )->setUserRights( ACLJobs::All, ACLJobs::Ok );
+ emit receivedUserRights( tqparent ); // warning, you need to connect first to get that one
return;
}
@@ -433,7 +433,7 @@ namespace KMail {
ACLJobs::GetUserRightsJob* job = ACLJobs::getUserRights( mSlave, url );
- jobData jd( url.url(), parent );
+ jobData jd( url.url(), tqparent );
jd.cancellable = true;
insertJob(job, jd);
@@ -447,7 +447,7 @@ namespace KMail {
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- KMFolder* folder = (*it).parent;
+ KMFolder* folder = (*it).tqparent;
if ( job->error() ) {
if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) // that's when the imap server doesn't support ACLs
mACLSupport = false;
@@ -471,13 +471,13 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::getACL( KMFolder* parent, const TQString& imapPath )
+ void ImapAccountBase::getACL( KMFolder* tqparent, const TQString& imapPath )
{
KURL url = getUrl();
url.setPath(imapPath);
ACLJobs::GetACLJob* job = ACLJobs::getACL( mSlave, url );
- jobData jd( url.url(), parent );
+ jobData jd( url.url(), tqparent );
jd.cancellable = true;
insertJob(job, jd);
@@ -491,21 +491,21 @@ namespace KMail {
JobIterator it = findJob( job );
if ( it == jobsEnd() ) return;
- KMFolder* folder = (*it).parent;
+ KMFolder* folder = (*it).tqparent;
emit receivedACL( folder, job, job->entries() );
if (mSlave) removeJob(job);
}
//-----------------------------------------------------------------------------
- // Do not remove imapPath, FolderDiaQuotaTab needs to call this with parent==0.
- void ImapAccountBase::getStorageQuotaInfo( KMFolder* parent, const TQString& imapPath )
+ // Do not remove imapPath, FolderDiaQuotaTab needs to call this with tqparent==0.
+ void ImapAccountBase::getStorageQuotaInfo( KMFolder* tqparent, const TQString& imapPath )
{
if ( !mSlave ) return;
KURL url = getUrl();
url.setPath(imapPath);
QuotaJobs::GetStorageQuotaJob* job = QuotaJobs::getStorageQuota( mSlave, url );
- jobData jd( url.url(), parent );
+ jobData jd( url.url(), tqparent );
jd.cancellable = true;
insertJob(job, jd);
@@ -521,7 +521,7 @@ namespace KMail {
if ( job->error() && job->error() == KIO::ERR_UNSUPPORTED_ACTION )
setHasNoQuotaSupport();
- KMFolder* folder = (*it).parent; // can be 0
+ KMFolder* folder = (*it).tqparent; // can be 0
emit receivedStorageQuotaInfo( folder, job, job->storageQuotaInfo() );
if (mSlave) removeJob(job);
}
@@ -570,7 +570,7 @@ namespace KMail {
const TQString &errorMsg)
{
if (aSlave != mSlave) return;
- handleError( errorCode, errorMsg, 0, TQString::null, true );
+ handleError( errorCode, errorMsg, 0, TQString(), true );
if ( mAskAgain )
if ( makeConnection() != ImapAccountBase::Error )
return;
@@ -593,7 +593,7 @@ namespace KMail {
if (aSlave != mSlave) return;
mSlaveConnected = true;
mNoopTimer.start( 60000 ); // make sure we start sending noops
- emit connectionResult( 0, TQString::null ); // success
+ emit connectionResult( 0, TQString() ); // success
if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) {
connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ),
@@ -643,7 +643,7 @@ namespace KMail {
jd.progressItem = ProgressManager::createProgressItem(
ProgressManager::getUniqueID(),
i18n("Retrieving Namespaces"),
- TQString::null, true, useSSL() || useTLS() );
+ TQString(), true, useSSL() || useTLS() );
jd.progressItem->setTotalItems( 1 );
connect ( jd.progressItem,
TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -737,7 +737,7 @@ namespace KMail {
"configuration of the account \"%1\" which is obsolete with the "
"support of IMAP namespaces.").arg( name() );
if ( list.tqcontains( "" ) ) {
- // tqreplace empty entry with the old prefix
+ // replace empty entry with the old prefix
list.remove( "" );
list += mOldPrefix;
mNamespaces[PersonalNS] = list;
@@ -746,11 +746,11 @@ namespace KMail {
mNamespaceToDelimiter.remove( "" );
mNamespaceToDelimiter[mOldPrefix] = delim;
}
- kdDebug(5006) << "migratePrefix - tqreplaced empty with " << mOldPrefix << endl;
+ kdDebug(5006) << "migratePrefix - replaced empty with " << mOldPrefix << endl;
msg += i18n("The configuration was automatically migrated but you should check "
"your account configuration.");
} else if ( list.count() == 1 ) {
- // only one entry in the personal namespace so tqreplace it
+ // only one entry in the personal namespace so replace it
TQString old = list.first();
list.clear();
list += mOldPrefix;
@@ -760,7 +760,7 @@ namespace KMail {
mNamespaceToDelimiter.remove( old );
mNamespaceToDelimiter[mOldPrefix] = delim;
}
- kdDebug(5006) << "migratePrefix - tqreplaced single with " << mOldPrefix << endl;
+ kdDebug(5006) << "migratePrefix - replaced single with " << mOldPrefix << endl;
msg += i18n("The configuration was automatically migrated but you should check "
"your account configuration.");
} else {
@@ -799,12 +799,12 @@ namespace KMail {
ns = ns.left( ns.length()-1 );
}
// first ignore an empty prefix as it would match always
- if ( !ns.isEmpty() && path.find( ns ) != -1 ) {
+ if ( !ns.isEmpty() && path.tqfind( ns ) != -1 ) {
return (*strit);
}
}
}
- return TQString::null;
+ return TQString();
}
//-----------------------------------------------------------------------------
@@ -820,7 +820,7 @@ namespace KMail {
// exclude empty namespace
for ( namespaceDelim::ConstIterator it = mNamespaceToDelimiter.begin();
it != mNamespaceToDelimiter.end(); ++it ) {
- // the namespace definition sometimes tqcontains the delimiter
+ // the namespace definition sometimes contains the delimiter
// make sure we also match this version
TQString stripped = it.key().left( it.key().length() - 1 );
if ( !it.key().isEmpty() &&
@@ -835,7 +835,7 @@ namespace KMail {
}
// well, we tried
//kdDebug(5006) << "delimiterForNamespace - not found" << endl;
- return TQString::null;
+ return TQString();
}
//-----------------------------------------------------------------------------
@@ -858,7 +858,7 @@ namespace KMail {
}
if (job->error()) {
if (!quiet)
- handleJobError(job, TQString::null );
+ handleJobError(job, TQString() );
else {
if ( job->error() == KIO::ERR_CONNECTION_BROKEN && slave() ) {
// make sure ERR_CONNECTION_BROKEN is properly handled and the slave
@@ -894,13 +894,13 @@ namespace KMail {
TQString ImapAccountBase::prettifyQuotaError( const TQString& _error, KIO::Job * job )
{
TQString error = _error;
- if ( error.find( "quota", 0, false ) == -1 ) return error;
+ if ( error.tqfind( "quota", 0, false ) == -1 ) return error;
// this is a quota error, prettify it a bit
JobIterator it = findJob( job );
TQString quotaAsString( i18n("No detailed quota information available.") );
bool readOnly = false;
if (it != mapJobData.end()) {
- const KMFolder * const folder = (*it).parent;
+ const KMFolder * const folder = (*it).tqparent;
if( !folder ) return _error;
const KMFolderCachedImap * const imap = dynamic_cast<const KMFolderCachedImap*>( folder->storage() );
if ( imap ) {
@@ -961,10 +961,10 @@ namespace KMail {
KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
// Show it in the status bar, in case the user has ticked "don't show again"
if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
- KPIM::BroadcasStatus::instance()->seStatusMsg(
+ KPIM::BroadcastqStatus::instance()->seStatusMsg(
i18n( "The connection to account %1 was broken." ).arg( name() ) );
else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
- KPIM::BroadcasStatus::instance()->seStatusMsg(
+ KPIM::BroadcastqStatus::instance()->seStatusMsg(
i18n( "The connection to account %1 timed out." ).arg( name() ) );
} else {
if ( !errors.isEmpty() )
@@ -1031,9 +1031,9 @@ namespace KMail {
mCheckingSingleFolder = ( type == Single );
if ( checkingMail() )
{
- disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckQueuedFolders() ) );
- connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckQueuedFolders() ) );
} else {
slotCheckQueuedFolders();
@@ -1043,7 +1043,7 @@ namespace KMail {
//-----------------------------------------------------------------------------
void ImapAccountBase::slotCheckQueuedFolders()
{
- disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckQueuedFolders() ) );
TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders;
@@ -1109,7 +1109,7 @@ namespace KMail {
// more than 50% of the parts have to be loaded anyway so it is faster
// to load the message completely
kdDebug(5006) << "Falling back to normal mode" << endl;
- FolderJob *job = msg->parent()->createJob(
+ FolderJob *job = msg->tqparent()->createJob(
msg, FolderJob::tGetMessage, 0, "TEXT" );
job->start();
return;
@@ -1123,14 +1123,14 @@ namespace KMail {
if ( part->loadHeaders() )
{
kdDebug(5006) << "load HEADER" << endl;
- FolderJob *job = msg->parent()->createJob(
+ FolderJob *job = msg->tqparent()->createJob(
msg, FolderJob::tGetMessage, 0, part->partSpecifier()+".MIME" );
job->start();
}
if ( part->loadPart() )
{
kdDebug(5006) << "load Part" << endl;
- FolderJob *job = msg->parent()->createJob(
+ FolderJob *job = msg->tqparent()->createJob(
msg, FolderJob::tGetMessage, 0, part->partSpecifier() );
job->start();
}
@@ -1138,26 +1138,26 @@ namespace KMail {
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
- DwBodyPart * parent, const DwMessage * dwmsg )
+ void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart,
+ DwBodyPart * tqparent, const DwMessage * dwmsg )
{
- int children;
+ int tqchildren;
for (int i = 0; i < count; i++)
{
- stream >> children;
+ stream >> tqchildren;
KMMessagePart* part = new KMMessagePart( stream );
- part->setParent( parentKMPart );
+ part->setParent( tqparentKMPart );
mBodyPartList.append( part );
kdDebug(5006) << "ImapAccountBase::constructParts - created id " << part->partSpecifier()
<< " of type " << part->originalContentTypeStr() << endl;
DwBodyPart *dwpart = mCurrentMsg->createDWBodyPart( part );
- if ( parent )
+ if ( tqparent )
{
- // add to parent body
- parent->Body().AddBodyPart( dwpart );
+ // add to tqparent body
+ tqparent->Body().AddBodyPart( dwpart );
dwpart->Parse();
-// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
+// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
// << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl;
} else if ( part->partSpecifier() != "0" &&
!part->partSpecifier().endsWith(".HEADER") )
@@ -1165,39 +1165,39 @@ namespace KMail {
// add to message
dwmsg->Body().AddBodyPart( dwpart );
dwpart->Parse();
-// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",parent " << parent
+// kdDebug(5006) << "constructed dwpart " << dwpart << ",dwmsg " << dwmsg << ",tqparent " << tqparent
// << ",dwparts msg " << dwpart->Body().Message() <<",id "<<dwpart->ObjectId() << endl;
} else
dwpart = 0;
- if ( !parentKMPart )
- parentKMPart = part;
+ if ( !tqparentKMPart )
+ tqparentKMPart = part;
- if (children > 0)
+ if (tqchildren > 0)
{
- DwBodyPart* newparent = dwpart;
+ DwBodyPart* newtqparent = dwpart;
const DwMessage* newmsg = dwmsg;
if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart &&
dwpart->Body().Message() )
{
// set the encapsulated message as the new message
- newparent = 0;
+ newtqparent = 0;
newmsg = dwpart->Body().Message();
}
KMMessagePart* newParentKMPart = part;
- if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent
- newParentKMPart = parentKMPart;
+ if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as tqparent
+ newParentKMPart = tqparentKMPart;
- constructParts( stream, children, newParentKMPart, newparent, newmsg );
+ constructParts( stream, tqchildren, newParentKMPart, newtqparent, newmsg );
}
}
}
//-----------------------------------------------------------------------------
- void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
+ void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
{
// set the status on the server, the uids are integrated in the path
- kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl;
+ kdDebug(5006) << "setImaptqStatus path=" << path << " to: " << flags << endl;
KURL url = getUrl();
url.setPath(path);
@@ -1218,7 +1218,7 @@ namespace KMail {
TQT_SLOT(slotSeStatusResult(KIO::Job *)));
}
- void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
+ void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen)
{
KURL url = getUrl();
url.setPath(path);
@@ -1246,16 +1246,16 @@ namespace KMail {
ImapAccountBase::JobIterator it = findJob(job);
if ( it == jobsEnd() ) return;
int errorCode = job->error();
- KMFolder * const parent = (*it).parent;
+ KMFolder * const tqparent = (*it).tqparent;
const TQString path = (*it).path;
if (errorCode && errorCode != KIO::ERR_CANNOT_OPEN_FOR_WRITING)
{
bool cont = handleJobError( job, i18n( "Error while uploading status of messages to server: " ) + '\n' );
- emit imapStatusChanged( parent, path, cont );
+ emit imapStatusChanged( tqparent, path, cont );
}
else
{
- emit imapStatusChanged( parent, path, true );
+ emit imapStatusChanged( tqparent, path, true );
removeJob(it);
}
}
@@ -1370,11 +1370,11 @@ namespace KMail {
}
//------------------------------------------------------------------------------
- TQString ImapAccountBase::createImapPath( const TQString& parent,
+ TQString ImapAccountBase::createImapPath( const TQString& tqparent,
const TQString& folderName )
{
- kdDebug(5006) << "createImapPath parent="<<parent<<", folderName="<<folderName<<endl;
- TQString newName = parent;
+ kdDebug(5006) << "createImapPath tqparent="<<tqparent<<", folderName="<<folderName<<endl;
+ TQString newName = tqparent;
// strip / at the end
if ( newName.endsWith("/") ) {
newName = newName.left( newName.length() - 1 );
@@ -1399,14 +1399,14 @@ namespace KMail {
}
//------------------------------------------------------------------------------
- TQString ImapAccountBase::createImapPath( FolderStorage* parent,
+ TQString ImapAccountBase::createImapPath( FolderStorage* tqparent,
const TQString& folderName )
{
TQString path;
- if ( parent->folderType() == KMFolderTypeImap ) {
- path = static_cast<KMFolderImap*>( parent )->imapPath();
- } else if ( parent->folderType() == KMFolderTypeCachedImap ) {
- path = static_cast<KMFolderCachedImap*>( parent )->imapPath();
+ if ( tqparent->folderType() == KMFolderTypeImap ) {
+ path = static_cast<KMFolderImap*>( tqparent )->imapPath();
+ } else if ( tqparent->folderType() == KMFolderTypeCachedImap ) {
+ path = static_cast<KMFolderCachedImap*>( tqparent )->imapPath();
} else {
// error
return path;
@@ -1418,7 +1418,7 @@ namespace KMail {
bool ImapAccountBase::locallySubscribedTo( const TQString& imapPath )
{
- return mLocalSubscriptionBlackList.find( imapPath ) == mLocalSubscriptionBlackList.end();
+ return mLocalSubscriptionBlackList.tqfind( imapPath ) == mLocalSubscriptionBlackList.end();
}
void ImapAccountBase::changeLocalSubscription( const TQString& imapPath, bool subscribe )
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 0795eb2a..eee46417 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -58,8 +58,9 @@ namespace KMail {
class ImapAccountBase : public KMail::NetworkAccount {
Q_OBJECT
+ TQ_OBJECT
protected:
- ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
+ ImapAccountBase( AccountManager * tqparent, const TQString & name, uint id );
public:
virtual ~ImapAccountBase();
@@ -141,13 +142,13 @@ namespace KMail {
struct jobData
{
// Needed by TQMap, don't use
- jobData() : url(TQString::null), parent(0), current(0), total(1), done(0), offset(0), progressItem(0),
+ jobData() : url(TQString()), tqparent(0), current(0), total(1), done(0), offset(0), progressItem(0),
onlySubscribed(false), quiet(false), cancellable(false) {}
// Real constructor
- jobData( const TQString& _url, KMFolder *_parent = 0,
+ jobData( const TQString& _url, KMFolder *_tqparent = 0,
int _total = 1, int _done = 0, bool _quiet = false,
bool _cancelable = false )
- : url(_url), parent(_parent), current(0), total(_total), done(_done), offset(0),
+ : url(_url), tqparent(_tqparent), current(0), total(_total), done(_done), offset(0),
progressItem(0), quiet(_quiet), cancellable(_cancelable) {}
TQString path;
@@ -156,7 +157,7 @@ namespace KMail {
TQByteArray data;
TQCString cdata;
TQStringList items;
- KMFolder *parent, *current;
+ KMFolder *tqparent, *current;
TQPtrList<KMMessage> msgList;
int total, done, offset;
KPIM::ProgressItem *progressItem;
@@ -173,7 +174,7 @@ namespace KMail {
/**
* Look for the jobData related to a given job. Compare with end()
*/
- JobIterator findJob( KIO::Job* job ) { return mapJobData.find( job ); }
+ JobIterator findJob( KIO::Job* job ) { return mapJobData.tqfind( job ); }
JobIterator jobsEnd() { return mapJobData.end(); }
/**
* Call this when a job is finished.
@@ -230,13 +231,13 @@ namespace KMail {
* Set the status on the server
* Emits imapStatusChanged signal on success/error.
*/
- void setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags );
+ void setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags );
/**
* Set seen status on the server.
* Emits imapStatusChanged signal on success/error.
*/
- void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
+ void setImapSeentqStatus( KMFolder* folder, const TQString& path, bool seen );
/**
* The KIO-Slave died
@@ -400,16 +401,16 @@ namespace KMail {
return mCapabilities.tqcontains( capa ); }
/**
- * Create an IMAP path for a parent folder and a foldername
+ * Create an IMAP path for a tqparent folder and a foldername
* Parent and folder are separated with the delimiter of the account
* The path starts and ends with '/'
*/
- TQString createImapPath( FolderStorage* parent, const TQString& folderName );
+ TQString createImapPath( FolderStorage* tqparent, const TQString& folderName );
/**
- * Create an IMAP path for a parent imapPath and a folderName
+ * Create an IMAP path for a tqparent imapPath and a folderName
*/
- TQString createImapPath( const TQString& parent, const TQString& folderName );
+ TQString createImapPath( const TQString& tqparent, const TQString& folderName );
public slots:
@@ -509,8 +510,8 @@ namespace KMail {
/**
* Build KMMessageParts and DwBodyParts from the bodystructure-stream
*/
- void constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
- DwBodyPart * parent, const DwMessage * dwmsg );
+ void constructParts( TQDataStream & stream, int count, KMMessagePart* tqparentKMPart,
+ DwBodyPart * tqparent, const DwMessage * dwmsg );
/** Migrate the prefix */
void migratePrefix();
@@ -590,13 +591,13 @@ namespace KMail {
/**
* Emitted when changeSubscription() failed.
- * @param errorMessage the error message that tqcontains the reason for the failure
+ * @param errorMessage the error message that contains the reason for the failure
*/
void subscriptionChangeFailed( const TQString &errorMessage );
/**
* Emitted upon completion of the job for setting the status for a group of UIDs,
- * as a result of a setImapStatus call.
+ * as a result of a setImaptqStatus call.
* On error, if the user chooses abort (not continue), cont is set to false.
*/
void imapStatusChanged( KMFolder*, const TQString& imapPath, bool cont );
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index b76c6d2c..fe773a9d 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -86,11 +86,11 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
if (folder) {
folder->open("imapjobdest");
}
- KMFolder *msg_parent = msg->parent();
- if (msg_parent) {
- msg_parent->open("imapjobsrc");
+ KMFolder *msg_tqparent = msg->tqparent();
+ if (msg_tqparent) {
+ msg_tqparent->open("imapjobsrc");
}
- mSrcFolder = msg_parent;
+ mSrcFolder = msg_tqparent;
// If there is a destination folder, this is a copy, move or put to an
// imap folder, use its account for keeping track of the job. Otherwise,
// this is a get job and the src folder is an imap one. Use its account
@@ -99,8 +99,8 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
if (folder) {
account = folder->account();
} else {
- if ( msg_parent && msg_parent->storage() )
- account = static_cast<KMFolderImap*>(msg_parent->storage())->account();
+ if ( msg_tqparent && msg_tqparent->storage() )
+ account = static_cast<KMFolderImap*>(msg_tqparent->storage())->account();
}
if ( !account ||
account->makeConnection() == ImapAccountBase::Error ) {
@@ -118,21 +118,21 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
++it;
if ( mSrcFolder && !curMsg->isMessage() )
{
- int idx = mSrcFolder->find( curMsg );
+ int idx = mSrcFolder->tqfind( curMsg );
curMsg = mSrcFolder->getMsg( idx );
}
KURL url = account->getUrl();
TQString flags = KMFolderImap::statusToFlags( curMsg->status(), folder->permanentFlags() );
url.setPath( folder->imapPath() + ";SECTION=" + flags );
ImapAccountBase::jobData jd;
- jd.parent = 0; jd.offset = 0; jd.done = 0;
+ jd.tqparent = 0; jd.offset = 0; jd.done = 0;
jd.total = ( curMsg->msgSizeServer() > 0 ) ?
curMsg->msgSizeServer() : curMsg->msgSize();
jd.msgList.append( curMsg );
TQCString cstr( curMsg->asString() );
- int a = cstr.find("\nX-UID: ");
- int b = cstr.find('\n', a);
- if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
+ int a = cstr.tqfind("\nX-UID: ");
+ int b = cstr.tqfind('\n', a);
+ if (a != -1 && b != -1 && cstr.tqfind("\n\n") > a) cstr.remove(a, b-a);
jd.data.resize( cstr.length() + cstr.tqcontains( "\n" ) - cstr.tqcontains( "\r\n" ) );
unsigned int i = 0;
char prevChar = '\0';
@@ -175,10 +175,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
KURL url = account->getUrl();
KURL destUrl = account->getUrl();
destUrl.setPath(folder->imapPath());
- KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_parent->storage());
+ KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(msg_tqparent->storage());
url.setPath( imapDestFolder->imapPath() + ";UID=" + sets );
ImapAccountBase::jobData jd;
- jd.parent = 0; jd.offset = 0;
+ jd.tqparent = 0; jd.offset = 0;
jd.total = 1; jd.done = 0;
jd.msgList = msgList;
@@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
"ImapJobCopyMove"+ProgressManager::getUniqueID(),
i18n("Server operation"),
i18n("Source folder: %1 - Destination folder: %2")
- .arg( TQStyleSheet::escape( msg_parent->prettyURL() ),
+ .arg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
true,
account->useSSL() || account->useTLS() );
@@ -285,12 +285,12 @@ void ImapJob::slotGetNextMessage()
KURL url = account->getUrl();
TQString path = msgParent->imapPath() + ";UID=" + TQString::number(msg->UID());
ImapAccountBase::jobData jd;
- jd.parent = 0; jd.offset = 0;
+ jd.tqparent = 0; jd.offset = 0;
jd.total = 1; jd.done = 0;
jd.msgList.append( msg );
if ( !mPartSpecifier.isEmpty() )
{
- if ( mPartSpecifier.find ("STRUCTURE", 0, false) != -1 ) {
+ if ( mPartSpecifier.tqfind ("STRUCTURE", 0, false) != -1 ) {
path += ";SECTION=STRUCTURE";
} else if ( mPartSpecifier == "HEADER" ) {
path += ";SECTION=HEADER";
@@ -325,7 +325,7 @@ void ImapJob::slotGetNextMessage()
KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob );
mJob = simpleJob;
account->insertJob( mJob, jd );
- if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 )
+ if ( mPartSpecifier.tqfind( "STRUCTURE", 0, false ) != -1 )
{
connect( mJob, TQT_SIGNAL(result(KIO::Job *)),
this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) );
@@ -347,15 +347,15 @@ void ImapJob::slotGetNextMessage()
void ImapJob::slotGetMessageResult( KIO::Job * job )
{
KMMessage *msg = mMsgList.first();
- if (!msg || !msg->parent() || !job) {
+ if (!msg || !msg->tqparent() || !job) {
emit messageRetrieved( 0 );
deleteLater();
return;
}
- KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
+ KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
if (msg->transferInProgress())
msg->setTransferInProgress( false );
- KMAcctImap *account = parent->account();
+ KMAcctImap *account = tqparent->account();
if ( !account ) {
emit messageRetrieved( 0 );
deleteLater();
@@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
{
TQString errorStr = i18n( "Error while retrieving messages from the server." );
if ( (*it).progressItem )
- (*it).progressItem->seStatus( errorStr );
+ (*it).progressItem->setqStatus( errorStr );
account->handleJobError( job, errorStr );
return;
} else {
@@ -397,10 +397,10 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
// During the construction of the message from the byteArray it does
// not have a uid. Therefore we have to make sure that no connected
// slots are called, since they would operate on uid == 0.
- msg->parent()->storage()->blockSignals( true );
+ msg->tqparent()->storage()->blockSignals( true );
msg->fromByteArray( (*it).data );
// now let others react
- msg->parent()->storage()->blockSignals( false );
+ msg->tqparent()->storage()->blockSignals( false );
if ( size > 0 && msg->msgSizeServer() == 0 ) {
msg->setMsgSizeServer(size);
}
@@ -447,9 +447,9 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
/* we got an answer but not data
* this means that the msg is not on the server anymore so delete it */
emit messageRetrieved( 0 );
- parent->ignoreJobsForMessage( msg );
- int idx = parent->find( msg );
- if (idx != -1) parent->removeMsg( idx, true );
+ tqparent->ignoreJobsForMessage( msg );
+ int idx = tqparent->tqfind( msg );
+ if (idx != -1) tqparent->removeMsg( idx, true );
// the removeMsg will unGet the message, which will delete all
// jobs, including this one
return;
@@ -464,14 +464,14 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
void ImapJob::slotGetBodyStructureResult( KIO::Job * job )
{
KMMessage *msg = mMsgList.first();
- if (!msg || !msg->parent() || !job) {
+ if (!msg || !msg->tqparent() || !job) {
deleteLater();
return;
}
- KMFolderImap* parent = static_cast<KMFolderImap*>(msg->storage());
+ KMFolderImap* tqparent = static_cast<KMFolderImap*>(msg->storage());
if (msg->transferInProgress())
msg->setTransferInProgress( false );
- KMAcctImap *account = parent->account();
+ KMAcctImap *account = tqparent->account();
if ( !account ) {
deleteLater();
return;
@@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
if (job->error())
{
if ( (*it).progressItem )
- (*it).progressItem->seStatus( i18n("Uploading message data failed.") );
+ (*it).progressItem->setqStatus( i18n("Uploading message data failed.") );
account->handlePutError( job, *it, mDestFolder );
return;
} else {
if ( (*it).progressItem )
- (*it).progressItem->seStatus( i18n("Uploading message data completed.") );
+ (*it).progressItem->setqStatus( i18n("Uploading message data completed.") );
if ( mParentProgressItem )
{
mParentProgressItem->incCompletedItems();
@@ -583,7 +583,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
ImapAccountBase::JobIterator it = account->findJob( job );
if ( it == account->jobsEnd() ) return;
- if (data.find("UID") != -1)
+ if (data.tqfind("UID") != -1)
{
// split
TQString oldUid = data.section(' ', 1, 1);
@@ -622,7 +622,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data)
ImapAccountBase::JobIterator it = account->findJob( job );
if ( it == account->jobsEnd() ) return;
- if ( data.find("UID") != -1 )
+ if ( data.tqfind("UID") != -1 )
{
ulong uid = ( data.right(data.length()-4) ).toInt();
if ( !(*it).msgList.isEmpty() )
@@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job )
mErrorCode = job->error();
TQString errStr = i18n("Error while copying messages.");
if ( (*it).progressItem )
- (*it).progressItem->seStatus( errStr );
+ (*it).progressItem->setqStatus( errStr );
if ( account->handleJobError( job, errStr ) )
deleteLater();
return;
@@ -678,9 +678,9 @@ void ImapJob::execute()
}
//-----------------------------------------------------------------------------
-void ImapJob::setParentFolder( const KMFolderImap* parent )
+void ImapJob::setParentFolder( const KMFolderImap* tqparent )
{
- mParentFolder = const_cast<KMFolderImap*>( parent );
+ mParentFolder = const_cast<KMFolderImap*>( tqparent );
}
//-----------------------------------------------------------------------------
@@ -690,13 +690,13 @@ void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed)
if (!msg || !job) {
return;
}
- KMFolderImap* parent = 0;
- if ( msg->parent() && msg->parent()->folderType() == KMFolderTypeImap )
- parent = static_cast<KMFolderImap*>(msg->parent()->storage());
+ KMFolderImap* tqparent = 0;
+ if ( msg->tqparent() && msg->tqparent()->folderType() == KMFolderTypeImap )
+ tqparent = static_cast<KMFolderImap*>(msg->tqparent()->storage());
else if (mDestFolder) // put
- parent = static_cast<KMFolderImap*>(mDestFolder->storage());
- if (!parent) return;
- KMAcctImap *account = parent->account();
+ tqparent = static_cast<KMFolderImap*>(mDestFolder->storage());
+ if (!tqparent) return;
+ KMAcctImap *account = tqparent->account();
if ( !account ) return;
ImapAccountBase::JobIterator it = account->findJob( job );
if ( it == account->jobsEnd() ) return;
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 94be48d1..55aa02dd 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -54,17 +54,18 @@ class AttachmentStrategy;
class ImapJob : public FolderJob
{
Q_OBJECT
+ TQ_OBJECT
friend class ::KMAcctImap;
public:
ImapJob( KMMessage *msg, JobType jt = tGetMessage, KMFolderImap *folder = 0,
- TQString partSpecifier = TQString::null, const AttachmentStrategy *as = 0 );
+ TQString partSpecifier = TQString(), const AttachmentStrategy *as = 0 );
ImapJob( TQPtrList<KMMessage>& msgList, TQString sets,
JobType jt = tGetMessage, KMFolderImap *folder = 0 );
virtual ~ImapJob();
- void setParentFolder( const KMFolderImap* parent );
- KPIM::ProgressItem* parentProgressItem() const { return mParentProgressItem; }
+ void setParentFolder( const KMFolderImap* tqparent );
+ KPIM::ProgressItem* tqparentProgressItem() const { return mParentProgressItem; }
void setParentProgressItem( KPIM::ProgressItem *p ) { mParentProgressItem = p; }
private slots:
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index b446ba0b..e820f113 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -32,11 +32,11 @@
using namespace KMail;
-ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags )
- : KDialogBase( parent, "import_archive_dialog", false, i18n( "Import Archive" ),
+ImportArchiveDialog::ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags )
+ : KDialogBase( tqparent, "import_archive_dialog", false, i18n( "Import Archive" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true ),
- mParentWidget( parent )
+ mParentWidget( tqparent )
{
setWFlags( flags );
TQWidget *mainWidget = new TQWidget( this );
@@ -48,7 +48,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla
int row = 0;
// TODO: Explaination label
- // TODO: Use QFormLayout in KDE4
+ // TODO: Use TQFormLayout in KDE4
// TODO: better label for "Ok" button
TQLabel *folderLabel = new TQLabel( i18n( "&Folder:" ), mainWidget );
diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h
index 0b04d9b8..f8c15bab 100644
--- a/kmail/importarchivedialog.h
+++ b/kmail/importarchivedialog.h
@@ -32,10 +32,11 @@ class FolderRequester;
class ImportArchiveDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags flags );
+ ImportArchiveDialog( TQWidget *tqparent, TQt::WidgetFlags flags );
void setFolder( KMFolder *defaultFolder );
protected slots:
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index cddf6a65..f7c44d19 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -106,12 +106,12 @@ void KMail::ImportJob::abort( const TQString &errorMessage )
deleteLater();
}
-KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions )
+KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions )
{
- KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(),
+ KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(),
KMFolderTypeMaildir );
if ( !newFolder ) {
- abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) );
+ abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparent->name() ) );
return 0;
}
else {
@@ -131,7 +131,7 @@ void KMail::ImportJob::enqueueMessages( const KArchiveDirectory *dir, KMFolder *
const KArchiveDirectory *messageDir = dynamic_cast<const KArchiveDirectory*>( dir->entry( "cur" ) );
if ( messageDir ) {
Messages messagesToQueue;
- messagesToQueue.parent = folder;
+ messagesToQueue.tqparent = folder;
const TQStringList entries = messageDir->entries();
for ( uint i = 0; i < entries.size(); i++ ) {
const KArchiveEntry *entry = messageDir->entry( entries[i] );
@@ -199,7 +199,7 @@ void KMail::ImportJob::importNextMessage()
return;
}
- KMFolder *folder = messages.parent;
+ KMFolder *folder = messages.tqparent;
if ( folder != mCurrentFolder ) {
kdDebug(5006) << "importNextMessage(): Processed all messages in the current folder of the queue." << endl;
if ( mCurrentFolder ) {
@@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage()
return;
}
kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
- mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
+ mProgressItem->setqStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
}
mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage()
messages.files.removeFirst();
mCurrentMessage = new KMMessage();
- mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ );
+ mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setqStatus */ );
int retIndex;
// If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is
@@ -273,26 +273,26 @@ static TQString folderNameForDirectoryName( const TQString &dirName )
Q_ASSERT( dirName.startsWith( "." ) );
const TQString end = ".directory";
const int expectedIndex = dirName.length() - end.length();
- if ( dirName.lower().find( end ) != expectedIndex )
+ if ( dirName.lower().tqfind( end ) != expectedIndex )
return TQString();
TQString returnName = dirName.left( dirName.length() - end.length() );
returnName = returnName.right( returnName.length() - 1 );
return returnName;
}
-KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName,
+KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName,
mode_t subFolderPermissions )
{
- if ( !parentFolder->createChildFolder() ) {
- abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) );
+ if ( !tqparentFolder->createChildFolder() ) {
+ abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparentFolder->name() ) );
return 0;
}
KMFolder *subFolder = 0;
- subFolder = dynamic_cast<KMFolder*>( parentFolder->child()->hasNamedFolder( subFolderName ) );
+ subFolder = dynamic_cast<KMFolder*>( tqparentFolder->child()->hasNamedFolder( subFolderName ) );
if ( !subFolder ) {
- subFolder = createSubFolder( parentFolder, subFolderName, subFolderPermissions );
+ subFolder = createSubFolder( tqparentFolder, subFolderName, subFolderPermissions );
}
return subFolder;
}
@@ -308,7 +308,7 @@ void KMail::ImportJob::importNextDirectory()
}
Folder folder = mQueuedDirectories.first();
- KMFolder *currentFolder = folder.parent;
+ KMFolder *currentFolder = folder.tqparent;
mQueuedDirectories.pop_front();
kdDebug(5006) << "importNextDirectory(): Working on directory " << folder.archiveDir->name() << endl;
@@ -343,7 +343,7 @@ void KMail::ImportJob::importNextDirectory()
Folder newFolder;
newFolder.archiveDir = dir;
- newFolder.parent = subFolder;
+ newFolder.tqparent = subFolder;
kdDebug(5006) << "Enqueueing directory " << entry->name() << endl;
mQueuedDirectories.push_back( newFolder );
}
@@ -388,7 +388,7 @@ void KMail::ImportJob::start()
Folder nextFolder;
nextFolder.archiveDir = mArchive->directory();
- nextFolder.parent = mRootFolder;
+ nextFolder.tqparent = mRootFolder;
mQueuedDirectories.push_back( nextFolder );
importNextDirectory();
}
diff --git a/kmail/importjob.h b/kmail/importjob.h
index 17044141..ddb00911 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -52,6 +52,7 @@ namespace KMail
class ImportJob : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -71,13 +72,13 @@ class ImportJob : public TQObject
struct Folder
{
- KMFolder *parent;
+ KMFolder *tqparent;
const KArchiveDirectory *archiveDir;
};
struct Messages
{
- KMFolder *parent;
+ KMFolder *tqparent;
TQPtrList<KArchiveFile> files;
};
@@ -85,8 +86,8 @@ class ImportJob : public TQObject
void abort( const TQString &errorMessage );
void queueFolders();
void importNextDirectory();
- KMFolder* createSubFolder( KMFolder *parent, const TQString &folderName, mode_t permissions );
- KMFolder* getOrCreateSubFolder( KMFolder *parentFolder, const TQString &subFolderName,
+ KMFolder* createSubFolder( KMFolder *tqparent, const TQString &folderName, mode_t permissions );
+ KMFolder* getOrCreateSubFolder( KMFolder *tqparentFolder, const TQString &subFolderName,
mode_t subFolderPermissions );
void enqueueMessages( const KArchiveDirectory *dir, KMFolder *folder );
void messageAdded();
@@ -101,11 +102,11 @@ class ImportJob : public TQObject
KURL mArchiveFile;
int mNumberOfImportedMessages;
- // List of archive folders with their corresponding KMail parent folder that are awaiting
+ // List of archive folders with their corresponding KMail tqparent folder that are awaiting
// processing
TQValueList<Folder> mQueuedDirectories;
- // List of list of messages and their parent folders which are awaiting processing
+ // List of list of messages and their tqparent folders which are awaiting processing
TQValueList<Messages> mQueuedMessages;
// The folder to which we are currently importing messages
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 632315a5..f824880f 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -60,14 +60,14 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled";
#ifdef HAVE_INDEXLIB
static
-TQValueList<int> vectorToQValueList( const std::vector<TQ_UINT32>& input ) {
+TQValueList<int> vectorToTQValueList( const std::vector<TQ_UINT32>& input ) {
TQValueList<int> res;
std::copy( input.begin(), input.end(), std::back_inserter( res ) );
return res;
}
static
-std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
+std::vector<TQ_UINT32> TQValueListToVector( const TQValueList<int>& input ) {
std::vector<TQ_UINT32> res;
// res.assign( input.begin(), input.end() ) doesn't work for some reason
for ( TQValueList<int>::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) {
@@ -77,8 +77,8 @@ std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
}
#endif
-KMMsgIndex::KMMsgIndex( TQObject* parent ):
- TQObject( parent, "index" ),
+KMMsgIndex::KMMsgIndex( TQObject* tqparent ):
+ TQObject( tqparent, "index" ),
mState( s_idle ),
#ifdef HAVE_INDEXLIB
mLockFile( std::string( static_cast<const char*>( TQFile::encodeName( defaultPath() ) + "/lock" ) ) ),
@@ -123,8 +123,8 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) );
mState = s_creating;
} else {
- mPendingMsgs = QValueListToVector( cfg.readIntListEntry( "pending" ) );
- mRemovedMsgs = QValueListToVector( cfg.readIntListEntry( "removed" ) );
+ mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) );
+ mRemovedMsgs = TQValueListToVector( cfg.readIntListEntry( "removed" ) );
}
}
mIndex = 0;
@@ -143,17 +143,17 @@ KMMsgIndex::~KMMsgIndex() {
TQValueList<int> pendingMsg;
if ( mState == s_processing ) {
Q_ASSERT( mAddedMsgs.empty() );
- pendingMsg = vectorToQValueList( mPendingMsgs );
+ pendingMsg = vectorToTQValueList( mPendingMsgs );
}
cfg.writeEntry( "pending", pendingMsg );
- cfg.writeEntry( "removed", vectorToQValueList( mRemovedMsgs ) );
+ cfg.writeEntry( "removed", vectorToTQValueList( mRemovedMsgs ) );
delete mIndex;
#endif
}
bool KMMsgIndex::isIndexable( KMFolder* folder ) const {
- if ( !folder || !folder->parent() ) return false;
- const KMFolderMgr* manager = folder->parent()->manager();
+ if ( !folder || !folder->tqparent() ) return false;
+ const KMFolderMgr* manager = folder->tqparent()->manager();
return manager == kmkernel->folderMgr() || manager == kmkernel->dimapFolderMgr();
}
@@ -219,9 +219,9 @@ void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
// create() will notice that folder is disabled
break;
case s_creating:
- if ( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
+ if ( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
// easy:
- mPendingFolders.erase( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
+ mPendingFolders.erase( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
break;
}
//else fall-through
@@ -433,7 +433,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
//}
void KMMsgIndex::removeSearch( TQObject* destroyed ) {
- mSearches.erase( std::find( mSearches.begin(), mSearches.end(), destroyed ) );
+ mSearches.erase( std::tqfind( mSearches.begin(), mSearches.end(), destroyed ) );
}
diff --git a/kmail/index.h b/kmail/index.h
index 5e7f16dc..f24dc47b 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -20,11 +20,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -51,8 +51,9 @@ class KMSearchPattern;
class KMMsgIndex : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- explicit KMMsgIndex( TQObject* parent );
+ explicit KMMsgIndex( TQObject* tqparent );
~KMMsgIndex();
public:
@@ -194,6 +195,7 @@ class KMMsgIndex : public TQObject {
class KMMsgIndex::Search : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
explicit Search( KMSearch* s );
~Search();
diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h
index 8d3e1bbc..251d61af 100644
--- a/kmail/interfaces/bodypart.h
+++ b/kmail/interfaces/bodypart.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -84,7 +84,7 @@ namespace KMail {
/**
@return the decoded (CTE, canonicalisation, and charset
encoding undone) text contained in the body part, or
- TQString::null, it the body part is not of type "text".
+ TQString(), it the body part is not of type "text".
*/
virtual TQString asText() const = 0;
@@ -96,7 +96,7 @@ namespace KMail {
/**
@return the value of the content-type header field parameter
- with name \a parameter, or TQString::null, if that that
+ with name \a parameter, or TQString(), if that that
parameter is not present in the body's content-type header
field. RFC 2231 encoding is removed first.
@@ -114,7 +114,7 @@ namespace KMail {
/**
@return the content of the content-description header field,
- or TQString::null if that header is not present in this body
+ or TQString() if that header is not present in this body
part. RFC 2047 encoding is decoded first.
*/
virtual TQString contentDescription() const = 0;
@@ -122,7 +122,7 @@ namespace KMail {
//virtual int contentDisposition() const = 0;
/**
@return the value of the content-disposition header field
- parameter with name \a parameter, or TQString::null if that
+ parameter with name \a parameter, or TQString() if that
parameter is not present in the body's content-disposition
header field. RFC 2231 encoding is removed first.
diff --git a/kmail/interfaces/bodypartformatter.h b/kmail/interfaces/bodypartformatter.h
index 9bc947f5..14fedc61 100644
--- a/kmail/interfaces/bodypartformatter.h
+++ b/kmail/interfaces/bodypartformatter.h
@@ -21,11 +21,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/interfaces/bodyparturlhandler.h b/kmail/interfaces/bodyparturlhandler.h
index be34e74a..01f64adb 100644
--- a/kmail/interfaces/bodyparturlhandler.h
+++ b/kmail/interfaces/bodyparturlhandler.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -81,7 +81,7 @@ namespace KMail {
/** Called when RMB-clicking on a link in the reader. Should
show a context menu at the specified point with the
- specified widget as parent.
+ specified widget as tqparent.
@return true if the right-click was handled by this handler,
false otherwise.
@@ -91,7 +91,7 @@ namespace KMail {
/** Called when hovering over a link.
@return a string to be shown in the status bar while
- hovering over this link or TQString::null if the link was not
+ hovering over this link or TQString() if the link was not
handled by this handler.
*/
virtual TQString statusBarMessage( BodyPart * part, const TQString & path ) const = 0;
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index 96383535..93235016 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/interfaces/observable.h b/kmail/interfaces/observable.h
index 184ee318..10d14dfa 100644
--- a/kmail/interfaces/observable.h
+++ b/kmail/interfaces/observable.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/interfaces/observer.h b/kmail/interfaces/observer.h
index 5f1d9b88..31cbc80a 100644
--- a/kmail/interfaces/observer.h
+++ b/kmail/interfaces/observer.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/interfaces/rulewidgethandler.h b/kmail/interfaces/rulewidgethandler.h
index 4d3eca8b..33095223 100644
--- a/kmail/interfaces/rulewidgethandler.h
+++ b/kmail/interfaces/rulewidgethandler.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
diff --git a/kmail/interfaces/urlhandler.h b/kmail/interfaces/urlhandler.h
index 38ada083..702efa41 100644
--- a/kmail/interfaces/urlhandler.h
+++ b/kmail/interfaces/urlhandler.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -94,7 +94,7 @@ namespace KMail {
/** Called when RMB-clicking on a link in the reader. Should show
a context menu at the specified point with the specified
- widget as parent.
+ widget as tqparent.
@return true if the right-click was handled by this
URLHandler, false otherwise.
diff --git a/kmail/isubject.h b/kmail/isubject.h
index 93a84a29..8bad40c4 100644
--- a/kmail/isubject.h
+++ b/kmail/isubject.h
@@ -18,11 +18,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp
index 89cabec9..caf4759f 100644
--- a/kmail/jobscheduler.cpp
+++ b/kmail/jobscheduler.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -34,8 +34,8 @@
using namespace KMail;
-JobScheduler::JobScheduler( TQObject* parent, const char* name )
- : TQObject( parent, name ), mTimer( this, "mTimer" ),
+JobScheduler::JobScheduler( TQObject* tqparent, const char* name )
+ : TQObject( tqparent, name ), mTimer( this, "mTimer" ),
mPendingImmediateTasks( 0 ),
mCurrentTask( 0 ), mCurrentJob( 0 )
{
@@ -109,7 +109,7 @@ void JobScheduler::notifyOpeningFolder( KMFolder* folder )
} else {
// Jobs scheduled from here should always be cancellable.
// One exception though, is when ExpireJob does its final KMMoveCommand.
- // Then that command shouldn't kill its own parent job just because it opens a folder...
+ // Then that command shouldn't kill its own tqparent job just because it opens a folder...
if ( mCurrentJob->isCancellable() )
interruptCurrentTask();
}
diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h
index 2dd04d4a..c35121dd 100644
--- a/kmail/jobscheduler.h
+++ b/kmail/jobscheduler.h
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -93,11 +93,12 @@ private:
* using too much CPU for too long. Tasks for opened folders are not executed until
* the folder is closed.
*/
-class JobScheduler : public QObject
+class JobScheduler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- JobScheduler( TQObject* parent, const char* name = 0 );
+ JobScheduler( TQObject* tqparent, const char* name = 0 );
~JobScheduler();
/// Register a task to be done for a given folder
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 3ba43637..6cb28374 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -31,55 +31,55 @@
//----------------------------
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_misc( TQWidget *tqparent, const char * )
{
- MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" );
+ MiscPage *page = new MiscPage( tqparent, "kcmkmail_config_misc" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_appearance( TQWidget *tqparent, const char * )
{
AppearancePage *page =
- new AppearancePage( parent, "kcmkmail_config_appearance" );
+ new AppearancePage( tqparent, "kcmkmail_config_appearance" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_composer( TQWidget *tqparent, const char * )
{
- ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" );
+ ComposerPage *page = new ComposerPage( tqparent, "kcmkmail_config_composer" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_identity( TQWidget *tqparent, const char * )
{
- IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" );
+ IdentityPage *page = new IdentityPage( tqparent, "kcmkmail_config_identity" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_accounts( TQWidget *tqparent, const char * )
{
- AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" );
+ AccountsPage *page = new AccountsPage( tqparent, "kcmkmail_config_accounts" );
return page;
}
}
extern "C"
{
- KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmail_config_security( TQWidget *tqparent, const char * )
{
- SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" );
+ SecurityPage *page = new SecurityPage( tqparent, "kcmkmail_config_security" );
return page;
}
}
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index a93e92af..3f6526d7 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -10,11 +10,11 @@
* As soon as it gets out of scope, it will restore the original
* cursor.
*/
-class KCursorSaver : public Qt
+class KCursorSaver : public TQt
{
public:
/// constructor taking TQCursor tqshapes
- KCursorSaver(Qt::tqCursorShape tqshape) {
+ KCursorSaver(TQt::tqCursorShape tqshape) {
TQApplication::setOverrideCursor( TQCursor(tqshape) );
inited = true;
}
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 94edd591..bd4d4a51 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -24,11 +24,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -555,7 +555,7 @@ namespace {
static TQString canonicalAddress( const TQString & _address ) {
const TQString address = KPIM::getEmailAddress( _address );
- if ( address.find('@') == -1 ) {
+ if ( address.tqfind('@') == -1 ) {
// local address
//char hostname[1024];
//gethostname(hostname,1024);
@@ -1370,7 +1370,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
dump();
for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
- d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
+ d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
if ( pos == d->mFormatInfoMap.end() )
continue;
std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1394,7 +1394,7 @@ void Kleo::KeyResolver::addToAllSplitInfos( const std::vector<GpgME::Key> & keys
if ( !( f & concreteCryptoMessageFormats[i] ) )
continue;
std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
- d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
+ d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
if ( pos == d->mFormatInfoMap.end() )
continue;
std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1560,14 +1560,14 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() {
std::vector<Kleo::KeyResolver::SplitInfo> Kleo::KeyResolver::encryptionItems( Kleo::CryptoMessageFormat f ) const {
dump();
std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
- d->mFormatInfoMap.find( f );
+ d->mFormatInfoMap.tqfind( f );
return it != d->mFormatInfoMap.end() ? it->second.splitInfos : std::vector<SplitInfo>() ;
}
std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) const {
dump();
std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
- d->mFormatInfoMap.find( f );
+ d->mFormatInfoMap.tqfind( f );
return it != d->mFormatInfoMap.end() ? it->second.signKeys : std::vector<GpgME::Key>() ;
}
@@ -1579,8 +1579,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f )
std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector<GpgME::Key> & selectedKeys ) const {
- const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats );
- const bool x509 = tqcontainsSMIME( mCryptoMessageFormats );
+ const bool opgp = containsOpenPGP( mCryptoMessageFormats );
+ const bool x509 = containsSMIME( mCryptoMessageFormats );
Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
msg, KPIM::getEmailAddress(person), selectedKeys,
@@ -1765,12 +1765,12 @@ void Kleo::KeyResolver::addKeys( const std::vector<Item> & items ) {
Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences( const TQString& address ) const
{
const Private::ContactPreferencesMap::iterator it =
- d->mContactPreferencesMap.find( address );
+ d->mContactPreferencesMap.tqfind( address );
if ( it != d->mContactPreferencesMap.end() )
return it->second;
KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
- const KABC::Addressee::List res = ab->tqfindByEmail( address );
+ const KABC::Addressee::List res = ab->findByEmail( address );
ContactPreferences pref;
if ( !res.isEmpty() ) {
KABC::Addressee addr = res.first();
@@ -1792,12 +1792,12 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
{
d->mContactPreferencesMap.insert( std::make_pair( email, pref ) );
KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
- KABC::Addressee::List res = ab->tqfindByEmail( email );
+ KABC::Addressee::List res = ab->findByEmail( email );
KABC::Addressee addr;
if ( res.isEmpty() ) {
bool ok = true;
- TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString::null, &ok );
+ TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
if ( ok ) {
addr.setNameFromString( fullName );
addr.insertEmail( email, true );
diff --git a/kmail/keyresolver.h b/kmail/keyresolver.h
index f39a0f96..0765459f 100644
--- a/kmail/keyresolver.h
+++ b/kmail/keyresolver.h
@@ -24,11 +24,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -101,14 +101,14 @@ namespace Kleo {
\section Step 4: Get signing keys.
If, after key resolving, signing is still requested and
- apparently possible, you can get the result of all this by
+ aptqparently possible, you can get the result of all this by
iterating over the available message formats and retrieving the
set of signing keys to use with a call to \c signingKeys().
\section Step 5: Get encrytion key sets.
If after key resolving, encryption is still requested and
- apparently possible, you can get the result of all this by
+ aptqparently possible, you can get the result of all this by
calling \c encryptionItems() with the current message format at
hand as its argument.
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 900264cd..64f085f9 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -47,8 +47,8 @@
namespace KMail {
KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
- TQObject * parent, const char * name )
- : TQObject( parent, name ), HtmlWriter(),
+ TQObject * tqparent, const char * name )
+ : TQObject( tqparent, name ), HtmlWriter(),
mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
{
assert( part );
@@ -140,7 +140,7 @@ namespace KMail {
DOM::HTMLImageElement image( node );
KURL url( image.src().string() );
if ( url.protocol() == "cid" ) {
- EmbeddedPartMap::const_iterator it = mEmbeddedPartMap.find( url.path() );
+ EmbeddedPartMap::const_iterator it = mEmbeddedPartMap.tqfind( url.path() );
if ( it != mEmbeddedPartMap.end() ) {
kdDebug(5006) << "Replacing " << url.prettyURL() << " by " << it.data() << endl;
image.setSrc( it.data() );
diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h
index 482d9b2c..3db102f7 100644
--- a/kmail/khtmlparthtmlwriter.h
+++ b/kmail/khtmlparthtmlwriter.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -45,11 +45,12 @@ namespace KMail {
class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter {
Q_OBJECT
+ TQ_OBJECT
public:
// Key is Content-Id, value is URL
typedef TQMap<TQString, TQString> EmbeddedPartMap;
KHtmlPartHtmlWriter( KHTMLPart * part,
- TQObject * parent=0, const char * name = 0 );
+ TQObject * tqparent=0, const char * name = 0 );
virtual ~KHtmlPartHtmlWriter();
void begin( const TQString & cssDefs );
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index 6baa874b..7cf11ebd 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -77,11 +77,11 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) {
return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ;
}
-static inline bool tqcontainsSMIME( unsigned int f ) {
+static inline bool containsSMIME( unsigned int f ) {
return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ;
}
-static inline bool tqcontainsOpenPGP( unsigned int f ) {
+static inline bool containsOpenPGP( unsigned int f ) {
return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
}
diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp
index 4249d3bf..530ffaf4 100644
--- a/kmail/klistboxdialog.cpp
+++ b/kmail/klistboxdialog.cpp
@@ -11,10 +11,10 @@
KListBoxDialog::KListBoxDialog( TQString& _selectedString,
const TQString& caption,
const TQString& labelText,
- TQWidget* parent,
+ TQWidget* tqparent,
const char* name,
bool modal )
- : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ),
+ : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok, true ),
selectedString( _selectedString )
{
@@ -52,7 +52,7 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString,
*/
KListBoxDialog::~KListBoxDialog()
{
- // no need to delete child widgets, Qt does it all for us
+ // no need to delete child widgets, TQt does it all for us
}
void KListBoxDialog::setLabelAbove(const TQString& label)
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index e245d1df..cf155075 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -9,12 +9,13 @@ class TQListBox;
class KListBoxDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
KListBoxDialog( TQString& _selectedString,
const TQString& caption,
const TQString& labelText,
- TQWidget* parent = 0,
+ TQWidget* tqparent = 0,
const char* name = 0,
bool modal = true );
~KListBoxDialog();
diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp
index 78a20dc5..f556c07d 100644
--- a/kmail/klistviewindexedsearchline.cpp
+++ b/kmail/klistviewindexedsearchline.cpp
@@ -17,11 +17,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -38,8 +38,8 @@
using KMail::HeaderListQuickSearch;
-KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ):
- HeaderListQuickSearch( parent, listView, actionCollection, name ),
+KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* tqparent, KListView* listView, KActionCollection* actionCollection, const char* name ):
+ HeaderListQuickSearch( tqparent, listView, actionCollection, name ),
mFiltering( false )
{
}
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index 5bd67e4b..f8aaf176 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -49,10 +49,11 @@ class KListViewSearchLine;
class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
{
Q_OBJECT
+ TQ_OBJECT
public:
- explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0);
+ explicit KListViewIndexedSearchLine(TQWidget *tqparent, KListView *listView, KActionCollection* action, const char *name = 0);
~KListViewIndexedSearchLine();
public slots:
@@ -60,7 +61,7 @@ public slots:
* Updates search to only make visible the items that match \a s. If
* \a s is null then the line edit's text will be used.
*/
- virtual void updateSearch(const TQString &s = TQString::null);
+ virtual void updateSearch(const TQString &s = TQString());
protected:
virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 8ddf6899..eebe99f7 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -12,7 +12,7 @@ using KMail::AccountManager;
#include "messagesender.h"
#include "kmmessage.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "kmfoldercachedimap.h"
#include "progressmanager.h"
@@ -42,10 +42,10 @@ using KMail::FolderJob;
#include "kmaccount.moc"
//-----------------------------------------------------------------------------
-KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
- : TQObject(parent), mPrecommand(precommand)
+KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
+ : TQObject(tqparent), mPrecommand(precommand)
{
- BroadcasStatus::instance()->seStatusMsg(
+ BroadcastqStatus::instance()->seStatusMsg(
i18n("Executing precommand %1").arg(precommand ));
mPrecommandProcess.setUseShell(true);
@@ -181,7 +181,7 @@ void KMAccount::writeConfig(KConfig& config)
KAccount::writeConfig(config);
config.writeEntry("Type", type());
- config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString::null);
+ config.writeEntry("Folder", mFolder ? mFolder->idString() : TQString());
config.writeEntry("check-interval", mInterval);
config.writeEntry("check-exclude", mExclude);
config.writePathEntry("precommand", mPrecommand);
@@ -220,9 +220,9 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
assert(aMsg != 0);
// Save this one for readding
- KMFolderCachedImap* parent = 0;
+ KMFolderCachedImap* tqparent = 0;
if( type() == "cachedimap" )
- parent = static_cast<KMFolderCachedImap*>( aMsg->storage() );
+ tqparent = static_cast<KMFolderCachedImap*>( aMsg->storage() );
// checks whether we should send delivery receipts
// and sends them.
@@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
// This is only valid for pop accounts and produces wrong stati for imap.
if ( type() != "cachedimap" && type() != "imap" ) {
if ( aMsg->isOld() )
- aMsg->seStatus(KMMsgStatusUnread); // -sanders
- // aMsg->seStatus(KMMsgStatusRead);
+ aMsg->setqStatus(KMMsgStatusUnread); // -sanders
+ // aMsg->setqStatus(KMMsgStatusRead);
else
- aMsg->seStatus(KMMsgStatusNew);
+ aMsg->setqStatus(KMMsgStatusNew);
}
/*
TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -258,7 +258,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
else if (processResult == 1)
{
if( type() == "cachedimap" )
- ; // already done by caller: parent->addMsgInternal( aMsg, false );
+ ; // already done by caller: tqparent->addMsgInternal( aMsg, false );
else {
// TODO: Perhaps it would be best, if this if was handled by a virtual
// method, so the if( !dimap ) above could die?
@@ -287,11 +287,11 @@ if( fileD0.open( IO_WriteOnly ) ) {
// Count number of new messages for each folder
TQString folderId;
if ( processResult == 1 ) {
- folderId = ( type() == "cachedimap" ) ? parent->folder()->idString()
+ folderId = ( type() == "cachedimap" ) ? tqparent->folder()->idString()
: mFolder->idString();
}
else {
- folderId = aMsg->parent()->idString();
+ folderId = aMsg->tqparent()->idString();
}
addToNewInFolder( folderId, 1 );
@@ -312,7 +312,7 @@ int KMAccount::checkInterval() const
{
if ( mInterval <= 0 )
return mInterval;
- return QMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() );
+ return TQMAX( mInterval, GlobalSettings::self()->minimumCheckInterval() );
}
//----------------------------------------------------------------------------
@@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
KMPrecommand precommandProcess(precommand, this);
- BroadcasStatus::instance()->seStatusMsg(
+ BroadcastqStatus::instance()->seStatusMsg(
i18n("Executing precommand %1").arg(precommand ));
connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
@@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) {
}
//-----------------------------------------------------------------------------
-void KMAccount::checkDone( bool newmail, CheckStatus status )
+void KMAccount::checkDone( bool newmail, ChecktqStatus status )
{
setCheckingMail( false );
// Reset the timeout for automatic mailchecking. The user might have
@@ -493,7 +493,7 @@ void KMAccount::checkDone( bool newmail, CheckStatus status )
//-----------------------------------------------------------------------------
void KMAccount::addToNewInFolder( TQString folderId, int num )
{
- if ( mNewInFolder.find( folderId ) == mNewInFolder.end() )
+ if ( mNewInFolder.tqfind( folderId ) == mNewInFolder.end() )
mNewInFolder[folderId] = num;
else
mNewInFolder[folderId] += num;
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 2872b111..02df2421 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -49,12 +49,13 @@ using KPIM::ProgressItem;
class KMAccount;
typedef TQValueList< ::KMAccount* > AccountList;
-class KMPrecommand : public QObject
+class KMPrecommand : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMPrecommand(const TQString &precommand, TQObject *parent = 0);
+ KMPrecommand(const TQString &precommand, TQObject *tqparent = 0);
virtual ~KMPrecommand();
bool start();
@@ -73,6 +74,7 @@ protected:
class KMAccount: public TQObject, public KAccount
{
Q_OBJECT
+ TQ_OBJECT
friend class KMail::AccountManager;
friend class ::KMail::FolderJob;
friend class ::AccountsPageReceivingTab; // part of the config dialog
@@ -81,7 +83,7 @@ class KMAccount: public TQObject, public KAccount
public:
virtual ~KMAccount();
- enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted,
+ enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted,
CheckError };
/** The default check interval */
@@ -90,7 +92,7 @@ public:
/**
* Returns type of the account
*/
- virtual TQString type() const { return TQString::null; }
+ virtual TQString type() const { return TQString(); }
/**
* Reimplemented, set account name
@@ -229,7 +231,7 @@ public:
* @param newMail true if new mail arrived
* @param status the status of the mail check
*/
- void checkDone( bool newMail, CheckStatus status );
+ void checkDone( bool newMail, ChecktqStatus status );
/**
* Abort all running mail checks. Used when closing the last KMMainWin.
@@ -258,7 +260,7 @@ signals:
* @param newMail true if there was new mail
* @param status the status of the mail check
**/
- virtual void finishedCheck( bool newMail, CheckStatus status );
+ virtual void finishedCheck( bool newMail, ChecktqStatus status );
/**
* Emitted after the mail check is finished.
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 4fc57d2c..134a7102 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -134,8 +134,8 @@ TQValueList<KMFolderCachedImap*> KMAcctCachedImap::killAllJobsInternal( bool dis
TQValueList<KMFolderCachedImap*> folderList;
TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
- if ((*it).parent)
- folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
+ if ((*it).tqparent)
+ folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
// Kill the job - except if it's the one that already died and is calling us
if ( !it.key()->error() && mSlave ) {
it.key()->kill();
@@ -163,8 +163,8 @@ void KMAcctCachedImap::cancelMailCheck()
TQValueList<KMFolderCachedImap*> folderList;
TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
- if ( (*it).cancellable && (*it).parent )
- folderList << static_cast<KMFolderCachedImap*>((*it).parent->storage());
+ if ( (*it).cancellable && (*it).tqparent )
+ folderList << static_cast<KMFolderCachedImap*>((*it).tqparent->storage());
}
// Kill jobs
ImapAccountBase::cancelMailCheck();
@@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders()
mMailCheckFolders.append( mFoldersQueuedForChecking.front() );
mFoldersQueuedForChecking.pop_front();
if ( mFoldersQueuedForChecking.isEmpty() )
- disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckQueuedFolders() ) );
kmkernel->acctMgr()->singleCheckMail(this, true);
@@ -243,7 +243,7 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder,
mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
"MailCheck" + TQString::number( id() ),
TQStyleSheet::escape( folder->label() ), // will be changed immediately in serverSync anyway
- TQString::null,
+ TQString(),
true, // can be cancelled
useSSL() || useTLS() );
connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -287,7 +287,7 @@ void KMAcctCachedImap::addUnreadMsgCount( const KMFolderCachedImap *folder,
// therefore doesn't need to be counted here
const TQString folderId = folder->folder()->idString();
int newInFolder = countUnread;
- if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() )
+ if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() )
newInFolder -= mUnreadBeforeCheck[folderId];
if ( newInFolder > 0 )
addToNewInFolder( folderId, newInFolder );
@@ -310,7 +310,7 @@ void KMAcctCachedImap::addLastUnreadMsgCount( const KMFolderCachedImap *folder,
void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
ImapAccountBase::readConfig( config );
- // Apparently this method is only ever called once (from KMKernel::init) so this is ok
+ // Aptqparently this method is only ever called once (from KMKernel::init) so this is ok
mPreviouslyDeletedFolders = config.readListEntry( "deleted-folders" );
mDeletedFolders.clear(); // but just in case...
const TQStringList oldPaths = config.readListEntry( "renamed-folders-paths" );
@@ -318,7 +318,7 @@ void KMAcctCachedImap::readConfig( /*const*/ KConfig/*Base*/ & config ) {
TQStringList::const_iterator it = oldPaths.begin();
TQStringList::const_iterator nameit = newNames.begin();
for( ; it != oldPaths.end() && nameit != newNames.end(); ++it, ++nameit ) {
- addRenamedFolder( *it, TQString::null, *nameit );
+ addRenamedFolder( *it, TQString(), *nameit );
}
mGroupwareType = (GroupwareType)config.readNumEntry( "groupwareType", GroupwareKolab );
}
@@ -351,7 +351,7 @@ void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder )
TQStringList strList;
TQValueList<TQGuardedPtr<KMFolder> > folderList;
kmkernel->dimapFolderMgr()->createFolderList( &strList, &folderList,
- folder->folder()->child(), TQString::null,
+ folder->folder()->child(), TQString(),
false );
TQValueList<TQGuardedPtr<KMFolder> >::Iterator it;
mCountLastUnread = 0;
@@ -417,12 +417,12 @@ TQStringList KMAcctCachedImap::deletedFolderPaths( const TQString& subFolderPath
bool KMAcctCachedImap::isDeletedFolder( const TQString& subFolderPath ) const
{
- return mDeletedFolders.find( subFolderPath ) != mDeletedFolders.end();
+ return mDeletedFolders.tqfind( subFolderPath ) != mDeletedFolders.end();
}
bool KMAcctCachedImap::isPreviouslyDeletedFolder( const TQString& subFolderPath ) const
{
- return mPreviouslyDeletedFolders.find( subFolderPath ) != mPreviouslyDeletedFolders.end();
+ return mPreviouslyDeletedFolders.tqfind( subFolderPath ) != mPreviouslyDeletedFolders.end();
}
void KMAcctCachedImap::removeDeletedFolder( const TQString& subFolderPath )
@@ -447,7 +447,7 @@ void KMAcctCachedImap::slotProgressItemCanceled( ProgressItem* )
killAllJobs( abortConnection );
if ( abortConnection ) {
// If we were trying to connect, tell kmfoldercachedimap so that it moves on
- emit connectionResult( KIO::ERR_USER_CANCELED, TQString::null );
+ emit connectionResult( KIO::ERR_USER_CANCELED, TQString() );
}
}
@@ -459,10 +459,10 @@ FolderStorage* KMAcctCachedImap::rootFolder() const
TQString KMAcctCachedImap::renamedFolder( const TQString& imapPath ) const
{
- TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.find( imapPath );
+ TQMap<TQString, RenamedFolder>::ConstIterator renit = mRenamedFolders.tqfind( imapPath );
if ( renit != mRenamedFolders.end() )
return (*renit).mNewName;
- return TQString::null;
+ return TQString();
}
#include "kmacctcachedimap.moc"
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index 5c3aa6c3..f045ca7f 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -19,11 +19,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -54,6 +54,7 @@ namespace KIO {
class KMAcctCachedImap: public KMail::ImapAccountBase
{
Q_OBJECT
+ TQ_OBJECT
friend class ::KMail::ImapJob;
friend class ::KMail::CachedImapJob;
@@ -144,7 +145,7 @@ public:
void removeRenamedFolder( const TQString& subFolderPath );
struct RenamedFolder {
- RenamedFolder() {} // for QMap
+ RenamedFolder() {} // for TQMap
RenamedFolder( const TQString& oldLabel, const TQString& newName )
: mOldLabel( oldLabel ), mNewName( newName ) {}
TQString mOldLabel;
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 6545d4e6..488142a9 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -24,7 +24,7 @@
class KMAccount;
-/** Simple wrapper class that tqcontains the kmail account handling
+/** Simple wrapper class that contains the kmail account handling
* stuff that is usually not required outside kmail.
*
* WARNING: do not add virtual methods in this class. This class is
@@ -48,7 +48,7 @@ public:
void clearAccountList();
private:
- KMAcctFolder( KMFolderDir* parent, const TQString& name,
+ KMAcctFolder( KMFolderDir* tqparent, const TQString& name,
KMFolderType aFolderType );
};
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 12d17af8..6942bab5 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
#include "kmmessage.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "kmfoldertree.h"
#include "kmfoldermgr.h"
#include "kmfolderimap.h"
@@ -153,10 +153,10 @@ void KMAcctImap::killAllJobs( bool disconnectSlave )
msg->setTransferInProgress( false );
}
}
- if ((*it).parent)
+ if ((*it).tqparent)
{
// clear folder state
- KMFolderImap *fld = static_cast<KMFolderImap*>((*it).parent->storage());
+ KMFolderImap *fld = static_cast<KMFolderImap*>((*it).tqparent->storage());
fld->setCheckingValidity(false);
fld->quiet(false);
fld->setContentState(KMFolderImap::imapNoInformation);
@@ -222,7 +222,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
{
ImapJob *job = it.current();
++it;
- if ( !job->msgList().isEmpty() && job->msgList().first()->parent() == folder )
+ if ( !job->msgList().isEmpty() && job->msgList().first()->tqparent() == folder )
{
job->kill();
}
@@ -237,8 +237,8 @@ void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
while ( it != mapJobData.end() ) {
TQMap<KIO::Job*, jobData>::Iterator i = it;
it++;
- if ( (*i).parent ) {
- if ( (*i).parent == folder ) {
+ if ( (*i).tqparent ) {
+ if ( (*i).tqparent == folder ) {
mapJobData.remove(i);
}
}
@@ -252,8 +252,8 @@ void KMAcctImap::cancelMailCheck()
TQValueList<KMFolderImap*> folderList;
TQMap<KIO::Job*, jobData>::Iterator it = mapJobData.begin();
for (; it != mapJobData.end(); ++it) {
- if ( (*it).cancellable && (*it).parent ) {
- folderList << static_cast<KMFolderImap*>((*it).parent->storage());
+ if ( (*it).cancellable && (*it).tqparent ) {
+ folderList << static_cast<KMFolderImap*>((*it).tqparent->storage());
}
}
// Kill jobs
@@ -298,7 +298,7 @@ void KMAcctImap::processNewMail(bool interactive)
ProgressManager::createProgressItem(
"MailCheckAccount" + name(),
i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ),
- TQString::null, // status
+ TQString(), // status
true, // can be canceled
useSSL() || useTLS() );
@@ -395,14 +395,14 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
if ( mMailCheckProgressItem ) {
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
- mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
+ mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") );
}
mCountRemainChecks--;
// count the unread messages
const TQString folderId = folder->idString();
int newInFolder = folder->countUnread();
- if ( mUnreadBeforeCheck.find( folderId ) != mUnreadBeforeCheck.end() )
+ if ( mUnreadBeforeCheck.tqfind( folderId ) != mUnreadBeforeCheck.end() )
newInFolder -= mUnreadBeforeCheck[folderId];
if ( newInFolder > 0 ) {
addToNewInFolder( folderId, newInFolder );
@@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count
// when we check only one folder (=selected) and we have new mails
// then do not display a summary as the normal status message is better
- bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
- ImapAccountBase::postProcessNewMail( showStatus );
+ bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true;
+ ImapAccountBase::postProcessNewMail( showtqStatus );
mUnreadBeforeCheck.clear();
mCheckingSingleFolder = false;
}
@@ -512,7 +512,7 @@ void KMAcctImap::slotUpdateFolderList()
TQStringList strList;
mMailCheckFolders.clear();
kmkernel->imapFolderMgr()->createFolderList(&strList, &mMailCheckFolders,
- mFolder->folder()->child(), TQString::null, false);
+ mFolder->folder()->child(), TQString(), false);
// the new list
TQValueList<TQGuardedPtr<KMFolder> > includedFolders;
// check for excluded folders
@@ -580,7 +580,7 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
void KMAcctImap::execFilters(TQ_UINT32 serNum)
{
if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return;
- TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.find( serNum );
+ TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.tqfind( serNum );
if ( findIt != mFilterSerNums.end() )
return;
mFilterSerNums.append( serNum );
@@ -607,11 +607,11 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
kmkernel->emergencyExit( i18n("Unable to process messages: " ) + TQString::fromLocal8Bit(strerror(errno)));
return 2;
}
- if (msg->parent()) { // unGet this msg
+ if (msg->tqparent()) { // unGet this msg
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->parent() ); assert( idx >= 0 );
+ assert( p == msg->tqparent() ); assert( idx >= 0 );
p->unGetMsg( idx );
}
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index f3fcc693..1a6c4882 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -40,6 +40,7 @@ class FolderStorage;
class KMAcctImap: public KMail::ImapAccountBase
{
Q_OBJECT
+ TQ_OBJECT
friend class KMail::ImapJob;
public:
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 47e04f33..6062f354 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
#include "kmfoldermbox.h"
#include "kmacctfolder.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "progressmanager.h"
using KPIM::ProgressManager;
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
if ( precommand().isEmpty() ) {
TQFileInfo fi( location() );
if ( fi.size() == 0 ) {
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
checkDone( mHasNewMail, CheckOK );
return false;
}
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
if (!mFolder) {
checkDone( mHasNewMail, CheckError );
- BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+ BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return false;
}
- //BroadcasStatus::instance()->reset();
- BroadcasStatus::instance()->seStatusMsg(
+ //BroadcastqStatus::instance()->reset();
+ BroadcastqStatus::instance()->seStatusMsg(
i18n("Preparing transmission from \"%1\"...").arg(mName));
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
{
kdDebug(5006) << "cannot run precommand " << precommand() << endl;
checkDone( mHasNewMail, CheckError );
- BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
+ BroadcastqStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
return false;
}
@@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
<< mMailFolder->name() << endl;
checkDone( mHasNewMail, CheckError );
- BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+ BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return false;
}
@@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess()
checkDone( mHasNewMail, CheckError );
TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
.arg( mMailFolder->location() );
- BroadcasStatus::instance()->seStatusMsg( errMsg );
+ BroadcastqStatus::instance()->seStatusMsg( errMsg );
return false;
}
@@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
.arg(mMailFolder->location()).arg( mNumMsgs );
- //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true );
+ //BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
return true;
}
@@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg()
if (kmkernel->mailCheckAborted()) break; */
const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
- //BroadcasStatus::instance()->seStatusMsg( statusMsg );
+ //BroadcastqStatus::instance()->seStatusMsg( statusMsg );
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
- mMailCheckProgressItem->seStatus( statusMsg );
+ mMailCheckProgressItem->setqStatus( statusMsg );
msg = mMailFolder->take(0);
if (msg)
@@ -214,8 +214,8 @@ bool KMAcctLocal::fetchMsg()
fileD0.close(); // If data is 0 we just create a zero length file.
}
#endif
- msg->seStatus(msg->headerField("Status").latin1(),
- msg->headerField("X-Status").latin1());
+ msg->setqStatus(msg->headerField("tqStatus").latin1(),
+ msg->headerField("X-tqStatus").latin1());
msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
msg->setComplete(true);
@@ -249,8 +249,8 @@ void KMAcctLocal::postProcess()
}
if( mMailCheckProgressItem ) { // do this only once...
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
- mMailCheckProgressItem->seStatus(
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+ mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from mailbox %1.",
"Fetched %n messages from mailbox %1.",
mNumMsgs ).arg( mMailFolder->location() ) );
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index ca378920..7b83dcf8 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
#include "kmfoldermaildir.h"
#include "kmacctfolder.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
#include "progressmanager.h"
using KPIM::ProgressManager;
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
TQFileInfo fi( location() );
if ( !fi.exists() ) {
checkDone( hasNewMail, CheckOK );
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
return;
}
}
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
if (!mFolder) {
checkDone( hasNewMail, CheckError );
- BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+ BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return;
}
- BroadcasStatus::instance()->seStatusMsg(
+ BroadcastqStatus::instance()->seStatusMsg(
i18n("Preparing transmission from \"%1\"...").arg(mName));
Q_ASSERT( !mMailCheckProgressItem );
@@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
{
kdDebug(5006) << "cannot run precommand " << precommand() << endl;
checkDone( hasNewMail, CheckError );
- BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+ BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return;
}
@@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool)
KMessageBox::sorry(0, aStr);
kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
checkDone( hasNewMail, CheckError );
- BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
+ BroadcastqStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
return;
}
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
{
if( kmkernel->mailCheckAborted() ) {
- BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
+ BroadcastqStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
num = i;
addedOk = false;
}
@@ -165,13 +165,13 @@ void KMAcctMaildir::processNewMail(bool)
TQString statusMsg = statusMsgStub.arg(i);
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
- mMailCheckProgressItem->seStatus( statusMsg );
+ mMailCheckProgressItem->setqStatus( statusMsg );
msg = mailFolder.take(0);
if (msg)
{
- msg->seStatus(msg->headerField("Status").latin1(),
- msg->headerField("X-Status").latin1());
+ msg->setqStatus(msg->headerField("tqStatus").latin1(),
+ msg->headerField("X-tqStatus").latin1());
msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool)
}
if( mMailCheckProgressItem ) { // do this only once...
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num );
- mMailCheckProgressItem->seStatus(
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( num );
+ mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from maildir folder %1.",
"Fetched %n messages from maildir folder %1.",
num ).arg(mailFolder.location() ) );
@@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
}
if (addedOk)
{
- BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
+ BroadcastqStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
}
// else warning is written already
diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp
index 44df37c6..caa2a215 100644
--- a/kmail/kmacctseldlg.cpp
+++ b/kmail/kmacctseldlg.cpp
@@ -32,8 +32,8 @@
#include "kmacctseldlg.moc"
-KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal )
- : KDialogBase( parent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
+KMAcctSelDlg::KMAcctSelDlg( TQWidget *tqparent, const char *name, bool modal )
+ : KDialogBase( tqparent, name, modal, i18n("Add Account"), Ok|Cancel, Ok )
{
TQFrame *page = makeMainWidget();
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h
index 3aad59b1..62a0012b 100644
--- a/kmail/kmacctseldlg.h
+++ b/kmail/kmacctseldlg.h
@@ -30,9 +30,10 @@
class KMAcctSelDlg: public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
+ KMAcctSelDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true );
/**
* Returns selected button from the account selection group:
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 055b29fc..8fdc5554 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -56,18 +56,18 @@ void KabcBridge::addresses(TQStringList& result) // includes lists
for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
email = *mit;
if (!email.isEmpty()) {
- if (n.isEmpty() || (email.find( '<' ) != -1))
- addr = TQString::null;
+ if (n.isEmpty() || (email.tqfind( '<' ) != -1))
+ addr = TQString();
else { // do we really need quotes around this name ?
- if (n.find(needQuotes) != -1)
+ if (n.tqfind(needQuotes) != -1)
addr = '"' + n + endQuote;
else
addr = n + ' ';
}
- if (!addr.isEmpty() && (email.find( '<' ) == -1)
- && (email.find( '>' ) == -1)
- && (email.find( ',' ) == -1))
+ if (!addr.isEmpty() && (email.tqfind( '<' ) == -1)
+ && (email.tqfind( '>' ) == -1)
+ && (email.tqfind( ',' ) == -1))
addr += '<' + email + '>';
else
addr += email;
@@ -99,7 +99,7 @@ TQStringList KabcBridge::addresses()
TQString KabcBridge::expandNickName( const TQString& nickName )
{
if ( nickName.isEmpty() )
- return TQString::null;
+ return TQString();
const TQString lowerNickName = nickName.lower();
const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -108,7 +108,7 @@ TQString KabcBridge::expandNickName( const TQString& nickName )
if ( (*it).nickName().lower() == lowerNickName )
return (*it).fullEmail();
}
- return TQString::null;
+ return TQString();
}
@@ -126,7 +126,7 @@ TQStringList KabcBridge::categories()
for ( TQStringList::ConstIterator itAux = aux.begin();
itAux != aux.end(); ++itAux ) {
// don't have duplicates in allcategories
- if ( allcategories.find( *itAux ) == allcategories.end() )
+ if ( allcategories.tqfind( *itAux ) == allcategories.end() )
allcategories += *itAux;
}
}
diff --git a/kmail/kmail.antispamrc b/kmail/kmail.antispamrc
index 098f80c2..2bef9ad0 100644
--- a/kmail/kmail.antispamrc
+++ b/kmail/kmail.antispamrc
@@ -20,7 +20,7 @@ UseRegExp=0
SupportsBayes=1
SupportsUnsure=0
ScoreName=Spamassassin
-ScoreHeader=X-Spam-Status
+ScoreHeader=X-Spam-tqStatus
ScoreType=Adjusted
ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -139,7 +139,7 @@ UseRegExp=0
SupportsBayes=1
SupportsUnsure=0
ScoreName=Spamassassin
-ScoreHeader=X-Spam-Status
+ScoreHeader=X-Spam-tqStatus
ScoreType=Adjusted
ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -163,7 +163,7 @@ UseRegExp=0
SupportsBayes=1
SupportsUnsure=0
ScoreName=Spamassassin
-ScoreHeader=X-Spam-Status
+ScoreHeader=X-Spam-tqStatus
ScoreType=Adjusted
ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.]
ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.]
@@ -222,7 +222,7 @@ PipeFilterName=CRM114 Check
PipeCmdDetect=crm -u $HOME/.crm114 mailreaver.crm
ExecCmdSpam=crm -u $HOME/.crm114 mailreaver.crm --spam
ExecCmdHam=crm -u $HOME/.crm114 mailreaver.crm --good
-DetectionHeader=X-CRM114-Status
+DetectionHeader=X-CRM114-tqStatus
DetectionPattern=SPAM
DetectionPattern2=UNSURE
DetectionOnly=0
@@ -230,7 +230,7 @@ UseRegExp=0
SupportsBayes=1
SupportsUnsure=1
ScoreName=CRM114
-ScoreHeader=X-CRM114-Status
+ScoreHeader=X-CRM114-tqStatus
ScoreType=Bool
ScoreValueRegexp=SPAM
ScoreThresholdRegexp=
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 4bbd1be6..88370a45 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -97,7 +97,7 @@
</group>
<group name="General">
- <entry name="disregardUmask" type="Bool">
+ <entry name="disregardUtqmask" type="Bool">
<label>Disregard the users umask setting and use "read-write for the user only" instead</label>
<default>false</default>
</entry>
@@ -257,7 +257,7 @@
</entry>
<entry name="TheIMAPResourceFolderParent" type="String">
- <whatsthis>&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>
+ <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>
<default>inbox</default>
</entry>
@@ -451,14 +451,14 @@
<entry name="ReplyPrefixes" type="StringList" key="reply-prefixes">
<default>Re\\s*:,Re\\[\\d+\\]:,Re\\d+:</default>
</entry>
- <entry name="ReplaceReplyPrefix" type="Bool" key="replace-reply-prefix">
+ <entry name="ReplaceReplyPrefix" type="Bool" key="tqreplace-reply-prefix">
<label>Replace recognized prefi&amp;x with "Re:"</label>
<default>true</default>
</entry>
<entry name="ForwardPrefixes" type="StringList" key="forward-prefixes">
<default>Fwd:,FW:</default>
</entry>
- <entry name="ReplaceForwardPrefix" type="Bool" key="replace-forward-prefix">
+ <entry name="ReplaceForwardPrefix" type="Bool" key="tqreplace-forward-prefix">
<label>Replace recognized prefix with "&amp;Fwd:"</label>
<default>true</default>
</entry>
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index cb40bc30..70c90cb0 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -20,8 +20,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifdef HAVE_CONFIG_H
@@ -61,8 +61,8 @@ typedef KParts::GenericFactory< KMailPart > KMailFactory;
K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
- TQObject *parent, const char *name, const TQStringList &) :
- DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
+ TQObject *tqparent, const char *name, const TQStringList &) :
+ DCOPObject("KMailIface"), KParts::ReadOnlyPart(tqparent, name),
mParentWidget( tqparentWidget )
{
kdDebug(5006) << "KMailPart()" << endl;
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
mainWidget->initializeFilterActions();
mainWidget->initializeFolderShortcutActions();
mainWidget->setupForwardingActionsList();
- mainWidget->updateVactionScripStatus();
+ mainWidget->updateVactionScriptqStatus();
}
void KMailPart::exit()
@@ -237,8 +237,8 @@ TQWidget* KMailPart::tqparentWidget() const
}
-KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
- : KParts::StatusBarExtension( parent ), mParent( parent )
+KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *tqparent )
+ : KParts::StatusBarExtension( tqparent ), mParent( tqparent )
{
}
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 69203db9..414ff384 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -19,8 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
+ with any edition of TQt, and distribute the resulting executable,
+ without including the source code for TQt in the source distribution.
*/
#ifndef KMail_PART_H
#define KMail_PART_H
@@ -52,9 +52,10 @@ class ActionManager;
class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
{
Q_OBJECT
+ TQ_OBJECT
public:
KMailPart(TQWidget *tqparentWidget, const char *widgetName,
- TQObject *parent, const char *name, const TQStringList &);
+ TQObject *tqparent, const char *name, const TQStringList &);
virtual ~KMailPart();
TQWidget* tqparentWidget() const;
@@ -88,7 +89,7 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
class KMailStatusBarExtension : public KParts::StatusBarExtension
{
public:
- KMailStatusBarExtension( KMailPart *parent );
+ KMailStatusBarExtension( KMailPart *tqparent );
KMainWindow *mainWindow() const;
diff --git a/kmail/kmail_part.rc b/kmail/kmail_part.rc
index fb4794df..5c4d034f 100644
--- a/kmail/kmail_part.rc
+++ b/kmail/kmail_part.rc
@@ -22,7 +22,7 @@
<Action name="file_print" />
<Separator/>
<Action name="expire_all_folders" />
- <Action name="file_invalidate_imap_cache"/>
+ <Action name="file_tqinvalidate_imap_cache"/>
<Action name="empty_trash"/>
<Separator/>
<Action name="online_status" />
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index 91f15df5..cd4ef29c 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -20,11 +20,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -50,7 +50,7 @@ public:
k_dcop:
struct SubResource {
//dcopidl barfs on those constructors, but dcopidlng works
- SubResource() {} // for QValueList
+ SubResource() {} // for TQValueList
SubResource( const TQString& loc, const TQString& lab, bool rw, bool ar )
: location( loc ), label( lab ), writable( rw ), alarmRelevant( ar ) {}
TQString location; // unique
@@ -115,11 +115,11 @@ k_dcop:
/**
* Trigger the creation of a new resource folder with name @param resource
- * under parent @param.
+ * under tqparent @param.
* @return success or failure
*/
virtual bool addSubresource( const TQString& resource,
- const TQString& parent,
+ const TQString& tqparent,
const TQString& contentsType ) = 0;
/**
* Trigger the deletion of a new resource folder with id @param resource.
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 41e9f96d..81237473 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -22,11 +22,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -236,7 +236,7 @@ inline static void debugBodyParts( const char*, const KMMessage& ) {}
// Add (or overwrite, resp.) an attachment in an existing mail,
// attachments must be local files, they are identified by their names.
-// If lookupByName if false the attachment to tqreplace is looked up by mimetype.
+// If lookupByName if false the attachment to replace is looked up by mimetype.
// return value: wrong if attachment could not be added/updated
bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
const TQString& attachmentURL,
@@ -260,7 +260,7 @@ bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
KMMessagePart msgPart;
msgPart.setName( attachmentName );
- const int iSlash = attachmentMimetype.find('/');
+ const int iSlash = attachmentMimetype.tqfind('/');
const TQCString sType = attachmentMimetype.left( iSlash ).latin1();
const TQCString sSubtype = attachmentMimetype.mid( iSlash+1 ).latin1();
msgPart.setTypeStr( sType );
@@ -309,7 +309,7 @@ bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
// Look for the attachment with the right mimetype
bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQString& mimetype, TQString& s )
{
- const int iSlash = mimetype.find('/');
+ const int iSlash = mimetype.tqfind('/');
const TQCString sType = mimetype.left( iSlash ).latin1();
const TQCString sSubtype = mimetype.mid( iSlash+1 ).latin1();
DwBodyPart* part = findBodyPartByMimeType( msg, sType, sSubtype, true /* starts with sSubtype, to accept application/x-vnd.kolab.contact.distlist */ );
@@ -556,7 +556,7 @@ TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString&
kdDebug(5006) << "The folder has " << f->count() << " messages." << endl;
int stopIndex = nbMessages == -1 ? f->count() :
- QMIN( f->count(), startIndex + nbMessages );
+ TQMIN( f->count(), startIndex + nbMessages );
for(int i = startIndex; i < stopIndex; ++i) {
#if 0
@@ -566,7 +566,7 @@ TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString&
KMMessage* msg = f->storage()->readTemporaryMsg(i);
#endif
if ( msg ) {
- const int iSlash = mimetype.find('/');
+ const int iSlash = mimetype.tqfind('/');
const TQCString sType = mimetype.left( iSlash ).latin1();
const TQCString sSubtype = mimetype.mid( iSlash+1 ).latin1();
if ( sType.isEmpty() || sSubtype.isEmpty() ) {
@@ -611,12 +611,12 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
{
if( !msg ) return;
- KMFolder *parent = msg->parent();
- Q_ASSERT( parent );
+ KMFolder *tqparent = msg->tqparent();
+ Q_ASSERT( tqparent );
TQ_UINT32 sernum = msg->getMsgSerNum();
// do we have an accumulator for this folder?
- Accumulator *ac = mAccumulators.find( parent->location() );
+ Accumulator *ac = mAccumulators.tqfind( tqparent->location() );
if( ac ) {
TQString s;
if ( !vPartFoundAndDecoded( msg, s ) ) return;
@@ -634,7 +634,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
} else {
/* We are not accumulating for this folder, so this one was added
* by KMail. Do your thang. */
- slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
+ slotIncidenceAdded( msg->tqparent(), msg->getMsgSerNum() );
}
if ( mTheUnGetMes.tqcontains( sernum ) ) {
@@ -687,10 +687,10 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
}
// Another special case is our own folders, under the imap INBOX, make
// those prettier too
- const KMFolder *parent = folder;
- while ( parent->parent() && parent->parent()->owner() ) {
- parent = parent->parent()->owner();
- if ( parent->isSystemFolder() ) {
+ const KMFolder *tqparent = folder;
+ while ( tqparent->tqparent() && tqparent->tqparent()->owner() ) {
+ tqparent = tqparent->tqparent()->owner();
+ if ( tqparent->isSystemFolder() ) {
TQStringList remainder(parts);
remainder.pop_front();
remainder.pop_front();
@@ -720,7 +720,7 @@ TQValueList<KMailICalIfaceImpl::SubResource> KMailICalIfaceImpl::subresourcesKol
TQValueList<SubResource> subResources;
// Add the default one
- KMFolder* f = folderFromType( contentsType, TQString::null );
+ KMFolder* f = folderFromType( contentsType, TQString() );
if ( f ) {
subResources.append( SubResource( f->location(), subresourceLabelForPresentation( f ),
f->isWritable(), folderIsAlarmRelevant( f ) ) );
@@ -1139,7 +1139,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
// go get the rest of it, then try again
// TODO: Till, port me
if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true );
- FolderJob *job = msg->parent()->createJob( msg );
+ FolderJob *job = msg->tqparent()->createJob( msg );
connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) );
job->start();
@@ -1199,7 +1199,7 @@ void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder,
void KMailICalIfaceImpl::slotRefresh( const TQString& type )
{
if( mUseResourceIMAP ) {
- signalRefresh( type, TQString::null /* PENDING(bo) folder->location() */ );
+ signalRefresh( type, TQString() /* PENDING(bo) folder->location() */ );
kdDebug(5006) << "Emitting DCOP signal signalRefresh( " << type << " )" << endl;
}
}
@@ -1213,7 +1213,7 @@ void KMailICalIfaceImpl::slotRefreshFolder( KMFolder* folder)
if( mUseResourceIMAP && folder ) {
if( folder == mCalendar || folder == mContacts
|| folder == mNotes || folder == mTasks
- || folder == mJournals || mExtraFolders.find( folder->location() ) ) {
+ || folder == mJournals || mExtraFolders.tqfind( folder->location() ) ) {
// Refresh the folder of this type
KMail::FolderContentsType ct = folder->storage()->contentsType();
slotRefresh( s_folderContentsType[ct].contentsTypeStr );
@@ -1257,7 +1257,7 @@ KMFolder* KMailICalIfaceImpl::folderFromType( const TQString& type,
bool KMailICalIfaceImpl::isResourceFolder( KMFolder* folder ) const
{
return mUseResourceIMAP && folder &&
- ( isStandardResourceFolder( folder ) || mExtraFolders.find( folder->location() )!=0 );
+ ( isStandardResourceFolder( folder ) || mExtraFolders.tqfind( folder->location() )!=0 );
}
bool KMailICalIfaceImpl::isStandardResourceFolder( KMFolder* folder ) const
@@ -1286,7 +1286,7 @@ KFolderTreeItem::Type KMailICalIfaceImpl::folderType( KMFolder* folder ) const
if( mUseResourceIMAP && folder ) {
if( folder == mCalendar || folder == mContacts
|| folder == mNotes || folder == mTasks
- || folder == mJournals || mExtraFolders.find( folder->location() ) ) {
+ || folder == mJournals || mExtraFolders.tqfind( folder->location() ) ) {
KMail::FolderContentsType ct = folder->storage()->contentsType();
return s_folderContentsType[ct].treeItemType;
}
@@ -1385,9 +1385,9 @@ void KMailICalIfaceImpl::deleteMsg( KMMessage *msg )
{
if( !msg ) return;
// Commands are now delayed; can't use that anymore, we need immediate deletion
- //( new KMDeleteMsgCommand( msg->parent(), msg ) )->start();
- KMFolder *srcFolder = msg->parent();
- int idx = srcFolder->find(msg);
+ //( new KMDeleteMsgCommand( msg->tqparent(), msg ) )->start();
+ KMFolder *srcFolder = msg->tqparent();
+ int idx = srcFolder->tqfind(msg);
assert(idx != -1);
// kill existing jobs since we are about to delete the message
srcFolder->ignoreJobsForMessage( msg );
@@ -1415,7 +1415,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder,
// Check if already know that 'extra folder'
const TQString location = folder->location();
- ExtraFolder* ef = mExtraFolders.find( location );
+ ExtraFolder* ef = mExtraFolders.tqfind( location );
if ( ef && ef->folder ) {
// Notify that the old folder resource is no longer available
subresourceDeleted(folderContentsType( folder->storage()->contentsType() ), location );
@@ -1469,7 +1469,7 @@ KMFolder* KMailICalIfaceImpl::extraFolder( const TQString& type,
if ( t < 1 || t > 5 )
return 0;
- ExtraFolder* ef = mExtraFolders.find( folder );
+ ExtraFolder* ef = mExtraFolders.tqfind( folder );
if ( ef && ef->folder && ef->folder->storage()->contentsType() == t )
return ef->folder;
@@ -1478,7 +1478,7 @@ KMFolder* KMailICalIfaceImpl::extraFolder( const TQString& type,
KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( KMFolder* folder ) const
{
- FolderInfoMap::ConstIterator it = mFolderInfoMap.find( folder );
+ FolderInfoMap::ConstIterator it = mFolderInfoMap.tqfind( folder );
if ( it != mFolderInfoMap.end() )
return (*it).mStorageFormat;
return globalStorageFormat();
@@ -1486,7 +1486,7 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( KMFolder* f
void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat format )
{
- FolderInfoMap::Iterator it = mFolderInfoMap.find( folder );
+ FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder );
if ( it != mFolderInfoMap.end() ) {
(*it).mStorageFormat = format;
} else {
@@ -1500,7 +1500,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma
void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges changes )
{
- FolderInfoMap::Iterator it = mFolderInfoMap.find( folder );
+ FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder );
if ( it != mFolderInfoMap.end() ) {
(*it).mChanges = static_cast<FolderChanges>( (*it).mChanges | changes );
} else { // Otherwise, well, it's a folder we don't care about.
@@ -1529,7 +1529,7 @@ KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolde
void KMailICalIfaceImpl::folderSynced( KMFolder* folder, const KURL& folderURL )
{
- FolderInfoMap::Iterator it = mFolderInfoMap.find( folder );
+ FolderInfoMap::Iterator it = mFolderInfoMap.tqfind( folder );
if ( it != mFolderInfoMap.end() && (*it).mChanges ) {
handleFolderSynced( folder, folderURL, (*it).mChanges );
(*it).mChanges = NoChange;
@@ -1569,13 +1569,13 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
// IMAP path is either /INBOX/<path> or /user/someone/<path>
TQString path = folderURL.path( -1 );
Q_ASSERT( path.startsWith( "/" ) );
- int secondSlash = path.find( '/', 1 );
+ int secondSlash = path.tqfind( '/', 1 );
if ( secondSlash == -1 ) {
kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl;
return;
}
if ( path.startsWith( "/INBOX/", false ) ) {
- // If INBOX, tqreplace it with the username (which is user@domain)
+ // If INBOX, replace it with the username (which is user@domain)
path = path.mid( secondSlash );
path.prepend( folderURL.user() );
} else {
@@ -1585,7 +1585,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
}
httpURL.setPath( "/freebusy/trigger/" + path + ".pfb" );
- httpURL.setQuery( TQString::null );
+ httpURL.setQuery( TQString() );
// Ensure that we encode everything with UTF8
httpURL = KURL( httpURL.url(0,106), 106 );
kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl;
@@ -1617,7 +1617,7 @@ void KMailICalIfaceImpl::slotFolderLocationChanged( const TQString &oldLocation,
const TQString &newLocation )
{
KMFolder *folder = findResourceFolder( oldLocation );
- ExtraFolder* ef = mExtraFolders.find( oldLocation );
+ ExtraFolder* ef = mExtraFolders.tqfind( oldLocation );
if ( ef ) {
// reuse the ExtraFolder entry, but adjust the key
mExtraFolders.setAutoDelete( false );
@@ -1645,7 +1645,7 @@ KMFolder* KMailICalIfaceImpl::findResourceFolder( const TQString& resource )
return mJournals;
// No luck. Try the extrafolders
- ExtraFolder* ef = mExtraFolders.find( resource );
+ ExtraFolder* ef = mExtraFolders.tqfind( resource );
if ( ef )
return ef->folder;
@@ -1702,24 +1702,24 @@ void KMailICalIfaceImpl::readConfig()
// Read remaining options
const bool hideFolders = GlobalSettings::self()->hideGroupwareFolders();
- TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
+ TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent();
- // Find the folder parent
+ // Find the folder tqparent
KMFolderDir* folderParentDir;
KMFolderType folderType;
- KMFolder* folderParent = kmkernel->findFolderById( parentName );
+ KMFolder* folderParent = kmkernel->findFolderById( tqparentName );
if( folderParent == 0 ) {
// Parent folder not found. It was probably deleted. The user will have to
// configure things again.
- kdDebug(5006) << "Groupware folder " << parentName << " not found. Groupware functionality disabled" << endl;
+ kdDebug(5006) << "Groupware folder " << tqparentName << " not found. Groupware functionality disabled" << endl;
// Or maybe the inbox simply wasn't created on the first startup
- KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() );
+ KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() );
Q_ASSERT( account );
if ( account ) {
// just in case we were connected already
- disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckDone() ) );
- connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckDone() ) );
}
mUseResourceIMAP = false;
@@ -1738,7 +1738,7 @@ void KMailICalIfaceImpl::readConfig()
KMAcctCachedImap::GroupwareType groupwareType = dynamic_cast<KMFolderCachedImap *>( folderParent->storage() )->account()->groupwareType();
if ( groupwareType == KMAcctCachedImap::GroupwareKolab ) {
- // Make sure the folder parent has the subdirs
+ // Make sure the folder tqparent has the subdirs
// Globally there are 3 cases: nothing found, some stuff found by type/name heuristics, or everything found OK
bool noneFound = true;
bool mustFix = false; // true when at least one was found by heuristics
@@ -1771,12 +1771,12 @@ void KMailICalIfaceImpl::readConfig()
if( noneFound || mustFix ) {
TQString msg;
- TQString parentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name();
+ TQString tqparentFolderName = folderParent != 0 ? folderParent->name() : folderParentDir->name();
if ( noneFound ) {
// No subfolder was found, so ask if we can make them
msg = i18n("KMail will now create the required groupware folders"
" as subfolders of %1; if you do not want this, cancel"
- " and the IMAP resource will be disabled").arg(parentFolderName);
+ " and the IMAP resource will be disabled").arg(tqparentFolderName);
} else {
// Some subfolders were found, be more precise
TQString operations = "<ul>";
@@ -1794,7 +1794,7 @@ void KMailICalIfaceImpl::readConfig()
msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2"
"<br>If you do not want this, cancel"
- " and the IMAP resource will be disabled").arg(parentFolderName, operations);
+ " and the IMAP resource will be disabled").arg(tqparentFolderName, operations);
}
@@ -1959,14 +1959,14 @@ void KMailICalIfaceImpl::readConfig()
void KMailICalIfaceImpl::slotCheckDone()
{
- TQString parentName = GlobalSettings::self()->theIMAPResourceFolderParent();
- KMFolder* folderParent = kmkernel->findFolderById( parentName );
+ TQString tqparentName = GlobalSettings::self()->theIMAPResourceFolderParent();
+ KMFolder* folderParent = kmkernel->findFolderById( tqparentName );
//kdDebug(5006) << k_funcinfo << " folderParent=" << folderParent << endl;
if ( folderParent ) // cool it exists now
{
- KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() );
+ KMAccount* account = kmkernel->acctMgr()->tqfind( GlobalSettings::self()->theIMAPResourceAccount() );
if ( account )
- disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
+ disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
this, TQT_SLOT( slotCheckDone() ) );
readConfig();
}
@@ -2003,9 +2003,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
folder =
mFolderParentDir->createFolder( localizedDefaultFolderName( contentsType ), false, type );
if( mFolderType == KMFolderTypeImap ) {
- KMFolderImap* parentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() );
- parentFolder->createFolder( localizedDefaultFolderName( contentsType ) );
- static_cast<KMFolderImap*>( folder->storage() )->setAccount( parentFolder->account() );
+ KMFolderImap* tqparentFolder = static_cast<KMFolderImap*>( mFolderParent->storage() );
+ tqparentFolder->createFolder( localizedDefaultFolderName( contentsType ) );
+ static_cast<KMFolderImap*>( folder->storage() )->setAccount( tqparentFolder->account() );
}
// Groupware folder created, use the global setting for storage format
setStorageFormat( folder, globalStorageFormat() );
@@ -2136,7 +2136,7 @@ void KMailICalIfaceImpl::cleanup()
TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
{
if( !mUseResourceIMAP )
- return TQString::null;
+ return TQString();
if( type == KFolderTreeItem::Contacts )
return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
@@ -2149,7 +2149,7 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
else if( type == KFolderTreeItem::Journals )
return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
- return TQString::null;
+ return TQString();
}
static void reloadFolderTree()
@@ -2287,17 +2287,17 @@ bool KMailICalIfaceImpl::isResourceQuiet() const
bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
- const TQString& parent,
+ const TQString& tqparent,
const TQString& contentsType )
{
- kdDebug(5006) << "Adding subresource to parent: " << parent << " with name: " << resource << endl;
+ kdDebug(5006) << "Adding subresource to tqparent: " << tqparent << " with name: " << resource << endl;
kdDebug(5006) << "contents type: " << contentsType << endl;
- KMFolder *folder = findResourceFolder( parent );
- KMFolderDir *parentFolderDir = !parent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
- if ( !parentFolderDir || parentFolderDir->hasNamedFolder( resource ) ) return false;
+ KMFolder *folder = findResourceFolder( tqparent );
+ KMFolderDir *tqparentFolderDir = !tqparent.isEmpty() && folder ? folder->createChildFolder(): mFolderParentDir;
+ if ( !tqparentFolderDir || tqparentFolderDir->hasNamedFolder( resource ) ) return false;
TQString msg;
- if ( parentFolderDir->owner() && !parentFolderDir->owner()->isValidName( resource, msg ) ) {
+ if ( tqparentFolderDir->owner() && !tqparentFolderDir->owner()->isValidName( resource, msg ) ) {
KMessageBox::error( 0, msg );
return false;
}
@@ -2305,7 +2305,7 @@ bool KMailICalIfaceImpl::addSubresource( const TQString& resource,
KMFolderType type = mFolderType;
if( type == KMFolderTypeUnknown ) type = KMFolderTypeMaildir;
- KMFolder* newFolder = parentFolderDir->createFolder( resource, false, type );
+ KMFolder* newFolder = tqparentFolderDir->createFolder( resource, false, type );
if ( !newFolder ) return false;
if( mFolderType == KMFolderTypeImap )
static_cast<KMFolderImap*>( folder->storage() )->createFolder( resource );
@@ -2359,10 +2359,10 @@ void KMailICalIfaceImpl::syncFolder(KMFolder * folder) const
KMFolderCachedImap *dimapFolder = dynamic_cast<KMFolderCachedImap*>( folder->storage() );
if ( !dimapFolder )
return;
- // check if the folder exists already, otherwise sync its parent as well to create it
+ // check if the folder exists already, otherwise sync its tqparent as well to create it
if ( dimapFolder->imapPath().isEmpty() ) {
- if ( folder->parent() && folder->parent()->owner() )
- syncFolder( folder->parent()->owner() );
+ if ( folder->tqparent() && folder->tqparent()->owner() )
+ syncFolder( folder->tqparent()->owner() );
else
return;
}
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index ae2d1d6e..3cec23c6 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -21,17 +21,17 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
*/
-/** @file This file tqcontains the class KMailICalIfaceImpl which actually
+/** @file This file contains the class KMailICalIfaceImpl which actually
* implements the ICal (DCOP) interface for KMail.
*/
@@ -83,6 +83,7 @@ public:
/** The implementation of the interface. */
class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface {
Q_OBJECT
+ TQ_OBJECT
public:
KMailICalIfaceImpl();
@@ -135,7 +136,7 @@ public:
bool removeSubresource( const TQString& );
bool addSubresource( const TQString& resource,
- const TQString& parent,
+ const TQString& tqparent,
const TQString& contentsType );
// tell KOrganizer about messages to be deleted
@@ -178,7 +179,7 @@ public:
/**
* Returns the name of the standard icon for a folder of given type or
- * TQString::null if the type is no groupware type.
+ * TQString() if the type is no groupware type.
*/
TQString folderPixmap( KFolderTreeItem::Type type ) const;
@@ -315,7 +316,7 @@ private:
// The reason for storing it here is that it can be shared between
// kmfoldercachedimap and kmfolderimap, and that it's groupware data anyway.
struct FolderInfo {
- FolderInfo() {} // for QMap
+ FolderInfo() {} // for TQMap
FolderInfo( StorageFormat f, FolderChanges c ) :
mStorageFormat( f ), mChanges( c ) {}
StorageFormat mStorageFormat;
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index 84967646..7a507c3f 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -9,9 +9,9 @@
#include <tqcheckbox.h>
#include <tqheader.h>
-KMAtmListViewItem::KMAtmListViewItem( TQListView *parent )
+KMAtmListViewItem::KMAtmListViewItem( TQListView *tqparent )
: TQObject(),
- TQListViewItem( parent )
+ TQListViewItem( tqparent )
{
mCBCompress = new TQCheckBox( listView()->viewport() );
mCBEncrypt = new TQCheckBox( listView()->viewport() );
@@ -70,7 +70,7 @@ void KMAtmListViewItem::updateAllCheckBoxes()
// as well. This is necessary to keep the positions of the checkboxes
// up-to-date. The signals which are, in the constructor of this class,
// connected to the update slots are not sufficent because unfortunatly,
-// Qt does not provide a signal for changed item positions, e.g. during
+// TQt does not provide a signal for changed item positions, e.g. during
// deleting or adding items. The problem with this is that this function does
// not catch updates which are off-screen, which means under some circumstances
// checkboxes have invalid positions. This should not happen anymore, but was
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index 35a65859..72ae6e25 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -12,12 +12,13 @@ class KMComposeWin;
class MessageComposer;
class TQCheckBox;
-class KMAtmListViewItem : public TQObject, public QListViewItem
+class KMAtmListViewItem : public TQObject, public TQListViewItem
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMAtmListViewItem( TQListView *parent );
+ KMAtmListViewItem( TQListView *tqparent );
virtual ~KMAtmListViewItem();
//A custom compare function is needed because the size column is
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 907d2110..1473d3d6 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -156,28 +156,28 @@ private:
};
-KMCommand::KMCommand( TQWidget *parent )
+KMCommand::KMCommand( TQWidget *tqparent )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( parent )
+ mEmitsCompletedItself( false ), mParent( tqparent )
{
}
-KMCommand::KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList )
+KMCommand::KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( parent ), mMsgList( msgList )
+ mEmitsCompletedItself( false ), mParent( tqparent ), mMsgList( msgList )
{
}
-KMCommand::KMCommand( TQWidget *parent, KMMsgBase *msgBase )
+KMCommand::KMCommand( TQWidget *tqparent, KMMsgBase *msgBase )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( parent )
+ mEmitsCompletedItself( false ), mParent( tqparent )
{
mMsgList.append( msgBase );
}
-KMCommand::KMCommand( TQWidget *parent, KMMessage *msg )
+KMCommand::KMCommand( TQWidget *tqparent, KMMessage *msg )
: mProgressDialog( 0 ), mResult( Undefined ), mDeletesItself( false ),
- mEmitsCompletedItself( false ), mParent( parent )
+ mEmitsCompletedItself( false ), mParent( tqparent )
{
if (msg)
mMsgList.append( &msg->toMsgBase() );
@@ -229,14 +229,14 @@ void KMCommand::slotStart()
this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) );
kmkernel->filterMgr()->ref();
- if (mMsgList.find(0) != -1) {
+ if (mMsgList.tqfind(0) != -1) {
emit messagesTransfered( Failed );
return;
}
if ((mMsgList.count() == 1) &&
(mMsgList.getFirst()->isMessage()) &&
- (mMsgList.getFirst()->parent() == 0))
+ (mMsgList.getFirst()->tqparent() == 0))
{
// Special case of operating on message that isn't in a folder
mRetrievedMsgs.append((KMMessage*)mMsgList.getFirst());
@@ -246,11 +246,11 @@ void KMCommand::slotStart()
for ( KMMsgBase *mb = mMsgList.first(); mb; mb = mMsgList.next() ) {
if ( mb ) {
- if ( !mb->parent() ) {
+ if ( !mb->tqparent() ) {
emit messagesTransfered( Failed );
return;
} else {
- keepFolderOpen( mb->parent() );
+ keepFolderOpen( mb->tqparent() );
}
}
}
@@ -271,7 +271,7 @@ void KMCommand::slotPostTransfer( KMCommand::Result result )
while ( (msg = it.current()) != 0 )
{
++it;
- if (msg->parent())
+ if (msg->tqparent())
msg->setTransferInProgress(false);
}
kmkernel->filterMgr()->deref();
@@ -315,27 +315,27 @@ void KMCommand::transferSelectedMsgs()
thisMsg = static_cast<KMMessage*>(mb);
else
{
- KMFolder *folder = mb->parent();
- int idx = folder->find(mb);
+ KMFolder *folder = mb->tqparent();
+ int idx = folder->tqfind(mb);
if (idx < 0) continue;
thisMsg = folder->getMsg(idx);
}
if (!thisMsg) continue;
if ( thisMsg->transferInProgress() &&
- thisMsg->parent()->folderType() == KMFolderTypeImap )
+ thisMsg->tqparent()->folderType() == KMFolderTypeImap )
{
thisMsg->setTransferInProgress( false, true );
- thisMsg->parent()->ignoreJobsForMessage( thisMsg );
+ thisMsg->tqparent()->ignoreJobsForMessage( thisMsg );
}
- if ( thisMsg->parent() && !thisMsg->isComplete() &&
+ if ( thisMsg->tqparent() && !thisMsg->isComplete() &&
( !mProgressDialog || !mProgressDialog->wasCancelled() ) )
{
kdDebug(5006)<<"### INCOMPLETE\n";
// the message needs to be transferred first
complete = false;
KMCommand::mCountJobs++;
- FolderJob *job = thisMsg->parent()->createJob(thisMsg);
+ FolderJob *job = thisMsg->tqparent()->createJob(thisMsg);
job->setCancellable( false );
totalSize += thisMsg->msgSizeServer();
// emitted when the message was transferred successfully
@@ -436,12 +436,12 @@ void KMCommand::slotTransferCancelled()
KMMessage* msg;
while ( (msg = it.current()) != 0 )
{
- KMFolder *folder = msg->parent();
+ KMFolder *folder = msg->tqparent();
++it;
if (!folder)
continue;
msg->setTransferInProgress(false);
- int idx = folder->find(msg);
+ int idx = folder->tqfind(msg);
if (idx > 0) folder->unGetMsg(idx);
}
mRetrievedMsgs.clear();
@@ -465,8 +465,8 @@ KMCommand::Result KMMailtoComposeCommand::execute()
KMMessage *msg = new KMMessage;
uint id = 0;
- if ( mMessage && mMessage->parent() )
- id = mMessage->parent()->identity();
+ if ( mMessage && mMessage->tqparent() )
+ id = mMessage->tqparent()->identity();
msg->initHeader(id);
msg->setCharset("utf-8");
@@ -481,9 +481,9 @@ KMCommand::Result KMMailtoComposeCommand::execute()
}
-KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *parent,
+KMMailtoReplyCommand::KMMailtoReplyCommand( TQWidget *tqparent,
const KURL &url, KMMessage *msg, const TQString &selection )
- :KMCommand( parent, msg ), mUrl( url ), mSelection( selection )
+ :KMCommand( tqparent, msg ), mUrl( url ), mSelection( selection )
{
}
@@ -506,9 +506,9 @@ KMCommand::Result KMMailtoReplyCommand::execute()
}
-KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *parent,
+KMMailtoForwardCommand::KMMailtoForwardCommand( TQWidget *tqparent,
const KURL &url, KMMessage *msg )
- :KMCommand( parent, msg ), mUrl( url )
+ :KMCommand( tqparent, msg ), mUrl( url )
{
}
@@ -530,8 +530,8 @@ KMCommand::Result KMMailtoForwardCommand::execute()
}
-KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent )
- : KMCommand( parent ), mUrl( url )
+KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent )
+ : KMCommand( tqparent ), mUrl( url )
{
}
@@ -550,8 +550,8 @@ KMCommand::Result KMAddBookmarksCommand::execute()
}
KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
- TQWidget *parent )
- : KMCommand( parent ), mUrl( url )
+ TQWidget *tqparent )
+ : KMCommand( tqparent ), mUrl( url )
{
}
@@ -565,8 +565,8 @@ KMCommand::Result KMMailtoAddAddrBookCommand::execute()
KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
- TQWidget *parent )
- : KMCommand( parent ), mUrl( url )
+ TQWidget *tqparent )
+ : KMCommand( tqparent ), mUrl( url )
{
}
@@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget )
KMCommand::Result KMUrlCopyCommand::execute()
{
- QClipboard* clip = TQApplication::clipboard();
+ TQClipboard* clip = TQApplication::clipboard();
if (mUrl.protocol() == "mailto") {
// put the url into the mouse selection and the clipboard
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
clip->setText( address );
clip->setSelectionMode( false );
clip->setText( address );
- KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
+ KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
} else {
// put the url into the mouse selection and the clipboard
clip->setSelectionMode( true );
clip->setText( mUrl.url() );
clip->setSelectionMode( false );
clip->setText( mUrl.url() );
- KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
+ KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
}
return OK;
@@ -623,8 +623,8 @@ KMCommand::Result KMUrlOpenCommand::execute()
}
-KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *parent )
- : KMCommand( parent ), mUrl( url )
+KMUrlSaveCommand::KMUrlSaveCommand( const KURL &url, TQWidget *tqparent )
+ : KMCommand( tqparent ), mUrl( url )
{
}
@@ -632,14 +632,14 @@ KMCommand::Result KMUrlSaveCommand::execute()
{
if ( mUrl.isEmpty() )
return OK;
- KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString::null,
+ KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString(),
tqparentWidget() );
if ( saveUrl.isEmpty() )
return Canceled;
if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) )
{
if (KMessageBox::warningContinueCancel(0,
- i18n("<qt>File <b>%1</b> exists.<br>Do you want to tqreplace it?</qt>")
+ i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
.arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
!= KMessageBox::Continue)
return Canceled;
@@ -664,45 +664,45 @@ void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job )
}
-KMEditMsgCommand::KMEditMsgCommand( TQWidget *parent, KMMessage *msg )
- :KMCommand( parent, msg )
+KMEditMsgCommand::KMEditMsgCommand( TQWidget *tqparent, KMMessage *msg )
+ :KMCommand( tqparent, msg )
{
}
KMCommand::Result KMEditMsgCommand::execute()
{
KMMessage *msg = retrievedMessage();
- if ( !msg || !msg->parent() ||
- ( !kmkernel->folderIsDraftOrOutbox( msg->parent() ) &&
- !kmkernel->folderIsTemplates( msg->parent() ) ) )
+ if ( !msg || !msg->tqparent() ||
+ ( !kmkernel->folderIsDraftOrOutbox( msg->tqparent() ) &&
+ !kmkernel->folderIsTemplates( msg->tqparent() ) ) )
return Failed;
- // Remember the old parent, we need it a bit further down to be able
+ // Remember the old tqparent, we need it a bit further down to be able
// to put the unchanged messsage back in the original folder if the nth
// edit is discarded, for n > 1.
- KMFolder *parent = msg->parent();
- if ( parent )
- parent->take( parent->find( msg ) );
+ KMFolder *tqparent = msg->tqparent();
+ if ( tqparent )
+ tqparent->take( tqparent->tqfind( msg ) );
KMail::Composer * win = KMail::makeComposer();
msg->setTransferInProgress(false); // From here on on, the composer owns the message.
win->setMsg(msg, false, true);
- win->setFolder( parent );
+ win->setFolder( tqparent );
win->show();
return OK;
}
-KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *parent, KMMessage *msg )
- :KMCommand( parent, msg )
+KMUseTemplateCommand::KMUseTemplateCommand( TQWidget *tqparent, KMMessage *msg )
+ :KMCommand( tqparent, msg )
{
}
KMCommand::Result KMUseTemplateCommand::execute()
{
KMMessage *msg = retrievedMessage();
- if ( !msg || !msg->parent() ||
- !kmkernel->folderIsTemplates( msg->parent() ) )
+ if ( !msg || !msg->tqparent() ||
+ !kmkernel->folderIsTemplates( msg->tqparent() ) )
return Failed;
// Take a copy of the original message, which remains unchanged.
@@ -721,9 +721,9 @@ KMCommand::Result KMUseTemplateCommand::execute()
return OK;
}
-KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *parent,
+KMShowMsgSrcCommand::KMShowMsgSrcCommand( TQWidget *tqparent,
KMMessage *msg, bool fixedFont )
- :KMCommand( parent, msg ), mFixedFont( fixedFont )
+ :KMCommand( tqparent, msg ), mFixedFont( fixedFont )
{
// remember complete state
mMsgWasComplete = msg->isComplete();
@@ -763,7 +763,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
static KURL subjectToUrl( const TQString & subject )
{
- // We need to tqreplace colons with underscores since those cause problems with KFileDialog (bug
+ // We need to replace colons with underscores since those cause problems with KFileDialog (bug
// in KFileDialog though) and also on Windows filesystems.
// We also look at the special case of ": ", since converting that to "_ " would look strange,
// simply "_" looks better.
@@ -782,8 +782,8 @@ static KURL subjectToUrl( const TQString & subject )
return KFileDialog::getSaveURL( cleanSubject, filter );
}
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
- : KMCommand( parent ),
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent, KMMessage * msg )
+ : KMCommand( tqparent ),
mMsgListIndex( 0 ),
mStandAloneMessage( 0 ),
mOffset( 0 ),
@@ -797,8 +797,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
// from an .eml file.
if ( msg->getMsgSerNum() != 0 ) {
mMsgList.append( msg->getMsgSerNum() );
- if ( msg->parent() ) {
- msg->parent()->open( "kmsavemsgcommand" );
+ if ( msg->tqparent() ) {
+ msg->tqparent()->open( "kmsavemsgcommand" );
}
} else {
mStandAloneMessage = msg;
@@ -806,9 +806,9 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent, KMMessage * msg )
mUrl = subjectToUrl( msg->cleanSubject() );
}
-KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent,
+KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *tqparent,
const TQPtrList<KMMsgBase> &msgList )
- : KMCommand( parent ),
+ : KMCommand( tqparent ),
mMsgListIndex( 0 ),
mStandAloneMessage( 0 ),
mOffset( 0 ),
@@ -826,8 +826,8 @@ KMSaveMsgCommand::KMSaveMsgCommand( TQWidget *parent,
while ( it.current() ) {
mMsgList.append( (*it)->getMsgSerNum() );
mTotalSize += (*it)->msgSize();
- if ((*it)->parent() != 0)
- (*it)->parent()->open("kmcommand");
+ if ((*it)->tqparent() != 0)
+ (*it)->tqparent()->open("kmcommand");
++it;
}
mMsgListIndex = 0;
@@ -895,8 +895,8 @@ void KMSaveMsgCommand::slotSaveDataReq()
slotMessageRetrievedForSaving( msg );
} else {
// retrieve Message first
- if ( msg->parent() && !msg->isComplete() ) {
- FolderJob *job = msg->parent()->createJob( msg );
+ if ( msg->tqparent() && !msg->isComplete() ) {
+ FolderJob *job = msg->tqparent()->createJob( msg );
job->setCancellable( false );
connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ),
this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) );
@@ -944,12 +944,12 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
}
++mMsgListIndex;
// Get rid of the message.
- if ( msg && msg->parent() && msg->getMsgSerNum() &&
+ if ( msg && msg->tqparent() && msg->getMsgSerNum() &&
mUngetMsgs.tqcontains( msg ) ) {
int idx = -1;
KMFolder * p = 0;
KMMsgDict::instance()->getLocation( msg, &p, &idx );
- assert( p == msg->parent() ); assert( idx >= 0 );
+ assert( p == msg->tqparent() ); assert( idx >= 0 );
p->unGetMsg( idx );
p->close("kmcommand");
}
@@ -962,7 +962,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
{
if (KMessageBox::warningContinueCancel(0,
- i18n("File %1 exists.\nDo you want to tqreplace it?")
+ i18n("File %1 exists.\nDo you want to replace it?")
.arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
== KMessageBox::Continue) {
mOffset = 0;
@@ -993,9 +993,9 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
//-----------------------------------------------------------------------------
-KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *parent, const KURL & url,
+KMOpenMsgCommand::KMOpenMsgCommand( TQWidget *tqparent, const KURL & url,
const TQString & encoding )
- : KMCommand( parent ),
+ : KMCommand( tqparent ),
mUrl( url ),
mEncoding( encoding )
{
@@ -1041,7 +1041,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
else {
int startOfMessage = 0;
if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) {
- startOfMessage = mMsgString.find( '\n' );
+ startOfMessage = mMsgString.tqfind( '\n' );
if ( startOfMessage == -1 ) {
KMessageBox::sorry( tqparentWidget(),
i18n( "The file does not contain a message." ) );
@@ -1060,7 +1060,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
}
// check for multiple messages in the file
bool multipleMessages = true;
- int endOfMessage = mMsgString.find( "\nFrom " );
+ int endOfMessage = mMsgString.tqfind( "\nFrom " );
if ( endOfMessage == -1 ) {
endOfMessage = mMsgString.length();
multipleMessages = false;
@@ -1090,7 +1090,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
win->show();
if ( multipleMessages )
KMessageBox::information( win,
- i18n( "The file tqcontains multiple messages. "
+ i18n( "The file contains multiple messages. "
"Only the first message is shown." ) );
setResult( OK );
emit completed( this );
@@ -1102,9 +1102,9 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
//TODO: ReplyTo, NoQuoteReplyTo, ReplyList, ReplyToAll, ReplyAuthor
// are all similar and should be factored
-KMReplyToCommand::KMReplyToCommand( TQWidget *parent, KMMessage *msg,
+KMReplyToCommand::KMReplyToCommand( TQWidget *tqparent, KMMessage *msg,
const TQString &selection )
- : KMCommand( parent, msg ), mSelection( selection )
+ : KMCommand( tqparent, msg ), mSelection( selection )
{
}
@@ -1125,9 +1125,9 @@ KMCommand::Result KMReplyToCommand::execute()
}
-KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *parent,
+KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( TQWidget *tqparent,
KMMessage *msg )
- : KMCommand( parent, msg )
+ : KMCommand( tqparent, msg )
{
}
@@ -1148,9 +1148,9 @@ KMCommand::Result KMNoQuoteReplyToCommand::execute()
}
-KMReplyListCommand::KMReplyListCommand( TQWidget *parent,
+KMReplyListCommand::KMReplyListCommand( TQWidget *tqparent,
KMMessage *msg, const TQString &selection )
- : KMCommand( parent, msg ), mSelection( selection )
+ : KMCommand( tqparent, msg ), mSelection( selection )
{
}
@@ -1171,9 +1171,9 @@ KMCommand::Result KMReplyListCommand::execute()
}
-KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *parent,
+KMReplyToAllCommand::KMReplyToAllCommand( TQWidget *tqparent,
KMMessage *msg, const TQString &selection )
- :KMCommand( parent, msg ), mSelection( selection )
+ :KMCommand( tqparent, msg ), mSelection( selection )
{
}
@@ -1194,9 +1194,9 @@ KMCommand::Result KMReplyToAllCommand::execute()
}
-KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
+KMReplyAuthorCommand::KMReplyAuthorCommand( TQWidget *tqparent, KMMessage *msg,
const TQString &selection )
- : KMCommand( parent, msg ), mSelection( selection )
+ : KMCommand( tqparent, msg ), mSelection( selection )
{
}
@@ -1217,16 +1217,16 @@ KMCommand::Result KMReplyAuthorCommand::execute()
}
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
const TQPtrList<KMMsgBase> &msgList, uint identity )
- : KMCommand( parent, msgList ),
+ : KMCommand( tqparent, msgList ),
mIdentity( identity )
{
}
-KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *parent,
+KMForwardInlineCommand::KMForwardInlineCommand( TQWidget *tqparent,
KMMessage *msg, uint identity )
- : KMCommand( parent, msg ),
+ : KMCommand( tqparent, msg ),
mIdentity( identity )
{
}
@@ -1290,16 +1290,16 @@ KMCommand::Result KMForwardInlineCommand::execute()
}
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win )
- : KMCommand( parent, msgList ), mIdentity( identity ),
+ : KMCommand( tqparent, msgList ), mIdentity( identity ),
mWin( TQGuardedPtr<KMail::Composer>( win ))
{
}
-KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *parent,
+KMForwardAttachedCommand::KMForwardAttachedCommand( TQWidget *tqparent,
KMMessage * msg, uint identity, KMail::Composer *win )
- : KMCommand( parent, msg ), mIdentity( identity ),
+ : KMCommand( tqparent, msg ), mIdentity( identity ),
mWin( TQGuardedPtr< KMail::Composer >( win ))
{
}
@@ -1353,16 +1353,16 @@ KMCommand::Result KMForwardAttachedCommand::execute()
}
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
const TQPtrList<KMMsgBase> &msgList, uint identity, KMail::Composer *win )
- : KMCommand( parent, msgList ), mIdentity( identity ),
+ : KMCommand( tqparent, msgList ), mIdentity( identity ),
mWin( TQGuardedPtr<KMail::Composer>( win ))
{
}
-KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *parent,
+KMForwardDigestCommand::KMForwardDigestCommand( TQWidget *tqparent,
KMMessage * msg, uint identity, KMail::Composer *win )
- : KMCommand( parent, msg ), mIdentity( identity ),
+ : KMCommand( tqparent, msg ), mIdentity( identity ),
mWin( TQGuardedPtr< KMail::Composer >( win ))
{
}
@@ -1440,9 +1440,9 @@ KMCommand::Result KMForwardDigestCommand::execute()
return OK;
}
-KMRedirectCommand::KMRedirectCommand( TQWidget *parent,
+KMRedirectCommand::KMRedirectCommand( TQWidget *tqparent,
KMMessage *msg )
- : KMCommand( parent, msg )
+ : KMCommand( tqparent, msg )
{
}
@@ -1470,10 +1470,10 @@ KMCommand::Result KMRedirectCommand::execute()
}
-KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
+KMCustomReplyToCommand::KMCustomReplyToCommand( TQWidget *tqparent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl )
- : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
+ : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
{
}
@@ -1495,10 +1495,10 @@ KMCommand::Result KMCustomReplyToCommand::execute()
}
-KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
+KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( TQWidget *tqparent, KMMessage *msg,
const TQString &selection,
const TQString &tmpl )
- : KMCommand( parent, msg ), mSelection( selection ), mTemplate( tmpl )
+ : KMCommand( tqparent, msg ), mSelection( selection ), mTemplate( tmpl )
{
}
@@ -1520,16 +1520,16 @@ KMCommand::Result KMCustomReplyAllToCommand::execute()
}
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
const TQPtrList<KMMsgBase> &msgList, uint identity, const TQString &tmpl )
- : KMCommand( parent, msgList ),
+ : KMCommand( tqparent, msgList ),
mIdentity( identity ), mTemplate( tmpl )
{
}
-KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *parent,
+KMCustomForwardCommand::KMCustomForwardCommand( TQWidget *tqparent,
KMMessage *msg, uint identity, const TQString &tmpl )
- : KMCommand( parent, msg ),
+ : KMCommand( tqparent, msg ),
mIdentity( identity ), mTemplate( tmpl )
{
}
@@ -1593,12 +1593,12 @@ KMCommand::Result KMCustomForwardCommand::execute()
}
-KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg,
+KMPrintCommand::KMPrintCommand( TQWidget *tqparent, KMMessage *msg,
const KMail::HeaderStyle *headerStyle,
const KMail::HeaderStrategy *headerStrategy,
bool htmlOverride, bool htmlLoadExtOverride,
bool useFixedFont, const TQString & encoding )
- : KMCommand( parent, msg ),
+ : KMCommand( tqparent, msg ),
mHeaderStyle( headerStyle ), mHeaderStrategy( headerStrategy ),
mHtmlOverride( htmlOverride ),
mHtmlLoadExtOverride( htmlLoadExtOverride ),
@@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute()
}
-KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
+KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status,
const TQValueList<TQ_UINT32> &serNums, bool toggle )
- : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
+ : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle )
{
}
@@ -1650,19 +1650,19 @@ KMCommand::Result KMSeStatusCommand::execute()
TQValueListIterator<TQ_UINT32> it;
int idx = -1;
KMFolder *folder = 0;
- bool parenStatus = false;
+ bool tqparentqStatus = false;
// Toggle actions on threads toggle the whole thread
- // depending on the state of the parent.
+ // depending on the state of the tqparent.
if (mToggle) {
KMMsgBase *msg;
KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx );
if (folder) {
msg = folder->getMsgBase(idx);
- if (msg && (msg->status()&mStatus))
- parenStatus = true;
+ if (msg && (msg->status()&mtqStatus))
+ tqparentqStatus = true;
else
- parenStatus = false;
+ tqparentqStatus = false;
}
}
TQMap< KMFolder*, TQValueList<int> > folderMap;
@@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute()
KMMsgBase *msg = folder->getMsgBase(idx);
// check if we are already at the target toggle state
if (msg) {
- bool myStatus;
- if (msg->status()&mStatus)
- myStatus = true;
+ bool mytqStatus;
+ if (msg->status()&mtqStatus)
+ mytqStatus = true;
else
- myStatus = false;
- if (myStatus != parenStatus)
+ mytqStatus = false;
+ if (mytqStatus != tqparentqStatus)
continue;
}
}
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute()
TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
while ( it2 != folderMap.end() ) {
KMFolder *f = it2.key();
- f->seStatus( (*it2), mStatus, mToggle );
+ f->setqStatus( (*it2), mtqStatus, mToggle );
++it2;
}
//kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -1712,10 +1712,10 @@ KMCommand::Result KMFilterCommand::execute()
}
-KMFilterActionCommand::KMFilterActionCommand( TQWidget *parent,
+KMFilterActionCommand::KMFilterActionCommand( TQWidget *tqparent,
const TQPtrList<KMMsgBase> &msgList,
KMFilter *filter )
- : KMCommand( parent, msgList ), mFilter( filter )
+ : KMCommand( tqparent, msgList ), mFilter( filter )
{
TQPtrListIterator<KMMsgBase> it(msgList);
while ( it.current() ) {
@@ -1742,7 +1742,7 @@ KMCommand::Result KMFilterActionCommand::execute()
progressItem->updateProgress();
TQString statusMsg = i18n("Filtering message %1 of %2");
statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
- KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
+ KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
}
@@ -1821,9 +1821,9 @@ void FolderShortcutCommand::setAction( KAction* action )
mAction = action;
}
-KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *parent,
+KMMailingListFilterCommand::KMMailingListFilterCommand( TQWidget *tqparent,
KMMessage *msg )
- : KMCommand( parent, msg )
+ : KMCommand( tqparent, msg )
{
}
@@ -1984,12 +1984,12 @@ KMCommand::Result KMCopyCommand::execute()
for (msgBase = mMsgList.first(); msgBase; msgBase = mMsgList.next() )
{
- KMFolder *srcFolder = msgBase->parent();
+ KMFolder *srcFolder = msgBase->tqparent();
if (( isMessage = msgBase->isMessage() ))
{
msg = static_cast<KMMessage*>(msgBase);
} else {
- idx = srcFolder->find(msgBase);
+ idx = srcFolder->tqfind(msgBase);
assert(idx != -1);
msg = srcFolder->getMsg(idx);
// corrupt IMAP cache, see FolderStorage::getMsg()
@@ -2015,12 +2015,12 @@ KMCommand::Result KMCopyCommand::execute()
// make sure the attachment state is only calculated when it's complete
if (!newMsg->isComplete())
newMsg->setReadyToShow(false);
- newMsg->seStatus(msg->status());
+ newMsg->setqStatus(msg->status());
if (srcFolder && !newMsg->isComplete())
{
// imap => others
- newMsg->setParent(msg->parent());
+ newMsg->setParent(msg->tqparent());
FolderJob *job = srcFolder->createJob(newMsg);
job->setCancellable( false );
mPendingJobs << job;
@@ -2307,7 +2307,7 @@ void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool succe
void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum)
{
- if ( folder != mDestFolder || mLostBoys.find( serNum ) == mLostBoys.end() ) {
+ if ( folder != mDestFolder || mLostBoys.tqfind( serNum ) == mLostBoys.end() ) {
//kdDebug(5006) << "KMMoveCommand::msgAddedToDestFolder different "
// "folder or invalid serial number." << endl;
return;
@@ -2421,7 +2421,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
TQString query=mUrl.query();
while (!query.isEmpty()) {
TQString queryPart;
- int secondQuery = query.find('?',1);
+ int secondQuery = query.tqfind('?',1);
if (secondQuery != -1)
queryPart = query.left(secondQuery);
else
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
(mUrl.protocol() == "smb") || (mUrl.protocol() == "fish") ||
(mUrl.protocol() == "news"))
{
- KPIM::BroadcasStatus::instance()->seStatusMsg( i18n("Opening URL..."));
+ KPIM::BroadcastqStatus::instance()->seStatusMsg( i18n("Opening URL..."));
KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
if (mime->name() == "application/x-desktop" ||
mime->name() == "application/x-executable" ||
@@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
mime->name() == "application/x-shellscript" )
{
if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" )
- .arg( mUrl.prettyURL() ), TQString::null, i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
+ .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
return Canceled;
}
KRun * runner = new KRun( mUrl );
@@ -2473,19 +2473,19 @@ KMCommand::Result KMUrlClickedCommand::execute()
return OK;
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, KMMessage *msg )
- : KMCommand( parent, msg ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, KMMessage *msg )
+ : KMCommand( tqparent, msg ), mImplicitAttachments( true ), mEncoded( false )
{
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, const TQPtrList<KMMsgBase>& msgs )
- : KMCommand( parent, msgs ), mImplicitAttachments( true ), mEncoded( false )
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase>& msgs )
+ : KMCommand( tqparent, msgs ), mImplicitAttachments( true ), mEncoded( false )
{
}
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *parent, TQPtrList<partNode>& attachments,
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand( TQWidget *tqparent, TQPtrList<partNode>& attachments,
KMMessage *msg, bool encoded )
- : KMCommand( parent ), mImplicitAttachments( false ), mEncoded( encoded )
+ : KMCommand( tqparent ), mImplicitAttachments( false ), mEncoded( encoded )
{
for ( TQPtrListIterator<partNode> it( attachments ); it.current(); ++it ) {
mAttachmentMap.insert( it.current(), msg );
@@ -2534,7 +2534,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
// considered attachments
if ( it.key()->msgPart().fileName().stripWhiteSpace().isEmpty() &&
( it.key()->msgPart().name().stripWhiteSpace().isEmpty() ||
- !it.key()->parentNode() ) ) {
+ !it.key()->tqparentNode() ) ) {
PartNodeMessageMap::iterator delIt = it;
++it;
mAttachmentMap.remove( delIt );
@@ -2554,7 +2554,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
KURL url, dirUrl;
if ( mAttachmentMap.count() > 1 ) {
// get the dir
- dirUrl = KDirSelectDialog::selectDirectory( TQString::null, false,
+ dirUrl = KDirSelectDialog::selectDirectory( TQString(), false,
tqparentWidget(),
i18n("Save Attachments To") );
if ( !dirUrl.isValid() ) {
@@ -2570,15 +2570,15 @@ void KMSaveAttachmentsCommand::slotSaveAll()
else {
// only one item, get the desired filename
partNode *node = mAttachmentMap.begin().key();
- // tqreplace all ':' with '_' because ':' isn't allowed on FAT volumes
+ // replace all ':' with '_' because ':' isn't allowed on FAT volumes
TQString s =
node->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
if ( s.isEmpty() )
s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
if ( s.isEmpty() )
s = i18n("filename for an unnamed attachment", "attachment.1");
- url = KFileDialog::getSaveURL( s, TQString::null, tqparentWidget(),
- TQString::null );
+ url = KFileDialog::getSaveURL( s, TQString(), tqparentWidget(),
+ TQString() );
if ( url.isEmpty() ) {
setResult( Canceled );
emit completed( this );
@@ -2759,7 +2759,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
}
// #79685 by default use the umask the user defined, but let it be configurable
- if ( GlobalSettings::self()->disregardUmask() )
+ if ( GlobalSettings::self()->disregardUtqmask() )
fchmod( file.handle(), S_IRUSR | S_IWUSR );
ds.setDevice( &file );
@@ -2814,7 +2814,7 @@ void KMLoadPartsCommand::slotStart()
!it.key()->msgPart().partSpecifier().isEmpty() ) {
// incomplete part, so retrieve it first
++mNeedsRetrieval;
- KMFolder* curFolder = it.data()->parent();
+ KMFolder* curFolder = it.data()->tqparent();
if ( curFolder ) {
FolderJob *job =
curFolder->createJob( it.data(), FolderJob::tGetMessage,
@@ -2824,7 +2824,7 @@ void KMLoadPartsCommand::slotStart()
this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) );
job->start();
} else
- kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl;
+ kdWarning(5006) << "KMLoadPartsCommand - msg has no tqparent" << endl;
}
}
if ( mNeedsRetrieval == 0 )
@@ -2860,9 +2860,9 @@ KMCommand::Result KMLoadPartsCommand::execute()
return OK;
}
-KMResendMessageCommand::KMResendMessageCommand( TQWidget *parent,
+KMResendMessageCommand::KMResendMessageCommand( TQWidget *tqparent,
KMMessage *msg )
- :KMCommand( parent, msg )
+ :KMCommand( tqparent, msg )
{
}
@@ -2892,8 +2892,8 @@ KMCommand::Result KMResendMessageCommand::execute()
return OK;
}
-KMMailingListCommand::KMMailingListCommand( TQWidget *parent, KMFolder *folder )
- : KMCommand( parent ), mFolder( folder )
+KMMailingListCommand::KMMailingListCommand( TQWidget *tqparent, KMFolder *folder )
+ : KMCommand( tqparent ), mFolder( folder )
{
}
@@ -2931,8 +2931,8 @@ void KMMailingListCommand::commandCompleted( KMCommand *command )
deleteLater();
}
-KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *parent, KMFolder *folder )
- : KMMailingListCommand( parent, folder )
+KMMailingListPostCommand::KMMailingListPostCommand( TQWidget *tqparent, KMFolder *folder )
+ : KMMailingListCommand( tqparent, folder )
{
}
KURL::List KMMailingListPostCommand::urls() const
@@ -2940,8 +2940,8 @@ KURL::List KMMailingListPostCommand::urls() const
return mFolder->mailingList().postURLS();
}
-KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder )
- : KMMailingListCommand( parent, folder )
+KMMailingListSubscribeCommand::KMMailingListSubscribeCommand( TQWidget *tqparent, KMFolder *folder )
+ : KMMailingListCommand( tqparent, folder )
{
}
KURL::List KMMailingListSubscribeCommand::urls() const
@@ -2949,8 +2949,8 @@ KURL::List KMMailingListSubscribeCommand::urls() const
return mFolder->mailingList().subscribeURLS();
}
-KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder )
- : KMMailingListCommand( parent, folder )
+KMMailingListUnsubscribeCommand::KMMailingListUnsubscribeCommand( TQWidget *tqparent, KMFolder *folder )
+ : KMMailingListCommand( tqparent, folder )
{
}
KURL::List KMMailingListUnsubscribeCommand::urls() const
@@ -2958,8 +2958,8 @@ KURL::List KMMailingListUnsubscribeCommand::urls() const
return mFolder->mailingList().unsubscribeURLS();
}
-KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder )
- : KMMailingListCommand( parent, folder )
+KMMailingListArchivesCommand::KMMailingListArchivesCommand( TQWidget *tqparent, KMFolder *folder )
+ : KMMailingListCommand( tqparent, folder )
{
}
KURL::List KMMailingListArchivesCommand::urls() const
@@ -2967,8 +2967,8 @@ KURL::List KMMailingListArchivesCommand::urls() const
return mFolder->mailingList().archiveURLS();
}
-KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder )
- : KMMailingListCommand( parent, folder )
+KMMailingListHelpCommand::KMMailingListHelpCommand( TQWidget *tqparent, KMFolder *folder )
+ : KMMailingListCommand( tqparent, folder )
{
}
KURL::List KMMailingListHelpCommand::urls() const
@@ -2987,7 +2987,7 @@ KMCommand::Result KMIMChatCommand::execute()
TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() );
// find UID for mail address
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
- KABC::AddresseeList addressees = addressBook->tqfindByEmail( KPIM::getEmailAddress( addr ) ) ;
+ KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ;
// start chat
if( addressees.count() == 1 ) {
@@ -3022,8 +3022,8 @@ KMCommand::Result KMIMChatCommand::execute()
KMHandleAttachmentCommand::KMHandleAttachmentCommand( partNode* node,
KMMessage* msg, int atmId, const TQString& atmName,
- AttachmentAction action, KService::Ptr offer, TQWidget* parent )
-: KMCommand( parent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
+ AttachmentAction action, KService::Ptr offer, TQWidget* tqparent )
+: KMCommand( tqparent ), mNode( node ), mMsg( msg ), mAtmId( atmId ), mAtmName( atmName ),
mAction( action ), mOffer( offer ), mJob( 0 )
{
}
@@ -3109,7 +3109,7 @@ TQString KMHandleAttachmentCommand::createAtmFileLink() const
if ( ::link(TQFile::encodeName( mAtmName ), TQFile::encodeName( linkName )) == 0 ) {
return linkName; // success
}
- return TQString::null;
+ return TQString();
}
KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
@@ -3128,13 +3128,13 @@ KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
mimetype = KMimeType::mimeType( contentTypeStr );
if ( mimetype->name() == "application/octet-stream" ) {
// consider the filename if Content-Type is application/octet-stream
- mimetype = KMimeType::tqfindByPath( mAtmName, 0, true /* no disk access */ );
+ mimetype = KMimeType::findByPath( mAtmName, 0, true /* no disk access */ );
}
if ( ( mimetype->name() == "application/octet-stream" )
&& msgPart.isComplete() ) {
// consider the attachment's contents if neither the Content-Type header
// nor the filename give us a clue
- mimetype = KMimeType::tqfindByFileContent( mAtmName );
+ mimetype = KMimeType::findByFileContent( mAtmName );
}
return KServiceTypeProfile::preferredService( mimetype->name(), "Application" );
}
@@ -3325,7 +3325,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
return;
}
- const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, tqparentWidget() );
+ const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString(), tqparentWidget() );
if ( url.isEmpty() )
return;
@@ -3349,15 +3349,15 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job
}
-AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
- KMCommand( parent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
+ KMCommand( tqparent, msg ),
mPartIndex( node->nodeId() ),
mSernum( 0 )
{
}
-AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent )
- : KMCommand( parent, msg ),
+AttachmentModifyCommand::AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
+ : KMCommand( tqparent, msg ),
mPartIndex( nodeId ),
mSernum( 0 )
{
@@ -3374,7 +3374,7 @@ KMCommand::Result AttachmentModifyCommand::execute()
return Failed;
mSernum = msg->getMsgSerNum();
- mFolder = msg->parent();
+ mFolder = msg->tqparent();
if ( !mFolder || !mFolder->storage() )
return Failed;
@@ -3427,14 +3427,14 @@ void AttachmentModifyCommand::messageDeleteResult(KMCommand * cmd)
deleteLater();
}
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
- AttachmentModifyCommand( node, msg, parent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
+ AttachmentModifyCommand( node, msg, tqparent )
{
kdDebug(5006) << k_funcinfo << endl;
}
-KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
- : AttachmentModifyCommand( nodeId, msg, parent )
+KMDeleteAttachmentCommand::KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
+ : AttachmentModifyCommand( nodeId, msg, tqparent )
{
kdDebug(5006) << k_funcinfo << endl;
}
@@ -3452,22 +3452,22 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
KMMessage *newMsg = new KMMessage();
newMsg->fromDwString( msg->asDwString() );
- newMsg->seStatus( msg->status() );
+ newMsg->setqStatus( msg->status() );
storeChangedMessage( newMsg );
return OK;
}
-KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * parent) :
- AttachmentModifyCommand( node, msg, parent )
+KMEditAttachmentCommand::KMEditAttachmentCommand(partNode * node, KMMessage * msg, TQWidget * tqparent) :
+ AttachmentModifyCommand( node, msg, tqparent )
{
kdDebug(5006) << k_funcinfo << endl;
mTempFile.setAutoDelete( true );
}
-KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent )
- : AttachmentModifyCommand( nodeId, msg, parent )
+KMEditAttachmentCommand::KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *tqparent )
+ : AttachmentModifyCommand( nodeId, msg, tqparent )
{
kdDebug(5006) << k_funcinfo << endl;
mTempFile.setAutoDelete( true );
@@ -3529,28 +3529,28 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
DwBodyPart *dwpart = msg->findPart( mPartIndex );
KMMessage::bodyPart( dwpart, &part, true );
- DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
- assert( parentNode );
- parentNode->RemoveBodyPart( dwpart );
+ DwBody *tqparentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
+ assert( tqparentNode );
+ tqparentNode->RemoveBodyPart( dwpart );
KMMessagePart att;
att.duplicate( part );
att.setBodyEncodedBinary( data );
DwBodyPart* newDwPart = msg->createDWBodyPart( &att );
- parentNode->AddBodyPart( newDwPart );
+ tqparentNode->AddBodyPart( newDwPart );
msg->getTopLevelPart()->Assemble();
KMMessage *newMsg = new KMMessage();
newMsg->fromDwString( msg->asDwString() );
- newMsg->seStatus( msg->status() );
+ newMsg->setqStatus( msg->status() );
storeChangedMessage( newMsg );
}
-CreateTodoCommand::CreateTodoCommand(TQWidget * parent, KMMessage * msg)
- : KMCommand( parent, msg )
+CreateTodoCommand::CreateTodoCommand(TQWidget * tqparent, KMMessage * msg)
+ : KMCommand( tqparent, msg )
{
}
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 5fbebb65..173f98ee 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -11,7 +11,7 @@
#include <tqtimer.h>
#include <tqfont.h>
#include <kio/job.h>
-#include "kmmsgbase.h" // for KMMsgStatus
+#include "kmmsgbase.h" // for KMMsgtqStatus
#include <mimelib/string.h>
#include <kdepimmacros.h>
#include <kservice.h>
@@ -48,22 +48,23 @@ namespace Kleo { class SpecialJob; }
typedef TQMap<int,KMFolder*> KMMenuToFolder;
typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap;
-class KDE_EXPORT KMCommand : public QObject
+class KDE_EXPORT KMCommand : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class LaterDeleterWithCommandCompletion;
public:
enum Result { Undefined, OK, Canceled, Failed };
// Trival constructor, don't retrieve any messages
- KMCommand( TQWidget *parent = 0 );
+ KMCommand( TQWidget *tqparent = 0 );
// Retrieve all messages in msgList when start is called.
- KMCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
+ KMCommand( TQWidget *tqparent, const TQPtrList<KMMsgBase> &msgList );
// Retrieve the single message msgBase when start is called.
- KMCommand( TQWidget *parent, KMMsgBase *msgBase );
+ KMCommand( TQWidget *tqparent, KMMsgBase *msgBase );
// Retrieve the single message msgBase when start is called.
- KMCommand( TQWidget *parent, KMMessage *message );
+ KMCommand( TQWidget *tqparent, KMMessage *message );
virtual ~KMCommand();
/** These folders will be closed by the dtor, handy, if you need to keep
@@ -97,7 +98,7 @@ protected:
const TQPtrList<KMMessage> retrievedMsgs() const;
// Returns the single message retrieved
KMMessage *retrievedMessage() const;
- // Returns the parent widget
+ // Returns the tqparent widget
TQWidget *tqparentWidget() const;
bool deletesItself() { return mDeletesItself; }
@@ -164,6 +165,7 @@ private:
class KDE_EXPORT KMMailtoComposeCommand : public KMCommand
{
Q_OBJECT
+ TQ_OBJECT
public:
KMMailtoComposeCommand( const KURL &url, KMMessage *msg=0 );
@@ -178,9 +180,10 @@ private:
class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMMailtoReplyCommand( TQWidget *parent, const KURL &url,
+ KMMailtoReplyCommand( TQWidget *tqparent, const KURL &url,
KMMessage *msg, const TQString &selection );
private:
@@ -193,9 +196,10 @@ private:
class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMMailtoForwardCommand( TQWidget *parent, const KURL &url,
+ KMMailtoForwardCommand( TQWidget *tqparent, const KURL &url,
KMMessage *msg );
private:
@@ -207,9 +211,10 @@ private:
class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent );
+ KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *tqparent );
private:
virtual Result execute();
@@ -220,9 +225,10 @@ private:
class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMAddBookmarksCommand( const KURL &url, TQWidget *parent );
+ KMAddBookmarksCommand( const KURL &url, TQWidget *tqparent );
private:
virtual Result execute();
@@ -234,9 +240,10 @@ private:
class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent );
<