From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: [PATCH] Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- Makefile.am.in | 2 +- akregator/src/Makefile.am | 2 +- akregator/src/actionmanagerimpl.cpp | 4 +- akregator/src/addfeedwidgetbase.ui | 14 +- akregator/src/akregator_part.cpp | 22 +- akregator/src/akregator_part.h | 2 +- akregator/src/akregator_view.cpp | 42 +- akregator/src/akregator_view.h | 8 +- akregator/src/article.cpp | 26 +- akregator/src/article.h | 2 +- akregator/src/articlefilter.cpp | 156 +- akregator/src/articlefilter.h | 8 +- akregator/src/articlelistview.cpp | 10 +- akregator/src/articleviewer.cpp | 6 +- akregator/src/dragobjects.cpp | 6 +- akregator/src/dragobjects.h | 2 +- akregator/src/feed.cpp | 30 +- akregator/src/feed.h | 2 +- akregator/src/feediconmanager.cpp | 6 +- akregator/src/feedlist.cpp | 4 +- akregator/src/feedlist.h | 2 +- akregator/src/feedstorage.h | 6 +- akregator/src/feedstoragedummyimpl.cpp | 80 +- akregator/src/feedstoragedummyimpl.h | 4 +- akregator/src/fetchqueue.cpp | 2 +- akregator/src/folder.cpp | 10 +- akregator/src/frame.cpp | 12 +- akregator/src/frame.h | 2 +- akregator/src/kcursorsaver.h | 6 +- akregator/src/librss/article.cpp | 44 +- akregator/src/librss/article.h | 2 +- akregator/src/librss/category.cpp | 4 +- akregator/src/librss/document.cpp | 304 +- akregator/src/librss/enclosure.cpp | 20 +- akregator/src/librss/image.cpp | 12 +- akregator/src/librss/textinput.cpp | 8 +- akregator/src/librss/tools_p.cpp | 26 +- akregator/src/listtabwidget.cpp | 10 +- akregator/src/mainwindow.cpp | 4 +- akregator/src/mainwindow.h | 2 +- akregator/src/mk4storage/Makefile.am | 4 +- .../src/mk4storage/feedstoragemk4impl.cpp | 14 +- akregator/src/mk4storage/feedstoragemk4impl.h | 4 +- .../src/mk4storage/metakit/include/mk4str.h | 2 +- .../src/mk4storage/metakit/src/column.cpp | 18 +- akregator/src/mk4storage/metakit/src/column.h | 2 +- akregator/src/mk4storage/metakit/src/field.h | 2 +- .../src/mk4storage/metakit/src/format.cpp | 2 +- .../src/mk4storage/metakit/src/handler.h | 2 +- .../src/mk4storage/metakit/src/persist.cpp | 4 +- .../src/mk4storage/metakit/src/remap.cpp | 20 +- .../src/mk4storage/metakit/src/store.cpp | 6 +- akregator/src/mk4storage/metakit/src/view.cpp | 2 +- .../src/mk4storage/metakit/tests/regress.cpp | 6 +- akregator/src/mk4storage/mk4confwidgetbase.ui | 12 +- akregator/src/mk4storage/storagemk4impl.cpp | 2 +- akregator/src/mk4storage/storagemk4impl.h | 2 +- akregator/src/nodelist.cpp | 6 +- akregator/src/pageviewer.cpp | 4 +- akregator/src/progressmanager.cpp | 8 +- akregator/src/propertieswidgetbase.ui | 18 +- akregator/src/searchbar.cpp | 4 +- akregator/src/searchbar.h | 2 +- akregator/src/settings_advancedbase.ui | 8 +- akregator/src/settings_appearance.ui | 6 +- akregator/src/settings_archive.ui | 8 +- akregator/src/settings_browser.ui | 8 +- akregator/src/settings_general.ui | 6 +- akregator/src/simplenodeselector.cpp | 6 +- akregator/src/speechclient.cpp | 2 +- akregator/src/storage.h | 2 +- akregator/src/storagedummyimpl.cpp | 14 +- akregator/src/storagedummyimpl.h | 2 +- akregator/src/storagefactoryregistry.cpp | 6 +- akregator/src/storagefactoryregistry.h | 2 +- akregator/src/tabwidget.cpp | 10 +- akregator/src/tag.h | 2 +- akregator/src/tagaction.cpp | 2 +- akregator/src/tagnode.cpp | 8 +- akregator/src/tagnode.h | 2 +- akregator/src/tagnodelist.cpp | 20 +- akregator/src/tagnodelist.h | 2 +- akregator/src/tagpropertieswidgetbase.ui | 14 +- akregator/src/tagset.cpp | 30 +- akregator/src/tagset.h | 8 +- akregator/src/treenode.h | 2 +- akregator/src/treenodeitem.cpp | 2 +- akregator/src/utils.cpp | 4 +- akregator/src/utils.h | 2 +- akregator/src/viewer.cpp | 4 +- certmanager/certificateinfowidget.ui | 8 +- certmanager/certificateinfowidgetimpl.cpp | 2 +- certmanager/certificatewizard.ui | 32 +- certmanager/certificatewizardimpl.cpp | 8 +- certmanager/certmanager.cpp | 6 +- certmanager/certmanager.h | 2 +- certmanager/conf/appearanceconfigwidget.cpp | 22 +- .../conf/appearanceconfigwidgetbase.ui | 8 +- certmanager/conf/configuredialog.cpp | 12 +- certmanager/hierarchyanalyser.cpp | 2 +- certmanager/kwatchgnupg/kwatchgnupgconfig.cpp | 4 +- .../kwatchgnupg/kwatchgnupgmainwin.cpp | 8 +- .../lib/backends/chiasmus/chiasmusbackend.cpp | 12 +- .../backends/qgpgme/qgpgmecryptoconfig.cpp | 8 +- certmanager/lib/backends/qgpgme/qgpgmejob.h | 8 +- .../qgpgme/qgpgmeprogresstokenmapper.cpp | 2 +- .../backends/qgpgme/qgpgmerefreshkeysjob.cpp | 16 +- .../backends/qgpgme/qgpgmerefreshkeysjob.h | 2 +- .../qgpgme/qgpgmesecretkeyexportjob.cpp | 16 +- .../qgpgme/qgpgmesecretkeyexportjob.h | 2 +- certmanager/lib/cryptplug.cpp | 2 +- certmanager/lib/cryptplug.h | 4 +- certmanager/lib/cryptplugwrapper.cpp | 36 +- certmanager/lib/cryptplugwrapper.h | 50 +- certmanager/lib/kleo/cryptobackendfactory.cpp | 2 +- certmanager/lib/kleo/dn.cpp | 2 +- certmanager/lib/kleo/downloadjob.h | 2 +- certmanager/lib/kleo/exportjob.h | 2 +- .../lib/kleo/hierarchicalkeylistjob.cpp | 2 +- certmanager/lib/kleo/importjob.h | 2 +- certmanager/lib/kleo/job.cpp | 4 +- certmanager/lib/kleo/keyfiltermanager.cpp | 4 +- certmanager/lib/kleo/keylistjob.h | 2 +- certmanager/lib/kleo/refreshkeysjob.h | 2 +- certmanager/lib/kleo/verifydetachedjob.h | 4 +- certmanager/lib/kleo/verifyopaquejob.h | 4 +- certmanager/lib/tests/gnupgviewer.h | 4 +- certmanager/lib/tests/test_cryptoconfig.cpp | 2 +- .../lib/tests/test_gnupgprocessbase.cpp | 8 +- .../lib/ui/adddirectoryservicedialog.ui | 8 +- certmanager/lib/ui/backendconfigwidget.cpp | 4 +- certmanager/lib/ui/cryptoconfigmodule.cpp | 12 +- certmanager/lib/ui/cryptoconfigmodule_p.h | 18 +- .../lib/ui/directoryserviceswidget.cpp | 2 +- .../lib/ui/directoryserviceswidgetbase.ui | 20 +- .../lib/ui/dnattributeorderconfigwidget.cpp | 2 +- certmanager/lib/ui/kdhorizontalline.cpp | 24 +- certmanager/lib/ui/kdhorizontalline.h | 6 +- certmanager/lib/ui/keyapprovaldialog.cpp | 10 +- certmanager/lib/ui/keylistview.cpp | 36 +- certmanager/lib/ui/keylistview.h | 10 +- certmanager/lib/ui/keyrequester.cpp | 4 +- certmanager/lib/ui/keyselectiondialog.cpp | 8 +- certmanager/lib/ui/messagebox.cpp | 2 +- certmanager/lib/ui/progressdialog.cpp | 2 +- certmanager/storedtransferjob.cpp | 2 +- doc/api/doxygen.css | 6 +- .../config/abi/borland_prefix.hpp | 6 +- indexlib/boost-compat/config/auto_link.hpp | 2 +- .../boost-compat/config/platform/macos.hpp | 2 +- .../config/select_stdlib_config.hpp | 2 +- indexlib/boost-compat/config/suffix.hpp | 6 +- indexlib/boost-compat/config/user.hpp | 12 +- indexlib/boost-compat/weak_ptr.hpp | 6 +- indexlib/compat.h | 2 +- indexlib/manager.h | 2 +- indexlib/match.cpp | 10 +- indexlib/match.h | 4 +- kabc/frontend/mainWindow.ui | 12 +- kabc/kabc2mutt/kabc2mutt.cpp | 8 +- kaddressbook/Makefile.am | 2 +- kaddressbook/addresseditwidget.cpp | 18 +- kaddressbook/addresseeeditordialog.cpp | 4 +- kaddressbook/addresseeeditorextension.cpp | 4 +- kaddressbook/addresseeeditorwidget.cpp | 132 +- kaddressbook/addviewdialog.cpp | 18 +- kaddressbook/advancedcustomfields.cpp | 4 +- kaddressbook/common/kabprefs.h | 4 +- kaddressbook/common/locationmap.cpp | 20 +- kaddressbook/contacteditorwidgetmanager.cpp | 2 +- kaddressbook/contacteditorwidgetmanager.h | 2 +- kaddressbook/customfieldswidget.cpp | 40 +- kaddressbook/distributionlisteditor.cpp | 16 +- kaddressbook/distributionlistentryview.cpp | 8 +- kaddressbook/distributionlistpicker.cpp | 10 +- kaddressbook/editors/Makefile.am | 2 +- kaddressbook/editors/imaddressbase.ui | 4 +- kaddressbook/editors/imeditorbase.ui | 10 +- kaddressbook/editors/imeditorwidget.cpp | 22 +- kaddressbook/editors/imeditorwidget.h | 2 +- kaddressbook/emaileditwidget.cpp | 2 +- kaddressbook/extensionmanager.cpp | 18 +- kaddressbook/features/Makefile.am | 6 +- .../features/distributionlistngwidget.cpp | 10 +- .../features/distributionlistwidget.cpp | 4 +- kaddressbook/filtereditdialog.cpp | 4 +- kaddressbook/freebusywidget.cpp | 6 +- kaddressbook/geowidget.cpp | 6 +- kaddressbook/imagewidget.cpp | 10 +- kaddressbook/incsearchwidget.cpp | 20 +- kaddressbook/interfaces/extensionwidget.cpp | 2 +- kaddressbook/interfaces/xxport.cpp | 2 +- kaddressbook/interfaces/xxport.h | 6 +- kaddressbook/jumpbuttonbar.cpp | 16 +- kaddressbook/kabcore.cpp | 32 +- kaddressbook/kabcore.h | 2 +- kaddressbook/kabtools.cpp | 18 +- kaddressbook/kaddressbook_part.cpp | 6 +- kaddressbook/kaddressbook_part.h | 2 +- kaddressbook/kaddressbookmain.cpp | 2 +- kaddressbook/kaddressbookview.cpp | 8 +- kaddressbook/kcmconfigs/addhostdialog.cpp | 4 +- kaddressbook/kcmconfigs/addresseewidget.cpp | 20 +- .../kcmconfigs/extensionconfigdialog.cpp | 4 +- kaddressbook/kcmconfigs/kabconfigwidget.cpp | 20 +- kaddressbook/kcmconfigs/kcmkabconfig.cpp | 4 +- kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 4 +- kaddressbook/kcmconfigs/ldapoptionswidget.cpp | 10 +- kaddressbook/keywidget.cpp | 16 +- kaddressbook/ldapsearchdialog.cpp | 14 +- kaddressbook/nameeditdialog.cpp | 34 +- kaddressbook/phoneeditwidget.cpp | 32 +- kaddressbook/printing/detailledstyle.cpp | 4 +- kaddressbook/printing/ds_appearance.ui | 30 +- kaddressbook/printing/kabentrypainter.cpp | 20 +- kaddressbook/printing/mikesstyle.cpp | 6 +- kaddressbook/printing/printingwizard.cpp | 4 +- kaddressbook/printing/printprogress.cpp | 2 +- kaddressbook/printing/selectionpage.cpp | 8 +- kaddressbook/printing/stylepage.cpp | 8 +- kaddressbook/secrecywidget.cpp | 4 +- kaddressbook/soundwidget.cpp | 4 +- .../thumbnailcreator/ldifvcardcreator.cpp | 2 +- kaddressbook/typecombo.h | 2 +- kaddressbook/undocmds.cpp | 8 +- kaddressbook/viewconfigurefieldspage.cpp | 10 +- kaddressbook/viewconfigurefilterpage.cpp | 2 +- kaddressbook/viewmanager.cpp | 12 +- kaddressbook/views/Makefile.am | 6 +- kaddressbook/views/cardview.cpp | 72 +- kaddressbook/views/cardview.h | 14 +- .../views/configurecardviewdialog.cpp | 16 +- .../views/configuretableviewdialog.cpp | 10 +- kaddressbook/views/configuretableviewdialog.h | 2 +- kaddressbook/views/contactlistview.cpp | 10 +- kaddressbook/views/kaddressbookcardview.cpp | 8 +- kaddressbook/views/kaddressbookiconview.cpp | 6 +- kaddressbook/views/kaddressbooktableview.cpp | 4 +- kaddressbook/xxport/Makefile.am | 18 +- kaddressbook/xxport/csv_xxport.cpp | 14 +- kaddressbook/xxport/csvimportdialog.cpp | 34 +- kaddressbook/xxport/dateparser.h | 2 +- kaddressbook/xxport/gnokii_xxport.cpp | 90 +- kaddressbook/xxport/kde2_xxport.cpp | 4 +- kaddressbook/xxport/ldif_xxport.cpp | 10 +- kaddressbook/xxport/opera_xxport.cpp | 26 +- kaddressbook/xxport/pab_xxport.cpp | 2 +- kaddressbook/xxport/vcard_xxport.cpp | 52 +- kaddressbook/xxportselectdialog.cpp | 16 +- kalarm/Makefile.am | 2 +- kalarm/alarmcalendar.cpp | 40 +- kalarm/alarmevent.cpp | 96 +- kalarm/alarmevent.h | 8 +- kalarm/alarmlistview.cpp | 20 +- kalarm/alarmlistview.h | 2 +- kalarm/alarmtext.cpp | 16 +- kalarm/alarmtimewidget.cpp | 40 +- kalarm/alarmtimewidget.h | 2 +- kalarm/birthdaydlg.cpp | 42 +- kalarm/calendarcompat.cpp | 10 +- kalarm/daemon.cpp | 20 +- kalarm/dcophandler.cpp | 122 +- kalarm/deferdlg.cpp | 6 +- kalarm/editdlg.cpp | 192 +- kalarm/eventlistviewbase.cpp | 4 +- kalarm/find.cpp | 20 +- kalarm/fontcolour.cpp | 24 +- kalarm/fontcolourbutton.cpp | 18 +- kalarm/functions.cpp | 40 +- kalarm/kalarmapp.cpp | 184 +- kalarm/kalarmd/adcalendar.cpp | 2 +- kalarm/kalarmd/adconfigdata.cpp | 14 +- kalarm/kalarmd/alarmdaemon.cpp | 18 +- kalarm/kamail.cpp | 70 +- kalarm/kamail.h | 2 +- kalarm/karecurrence.cpp | 4 +- kalarm/latecancel.cpp | 20 +- kalarm/latecancel.h | 4 +- kalarm/lib/checkbox.h | 2 +- kalarm/lib/colourcombo.cpp | 4 +- kalarm/lib/colourlist.h | 4 +- kalarm/lib/dateedit.cpp | 2 +- kalarm/lib/dateedit.h | 2 +- kalarm/lib/label.cpp | 2 +- kalarm/lib/lineedit.cpp | 8 +- kalarm/lib/lineedit.h | 6 +- kalarm/lib/messagebox.cpp | 6 +- kalarm/lib/radiobutton.h | 2 +- kalarm/lib/spinbox.cpp | 4 +- kalarm/lib/spinbox2.cpp | 22 +- kalarm/lib/spinbox2.h | 24 +- kalarm/lib/spinbox2private.h | 2 +- kalarm/lib/synchtimer.cpp | 4 +- kalarm/lib/timeedit.cpp | 4 +- kalarm/lib/timeedit.h | 2 +- kalarm/lib/timeperiod.cpp | 4 +- kalarm/lib/timespinbox.cpp | 14 +- kalarm/lib/timespinbox.h | 4 +- kalarm/mainwindow.cpp | 48 +- kalarm/messagewin.cpp | 210 +- kalarm/messagewin.h | 2 +- kalarm/prefdlg.cpp | 244 +- kalarm/preferences.cpp | 148 +- kalarm/recurrenceedit.cpp | 188 +- kalarm/recurrenceeditprivate.h | 2 +- kalarm/reminder.cpp | 12 +- kalarm/repetition.cpp | 28 +- kalarm/sounddlg.cpp | 40 +- kalarm/soundpicker.cpp | 6 +- kalarm/specialactions.cpp | 10 +- kalarm/templatedlg.cpp | 16 +- kalarm/timeselector.cpp | 10 +- kalarm/traywindow.cpp | 4 +- kalarm/undo.cpp | 12 +- kalarm/undo.h | 2 +- kandy/src/cmdpropertiesdialog_base.ui | 6 +- kandy/src/mobilegui.cpp | 18 +- kandy/src/mobilegui.h | 2 +- kandy/src/mobilegui_base.ui | 16 +- kandy/src/mobilemain.cpp | 6 +- kandy/src/mobilemain.h | 2 +- karm/csvexportdialog_base.ui | 10 +- karm/desktoptracker.cpp | 2 +- karm/desktoptracker.h | 2 +- karm/edittaskdialog.cpp | 12 +- karm/idletimedetector.cpp | 6 +- karm/karm_part.cpp | 36 +- karm/karm_part.h | 4 +- karm/karmstorage.cpp | 78 +- karm/karmstorage.h | 2 +- karm/karmutility.cpp | 2 +- karm/ktimewidget.cpp | 18 +- karm/mainwindow.cpp | 52 +- karm/mainwindow.h | 4 +- karm/plannerparser.cpp | 8 +- karm/preferences.cpp | 96 +- karm/print.cpp | 2 +- karm/printdialog.cpp | 26 +- karm/reportcriteria.h | 2 +- karm/task.cpp | 14 +- karm/task.h | 4 +- karm/taskview.cpp | 2 +- karm/taskview.h | 4 +- karm/test/lockerthread.cpp | 2 +- karm/test/locking.cpp | 6 +- karm/test/script.cpp | 2 +- karm/timekard.cpp | 48 +- kdgantt/KDGanttMinimizeSplitter.cpp | 160 +- kdgantt/KDGanttMinimizeSplitter.h | 6 +- kdgantt/KDGanttSemiSizingControl.cpp | 32 +- kdgantt/KDGanttSemiSizingControl.h | 2 +- kdgantt/KDGanttView.cpp | 192 +- kdgantt/KDGanttView.h | 12 +- kdgantt/KDGanttViewEventItem.cpp | 2 +- kdgantt/KDGanttViewItem.cpp | 126 +- kdgantt/KDGanttViewItem.h | 6 +- kdgantt/KDGanttViewItemDrag.cpp | 6 +- kdgantt/KDGanttViewItemDrag.h | 2 +- kdgantt/KDGanttViewSubwidgets.cpp | 86 +- kdgantt/KDGanttViewSubwidgets.h | 8 +- kdgantt/KDGanttViewSummaryItem.cpp | 2 +- kdgantt/KDGanttViewTaskItem.cpp | 4 +- kdgantt/itemAttributeDialog.ui | 10 +- kdgantt/itemAttributeDialog.ui.h | 22 +- kdgantt/qlayoutengine_p.h | 14 +- kfile-plugins/ics/kfile_ics.cpp | 4 +- kfile-plugins/vcf/kfile_vcf.cpp | 2 +- kgantt/kgantt/KGantt.cpp | 4 +- kgantt/kgantt/KGantt.h | 8 +- kgantt/kgantt/KGanttItem.cpp | 2 +- kgantt/kgantt/KGanttItem.h | 8 +- kgantt/kgantt/KGanttRelation.h | 6 +- kgantt/kgantt/itemedit.ui | 36 +- kgantt/kgantt/itemedit2.ui | 18 +- kgantt/kgantt/xQGanttBarViewPort.cpp | 2 +- kioslaves/imap4/imap4.cc | 32 +- kioslaves/imap4/imap4.h | 6 +- kioslaves/imap4/imapcommand.cc | 2 +- kioslaves/imap4/imapcommand.h | 2 +- kioslaves/imap4/imapinfo.cc | 22 +- kioslaves/imap4/imapparser.cc | 72 +- kioslaves/imap4/imapparser.h | 6 +- kioslaves/imap4/mailheader.h | 4 +- kioslaves/imap4/mimehdrline.h | 4 +- kioslaves/imap4/mimeheader.cc | 2 +- kioslaves/imap4/rfcdecoder.cc | 4 +- kioslaves/imap4/rfcdecoder.h | 2 +- kioslaves/mbox/Makefile.am | 2 +- kioslaves/mbox/readmbox.cc | 2 +- kioslaves/opengroupware/opengroupware.cpp | 4 +- kioslaves/sieve/Makefile.am | 2 +- kioslaves/sieve/sieve.cpp | 14 +- kitchensync/libqopensync/group.cpp | 2 +- kitchensync/libqopensync/member.cpp | 4 +- kitchensync/libqopensync/plugin.cpp | 6 +- kitchensync/libqopensync/syncchange.h | 2 +- kitchensync/src/Makefile.am | 5 +- kitchensync/src/aboutpage.cpp | 4 +- kitchensync/src/configguievo2.cpp | 16 +- kitchensync/src/configguignokii.cpp | 18 +- kitchensync/src/configguigpe.cpp | 20 +- kitchensync/src/configguijescs.cpp | 18 +- kitchensync/src/configguildap.cpp | 20 +- kitchensync/src/configguimoto.cpp | 8 +- kitchensync/src/configguiopie.cpp | 26 +- kitchensync/src/configguisunbird.cpp | 18 +- kitchensync/src/configguisynce.cpp | 14 +- kitchensync/src/configguisyncmlhttp.cpp | 6 +- kitchensync/src/configguisyncmlobex.cpp | 6 +- kitchensync/src/connectionwidgets.cpp | 44 +- kitchensync/src/groupconfig.cpp | 4 +- kitchensync/src/groupconfigcommon.cpp | 20 +- kitchensync/src/groupitem.cpp | 72 +- kitchensync/src/groupitem.h | 2 +- kitchensync/src/kwidgetlist.cpp | 4 +- kitchensync/src/multiconflictdialog.cpp | 18 +- kitchensync/src/part.cpp | 4 +- kitchensync/src/part.h | 2 +- kitchensync/src/pluginpicker.cpp | 14 +- kitchensync/src/singleconflictdialog.cpp | 14 +- kitchensync/src/syncprocess.cpp | 2 +- kmail/Makefile.am | 6 +- kmail/aboutdata.cpp | 4 +- kmail/accountdialog.cpp | 52 +- kmail/accountmanager.cpp | 8 +- kmail/accountmanager.h | 2 +- kmail/accountwizard.cpp | 40 +- kmail/acljobs.cpp | 2 +- kmail/acljobs.h | 2 +- kmail/actionscheduler.cpp | 26 +- kmail/actionscheduler.h | 20 +- kmail/annotationjobs.h | 2 +- kmail/antispamwizard.cpp | 80 +- kmail/antispamwizard.h | 2 +- kmail/archivefolderdialog.cpp | 4 +- kmail/attachmentlistview.cpp | 2 +- kmail/backupjob.cpp | 4 +- kmail/bodypartformatter.cpp | 2 +- kmail/bodyvisitor.cpp | 6 +- kmail/cachedimapjob.cpp | 8 +- kmail/callback.cpp | 8 +- kmail/chiasmuskeyselector.cpp | 12 +- kmail/compactionjob.cpp | 8 +- kmail/composercryptoconfiguration.ui | 6 +- kmail/configuredialog.cpp | 218 +- kmail/configuredialog_p.cpp | 28 +- kmail/configuredialog_p.h | 8 +- kmail/customtemplates_base.ui | 22 +- kmail/distributionlistdialog.cpp | 2 +- kmail/editorwatcher.cpp | 10 +- kmail/editorwatcher.h | 4 +- kmail/encodingdetector.cpp | 2 +- kmail/encodingdetector.h | 2 +- kmail/expirejob.cpp | 6 +- kmail/expirypropertiesdialog.cpp | 8 +- kmail/favoritefolderview.cpp | 20 +- kmail/filterlog.h | 2 +- kmail/folderdiaacltab.cpp | 14 +- kmail/folderdiaacltab.h | 2 +- kmail/folderdiaquotatab.cpp | 4 +- kmail/folderdiaquotatab.h | 2 +- kmail/folderdiaquotatab_p.cpp | 14 +- kmail/folderjob.h | 4 +- kmail/folderpropertiesdialog.ui | 30 +- kmail/folderrequester.cpp | 2 +- kmail/folderrequester.h | 2 +- kmail/foldersetselector.cpp | 2 +- kmail/folderstorage.cpp | 42 +- kmail/folderstorage.h | 42 +- kmail/foldertreebase.cpp | 16 +- kmail/foldertreebase.h | 2 +- kmail/folderviewtooltip.h | 8 +- kmail/headeritem.cpp | 8 +- kmail/headeritem.h | 4 +- kmail/headerlistquicksearch.cpp | 36 +- kmail/headerlistquicksearch.h | 8 +- kmail/headerstrategy.cpp | 4 +- kmail/headerstyle.cpp | 22 +- kmail/htmlstatusbar.cpp | 4 +- kmail/identitydialog.cpp | 16 +- kmail/identitydrag.cpp | 4 +- kmail/identitydrag.h | 2 +- kmail/imapaccountbase.cpp | 42 +- kmail/imapaccountbase.h | 10 +- kmail/imapjob.cpp | 10 +- kmail/importarchivedialog.cpp | 2 +- kmail/importjob.cpp | 10 +- kmail/importjob.h | 2 +- kmail/index.cpp | 32 +- kmail/index.h | 24 +- kmail/isubject.cpp | 4 +- kmail/kcursorsaver.h | 6 +- kmail/keyresolver.cpp | 10 +- kmail/khtmlparthtmlwriter.cpp | 2 +- kmail/kleo_util.h | 4 +- kmail/kmaccount.cpp | 20 +- kmail/kmaccount.h | 4 +- kmail/kmacctcachedimap.cpp | 8 +- kmail/kmacctcachedimap.h | 4 +- kmail/kmacctfolder.h | 2 +- kmail/kmacctimap.cpp | 18 +- kmail/kmacctimap.h | 6 +- kmail/kmacctlocal.cpp | 28 +- kmail/kmacctmaildir.cpp | 24 +- kmail/kmailIface.h | 6 +- kmail/kmail_part.cpp | 12 +- kmail/kmail_part.h | 4 +- kmail/kmailicalIface.h | 22 +- kmail/kmailicalifaceimpl.cpp | 136 +- kmail/kmailicalifaceimpl.h | 28 +- kmail/kmatmlistview.cpp | 4 +- kmail/kmcommands.cpp | 184 +- kmail/kmcommands.h | 22 +- kmail/kmcomposewin.cpp | 106 +- kmail/kmcomposewin.h | 8 +- kmail/kmdict.cpp | 2 +- kmail/kmdict.h | 2 +- kmail/kmedit.cpp | 30 +- kmail/kmfawidgets.cpp | 4 +- kmail/kmfilter.cpp | 12 +- kmail/kmfilteraction.cpp | 58 +- kmail/kmfilteraction.h | 2 +- kmail/kmfilterdlg.cpp | 38 +- kmail/kmfilterdlg.h | 4 +- kmail/kmfiltermgr.cpp | 8 +- kmail/kmfiltermgr.h | 6 +- kmail/kmfolder.cpp | 38 +- kmail/kmfolder.h | 18 +- kmail/kmfoldercachedimap.cpp | 32 +- kmail/kmfoldercachedimap.h | 6 +- kmail/kmfolderdia.cpp | 10 +- kmail/kmfolderdia.h | 4 +- kmail/kmfolderdir.cpp | 2 +- kmail/kmfolderimap.cpp | 50 +- kmail/kmfolderimap.h | 18 +- kmail/kmfolderindex.cpp | 20 +- kmail/kmfolderindex.h | 2 +- kmail/kmfoldermaildir.cpp | 16 +- kmail/kmfoldermaildir.h | 4 +- kmail/kmfoldermbox.cpp | 28 +- kmail/kmfoldermbox.h | 2 +- kmail/kmfoldermgr.h | 8 +- kmail/kmfoldernode.h | 2 +- kmail/kmfoldersearch.cpp | 138 +- kmail/kmfoldersearch.h | 26 +- kmail/kmfoldertree.cpp | 36 +- kmail/kmfoldertree.h | 2 +- kmail/kmheaders.cpp | 124 +- kmail/kmheaders.h | 14 +- kmail/kmkernel.cpp | 42 +- kmail/kmkernel.h | 10 +- kmail/kmlineeditspell.cpp | 6 +- kmail/kmmainwidget.cpp | 100 +- kmail/kmmainwidget.h | 4 +- kmail/kmmainwin.cpp | 8 +- kmail/kmmessage.cpp | 108 +- kmail/kmmessage.h | 40 +- kmail/kmmimeparttree.cpp | 6 +- kmail/kmmsgbase.cpp | 120 +- kmail/kmmsgbase.h | 24 +- kmail/kmmsgdict.cpp | 28 +- kmail/kmmsgdict.h | 2 +- kmail/kmmsginfo.cpp | 4 +- kmail/kmmsginfo.h | 4 +- kmail/kmmsgpart.cpp | 8 +- kmail/kmmsgpart.h | 8 +- kmail/kmmsgpartdlg.cpp | 22 +- kmail/kmpopfiltercnfrmdlg.cpp | 2 +- kmail/kmreadermainwin.cpp | 2 +- kmail/kmreaderwin.cpp | 68 +- kmail/kmreaderwin.h | 12 +- kmail/kmsearchpattern.cpp | 22 +- kmail/kmsearchpattern.h | 6 +- kmail/kmsearchpatternedit.cpp | 6 +- kmail/kmsender.cpp | 42 +- kmail/kmsender.h | 4 +- kmail/kmstartup.cpp | 4 +- kmail/kmsystemtray.cpp | 12 +- kmail/kmtransport.cpp | 6 +- kmail/korghelper.cpp | 6 +- kmail/kwindowpositioner.cpp | 2 +- kmail/listjob.cpp | 2 +- kmail/localsubscriptiondialog.cpp | 2 +- kmail/mailinglistpropertiesdialog.cpp | 6 +- kmail/managesievescriptsdialog.cpp | 4 +- kmail/messageactions.cpp | 8 +- kmail/messageactions.h | 8 +- kmail/messagecomposer.cpp | 14 +- kmail/messagecopyhelper.cpp | 18 +- kmail/messagecopyhelper.h | 8 +- kmail/messageproperty.cpp | 40 +- kmail/messageproperty.h | 26 +- kmail/newfolderdialog.cpp | 4 +- kmail/objecttreeparser.cpp | 22 +- kmail/objecttreeparser.h | 12 +- kmail/objecttreeparser_p.cpp | 4 +- kmail/partNode.cpp | 6 +- kmail/partNode.h | 2 +- kmail/popaccount.cpp | 22 +- kmail/quotajobs.h | 2 +- kmail/recipientseditor.cpp | 26 +- kmail/recipientseditor.h | 8 +- kmail/recipientseditortest.cpp | 2 +- kmail/recipientspicker.cpp | 2 +- kmail/recipientspicker.h | 2 +- kmail/redirectdialog.cpp | 2 +- kmail/regexplineedit.cpp | 2 +- kmail/renamejob.cpp | 2 +- kmail/rulewidgethandlermanager.cpp | 20 +- kmail/scalix.cpp | 2 +- kmail/scalix.h | 4 +- kmail/searchjob.cpp | 16 +- kmail/searchjob.h | 10 +- kmail/searchwindow.cpp | 18 +- kmail/searchwindow.h | 2 +- kmail/sievejob.cpp | 2 +- kmail/signatureconfigurator.cpp | 6 +- kmail/simplestringlisteditor.cpp | 6 +- kmail/simplestringlisteditor.h | 2 +- kmail/smimeconfiguration.ui | 20 +- kmail/snippetdlg.cpp | 4 +- kmail/snippetdlgbase.ui | 14 +- kmail/snippetsettingsbase.ui | 12 +- kmail/snippetwidget.cpp | 106 +- kmail/snippetwidget.h | 2 +- kmail/stringutil.cpp | 2 +- kmail/subscriptiondialog.cpp | 2 +- kmail/templateparser.cpp | 16 +- kmail/templateparser.h | 8 +- kmail/templatesconfiguration.cpp | 4 +- kmail/templatesconfiguration_base.ui | 14 +- kmail/templatesinsertcommand.cpp | 2 +- kmail/tests/messagedicttests.cpp | 4 +- kmail/tests/mimelibtests.cpp | 8 +- kmail/tests/utiltests.cpp | 4 +- kmail/textsource.cpp | 2 +- kmail/textsource.h | 2 +- kmail/treebase.cpp | 2 +- kmail/urlhandlermanager.cpp | 4 +- kmail/util.cpp | 6 +- kmail/util.h | 2 +- kmail/vacation.cpp | 36 +- kmail/warningconfiguration.ui | 16 +- kmail/xfaceconfigurator.cpp | 6 +- kmailcvt/filter_evolution.cxx | 6 +- kmailcvt/filter_evolution_v2.cxx | 10 +- kmailcvt/filter_mbox.cxx | 2 +- kmailcvt/filter_oe.cxx | 42 +- kmailcvt/filter_pmail.cxx | 14 +- kmailcvt/filter_pmail.hxx | 6 +- kmailcvt/filter_sylpheed.cxx | 8 +- kmailcvt/filter_thebat.cxx | 2 +- kmailcvt/filter_thunderbird.cxx | 10 +- kmailcvt/filters.cxx | 4 +- kmailcvt/filters.hxx | 2 +- kmailcvt/kimportpagedlg.ui | 16 +- kmailcvt/kmailcvt.cpp | 4 +- kmailcvt/kselfilterpagedlg.ui | 12 +- kmobile/devices/gnokii/gnokii_mobile.cpp | 2 +- kmobile/devices/gnokii/gnokiiconfigui.ui | 10 +- kmobile/kioslave/kio_mobile.cpp | 2 +- kmobile/kmobile_selectiondialog.ui | 8 +- kmobile/kmobileclient.cpp | 2 +- kmobile/kmobiledevice.h | 14 +- kmobile/kmobileitem.cpp | 2 +- kmobile/pref.cpp | 8 +- knode/Makefile.am | 2 +- knode/articlewidget.cpp | 36 +- knode/articlewidget.h | 2 +- knode/headerview.cpp | 12 +- knode/knaccountmanager.cpp | 4 +- knode/knarticle.cpp | 4 +- knode/knarticle.h | 2 +- knode/knarticlefactory.cpp | 24 +- knode/knarticlefilter.cpp | 6 +- knode/knarticlemanager.cpp | 20 +- knode/kncollectionview.cpp | 2 +- knode/kncollectionviewitem.cpp | 2 +- knode/kncomposer.cpp | 96 +- knode/kncomposer.h | 4 +- knode/knconfig.cpp | 16 +- knode/knconfig.h | 2 +- knode/knconfigwidgets.cpp | 34 +- knode/knconvert.cpp | 2 +- knode/kndisplayedheader.cpp | 4 +- knode/knfilterdialog.cpp | 4 +- knode/knfiltermanager.cpp | 2 +- knode/knfolder.cpp | 6 +- knode/knfoldermanager.cpp | 10 +- knode/knglobals.cpp | 4 +- knode/knglobals.h | 4 +- knode/kngroup.cpp | 16 +- knode/kngroup.h | 2 +- knode/kngroupbrowser.cpp | 8 +- knode/kngroupdialog.cpp | 4 +- knode/kngroupmanager.cpp | 6 +- knode/kngroupmanager.h | 2 +- knode/kngrouppropdlg.cpp | 2 +- knode/kngroupselectdialog.cpp | 2 +- knode/knhdrviewitem.cpp | 6 +- knode/knhdrviewitem.h | 2 +- knode/knjobdata.cpp | 4 +- knode/knjobdata.h | 2 +- knode/knmainwidget.cpp | 50 +- knode/knmainwidget.h | 10 +- knode/knmemorymanager.cpp | 4 +- knode/knnetaccess.cpp | 48 +- knode/knnntpaccount.cpp | 2 +- knode/knnntpclient.cpp | 2 +- knode/knode.cpp | 4 +- knode/knode.h | 2 +- knode/knode_part.cpp | 8 +- knode/knode_part.h | 4 +- knode/knrangefilter.cpp | 2 +- knode/knsearchdialog.cpp | 4 +- knode/knserverinfo.cpp | 4 +- knode/knstringfilter.cpp | 10 +- knode/knstringfilter.h | 2 +- knode/knwidgets.cpp | 6 +- knode/knwidgets.h | 2 +- knode/smtpaccountwidget_base.ui | 6 +- knode/utilities.cpp | 8 +- knotes/Makefile.am | 2 +- knotes/knote.cpp | 30 +- knotes/knotebutton.cpp | 16 +- knotes/knotebutton.h | 2 +- knotes/knoteconfigdlg.cpp | 66 +- knotes/knoteedit.cpp | 16 +- knotes/knoteedit.h | 2 +- knotes/knoteprinter.cpp | 10 +- knotes/knoteprinter.h | 6 +- knotes/knotesalarm.cpp | 2 +- knotes/knotesapp.cpp | 10 +- knotes/knoteslegacy.cpp | 2 +- knotes/knotesnetrecv.cpp | 2 +- knotes/knotesnetsend.cpp | 2 +- knotes/resourcelocal.cpp | 2 +- knotes/resourcelocalconfig.cpp | 6 +- kode/automakefile.cpp | 2 +- kode/kodemain.cpp | 8 +- kode/kwsdl/compiler.cpp | 2 +- kode/kwsdl/converter.cpp | 2 +- kode/kwsdl/kung/complexbaseinputfield.cpp | 6 +- kode/kwsdl/kung/dateinputfield.cpp | 2 +- kode/kwsdl/kung/dispatcher.cpp | 4 +- kode/kwsdl/kung/listinputfield.cpp | 10 +- kode/kwsdl/kung/pageinputfield.cpp | 10 +- kode/kwsdl/namemapper.cpp | 2 +- kode/kwsdl/schema/fileprovider.cpp | 2 +- kode/kwsdl/schema/parser.cpp | 2 +- kode/kwsdl/schema/simpletype.cpp | 2 +- kode/kxml_compiler/creator.cpp | 2 +- kode/kxml_compiler/kxml_compiler.cpp | 2 +- kode/kxml_compiler/parser.cpp | 2 +- kode/printer.cpp | 2 +- konsolekalendar/konsolekalendarepoch.cpp | 4 +- konsolekalendar/konsolekalendarexports.cpp | 14 +- konsolekalendar/main.cpp | 4 +- kontact/interfaces/core.cpp | 8 +- kontact/interfaces/core.h | 2 +- kontact/interfaces/plugin.h | 4 +- kontact/interfaces/summary.cpp | 18 +- kontact/interfaces/summary.h | 2 +- kontact/plugins/kmail/kcmkmailsummary.cpp | 10 +- kontact/plugins/kmail/kmail_plugin.cpp | 2 +- kontact/plugins/kmail/summarywidget.cpp | 8 +- kontact/plugins/knotes/knotes_part.cpp | 4 +- kontact/plugins/knotes/knotes_part_p.h | 8 +- kontact/plugins/knotes/knotes_plugin.cpp | 4 +- kontact/plugins/knotes/knotes_plugin.h | 2 +- kontact/plugins/knotes/knotetip.cpp | 4 +- kontact/plugins/knotes/summarywidget.cpp | 10 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 10 +- .../plugins/korganizer/korganizerplugin.cpp | 4 +- kontact/plugins/korganizer/summarywidget.cpp | 34 +- kontact/plugins/korganizer/todoplugin.cpp | 2 +- .../plugins/korganizer/todosummarywidget.cpp | 28 +- kontact/plugins/kpilot/kpilot_plugin.cpp | 4 +- kontact/plugins/kpilot/kpilot_plugin.h | 2 +- kontact/plugins/kpilot/summarywidget.cpp | 4 +- kontact/plugins/newsticker/kcmkontactknt.cpp | 22 +- kontact/plugins/newsticker/newsfeeds.h | 282 +- .../plugins/newsticker/newsticker_plugin.cpp | 4 +- .../plugins/newsticker/newsticker_plugin.h | 2 +- kontact/plugins/newsticker/summarywidget.cpp | 16 +- kontact/plugins/specialdates/kcmsdsummary.cpp | 12 +- .../plugins/specialdates/sdsummarywidget.cpp | 52 +- .../specialdates/specialdates_plugin.cpp | 4 +- .../specialdates/specialdates_plugin.h | 2 +- kontact/plugins/summary/dropwidget.cpp | 6 +- kontact/plugins/summary/dropwidget.h | 2 +- kontact/plugins/summary/kcmkontactsummary.cpp | 10 +- kontact/plugins/summary/summaryview_part.cpp | 38 +- kontact/plugins/summary/summaryview_part.h | 2 +- kontact/plugins/test/test_part.cpp | 2 +- kontact/plugins/weather/summarywidget.cpp | 22 +- kontact/plugins/weather/weather_plugin.cpp | 4 +- kontact/plugins/weather/weather_plugin.h | 2 +- kontact/src/aboutdialog.cpp | 4 +- kontact/src/iconsidepane.cpp | 22 +- kontact/src/iconsidepane.h | 8 +- kontact/src/kcmkontact.cpp | 2 +- kontact/src/main.cpp | 2 +- kontact/src/mainwindow.cpp | 28 +- kontact/src/profilemanager.cpp | 14 +- korganizer/Makefile.am | 2 +- korganizer/actionmanager.cpp | 22 +- korganizer/calendarview.cpp | 28 +- korganizer/calendarview.h | 4 +- korganizer/datechecker.cpp | 8 +- korganizer/datenavigator.cpp | 16 +- korganizer/datenavigatorcontainer.cpp | 18 +- korganizer/datenavigatorcontainer.h | 4 +- korganizer/eventarchiver.cpp | 6 +- korganizer/filteredit_base.ui | 14 +- korganizer/freebusymanager.cpp | 50 +- korganizer/freebusymanager.h | 2 +- korganizer/incidencechanger.cpp | 2 +- korganizer/interfaces/korganizer/baseview.h | 2 +- korganizer/interfaces/korganizer/mainwindow.h | 2 +- korganizer/interfaces/korganizer/part.h | 2 +- korganizer/journalentry.cpp | 8 +- korganizer/kdatenavigator.cpp | 18 +- korganizer/koagenda.cpp | 24 +- korganizer/koagendaitem.cpp | 10 +- korganizer/koagendaview.cpp | 40 +- korganizer/koagendaview.h | 6 +- korganizer/koapp.cpp | 6 +- korganizer/koattendeeeditor.cpp | 10 +- korganizer/koattendeeeditor.h | 4 +- korganizer/kocore.cpp | 2 +- korganizer/kodaymatrix.cpp | 18 +- korganizer/kodaymatrix.h | 8 +- korganizer/koeditoralarms_base.ui | 18 +- korganizer/koeditorattachments.cpp | 10 +- korganizer/koeditordetails.cpp | 2 +- korganizer/koeditorfreebusy.cpp | 20 +- korganizer/koeditorgeneralevent.cpp | 44 +- korganizer/koeditorgeneralevent.h | 2 +- korganizer/koeditorgeneraljournal.cpp | 2 +- korganizer/koeditorgeneraltodo.cpp | 48 +- korganizer/koeditorgeneraltodo.h | 2 +- korganizer/koeditorrecurrence.cpp | 12 +- korganizer/koeditorrecurrence.h | 2 +- korganizer/koeventeditor.cpp | 4 +- korganizer/koeventeditor.h | 2 +- korganizer/koeventviewer.cpp | 6 +- korganizer/koglobals.cpp | 4 +- korganizer/kogroupware.cpp | 8 +- korganizer/kogroupwareprefspage.ui | 20 +- korganizer/koincidenceeditor.cpp | 2 +- korganizer/koincidenceeditor.h | 2 +- korganizer/koincidencetooltip.cpp | 2 +- korganizer/kojournaleditor.cpp | 4 +- korganizer/kojournaleditor.h | 2 +- korganizer/kojournalview.cpp | 6 +- korganizer/kojournalview.h | 2 +- korganizer/kolistview.cpp | 18 +- korganizer/kolistview.h | 4 +- korganizer/komailclient.cpp | 24 +- korganizer/komonthview.cpp | 20 +- korganizer/komonthview.h | 2 +- korganizer/koprefs.cpp | 6 +- korganizer/koprefsdialog.cpp | 14 +- korganizer/korgac/alarmdialog.cpp | 16 +- korganizer/korgac/alarmdockwindow.cpp | 4 +- korganizer/korgac/koalarmclient.cpp | 4 +- korganizer/korgac/testalarmdlg.cpp | 16 +- korganizer/korganizer.h | 4 +- korganizer/korganizer_part.cpp | 10 +- korganizer/korganizer_part.h | 4 +- korganizer/korganizeriface.h | 2 +- korganizer/kotimelineview.cpp | 4 +- korganizer/kotimelineview.h | 2 +- korganizer/kotodoeditor.cpp | 8 +- korganizer/kotodoeditor.h | 2 +- korganizer/kotodoview.cpp | 20 +- korganizer/kotodoview.h | 2 +- korganizer/kotodoviewitem.cpp | 8 +- korganizer/kotodoviewitem.h | 2 +- korganizer/koviewmanager.cpp | 2 +- korganizer/kowhatsnextview.cpp | 8 +- korganizer/kowhatsnextview.h | 2 +- korganizer/mailscheduler.cpp | 2 +- korganizer/multiagendaview.cpp | 12 +- korganizer/multiagendaview.h | 2 +- korganizer/navigatorbar.cpp | 18 +- korganizer/plugins/datenums/Makefile.am | 2 +- korganizer/plugins/exchange/Makefile.am | 3 +- korganizer/plugins/exchange/exchange.cpp | 6 +- korganizer/plugins/hebrew/Makefile.am | 2 +- .../plugins/printing/journal/Makefile.am | 2 +- .../journal/calprintjournalconfig_base.ui | 12 +- .../printing/list/calprintlistconfig_base.ui | 12 +- .../whatsnext/calprintwhatsnextconfig_base.ui | 12 +- korganizer/plugins/printing/year/Makefile.am | 2 +- .../printing/year/calprintyearconfig_base.ui | 10 +- .../plugins/projectview/koprojectview.cpp | 16 +- .../plugins/projectview/koprojectview.h | 2 +- .../plugins/timespanview/kotimespanview.cpp | 2 +- .../plugins/timespanview/kotimespanview.h | 2 +- korganizer/printing/calprintdayconfig_base.ui | 10 +- .../printing/calprintdefaultplugins.cpp | 2 +- korganizer/printing/calprinter.cpp | 10 +- .../printing/calprintincidenceconfig_base.ui | 6 +- .../printing/calprintmonthconfig_base.ui | 8 +- korganizer/printing/calprintpluginbase.cpp | 22 +- korganizer/printing/calprintpluginbase.h | 6 +- .../printing/calprinttodoconfig_base.ui | 16 +- .../printing/calprintweekconfig_base.ui | 14 +- korganizer/publishdialog_base.ui | 6 +- korganizer/resourceview.cpp | 12 +- korganizer/resourceview.h | 2 +- korganizer/searchdialog.cpp | 14 +- korganizer/template_management_dialog_base.ui | 6 +- korganizer/templatemanagementdialog.h | 2 +- korganizer/timelabels.cpp | 6 +- korn/account_input.cpp | 2 +- korn/account_input.h | 2 +- korn/boxcontaineritem.cpp | 24 +- korn/boxcontaineritem.h | 2 +- korn/dcopdrop.cpp | 8 +- korn/dcopdrop.h | 2 +- korn/dockeditem.h | 2 +- korn/imap_proto.cpp | 10 +- korn/imap_proto.h | 2 +- korn/kconf_update/korn-3-4-config_change.cpp | 4 +- korn/kio.cpp | 12 +- korn/kio_count.cpp | 4 +- korn/kio_count.h | 2 +- korn/kio_proto.cpp | 2 +- korn/kornaccountcfg.ui | 12 +- korn/kornaccountcfgimpl.cpp | 18 +- korn/kornaccountcfgimpl.h | 2 +- korn/kornboxcfg.ui | 134 +- korn/korncfg.ui | 4 +- korn/korncfgimpl.cpp | 12 +- korn/kornshell.cpp | 10 +- korn/maildir_proto.h | 2 +- korn/maildlg.cpp | 4 +- korn/maildrop.h | 2 +- korn/mailsubject.h | 8 +- korn/password.cpp | 2 +- korn/pop3_proto.cpp | 10 +- korn/pop3_proto.h | 4 +- korn/progress_dialog.ui | 10 +- korn/subjectsdlg.cpp | 6 +- korn/systemtray.h | 2 +- kpilot/.emacs-dirvars | 7 - kpilot/AUTHORS | 29 - kpilot/CMakeLists.txt | 96 - kpilot/COPYING | 355 -- kpilot/ChangeLog | 4220 ----------------- .../ConduitStructure.eps | 500 -- .../ConduitProgrammingTutorial/Makefile | 25 - .../ConduitProgrammingTutorial/index.tex | 1708 ------- .../ConduitProgrammingTutorial/mal-factory.cc | 123 - .../ConduitProgrammingTutorial/mal-factory.h | 54 - .../pictures/ConnectionsDialog.png | Bin 9676 -> 0 bytes .../pictures/NoLayoutDialog.png | Bin 81069 -> 0 bytes .../pictures/ProxyTab.png | Bin 85254 -> 0 bytes kpilot/Documentation/HOWTO-CODE.txt | 112 - kpilot/Documentation/HOWTO-CONDUIT.txt | 67 - kpilot/Documentation/README | 17 - kpilot/Documentation/README-3.2.1+ | 156 - kpilot/Documentation/README-4.0.0 | 103 - kpilot/Documentation/README-4.2.1 | 106 - kpilot/Documentation/README-4.2.2 | 108 - .../UML/vcal-classdiagram.xmi.tgz | Bin 134659 -> 0 bytes kpilot/Documentation/checkPlugin.sh | 77 - kpilot/Documentation/merge-into-svn.sh | 165 - kpilot/INSTALL | 56 - kpilot/Mainpage.dox | 31 - kpilot/Makefile.am | 20 - kpilot/Makefile.cmake | 65 - kpilot/NEWS | 24 - kpilot/README | 43 - kpilot/TODO | 201 - kpilot/cmake/modules/FindMal.cmake | 62 - kpilot/cmake/modules/FindPilotlink.cmake | 55 - kpilot/cmake/modules/KPilotCustom.cmake | 53 - kpilot/cmake_uninstall.cmake.in | 23 - kpilot/conduits/CMakeLists.txt | 35 - kpilot/conduits/Makefile.am | 30 - .../conduits/abbrowserconduit/CMakeLists.txt | 46 - .../KPilotCustomFieldEditor.ui | 276 -- kpilot/conduits/abbrowserconduit/Makefile.am | 24 - .../abbrowserconduit/abbrowser-conduit.cc | 1897 -------- .../abbrowserconduit/abbrowser-conduit.h | 222 - .../abbrowserconduit/abbrowser-factory.cc | 45 - .../abbrowserconduit/abbrowser-factory.h | 40 - .../abbrowserconduit/abbrowser-setup.cc | 195 - .../abbrowserconduit/abbrowser-setup.h | 52 - .../abbrowserconduit/abbrowserSettings.kcfgc | 7 - .../abbrowser_conduit.desktop | 113 - .../abbrowserconduit/abbrowserconduit.kcfg | 80 - .../conduits/abbrowserconduit/kabcRecord.cc | 710 --- kpilot/conduits/abbrowserconduit/kabcRecord.h | 263 - .../abbrowserconduit/kaddressbookConduit.ui | 746 --- .../abbrowserconduit/resolutionDialog.cc | 323 -- .../abbrowserconduit/resolutionDialog.h | 70 - .../abbrowserconduit/resolutionDialog_base.ui | 129 - .../abbrowserconduit/resolutionTable.h | 70 - kpilot/conduits/configure.in.bot | 14 - kpilot/conduits/configure.in.in | 241 - kpilot/conduits/docconduit/CMakeLists.txt | 87 - kpilot/conduits/docconduit/DOC-converter.cc | 631 --- kpilot/conduits/docconduit/DOC-converter.h | 183 - .../conduits/docconduit/Icons/CMakeLists.txt | 3 - kpilot/conduits/docconduit/Icons/Makefile.am | 7 - .../docconduit/Icons/cr16-app-kpalmdoc.png | Bin 747 -> 0 bytes .../docconduit/Icons/cr22-app-kpalmdoc.png | Bin 1088 -> 0 bytes .../docconduit/Icons/cr32-app-kpalmdoc.png | Bin 2007 -> 0 bytes .../docconduit/Icons/cr48-app-kpalmdoc.png | Bin 3254 -> 0 bytes kpilot/conduits/docconduit/Makefile.am | 38 - .../conduits/docconduit/bmkSpecification.txt | 199 - kpilot/conduits/docconduit/doc-conduit.cc | 1018 ---- kpilot/conduits/docconduit/doc-conduit.h | 152 - .../conduits/docconduit/doc-conflictdialog.cc | 182 - .../conduits/docconduit/doc-conflictdialog.h | 83 - kpilot/conduits/docconduit/doc-factory.cc | 116 - kpilot/conduits/docconduit/doc-factory.h | 74 - kpilot/conduits/docconduit/doc-setup.cc | 136 - kpilot/conduits/docconduit/doc-setup.h | 47 - kpilot/conduits/docconduit/doc-setupdialog.ui | 557 --- .../conduits/docconduit/doc_conduit.desktop | 58 - kpilot/conduits/docconduit/docconduit.kcfg | 54 - .../docconduit/docconduitSettings.kcfgc | 7 - kpilot/conduits/docconduit/kpalmdoc.cpp | 58 - kpilot/conduits/docconduit/kpalmdoc.desktop | 64 - kpilot/conduits/docconduit/kpalmdoc.kcfg | 41 - kpilot/conduits/docconduit/kpalmdoc.upd | 6 - .../docconduit/kpalmdocSettings.kcfgc | 7 - kpilot/conduits/docconduit/kpalmdoc_dlg.cc | 529 --- kpilot/conduits/docconduit/kpalmdoc_dlg.h | 67 - .../conduits/docconduit/kpalmdoc_dlgbase.ui | 435 -- kpilot/conduits/docconduit/makedoc9.cc | 405 -- kpilot/conduits/docconduit/makedoc9.h | 111 - .../conduits/docconduit/pilotDOCBookmark.cc | 87 - kpilot/conduits/docconduit/pilotDOCBookmark.h | 51 - kpilot/conduits/docconduit/pilotDOCEntry.cc | 92 - kpilot/conduits/docconduit/pilotDOCEntry.h | 73 - kpilot/conduits/docconduit/pilotDOCHead.cc | 101 - kpilot/conduits/docconduit/pilotDOCHead.h | 62 - .../docconduit/tests/testcompress.cpp | 59 - kpilot/conduits/knotes/CMakeLists.txt | 52 - kpilot/conduits/knotes/Makefile.am | 21 - .../knotes/cr32-app-knotesconduit.png | Bin 369 -> 0 bytes kpilot/conduits/knotes/knotes-action.cc | 872 ---- kpilot/conduits/knotes/knotes-action.h | 113 - kpilot/conduits/knotes/knotes-conduit.desktop | 92 - kpilot/conduits/knotes/knotes-factory.cc | 133 - kpilot/conduits/knotes/knotes-factory.h | 70 - kpilot/conduits/knotes/knotes-setup.cc | 83 - kpilot/conduits/knotes/knotes-setup.h | 49 - kpilot/conduits/knotes/knotesconduit.kcfg | 25 - .../knotes/knotesconduitSettings.kcfgc | 7 - kpilot/conduits/knotes/setup_base.ui | 88 - kpilot/conduits/malconduit/CMakeLists.txt | 48 - kpilot/conduits/malconduit/Makefile.am | 18 - kpilot/conduits/malconduit/README | 12 - kpilot/conduits/malconduit/mal-conduit.cc | 319 -- kpilot/conduits/malconduit/mal-conduit.h | 66 - kpilot/conduits/malconduit/mal-factory.cc | 143 - kpilot/conduits/malconduit/mal-factory.h | 67 - kpilot/conduits/malconduit/mal-setup.cc | 185 - kpilot/conduits/malconduit/mal-setup.h | 54 - .../conduits/malconduit/mal-setup_dialog.ui | 634 --- .../conduits/malconduit/mal_conduit.desktop | 94 - kpilot/conduits/malconduit/malconduit.kcfg | 56 - .../malconduit/malconduitSettings.kcfgc | 7 - .../conduits/memofileconduit/CMakeLists.txt | 44 - kpilot/conduits/memofileconduit/Makefile.am | 16 - .../design/SQD - copyHHToPC.jpg | Bin 111060 -> 0 bytes .../design/SQD - copyPCToHH.jpg | Bin 69573 -> 0 bytes .../design/SQD - detailed load.jpg | Bin 119635 -> 0 bytes .../memofileconduit/design/SQD - sync.jpg | Bin 112438 -> 0 bytes .../memofileconduit/memofile-conduit.cc | 567 --- .../memofileconduit/memofile-conduit.desktop | 91 - .../memofileconduit/memofile-conduit.h | 92 - .../memofileconduit/memofile-factory.cc | 128 - .../memofileconduit/memofile-factory.h | 40 - kpilot/conduits/memofileconduit/memofile.cc | 239 - kpilot/conduits/memofileconduit/memofile.h | 113 - .../memofileconduit/memofileSettings.kcfgc | 7 - .../memofileconduit/memofileconduit.kcfg | 16 - .../memofileconduit/memofileconduit.xmi | 241 - kpilot/conduits/memofileconduit/memofiles.cc | 700 --- kpilot/conduits/memofileconduit/memofiles.h | 96 - kpilot/conduits/memofileconduit/setup_base.ui | 143 - kpilot/conduits/notepadconduit/CMakeLists.txt | 38 - kpilot/conduits/notepadconduit/Makefile.am | 14 - .../notepadconduit/notepad-conduit.cc | 265 -- .../notepadconduit/notepad-conduit.desktop | 64 - .../conduits/notepadconduit/notepad-conduit.h | 94 - .../notepadconduit/notepad-factory.cc | 124 - .../conduits/notepadconduit/notepad-factory.h | 38 - .../conduits/notepadconduit/notepad-setup.ui | 79 - .../notepadconduit/notepadconduit.kcfg | 14 - .../notepadconduit/notepadconduit.kcfgc | 7 - kpilot/conduits/null/CMakeLists.txt | 38 - kpilot/conduits/null/Makefile.am | 15 - kpilot/conduits/null/null-conduit.cc | 98 - kpilot/conduits/null/null-conduit.desktop | 63 - kpilot/conduits/null/null-conduit.h | 65 - kpilot/conduits/null/null-factory.cc | 125 - kpilot/conduits/null/null-factory.h | 40 - kpilot/conduits/null/nullSettings.kcfgc | 7 - kpilot/conduits/null/nullconduit.kcfg | 13 - kpilot/conduits/null/setup_base.ui | 128 - kpilot/conduits/popmail/CMakeLists.txt | 43 - kpilot/conduits/popmail/Makefile.am | 24 - kpilot/conduits/popmail/popmail-conduit.cc | 416 -- .../conduits/popmail/popmail-conduit.desktop | 106 - kpilot/conduits/popmail/popmail-conduit.h | 74 - kpilot/conduits/popmail/popmail-factory.cc | 47 - kpilot/conduits/popmail/popmail-factory.h | 37 - kpilot/conduits/popmail/popmail.kcfg | 25 - kpilot/conduits/popmail/popmailSettings.kcfgc | 7 - kpilot/conduits/popmail/setup-dialog.ui | 141 - kpilot/conduits/popmail/setupDialog.cc | 158 - kpilot/conduits/popmail/setupDialog.h | 62 - kpilot/conduits/recordconduit/Makefile.am | 15 - kpilot/conduits/recordconduit/factory.cc | 144 - kpilot/conduits/recordconduit/factory.h | 40 - .../recordconduit/record-conduit.desktop | 91 - kpilot/conduits/recordconduit/settings.kcfg | 22 - kpilot/conduits/recordconduit/settings.kcfgc | 7 - kpilot/conduits/recordconduit/setup_base.ui | 158 - kpilot/conduits/sysinfoconduit/CMakeLists.txt | 50 - kpilot/conduits/sysinfoconduit/Makefile.am | 24 - kpilot/conduits/sysinfoconduit/Template.html | 184 - kpilot/conduits/sysinfoconduit/Template.txt | 76 - .../sysinfoconduit/sysinfo-conduit.cc | 611 --- .../conduits/sysinfoconduit/sysinfo-conduit.h | 79 - .../sysinfoconduit/sysinfo-factory.cc | 43 - .../conduits/sysinfoconduit/sysinfo-factory.h | 36 - .../conduits/sysinfoconduit/sysinfo-setup.cc | 198 - .../conduits/sysinfoconduit/sysinfo-setup.h | 47 - .../sysinfoconduit/sysinfo-setup_dialog.ui | 214 - .../sysinfoconduit/sysinfoSettings.kcfgc | 7 - .../sysinfoconduit/sysinfo_conduit.desktop | 108 - .../sysinfoconduit/sysinfoconduit.kcfg | 64 - kpilot/conduits/timeconduit/CMakeLists.txt | 44 - kpilot/conduits/timeconduit/Makefile.am | 22 - kpilot/conduits/timeconduit/time-conduit.cc | 121 - kpilot/conduits/timeconduit/time-conduit.h | 49 - kpilot/conduits/timeconduit/time-factory.cc | 46 - kpilot/conduits/timeconduit/time-factory.h | 41 - kpilot/conduits/timeconduit/time-setup.cc | 86 - kpilot/conduits/timeconduit/time-setup.h | 50 - .../conduits/timeconduit/time-setup_dialog.ui | 122 - .../timeconduit/timeConduitSettings.kcfgc | 7 - .../conduits/timeconduit/time_conduit.desktop | 105 - kpilot/conduits/timeconduit/timeconduit.kcfg | 17 - kpilot/conduits/vcalconduit/CMakeLists.txt | 75 - kpilot/conduits/vcalconduit/Makefile.am | 43 - kpilot/conduits/vcalconduit/README | 11 - kpilot/conduits/vcalconduit/cleanupstate.cc | 132 - kpilot/conduits/vcalconduit/cleanupstate.h | 49 - kpilot/conduits/vcalconduit/conduitstate.h | 86 - .../vcalconduit/deleteunsyncedhhstate.cc | 115 - .../vcalconduit/deleteunsyncedhhstate.h | 53 - .../vcalconduit/deleteunsyncedpcstate.cc | 135 - .../vcalconduit/deleteunsyncedpcstate.h | 53 - kpilot/conduits/vcalconduit/hhtopcstate.cc | 249 - kpilot/conduits/vcalconduit/hhtopcstate.h | 55 - kpilot/conduits/vcalconduit/initstate.cc | 109 - kpilot/conduits/vcalconduit/initstate.h | 52 - kpilot/conduits/vcalconduit/kcalRecord.cc | 143 - kpilot/conduits/vcalconduit/kcalRecord.h | 49 - .../conduits/vcalconduit/korganizerConduit.ui | 275 -- kpilot/conduits/vcalconduit/pctohhstate.cc | 159 - kpilot/conduits/vcalconduit/pctohhstate.h | 54 - kpilot/conduits/vcalconduit/teststate.cc | 127 - kpilot/conduits/vcalconduit/teststate.h | 55 - kpilot/conduits/vcalconduit/todo-conduit.cc | 373 -- .../conduits/vcalconduit/todo-conduit.desktop | 105 - kpilot/conduits/vcalconduit/todo-conduit.h | 108 - kpilot/conduits/vcalconduit/todo-factory.cc | 46 - kpilot/conduits/vcalconduit/todo-factory.h | 40 - kpilot/conduits/vcalconduit/todo-setup.cc | 86 - kpilot/conduits/vcalconduit/todo-setup.h | 44 - kpilot/conduits/vcalconduit/todoRecord.cc | 141 - kpilot/conduits/vcalconduit/todoRecord.h | 49 - kpilot/conduits/vcalconduit/vcal-conduit.cc | 309 -- .../conduits/vcalconduit/vcal-conduit.desktop | 103 - kpilot/conduits/vcalconduit/vcal-conduit.h | 101 - .../conduits/vcalconduit/vcal-conduitbase.cc | 622 --- .../conduits/vcalconduit/vcal-conduitbase.h | 202 - kpilot/conduits/vcalconduit/vcal-factory.cc | 50 - kpilot/conduits/vcalconduit/vcal-factory.h | 41 - .../conduits/vcalconduit/vcal-factorybase.h | 44 - kpilot/conduits/vcalconduit/vcal-setup.cc | 78 - kpilot/conduits/vcalconduit/vcal-setup.h | 46 - kpilot/conduits/vcalconduit/vcal-setupbase.cc | 110 - kpilot/conduits/vcalconduit/vcal-setupbase.h | 51 - kpilot/conduits/vcalconduit/vcalRecord.cc | 548 --- kpilot/conduits/vcalconduit/vcalRecord.h | 51 - .../vcalconduit/vcalconduitSettings.kcfgc | 7 - .../conduits/vcalconduit/vcalconduitbase.kcfg | 31 - kpilot/config.h.cmake | 43 - kpilot/configure | 213 - kpilot/configure.in.bot | 18 - kpilot/configure.in.in | 256 - kpilot/kpilot/CMakeLists.txt | 180 - kpilot/kpilot/Icons/CMakeLists.txt | 4 - kpilot/kpilot/Icons/Makefile.am | 19 - kpilot/kpilot/Icons/busysync.png | Bin 2872 -> 0 bytes kpilot/kpilot/Icons/cr16-action-backup.png | Bin 747 -> 0 bytes kpilot/kpilot/Icons/cr16-action-busysync.png | Bin 705 -> 0 bytes kpilot/kpilot/Icons/cr16-action-fastsync.png | Bin 705 -> 0 bytes kpilot/kpilot/Icons/cr16-action-fullsync.png | Bin 674 -> 0 bytes kpilot/kpilot/Icons/cr16-action-hotsync.png | Bin 701 -> 0 bytes kpilot/kpilot/Icons/cr16-action-listsync.png | Bin 427 -> 0 bytes kpilot/kpilot/Icons/cr16-action-nosync.png | Bin 844 -> 0 bytes kpilot/kpilot/Icons/cr16-action-restore.png | Bin 787 -> 0 bytes kpilot/kpilot/Icons/cr16-app-kpilotDaemon.png | Bin 712 -> 0 bytes kpilot/kpilot/Icons/cr22-action-backup.png | Bin 1036 -> 0 bytes kpilot/kpilot/Icons/cr22-action-busysync.png | Bin 1119 -> 0 bytes kpilot/kpilot/Icons/cr22-action-fastsync.png | Bin 1052 -> 0 bytes kpilot/kpilot/Icons/cr22-action-fullsync.png | Bin 994 -> 0 bytes kpilot/kpilot/Icons/cr22-action-hotsync.png | Bin 984 -> 0 bytes kpilot/kpilot/Icons/cr22-action-listsync.png | Bin 628 -> 0 bytes kpilot/kpilot/Icons/cr22-action-nosync.png | Bin 1462 -> 0 bytes kpilot/kpilot/Icons/cr22-action-restore.png | Bin 1060 -> 0 bytes kpilot/kpilot/Icons/cr22-app-kpilotDaemon.png | Bin 1151 -> 0 bytes kpilot/kpilot/Icons/cr32-action-fastsync.png | Bin 1638 -> 0 bytes kpilot/kpilot/Icons/cr32-action-fullsync.png | Bin 1577 -> 0 bytes kpilot/kpilot/Icons/cr32-action-hotsync.png | Bin 1647 -> 0 bytes kpilot/kpilot/Icons/cr32-action-listsync.png | Bin 972 -> 0 bytes kpilot/kpilot/Icons/cr32-app-kpilotDaemon.png | Bin 1836 -> 0 bytes kpilot/kpilot/Icons/cr48-action-fastsync.png | Bin 2768 -> 0 bytes kpilot/kpilot/Icons/cr48-action-fullsync.png | Bin 2675 -> 0 bytes kpilot/kpilot/Icons/cr48-action-hotsync.png | Bin 2769 -> 0 bytes kpilot/kpilot/Icons/cr48-action-listsync.png | Bin 1608 -> 0 bytes kpilot/kpilot/Icons/cr48-app-kpilotDaemon.png | Bin 3228 -> 0 bytes .../Icons/cr64-action-kpilotaddress.png | Bin 5176 -> 0 bytes .../Icons/cr64-action-kpilotbhotsync.png | Bin 5163 -> 0 bytes .../Icons/cr64-action-kpilotcalendar.png | Bin 5187 -> 0 bytes kpilot/kpilot/Icons/cr64-action-kpilotdb.png | Bin 4988 -> 0 bytes .../Icons/cr64-action-kpilotfileinstaller.png | Bin 4489 -> 0 bytes .../kpilot/Icons/cr64-action-kpilotknotes.png | Bin 4808 -> 0 bytes .../kpilot/Icons/cr64-action-kpilottodo.png | Bin 4526 -> 0 bytes kpilot/kpilot/Icons/fastsync.png | Bin 1052 -> 0 bytes kpilot/kpilot/Icons/hi16-app-kpilot.png | Bin 712 -> 0 bytes kpilot/kpilot/Icons/hi22-app-kpilot.png | Bin 1151 -> 0 bytes kpilot/kpilot/Icons/hi32-app-kpilot.png | Bin 1836 -> 0 bytes kpilot/kpilot/Icons/hi48-app-kpilot.png | Bin 3228 -> 0 bytes kpilot/kpilot/Icons/hotsync.png | Bin 3832 -> 0 bytes kpilot/kpilot/Icons/kpilot-splash.png | Bin 68819 -> 0 bytes kpilot/kpilot/Icons/mini-kpilot.png | Bin 1126 -> 0 bytes kpilot/kpilot/Icons/nosync.png | Bin 844 -> 0 bytes kpilot/kpilot/Makefile-standalone | 167 - kpilot/kpilot/Makefile.am | 104 - kpilot/kpilot/addressEditor.cc | 271 -- kpilot/kpilot/addressEditor.h | 87 - kpilot/kpilot/addressWidget.cc | 733 --- kpilot/kpilot/addressWidget.h | 144 - kpilot/kpilot/conduitConfigDialog.cc | 849 ---- kpilot/kpilot/conduitConfigDialog.h | 112 - kpilot/kpilot/datebookWidget.cc | 133 - kpilot/kpilot/datebookWidget.h | 66 - kpilot/kpilot/dbAppInfoEditor.cc | 105 - kpilot/kpilot/dbAppInfoEditor.h | 51 - kpilot/kpilot/dbFlagsEditor.cc | 157 - kpilot/kpilot/dbFlagsEditor.h | 56 - kpilot/kpilot/dbFlagsEditor_base.ui | 376 -- kpilot/kpilot/dbFlagsEditor_base.ui.h | 24 - kpilot/kpilot/dbRecordEditor.cc | 235 - kpilot/kpilot/dbRecordEditor.h | 94 - kpilot/kpilot/dbRecordEditor_base.ui | 151 - kpilot/kpilot/dbSelectionDialog.cc | 144 - kpilot/kpilot/dbSelectionDialog.h | 60 - kpilot/kpilot/dbSelection_base.ui | 80 - kpilot/kpilot/dbviewerWidget.cc | 440 -- kpilot/kpilot/dbviewerWidget.h | 91 - kpilot/kpilot/fileInstallWidget.cc | 304 -- kpilot/kpilot/fileInstallWidget.h | 92 - kpilot/kpilot/fileInstaller.cc | 184 - kpilot/kpilot/fileInstaller.h | 82 - kpilot/kpilot/hotSync.cc | 1156 ----- kpilot/kpilot/hotSync.h | 175 - kpilot/kpilot/internalEditorAction.cc | 394 -- kpilot/kpilot/internalEditorAction.h | 68 - kpilot/kpilot/kpilot.cc | 1136 ----- kpilot/kpilot/kpilot.desktop | 86 - kpilot/kpilot/kpilot.gif | Bin 295 -> 0 bytes kpilot/kpilot/kpilot.h | 214 - kpilot/kpilot/kpilot.kcfg | 186 - kpilot/kpilot/kpilot.magic | 12 - kpilot/kpilot/kpilot.upd | 34 - kpilot/kpilot/kpilotConfig.cc | 346 -- kpilot/kpilot/kpilotConfig.h | 126 - kpilot/kpilot/kpilotConfigDialog.cc | 528 --- kpilot/kpilot/kpilotConfigDialog.h | 134 - kpilot/kpilot/kpilotConfigDialog_backup.ui | 207 - kpilot/kpilot/kpilotConfigDialog_device.ui | 189 - kpilot/kpilot/kpilotConfigDialog_startup.ui | 118 - kpilot/kpilot/kpilotConfigDialog_sync.ui | 171 - kpilot/kpilot/kpilotConfigDialog_viewers.ui | 149 - kpilot/kpilot/kpilotConfigWizard.cc | 233 - kpilot/kpilot/kpilotConfigWizard.h | 58 - .../kpilot/kpilotConfigWizard_address.kcfgc | 7 - kpilot/kpilot/kpilotConfigWizard_app.ui | 112 - kpilot/kpilot/kpilotConfigWizard_notes.kcfgc | 7 - kpilot/kpilot/kpilotConfigWizard_user.ui | 168 - kpilot/kpilot/kpilotConfigWizard_vcal.kcfgc | 7 - kpilot/kpilot/kpilotDCOP.h | 75 - kpilot/kpilot/kpilotProbeDialog.cc | 363 -- kpilot/kpilot/kpilotProbeDialog.h | 102 - kpilot/kpilot/kpilotSettings.kcfgc | 7 - kpilot/kpilot/kpilot_config.desktop | 156 - kpilot/kpilot/kpilotconduit.desktop | 59 - kpilot/kpilot/kpilotdaemon.desktop | 42 - kpilot/kpilot/kpilotui.rc | 53 - kpilot/kpilot/kroupware.cc | 311 -- kpilot/kpilot/kroupware.h | 87 - kpilot/kpilot/listCat.cc | 272 -- kpilot/kpilot/listCat.h | 229 - kpilot/kpilot/listItems.cc | 242 - kpilot/kpilot/listItems.h | 114 - kpilot/kpilot/logFile.cc | 128 - kpilot/kpilot/logFile.h | 64 - kpilot/kpilot/logWidget.cc | 396 -- kpilot/kpilot/logWidget.h | 90 - kpilot/kpilot/loggerDCOP.h | 58 - kpilot/kpilot/main-config.cc | 0 kpilot/kpilot/main-test.cc | 437 -- kpilot/kpilot/memoWidget.cc | 803 ---- kpilot/kpilot/memoWidget.h | 112 - kpilot/kpilot/pilot-addresses.c | 362 -- kpilot/kpilot/pilotComponent.cc | 190 - kpilot/kpilot/pilotComponent.h | 141 - kpilot/kpilot/pilotDaemon.cc | 1404 ------ kpilot/kpilot/pilotDaemon.h | 279 -- kpilot/kpilot/pilotDaemonDCOP.h | 103 - kpilot/kpilot/stamp-h.in | 0 kpilot/kpilot/syncCalendar.cc | 87 - kpilot/kpilot/todoEditor.cc | 173 - kpilot/kpilot/todoEditor.h | 74 - kpilot/kpilot/todoEditor_base.ui | 180 - kpilot/kpilot/todoWidget.cc | 608 --- kpilot/kpilot/todoWidget.h | 167 - kpilot/lib/CMakeLists.txt | 90 - kpilot/lib/COPYING | 509 -- kpilot/lib/Makefile.am | 60 - kpilot/lib/actionQueue.cc | 172 - kpilot/lib/actionQueue.h | 162 - kpilot/lib/actions.cc | 137 - kpilot/lib/actions.h | 115 - kpilot/lib/idmapper.cc | 247 - kpilot/lib/idmapper.h | 159 - kpilot/lib/idmapperxml.cc | 213 - kpilot/lib/idmapperxml.h | 84 - kpilot/lib/idmapping.cc | 89 - kpilot/lib/idmapping.h | 66 - kpilot/lib/kpilotdevicelink.cc | 966 ---- kpilot/lib/kpilotdevicelink.h | 220 - kpilot/lib/kpilotdevicelinkPrivate.h | 330 -- kpilot/lib/kpilotlib.kcfg | 9 - kpilot/lib/kpilotlibSettings.kcfgc | 7 - kpilot/lib/kpilotlink.cc | 272 -- kpilot/lib/kpilotlink.h | 501 -- kpilot/lib/kpilotlocallink.cc | 368 -- kpilot/lib/kpilotlocallink.h | 95 - kpilot/lib/options.cc | 157 - kpilot/lib/options.h | 199 - kpilot/lib/pilot.cc | 264 -- kpilot/lib/pilot.h | 410 -- kpilot/lib/pilotAddress.cc | 636 --- kpilot/lib/pilotAddress.h | 339 -- kpilot/lib/pilotAppInfo.cc | 77 - kpilot/lib/pilotAppInfo.h | 216 - kpilot/lib/pilotCard.h | 65 - kpilot/lib/pilotDatabase.cc | 112 - kpilot/lib/pilotDatabase.h | 272 -- kpilot/lib/pilotDateEntry.cc | 478 -- kpilot/lib/pilotDateEntry.h | 388 -- kpilot/lib/pilotLinkVersion.h | 60 - kpilot/lib/pilotLocalDatabase.cc | 762 --- kpilot/lib/pilotLocalDatabase.h | 201 - kpilot/lib/pilotMemo.cc | 135 - kpilot/lib/pilotMemo.h | 105 - kpilot/lib/pilotRecord.cc | 132 - kpilot/lib/pilotRecord.h | 355 -- kpilot/lib/pilotSerialDatabase.cc | 432 -- kpilot/lib/pilotSerialDatabase.h | 144 - kpilot/lib/pilotSysInfo.h | 144 - kpilot/lib/pilotTodoEntry.cc | 270 -- kpilot/lib/pilotTodoEntry.h | 166 - kpilot/lib/pilotUser.h | 128 - kpilot/lib/plugin.cc | 760 --- kpilot/lib/plugin.h | 476 -- kpilot/lib/pluginfactory.h | 98 - kpilot/lib/recordConduit.cc | 1145 ----- kpilot/lib/recordConduit.h | 181 - kpilot/lib/syncAction.cc | 512 -- kpilot/lib/syncAction.h | 410 -- kpilot/tests/CMakeLists.txt | 55 - .../tests/conduits/vcalconduit/exampletest.cc | 26 - .../tests/conduits/vcalconduit/exampletest.h | 28 - kpilot/tests/data/AddressDB.pdb | Bin 1545 -> 0 bytes kpilot/tests/data/MailDB.pdb | Bin 1342 -> 0 bytes kpilot/tests/data/MemoDB.pdb | Bin 5262 -> 0 bytes kpilot/tests/data/ToDoDB.pdb | Bin 881 -> 0 bytes kpilot/tests/data/bogus.pdb | 367 -- kpilot/tests/exportdatebook.cc | 136 - kpilot/tests/importaddresses.cc | 128 - kpilot/tests/importdatebook.cc | 131 - kpilot/tests/main.cc | 17 - kpilot/tests/mergecalendars.cc | 228 - kpilot/tests/testactions.cc | 92 - kpilot/tests/testaddress.cc | 106 - kpilot/tests/testcategories.cc | 215 - kpilot/tests/testconstants.cc | 68 - kpilot/tests/testdatabase.cc | 316 -- kpilot/tests/testdatebook.cc | 95 - kpilot/tests/testidmapper.cc | 314 -- kresources/birthdays/resourcekabc.cpp | 6 +- kresources/birthdays/resourcekabcconfig.cpp | 2 +- .../blogging/resourcebloggingsettings.ui | 8 +- kresources/caldav/config.cpp | 2 +- kresources/caldav/configwidgets.cpp | 4 +- kresources/caldav/preferences.cpp | 18 +- kresources/caldav/resource.cpp | 40 +- kresources/carddav/config.cpp | 2 +- kresources/carddav/configwidgets.cpp | 4 +- kresources/carddav/preferences.cpp | 6 +- kresources/carddav/resource.cpp | 6 +- kresources/carddav/writer.cpp | 4 +- kresources/egroupware/debugdialog.cpp | 10 +- kresources/egroupware/kcal_resourcexmlrpc.cpp | 4 +- .../egroupware/knotes_resourcexmlrpc.cpp | 4 +- kresources/egroupware/todostatemapper.cpp | 2 +- kresources/egroupware/xmlrpciface.cpp | 8 +- kresources/exchange/dateset.cpp | 8 +- kresources/exchange/dateset.h | 8 +- kresources/exchange/resourceexchange.cpp | 8 +- kresources/groupdav/groupdavglobals.cpp | 2 +- .../groupwise/groupwisesettingswidgetbase.ui | 4 +- .../groupwise/kabc_resourcegroupwise.cpp | 10 +- .../groupwise/kcal_resourcegroupwise.cpp | 2 +- .../kcal_resourcegroupwiseconfig.cpp | 2 +- kresources/groupwise/kioslave/groupwise.cpp | 18 +- .../groupwise/soap/contactconverter.cpp | 8 +- kresources/groupwise/soap/groupwiseserver.cpp | 14 +- kresources/groupwise/soap/gwconverter.cpp | 2 +- kresources/groupwise/soap/gwjobs.cpp | 12 +- .../groupwise/soap/incidenceconverter.cpp | 6 +- kresources/groupwise/soap/ksslsocket.cpp | 10 +- kresources/groupwise/soap/ksslsocket.h | 4 +- kresources/groupwise/soap/soapC.cpp | 1028 ++-- kresources/groupwise/soap/soapH.h | 64 +- kresources/groupwise/soap/soapStub.h | 56 +- kresources/groupwise/soap/stdsoap2.cpp | 10 +- kresources/groupwise/soap/stdsoap2.h | 8 +- kresources/kolab/kabc/contact.cpp | 18 +- kresources/kolab/kabc/contact.h | 6 +- kresources/kolab/kabc/resourcekolab.cpp | 42 +- kresources/kolab/kabc/resourcekolab.h | 6 +- kresources/kolab/kcal/event.cpp | 4 +- kresources/kolab/kcal/event.h | 4 +- kresources/kolab/kcal/incidence.cpp | 8 +- kresources/kolab/kcal/incidence.h | 4 +- kresources/kolab/kcal/resourcekolab.cpp | 114 +- kresources/kolab/kcal/resourcekolab.h | 22 +- kresources/kolab/kcal/task.cpp | 20 +- kresources/kolab/kcal/task.h | 6 +- kresources/kolab/knotes/resourcekolab.cpp | 36 +- kresources/kolab/knotes/resourcekolab.h | 8 +- kresources/kolab/shared/kmailconnection.cpp | 26 +- kresources/kolab/shared/kmailconnection.h | 16 +- kresources/kolab/shared/kolabbase.cpp | 10 +- kresources/kolab/shared/resourcekolabbase.cpp | 14 +- kresources/kolab/shared/resourcekolabbase.h | 16 +- kresources/kolab/shared/subresource.cpp | 6 +- kresources/kolab/shared/subresource.h | 8 +- kresources/lib/addressbookadaptor.cpp | 4 +- kresources/lib/folderconfig.cpp | 12 +- kresources/lib/folderlister.cpp | 10 +- kresources/lib/folderlistview.cpp | 36 +- kresources/lib/folderlistview.h | 6 +- kresources/lib/folderselectdialog.cpp | 8 +- kresources/lib/groupwaredataadaptor.cpp | 6 +- kresources/lib/groupwaredataadaptor.h | 2 +- kresources/lib/groupwaredownloadjob.cpp | 18 +- kresources/lib/kcal_resourcegroupwarebase.cpp | 6 +- .../newexchange/exchangeconvertercalendar.cpp | 2 +- .../newexchange/exchangeconvertercontact.cpp | 2 +- kresources/scalix/kabc/resourcescalix.cpp | 42 +- kresources/scalix/kabc/resourcescalix.h | 6 +- kresources/scalix/kcal/resourcescalix.cpp | 82 +- kresources/scalix/kcal/resourcescalix.h | 22 +- kresources/scalix/kioslave/scalix.cpp | 12 +- kresources/scalix/knotes/resourcescalix.cpp | 30 +- kresources/scalix/knotes/resourcescalix.h | 8 +- .../scalix/scalixadmin/delegatedialog.cpp | 10 +- .../scalix/scalixadmin/delegatepage.cpp | 10 +- .../scalix/scalixadmin/otherusermanager.cpp | 2 +- .../scalix/scalixadmin/otheruserpage.cpp | 14 +- .../scalix/scalixadmin/outofofficepage.cpp | 10 +- .../scalix/scalixadmin/passwordpage.cpp | 18 +- kresources/scalix/shared/kmailconnection.cpp | 20 +- kresources/scalix/shared/kmailconnection.h | 12 +- .../scalix/shared/resourcescalixbase.cpp | 8 +- kresources/scalix/shared/resourcescalixbase.h | 12 +- kresources/scalix/shared/scalixbase.cpp | 8 +- kresources/scalix/shared/subresource.cpp | 6 +- kresources/scalix/shared/subresource.h | 8 +- kresources/slox/kabcresourceslox.cpp | 10 +- kresources/slox/kcalresourceslox.cpp | 12 +- kresources/slox/sloxaccounts.cpp | 2 +- kresources/slox/sloxbase.h | 2 +- kresources/slox/sloxfolderdialog.cpp | 2 +- kresources/slox/webdavhandler.cpp | 2 +- .../tvanytime/kcal_resourcetvanytime.cpp | 14 +- ktnef/gui/attachpropertydialog.cpp | 4 +- ktnef/gui/attachpropertydialogbase.ui | 10 +- ktnef/gui/ktnefmain.cpp | 4 +- ktnef/gui/ktnefview.cpp | 2 +- ktnef/gui/qwmf.cpp | 2 +- ktnef/gui/qwmf.h | 2 +- ktnef/gui/wmfstruct.h | 4 +- ktnef/lib/ktnefparser.cpp | 74 +- ktnef/lib/ktnefwriter.cpp | 122 +- libemailfunctions/email.cpp | 20 +- libemailfunctions/email.h | 4 +- libemailfunctions/idmapper.cpp | 10 +- libemailfunctions/networkstatus.cpp | 6 +- libemailfunctions/networkstatus.h | 2 +- libemailfunctions/tests/testemail.cpp | 2 +- libkcal/assignmentvisitor.cpp | 2 +- libkcal/assignmentvisitor.h | 2 +- libkcal/attendee.cpp | 2 +- libkcal/attendee.h | 2 +- libkcal/calendar.cpp | 4 +- libkcal/calendarlocal.cpp | 2 +- libkcal/calendarnull.cpp | 2 +- libkcal/calendarresources.cpp | 6 +- libkcal/calendarresources.h | 2 +- libkcal/calfilter.cpp | 4 +- libkcal/calformat.cpp | 4 +- libkcal/calhelper.cpp | 4 +- libkcal/calselectdialog.cpp | 8 +- libkcal/compat.cpp | 2 +- libkcal/customproperties.cpp | 2 +- libkcal/dndfactory.cpp | 2 +- libkcal/htmlexport.cpp | 56 +- libkcal/icaldrag.cpp | 2 +- libkcal/icalformat.cpp | 8 +- libkcal/icalformatimpl.cpp | 12 +- libkcal/incidence.cpp | 6 +- libkcal/incidence.h | 2 +- libkcal/incidencebase.cpp | 2 +- libkcal/incidenceformatter.cpp | 90 +- libkcal/recurrence.cpp | 34 +- libkcal/recurrence.h | 10 +- libkcal/recurrencerule.cpp | 6 +- libkcal/recurrencerule.h | 2 +- libkcal/resourcecached.cpp | 10 +- libkcal/resourcelocaldir.cpp | 2 +- libkcal/scheduler.cpp | 20 +- libkcal/tests/fbrecurring.cpp | 2 +- libkcal/tests/readandwrite.cpp | 2 +- libkcal/tests/testcalendar.cpp | 2 +- libkcal/tests/testfields.cpp | 12 +- libkcal/tests/testrecurprevious.cpp | 2 +- libkcal/tests/testrecurrence.cpp | 2 +- libkcal/tests/testrecurrencetype.cpp | 2 +- libkcal/tests/testrecurson.cpp | 2 +- libkcal/tests/testvcalexport.cpp | 2 +- libkcal/todo.cpp | 8 +- libkcal/vcaldrag.cpp | 2 +- libkcal/vcalformat.cpp | 26 +- libkcal/versit/vobject.h | 4 +- .../libgpg-error-copy/gpg-error.h.in | 4 +- libkdenetwork/libgpg-error-copy/strerror.c | 4 +- .../libgpgme-copy/assuan/assuan-buffer.c | 2 +- .../libgpgme-copy/assuan/assuan-defs.h | 4 +- .../assuan/assuan-pipe-connect.c | 2 +- .../libgpgme-copy/assuan/assuan-uds.c | 4 +- libkdenetwork/libgpgme-copy/assuan/assuan.h | 4 +- libkdenetwork/libgpgme-copy/gpgme/error.c | 4 +- libkdenetwork/libgpgme-copy/gpgme/get-env.c | 2 +- libkdenetwork/libgpgme-copy/gpgme/gpgme.h | 16 +- libkdenetwork/libgpgme-copy/gpgme/memrchr.c | 10 +- libkdenetwork/libgpgme-copy/gpgme/posix-io.c | 2 +- libkdenetwork/libgpgme-copy/gpgme/util.h | 2 +- .../libgpgme-copy/gpgme/wait-global.c | 8 +- libkdenetwork/qgpgme/eventloopinteractor.cpp | 8 +- libkdepim/addresseeemailselection.cpp | 2 +- libkdepim/addresseelineedit.cpp | 26 +- libkdepim/addresseeselector.cpp | 22 +- libkdepim/addresseeview.cpp | 74 +- libkdepim/addresseeview.h | 6 +- libkdepim/addressesdialog.cpp | 6 +- libkdepim/addresspicker.ui | 18 +- libkdepim/broadcaststatus.cpp | 34 +- libkdepim/broadcaststatus.h | 24 +- libkdepim/categoryeditdialog.cpp | 10 +- libkdepim/categoryeditdialog_base.ui | 8 +- libkdepim/categoryselectdialog_base.ui | 6 +- libkdepim/cfgc/general_base.ui | 4 +- libkdepim/cfgc/myoptions_base.ui | 8 +- libkdepim/clicklineedit.cpp | 8 +- libkdepim/clicklineedit.h | 2 +- libkdepim/csshelper.cpp | 2 +- libkdepim/designerfields.cpp | 12 +- libkdepim/distributionlist.cpp | 14 +- libkdepim/embeddedurlpage.cpp | 4 +- libkdepim/kabcresourcecached.cpp | 6 +- libkdepim/kaddrbook.cpp | 6 +- libkdepim/kcmdesignerfields.cpp | 12 +- libkdepim/kdateedit.cpp | 36 +- libkdepim/kdateedit.h | 2 +- libkdepim/kdatepickerpopup.cpp | 8 +- libkdepim/kdatepickerpopup.h | 2 +- libkdepim/kfileio.cpp | 2 +- libkdepim/kfileio.h | 2 +- libkdepim/kfoldertree.cpp | 26 +- libkdepim/kfoldertree.h | 10 +- libkdepim/kimportdialog.cpp | 16 +- libkdepim/kmailcompletion.cpp | 2 +- libkdepim/kmailcompletion.h | 6 +- libkdepim/komposer/core/core.h | 2 +- libkdepim/komposer/core/pluginmanager.cpp | 28 +- libkdepim/komposer/core/prefsmodule.cpp | 10 +- libkdepim/komposer/core/tests/testmanager.cpp | 2 +- .../plugins/default/defaulteditor.cpp | 24 +- .../kpartsdesignerplugin.cpp | 8 +- .../kpartsdesignerplugin.h | 2 +- libkdepim/kpixmapregionselectorwidget.cpp | 2 +- libkdepim/kprefsdialog.cpp | 20 +- libkdepim/kprefsdialog.h | 24 +- libkdepim/kregexp3.cpp | 30 +- libkdepim/kregexp3.h | 30 +- libkdepim/krsqueezedtextlabel.cpp | 16 +- libkdepim/krsqueezedtextlabel.h | 8 +- libkdepim/kscoring.cpp | 16 +- libkdepim/kscoringeditor.cpp | 16 +- libkdepim/ksubscription.cpp | 2 +- libkdepim/ktimeedit.cpp | 2 +- libkdepim/kvcarddrag.cpp | 8 +- libkdepim/kvcarddrag.h | 2 +- libkdepim/kwidgetlister.cpp | 2 +- libkdepim/kwidgetlister.h | 8 +- libkdepim/kxface.cpp | 4 +- libkdepim/ldapclient.cpp | 4 +- libkdepim/ldapsearchdialog.cpp | 10 +- libkdepim/linklocator.cpp | 26 +- libkdepim/linklocator.h | 2 +- libkdepim/maillistdrag.cpp | 16 +- libkdepim/maillistdrag.h | 12 +- libkdepim/overlaywidget.cpp | 6 +- libkdepim/overlaywidget.h | 6 +- libkdepim/pluginloaderbase.cpp | 4 +- libkdepim/progressdialog.cpp | 64 +- libkdepim/progressdialog.h | 6 +- libkdepim/progressmanager.cpp | 6 +- libkdepim/progressmanager.h | 6 +- libkdepim/qutf7codec.cpp | 18 +- libkdepim/qutf7codec.h | 2 +- libkdepim/qutf7codecplugin.cpp | 2 +- libkdepim/recentaddresses.cpp | 4 +- libkdepim/sendsmsdialog.cpp | 14 +- libkdepim/spellingfilter.cpp | 8 +- libkdepim/statusbarprogresswidget.cpp | 6 +- libkdepim/tests/test_kregexp.cpp | 4 +- libkdepim/tests/testdateedit.cpp | 4 +- libkdepim/tests/testutf7encoder.cpp | 2 +- libkholidays/parseholiday.c | 4 +- libkholidays/parseholiday.h | 2 +- libkmime/boolflags.cpp | 4 +- libkmime/kmime_charfreq.cpp | 2 +- libkmime/kmime_charfreq.h | 2 +- libkmime/kmime_codecs.h | 6 +- libkmime/kmime_content.cpp | 34 +- libkmime/kmime_content.h | 4 +- libkmime/kmime_header_parsing.cpp | 18 +- libkmime/kmime_header_parsing.h | 2 +- libkmime/kmime_headers.cpp | 16 +- libkmime/kmime_headers.h | 2 +- libkmime/kmime_mdn.cpp | 4 +- libkmime/kmime_parsers.cpp | 26 +- libkmime/kmime_util.cpp | 12 +- libkmime/kmime_util.h | 4 +- libkmime/tests/test_dates.cpp | 10 +- libkmime/tests/test_kmime_codec.cpp | 12 +- libkpgp/kpgp.cpp | 14 +- libkpgp/kpgp.h | 4 +- libkpgp/kpgpbase.cpp | 32 +- libkpgp/kpgpbase2.cpp | 80 +- libkpgp/kpgpbase5.cpp | 70 +- libkpgp/kpgpbase6.cpp | 54 +- libkpgp/kpgpbaseG.cpp | 64 +- libkpgp/kpgpblock.cpp | 4 +- libkpgp/kpgpblock.h | 6 +- libkpgp/kpgpui.cpp | 44 +- libkpimexchange/core/exchangeaccount.cpp | 8 +- libkpimexchange/core/exchangeclient.cpp | 6 +- libkpimexchange/core/exchangedownload.cpp | 4 +- libkpimexchange/core/exchangemonitor.cpp | 8 +- libkpimexchange/core/exchangeupload.cpp | 10 +- libkpimidentities/identity.cpp | 18 +- libkpimidentities/identitymanager.cpp | 6 +- libkpimidentities/identitymanager.h | 2 +- libksieve/parser/lexer.cpp | 4 +- libksieve/tests/lexertest.cpp | 6 +- libksieve/tests/parsertest.cpp | 6 +- mimelib/basicmsg.h | 2 +- mimelib/doc/addrlist.html | 2 +- mimelib/doc/body.html | 16 +- mimelib/doc/bodypart.html | 4 +- mimelib/doc/entity.html | 6 +- mimelib/doc/field.html | 18 +- mimelib/doc/fieldbdy.html | 2 +- mimelib/doc/group.html | 4 +- mimelib/doc/headers.html | 8 +- mimelib/doc/mailbox.html | 6 +- mimelib/doc/mboxlist.html | 2 +- mimelib/doc/mediatyp.html | 2 +- mimelib/doc/message.html | 6 +- mimelib/doc/msgcmp.html | 2 +- mimelib/doc/msgid.html | 2 +- mimelib/doc/string.html | 26 +- mimelib/dwstring.cpp | 66 +- mimelib/headers.cpp | 2 +- mimelib/mimelib/addrlist.h | 2 +- mimelib/mimelib/body.h | 16 +- mimelib/mimelib/bodypart.h | 4 +- mimelib/mimelib/entity.h | 6 +- mimelib/mimelib/field.h | 16 +- mimelib/mimelib/fieldbdy.h | 2 +- mimelib/mimelib/group.h | 4 +- mimelib/mimelib/headers.h | 8 +- mimelib/mimelib/mailbox.h | 6 +- mimelib/mimelib/mboxlist.h | 2 +- mimelib/mimelib/mediatyp.h | 2 +- mimelib/mimelib/message.h | 6 +- mimelib/mimelib/msgcmp.h | 4 +- mimelib/mimelib/msgid.h | 2 +- mimelib/mimelib/nntp.h | 2 +- mimelib/mimelib/string.h | 18 +- mimelib/multipar.cpp | 2 +- mimelib/nntp.cpp | 42 +- .../bodypartformatter/attendeeselector.cpp | 4 +- .../kmail/bodypartformatter/text_calendar.cpp | 10 +- .../kmail/bodypartformatter/text_vcard.cpp | 2 +- .../kmail/bodypartformatter/text_xdiff.cpp | 6 +- .../bodypartformatter/ui_attendeeselector.ui | 10 +- wizards/egroupwarewizard.cpp | 2 +- wizards/groupwarewizard.cpp | 6 +- wizards/kmailchanges.cpp | 6 +- wizards/kolabwizard.cpp | 2 +- wizards/overviewpage.cpp | 26 +- wizards/scalixwizard.cpp | 6 +- wizards/servertype.h | 2 +- 1758 files changed, 9472 insertions(+), 83876 deletions(-) delete mode 100644 kpilot/.emacs-dirvars delete mode 100644 kpilot/AUTHORS delete mode 100644 kpilot/CMakeLists.txt delete mode 100644 kpilot/COPYING delete mode 100644 kpilot/ChangeLog delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/Makefile delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/index.tex delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/pictures/ConnectionsDialog.png delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/pictures/NoLayoutDialog.png delete mode 100644 kpilot/Documentation/ConduitProgrammingTutorial/pictures/ProxyTab.png delete mode 100644 kpilot/Documentation/HOWTO-CODE.txt delete mode 100644 kpilot/Documentation/HOWTO-CONDUIT.txt delete mode 100644 kpilot/Documentation/README delete mode 100644 kpilot/Documentation/README-3.2.1+ delete mode 100644 kpilot/Documentation/README-4.0.0 delete mode 100644 kpilot/Documentation/README-4.2.1 delete mode 100644 kpilot/Documentation/README-4.2.2 delete mode 100644 kpilot/Documentation/UML/vcal-classdiagram.xmi.tgz delete mode 100644 kpilot/Documentation/checkPlugin.sh delete mode 100755 kpilot/Documentation/merge-into-svn.sh delete mode 100644 kpilot/INSTALL delete mode 100644 kpilot/Mainpage.dox delete mode 100644 kpilot/Makefile.am delete mode 100644 kpilot/Makefile.cmake delete mode 100644 kpilot/NEWS delete mode 100644 kpilot/README delete mode 100644 kpilot/TODO delete mode 100644 kpilot/cmake/modules/FindMal.cmake delete mode 100644 kpilot/cmake/modules/FindPilotlink.cmake delete mode 100644 kpilot/cmake/modules/KPilotCustom.cmake delete mode 100644 kpilot/cmake_uninstall.cmake.in delete mode 100644 kpilot/conduits/CMakeLists.txt delete mode 100644 kpilot/conduits/Makefile.am delete mode 100644 kpilot/conduits/abbrowserconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui delete mode 100644 kpilot/conduits/abbrowserconduit/Makefile.am delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser-conduit.h delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser-factory.cc delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser-factory.h delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser-setup.cc delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser-setup.h delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop delete mode 100644 kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg delete mode 100644 kpilot/conduits/abbrowserconduit/kabcRecord.cc delete mode 100644 kpilot/conduits/abbrowserconduit/kabcRecord.h delete mode 100644 kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui delete mode 100644 kpilot/conduits/abbrowserconduit/resolutionDialog.cc delete mode 100644 kpilot/conduits/abbrowserconduit/resolutionDialog.h delete mode 100644 kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui delete mode 100644 kpilot/conduits/abbrowserconduit/resolutionTable.h delete mode 100644 kpilot/conduits/configure.in.bot delete mode 100644 kpilot/conduits/configure.in.in delete mode 100644 kpilot/conduits/docconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/docconduit/DOC-converter.cc delete mode 100644 kpilot/conduits/docconduit/DOC-converter.h delete mode 100644 kpilot/conduits/docconduit/Icons/CMakeLists.txt delete mode 100644 kpilot/conduits/docconduit/Icons/Makefile.am delete mode 100644 kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png delete mode 100644 kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png delete mode 100644 kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png delete mode 100644 kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png delete mode 100644 kpilot/conduits/docconduit/Makefile.am delete mode 100644 kpilot/conduits/docconduit/bmkSpecification.txt delete mode 100644 kpilot/conduits/docconduit/doc-conduit.cc delete mode 100644 kpilot/conduits/docconduit/doc-conduit.h delete mode 100644 kpilot/conduits/docconduit/doc-conflictdialog.cc delete mode 100644 kpilot/conduits/docconduit/doc-conflictdialog.h delete mode 100644 kpilot/conduits/docconduit/doc-factory.cc delete mode 100644 kpilot/conduits/docconduit/doc-factory.h delete mode 100644 kpilot/conduits/docconduit/doc-setup.cc delete mode 100644 kpilot/conduits/docconduit/doc-setup.h delete mode 100644 kpilot/conduits/docconduit/doc-setupdialog.ui delete mode 100644 kpilot/conduits/docconduit/doc_conduit.desktop delete mode 100644 kpilot/conduits/docconduit/docconduit.kcfg delete mode 100644 kpilot/conduits/docconduit/docconduitSettings.kcfgc delete mode 100644 kpilot/conduits/docconduit/kpalmdoc.cpp delete mode 100644 kpilot/conduits/docconduit/kpalmdoc.desktop delete mode 100644 kpilot/conduits/docconduit/kpalmdoc.kcfg delete mode 100644 kpilot/conduits/docconduit/kpalmdoc.upd delete mode 100644 kpilot/conduits/docconduit/kpalmdocSettings.kcfgc delete mode 100644 kpilot/conduits/docconduit/kpalmdoc_dlg.cc delete mode 100644 kpilot/conduits/docconduit/kpalmdoc_dlg.h delete mode 100644 kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui delete mode 100644 kpilot/conduits/docconduit/makedoc9.cc delete mode 100644 kpilot/conduits/docconduit/makedoc9.h delete mode 100644 kpilot/conduits/docconduit/pilotDOCBookmark.cc delete mode 100644 kpilot/conduits/docconduit/pilotDOCBookmark.h delete mode 100644 kpilot/conduits/docconduit/pilotDOCEntry.cc delete mode 100644 kpilot/conduits/docconduit/pilotDOCEntry.h delete mode 100644 kpilot/conduits/docconduit/pilotDOCHead.cc delete mode 100644 kpilot/conduits/docconduit/pilotDOCHead.h delete mode 100644 kpilot/conduits/docconduit/tests/testcompress.cpp delete mode 100644 kpilot/conduits/knotes/CMakeLists.txt delete mode 100644 kpilot/conduits/knotes/Makefile.am delete mode 100644 kpilot/conduits/knotes/cr32-app-knotesconduit.png delete mode 100644 kpilot/conduits/knotes/knotes-action.cc delete mode 100644 kpilot/conduits/knotes/knotes-action.h delete mode 100644 kpilot/conduits/knotes/knotes-conduit.desktop delete mode 100644 kpilot/conduits/knotes/knotes-factory.cc delete mode 100644 kpilot/conduits/knotes/knotes-factory.h delete mode 100644 kpilot/conduits/knotes/knotes-setup.cc delete mode 100644 kpilot/conduits/knotes/knotes-setup.h delete mode 100644 kpilot/conduits/knotes/knotesconduit.kcfg delete mode 100644 kpilot/conduits/knotes/knotesconduitSettings.kcfgc delete mode 100644 kpilot/conduits/knotes/setup_base.ui delete mode 100644 kpilot/conduits/malconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/malconduit/Makefile.am delete mode 100644 kpilot/conduits/malconduit/README delete mode 100644 kpilot/conduits/malconduit/mal-conduit.cc delete mode 100644 kpilot/conduits/malconduit/mal-conduit.h delete mode 100644 kpilot/conduits/malconduit/mal-factory.cc delete mode 100644 kpilot/conduits/malconduit/mal-factory.h delete mode 100644 kpilot/conduits/malconduit/mal-setup.cc delete mode 100644 kpilot/conduits/malconduit/mal-setup.h delete mode 100644 kpilot/conduits/malconduit/mal-setup_dialog.ui delete mode 100644 kpilot/conduits/malconduit/mal_conduit.desktop delete mode 100644 kpilot/conduits/malconduit/malconduit.kcfg delete mode 100644 kpilot/conduits/malconduit/malconduitSettings.kcfgc delete mode 100644 kpilot/conduits/memofileconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/memofileconduit/Makefile.am delete mode 100644 kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg delete mode 100644 kpilot/conduits/memofileconduit/design/SQD - copyPCToHH.jpg delete mode 100644 kpilot/conduits/memofileconduit/design/SQD - detailed load.jpg delete mode 100644 kpilot/conduits/memofileconduit/design/SQD - sync.jpg delete mode 100644 kpilot/conduits/memofileconduit/memofile-conduit.cc delete mode 100644 kpilot/conduits/memofileconduit/memofile-conduit.desktop delete mode 100644 kpilot/conduits/memofileconduit/memofile-conduit.h delete mode 100644 kpilot/conduits/memofileconduit/memofile-factory.cc delete mode 100644 kpilot/conduits/memofileconduit/memofile-factory.h delete mode 100644 kpilot/conduits/memofileconduit/memofile.cc delete mode 100644 kpilot/conduits/memofileconduit/memofile.h delete mode 100644 kpilot/conduits/memofileconduit/memofileSettings.kcfgc delete mode 100644 kpilot/conduits/memofileconduit/memofileconduit.kcfg delete mode 100644 kpilot/conduits/memofileconduit/memofileconduit.xmi delete mode 100644 kpilot/conduits/memofileconduit/memofiles.cc delete mode 100644 kpilot/conduits/memofileconduit/memofiles.h delete mode 100644 kpilot/conduits/memofileconduit/setup_base.ui delete mode 100644 kpilot/conduits/notepadconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/notepadconduit/Makefile.am delete mode 100644 kpilot/conduits/notepadconduit/notepad-conduit.cc delete mode 100644 kpilot/conduits/notepadconduit/notepad-conduit.desktop delete mode 100644 kpilot/conduits/notepadconduit/notepad-conduit.h delete mode 100644 kpilot/conduits/notepadconduit/notepad-factory.cc delete mode 100644 kpilot/conduits/notepadconduit/notepad-factory.h delete mode 100644 kpilot/conduits/notepadconduit/notepad-setup.ui delete mode 100644 kpilot/conduits/notepadconduit/notepadconduit.kcfg delete mode 100644 kpilot/conduits/notepadconduit/notepadconduit.kcfgc delete mode 100644 kpilot/conduits/null/CMakeLists.txt delete mode 100644 kpilot/conduits/null/Makefile.am delete mode 100644 kpilot/conduits/null/null-conduit.cc delete mode 100644 kpilot/conduits/null/null-conduit.desktop delete mode 100644 kpilot/conduits/null/null-conduit.h delete mode 100644 kpilot/conduits/null/null-factory.cc delete mode 100644 kpilot/conduits/null/null-factory.h delete mode 100644 kpilot/conduits/null/nullSettings.kcfgc delete mode 100644 kpilot/conduits/null/nullconduit.kcfg delete mode 100644 kpilot/conduits/null/setup_base.ui delete mode 100644 kpilot/conduits/popmail/CMakeLists.txt delete mode 100644 kpilot/conduits/popmail/Makefile.am delete mode 100644 kpilot/conduits/popmail/popmail-conduit.cc delete mode 100644 kpilot/conduits/popmail/popmail-conduit.desktop delete mode 100644 kpilot/conduits/popmail/popmail-conduit.h delete mode 100644 kpilot/conduits/popmail/popmail-factory.cc delete mode 100644 kpilot/conduits/popmail/popmail-factory.h delete mode 100644 kpilot/conduits/popmail/popmail.kcfg delete mode 100644 kpilot/conduits/popmail/popmailSettings.kcfgc delete mode 100644 kpilot/conduits/popmail/setup-dialog.ui delete mode 100644 kpilot/conduits/popmail/setupDialog.cc delete mode 100644 kpilot/conduits/popmail/setupDialog.h delete mode 100644 kpilot/conduits/recordconduit/Makefile.am delete mode 100644 kpilot/conduits/recordconduit/factory.cc delete mode 100644 kpilot/conduits/recordconduit/factory.h delete mode 100644 kpilot/conduits/recordconduit/record-conduit.desktop delete mode 100644 kpilot/conduits/recordconduit/settings.kcfg delete mode 100644 kpilot/conduits/recordconduit/settings.kcfgc delete mode 100644 kpilot/conduits/recordconduit/setup_base.ui delete mode 100644 kpilot/conduits/sysinfoconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/sysinfoconduit/Makefile.am delete mode 100644 kpilot/conduits/sysinfoconduit/Template.html delete mode 100644 kpilot/conduits/sysinfoconduit/Template.txt delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-conduit.h delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-factory.cc delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-factory.h delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-setup.cc delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-setup.h delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfoSettings.kcfgc delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop delete mode 100644 kpilot/conduits/sysinfoconduit/sysinfoconduit.kcfg delete mode 100644 kpilot/conduits/timeconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/timeconduit/Makefile.am delete mode 100644 kpilot/conduits/timeconduit/time-conduit.cc delete mode 100644 kpilot/conduits/timeconduit/time-conduit.h delete mode 100644 kpilot/conduits/timeconduit/time-factory.cc delete mode 100644 kpilot/conduits/timeconduit/time-factory.h delete mode 100644 kpilot/conduits/timeconduit/time-setup.cc delete mode 100644 kpilot/conduits/timeconduit/time-setup.h delete mode 100644 kpilot/conduits/timeconduit/time-setup_dialog.ui delete mode 100644 kpilot/conduits/timeconduit/timeConduitSettings.kcfgc delete mode 100644 kpilot/conduits/timeconduit/time_conduit.desktop delete mode 100644 kpilot/conduits/timeconduit/timeconduit.kcfg delete mode 100644 kpilot/conduits/vcalconduit/CMakeLists.txt delete mode 100644 kpilot/conduits/vcalconduit/Makefile.am delete mode 100644 kpilot/conduits/vcalconduit/README delete mode 100644 kpilot/conduits/vcalconduit/cleanupstate.cc delete mode 100644 kpilot/conduits/vcalconduit/cleanupstate.h delete mode 100644 kpilot/conduits/vcalconduit/conduitstate.h delete mode 100644 kpilot/conduits/vcalconduit/deleteunsyncedhhstate.cc delete mode 100644 kpilot/conduits/vcalconduit/deleteunsyncedhhstate.h delete mode 100644 kpilot/conduits/vcalconduit/deleteunsyncedpcstate.cc delete mode 100644 kpilot/conduits/vcalconduit/deleteunsyncedpcstate.h delete mode 100644 kpilot/conduits/vcalconduit/hhtopcstate.cc delete mode 100644 kpilot/conduits/vcalconduit/hhtopcstate.h delete mode 100644 kpilot/conduits/vcalconduit/initstate.cc delete mode 100644 kpilot/conduits/vcalconduit/initstate.h delete mode 100644 kpilot/conduits/vcalconduit/kcalRecord.cc delete mode 100644 kpilot/conduits/vcalconduit/kcalRecord.h delete mode 100644 kpilot/conduits/vcalconduit/korganizerConduit.ui delete mode 100644 kpilot/conduits/vcalconduit/pctohhstate.cc delete mode 100644 kpilot/conduits/vcalconduit/pctohhstate.h delete mode 100644 kpilot/conduits/vcalconduit/teststate.cc delete mode 100644 kpilot/conduits/vcalconduit/teststate.h delete mode 100644 kpilot/conduits/vcalconduit/todo-conduit.cc delete mode 100644 kpilot/conduits/vcalconduit/todo-conduit.desktop delete mode 100644 kpilot/conduits/vcalconduit/todo-conduit.h delete mode 100644 kpilot/conduits/vcalconduit/todo-factory.cc delete mode 100644 kpilot/conduits/vcalconduit/todo-factory.h delete mode 100644 kpilot/conduits/vcalconduit/todo-setup.cc delete mode 100644 kpilot/conduits/vcalconduit/todo-setup.h delete mode 100644 kpilot/conduits/vcalconduit/todoRecord.cc delete mode 100644 kpilot/conduits/vcalconduit/todoRecord.h delete mode 100644 kpilot/conduits/vcalconduit/vcal-conduit.cc delete mode 100644 kpilot/conduits/vcalconduit/vcal-conduit.desktop delete mode 100644 kpilot/conduits/vcalconduit/vcal-conduit.h delete mode 100644 kpilot/conduits/vcalconduit/vcal-conduitbase.cc delete mode 100644 kpilot/conduits/vcalconduit/vcal-conduitbase.h delete mode 100644 kpilot/conduits/vcalconduit/vcal-factory.cc delete mode 100644 kpilot/conduits/vcalconduit/vcal-factory.h delete mode 100644 kpilot/conduits/vcalconduit/vcal-factorybase.h delete mode 100644 kpilot/conduits/vcalconduit/vcal-setup.cc delete mode 100644 kpilot/conduits/vcalconduit/vcal-setup.h delete mode 100644 kpilot/conduits/vcalconduit/vcal-setupbase.cc delete mode 100644 kpilot/conduits/vcalconduit/vcal-setupbase.h delete mode 100644 kpilot/conduits/vcalconduit/vcalRecord.cc delete mode 100644 kpilot/conduits/vcalconduit/vcalRecord.h delete mode 100644 kpilot/conduits/vcalconduit/vcalconduitSettings.kcfgc delete mode 100644 kpilot/conduits/vcalconduit/vcalconduitbase.kcfg delete mode 100644 kpilot/config.h.cmake delete mode 100755 kpilot/configure delete mode 100644 kpilot/configure.in.bot delete mode 100644 kpilot/configure.in.in delete mode 100644 kpilot/kpilot/CMakeLists.txt delete mode 100644 kpilot/kpilot/Icons/CMakeLists.txt delete mode 100644 kpilot/kpilot/Icons/Makefile.am delete mode 100644 kpilot/kpilot/Icons/busysync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-backup.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-busysync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-fastsync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-fullsync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-hotsync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-listsync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-nosync.png delete mode 100644 kpilot/kpilot/Icons/cr16-action-restore.png delete mode 100644 kpilot/kpilot/Icons/cr16-app-kpilotDaemon.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-backup.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-busysync.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-fastsync.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-fullsync.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-hotsync.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-listsync.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-nosync.png delete mode 100644 kpilot/kpilot/Icons/cr22-action-restore.png delete mode 100644 kpilot/kpilot/Icons/cr22-app-kpilotDaemon.png delete mode 100644 kpilot/kpilot/Icons/cr32-action-fastsync.png delete mode 100644 kpilot/kpilot/Icons/cr32-action-fullsync.png delete mode 100644 kpilot/kpilot/Icons/cr32-action-hotsync.png delete mode 100644 kpilot/kpilot/Icons/cr32-action-listsync.png delete mode 100644 kpilot/kpilot/Icons/cr32-app-kpilotDaemon.png delete mode 100644 kpilot/kpilot/Icons/cr48-action-fastsync.png delete mode 100644 kpilot/kpilot/Icons/cr48-action-fullsync.png delete mode 100644 kpilot/kpilot/Icons/cr48-action-hotsync.png delete mode 100644 kpilot/kpilot/Icons/cr48-action-listsync.png delete mode 100644 kpilot/kpilot/Icons/cr48-app-kpilotDaemon.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilotaddress.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilotbhotsync.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilotcalendar.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilotdb.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilotfileinstaller.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilotknotes.png delete mode 100644 kpilot/kpilot/Icons/cr64-action-kpilottodo.png delete mode 100644 kpilot/kpilot/Icons/fastsync.png delete mode 100644 kpilot/kpilot/Icons/hi16-app-kpilot.png delete mode 100644 kpilot/kpilot/Icons/hi22-app-kpilot.png delete mode 100644 kpilot/kpilot/Icons/hi32-app-kpilot.png delete mode 100644 kpilot/kpilot/Icons/hi48-app-kpilot.png delete mode 100644 kpilot/kpilot/Icons/hotsync.png delete mode 100644 kpilot/kpilot/Icons/kpilot-splash.png delete mode 100644 kpilot/kpilot/Icons/mini-kpilot.png delete mode 100644 kpilot/kpilot/Icons/nosync.png delete mode 100644 kpilot/kpilot/Makefile-standalone delete mode 100644 kpilot/kpilot/Makefile.am delete mode 100644 kpilot/kpilot/addressEditor.cc delete mode 100644 kpilot/kpilot/addressEditor.h delete mode 100644 kpilot/kpilot/addressWidget.cc delete mode 100644 kpilot/kpilot/addressWidget.h delete mode 100644 kpilot/kpilot/conduitConfigDialog.cc delete mode 100644 kpilot/kpilot/conduitConfigDialog.h delete mode 100644 kpilot/kpilot/datebookWidget.cc delete mode 100644 kpilot/kpilot/datebookWidget.h delete mode 100644 kpilot/kpilot/dbAppInfoEditor.cc delete mode 100644 kpilot/kpilot/dbAppInfoEditor.h delete mode 100644 kpilot/kpilot/dbFlagsEditor.cc delete mode 100644 kpilot/kpilot/dbFlagsEditor.h delete mode 100644 kpilot/kpilot/dbFlagsEditor_base.ui delete mode 100644 kpilot/kpilot/dbFlagsEditor_base.ui.h delete mode 100644 kpilot/kpilot/dbRecordEditor.cc delete mode 100644 kpilot/kpilot/dbRecordEditor.h delete mode 100644 kpilot/kpilot/dbRecordEditor_base.ui delete mode 100644 kpilot/kpilot/dbSelectionDialog.cc delete mode 100644 kpilot/kpilot/dbSelectionDialog.h delete mode 100644 kpilot/kpilot/dbSelection_base.ui delete mode 100644 kpilot/kpilot/dbviewerWidget.cc delete mode 100644 kpilot/kpilot/dbviewerWidget.h delete mode 100644 kpilot/kpilot/fileInstallWidget.cc delete mode 100644 kpilot/kpilot/fileInstallWidget.h delete mode 100644 kpilot/kpilot/fileInstaller.cc delete mode 100644 kpilot/kpilot/fileInstaller.h delete mode 100644 kpilot/kpilot/hotSync.cc delete mode 100644 kpilot/kpilot/hotSync.h delete mode 100644 kpilot/kpilot/internalEditorAction.cc delete mode 100644 kpilot/kpilot/internalEditorAction.h delete mode 100644 kpilot/kpilot/kpilot.cc delete mode 100644 kpilot/kpilot/kpilot.desktop delete mode 100644 kpilot/kpilot/kpilot.gif delete mode 100644 kpilot/kpilot/kpilot.h delete mode 100644 kpilot/kpilot/kpilot.kcfg delete mode 100644 kpilot/kpilot/kpilot.magic delete mode 100644 kpilot/kpilot/kpilot.upd delete mode 100644 kpilot/kpilot/kpilotConfig.cc delete mode 100644 kpilot/kpilot/kpilotConfig.h delete mode 100644 kpilot/kpilot/kpilotConfigDialog.cc delete mode 100644 kpilot/kpilot/kpilotConfigDialog.h delete mode 100644 kpilot/kpilot/kpilotConfigDialog_backup.ui delete mode 100644 kpilot/kpilot/kpilotConfigDialog_device.ui delete mode 100644 kpilot/kpilot/kpilotConfigDialog_startup.ui delete mode 100644 kpilot/kpilot/kpilotConfigDialog_sync.ui delete mode 100644 kpilot/kpilot/kpilotConfigDialog_viewers.ui delete mode 100644 kpilot/kpilot/kpilotConfigWizard.cc delete mode 100644 kpilot/kpilot/kpilotConfigWizard.h delete mode 100644 kpilot/kpilot/kpilotConfigWizard_address.kcfgc delete mode 100644 kpilot/kpilot/kpilotConfigWizard_app.ui delete mode 100644 kpilot/kpilot/kpilotConfigWizard_notes.kcfgc delete mode 100644 kpilot/kpilot/kpilotConfigWizard_user.ui delete mode 100644 kpilot/kpilot/kpilotConfigWizard_vcal.kcfgc delete mode 100644 kpilot/kpilot/kpilotDCOP.h delete mode 100644 kpilot/kpilot/kpilotProbeDialog.cc delete mode 100644 kpilot/kpilot/kpilotProbeDialog.h delete mode 100644 kpilot/kpilot/kpilotSettings.kcfgc delete mode 100644 kpilot/kpilot/kpilot_config.desktop delete mode 100644 kpilot/kpilot/kpilotconduit.desktop delete mode 100644 kpilot/kpilot/kpilotdaemon.desktop delete mode 100644 kpilot/kpilot/kpilotui.rc delete mode 100644 kpilot/kpilot/kroupware.cc delete mode 100644 kpilot/kpilot/kroupware.h delete mode 100644 kpilot/kpilot/listCat.cc delete mode 100644 kpilot/kpilot/listCat.h delete mode 100644 kpilot/kpilot/listItems.cc delete mode 100644 kpilot/kpilot/listItems.h delete mode 100644 kpilot/kpilot/logFile.cc delete mode 100644 kpilot/kpilot/logFile.h delete mode 100644 kpilot/kpilot/logWidget.cc delete mode 100644 kpilot/kpilot/logWidget.h delete mode 100644 kpilot/kpilot/loggerDCOP.h delete mode 100644 kpilot/kpilot/main-config.cc delete mode 100644 kpilot/kpilot/main-test.cc delete mode 100644 kpilot/kpilot/memoWidget.cc delete mode 100644 kpilot/kpilot/memoWidget.h delete mode 100644 kpilot/kpilot/pilot-addresses.c delete mode 100644 kpilot/kpilot/pilotComponent.cc delete mode 100644 kpilot/kpilot/pilotComponent.h delete mode 100644 kpilot/kpilot/pilotDaemon.cc delete mode 100644 kpilot/kpilot/pilotDaemon.h delete mode 100644 kpilot/kpilot/pilotDaemonDCOP.h delete mode 100644 kpilot/kpilot/stamp-h.in delete mode 100644 kpilot/kpilot/syncCalendar.cc delete mode 100644 kpilot/kpilot/todoEditor.cc delete mode 100644 kpilot/kpilot/todoEditor.h delete mode 100644 kpilot/kpilot/todoEditor_base.ui delete mode 100644 kpilot/kpilot/todoWidget.cc delete mode 100644 kpilot/kpilot/todoWidget.h delete mode 100644 kpilot/lib/CMakeLists.txt delete mode 100644 kpilot/lib/COPYING delete mode 100644 kpilot/lib/Makefile.am delete mode 100644 kpilot/lib/actionQueue.cc delete mode 100644 kpilot/lib/actionQueue.h delete mode 100644 kpilot/lib/actions.cc delete mode 100644 kpilot/lib/actions.h delete mode 100644 kpilot/lib/idmapper.cc delete mode 100644 kpilot/lib/idmapper.h delete mode 100644 kpilot/lib/idmapperxml.cc delete mode 100644 kpilot/lib/idmapperxml.h delete mode 100644 kpilot/lib/idmapping.cc delete mode 100644 kpilot/lib/idmapping.h delete mode 100644 kpilot/lib/kpilotdevicelink.cc delete mode 100644 kpilot/lib/kpilotdevicelink.h delete mode 100644 kpilot/lib/kpilotdevicelinkPrivate.h delete mode 100644 kpilot/lib/kpilotlib.kcfg delete mode 100644 kpilot/lib/kpilotlibSettings.kcfgc delete mode 100644 kpilot/lib/kpilotlink.cc delete mode 100644 kpilot/lib/kpilotlink.h delete mode 100644 kpilot/lib/kpilotlocallink.cc delete mode 100644 kpilot/lib/kpilotlocallink.h delete mode 100644 kpilot/lib/options.cc delete mode 100644 kpilot/lib/options.h delete mode 100644 kpilot/lib/pilot.cc delete mode 100644 kpilot/lib/pilot.h delete mode 100644 kpilot/lib/pilotAddress.cc delete mode 100644 kpilot/lib/pilotAddress.h delete mode 100644 kpilot/lib/pilotAppInfo.cc delete mode 100644 kpilot/lib/pilotAppInfo.h delete mode 100644 kpilot/lib/pilotCard.h delete mode 100644 kpilot/lib/pilotDatabase.cc delete mode 100644 kpilot/lib/pilotDatabase.h delete mode 100644 kpilot/lib/pilotDateEntry.cc delete mode 100644 kpilot/lib/pilotDateEntry.h delete mode 100644 kpilot/lib/pilotLinkVersion.h delete mode 100644 kpilot/lib/pilotLocalDatabase.cc delete mode 100644 kpilot/lib/pilotLocalDatabase.h delete mode 100644 kpilot/lib/pilotMemo.cc delete mode 100644 kpilot/lib/pilotMemo.h delete mode 100644 kpilot/lib/pilotRecord.cc delete mode 100644 kpilot/lib/pilotRecord.h delete mode 100644 kpilot/lib/pilotSerialDatabase.cc delete mode 100644 kpilot/lib/pilotSerialDatabase.h delete mode 100644 kpilot/lib/pilotSysInfo.h delete mode 100644 kpilot/lib/pilotTodoEntry.cc delete mode 100644 kpilot/lib/pilotTodoEntry.h delete mode 100644 kpilot/lib/pilotUser.h delete mode 100644 kpilot/lib/plugin.cc delete mode 100644 kpilot/lib/plugin.h delete mode 100644 kpilot/lib/pluginfactory.h delete mode 100644 kpilot/lib/recordConduit.cc delete mode 100644 kpilot/lib/recordConduit.h delete mode 100644 kpilot/lib/syncAction.cc delete mode 100644 kpilot/lib/syncAction.h delete mode 100644 kpilot/tests/CMakeLists.txt delete mode 100644 kpilot/tests/conduits/vcalconduit/exampletest.cc delete mode 100644 kpilot/tests/conduits/vcalconduit/exampletest.h delete mode 100644 kpilot/tests/data/AddressDB.pdb delete mode 100644 kpilot/tests/data/MailDB.pdb delete mode 100644 kpilot/tests/data/MemoDB.pdb delete mode 100644 kpilot/tests/data/ToDoDB.pdb delete mode 100644 kpilot/tests/data/bogus.pdb delete mode 100644 kpilot/tests/exportdatebook.cc delete mode 100644 kpilot/tests/importaddresses.cc delete mode 100644 kpilot/tests/importdatebook.cc delete mode 100644 kpilot/tests/main.cc delete mode 100644 kpilot/tests/mergecalendars.cc delete mode 100644 kpilot/tests/testactions.cc delete mode 100644 kpilot/tests/testaddress.cc delete mode 100644 kpilot/tests/testcategories.cc delete mode 100644 kpilot/tests/testconstants.cc delete mode 100644 kpilot/tests/testdatabase.cc delete mode 100644 kpilot/tests/testdatebook.cc delete mode 100644 kpilot/tests/testidmapper.cc diff --git a/Makefile.am.in b/Makefile.am.in index 9cea71b02..0c9215c4c 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -11,7 +11,7 @@ COMPILE_AFTER_libkmime = libemailfunctions COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer COMPILE_AFTER_libkholidays = korganizer kontact -COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins +COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libkdepim karm knotes kresources kfile-plugins COMPILE_AFTER_mimelib = korn kmail COMPILE_AFTER_libkdenetwork = kmail knode COMPILE_AFTER_libksieve = kmail diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am index f146b4861..45d0d964e 100644 --- a/akregator/src/Makefile.am +++ b/akregator/src/Makefile.am @@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \ kspeech.stub libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries) -libakregatorpart_la_LIBADD = libakregatorprivate.la +libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index c22e84185..18523993d 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -148,7 +148,7 @@ void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& t for (TQValueList::ConstIterator it = actions.begin(); it != actions.end(); ++it) { - (*it)->setChecked(tagIds.contains((*it)->tag().id())); + (*it)->setChecked(tagIds.tqcontains((*it)->tag().id())); } } } @@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag) if (!Settings::showTaggingGUI()) return; - if (!d->tagActions.contains(tag.id())) + if (!d->tagActions.tqcontains(tag.id())) { d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); d->tagMenu->insert(d->tagActions[tag.id()]); diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 6b55d5fb1..09c10fa49 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -4,7 +4,7 @@ AddFeedWidget - + 0 0 @@ -24,7 +24,7 @@ - layout16 + tqlayout16 @@ -56,7 +56,7 @@ Fixed - + 16 20 @@ -65,7 +65,7 @@ - layout15 + tqlayout15 @@ -75,7 +75,7 @@ urlEdit - + 200 0 @@ -128,7 +128,7 @@ Expanding - + 20 50 @@ -137,7 +137,7 @@ - + klineedit.h ksqueezedtextlabel.h diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 449b871e7..aafb17bec 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor } }; -Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, +Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/, TQObject *parent, const char *name, const TQStringList& ) : DCOPObject("AkregatorIface") , MyBasePart(parent, name) @@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, { m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams); - KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") ); + KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") ); } Filters::ArticleFilterList list; @@ -187,14 +187,14 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_actionManager = new ActionManagerImpl(this); ActionManager::setInstance(m_actionManager); - m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view"); + m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view"); m_actionManager->initView(m_view); m_actionManager->setTagSet(Kernel::self()->tagSet()); m_extension = new BrowserExtension(this, "ak_extension"); connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&))); - connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); + connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&))); connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*))); @@ -428,7 +428,7 @@ bool Part::openFile() if (file.size() > 0) // don't backup empty files { - TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t()); + TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()); copyFile(backup); @@ -444,7 +444,7 @@ bool Part::openFile() { if (file.size() > 0) // don't backup empty files { - TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t()); + TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()); copyFile(backup); KMessageBox::error(m_view, i18n("The standard feed list is corrupted (no valid OPML). A backup was created:

%2

").arg(backup), i18n("OPML Parsing Error") ); @@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part) { if (m_mergedPart) { factory()->removeClient(m_mergedPart); - if (childClients()->containsRef(m_mergedPart)) + if (childClients()->tqcontainsRef(m_mergedPart)) removeChildClient(m_mergedPart); } if (part) @@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow() { // this is a dirty fix to get the main window used for the tray icon - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = kapp->tqtopLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; @@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos) if (!widget) { break; } - widget = widget->parentWidget(); + widget = widget->tqparentWidget(); } if (m_view && m_view->currentFrame() && child) { return m_view->currentFrame()->part(); @@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that %2 is not already running.") .arg( programName, programName, backendName ); - // TQString::arg( st ) only replaces the first occurrence of %1 - // with st while TQString::arg( s1, s2 ) replacess all occurrences + // TQString::arg( st ) only tqreplaces the first occurrence of %1 + // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't // even think about changing the above to .arg( programName ). else diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 3b0ec30ed..487b001de 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -80,7 +80,7 @@ namespace Akregator typedef MyBasePart inherited; /** Default constructor.*/ - Part(TQWidget *parentWidget, const char *widgetName, + Part(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList&); /** Destructor. */ diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 8776ec123..59457286a 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons if (!Settings::resetQuickFilterOnNodeChange()) { - m_searchBar->slotSetStatus(Settings::statusFilter()); + m_searchBar->slotSeStatus(Settings::statusFilter()); m_searchBar->slotSetText(Settings::textFilter()); } @@ -411,10 +411,10 @@ void View::slotOnShutdown() void View::saveSettings() { const TQValueList spl1 = m_horizontalSplitter->sizes(); - if ( spl1.contains( 0 ) == 0 ) + if ( spl1.tqcontains( 0 ) == 0 ) Settings::setSplitter1Sizes( spl1 ); const TQValueList spl2 = m_articleSplitter->sizes(); - if ( spl2.contains( 0 ) == 0 ) + if ( spl2.tqcontains( 0 ) == 0 ) Settings::setSplitter2Sizes( spl2 ); Settings::setViewMode( m_viewMode ); Settings::writeConfig(); @@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon) void View::connectFrame(Frame *f) { - connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&))); + connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&))); connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &))); connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) ); connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted())); @@ -465,10 +465,10 @@ void View::connectFrame(Frame *f) connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&))); } -void View::slotStatusText(const TQString &c) +void View::sloStatusText(const TQString &c) { if (sender() == m_currentFrame) - emit setStatusBarText(c); + emit seStatusBarText(c); } void View::slotCaptionChanged(const TQString &c) @@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent) // create a tag for every tag ID in the archive that is not part of the tagset // this is a fallback in case the tagset was corrupted, // so the tagging information from archive does not get lost. - if (!tagSet->containsID(*it)) + if (!tagSet->tqcontainsID(*it)) { Tag tag(*it, *it); tagSet->insert(tag); @@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f) emit setWindowCaption(f->caption()); emit setProgress(f->progress()); - emit setStatusBarText(f->statusText()); + emit seStatusBarText(f->statusText()); if (f->part() == m_part) m_part->mergePart(m_articleViewer); @@ -1070,14 +1070,14 @@ void View::slotFetchingStarted() { m_mainFrame->setState(Frame::Started); m_actionManager->action("feed_stop")->setEnabled(true); - m_mainFrame->setStatusText(i18n("Fetching Feeds...")); + m_mainFrame->seStatusText(i18n("Fetching Feeds...")); } void View::slotFetchingStopped() { m_mainFrame->setState(Frame::Completed); m_actionManager->action("feed_stop")->setEnabled(false); - m_mainFrame->setStatusText(TQString::null); + m_mainFrame->seStatusText(TQString::null); } void View::slotFeedFetched(Feed *feed) @@ -1152,7 +1152,7 @@ void View::slotNewTag() void View::slotTagCreated(const Tag& tag) { - if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id())) + if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id())) { TagNode* tagNode = new TagNode(tag, m_feedList->rootNode()); m_tagNodeList->rootNode()->appendChild(tagNode); @@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article) if (delay > 0) m_markReadTimer->start( delay*1000, true ); else - a.setStatus(Article::Read); + a.seStatus(Article::Read); } } @@ -1329,7 +1329,7 @@ void View::slotArticleDelete() for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) { Feed* feed = (*it).feed(); - if (!feeds.contains(feed)) + if (!feeds.tqcontains(feed)) feeds.append(feed); feed->setNotificationMode(false); (*it).setDeleted(); @@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead() return; for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).setStatus(Article::Read); + (*it).seStatus(Article::Read); } void View::slotTextToSpeechRequest() @@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread() return; for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).setStatus(Article::Unread); + (*it).seStatus(Article::Unread); } void View::slotSetSelectedArticleNew() @@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew() return; for (TQValueList
::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).setStatus(Article::New); + (*it).seStatus(Article::New); } void View::slotSetCurrentArticleReadDelayed() @@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed() if (article.isNull()) return; - article.setStatus(Article::Read); + article.seStatus(Article::Read); } void View::slotMouseOverInfo(const KFileItem *kifi) @@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi) if (kifi) { KFileItem *k=(KFileItem*)kifi; - m_mainFrame->setStatusText(k->url().prettyURL());//getStatusBarInfo()); + m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo()); } else { - m_mainFrame->setStatusText(TQString::null); + m_mainFrame->seStatusText(TQString::null); } } @@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config) m_searchBar->slotSetText(config->readEntry("searchLine")); int statusfilter = config->readNumEntry("searchCombo", -1); if (statusfilter != -1) - m_searchBar->slotSetStatus(statusfilter); + m_searchBar->slotSeStatus(statusfilter); } int selectedID = config->readNumEntry("selectedNodeID", -1); @@ -1529,7 +1529,7 @@ void View::updateTagActions() TQStringList atags = (*it).tags(); for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2) { - if (!tags.contains(*it2)) + if (!tags.tqcontains(*it2)) tags += *it2; } } diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index cb3e032c7..4b9dcd13b 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -83,7 +83,7 @@ namespace Akregator { public: /** constructor - @param part the Akregator::Part which contains this widget + @param part the Akregator::Part which tqcontains this widget @param parent parent widget @param Actionmanager for this view @param name the name of the widget (@ref TQWidget ) @@ -104,7 +104,7 @@ namespace Akregator { bool importFeeds(const TQDomDocument& doc); /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current - feed list is replaced by the parsed one + feed list is tqreplaced by the parsed one @param doc TQDomDocument generated from OPML @param parent The parent group the new nodes */ bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0); @@ -133,7 +133,7 @@ namespace Akregator { void signalUnreadCountChanged(int); void setWindowCaption(const TQString&); - void setStatusBarText(const TQString&); + void seStatusBarText(const TQString&); void setProgress(int); void signalStarted(KIO::Job*); void signalCompleted(); @@ -195,7 +195,7 @@ namespace Akregator { void slotMouseOverInfo(const KFileItem *kifi); /** sets the status bar text to a given string */ - void slotStatusText(const TQString &); + void sloStatusText(const TQString &); void slotStarted(); void slotCanceled(const TQString &); diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index 75d3f7872..09f631a0a 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -102,14 +102,14 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) d->guid = article.guid(); - if (!d->archive->contains(d->guid)) + if (!d->archive->tqcontains(d->guid)) { d->archive->addEntry(d->guid); if (article.meta("deleted") == "true") { // if article is in deleted state, we just add the status and omit the rest d->status = Private::Read | Private::Deleted; - d->archive->setStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); } else { // article is not deleted, let's add it to the archive @@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) d->archive->setCommentsLink(d->guid, article.commentsLink().url()); d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink()); d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true"); - d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime(); + d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime(); d->archive->setPubDate(d->guid, d->pubDate.toTime_t()); d->archive->setAuthor(d->guid, article.author()); @@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) int statusInt = status.toInt(); if (statusInt == New) statusInt = Unread; - setStatus(statusInt); + seStatus(statusInt); } setKeep(article.meta("keep") == "true"); } @@ -210,9 +210,9 @@ void Article::setDeleted() if (isDeleted()) return; - setStatus(Read); + seStatus(Read); d->status = Private::Deleted | Private::Read; - d->archive->setStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); d->archive->setDeleted(d->guid); if (d->feed) @@ -299,7 +299,7 @@ int Article::status() const return Unread; } -void Article::setStatus(int stat) +void Article::seStatus(int stat) { // use status() rather than statusBits() here to filter out status flags that we are not // interested in @@ -319,7 +319,7 @@ void Article::setStatus(int stat) d->status = ( d->status | Private::New) & ~Private::Read; break; } - d->archive->setStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this, oldStatus); } @@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const void Article::setKeep(bool keep) { d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep); - d->archive->setStatus(d->guid, d->status); + d->archive->seStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this); } @@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag) bool Article::hasTag(const TQString& tag) const { - return d->archive->tags(d->guid).contains(tag); + return d->archive->tags(d->guid).tqcontains(tag); } TQStringList Article::tags() const @@ -457,7 +457,7 @@ TQString Article::buildTitle(const TQString& description) if (i != -1) s = s.left(i+1); TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false); - TQString tagName, toReplace, replaceWith; + TQString tagName, toReplace, tqreplaceWith; while (rx.search(s) != -1 ) { tagName=rx.cap(2); @@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description) else if (tagName.startsWith("br") || tagName.startsWith("BR")) { toReplace=rx.cap(1); - replaceWith=" "; + tqreplaceWith=" "; } else toReplace=rx.cap(1); // strip just tag - s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed + s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed } if (s.length()> 90) s=s.left(90)+"..."; diff --git a/akregator/src/article.h b/akregator/src/article.h index e9dae588e..4b4d480e6 100644 --- a/akregator/src/article.h +++ b/akregator/src/article.h @@ -80,7 +80,7 @@ namespace Akregator bool isNull() const; int status() const; - void setStatus(int s); + void seStatus(int s); void offsetPubDate(int secs); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index a8bf8a365..065a421aa 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj) switch (subj) { case Title: - return TQString::fromLatin1("Title"); + return TQString::tqfromLatin1("Title"); case Link: - return TQString::fromLatin1("Link"); + return TQString::tqfromLatin1("Link"); case Author: - return TQString::fromLatin1("Author"); + return TQString::tqfromLatin1("Author"); case Description: - return TQString::fromLatin1("Description"); + return TQString::tqfromLatin1("Description"); case Status: - return TQString::fromLatin1("Status"); + return TQString::tqfromLatin1("Status"); case KeepFlag: - return TQString::fromLatin1("KeepFlag"); + return TQString::tqfromLatin1("KeepFlag"); default: // should never happen (TM) - return TQString::fromLatin1("Description"); + return TQString::tqfromLatin1("Description"); } } Criterion::Subject Criterion::stringToSubject(const TQString& subjStr) { - if (subjStr == TQString::fromLatin1("Title")) + if (subjStr == TQString::tqfromLatin1("Title")) return Title; - else if (subjStr == TQString::fromLatin1("Link")) + else if (subjStr == TQString::tqfromLatin1("Link")) return Link; - else if (subjStr == TQString::fromLatin1("Description")) + else if (subjStr == TQString::tqfromLatin1("Description")) return Description; - else if (subjStr == TQString::fromLatin1("Author")) + else if (subjStr == TQString::tqfromLatin1("Author")) return Author; - else if (subjStr == TQString::fromLatin1("Status")) + else if (subjStr == TQString::tqfromLatin1("Status")) return Status; - else if (subjStr == TQString::fromLatin1("KeepFlag")) + else if (subjStr == TQString::tqfromLatin1("KeepFlag")) return KeepFlag; // hopefully never reached @@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred) switch (pred) { case Contains: - return TQString::fromLatin1("Contains"); + return TQString::tqfromLatin1("Contains"); case Equals: - return TQString::fromLatin1("Equals"); + return TQString::tqfromLatin1("Equals"); case Matches: - return TQString::fromLatin1("Matches"); + return TQString::tqfromLatin1("Matches"); case Negation: - return TQString::fromLatin1("Negation"); + return TQString::tqfromLatin1("Negation"); default:// hopefully never reached - return TQString::fromLatin1("Contains"); + return TQString::tqfromLatin1("Contains"); } } Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr) { - if (predStr == TQString::fromLatin1("Contains")) + if (predStr == TQString::tqfromLatin1("Contains")) return Contains; - else if (predStr == TQString::fromLatin1("Equals")) + else if (predStr == TQString::tqfromLatin1("Equals")) return Equals; - else if (predStr == TQString::fromLatin1("Matches")) + else if (predStr == TQString::tqfromLatin1("Matches")) return Matches; - else if (predStr == TQString::fromLatin1("Negation")) + else if (predStr == TQString::tqfromLatin1("Negation")) return Negation; // hopefully never reached @@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj void Criterion::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject)); + config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject)); - config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate)); + config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate)); - config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName())); + config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName())); - config->writeEntry(TQString::fromLatin1("objectValue"), m_object); + config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object); } void Criterion::readConfig(KConfig* config) { - m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject"))); - m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate"))); - TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii()); + m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject"))); + m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate"))); + TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii()); if (type != TQVariant::Invalid) { - m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type); + m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type); } } @@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const void ArticleMatcher::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association)); + config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association)); - config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count()); + config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count()); int index = 0; for (TQValueList::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it) { - config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index)); + config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index)); (*it).writeConfig(config); ++index; } @@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const void ArticleMatcher::readConfig(KConfig* config) { m_criteria.clear(); - m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation"))); + m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation"))); - int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0); + int count = config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0); for (int i = 0; i < count; ++i) { Criterion c; - config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i)); + config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i)); c.readConfig(config); m_criteria.append(c); } @@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr) { - if (assocStr == TQString::fromLatin1("LogicalAnd")) + if (assocStr == TQString::tqfromLatin1("LogicalAnd")) return LogicalAnd; - else if (assocStr == TQString::fromLatin1("LogicalOr")) + else if (assocStr == TQString::tqfromLatin1("LogicalOr")) return LogicalOr; else return None; @@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association) switch (association) { case LogicalAnd: - return TQString::fromLatin1("LogicalAnd"); + return TQString::tqfromLatin1("LogicalAnd"); case LogicalOr: - return TQString::fromLatin1("LogicalOr"); + return TQString::tqfromLatin1("LogicalOr"); default: - return TQString::fromLatin1("None"); + return TQString::tqfromLatin1("None"); } } @@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0) void TagMatcher::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher")); - config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID); + config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher")); + config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID); } void TagMatcher::readConfig(KConfig* config) { - d->tagID = config->readEntry(TQString::fromLatin1("matcherParams")); + d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams")); } bool TagMatcher::operator==(const AbstractMatcher& other) const @@ -442,41 +442,41 @@ void DeleteAction::exec(Article& article) article.setDeleted(); } -SetStatusAction::SetStatusAction(int status) : m_status(status) +SeStatusAction::SeStatusAction(int status) : m_status(status) { } -void SetStatusAction::exec(Article& article) +void SeStatusAction::exec(Article& article) { if (!article.isNull()) - article.setStatus(m_status); + article.seStatus(m_status); } -int SetStatusAction::status() const +int SeStatusAction::status() const { return m_status; } -void SetStatusAction::setStatus(int status) +void SeStatusAction::seStatus(int status) { m_status = status; } -void SetStatusAction::writeConfig(KConfig* config) const +void SeStatusAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction")); - config->writeEntry(TQString::fromLatin1("actionParams"), m_status); + config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction")); + config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status); } -void SetStatusAction::readConfig(KConfig* config) +void SeStatusAction::readConfig(KConfig* config) { - m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read); + m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read); } -bool SetStatusAction::operator==(const AbstractAction& other) +bool SeStatusAction::operator==(const AbstractAction& other) { AbstractAction* ptr = const_cast(&other); - SetStatusAction* o = dynamic_cast(ptr); + SeStatusAction* o = dynamic_cast(ptr); if (!o) return false; else @@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const void ArticleFilterList::writeConfig(KConfig* config) const { - config->setGroup(TQString::fromLatin1("Filters")); - config->writeEntry(TQString::fromLatin1("count"), count()); + config->setGroup(TQString::tqfromLatin1("Filters")); + config->writeEntry(TQString::tqfromLatin1("count"), count()); int index = 0; for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it) { - config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index)); + config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index)); (*it).writeConfig(config); ++index; } @@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const void ArticleFilterList::readConfig(KConfig* config) { clear(); - config->setGroup(TQString::fromLatin1("Filters")); - int count = config->readNumEntry(TQString::fromLatin1("count"), 0); + config->setGroup(TQString::tqfromLatin1("Filters")); + int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0); for (int i = 0; i < count; ++i) { - config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i)); + config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i)); ArticleFilter filter; filter.readConfig(config); append(filter); @@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config) void AssignTagAction::readConfig(KConfig* config) { - m_tagID = config->readEntry(TQString::fromLatin1("actionParams")); + m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams")); } void AssignTagAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction")); - config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID); + config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction")); + config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID); } bool AssignTagAction::operator==(const AbstractAction& other) @@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/) void DeleteAction::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction")); + config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction")); } bool DeleteAction::operator==(const AbstractAction& other) @@ -661,28 +661,28 @@ void ArticleFilter::readConfig(KConfig* config) delete d->action; d->action = 0; - d->name = config->readEntry(TQString::fromLatin1("name")); - d->id = config->readNumEntry(TQString::fromLatin1("id"), 0); + d->name = config->readEntry(TQString::tqfromLatin1("name")); + d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0); - TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType")); + TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType")); - if (matcherType == TQString::fromLatin1("TagMatcher")) + if (matcherType == TQString::tqfromLatin1("TagMatcher")) d->matcher = new TagMatcher(); - else if (matcherType == TQString::fromLatin1("ArticleMatcher")) + else if (matcherType == TQString::tqfromLatin1("ArticleMatcher")) d->matcher = new ArticleMatcher(); if (d->matcher) d->matcher->readConfig(config); - TQString actionType = config->readEntry(TQString::fromLatin1("actionType")); + TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType")); - if (actionType == TQString::fromLatin1("AssignTagAction")) + if (actionType == TQString::tqfromLatin1("AssignTagAction")) d->action = new AssignTagAction(); - else if (actionType == TQString::fromLatin1("DeleteAction")) + else if (actionType == TQString::tqfromLatin1("DeleteAction")) d->action = new DeleteAction(); - else if (actionType == TQString::fromLatin1("SetStatusAction")) - d->action = new SetStatusAction(); + else if (actionType == TQString::tqfromLatin1("SeStatusAction")) + d->action = new SeStatusAction(); if (d->action) d->action->readConfig(config); @@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config) void ArticleFilter::writeConfig(KConfig* config) const { - config->writeEntry(TQString::fromLatin1("name"), d->name); - config->writeEntry(TQString::fromLatin1("id"), d->id); + config->writeEntry(TQString::tqfromLatin1("name"), d->name); + config->writeEntry(TQString::tqfromLatin1("id"), d->id); d->matcher->writeConfig(config); d->action->writeConfig(config); } diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index 9a9b4a76d..dee27da55 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -166,20 +166,20 @@ class DeleteAction : public AbstractAction virtual bool operator==(const AbstractAction& other); }; -class SetStatusAction : public AbstractAction +class SeStatusAction : public AbstractAction { public: - SetStatusAction(int status=0); + SeStatusAction(int status=0); virtual void exec(Article& article); int status() const; - void setStatus(int status); + void seStatus(int status); virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); - virtual SetStatusAction* clone() const { return new SetStatusAction(*this); } + virtual SeStatusAction* clone() const { return new SeStatusAction(*this); } virtual bool operator==(const AbstractAction& other); private: diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 72527822c..c9df89633 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!d->articleMap.contains(*it)) + if (!d->articleMap.tqcontains(*it)) { if (!(*it).isNull() && !(*it).isDeleted()) { @@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList< for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (!(*it).isNull() && d->articleMap.contains(*it)) + if (!(*it).isNull() && d->articleMap.tqcontains(*it)) { ArticleItem* ali = d->articleMap[*it]; @@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it) { - if (d->articleMap.contains(*it)) + if (d->articleMap.tqcontains(*it)) { ArticleItem* ali = d->articleMap[*it]; d->articleMap.remove(*it); @@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message) const uint x = (viewport()->width() - w - 30) / 2 ; const uint y = (viewport()->height() - h - 30) / 2 ; - p.setBrush( colorGroup().background() ); + p.setBrush( tqcolorGroup().background() ); p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h ); - t.draw( &p, x+15, y+15, TQRect(), colorGroup() ); + t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() ); } void ArticleListView::viewportPaintEvent(TQPaintEvent *e) diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 147f4ab41..d456a415d 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor { text += TQString("
"); TQString url=node->xmlUrl(); - TQString file = url.replace("/", "_").replace(":", "_"); + TQString file = url.tqreplace("/", "_").tqreplace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); text += TQString("\n").arg(node->htmlUrl()).arg(u.url()); @@ -410,7 +410,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic text += TQString("
\n").arg(directionOf(Utils::stripTags(article.title()))); if (article.link().isValid()) text += ""; - text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser + text += article.title().tqreplace("<", "<").tqreplace(">", ">"); // TODO: better leave things escaped in the parser if (article.link().isValid()) text += ""; text += "
\n"; @@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art text += TQString("
\n").arg(directionOf(Utils::stripTags(article.title()))); if (link.isValid()) text += ""; - text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser + text += article.title().tqreplace("<", "<").tqreplace(">", ">"); // TODO: better leave things escaped in the parser if (link.isValid()) text += ""; text += "
\n"; diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp index 679166e1e..020748911 100644 --- a/akregator/src/dragobjects.cpp +++ b/akregator/src/dragobjects.cpp @@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e) bool ArticleDrag::decode(const TQMimeSource* e, TQValueList& articles) { articles.clear(); - TQByteArray array = e->encodedData("akregator/articles"); + TQByteArray array = e->tqencodedData("akregator/articles"); TQDataStream stream(array, IO_ReadOnly); @@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const return 0; } -TQByteArray ArticleDrag::encodedData(const char* mime) const +TQByteArray ArticleDrag::tqencodedData(const char* mime) const { TQCString mimetype(mime); if (mimetype == "akregator/articles") @@ -86,7 +86,7 @@ TQByteArray ArticleDrag::encodedData(const char* mime) const } else { - return KURLDrag::encodedData(mime); + return KURLDrag::tqencodedData(mime); } } diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h index cc1be89f4..88531d367 100644 --- a/akregator/src/dragobjects.h +++ b/akregator/src/dragobjects.h @@ -57,7 +57,7 @@ public: protected: - virtual TQByteArray encodedData(const char* mime) const; + virtual TQByteArray tqencodedData(const char* mime) const; virtual const char* format(int i) const; private: diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index f0574c31a..edf1a7909 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -87,7 +87,7 @@ class Feed::FeedPrivate /** caches guids of tagged articles. key: tag, value: list of guids */ TQMap taggedArticles; - /** list of deleted articles. This contains **/ + /** list of deleted articles. This tqcontains **/ TQValueList
deletedArticles; /** caches guids of deleted articles for notification */ @@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead() TQValueList
::Iterator en = tarticles.end(); for (it = tarticles.begin(); it != en; ++it) - (*it).setStatus(Article::Read); + (*it).seStatus(Article::Read); setNotificationMode(true, true); } } @@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) queue->addFeed(this); else { - uint now = TQDateTime::currentDateTime().toTime_t(); + uint now = TQDateTime::tqcurrentDateTime().toTime_t(); // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes // this fixes annoying behaviour of akregator, especially when the host is reachable @@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc) for (it = d_articles.begin(); it != en; ++it) { - if ( !d->articles.contains((*it).guid()) ) // article not in list + if ( !d->articles.tqcontains((*it).guid()) ) // article not in list { Article mya(*it, this); mya.offsetPubDate(nudge); @@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc) d->addedArticlesNotify.append(mya); if (!mya.isDeleted() && !markImmediatelyAsRead()) - mya.setStatus(Article::New); + mya.seStatus(Article::New); else - mya.setStatus(Article::Read); + mya.seStatus(Article::Read); changed = true; } @@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc) { mya.setKeep(old.keep()); int oldstatus = old.status(); - old.setStatus(Article::Read); + old.seStatus(Article::Read); d->articles.remove(old.guid()); appendArticle(mya); - mya.setStatus(oldstatus); + mya.seStatus(oldstatus); d->updatedArticlesNotify.append(mya); changed = true; @@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const bool Feed::isExpired(const Article& a) const { - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); int expiryAge = -1; // check whether the feed uses the global default and the default is limitArticleAge if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge) @@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a) { if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired { - if (!d->articles.contains(a.guid())) + if (!d->articles.tqcontains(a.guid())) { d->articles[a.guid()] = a; if (!a.isDeleted() && a.status() != Article::Read) @@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery) { if ((*it).status() == Article::New) { - (*it).setStatus(Article::Unread); + (*it).seStatus(Article::Unread); } } @@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) else { d->fetchError = true; - d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t(); + d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t(); emit fetchError(this); } return; @@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) appendArticles(doc); - d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t()); + d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t()); emit fetched(this); } @@ -726,10 +726,10 @@ void Feed::setUnread(int unread) void Feed::setArticleDeleted(Article& a) { - if (!d->deletedArticles.contains(a)) + if (!d->deletedArticles.tqcontains(a)) d->deletedArticles.append(a); - if (!d->removedArticlesNotify.contains(a)) + if (!d->removedArticlesNotify.tqcontains(a)) d->removedArticlesNotify.append(a); articlesModified(); diff --git a/akregator/src/feed.h b/akregator/src/feed.h index 86c98bd80..d94eecaca 100644 --- a/akregator/src/feed.h +++ b/akregator/src/feed.h @@ -264,7 +264,7 @@ namespace Akregator void setArticleDeleted(Article& a); /** notifies that article @c mya was changed - @param oldStatus if the status was changed, it contains the old status, -1 otherwise + @param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise To be called by @ref Article */ void setArticleChanged(Article& a, int oldStatus=-1); diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 13e65d51d..884337067 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self() void FeedIconManager::fetchIcon(Feed* feed) { - if (!d->registeredFeeds.contains(feed)) + if (!d->registeredFeeds.tqcontains(feed)) { d->registeredFeeds.append(feed); connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*))); @@ -133,7 +133,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node) { Feed* feed = dynamic_cast(node); if (feed) - while (d->registeredFeeds.contains(feed)) + while (d->registeredFeeds.tqcontains(feed)) d->registeredFeeds.remove(d->registeredFeeds.find(feed)); } @@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is { while (( f = d->urlDict.take(hostOrURL) )) - if (d->registeredFeeds.contains(f)) + if (d->registeredFeeds.tqcontains(f)) f->setFavicon(p); } emit signalIconChanged(hostOrURL, iconFile); diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 4076c6231..1195b5ddd 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* parent) Feed* feed = Feed::fromOPML(e); if (feed) { - if (!d->urlMap[feed->xmlUrl()].contains(feed)) + if (!d->urlMap[feed->xmlUrl()].tqcontains(feed)) d->urlMap[feed->xmlUrl()].append(feed); parent->appendChild(feed); } @@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) if ( list == this ) return; - if ( !flatList()->contains(parent) ) + if ( !flatList()->tqcontains(parent) ) parent = rootNode(); TQValueList children = list->rootNode()->children(); diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h index 10e492179..c0ba14ccd 100644 --- a/akregator/src/feedlist.h +++ b/akregator/src/feedlist.h @@ -64,7 +64,7 @@ public: /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */ virtual TQDomDocument toXML() const; - /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */ + /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */ Feed* findByURL(const TQString& feedURL) const; Article findArticle(const TQString& feedURL, const TQString& guid) const; diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index 5b2f2a50f..bbf362078 100644 --- a/akregator/src/feedstorage.h +++ b/akregator/src/feedstorage.h @@ -80,7 +80,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject /** returns the guid of the articles in a given category */ virtual TQStringList articles(const Category& cat) = 0; - /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source + /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is tqreplaced by the article from the source @param source the archive which articles should be appended */ virtual void add(FeedStorage* source) = 0; @@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual void clear() = 0; - virtual bool contains(const TQString& guid) = 0; + virtual bool tqcontains(const TQString& guid) = 0; virtual void addEntry(const TQString& guid) = 0; virtual void deleteArticle(const TQString& guid) = 0; virtual int comments(const TQString& guid) = 0; @@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject virtual uint pubDate(const TQString& guid) = 0; virtual void setPubDate(const TQString& guid, uint pubdate) = 0; virtual int status(const TQString& guid) = 0; - virtual void setStatus(const TQString& guid, int status) = 0; + virtual void seStatus(const TQString& guid, int status) = 0; virtual TQString title(const TQString& guid) = 0; virtual void setTitle(const TQString& guid, const TQString& title) = 0; virtual TQString description(const TQString& guid) = 0; diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index 6712d7482..b7200b0e0 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -147,21 +147,21 @@ TQStringList FeedStorageDummyImpl::articles(const Category& cat) void FeedStorageDummyImpl::addEntry(const TQString& guid) { - if (!d->entries.contains(guid)) + if (!d->entries.tqcontains(guid)) { d->entries[guid] = FeedStorageDummyImplPrivate::Entry(); setTotalCount(totalCount()+1); } } -bool FeedStorageDummyImpl::contains(const TQString& guid) +bool FeedStorageDummyImpl::tqcontains(const TQString& guid) { - return d->entries.contains(guid); + return d->entries.tqcontains(guid); } void FeedStorageDummyImpl::deleteArticle(const TQString& guid) { - if (!d->entries.contains(guid)) + if (!d->entries.tqcontains(guid)) return; setDeleted(guid); @@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid) int FeedStorageDummyImpl::comments(const TQString& guid) { - return contains(guid) ? d->entries[guid].comments : 0; + return tqcontains(guid) ? d->entries[guid].comments : 0; } TQString FeedStorageDummyImpl::commentsLink(const TQString& guid) { - return contains(guid) ? d->entries[guid].commentsLink : ""; + return tqcontains(guid) ? d->entries[guid].commentsLink : ""; } bool FeedStorageDummyImpl::guidIsHash(const TQString& guid) { - return contains(guid) ? d->entries[guid].guidIsHash : false; + return tqcontains(guid) ? d->entries[guid].guidIsHash : false; } bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid) { - return contains(guid) ? d->entries[guid].guidIsPermaLink : false; + return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false; } uint FeedStorageDummyImpl::hash(const TQString& guid) { - return contains(guid) ? d->entries[guid].hash : 0; + return tqcontains(guid) ? d->entries[guid].hash : 0; } void FeedStorageDummyImpl::setDeleted(const TQString& guid) { - if (!contains(guid)) + if (!tqcontains(guid)) return; FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; @@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid) TQString FeedStorageDummyImpl::link(const TQString& guid) { - return contains(guid) ? d->entries[guid].link : ""; + return tqcontains(guid) ? d->entries[guid].link : ""; } uint FeedStorageDummyImpl::pubDate(const TQString& guid) { - return contains(guid) ? d->entries[guid].pubDate : 0; + return tqcontains(guid) ? d->entries[guid].pubDate : 0; } int FeedStorageDummyImpl::status(const TQString& guid) { - return contains(guid) ? d->entries[guid].status : 0; + return tqcontains(guid) ? d->entries[guid].status : 0; } -void FeedStorageDummyImpl::setStatus(const TQString& guid, int status) +void FeedStorageDummyImpl::seStatus(const TQString& guid, int status) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].status = status; } TQString FeedStorageDummyImpl::title(const TQString& guid) { - return contains(guid) ? d->entries[guid].title : ""; + return tqcontains(guid) ? d->entries[guid].title : ""; } TQString FeedStorageDummyImpl::description(const TQString& guid) { - return contains(guid) ? d->entries[guid].description : ""; + return tqcontains(guid) ? d->entries[guid].description : ""; } void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].pubDate = pubdate; } void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].guidIsHash = isHash; } void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].link = link; } void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].hash = hash; } void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].title = title; } void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].description = description; } void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].commentsLink = commentsLink; } void FeedStorageDummyImpl::setComments(const TQString& guid, int comments) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].comments = comments; } void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].guidIsPermaLink = isPermaLink; } void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag) { - if (contains(guid)) + if (tqcontains(guid)) { d->entries[guid].tags.append(tag); - if (!d->taggedArticles[tag].contains(guid)) + if (!d->taggedArticles[tag].tqcontains(guid)) d->taggedArticles[tag].append(guid); - if (!d->tags.contains(tag)) + if (!d->tags.tqcontains(tag)) d->tags.append(tag); } @@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag) void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat) { - if (!contains(guid)) + if (!tqcontains(guid)) return; d->entries[guid].categories.append(cat); @@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author) { - if (contains(guid)) + if (tqcontains(guid)) d->entries[guid].author = author; } TQString FeedStorageDummyImpl::author(const TQString& guid) { - return contains(guid) ? d->entries[guid].author : TQString(); + return tqcontains(guid) ? d->entries[guid].author : TQString(); } TQValueList FeedStorageDummyImpl::categories(const TQString& guid) { if (!guid.isNull()) - return contains(guid) ? d->entries[guid].categories : TQValueList(); + return tqcontains(guid) ? d->entries[guid].categories : TQValueList(); else return d->categories; } @@ -365,7 +365,7 @@ TQValueList FeedStorageDummyImpl::categories(const TQString& guid) void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag) { - if (contains(guid)) + if (tqcontains(guid)) { d->entries[guid].tags.remove(tag); d->taggedArticles[tag].remove(guid); @@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag) TQStringList FeedStorageDummyImpl::tags(const TQString& guid) { if (!guid.isNull()) - return contains(guid) ? d->entries[guid].tags : TQStringList(); + return tqcontains(guid) ? d->entries[guid].tags : TQStringList(); else { return d->tags; @@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source) void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source) { - if (!contains(guid)) + if (!tqcontains(guid)) addEntry(guid); setComments(guid, source->comments(guid)); @@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - setStatus(guid, source->status(guid)); + seStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); TQStringList tags = source->tags(guid); @@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear() void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length) { - if (contains(guid)) + if (tqcontains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; entry.hasEnclosure = true; @@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur void FeedStorageDummyImpl::removeEnclosure(const TQString& guid) { - if (contains(guid)) + if (tqcontains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; entry.hasEnclosure = false; @@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid) void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length) { - if (contains(guid)) + if (tqcontains(guid)) { FeedStorageDummyImplPrivate::Entry entry = d->entries[guid]; hasEnclosure = entry.hasEnclosure; diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h index 60c708571..d15f45bd7 100644 --- a/akregator/src/feedstoragedummyimpl.h +++ b/akregator/src/feedstoragedummyimpl.h @@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual TQStringList articles(const Category& cat); - virtual bool contains(const TQString& guid); + virtual bool tqcontains(const TQString& guid); virtual void addEntry(const TQString& guid); virtual void deleteArticle(const TQString& guid); virtual int comments(const TQString& guid); @@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void setStatus(const TQString& guid, int status); + virtual void seStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index 63c4a4c4b..6093cb51c 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -72,7 +72,7 @@ void FetchQueue::slotAbort() void FetchQueue::addFeed(Feed *f) { - if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f)) + if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f)) { connectToFeed(f); d->queuedFeeds.append(f); diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index f3a583a6d..fac9bd2e7 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor) Folder* Folder::fromOPML(TQDomElement e) { - Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title"))); - fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false"))); - fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() ); + Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title"))); + fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false"))); + fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() ); return fg; } @@ -99,7 +99,7 @@ TQStringList Folder::tags() const // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now. TQStringList t2 = (*it)->tags(); for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2) - if (!t.contains(*it2)) + if (!t.tqcontains(*it2)) t.append(*it2); } return t; @@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node) void Folder::removeChild(TreeNode* node) { // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; - if (node && d->children.contains(node)) + if (node && d->children.tqcontains(node)) { node->setParent(0); d->children.remove(node); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index c8780462f..85419931a 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -51,7 +51,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (watchSignals) // e.g, articles tab has no part { connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); - connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &))); + connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) @@ -120,10 +120,10 @@ void Frame::setCaption(const TQString &s) emit captionChanged(s); } -void Frame::setStatusText(const TQString &s) +void Frame::seStatusText(const TQString &s) { m_statusText=s; - m_statusText.replace(TQRegExp("<[^>]*>"), ""); + m_statusText.tqreplace(TQRegExp("<[^>]*>"), ""); emit statusText(m_statusText); } @@ -175,7 +175,7 @@ void Frame::setStarted() { if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString::null, false); - m_progressItem->setStatus(i18n("Loading...")); + m_progressItem->seStatus(i18n("Loading...")); //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); m_state=Started; emit started(); @@ -184,7 +184,7 @@ void Frame::setStarted() void Frame::setCanceled(const TQString &s) { if(m_progressItem) { - m_progressItem->setStatus(i18n("Loading canceled")); + m_progressItem->seStatus(i18n("Loading canceled")); m_progressItem->setComplete(); m_progressItem = 0; } @@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s) void Frame::setCompleted() { if(m_progressItem) { - m_progressItem->setStatus(i18n("Loading completed")); + m_progressItem->seStatus(i18n("Loading completed")); m_progressItem->setComplete(); m_progressItem = 0; } diff --git a/akregator/src/frame.h b/akregator/src/frame.h index 1649722d7..274184029 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -69,7 +69,7 @@ namespace Akregator void setProgress(int); void setCaption(const TQString &); void setTitle(const TQString &); - void setStatusText(const TQString &); + void seStatusText(const TQString &); signals: void captionChanged(const TQString &); diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h index 50e49aa87..da38eec57 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -17,9 +17,9 @@ namespace Akregator { class KCursorSaver : public Qt { public: - /// constructor taking TQCursor shapes - KCursorSaver(Qt::CursorShape shape) { - TQApplication::setOverrideCursor( TQCursor(shape) ); + /// constructor taking TQCursor tqshapes + KCursorSaver(Qt::tqCursorShape tqshape) { + TQApplication::setOverrideCursor( TQCursor(tqshape) ); inited = true; } diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 244130535..59949244b 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); - if ( (e.tagName()==TQString::fromLatin1("link")) && - (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) + if ( (e.tagName()==TQString::tqfromLatin1("link")) && + (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate"))) { - d->link=n.toElement().attribute(TQString::fromLatin1("href")); + d->link=n.toElement().attribute(TQString::tqfromLatin1("href")); break; } } } else { - if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; } // prefer content/content:encoded over summary/description for feeds that provide it - TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded"); + TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded"); if (!(elemText = extractNode(node, tagName, false)).isNull()) d->description = elemText; if (d->description.isEmpty()) { - if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull()) d->description = elemText; if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html { - if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) d->description = elemText; } } @@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new if (format == AtomFeed) { if (version == vAtom_1_0) - elemText = extractNode(node, TQString::fromLatin1("updated")); + elemText = extractNode(node, TQString::tqfromLatin1("updated")); else - elemText = extractNode(node, TQString::fromLatin1("issued")); + elemText = extractNode(node, TQString::tqfromLatin1("issued")); if (!elemText.isNull()) time = parseISO8601Date(elemText); } else { - elemText = extractNode(node, TQString::fromLatin1("pubDate")); + elemText = extractNode(node, TQString::tqfromLatin1("pubDate")); if (!elemText.isNull()) time = KRFCDate::parseDate(elemText); } - if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull()) { time = parseISO8601Date(elemText); } @@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new if (time != 0) d->pubDate.setTime_t(time); - if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) { + if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) { d->commentsLink = elemText; } - if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) { + if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) { d->numComments = elemText.toInt(); } @@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new // in RSS 1.0, we use attribute as ID // FIXME: pass format version instead of checking for attribute - if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about"))) + if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about"))) { - d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work + d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work d->guidIsPermaLink = false; } else { - tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); + tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid"); TQDomNode n = node.namedItem(tagName); if (!n.isNull()) { d->guidIsPermaLink = (format==AtomFeed)? false : true; - if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; + if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; if (!(elemText = extractNode(node, tagName)).isNull()) d->guid = elemText; } @@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new md5Machine.update(d->title.utf8()); md5Machine.update(d->description.utf8()); d->guid = TQString(md5Machine.hexDigest().data()); - d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true"); + d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true"); } - TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure")); + TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure")); if (enclosure.isElement()) d->enclosure = Enclosure::fromXML(enclosure.toElement()); @@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new { if (i.isElement()) { - if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta")) + if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta")) { - TQString type = i.toElement().attribute(TQString::fromLatin1("type")); + TQString type = i.toElement().attribute(TQString::tqfromLatin1("type")); d->meta[type] = i.toElement().text(); } - else if (i.toElement().tagName() == TQString::fromLatin1("category")) + else if (i.toElement().tagName() == TQString::tqfromLatin1("category")) { d->categories.append(Category::fromXML(i.toElement())); } diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 2cbbca06f..611dd408f 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -148,7 +148,7 @@ namespace RSS * @param parent The parent widget for the KURLLabel. * @param name A name for the widget which will be used internally. * @return a widget (a KURLLabel in this case) for the Article. - * This makes building a user-interface which contains the + * This makes building a user-interface which tqcontains the * information in this Article object more convenient. * The returned KURLLabel's caption will be the title(), clicking * on it will emit the URL link(), and it has a TQToolTip attached diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index ae757714c..6dc63d3bb 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -64,8 +64,8 @@ bool Category::isNull() const Category Category::fromXML(const TQDomElement& e) { Category obj; - if (e.hasAttribute(TQString::fromLatin1("domain"))) - obj.d->domain = e.attribute(TQString::fromLatin1("domain")); + if (e.hasAttribute(TQString::tqfromLatin1("domain"))) + obj.d->domain = e.attribute(TQString::tqfromLatin1("domain")); obj.d->category = e.text(); obj.d->isNull = false; return obj; diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index b52ea87c9..170ceaa7e 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format) TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); - if ( (e.tagName() == TQString::fromLatin1("link")) - && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) + if ( (e.tagName() == TQString::tqfromLatin1("link")) + && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate"))) { - return n.toElement().attribute(TQString::fromLatin1("href")); + return n.toElement().attribute(TQString::tqfromLatin1("href")); } } } - return extractNode(node, TQString::fromLatin1("link")); + return extractNode(node, TQString::tqfromLatin1("link")); } @@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private) TQString attr; // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml - if (rootNode.toElement().tagName()==TQString::fromLatin1("html")) + if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html")) d->valid=false; else d->valid=true; - attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString::null); - if (rootNode.toElement().tagName()==TQString::fromLatin1("feed")) + attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null); + if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed")) { d->format=AtomFeed; - if (attr == TQString::fromLatin1("0.3")) + if (attr == TQString::tqfromLatin1("0.3")) d->version = vAtom_0_3; - else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */ + else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */ d->version = vAtom_0_2; - else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */ + else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */ d->version = vAtom_0_1; else d->version = vAtom_1_0; @@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else { d->format=RSSFeed; - if (attr == TQString::fromLatin1("0.91")) + if (attr == TQString::tqfromLatin1("0.91")) d->version = v0_91; - else if (attr == TQString::fromLatin1("0.92")) + else if (attr == TQString::tqfromLatin1("0.92")) d->version = v0_92; - else if (attr == TQString::fromLatin1("0.93")) + else if (attr == TQString::tqfromLatin1("0.93")) d->version = v0_93; - else if (attr == TQString::fromLatin1("0.94")) + else if (attr == TQString::tqfromLatin1("0.94")) d->version = v0_94; else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally // backward-compatible, this should work @@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (d->format==UnknownFormat) { - attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString::null); + attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::null); if (!attr.isNull()) { /* * Hardcoding these URLs is actually a bad idea, since the DTD doesn't @@ -147,11 +147,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private) * distinguish the RSS versions by analyzing the relationship between * the nodes. */ - if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { + if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) { d->format=RSSFeed; d->version = v0_90; } - else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) { + else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) { d->format=RSSFeed; d->version = v1_0; } @@ -163,7 +163,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (d->format == AtomFeed) channelNode=rootNode; else - channelNode=rootNode.namedItem(TQString::fromLatin1("channel")); + channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel")); if (!(elemText = extractTitle(channelNode)).isNull()) d->title = elemText; @@ -192,27 +192,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else { // following is a HACK for broken 0.91 feeds like xanga.com's - if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull()) + if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull()) parentNode = rootNode; else parentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(TQString::fromLatin1("textinput")); + n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); // Our (hopefully faster) version of elementsByTagName() TQString tagName; if (d->format == AtomFeed) - tagName=TQString::fromLatin1("entry"); + tagName=TQString::tqfromLatin1("entry"); else - tagName=TQString::fromLatin1("item"); + tagName=TQString::tqfromLatin1("item"); for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); @@ -220,212 +220,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->articles.append(Article(e, d->format, d->version)); } - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull()) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString::null); + elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString::null); else - elemText = extractNode(channelNode, TQString::fromLatin1("language")); + elemText = extractNode(channelNode, TQString::tqfromLatin1("language")); if (!elemText.isNull()){ - if (elemText == TQString::fromLatin1("af")) + if (elemText == TQString::tqfromLatin1("af")) d->language = af; - else if (elemText == TQString::fromLatin1("sq")) + else if (elemText == TQString::tqfromLatin1("sq")) d->language = sq; - else if (elemText == TQString::fromLatin1("eu")) + else if (elemText == TQString::tqfromLatin1("eu")) d->language = eu; - else if (elemText == TQString::fromLatin1("be")) + else if (elemText == TQString::tqfromLatin1("be")) d->language = be; - else if (elemText == TQString::fromLatin1("bg")) + else if (elemText == TQString::tqfromLatin1("bg")) d->language = bg; - else if (elemText == TQString::fromLatin1("ca")) + else if (elemText == TQString::tqfromLatin1("ca")) d->language = ca; - else if (elemText == TQString::fromLatin1("zh-cn")) + else if (elemText == TQString::tqfromLatin1("zh-cn")) d->language = zh_cn; - else if (elemText == TQString::fromLatin1("zh-tw")) + else if (elemText == TQString::tqfromLatin1("zh-tw")) d->language = zh_tw; - else if (elemText == TQString::fromLatin1("hr")) + else if (elemText == TQString::tqfromLatin1("hr")) d->language = hr; - else if (elemText == TQString::fromLatin1("cs")) + else if (elemText == TQString::tqfromLatin1("cs")) d->language = cs; - else if (elemText == TQString::fromLatin1("da")) + else if (elemText == TQString::tqfromLatin1("da")) d->language = da; - else if (elemText == TQString::fromLatin1("nl")) + else if (elemText == TQString::tqfromLatin1("nl")) d->language = nl; - else if (elemText == TQString::fromLatin1("nl-be")) + else if (elemText == TQString::tqfromLatin1("nl-be")) d->language = nl_be; - else if (elemText == TQString::fromLatin1("nl-nl")) + else if (elemText == TQString::tqfromLatin1("nl-nl")) d->language = nl_nl; - else if (elemText == TQString::fromLatin1("en")) + else if (elemText == TQString::tqfromLatin1("en")) d->language = en; - else if (elemText == TQString::fromLatin1("en-au")) + else if (elemText == TQString::tqfromLatin1("en-au")) d->language = en_au; - else if (elemText == TQString::fromLatin1("en-bz")) + else if (elemText == TQString::tqfromLatin1("en-bz")) d->language = en_bz; - else if (elemText == TQString::fromLatin1("en-ca")) + else if (elemText == TQString::tqfromLatin1("en-ca")) d->language = en_ca; - else if (elemText == TQString::fromLatin1("en-ie")) + else if (elemText == TQString::tqfromLatin1("en-ie")) d->language = en_ie; - else if (elemText == TQString::fromLatin1("en-jm")) + else if (elemText == TQString::tqfromLatin1("en-jm")) d->language = en_jm; - else if (elemText == TQString::fromLatin1("en-nz")) + else if (elemText == TQString::tqfromLatin1("en-nz")) d->language = en_nz; - else if (elemText == TQString::fromLatin1("en-ph")) + else if (elemText == TQString::tqfromLatin1("en-ph")) d->language = en_ph; - else if (elemText == TQString::fromLatin1("en-za")) + else if (elemText == TQString::tqfromLatin1("en-za")) d->language = en_za; - else if (elemText == TQString::fromLatin1("en-tt")) + else if (elemText == TQString::tqfromLatin1("en-tt")) d->language = en_tt; - else if (elemText == TQString::fromLatin1("en-gb")) + else if (elemText == TQString::tqfromLatin1("en-gb")) d->language = en_gb; - else if (elemText == TQString::fromLatin1("en-us")) + else if (elemText == TQString::tqfromLatin1("en-us")) d->language = en_us; - else if (elemText == TQString::fromLatin1("en-zw")) + else if (elemText == TQString::tqfromLatin1("en-zw")) d->language = en_zw; - else if (elemText == TQString::fromLatin1("fo")) + else if (elemText == TQString::tqfromLatin1("fo")) d->language = fo; - else if (elemText == TQString::fromLatin1("fi")) + else if (elemText == TQString::tqfromLatin1("fi")) d->language = fi; - else if (elemText == TQString::fromLatin1("fr")) + else if (elemText == TQString::tqfromLatin1("fr")) d->language = fr; - else if (elemText == TQString::fromLatin1("fr-be")) + else if (elemText == TQString::tqfromLatin1("fr-be")) d->language = fr_be; - else if (elemText == TQString::fromLatin1("fr-ca")) + else if (elemText == TQString::tqfromLatin1("fr-ca")) d->language = fr_ca; - else if (elemText == TQString::fromLatin1("fr-fr")) + else if (elemText == TQString::tqfromLatin1("fr-fr")) d->language = fr_fr; - else if (elemText == TQString::fromLatin1("fr-lu")) + else if (elemText == TQString::tqfromLatin1("fr-lu")) d->language = fr_lu; - else if (elemText == TQString::fromLatin1("fr-mc")) + else if (elemText == TQString::tqfromLatin1("fr-mc")) d->language = fr_mc; - else if (elemText == TQString::fromLatin1("fr-ch")) + else if (elemText == TQString::tqfromLatin1("fr-ch")) d->language = fr_ch; - else if (elemText == TQString::fromLatin1("gl")) + else if (elemText == TQString::tqfromLatin1("gl")) d->language = gl; - else if (elemText == TQString::fromLatin1("gd")) + else if (elemText == TQString::tqfromLatin1("gd")) d->language = gd; - else if (elemText == TQString::fromLatin1("de")) + else if (elemText == TQString::tqfromLatin1("de")) d->language = de; - else if (elemText == TQString::fromLatin1("de-at")) + else if (elemText == TQString::tqfromLatin1("de-at")) d->language = de_at; - else if (elemText == TQString::fromLatin1("de-de")) + else if (elemText == TQString::tqfromLatin1("de-de")) d->language = de_de; - else if (elemText == TQString::fromLatin1("de-li")) + else if (elemText == TQString::tqfromLatin1("de-li")) d->language = de_li; - else if (elemText == TQString::fromLatin1("de-lu")) + else if (elemText == TQString::tqfromLatin1("de-lu")) d->language = de_lu; - else if (elemText == TQString::fromLatin1("de-ch")) + else if (elemText == TQString::tqfromLatin1("de-ch")) d->language = de_ch; - else if (elemText == TQString::fromLatin1("el")) + else if (elemText == TQString::tqfromLatin1("el")) d->language = el; - else if (elemText == TQString::fromLatin1("hu")) + else if (elemText == TQString::tqfromLatin1("hu")) d->language = hu; - else if (elemText == TQString::fromLatin1("is")) + else if (elemText == TQString::tqfromLatin1("is")) d->language = is; - else if (elemText == TQString::fromLatin1("id")) + else if (elemText == TQString::tqfromLatin1("id")) d->language = id; - else if (elemText == TQString::fromLatin1("ga")) + else if (elemText == TQString::tqfromLatin1("ga")) d->language = ga; - else if (elemText == TQString::fromLatin1("it")) + else if (elemText == TQString::tqfromLatin1("it")) d->language = it; - else if (elemText == TQString::fromLatin1("it-it")) + else if (elemText == TQString::tqfromLatin1("it-it")) d->language = it_it; - else if (elemText == TQString::fromLatin1("it-ch")) + else if (elemText == TQString::tqfromLatin1("it-ch")) d->language = it_ch; - else if (elemText == TQString::fromLatin1("ja")) + else if (elemText == TQString::tqfromLatin1("ja")) d->language = ja; - else if (elemText == TQString::fromLatin1("ko")) + else if (elemText == TQString::tqfromLatin1("ko")) d->language = ko; - else if (elemText == TQString::fromLatin1("mk")) + else if (elemText == TQString::tqfromLatin1("mk")) d->language = mk; - else if (elemText == TQString::fromLatin1("no")) + else if (elemText == TQString::tqfromLatin1("no")) d->language = no; - else if (elemText == TQString::fromLatin1("pl")) + else if (elemText == TQString::tqfromLatin1("pl")) d->language = pl; - else if (elemText == TQString::fromLatin1("pt")) + else if (elemText == TQString::tqfromLatin1("pt")) d->language = pt; - else if (elemText == TQString::fromLatin1("pt-br")) + else if (elemText == TQString::tqfromLatin1("pt-br")) d->language = pt_br; - else if (elemText == TQString::fromLatin1("pt-pt")) + else if (elemText == TQString::tqfromLatin1("pt-pt")) d->language = pt_pt; - else if (elemText == TQString::fromLatin1("ro")) + else if (elemText == TQString::tqfromLatin1("ro")) d->language = ro; - else if (elemText == TQString::fromLatin1("ro-mo")) + else if (elemText == TQString::tqfromLatin1("ro-mo")) d->language = ro_mo; - else if (elemText == TQString::fromLatin1("ro-ro")) + else if (elemText == TQString::tqfromLatin1("ro-ro")) d->language = ro_ro; - else if (elemText == TQString::fromLatin1("ru")) + else if (elemText == TQString::tqfromLatin1("ru")) d->language = ru; - else if (elemText == TQString::fromLatin1("ru-mo")) + else if (elemText == TQString::tqfromLatin1("ru-mo")) d->language = ru_mo; - else if (elemText == TQString::fromLatin1("ru-ru")) + else if (elemText == TQString::tqfromLatin1("ru-ru")) d->language = ru_ru; - else if (elemText == TQString::fromLatin1("sr")) + else if (elemText == TQString::tqfromLatin1("sr")) d->language = sr; - else if (elemText == TQString::fromLatin1("sk")) + else if (elemText == TQString::tqfromLatin1("sk")) d->language = sk; - else if (elemText == TQString::fromLatin1("sl")) + else if (elemText == TQString::tqfromLatin1("sl")) d->language = sl; - else if (elemText == TQString::fromLatin1("es")) + else if (elemText == TQString::tqfromLatin1("es")) d->language = es; - else if (elemText == TQString::fromLatin1("es-ar")) + else if (elemText == TQString::tqfromLatin1("es-ar")) d->language = es_ar; - else if (elemText == TQString::fromLatin1("es-bo")) + else if (elemText == TQString::tqfromLatin1("es-bo")) d->language = es_bo; - else if (elemText == TQString::fromLatin1("es-cl")) + else if (elemText == TQString::tqfromLatin1("es-cl")) d->language = es_cl; - else if (elemText == TQString::fromLatin1("es-co")) + else if (elemText == TQString::tqfromLatin1("es-co")) d->language = es_co; - else if (elemText == TQString::fromLatin1("es-cr")) + else if (elemText == TQString::tqfromLatin1("es-cr")) d->language = es_cr; - else if (elemText == TQString::fromLatin1("es-do")) + else if (elemText == TQString::tqfromLatin1("es-do")) d->language = es_do; - else if (elemText == TQString::fromLatin1("es-ec")) + else if (elemText == TQString::tqfromLatin1("es-ec")) d->language = es_ec; - else if (elemText == TQString::fromLatin1("es-sv")) + else if (elemText == TQString::tqfromLatin1("es-sv")) d->language = es_sv; - else if (elemText == TQString::fromLatin1("es-gt")) + else if (elemText == TQString::tqfromLatin1("es-gt")) d->language = es_gt; - else if (elemText == TQString::fromLatin1("es-hn")) + else if (elemText == TQString::tqfromLatin1("es-hn")) d->language = es_hn; - else if (elemText == TQString::fromLatin1("es-mx")) + else if (elemText == TQString::tqfromLatin1("es-mx")) d->language = es_mx; - else if (elemText == TQString::fromLatin1("es-ni")) + else if (elemText == TQString::tqfromLatin1("es-ni")) d->language = es_ni; - else if (elemText == TQString::fromLatin1("es-pa")) + else if (elemText == TQString::tqfromLatin1("es-pa")) d->language = es_pa; - else if (elemText == TQString::fromLatin1("es-py")) + else if (elemText == TQString::tqfromLatin1("es-py")) d->language = es_py; - else if (elemText == TQString::fromLatin1("es-pe")) + else if (elemText == TQString::tqfromLatin1("es-pe")) d->language = es_pe; - else if (elemText == TQString::fromLatin1("es-pr")) + else if (elemText == TQString::tqfromLatin1("es-pr")) d->language = es_pr; - else if (elemText == TQString::fromLatin1("es-es")) + else if (elemText == TQString::tqfromLatin1("es-es")) d->language = es_es; - else if (elemText == TQString::fromLatin1("es-uy")) + else if (elemText == TQString::tqfromLatin1("es-uy")) d->language = es_uy; - else if (elemText == TQString::fromLatin1("es-ve")) + else if (elemText == TQString::tqfromLatin1("es-ve")) d->language = es_ve; - else if (elemText == TQString::fromLatin1("sv")) + else if (elemText == TQString::tqfromLatin1("sv")) d->language = sv; - else if (elemText == TQString::fromLatin1("sv-fi")) + else if (elemText == TQString::tqfromLatin1("sv-fi")) d->language = sv_fi; - else if (elemText == TQString::fromLatin1("sv-se")) + else if (elemText == TQString::tqfromLatin1("sv-se")) d->language = sv_se; - else if (elemText == TQString::fromLatin1("tr")) + else if (elemText == TQString::tqfromLatin1("tr")) d->language = tr; - else if (elemText == TQString::fromLatin1("uk")) + else if (elemText == TQString::tqfromLatin1("uk")) d->language = uk; else d->language = UndefinedLanguage; } if (d->format == AtomFeed) - tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds + tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds // but some broken feeds do this else - tagName=TQString::fromLatin1("pubDate"); + tagName=TQString::tqfromLatin1("pubDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; @@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) { + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) { time_t _time = parseISO8601Date(elemText); /* \bug This isn't really the right way since it will set the date to * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that @@ -451,9 +451,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private) } if (d->format == AtomFeed) - tagName=TQString::fromLatin1("modified"); + tagName=TQString::tqfromLatin1("modified"); else - tagName=TQString::fromLatin1("lastBuildDate"); + tagName=TQString::tqfromLatin1("lastBuildDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; if (d->format == AtomFeed) @@ -463,44 +463,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->lastBuildDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull()) d->rating = elemText; - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull()) d->docs = elemText; - if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) d->managingEditor = elemText; - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull()) d->webMaster = elemText; - if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull()) d->ttl = elemText.toUInt(); - n = channelNode.namedItem(TQString::fromLatin1("skipHours")); + n = channelNode.namedItem(TQString::tqfromLatin1("skipHours")); if (!n.isNull()) for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == TQString::fromLatin1("hour")) + if (e.tagName() == TQString::tqfromLatin1("hour")) d->skipHours.append(e.text().toUInt()); - n = channelNode.namedItem(TQString::fromLatin1("skipDays")); + n = channelNode.namedItem(TQString::tqfromLatin1("skipDays")); if (!n.isNull()) { Day day; TQString elemText; for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == TQString::fromLatin1("day")) { + if (e.tagName() == TQString::tqfromLatin1("day")) { elemText = e.text().lower(); - if (elemText == TQString::fromLatin1("monday")) + if (elemText == TQString::tqfromLatin1("monday")) day = Monday; - else if (elemText == TQString::fromLatin1("tuesday")) + else if (elemText == TQString::tqfromLatin1("tuesday")) day = Tuesday; - else if (elemText == TQString::fromLatin1("wednesday")) + else if (elemText == TQString::tqfromLatin1("wednesday")) day = Wednesday; - else if (elemText == TQString::fromLatin1("thursday")) + else if (elemText == TQString::tqfromLatin1("thursday")) day = Thursday; - else if (elemText == TQString::fromLatin1("friday")) + else if (elemText == TQString::tqfromLatin1("friday")) day = Friday; - else if (elemText == TQString::fromLatin1("saturday")) + else if (elemText == TQString::tqfromLatin1("saturday")) day = Saturday; - else if (elemText == TQString::fromLatin1("sunday")) + else if (elemText == TQString::tqfromLatin1("sunday")) day = Sunday; else day = UndefinedDay; @@ -529,17 +529,17 @@ Version Document::version() const TQString Document::verbVersion() const { switch (d->version) { - case v0_90: return TQString::fromLatin1("0.90"); - case v0_91: return TQString::fromLatin1("0.91"); - case v0_92: return TQString::fromLatin1("0.92"); - case v0_93: return TQString::fromLatin1("0.93"); - case v0_94: return TQString::fromLatin1("0.94"); - case v1_0: return TQString::fromLatin1("1.0"); - case v2_0: return TQString::fromLatin1("2.0"); - case vAtom_0_3: return TQString::fromLatin1("0.3"); - case vAtom_0_2: return TQString::fromLatin1("0.2"); - case vAtom_0_1: return TQString::fromLatin1("0.1"); - case vAtom_1_0: return TQString::fromLatin1("1.0"); + case v0_90: return TQString::tqfromLatin1("0.90"); + case v0_91: return TQString::tqfromLatin1("0.91"); + case v0_92: return TQString::tqfromLatin1("0.92"); + case v0_93: return TQString::tqfromLatin1("0.93"); + case v0_94: return TQString::tqfromLatin1("0.94"); + case v1_0: return TQString::tqfromLatin1("1.0"); + case v2_0: return TQString::tqfromLatin1("2.0"); + case vAtom_0_3: return TQString::tqfromLatin1("0.3"); + case vAtom_0_2: return TQString::tqfromLatin1("0.2"); + case vAtom_0_1: return TQString::tqfromLatin1("0.1"); + case vAtom_1_0: return TQString::tqfromLatin1("1.0"); } return TQString::null; } diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index 602a25588..864c19fce 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -57,30 +57,30 @@ Enclosure Enclosure::fromXML(const TQDomElement& e) TQString url, type; int length = -1; - if (e.hasAttribute(TQString::fromLatin1("url"))) - url = e.attribute(TQString::fromLatin1("url")); + if (e.hasAttribute(TQString::tqfromLatin1("url"))) + url = e.attribute(TQString::tqfromLatin1("url")); - if (e.hasAttribute(TQString::fromLatin1("length"))) + if (e.hasAttribute(TQString::tqfromLatin1("length"))) { bool ok; - int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok); + int c = e.attribute(TQString::tqfromLatin1("length")).toInt(&ok); length = ok ? c : -1; } - if (e.hasAttribute(TQString::fromLatin1("type"))) - type = e.attribute(TQString::fromLatin1("type")); + if (e.hasAttribute(TQString::tqfromLatin1("type"))) + type = e.attribute(TQString::tqfromLatin1("type")); return Enclosure(url, length, type); } TQDomElement Enclosure::toXML(TQDomDocument document) const { - TQDomElement e = document.createElement(TQString::fromLatin1("enclosure")); + TQDomElement e = document.createElement(TQString::tqfromLatin1("enclosure")); if (!d->url.isNull()) - e.setAttribute(TQString::fromLatin1("url"), d->url); + e.setAttribute(TQString::tqfromLatin1("url"), d->url); if (d->length != -1) - e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length)); + e.setAttribute(TQString::tqfromLatin1("length"), TQString::number(d->length)); if (!d->type.isNull()) - e.setAttribute(TQString::fromLatin1("type"), d->type); + e.setAttribute(TQString::tqfromLatin1("type"), d->type); return e; } diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index cb8d7c86b..98074be37 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull()) d->url = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull()) d->height = elemText.toUInt(); - if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull()) d->width = elemText.toUInt(); } diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index 04799fcaa..a12442fa3 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/textinput.cpp @@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private) { TQString elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("name")))) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("name")))) d->name = elemText; - if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; } diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 41996fd8f..e12bea883 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -43,11 +43,11 @@ TQString childNodesAsXML(const TQDomNode& parent) static TQString plainTextToHtml(const TQString& plainText) { TQString str(plainText); - str.replace("&", "&"); - str.replace("\"", """); - str.replace("<", "<"); - //str.replace(">", ">"); - str.replace("\n", "
"); + str.tqreplace("&", "&"); + str.tqreplace("\"", """); + str.tqreplace("<", "<"); + //str.tqreplace(">", ">"); + str.tqreplace("\n", "
"); return str; } @@ -84,7 +84,7 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type xmltypes.append(TQString::fromUtf8("application/xml-dtd")); - if (xmltypes.contains(type) + if (xmltypes.tqcontains(type) || type.endsWith(TQString::fromUtf8("+xml"), false) || type.endsWith(TQString::fromUtf8("/xml"), false)) return XML; @@ -102,7 +102,7 @@ static TQString extractAtomContent(const TQDomElement& e) { case HTML: { - const bool hasPre = e.text().contains( "
", false ) || e.text().contains( "
", false ) || e.text().tqcontains( "
", false) || result.contains("
 regexp
+            bool hasPre = result.tqcontains("
", false) || result.tqcontains("
 regexp
             if(!isInlined && !hasHtml)						// perform nl2br if not a inline elt and it has no html elts
-                    result = result = result.replace(TQChar('\n'), "
");
+                    result = result = result.tqreplace(TQChar('\n'), "
");
             if(!hasPre)										// strip white spaces if no 
                     result = result.simplifyWhiteSpace();
         }
@@ -145,13 +145,13 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
 
 TQString extractTitle(const TQDomNode & parent)
 {
-    TQDomNode node = parent.namedItem(TQString::fromLatin1("title"));
+    TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
     if (node.isNull())
         return TQString::null;
 
     TQString result = node.toElement().text();
 
-    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\"));
+    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).tqreplace(TQRegExp("<[^>]*>"), "").remove("\\"));
 	result = result.simplifyWhiteSpace();
 
     if (result.isEmpty())
@@ -177,7 +177,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
     {
         TQString all = remail.cap(0);
         email = remail.cap(1);
-        str.replace(all, ""); // remove mail address
+        str.tqreplace(all, ""); // remove mail address
     }
     
     // simplify the rest and use it as name
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index 5434a4a6e..608d36a01 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -52,7 +52,7 @@ public:
     int currentID;
     TQValueList views;
     TQMap idToView;
-    TQHBoxLayout* layout;
+    TQHBoxLayout* tqlayout;
     ViewMode viewMode;
     TQMap captions;
 };
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
     d->current = 0;
     d->currentID = -1;
     d->viewMode = verticalTabs;
-    d->layout = new TQHBoxLayout(this);
-    //d->layout = new TQGridLayout(this, 1, 2);
+    d->tqlayout = new TQHBoxLayout(this);
+    //d->tqlayout = new TQGridLayout(this, 1, 2);
     d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); 
     d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
     //d->tabBar->setStyle(KMultiTabBar::KDEV3);
     d->tabBar->showActiveTabTexts(true);
     d->tabBar->setPosition(KMultiTabBar::Left);
-    d->layout->addWidget(d->tabBar/*, 0, 0*/);
+    d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
 
     d->stack = new TQWidgetStack(this);
-    d->layout->addWidget(d->stack/*, 0, 1*/);
+    d->tqlayout->addWidget(d->stack/*, 0, 1*/);
     
 //    connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
 }
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 8271994ff..255309ffa 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -85,7 +85,7 @@ MainWindow::MainWindow()
     int statH=fontMetrics().height()+2;
     m_statusLabel = new KSqueezedTextLabel(this);
     m_statusLabel->setTextFormat(Qt::RichText);
-    m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+    m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
     m_statusLabel->setMinimumWidth( 0 );
     m_statusLabel->setFixedHeight( statH );
     statusBar()->addWidget (m_statusLabel, 1, false);
@@ -277,7 +277,7 @@ void MainWindow::slotClearStatusText()
     m_statusLabel->setText(TQString());
 }
 
-void MainWindow::slotSetStatusBarText( const TQString & text )
+void MainWindow::slotSeStatusBarText( const TQString & text )
 {
     m_statusLabel->setText(text);
 }
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index 3c52cdc5f..843062829 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -93,7 +93,7 @@ public:
     
 public slots:
     void slotClearStatusText();
-    void slotSetStatusBarText(const TQString &c);
+    void slotSeStatusBarText(const TQString &c);
 
 protected:
     /**
diff --git a/akregator/src/mk4storage/Makefile.am b/akregator/src/mk4storage/Makefile.am
index 4f2ebfae5..badfa1833 100644
--- a/akregator/src/mk4storage/Makefile.am
+++ b/akregator/src/mk4storage/Makefile.am
@@ -12,7 +12,9 @@ libakregator_mk4storage_plugin_la_LIBADD = \
     $(top_builddir)/akregator/src/librss/librsslocal.la \
     ../libakregatorprivate.la \
     $(LIB_KFILE) \
-    $(LIB_KDECORE)
+    $(LIB_KDECORE) \
+    $(LIB_QT) \
+    $(LIB_KDEUI)
 
 libakregator_mk4storage_plugin_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index b03f0438b..a535197f6 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -147,8 +147,8 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main
     kdDebug() << url2 << endl;
     TQString t = url2;
     TQString t2 = url2;
-    TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
-    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";
+    TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
+    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
 
     d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
     d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
 {
     c4_Row row;
     d->pguid(row) = guid.ascii();
-    if (!contains(guid))
+    if (!tqcontains(guid))
     {
         d->archiveView.Add(row);
         markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
     }
 }
 
-bool FeedStorageMK4Impl::contains(const TQString& guid)
+bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
 {
     return findArticle(guid) != -1;
 }
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
 }
 
-void FeedStorageMK4Impl::setStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
 {
     int findidx = findArticle(guid);
     if (findidx == -1)
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)
 
 void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         addEntry(guid);
     setComments(guid, source->comments(guid));
     setCommentsLink(guid, source->commentsLink(guid));
@@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    setStatus(guid, source->status(guid));
+    seStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     setAuthor(guid, source->author(guid));
 
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index b6fea2e86..df60b29c4 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage
 
         virtual TQStringList articles(const Category& cat);
 
-        virtual bool contains(const TQString& guid);
+        virtual bool tqcontains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
@@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void setStatus(const TQString& guid, int status);
+        virtual void seStatus(const TQString& guid, int status);
         virtual TQString title(const TQString& guid);
         virtual void setTitle(const TQString& guid, const TQString& title);
         virtual TQString description(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h
index 7124a29ea..88b7a39d6 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.h
+++ b/akregator/src/mk4storage/metakit/include/mk4str.h
@@ -96,7 +96,7 @@ d4_inline bool operator== (const char* s1, const c4_String& s2);
 d4_inline bool operator!= (const c4_String& s1, const char* s2);
 d4_inline bool operator!= (const char* s1, const c4_String& s2);
 
-#else                           // Universal replacement classes
+#else                           // Universal tqreplacement classes
 
     /// An efficient string class, modeled after the MFC version
 class c4_String
diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp
index 2d191c645..0873ac835 100644
--- a/akregator/src/mk4storage/metakit/src/column.cpp
+++ b/akregator/src/mk4storage/metakit/src/column.cpp
@@ -770,7 +770,7 @@ void c4_Column::StoreBytes(t4_i32 pos_, const c4_Bytes& buffer_)
       
 t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
 {
-  t4_i32 mask = *ptr_ ? 0 : ~0;
+  t4_i32 tqmask = *ptr_ ? 0 : ~0;
 
   t4_i32 v = 0;
   for (;;) {
@@ -779,7 +779,7 @@ t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
       break;      
   }
   
-  return mask ^ (v - 0x80);   // oops, last byte had bit 7 set
+  return tqmask ^ (v - 0x80);   // oops, last byte had bit 7 set
 }
 
 void c4_Column::PushValue(t4_byte*& ptr_, t4_i32 v_)
@@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)
 
     /*  _currwidth    1:  2:  4:
      *    shiftPos     3   2   1    shift the offset right this much
-     *    maskPos      7   3   1    mask the offset with this
+     *    tqmaskPos      7   3   1    tqmask the offset with this
      */
 
   const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth;
-  const int maskPos = (1 << shiftPos) - 1;
+  const int tqmaskPos = (1 << shiftPos) - 1;
 
   // the following code is similar to c4_Column::Resize, but at bit level
 
     // turn insertion into deletion by inserting entire bytes
   if (count_ > 0) {
     unsigned off = (unsigned) index_ >> shiftPos;
-    int gapBytes = (count_ + maskPos) >> shiftPos;
+    int gapBytes = (count_ + tqmaskPos) >> shiftPos;
 
     InsertData(off, gapBytes, clear_);
 
       // oops, we might have inserted too low by a few entries
-    const int bits = (index_ & maskPos) * _currWidth;
+    const int bits = (index_ & tqmaskPos) * _currWidth;
     if (bits) {
-      const int maskLow = (1 << bits) - 1;
+      const int tqmaskLow = (1 << bits) - 1;
 
         // move the first few bits to start of inserted range
       t4_byte* p = CopyNow(off + gapBytes);
-      t4_byte one = *p & maskLow;
-      *p &= ~maskLow;
+      t4_byte one = *p & tqmaskLow;
+      *p &= ~tqmaskLow;
 
       * CopyNow(off) = one;
     }
diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h
index 3f6e4f157..96d1622ef 100644
--- a/akregator/src/mk4storage/metakit/src/column.h
+++ b/akregator/src/mk4storage/metakit/src/column.h
@@ -169,7 +169,7 @@ private:
   tSetter _setter;
 
   union {
-  t4_byte _item[8]; // holds temp result (careful with alignment!)
+  t4_byte _item[8]; // holds temp result (careful with tqalignment!)
   double _aligner;  // needed for SPARC
   };
 
diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h
index 5dfc25736..8bf3dc8c6 100644
--- a/akregator/src/mk4storage/metakit/src/field.h
+++ b/akregator/src/mk4storage/metakit/src/field.h
@@ -34,7 +34,7 @@ public:
   c4_Field& SubField(int) const;
     //: Returns the description of each subfield.
   bool IsRepeating() const;
-    //: Returns true if this field contains subtables.
+    //: Returns true if this field tqcontains subtables.
   
 /* Field name and description */
   const c4_String& Name() const;
diff --git a/akregator/src/mk4storage/metakit/src/format.cpp b/akregator/src/mk4storage/metakit/src/format.cpp
index aa23e7391..49c45bce6 100644
--- a/akregator/src/mk4storage/metakit/src/format.cpp
+++ b/akregator/src/mk4storage/metakit/src/format.cpp
@@ -1036,7 +1036,7 @@ void c4_FormatV::SetupAllSubviews()
 void c4_FormatV::Define(int rows_, const t4_byte** ptr_)
 {
   if (_inited) {
-    // big oops: a root handler already contains data
+    // big oops: a root handler already tqcontains data
     
     for (int i = 0; i < _subSeqs.GetSize(); ++i)
       ForgetSubview(i);
diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h
index 6003f625d..353d0517a 100644
--- a/akregator/src/mk4storage/metakit/src/handler.h
+++ b/akregator/src/mk4storage/metakit/src/handler.h
@@ -52,7 +52,7 @@ public:
   virtual int ItemSize(int index_) = 0;
     //: Return width of specified data item.
   void GetBytes(int index_, c4_Bytes& buf_, bool copySmall_ =false);
-    //: Used for backward compatibility, should probably be replaced.
+    //: Used for backward compatibility, should probably be tqreplaced.
   virtual const void* Get(int index_, int& length_) = 0;
     //: Retrieves the data item at the specified index.
   virtual void Set(int index_, const c4_Bytes& buf_) = 0;
diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp
index 65a9e94eb..743f47576 100644
--- a/akregator/src/mk4storage/metakit/src/persist.cpp
+++ b/akregator/src/mk4storage/metakit/src/persist.cpp
@@ -144,7 +144,7 @@ private:
 //      other hand, the allocator does not know the size of used slots.
 //    * Alternate function allows marking a specific range as occupied.
 //    * Allocator can be initialized as either all free or all in-use.
-//    * Allocation info contains only integers, it could be stored.
+//    * Allocation info tqcontains only integers, it could be stored.
 //    * To extend allocated slots: "occupy" extra bytes at the end.
 //    * Generic: can be used for memory, disk files, and array entries.
 
@@ -767,7 +767,7 @@ void c4_SaveContext::SaveIt(c4_HandlerSeq& root_, c4_Allocator** spacePtr_,
 
   * write new skip + commit "tails" at limit (no visible effect on file)
   * overwrite commit tail at end  with a skip to this new one (equivalent)
-  * replace header with one pointing to that internal new one (equivalent)
+  * tqreplace header with one pointing to that internal new one (equivalent)
   * flush (now the file is valid both truncated and not-yet-truncated
 
       end = limit;
diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp
index cc8175df2..243eca047 100644
--- a/akregator/src/mk4storage/metakit/src/remap.cpp
+++ b/akregator/src/mk4storage/metakit/src/remap.cpp
@@ -79,7 +79,7 @@ public:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-// The following contains code derived froms Python's dictionaries, hence:
+// The following tqcontains code derived froms Python's dictionaries, hence:
 //  Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
 //  The Netherlands.
 // Reduced and turned into a fast C++ class by Christian Tismer, hence:
@@ -258,10 +258,10 @@ t4_i32 c4_HashViewer::CalcHash(c4_Cursor cursor_) const
 
 int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
 {
-  const unsigned int mask = _map.GetSize() - 2;
+  const unsigned int tqmask = _map.GetSize() - 2;
   /* We must come up with (i, incr) such that 0 <= i < _size
      and 0 < incr < _size and both are a function of hash */
-  int i = mask & ~hash_;
+  int i = tqmask & ~hash_;
   /* We use ~hash_ instead of hash_, as degenerate hash functions, such
      as for ints , can have lots of leading zeros. It's not
      really a performance risk, but better safe than sorry. */
@@ -272,14 +272,14 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
 
   /* Derive incr from hash_, just to make it more arbitrary. Note that
      incr must not be 0, or we will get into an infinite loop.*/
-  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & mask;
+  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & tqmask;
   if (!incr)
-    incr = mask;
+    incr = tqmask;
 
   int poly = GetPoly();
   for (;;)
   {
-    i = (i+incr) & mask;
+    i = (i+incr) & tqmask;
     if (IsUnused(i))
       break;
     if (Hash(i) == hash_ && KeySame(Row(i), cursor_))
@@ -288,7 +288,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
       freeslot = i;
       /* Cycle through GF(2^n)-{0} */
     incr = incr << 1;
-    if (incr > mask)
+    if (incr > tqmask)
       incr ^= poly; /* This will implicitely clear the highest bit */
   }
 
@@ -434,7 +434,7 @@ bool c4_HashViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
   int i = Lookup(value_, n);
   if (i >= 0 && n > 0)
   {
-    _base.SetAt(i, *value_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
     return true;
   }
 
@@ -944,7 +944,7 @@ bool c4_OrderedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
   }
 
   return true;
@@ -1099,7 +1099,7 @@ bool c4_IndexedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
   }
 
   return true;
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index a32de665c..f43bc0e39 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -161,7 +161,7 @@ void c4_Notifier::Notify()
  *  Manager for persistent storage of view structures.
  *
  *  The storage class uses a view, with additional functionality to be able 
- *  to store and reload the data it contains (including nested subviews).
+ *  to store and reload the data it tqcontains (including nested subviews).
  *
  *  By default, data is loaded on demand, i.e. whenever data which has
  *  not yet been referenced is used for the first time.  Loading is limited
@@ -366,7 +366,7 @@ bool c4_Storage::SetAside(c4_Storage& aside_)
 {
   c4_Persist* pers = Persist();
   bool f = pers->SetAside(aside_);
-  // adjust our copy when the root view has been replaced
+  // adjust our copy when the root view has been tqreplaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
@@ -391,7 +391,7 @@ bool c4_Storage::Rollback(bool full_)
 {
   c4_Persist* pers = Persist();
   bool f = Strategy().IsValid() && pers->Rollback(full_);
-  // adjust our copy when the root view has been replaced
+  // adjust our copy when the root view has been tqreplaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
diff --git a/akregator/src/mk4storage/metakit/src/view.cpp b/akregator/src/mk4storage/metakit/src/view.cpp
index af2fc9fa2..11e384ee7 100644
--- a/akregator/src/mk4storage/metakit/src/view.cpp
+++ b/akregator/src/mk4storage/metakit/src/view.cpp
@@ -44,7 +44,7 @@ public:
  *  On Win32, use a critical section to protect the global symbol table.
  *  Also uses special thread-safe calls to inc/dec all reference counts.
  *
- *  This implementation replaces the previous use of TLS, which cannot
+ *  This implementation tqreplaces the previous use of TLS, which cannot
  *  be used without special tricks in dynamically loaded DLL's, as is
  *  required for OCX/ActiveX use (which uses LoadLibrary).
  *
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 0725f57f5..4e210444f 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -100,7 +100,7 @@ main()
 }
 
 // Recursively display the entire view contents. The results shown do not
-// depend on file layout (free space, file positions, flat vs. on-demand).
+// depend on file tqlayout (free space, file positions, flat vs. on-demand).
 
 static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
 {
@@ -219,9 +219,9 @@ void FailExpr(const char* expr)
   Fail(buffer);
 }
 
-int StartTest(int mask_, const char* name_, const char* desc_)
+int StartTest(int tqmask_, const char* name_, const char* desc_)
 {
-  if (mask_)
+  if (tqmask_)
   {
     #if q4_MFC && defined(_DEBUG)
       TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_);
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index cc91559af..c89602373 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -4,7 +4,7 @@
     
         MK4ConfWidgetBase
     
-    
+    
         
             0
             0
@@ -27,7 +27,7 @@
         
         
             
-                layout4
+                tqlayout4
             
             
                 
@@ -46,7 +46,7 @@
                 
                 
                     
-                        layout3
+                        tqlayout3
                     
                     
                         
@@ -74,7 +74,7 @@
         
         
             
-                layout4
+                tqlayout4
             
             
                 
@@ -90,7 +90,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             140
                             20
@@ -169,7 +169,7 @@
         <No)
     
 
-
+
 
     kurlrequester.h
     klineedit.h
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 4fc9ecec1..8fd93c556 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -276,7 +276,7 @@ void StorageMK4Impl::slotCommit()
 
 FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
     {
         FeedStorage* fs = new FeedStorageMK4Impl(url, this);
         d->feeds[url] = fs;
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index bf50efc68..37e317646 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -105,7 +105,7 @@ class StorageMK4Impl : public Storage
         virtual TQString restoreTagSet() const; 
   
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 952428409..fd49c060f 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -216,7 +216,7 @@ int NodeList::generateID()
 void NodeList::slotNodeAdded(TreeNode* node)
 {
     Folder* parent = node->parent();
-    if ( !node || !d->flatList.contains(parent) || d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(parent) || d->flatList.tqcontains(node) )
         return;
 
     addNode(node, false);
@@ -224,7 +224,7 @@ void NodeList::slotNodeAdded(TreeNode* node)
 
 void NodeList::slotNodeDestroyed(TreeNode* node)
 {
-    if ( !node || !d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(node) )
         return;
 
     removeNode(node);
@@ -232,7 +232,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
 
 void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
 {
-    if ( !node || !d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(node) )
         return;
 
     removeNode(node);
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 9f1e5591c..90bf60082 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -356,7 +356,7 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ )
 
 void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args)
 {
-    if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+    if (url.startsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
     {
         KHTMLPart::urlSelected(url,button,state,_target,args);
     }
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
     if ( !obj ) // not all views have a browser extension !
         return;
     
-    int id = obj->metaObject()->findSlot("reparseConfiguration()");
+    int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
     if (id == -1)
         return;
     QUObject o[1];
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 6146ddd86..6535896b7 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -102,7 +102,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node)
     Feed* feed = dynamic_cast(node);
     if (feed)
     {
-        if (!d->handlers.contains(feed))
+        if (!d->handlers.tqcontains(feed))
         d->handlers[feed] = new ProgressItemHandler(feed);
         connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
     }
@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch completed"));
+        d->progressItem->seStatus(i18n("Fetch completed"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch error"));
+        d->progressItem->seStatus(i18n("Fetch error"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch aborted"));
+        d->progressItem->seStatus(i18n("Fetch aborted"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index eb7d39622..3e94c7ed0 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -4,7 +4,7 @@
     
         FeedPropertiesWidget
     
-    
+    
         
             0
             0
@@ -39,7 +39,7 @@
                     
                     
                         
-                            layout8
+                            tqlayout8
                         
                         
                             
@@ -100,7 +100,7 @@
                     
                     
                         
-                            layout9
+                            tqlayout9
                         
                         
                             
@@ -116,7 +116,7 @@
                                 
                                     Fixed
                                 
-                                
+                                
                                     
                                         31
                                         20
@@ -282,7 +282,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         99
                                         20
@@ -299,7 +299,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         100
                                         20
@@ -362,7 +362,7 @@
                     
                     
                         
-                            layout4
+                            tqlayout4
                         
                         
                             
@@ -396,7 +396,7 @@
                         
                             Expanding
                         
-                        
+                        
                             
                                 20
                                 71
@@ -456,7 +456,7 @@
     slotUpdateComboBoxActivated( int )
     slotUpdateCheckBoxToggled( bool )
 
-
+
 
     klineedit.h
     klineedit.h
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index eb5b7cff7..f2dd33e77 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -65,7 +65,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
     d->delay = 400;
     setMargin(2);
     setSpacing(5);
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
     TQToolButton *clearButton = new TQToolButton(this);
     clearButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
 
@@ -144,7 +144,7 @@ void SearchBar::slotClearSearch()
     }
 }
 
-void SearchBar::slotSetStatus(int status)
+void SearchBar::slotSeStatus(int status)
 {
      d->searchCombo->setCurrentItem(status);
      slotSearchComboChanged(status);
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 932275788..8227f83f9 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -58,7 +58,7 @@ class SearchBar : public QHBox
 
     public slots:
         void slotClearSearch();
-        void slotSetStatus(int status);
+        void slotSeStatus(int status);
         void slotSetText(const TQString& text);
 
     private slots:
diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui
index 0fc992959..3cb488682 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -5,7 +5,7 @@
     
         SettingsAdvanced
     
-    
+    
         
             0
             0
@@ -89,7 +89,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             174
                             20
@@ -133,7 +133,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     260
@@ -150,7 +150,7 @@
         setEnabled(bool)
     
 
-
+
 
     kcombobox.h
 
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 48985a878..2f40bcd5d 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -5,7 +5,7 @@
     
         SettingsAppearance
     
-    
+    
         
             0
             0
@@ -197,7 +197,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     41
@@ -234,7 +234,7 @@
         setValue(int)
     
 
-
+
 
     knuminput.h
     knuminput.h
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 4fcfc4e5c..86e0a303f 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -5,7 +5,7 @@
     
         SettingsArchive
     
-    
+    
         
             0
             0
@@ -25,7 +25,7 @@
         
         
             
-                layout1
+                tqlayout1
             
             
                 
@@ -143,7 +143,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             30
@@ -168,7 +168,7 @@
         setEnabled(bool)
     
 
-
+
 
     knuminput.h
     knuminput.h
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index 52729a169..af9798e3c 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -5,7 +5,7 @@
     
         SettingsBrowser
     
-    
+    
         
             0
             0
@@ -87,7 +87,7 @@
             
                 Expanding
             
-            
+            
                 
                     31
                     16
@@ -96,7 +96,7 @@
         
         
             
-                layout2
+                tqlayout2
             
             
                 
@@ -202,5 +202,5 @@
         setEnabled(bool)
     
 
-
+
 
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index dc0e559da..26ef92994 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -5,7 +5,7 @@
     
         SettingsGeneral
     
-    
+    
         
             0
             0
@@ -139,7 +139,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     20
@@ -183,5 +183,5 @@
         setEnabled(bool)
     
 
-
+
 
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 5c3272a13..cd991a49b 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
     
     connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
 
-    TQGridLayout* layout = new TQGridLayout(this, 1, 1);
-    layout->addWidget(d->view, 0, 0);
+    TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
+    tqlayout->addWidget(d->view, 0, 0);
 
     d->visitor = new NodeVisitor(this);
 
@@ -185,7 +185,7 @@ void SimpleNodeSelector::slotItemSelected(TQListViewItem* item)
 
 void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node)
 {
-    if (d->nodeToItem.contains(node))
+    if (d->nodeToItem.tqcontains(node))
     {
         TQListViewItem* item = d->nodeToItem[node];
         d->nodeToItem.remove(node);
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 4f98df2c1..6263c11f0 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -135,7 +135,7 @@ void SpeechClient::slotAbortJobs()
 ASYNC SpeechClient::textRemoved(const TQCString& /*appId*/, uint jobNum)
 {
     kdDebug() << "SpeechClient::textRemoved() called" << endl;
-    if (d->pendingJobs.contains(jobNum))
+    if (d->pendingJobs.tqcontains(jobNum))
     {
         d->pendingJobs.remove(jobNum);
         if (d->pendingJobs.isEmpty())
diff --git a/akregator/src/storage.h b/akregator/src/storage.h
index 8c02a9f7e..2c6a9ceb3 100644
--- a/akregator/src/storage.h
+++ b/akregator/src/storage.h
@@ -105,7 +105,7 @@ class AKREGATOR_EXPORT Storage : public QObject
         virtual TQStringList feeds() const = 0;
 
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source) = 0;
         
diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp
index 25d3f320f..43b8788d0 100644
--- a/akregator/src/storagedummyimpl.cpp
+++ b/akregator/src/storagedummyimpl.cpp
@@ -100,12 +100,12 @@ bool StorageDummyImpl::rollback()
 
 int StorageDummyImpl::unreadFor(const TQString &url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].unread : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].unread : 0;
 }
 
 void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, unread, unread, 0);
     else
        d->feeds[url].unread = unread;
@@ -113,12 +113,12 @@ void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
 
 int StorageDummyImpl::totalCountFor(const TQString &url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].totalCount : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].totalCount : 0;
 }
 
 void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, 0, total, 0);
     else
        d->feeds[url].totalCount = total;
@@ -126,12 +126,12 @@ void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
 
 int StorageDummyImpl::lastFetchFor(const TQString& url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].lastFetch : 0;
 }
 
 void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, 0, 0, lastFetch);
     else 
        d->feeds[url].lastFetch = lastFetch;
@@ -143,7 +143,7 @@ void StorageDummyImpl::slotCommit()
 
 FeedStorage* StorageDummyImpl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
         d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this);
 
     return d->feeds[url].feedStorage;
diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h
index e5ef8cd81..35cbdda43 100644
--- a/akregator/src/storagedummyimpl.h
+++ b/akregator/src/storagedummyimpl.h
@@ -88,7 +88,7 @@ class StorageDummyImpl : public Storage
         virtual TQString restoreTagSet() const;
 
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp
index a175df9da..f6162ef91 100644
--- a/akregator/src/storagefactoryregistry.cpp
+++ b/akregator/src/storagefactoryregistry.cpp
@@ -52,7 +52,7 @@ StorageFactoryRegistry* StorageFactoryRegistry::self()
 	
 bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const TQString& typestr)
 {
-    if (containsFactory(typestr))
+    if (tqcontainsFactory(typestr))
         return false;
     d->map[typestr] = factory;
     return true; 
@@ -68,9 +68,9 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr)
     return d->map[typestr];
 }
 
-bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const
+bool StorageFactoryRegistry::tqcontainsFactory(const TQString& typestr) const
 {
-    return d->map.contains(typestr);
+    return d->map.tqcontains(typestr);
 }
 
 TQStringList StorageFactoryRegistry::list() const
diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h
index 75976e269..645678408 100644
--- a/akregator/src/storagefactoryregistry.h
+++ b/akregator/src/storagefactoryregistry.h
@@ -45,7 +45,7 @@ class AKREGATOR_EXPORT StorageFactoryRegistry
         bool registerFactory(StorageFactory* factory, const TQString& typestr);
         void unregisterFactory(const TQString& typestr);
         StorageFactory* getFactory(const TQString& typestr);
-        bool containsFactory(const TQString& typestr) const;
+        bool tqcontainsFactory(const TQString& typestr) const;
         TQStringList list() const;
         
 
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index df969aacc..3f86fa1d1 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    hframe = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -198,7 +198,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
     removeTabToolTip( sender );
    
     uint lcw=0, rcw=0;
-    int tabBarHeight = tabBar()->sizeHint().height();
+    int tabBarHeight = tabBar()->tqsizeHint().height();
     if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
         lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
     if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -218,7 +218,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
         newTitle = newTitle.left( newMaxLength-3 ) + "...";
     }
 
-    newTitle.replace( '&', "&&" );
+    newTitle.tqreplace( '&', "&&" );
     if ( tabLabel( sender ) != newTitle )
         changeTab( sender, newTitle );
 
@@ -235,7 +235,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
                 newTitle = newTitle.left( newMaxLength-3 ) + "...";
             }
 
-            newTitle.replace( '&', "&&" );
+            newTitle.tqreplace( '&', "&&" );
             if ( newTitle != tabLabel( page( i ) ) )
                     changeTab( page( i ), newTitle );
         }
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index 01c0f4e20..a865b6ec7 100644
--- a/akregator/src/tag.h
+++ b/akregator/src/tag.h
@@ -81,7 +81,7 @@ class Tag
 
     bool isNull() const;
     
-    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */
+    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */
     TQString id() const;
 
     /** user-visible name of the tag */
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index eba476c51..20a68eb41 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -90,7 +90,7 @@ int TagAction::plug(TQWidget* widget, int index)
         return -1;
     
    TagMenuItem* item = new TagMenuItem(d->tag);
-    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index);
+    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->tqcolorGroup()), item, -1, index);
    
     
     popup->connectItem (id, this, TQT_SLOT(slotActivated()));
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index b351d668f..3b4939cd2 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead()
     setNotificationMode(false);
     TQValueList
::Iterator en = d->articles.end();
     for (TQValueList
::Iterator it = d->articles.begin(); it != en; ++it)
-        (*it).setStatus(Article::Read);
+        (*it).seStatus(Article::Read);
     setNotificationMode(true);
 }
     
@@ -196,7 +196,7 @@ void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList
& list
     bool added = false;
     for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (!d->articles.contains(*it) && d->filter.matches(*it))
+        if (!d->articles.tqcontains(*it) && d->filter.matches(*it))
         {
             d->articles.append(*it);
             d->addedArticlesNotify.append(*it);
@@ -216,7 +216,7 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList
& li
     bool updated = false;
     for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articles.contains(*it))
+        if (d->articles.tqcontains(*it))
         {
             if (!d->filter.matches(*it)) // articles is in list, but doesn't match our criteria anymore -> remove it
 	    {
@@ -252,7 +252,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList
& li
     bool removed = false;
     for (TQValueList
::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articles.contains(*it))
+        if (d->articles.tqcontains(*it))
         {
             d->articles.remove(*it);
             d->removedArticlesNotify.append(*it);
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index efe54ae9c..30630f867 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -75,7 +75,7 @@ public:
     virtual int totalCount() const;
 
     
-    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
+    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index c53e5be3b..f1a98b62e 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -92,7 +92,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 {
     tagNode->setId(KApplication::random());
     TQString id = tagNode->tag().id();
-    if (!containsTagId(id))
+    if (!tqcontainsTagId(id))
     {
         rootNode()->appendChild(tagNode); // TODO: maintain sorting
         d->tagIdToNodeMap[id] = tagNode;
@@ -105,7 +105,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 bool TagNodeList::remove(TagNode* tagNode)
 {
     TQString id = tagNode->tag().id();
-    if (containsTagId(id))
+    if (tqcontainsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -120,7 +120,7 @@ void TagNodeList::slotNodeDestroyed(TreeNode* node)
     TagNode* tagNode = dynamic_cast(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (tagNode != 0 && containsTagId(id))
+    if (tagNode != 0 && tqcontainsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -135,7 +135,7 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
     TagNode* tagNode = dynamic_cast(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (tagNode != 0L && !containsTagId(id))
+    if (tagNode != 0L && !tqcontainsTagId(id))
     {
        d->tagIdToNodeMap[id] = tagNode;
        emit signalTagNodeAdded(tagNode);
@@ -149,16 +149,16 @@ void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
     TagNode* tagNode = dynamic_cast(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (parent == rootNode() && tagNode != 0L && containsTagId(id))
+    if (parent == rootNode() && tagNode != 0L && tqcontainsTagId(id))
     {
         d->tagIdToNodeMap.remove(id);
         emit signalTagNodeRemoved(tagNode);
     }
 }
 
-bool TagNodeList::containsTagId(const TQString& tagId)
+bool TagNodeList::tqcontainsTagId(const TQString& tagId)
 {
-    return d->tagIdToNodeMap.contains(tagId);
+    return d->tagIdToNodeMap.tqcontains(tagId);
 }
 
 TQValueList TagNodeList::toList() const
@@ -178,7 +178,7 @@ TQDomDocument TagNodeList::toXML() const
 
 void TagNodeList::slotTagAdded(const Tag& tag)
 {
-    if (!containsTagId(tag.id()))
+    if (!tqcontainsTagId(tag.id()))
     {
         insert(new TagNode(tag, d->feedList->rootNode()));
     }
@@ -186,14 +186,14 @@ void TagNodeList::slotTagAdded(const Tag& tag)
 
 void TagNodeList::slotTagUpdated(const Tag& tag)
 {
-    if (containsTagId(tag.id()))
+    if (tqcontainsTagId(tag.id()))
     {
         d->tagIdToNodeMap[tag.id()]->tagChanged();
     }
 }
 void TagNodeList::slotTagRemoved(const Tag& tag)
 {
-    if (containsTagId(tag.id()))
+    if (tqcontainsTagId(tag.id()))
     {
         delete d->tagIdToNodeMap[tag.id()];
         d->tagIdToNodeMap[tag.id()] = 0;
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index f909c8276..9e67b197c 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -53,7 +53,7 @@ namespace Akregator {
        FeedList* feedList() const;
        bool insert(TagNode* tagNode);
        bool remove(TagNode* tagNode);
-       bool containsTagId(const TQString& tagId);
+       bool tqcontainsTagId(const TQString& tagId);
        TQValueList toList() const;
        
        TagNode* findByTagID(const TQString& tagID);
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index 68bc09c10..d96744bba 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -5,7 +5,7 @@
     
         Form1
     
-    
+    
         
             0
             0
@@ -22,7 +22,7 @@
         
         
             
-                layout1
+                tqlayout1
             
             
                 
@@ -53,7 +53,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     31
@@ -62,7 +62,7 @@
         
         
             
-                layout9
+                tqlayout9
             
             
                 
@@ -91,7 +91,7 @@
                             0
                         
                     
-                    
+                    
                         
                             40
                             40
@@ -117,7 +117,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             200
                             21
@@ -128,7 +128,7 @@
         
     
 
-
+
 
     kicondialog.h
 
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index e3a8d60ec..4cfb787a9 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -54,7 +54,7 @@ TagSet::~TagSet()
 
 void TagSet::insert(const Tag& tag)
 {
-    if (!d->map.contains(tag.id()))
+    if (!d->map.tqcontains(tag.id()))
     {
         d->map.insert(tag.id(), tag);
         tag.addedToTagSet(this);
@@ -64,7 +64,7 @@ void TagSet::insert(const Tag& tag)
 
 void TagSet::remove(const Tag& tag)
 {
-    if (d->map.contains(tag.id()))
+    if (d->map.tqcontains(tag.id()))
     {
         d->map.remove(tag.id());
         tag.removedFromTagSet(this);
@@ -72,19 +72,19 @@ void TagSet::remove(const Tag& tag)
     }
 }
 
-bool TagSet::containsID(const TQString& id) const
+bool TagSet::tqcontainsID(const TQString& id) const
 {
-    return d->map.contains(id);
+    return d->map.tqcontains(id);
 }
 
-bool TagSet::contains(const Tag& tag) const
+bool TagSet::tqcontains(const Tag& tag) const
 {
-    return d->map.contains(tag.id());
+    return d->map.tqcontains(tag.id());
 }
 
 Tag TagSet::findByID(const TQString& id) const
 {
-    return d->map.contains(id) ? d->map[id] : Tag();
+    return d->map.tqcontains(id) ? d->map[id] : Tag();
 }
 
 TQMap TagSet::toMap() const
@@ -99,21 +99,21 @@ void TagSet::readFromXML(const TQDomDocument& doc)
     if (root.isNull())
         return;
 
-    TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag"));
+    TQDomNodeList list = root.elementsByTagName(TQString::tqfromLatin1("tag"));
 
     for (uint i = 0; i < list.length(); ++i)
     {
         TQDomElement e = list.item(i).toElement();
         if (!e.isNull())
         {
-            if (e.hasAttribute(TQString::fromLatin1("id")))
+            if (e.hasAttribute(TQString::tqfromLatin1("id")))
             {
-                TQString id = e.attribute(TQString::fromLatin1("id"));
+                TQString id = e.attribute(TQString::tqfromLatin1("id"));
                 TQString name = e.text();
-                TQString scheme = e.attribute(TQString::fromLatin1("scheme"));
+                TQString scheme = e.attribute(TQString::tqfromLatin1("scheme"));
                 Tag tag(id, name, scheme);
                 
-                TQString icon = e.attribute(TQString::fromLatin1("icon"));
+                TQString icon = e.attribute(TQString::tqfromLatin1("icon"));
                 if (!icon.isEmpty())
                     tag.setIcon(icon);
 
@@ -145,11 +145,11 @@ TQDomDocument TagSet::toXML() const
         TQDomElement tn = doc.createElement("tag");
         
         TQDomText text = doc.createTextNode((*it).name());
-        tn.setAttribute(TQString::fromLatin1("id"),(*it).id());
+        tn.setAttribute(TQString::tqfromLatin1("id"),(*it).id());
         if (!(*it).scheme().isEmpty())
-            tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme());
+            tn.setAttribute(TQString::tqfromLatin1("scheme"),(*it).scheme());
         if (!(*it).icon().isEmpty())
-            tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon());
+            tn.setAttribute(TQString::tqfromLatin1("icon"),(*it).icon());
         tn.appendChild(text);
         root.appendChild(tn);
     }
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index aea004c82..febb47d36 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -62,11 +62,11 @@ class TagSet : public QObject
         /** returns the tag set as map ((id, Tag) pairs) */
         TQMap toMap() const;
 
-        /** returns @c true if this set contains @c tag */
-        bool contains(const Tag& tag) const;
+        /** returns @c true if this set tqcontains @c tag */
+        bool tqcontains(const Tag& tag) const;
 
-        /** returns @c true if this set contains a tag with a given ID */
-        bool containsID(const TQString& id) const;
+        /** returns @c true if this set tqcontains a tag with a given ID */
+        bool tqcontainsID(const TQString& id) const;
 
         /** returns the tag with the given ID if the tag is element of the set, or a null tag if not */
         Tag findByID(const TQString& id) const;
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 1e8a1cf69..366677d39 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -111,7 +111,7 @@ public:
     virtual void setParent(Folder* parent);
     
     
-    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
+    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 92a36859a..02361f377 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
 } 
     
 
-// TODO: reverse for reverse layout
+// TODO: reverse for reverse tqlayout
 void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
                                int column, int width, int align )
 
diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp
index e4a24209e..eb555a752 100644
--- a/akregator/src/utils.cpp
+++ b/akregator/src/utils.cpp
@@ -30,7 +30,7 @@ namespace Akregator {
 
 TQString Utils::stripTags(const TQString& str)
 {
-    return TQString(str).replace(TQRegExp("<[^>]*>"), "");
+    return TQString(str).tqreplace(TQRegExp("<[^>]*>"), "");
 }
 
 uint Utils::calcHash(const TQString& str)
@@ -48,7 +48,7 @@ TQString Utils::fileNameForUrl(const TQString& url_p)
 {
     TQString url2(url_p);
     
-    url2 = url2.replace("/", "_").replace(":", "_");
+    url2 = url2.tqreplace("/", "_").tqreplace(":", "_");
     
     if (url2.length() > 255)
         url2 = url2.left(200) + TQString::number(Akregator::Utils::calcHash(url2), 16);
diff --git a/akregator/src/utils.h b/akregator/src/utils.h
index 8ab0fea10..7a65915b8 100644
--- a/akregator/src/utils.h
+++ b/akregator/src/utils.h
@@ -46,7 +46,7 @@ class Utils
     
     /**
      * returns a file name for a URL, with chars like "/" ":"
-     * replaced by "_". Too long URLs (>255 chars) are shortened and
+     * tqreplaced by "_". Too long URLs (>255 chars) are shortened and
      * appended with a hash value.
      * 
      */
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 55e9b758e..6926a151f 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -112,7 +112,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
    {
        TQString cmd = Settings::externalBrowserCustomCommand();
        TQString urlStr = url.url();
-       cmd.replace(TQRegExp("%u"), urlStr);
+       cmd.tqreplace(TQRegExp("%u"), urlStr);
        KProcess *proc = new KProcess;
        TQStringList cmdAndArgs = KShell::splitArgs(cmd);
        *proc << cmdAndArgs;
@@ -202,7 +202,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
 void Viewer::slotCopy()
 {
     TQString text = selectedText();
-    text.replace( TQChar( 0xa0 ), ' ' );
+    text.tqreplace( TQChar( 0xa0 ), ' ' );
     QClipboard *cb = TQApplication::clipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui
index 967d32982..f907e37d7 100644
--- a/certmanager/certificateinfowidget.ui
+++ b/certmanager/certificateinfowidget.ui
@@ -4,7 +4,7 @@
     
         CertificateInfoWidget
     
-    
+    
         
             0
             0
@@ -12,7 +12,7 @@
             403
         
     
-    
+    
         
             250
             0
@@ -181,7 +181,7 @@
             
                 Expanding
             
-            
+            
                 
                     291
                     16
@@ -211,5 +211,5 @@
         
     
 
-
+
 
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 4367cd667..4932b6bdf 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -155,7 +155,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key  ) {
 
   for ( Kleo::DN::const_iterator dnit = dn.begin() ; dnit != dn.end() ; ++dnit ) {
 	TQString displayName = (*dnit).name();
-	if( dnComponentNames.contains(displayName) ) displayName = dnComponentNames[displayName];
+	if( dnComponentNames.tqcontains(displayName) ) displayName = dnComponentNames[displayName];
 	item = new TQListViewItem( listView, item, displayName, (*dnit).value() );
   }
 
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui
index 7edbd1a72..3cf42adb6 100644
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@@ -4,7 +4,7 @@
     
         CertificateWizard
     
-    
+    
         
             0
             0
@@ -55,7 +55,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     Expanding
                 
-                
+                
                     
                         20
                         40
@@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     On this page, you will configure the cryptographic key length and the type of certificate to create.
                 
-                
+                
                     WordBreak|AlignVCenter
                 
             
@@ -96,7 +96,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     Expanding
                 
-                
+                
                     
                         20
                         31
@@ -140,7 +140,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                         
                             Expanding
                         
-                        
+                        
                             
                                 61
                                 20
@@ -199,7 +199,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     Expanding
                 
-                
+                
                     
                         21
                         60
@@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.
                 
-                
+                
                     WordBreak|AlignVCenter
                 
             
@@ -240,7 +240,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     Expanding
                 
-                
+                
                     
                         440
                         20
@@ -268,7 +268,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 
                     Expanding
                 
-                
+                
                     
                         20
                         40
@@ -322,7 +322,7 @@ Once you are done with your settings, click
 a kmail composer will be opened; you can add detailed information for the CA
 there.</p><qt>
                 
-                
+                
                     WordBreak|AlignVCenter
                 
             
@@ -336,7 +336,7 @@ there.</p><qt>
                 
                     Expanding
                 
-                
+                
                     
                         21
                         31
@@ -411,7 +411,7 @@ there.</p><qt>
                 
                     generatePB
                 
-                
+                
                     
                         0
                         30
@@ -431,7 +431,7 @@ there.</p><qt>
                 
                     Expanding
                 
-                
+                
                     
                         118
                         16
@@ -448,7 +448,7 @@ there.</p><qt>
                 
                     Expanding
                 
-                
+                
                     
                         119
                         16
@@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi
 If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA.
 </qt>
                 
-                
+                
                     WordBreak|AlignVCenter
                 
             
@@ -550,7 +550,7 @@ If you want to change anything, press Back and make your changes; otherwise, pre
     slotEmailAddressChanged(const QString&)
     slotGenerateCertificate()
 
-
+
 
     klineedit.h
     kpushbutton.h
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index bb31d5c3e..7127b3c2f 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
 	  if ( !res.error().isCanceled() )
 	    KMessageBox::error( this,
 				i18n( "Could not generate certificate: %1" )
-				.arg( TQString::fromLatin1( res.error().asString() ) ),
+				.arg( TQString::tqfromLatin1( res.error().asString() ) ),
 				i18n( "Certificate Manager Error" ) );
     } else {
         // next will stay enabled until the user clicks Generate
@@ -429,7 +429,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQString error;
   TQCString dcopService;
   int result = KDCOPServiceStarter::self()->
-    findServiceFor( "DCOP/Mailer", TQString::null,
+    tqfindServiceFor( "DCOP/Mailer", TQString::null,
                     TQString::null, &error, &dcopService );
   if ( result != 0 ) {
     kdDebug() << "Couldn't connect to KMail\n";
@@ -441,11 +441,11 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQCString dummy;
   // OK, so kmail (or kontact) is running. Now ensure the object we want is available.
   // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
-  if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+  if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
     DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
     DCOPReply reply = ref.call( "load()" );
     if ( reply.isValid() && (bool)reply ) {
-      Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+      Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
     } else
       kdWarning() << "Error loading " << dcopService << endl;
   }
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index c078315b9..aebfa3668 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -412,7 +412,7 @@ void CertManager::slotConfigureGpgME() {
 
 void CertManager::slotRepaint()
 {
-  mKeyListView->repaintContents();
+  mKeyListView->tqrepaintContents();
 }
 
 void CertManager::slotToggleRemote( int idx ) {
@@ -500,7 +500,7 @@ static TQStringList stringlistFromSet( const std::set & set ) {
   TQStringList sl;
   for ( std::set::const_iterator it = set.begin() ; it != set.end() ; ++it )
     // let's make extra sure, maybe someone tries to make Qt not support std::string->TQString conversion
-    sl.push_back( TQString::fromLatin1( it->c_str() ) );
+    sl.push_back( TQString::tqfromLatin1( it->c_str() ) );
   return sl;
 }
 
@@ -1338,7 +1338,7 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) {
     };
     TQStringList charsetList;
     for ( const char** c = charsets; *c; ++c ) {
-      charsetList.append( TQString::fromLatin1( *c ) );
+      charsetList.append( TQString::tqfromLatin1( *c ) );
     }
 
     // TODO this selection could be done in a derived KeySelectionDialog which would add a combobox,
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index fb9308ee3..bee157045 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -136,7 +136,7 @@ private slots:
     void slotConfigureGpgME();
     void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point);
     void slotDropped(const KURL::List&);
-    /** Schedule a repaint for the listview items. E.g. when the
+    /** Schedule a tqrepaint for the listview items. E.g. when the
 	colour config has changed */
     void slotRepaint();
     /** Schedule a validating keylisting for the selected items (or
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 27797dfe7..77a97bb48 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -139,7 +139,7 @@ private:
     setText( 0, name );
   }
 
-  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
 private:
   TQColor mForegroundColor, mBackgroundColor;
@@ -152,7 +152,7 @@ private:
   bool mDirty;
 };
 
-void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   TQColorGroup _cg = cg;
   TQFont font = p->font();
   if ( mHasFont )
@@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
   if ( mBackgroundColor.isValid() )
     _cg.setColor( TQColorGroup::Base, mBackgroundColor );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 ////
@@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked()
   if ( !item )
     return;
   item->setDefaultAppearance();
-  item->repaint();
+  item->tqrepaint();
   slotSelectionChanged( item );
   emit changed();
 }
@@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() {
   int result = KColorDialog::getColor( fg );
   if ( result == KColorDialog::Accepted ) {
     item->setForegroundColor( fg );
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() {
   int result = KColorDialog::getColor( bg );
   if ( result == KColorDialog::Accepted ) {
     item->setBackgroundColor( bg );
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() {
   int result = KFontDialog::getFont( font );
   if ( result == KFontDialog::Accepted ) {
     item->setFont( font );
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults()
   for ( ; lvit.current() ; ++lvit ) {
     CategoryListViewItem* item = static_cast( lvit.current() );
     item->setDefaultAppearance();
-    item->repaint();
+    item->tqrepaint();
   }
   emit changed();
 }
@@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked()
   CategoryListViewItem* item = static_cast(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleItalic();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked()
   CategoryListViewItem* item = static_cast(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleBold();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked()
   CategoryListViewItem* item = static_cast(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleStrikeout();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index b432ac8c6..60e10c21a 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -4,7 +4,7 @@
     
         AppearanceConfigWidgetBase
     
-    
+    
         
             0
             0
@@ -37,7 +37,7 @@
         
         
             
-                layout2
+                tqlayout2
             
             
                 
@@ -119,7 +119,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             100
@@ -211,5 +211,5 @@
     slotBoldClicked()
     slotStrikeoutClicked()
 
-
+
 
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index e9f16f109..aa161fc74 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  const KConfigGroup geometry( KGlobal::config(), "Geometry" );
-  const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
-  const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
+  const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
+  const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
+  const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
-  KConfigGroup geometry( KGlobal::config(), "Geometry" );
-  geometry.writeEntry( "ConfigureDialogWidth", width() );
-  geometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
+  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
+  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
 }
 
 ConfigureDialog::~ConfigureDialog() {
diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp
index 380c48a58..ed7809a78 100644
--- a/certmanager/hierarchyanalyser.cpp
+++ b/certmanager/hierarchyanalyser.cpp
@@ -69,7 +69,7 @@ const std::vector & HierarchyAnalyser::subjectsForIssuer( const char
 
 std::vector HierarchyAnalyser::subjectsForIssuerRecursive( const char * issuer_dn ) const {
   std::vector keys = subjectsForIssuer( issuer_dn );
-  for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would invalidate them
+  for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would tqinvalidate them
     if ( const char * fpr = keys[i].primaryFingerprint() ) {
       const std::vector & tmp = subjectsForIssuer( fpr );
       std::copy( tmp.begin(), tmp.end(), std::back_inserter( keys ) );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index aa8e52f72..c22be6b77 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
   TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
 
   group = new TQVGroupBox( i18n("WatchGnuPG"), top );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
 
   /******************* Log Window group *******************/
   group = new TQVGroupBox( i18n("Log Window"), top );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 234973b6e..3b856ca15 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
@@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions()
   ( void )KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
-  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
+  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
 					 0, this, TQT_SLOT( slotConfigure() ),
 					 actionCollection(), "configure" );
 #endif
@@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
 	mCentralWidget->append(tr("[%1] Log stopped")
-						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
+						   .arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) );
   } else {
 	mCentralWidget->append( tr("[%1] Log started")
-							.arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+							.arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
   }
   connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
 		   this, TQT_SLOT( slotWatcherExited() ) );
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index aad0701ae..2804cca1f 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -224,9 +224,9 @@ namespace {
         return TQVariant( data.defaults.boolean.value, int() );
     case ArgType_String:
       if ( isList() )
-        return TQStringList( TQString::fromLatin1( data.defaults.string ) );
+        return TQStringList( TQString::tqfromLatin1( data.defaults.string ) );
       else
-        return TQString::fromLatin1( data.defaults.string );
+        return TQString::tqfromLatin1( data.defaults.string );
     case ArgType_Int:
       if ( isList() )
         return TQValueList() << data.defaults.integer;
@@ -240,15 +240,15 @@ namespace {
     case ArgType_Path:
     case ArgType_DirPath:
       if ( isList() )
-        return TQValueList() << TQString::fromLatin1( data.defaults.path );
+        return TQValueList() << TQString::tqfromLatin1( data.defaults.path );
       else
-        return TQString::fromLatin1( data.defaults.path );
+        return TQString::tqfromLatin1( data.defaults.path );
     case ArgType_URL:
     case ArgType_LDAPURL:
       if ( isList() )
-        return TQValueList() << TQString::fromLatin1( data.defaults.url );
+        return TQValueList() << TQString::tqfromLatin1( data.defaults.url );
       else
-        return TQString::fromLatin1( data.defaults.url );
+        return TQString::tqfromLatin1( data.defaults.url );
     }
   }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index ae45d6833..6dc5c5e3a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -357,15 +357,15 @@ static TQString gpgconf_escape( const TQString& str )
   // Escape special chars (including ':' and '%')
   TQString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
   // Also encode commas, for lists.
-  enc.replace( ',', "%2c" );
+  enc.tqreplace( ',', "%2c" );
   return enc;
 }
 
 static TQString urlpart_encode( const TQString& str )
 {
   TQString enc( str );
-  enc.replace( '%', "%25" ); // first!
-  enc.replace( ':', "%3a" );
+  enc.tqreplace( '%', "%25" ); // first!
+  enc.tqreplace( ':', "%3a" );
   //kdDebug() << "  urlpart_encode: " << str << " -> " << enc << endl;
   return enc;
 }
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString::null;
+      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null;
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index 0681c165d..4a03d7d94 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -63,10 +63,10 @@ class TQStringList;
 namespace Kleo {
 
   /** This is a hackish helper class to avoid code duplication in this
-      backend's Kleo::Job subclasses. It contains several workarounds
-      for moc/signal/slot shortcomings, most of which the author of
+      backend's Kleo::Job subclasses. It tqcontains several workarounds
+      for tqmoc/signal/slot shortcomings, most of which the author of
       this thinks are Qt bugs (lazy implementations), first and
-      foremost the inability of moc to handle inheritance from
+      foremost the inability of tqmoc to handle inheritance from
       multiple QObject-derived subclasses.
 
       To use it, inherit from the Job-subclass, then from this class,
@@ -140,7 +140,7 @@ namespace Kleo {
     QGpgME::QByteArrayDataProvider * mOutDataDataProvider;
   private:
     const char* * mPatterns;
-    // holds the entry - if any - in mPattern that was replaced with
+    // holds the entry - if any - in mPattern that was tqreplaced with
     // NULL to create a temporary end-of-array marker for gpgme:
     const char * mReplacedPattern;
     unsigned int mNumPatterns;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index 6cb71dbad..89d9dda36 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
   static Map map;
   for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) {
     assert( tokens[i].token );
-    const TQString token = TQString::fromLatin1( tokens[i].token ).lower();
+    const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower();
     for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) {
       const Desc & desc = tokens[i].desc[j];
       assert( desc.display );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 911afcd63..7517b2a8c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index 7ed476866..7246f0a3a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -62,7 +62,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index aeb7b010e..d73b4cb10 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 50d42c3ce..cb65d549e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -67,7 +67,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStdout( KProcess *, char *, int );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 77a914514..c3c8b4622 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -226,7 +226,7 @@ OpenPGPCryptPlug::OpenPGPCryptPlug() : CryptPlug() {
 /* Max number of parts in a DN */
 #define MAX_GPGME_IDX 20
 
-/* some macros to replace ctype ones and avoid locale problems */
+/* some macros to tqreplace ctype ones and avoid locale problems */
 #define spacep(p)   (*(p) == ' ' || *(p) == '\t')
 #define digitp(p)   (*(p) >= '0' && *(p) <= '9')
 #define hexdigitp(a) (digitp (a)                     \
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index 081702a7a..6af3a644c 100644
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@@ -104,7 +104,7 @@ namespace GpgME {
 /*! \defgroup groupConfigDir Directory Service Configuration
     \ingroup groupConfig
 
-    This section contains messages for configuring the
+    This section tqcontains messages for configuring the
     directory service.
 */
 
@@ -501,7 +501,7 @@ bool hasFeature( ::Feature );
 
    How to use StructuringInfo data in your program:
    \li To compose a signed message please act as described below.
-   \li For constructing an encrypted message just replace the
+   \li For constructing an encrypted message just tqreplace the
    \c signMessage() call by the respective \c encryptMessage() call
    and then proceed exactly the same way.
    \li In any case make sure to free your \c ciphertext and
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index ec6d6d571..7694a138c 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name,
     _libName( libName ),
     _updateURL( update ),
     _active(  active  ),
-    _initStatus( InitStatus_undef ),
+    _iniStatus( IniStatus_undef ),
     _cp( 0 ),
     _config( 0 ),
     _cryptoConfig( 0 )
@@ -468,9 +468,9 @@ TQString CryptPlugWrapper::libName() const
 
 TQString CryptPlugWrapper::protocol() const
 {
-  if ( _libName.contains( "smime" ) )
+  if ( _libName.tqcontains( "smime" ) )
     return "SMIME";
-  if ( _libName.contains( "openpgp" ) )
+  if ( _libName.tqcontains( "openpgp" ) )
     return "OpenPGP";
   return TQString::null;
 }
@@ -485,28 +485,28 @@ TQString CryptPlugWrapper::displayName() const
 {
     if ( !_name.isEmpty() )
       return _name;
-    if ( _libName.contains( "smime" ) )
+    if ( _libName.tqcontains( "smime" ) )
       return "gpgsm";
-    if ( _libName.contains( "openpgp" ) )
+    if ( _libName.tqcontains( "openpgp" ) )
       return "gpg";
     return i18n("(Unknown Protocol)");
 }
 
-bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg )
+bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
 {
     if ( _cp )
       return true;
 
-    _initStatus = InitStatus_undef;
+    _iniStatus = IniStatus_undef;
     /* make sure we have a lib name */
     if ( _libName.isEmpty() ) {
-      _initStatus = InitStatus_NoLibName;
+      _iniStatus = IniStatus_NoLibName;
       kdDebug(5150) << "No library name was given.\n" << endl;
     } else {
-      if ( _libName.contains( "smime" ) ) {
+      if ( _libName.tqcontains( "smime" ) ) {
 	_cp = new SMIMECryptPlug();
 	_config = new Config( GPGME_PROTOCOL_CMS );
-      } else if ( _libName.contains( "openpgp" ) ) {
+      } else if ( _libName.tqcontains( "openpgp" ) ) {
 	_cp = new OpenPGPCryptPlug();
 	_config = new Config( GPGME_PROTOCOL_OpenPGP );
       } else {
@@ -515,12 +515,12 @@ bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg )
       }
 
       if ( !_cp ) {
-	_initStatus = InitStatus_LoadError;
+	_iniStatus = IniStatus_LoadError;
 	kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl;
       } else {
 	/* now call the init function */
 	if( !_cp->initialize() ) {
-	  _initStatus = InitStatus_InitError;
+	  _iniStatus = IniStatus_InitError;
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
 	  _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
 	  if ( errorMsg )
@@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg )
 	  delete _cp; _cp = 0;
 	  delete _config; _config = 0;
 	} else {
-	  _initStatus  = InitStatus_Ok;
+	  _iniStatus  = IniStatus_Ok;
 	}
       }
     }
-    if( initStatus )
-        *initStatus = _initStatus;
-    return _initStatus == InitStatus_Ok;
+    if( iniStatus )
+        *iniStatus = _iniStatus;
+    return _iniStatus == IniStatus_Ok;
 }
 
 
@@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize()
 }
 
 
-CryptPlugWrapper::InitStatus CryptPlugWrapper::initStatus( TQString* errorMsg ) const
+CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const
 {
     if( errorMsg )
         *errorMsg = _lastError;
-    return _initStatus;
+    return _iniStatus;
 }
 
 
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index fca08b650..a2ddea95e 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -170,7 +170,7 @@ namespace Kleo {
 /*! \defgroup groupConfigDir Directory Service Configuration
     \ingroup groupConfig
 
-    This section contains messages for configuring the
+    This section tqcontains messages for configuring the
     directory service.
 */
 
@@ -322,7 +322,7 @@ class CryptPlugWrapper;
 
   How to use StructuringInfoWrapper data in your program:
   \li To compose a signed message please act as described below.
-  \li For constructing an encrypted message just replace the
+  \li For constructing an encrypted message just tqreplace the
   \c signMessage() call by the respective \c encryptMessage() call
   and then proceed exactly the same way.
   \li In any case make sure to free your \c ciphertext when
@@ -462,16 +462,16 @@ public:
         If initialize was not called before return value will be
         \c CryptPlugInit_undef.
 
-        \sa initStatus, initialize
+        \sa iniStatus, initialize
     */
     typedef enum {
-        InitStatus_undef         = 0,
+        IniStatus_undef         = 0,
 
-        InitStatus_Ok            = 1,
-        InitStatus_NoLibName     = 2,
-        InitStatus_LoadError     = 0x1000,
-        InitStatus_InitError     = 0x2000
-    } InitStatus;
+        IniStatus_Ok            = 1,
+        IniStatus_NoLibName     = 2,
+        IniStatus_LoadError     = 0x1000,
+        IniStatus_InitError     = 0x2000
+    } IniStatus;
 
     /*! \ingroup groupSignAct
         \brief Flags used to compose the SigStatusFlags value.
@@ -518,7 +518,7 @@ public:
 
 
     enum {
-        CertStatus_EXPIRES_NEVER = CRYPTPLUG_CERT_DOES_NEVER_EXPIRE
+        CerStatus_EXPIRES_NEVER = CRYPTPLUG_CERT_DOES_NEVER_EXPIRE
     };
 
 
@@ -543,7 +543,7 @@ public:
                        or not.
 
         \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize
-        \sa initStatus
+        \sa iniStatus
     */
     CryptPlugWrapper( const TQString& name=TQString::null,
                       const TQString& libName=TQString::null,
@@ -582,7 +582,7 @@ public:
               structures - if just prevents the normal functions from
               being called erroneously. When deactivated only the following
               functions are operational: constructor , destructor ,
-              setActive , active, setLibName , libName , initStatus;
+              setActive , active, setLibName , libName , iniStatus;
               calling other functions will be ignored and their return
               values will be undefined.
 
@@ -590,7 +590,7 @@ public:
                        or not.
 
         \sa active, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, initStatus
+        \sa deinitialize, initialize, iniStatus
     */
     void setActive( bool active );
 
@@ -613,7 +613,7 @@ public:
         This name may be set in the constructor or by calling setLibName().
 
         \note Setting/changing the library name may only be done when
-              the initStatus() is not \c InitStatus_Ok.
+              the iniStatus() is not \c IniStatus_Ok.
               If you want to change the name of the library after
               successfully having called initialize() please make
               sure to unload it by calling the deinitialize() function.
@@ -626,7 +626,7 @@ public:
                 above 'note'.
 
         \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, initStatus
+        \sa deinitialize, initialize, iniStatus
     */
     bool setLibName( const TQString& libName );
 
@@ -666,13 +666,13 @@ private:
         undefined in this case, this rule does not apply to the functions
         \c setActive() and \c setLibName().
 
-        \param initStatus will receive the resulting InitStatus if not NULL
+        \param iniStatus will receive the resulting IniStatus if not NULL
         \param errorMsg will receive the system error message if not NULL
 
-        \sa initStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
+        \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    bool initialize( InitStatus* initStatus, TQString* errorMsg );
+    bool initialize( IniStatus* iniStatus, TQString* errorMsg );
 
 public:
     /*! \ingroup groupGeneral
@@ -681,10 +681,10 @@ public:
         After this function has been called, no other plugin functions
         should be called; the behavior is undefined in this case.
 
-        \note Deinitializing sets the internal initStatus value back
-              to \c InitStatus_undef.
+        \note Deinitializing sets the internal iniStatus value back
+              to \c IniStatus_undef.
 
-        \sa initStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
+        \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
         \sa setActive, active
     */
     void deinitialize();
@@ -693,7 +693,7 @@ public:
         \brief Returns this CRYPTPLUG wrapper's initialization state.
 
         \param errorMsg receives the last system error message, this value
-        should be ignored if InitStatus value equals \c InitStatus_Ok.
+        should be ignored if IniStatus value equals \c IniStatus_Ok.
 
         \return  whether the relative library was loaded and initialized
                  correctly
@@ -701,7 +701,7 @@ public:
         \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    InitStatus initStatus( TQString* errorMsg ) const;
+    IniStatus iniStatus( TQString* errorMsg ) const;
 
 
     /*! \ingroup groupGeneral
@@ -714,7 +714,7 @@ public:
         however.
 
         \note In case this function cannot be executed the system's error
-        message may be retrieved by calling initStatus( TQString* ).
+        message may be retrieved by calling iniStatus( TQString* ).
 
         \return  whether the relative feature is implemented or not
     */
@@ -824,7 +824,7 @@ private:
     TQString    _libName;
     TQString    _updateURL;
     bool       _active;
-    InitStatus _initStatus;
+    IniStatus _iniStatus;
     TQString    _lastError;
     CryptPlug* _cp;
     // local parameters without representation in cryptplug.h
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 88ba036de..9b56e89b3 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -66,7 +66,7 @@ static const char * availableProtocols[] = {
 static const unsigned int numAvailableProtocols = sizeof availableProtocols / sizeof *availableProtocols;
 
 Kleo::CryptoBackendFactory::CryptoBackendFactory()
-  : TQObject( qApp, "CryptoBackendFactory::instance()" ),
+  : TQObject( tqApp, "CryptoBackendFactory::instance()" ),
     mConfigObject( 0 ),
     mAvailableProtocols( availableProtocols, availableProtocols + numAvailableProtocols )
 {
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 61693aff2..a9333ebb2 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
     TQString result;
     for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
         const TQChar ch = s[i];
-        switch ( ch.unicode() ) {
+        switch ( ch.tqunicode() ) {
         case ',':
         case '+':
         case '"':
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index bac195d99..45a4bf9c9 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /**
        Starts the download operation. \a fingerprints is a list of
        fingerprints used to specify the list of keys downloaded. Empty
-       patterns are ignored. If \a fingerprints is empty, contains
+       patterns are ignored. If \a fingerprints is empty, tqcontains
        only empty strings or anything other than fingerprints, the
        result is undefined.
     */
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 363006e60..193ea863b 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /**
        Starts the export operation. \a patterns is a list of patterns
        used to restrict the list of keys exported. Empty patterns are
-       ignored. If \a patterns is empty or contains only empty
+       ignored. If \a patterns is empty or tqcontains only empty
        strings, all available keys are exported.
     */
     virtual GpgME::Error start( const TQStringList & patterns ) = 0;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index c9a9ffcec..4d33761f4 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -75,7 +75,7 @@ Kleo::HierarchicalKeyListJob::~HierarchicalKeyListJob() {
 GpgME::Error Kleo::HierarchicalKeyListJob::start( const TQStringList & patterns, bool secretOnly ) {
   if ( secretOnly || patterns.empty() )
     return gpg_err_make( GPG_ERR_SOURCE_GPGME, GPG_ERR_UNSUPPORTED_OPERATION );
-  qCopy( patterns.begin(), patterns.end(),
+  tqCopy( patterns.begin(), patterns.end(),
 	 std::inserter( mNextSet, mNextSet.begin() ) );
   const GpgME::Error err = startAJob();
   if ( err )
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index 9c446457f..275c9b6c0 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -67,7 +67,7 @@ namespace Kleo {
     ~ImportJob();
 
     /**
-       Starts the importing operation. \a keyData contains the data to
+       Starts the importing operation. \a keyData tqcontains the data to
        import from.
     */
     virtual GpgME::Error start( const TQByteArray & keyData ) = 0;
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index dedbebfc2..ac5dbac2f 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -62,8 +62,8 @@
 Kleo::Job::Job( TQObject * parent, const char * name )
   : TQObject( parent, name )
 {
-  if ( qApp )
-    connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
+  if ( tqApp )
+    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
 }
 
 Kleo::Job::~Job() {
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 53493ab80..51caf5d28 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -72,8 +72,8 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
   mSelf = this;
   d = new Private();
   // ### DF: doesn't a KStaticDeleter work more reliably?
-  if ( qApp )
-    connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+  if ( tqApp )
+    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
   reload();
 }
 
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index ed6571847..667ddadc3 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -73,7 +73,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or contains only empty strings,
+       ignored. If \a pattern is empty or tqcontains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 29467a1cd..6249116d0 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -70,7 +70,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or contains only empty strings,
+       ignored. If \a pattern is empty or tqcontains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index 58ff64732..c88c3461d 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -67,8 +67,8 @@ namespace Kleo {
     ~VerifyDetachedJob();
 
     /**
-       Starts the verification operation. \a signature contains the
-       signature data, while \a signedData contains the data over
+       Starts the verification operation. \a signature tqcontains the
+       signature data, while \a signedData tqcontains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signature,
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index 58c452b7c..ba7f40d8a 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -67,8 +67,8 @@ namespace Kleo {
     ~VerifyOpaqueJob();
 
     /**
-       Starts the verification operation. \a signature contains the
-       signature data, while \a signedData contains the data over
+       Starts the verification operation. \a signature tqcontains the
+       signature data, while \a signedData tqcontains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signedData ) = 0;
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 059d1f769..bd6af17e8 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -53,12 +53,12 @@ public:
 private slots:
   void slotStdout( KProcess *, char *, int );
   void slotStderr( KProcess *, char *, int );
-  void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+  void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
   void slotProcessExited( KProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
-  TQString mLastStdout, mLastStderr, mLastStatus;
+  TQString mLastStdout, mLastStderr, mLasStatus;
 };
 
 #endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 4aadb7ff1..964674838 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -312,7 +312,7 @@ int main( int argc, char** argv ) {
       // Test with query containing a litteral ':' (KURL supports this)
       // and a ' ' (KURL will escape it, see issue119)
       lst << KURL( "ldap://foo:389/?a:b c" );
-      lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query contains a litteral ','
+      lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query tqcontains a litteral ','
       //cout << " trying to set: " << lst.toStringList().join(", ").local8Bit() << endl;
       assert( lst[0].query() == "?b" );
       assert( lst[1].query() == "?a:b%20c" ); // see, the space got escaped
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 29ca483f1..daccda6de 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -88,7 +88,7 @@ static TQStringList split( char * buffer, int buflen, TQString & old ) {
 }
 
 static TQString escape( TQString str ) {
-  return str.replace( '&', "&" ).replace( '<', "<" ).replace( '>', ">" );
+  return str.tqreplace( '&', "&" ).tqreplace( '<', "<" ).tqreplace( '>', ">" );
 }
 
 void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) {
@@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "stderr: " + escape( *it ) + "" );
 }
-void GnuPGViewer::slotStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
   append( "status: " + escape( type + ' ' + args.join( " " ) ) + "" );
 }
 void GnuPGViewer::slotProcessExited( KProcess * proc ) {
   if ( !proc )
     return;
   if ( proc->normalExit() )
-    append( TQString( "Process exit: return code %1" ).arg ( proc->exitStatus() ) );
+    append( TQString( "Process exit: return code %1" ).arg ( proc->exiStatus() ) );
   else
     append( "Process exit: killed" );
 }
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index 98e171887..f15d2d201 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -4,7 +4,7 @@
     
         AddDirectoryServiceDialog
     
-    
+    
         
             0
             0
@@ -75,7 +75,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     60
@@ -136,7 +136,7 @@
             
                 Expanding
             
-            
+            
                 
                     260
                     21
@@ -203,5 +203,5 @@
     PushButton3
     PushButton4
 
-
+
 
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 2871b920f..720525a1a 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -88,7 +88,7 @@ public:
   /// deselect all except one for a given protocol type (radiobutton-like exclusivity)
   void deselectAll( const char * protocol, TQCheckListItem* except );
 
-  void emitChanged() { static_cast( parentWidget() )->emitChanged( true ); }
+  void emitChanged() { static_cast( tqparentWidget() )->emitChanged( true ); }
 };
 
 // Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2")
@@ -144,7 +144,7 @@ private:
     // First one is the generic name (find a nice one for OpenPGP, SMIME)
     const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0
                               ? qstricmp( protocolName, "smime" ) != 0
-                              ? TQString::fromLatin1( protocolName )
+                              ? TQString::tqfromLatin1( protocolName )
                               : i18n( "S/MIME" )
                               : i18n( "OpenPGP" );
     // second one is implementation name (gpg, gpgsm...)
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index 5b14d7c41..3bed433eb 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -59,7 +59,7 @@ using namespace Kleo;
 
 static inline TQPixmap loadIcon( TQString s ) {
   return KGlobal::instance()->iconLoader()
-    ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( s.tqreplace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
 static unsigned int num_components_with_options( const Kleo::CryptoConfig * config ) {
@@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
       dialogHeight = 500;
     else // small (800x600, 640x480) desktop
       dialogHeight = 400;
-    TQSize sz = scrollView->sizeHint();
+    TQSize sz = scrollView->tqsizeHint();
     scrollView->setMinimumSize( sz.width()
-                                + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent),
-                                QMIN( compGUI->sizeHint().height(), dialogHeight ) );
+                                + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
+                                QMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
       Q_ASSERT( face() == Plain );
@@ -136,7 +136,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "information.")
           .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
-      label->setAlignment( TQt::WordBreak );
+      label->tqsetAlignment( TQt::WordBreak );
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
   }
 }
@@ -633,7 +633,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog()
 {
   // I'm a bad boy and I do it all on the stack. Enough classes already :)
   // This is just a simple dialog around the directory-services-widget
-  KDialogBase dialog( mPushButton->parentWidget(), 0, true /*modal*/,
+  KDialogBase dialog( mPushButton->tqparentWidget(), 0, true /*modal*/,
                       i18n( "Configure LDAP Servers" ),
                       KDialogBase::Default|KDialogBase::Cancel|KDialogBase::Ok,
                       KDialogBase::Ok, true /*separator*/ );
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 8bc52f211..cce1afeaa 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -80,7 +80,7 @@ namespace Kleo {
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
-                          TQGridLayout * layout, TQWidget* parent, const char* name = 0 );
+                          TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
 
     bool save();
     void load();
@@ -100,7 +100,7 @@ namespace Kleo {
     static CryptoConfigEntryGUI* createEntryGUI(
       CryptoConfigModule* module,
       Kleo::CryptoConfigEntry* entry, const TQString& entryName,
-      TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
+      TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
   };
 
   /**
@@ -150,7 +150,7 @@ namespace Kleo {
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * layout,
+                               TQGridLayout * tqlayout,
                                TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -169,7 +169,7 @@ namespace Kleo {
     CryptoConfigEntryPath( CryptoConfigModule* module,
                            Kleo::CryptoConfigEntry* entry,
                            const TQString& entryName,
-                           TQGridLayout * layout,
+                           TQGridLayout * tqlayout,
                            TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -188,7 +188,7 @@ namespace Kleo {
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -207,7 +207,7 @@ namespace Kleo {
     CryptoConfigEntryURL( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
                           const TQString& entryName,
-                          TQGridLayout * layout,
+                          TQGridLayout * tqlayout,
                           TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -226,7 +226,7 @@ namespace Kleo {
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -245,7 +245,7 @@ namespace Kleo {
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * layout,
+                               TQGridLayout * tqlayout,
                                TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -263,7 +263,7 @@ namespace Kleo {
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 0b9dd91f2..3f99ddb96 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -63,7 +63,7 @@ public:
 
   void setPassword( const TQString& pass ) {
     mPassword = pass;
-    setText( 4, pass.isEmpty() ? TQString::null : TQString::fromLatin1( "******" ) );
+    setText( 4, pass.isEmpty() ? TQString::null : TQString::tqfromLatin1( "******" ) );
   }
 
   const TQString& password() const { return mPassword; }
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 1dabbca51..c2c225017 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -4,7 +4,7 @@
     
         DirectoryServicesWidgetBase
     
-    
+    
         
             0
             0
@@ -44,7 +44,7 @@
         
         
             
-                layout2
+                tqlayout2
             
             
                 
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
                 
                 
                     
-                        layout1
+                        tqlayout1
                     
                     
                         
@@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates.
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     20
                                     51
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
         
         
             
-                layout3
+                tqlayout3
             
             
                 
@@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates.
                     
                         Expanding
                     
-                    
+                    
                         
                             47
                             20
@@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r
                     
                         Expanding
                     
-                    
+                    
                         
                             47
                             20
@@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service
                     
                         Expanding
                     
-                    
+                    
                         
                             47
                             20
@@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service
             
                 Expanding
             
-            
+            
                 
                     20
                     16
@@ -338,5 +338,5 @@ By clicking this button, you can remove the currently selected directory service
     slotMoveUp()
     slotMoveDown()
 
-
+
 
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 4c7184066..8f2bc6ec5 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
   // the up/down/left/right arrow cross:
 
   TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" );
-  xlay->setAlignment( AlignCenter );
+  xlay->tqsetAlignment( AlignCenter );
 
   static const struct {
     const char * icon;
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 7ccddb5d0..bb9432a92 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
     if ( mLenVisible ) { // but do we also have a visible label?
       TQRect r = rect();
-      const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+      const int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
       if( va & AlignVCenter )
         r.setTop( fm.height() / 2 );		// frame rect should be
       else if( va & AlignTop )
@@ -115,15 +115,15 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const {
   return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 }
 
-TQSize KDHorizontalLine::sizeHint() const {
-  return minimumSizeHint();
+TQSize KDHorizontalLine::tqsizeHint() const {
+  return tqminimumSizeHint();
 }
 
-TQSize KDHorizontalLine::minimumSizeHint() const {
+TQSize KDHorizontalLine::tqminimumSizeHint() const {
   const int w = fontMetrics().width( mTitle, mLenVisible ) +
                 fontMetrics().width( TQChar( ' ' ) );
   const int h = fontMetrics().height();
-  return TQSize( QMAX( w, indentHint() ), h ).expandedTo( qApp->globalStrut() );
+  return TQSize( QMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() );
 }
 
 void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
@@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
     const int h = fm.height();
     const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' '));
     int x;
-    if ( mAlign & AlignHCenter )		// center alignment
+    if ( mAlign & AlignHCenter )		// center tqalignment
       x = frameRect().width()/2 - tw/2;
-    else if ( mAlign & AlignRight )	// right alignment
+    else if ( mAlign & AlignRight )	// right tqalignment
       x = frameRect().width() - tw;
-    else if ( mAlign & AlignLeft )       // left alignment
+    else if ( mAlign & AlignLeft )       // left tqalignment
       x = 0;
     else { // auto align
       if( TQApplication::reverseLayout() )
@@ -147,15 +147,15 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
         x = 0;
     }
     TQRect r( x, 0, tw, h );
-    int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+    int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (QRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+    const TQColor pen( (QRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
 #if QT_VERSION >= 0x030300
-    if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+    if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
 #endif
-    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
+    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
   }
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 5b6d5da9a..0b857bac0 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -54,11 +54,11 @@ public:
 
   TQString title() const { return mTitle; }
 
-  /*! \reimp to hard-code the frame shape */
+  /*! \reimp to hard-code the frame tqshape */
   void setFrameStyle( int style );
 
-  TQSize sizeHint() const;
-  TQSize minimumSizeHint() const;
+  TQSize tqsizeHint() const;
+  TQSize tqminimumSizeHint() const;
   TQSizePolicy sizePolicy() const;
 
   static int indentHint();
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index d45b64a8c..8c48f896a 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients
   // calculate the optimal width for the dialog
   const int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + view->sizeHint().width()
-                  + sv->verticalScrollBar()->sizeHint().width()
+                  + view->tqsizeHint().width()
+                  + sv->verticalScrollBar()->tqsizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
@@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients
                    + fontMetrics().height()
                    + spacingHint()
                    + sv->frameWidth()
-                   + view->sizeHint().height()
-                   + sv->horizontalScrollBar()->sizeHint().height()
+                   + view->tqsizeHint().height()
+                   + sv->horizontalScrollBar()->tqsizeHint().height()
                    + sv->frameWidth()
                    + spacingHint()
-                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
                    + marginHint()
                    + 2;
 
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index fa8c9eb83..d8afcc596 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -81,8 +81,8 @@ namespace {
     if ( !item )
       return;
 
-    const TQRect itemRect = mKeyListView->itemRect( item );
-    if ( !itemRect.isValid() )
+    const TQRect tqitemRect = mKeyListView->tqitemRect( item );
+    if ( !tqitemRect.isValid() )
       return;
 
     const int col = mKeyListView->header()->sectionAt( p.x() );
@@ -93,8 +93,8 @@ namespace {
     if ( !headerRect.isValid() )
       return;
 
-    const TQRect cellRect( headerRect.left(), itemRect.top(),
-			  headerRect.width(), itemRect.height() );
+    const TQRect cellRect( headerRect.left(), tqitemRect.top(),
+			  headerRect.width(), tqitemRect.height() );
 
     TQString tipStr;
     if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast( item ) )
@@ -117,7 +117,7 @@ struct Kleo::KeyListView::Private {
   std::map itemMap;
 };
 
-// a list of signals where we want to replace TQListViewItem with
+// a list of signals where we want to tqreplace TQListViewItem with
 // Kleo:KeyListViewItem:
 static const struct {
   const char * source;
@@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) {
     if ( const TQPixmap * pix = cs->pixmap( key, i ) )
       setPixmap( i, *pix );
   }
-  repaint();
+  tqrepaint();
 }
 
 TQString Kleo::KeyListViewItem::toolTip( int col ) const {
@@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi
   return listView()->columnStrategy()->compare( this->key(), that->key(), col );
 }
 
-void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->keyForeground( key(), cg.text() );
@@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) {
@@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a
   return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col );
 }
 
-void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->subkeyForeground( subkey(), cg.text() );
@@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
@@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a
 }
 
 
-void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->useridForeground( userID(), cg.text() );
@@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
@@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo
   return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col );
 }
 
-void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->signatureForeground( signature(), cg.text() );
@@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 2ade61a39..986ed267e 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -45,7 +45,7 @@ class TQColor;
 
 namespace Kleo {
 
-  // work around moc parser bug...
+  // work around tqmoc parser bug...
 #define TEMPLATE_TYPENAME(T) template 
   TEMPLATE_TYPENAME(T)
   inline T * lvi_cast( TQListViewItem * item ) {
@@ -91,7 +91,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
     /*! \reimp */
     void insertItem( TQListViewItem * item );
     /*! \reimp */
@@ -127,7 +127,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::Subkey mSubkey;
@@ -159,7 +159,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::UserID mUserID;
@@ -191,7 +191,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 3a883dea1..27d9d8739 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -117,7 +117,7 @@ void Kleo::KeyRequester::init()
   // the button to unset any key:
   mEraseButton = new KPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -133,7 +133,7 @@ void Kleo::KeyRequester::init()
   connect( mEraseButton,  TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
   connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
 
   setAllowedKeys( mKeyUsage );
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index fc590d49b..1ff68570e 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -250,7 +250,7 @@ namespace {
 		   "Fingerprint: %4" )
 	.arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
+	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
     else
       return i18n( "S/MIME key for %1\n"
 		   "Created: %2\n"
@@ -259,7 +259,7 @@ namespace {
 		   "Issuer: %5" )
 	.arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
+	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
 	.arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
   }
 
@@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
       KActiveLabel *textLabel = new KActiveLabel( text, page );
       disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
       connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
-      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
+      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
+      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     }
   }
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index e05a21b9a..c209ff676 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -99,7 +99,7 @@ public:
         kdDebug() << "setAuditLog: rect = " << rect << endl;
         if ( !rect.isValid() )
             return;
-        TQSize maxSize = qApp->desktop()->screenGeometry( this ).size() * 2 / 3 ;
+        TQSize maxSize = tqApp->desktop()->screenGeometry( this ).size() * 2 / 3 ;
         if ( !maxSize.isValid() )
             maxSize = TQSize( 640, 480 );
         m_textEdit->setMinimumSize( rect.size().boundedTo( maxSize ) );
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index 1418bb65a..58f196d10 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -48,7 +48,7 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText,
   : TQProgressDialog( creator, name, false, f ), mBaseText( baseText )
 {
   assert( job );
-  setBar( new ProgressBar( this, "replacement progressbar in Kleo::ProgressDialog" ) );
+  setBar( new ProgressBar( this, "tqreplacement progressbar in Kleo::ProgressDialog" ) );
 
   setMinimumDuration( 2000 /*ms*/ );
   setAutoReset( false );
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index 1aa995e8f..fd9e601b8 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -89,7 +89,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
 StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int permissions,
                                 bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions;
+    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
     StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;
diff --git a/doc/api/doxygen.css b/doc/api/doxygen.css
index e059f34a5..2e8f17f5c 100644
--- a/doc/api/doxygen.css
+++ b/doc/api/doxygen.css
@@ -227,7 +227,7 @@ height: 100px;
 bottom:0px;
 }
 
-/* right footer, contains the wave image */
+/* right footer, tqcontains the wave image */
 #footer_right {
 position: absolute;
 right: 0px;
@@ -235,7 +235,7 @@ text-align: right;
 z-index: 5;
 }
 
-/* left footer, contains the text */
+/* left footer, tqcontains the text */
 #footer_left {
 position: absolute;
 left: 0px;
@@ -362,7 +362,7 @@ display: none;
 @media aural { .doNotDisplay {
 display: inline;
 }}
-/* Stylesheet that handles PIM-specific classes and layout */
+/* Stylesheet that handles PIM-specific classes and tqlayout */
 
 #content h1
 {
diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp
index 49f424949..f8d23b7a2 100644
--- a/indexlib/boost-compat/config/abi/borland_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp
@@ -8,11 +8,11 @@
 //  -b (on or off - effect emum sizes)
 //  -Vx  (on or off - empty members)
 //  -Ve (on or off - empty base classes)
-//  -aX (alignment - 5 options).
+//  -aX (tqalignment - 5 options).
 //  -pX (Calling convention - 4 options)
-//  -VmX (member pointer size and layout - 5 options)
+//  -VmX (member pointer size and tqlayout - 5 options)
 //  -VC (on or off, changes name mangling)
-//  -Vl (on or off, changes struct layout).
+//  -Vl (on or off, changes struct tqlayout).
 
 //  In addition the following warnings are sufficiently annoying (and
 //  unfixable) to have them turned off by default:
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp
index b4e580ffa..9723a18f8 100644
--- a/indexlib/boost-compat/config/auto_link.hpp
+++ b/indexlib/boost-compat/config/auto_link.hpp
@@ -53,7 +53,7 @@ BOOST_LIB_TOOLSET:    The compiler toolset name (vc6, vc7, bcb5 etc).
 BOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing.
 
 BOOST_LIB_RT_OPT:     A suffix that indicates the runtime library used,
-                      contains one or more of the following letters after
+                      tqcontains one or more of the following letters after
                       a hiphen:
 
                       s      static runtime (dynamic if not present).
diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.hpp
index 3a5f41303..4893faaa4 100644
--- a/indexlib/boost-compat/config/platform/macos.hpp
+++ b/indexlib/boost-compat/config/platform/macos.hpp
@@ -53,7 +53,7 @@
 
 #    define BOOST_HAS_MPTASKS
 
-// The MP task implementation of Boost Threads aims to replace MP-unsafe
+// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe
 // parts of the MSL, so we turn on threads unconditionally.
 #    define BOOST_HAS_THREADS
 
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp
index b7bf59143..735a03b0b 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.hpp
+++ b/indexlib/boost-compat/config/select_stdlib_config.hpp
@@ -54,7 +54,7 @@
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp"
 
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Dinkumware Library (this has to appear after any possible replacement libraries):
+// Dinkumware Library (this has to appear after any possible tqreplacement libraries):
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"
 
 #elif defined (BOOST_ASSERT_CONFIG)
diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.hpp
index 77d9decac..a144b4feb 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.hpp
@@ -332,7 +332,7 @@ namespace std {
 // The same problem occurs with has_facet.
 // These macros provide a consistent way to access a locale's facets.
 // Usage:
-//    replace
+//    tqreplace
 //       std::use_facet(loc);
 //    with
 //       BOOST_USE_FACET(Type, loc);
@@ -357,7 +357,7 @@ namespace std {
 
 // BOOST_NESTED_TEMPLATE workaround ------------------------------------------//
 // Member templates are supported by some compilers even though they can't use
-// the A::template member syntax, as a workaround replace:
+// the A::template member syntax, as a workaround tqreplace:
 //
 // typedef typename A::template rebind binder;
 //
@@ -500,7 +500,7 @@ namespace boost{
 
 //
 // Helper macro BOOST_STRINGIZE:
-// Converts the parameter X to a string after macro replacement
+// Converts the parameter X to a string after macro tqreplacement
 // on X has been performed.
 //
 #define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X)
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp
index 5a4a9d477..d595f997b 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.hpp
@@ -67,16 +67,16 @@
 
 // BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any 
 // prefix/suffix headers that normally control things like struct 
-// packing and alignment. 
+// packing and tqalignment. 
 // #define BOOST_DISABLE_ABI_HEADERS
 
 // BOOST_ABI_PREFIX: A prefix header to include in place of whatever
-// boost.config would normally select, any replacement should set up 
-// struct packing and alignment options as required. 
+// boost.config would normally select, any tqreplacement should set up 
+// struct packing and tqalignment options as required. 
 // #define BOOST_ABI_PREFIX my-header-name
 
 // BOOST_ABI_SUFFIX: A suffix header to include in place of whatever 
-// boost.config would normally select, any replacement should undo 
+// boost.config would normally select, any tqreplacement should undo 
 // the effects of the prefix header. 
 // #define BOOST_ABI_SUFFIX my-header-name
 
@@ -91,7 +91,7 @@
 // #define BOOST_ALL_DYN_LINK
  
 // BOOST_WHATEVER_DYN_LINK: Forces library "whatever" to be linked as a dll 
-// rather than a static library on Microsoft Windows: replace the WHATEVER 
+// rather than a static library on Microsoft Windows: tqreplace the WHATEVER 
 // part of the macro name with the name of the library that you want to 
 // dynamically link to, for example use BOOST_DATE_TIME_DYN_LINK or 
 // BOOST_REGEX_DYN_LINK etc (this macro is used to turn on __declspec(dllimport) 
@@ -112,7 +112,7 @@
  
 // BOOST_WHATEVER_NO_LIB: Tells the config system not to automatically 
 // select which library to link against for library "whatever", 
-// replace WHATEVER in the macro name with the name of the library; 
+// tqreplace WHATEVER in the macro name with the name of the library; 
 // for example BOOST_DATE_TIME_NO_LIB or BOOST_REGEX_NO_LIB.  
 // Normally if a compiler supports #pragma lib, then the correct library 
 // build variant will be automatically selected and linked against, simply 
diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.hpp
index c23850079..8a0637847 100644
--- a/indexlib/boost-compat/weak_ptr.hpp
+++ b/indexlib/boost-compat/weak_ptr.hpp
@@ -51,11 +51,11 @@ public:
 //
 //  has a serious problem.
 //
-//  r.px may already have been invalidated. The px(r.px)
+//  r.px may already have been tqinvalidated. The px(r.px)
 //  conversion may require access to *r.px (virtual inheritance).
 //
 //  It is not possible to avoid spurious access violations since
-//  in multithreaded programs r.px may be invalidated at any point.
+//  in multithreaded programs r.px may be tqinvalidated at any point.
 //
 
     template
@@ -106,7 +106,7 @@ public:
         catch(bad_weak_ptr const &)
         {
             // Q: how can we get here?
-            // A: another thread may have invalidated r after the use_count test above.
+            // A: another thread may have tqinvalidated r after the use_count test above.
             return shared_ptr();
         }
 
diff --git a/indexlib/compat.h b/indexlib/compat.h
index f7c1c2702..f0dd0d182 100644
--- a/indexlib/compat.h
+++ b/indexlib/compat.h
@@ -51,7 +51,7 @@ struct iterator {
 }
 #endif
 
-/* compatibility replacements for functions not defined in older libstdc++ */
+/* compatibility tqreplacements for functions not defined in older libstdc++ */
 template T kMin(const T &a, const T &b) { return a < b ? a : b; }
 template T kMax(const T &a, const T &b) { return a > b ? a : b; }
 
diff --git a/indexlib/manager.h b/indexlib/manager.h
index c2672e239..da321cb7b 100644
--- a/indexlib/manager.h
+++ b/indexlib/manager.h
@@ -51,7 +51,7 @@ class memory_manager  {
 		/** Returns the size of the block */
 		virtual unsigned size() const = 0;
 		/** Resizes the block.
-		  * This invalidates all previously returned pointers
+		  * This tqinvalidates all previously returned pointers
 		  */
 		virtual void resize( unsigned ) = 0;
 };
diff --git a/indexlib/match.cpp b/indexlib/match.cpp
index a73dc5f5a..03851a841 100644
--- a/indexlib/match.cpp
+++ b/indexlib/match.cpp
@@ -47,17 +47,17 @@ namespace {
 }
 
 indexlib::Match::Match( std::string str, unsigned flags ):
-	masks_( 256 ),
+	tqmasks_( 256 ),
 	caseinsensitive_( flags & caseinsensitive ),
 	pattern_rest_( str, kMin( str.size(), sizeof( unsigned ) * 8 - 1 ) )
 {
 	hot_bit_ = kMin( str.size(), sizeof( unsigned ) * 8 - 1 );
 	for ( unsigned i = 0; i != hot_bit_; ++i ) {
 		if ( caseinsensitive_ ) {
-			setbit( masks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
-			setbit( masks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
+			setbit( tqmasks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
+			setbit( tqmasks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
 		} else {
-			setbit( masks_[ ( unsigned char )str[ i ] ], i );
+			setbit( tqmasks_[ ( unsigned char )str[ i ] ], i );
 		}
 	}
 }
@@ -69,7 +69,7 @@ bool indexlib::Match::process( const char* string ) const {
 	unsigned state = 0;
 	while ( *string ) {
 		state |= 1;
-		state &= masks_[ ( unsigned char )*string ];
+		state &= tqmasks_[ ( unsigned char )*string ];
 		state <<= 1;
 		++string;
 		if ( getbit( state, hot_bit_ ) && ( pattern_rest_ == std::string( string, pattern_rest_.size() ) ) ) return true;
diff --git a/indexlib/match.h b/indexlib/match.h
index 568eb3d0d..6cbf448b7 100644
--- a/indexlib/match.h
+++ b/indexlib/match.h
@@ -64,8 +64,8 @@ class Match {
 		bool process( const char* string ) const;
 		bool process( std::string str ) const { return process( str.c_str() ); }
 	private:
-		typedef std::vector masks_type;
-		masks_type masks_;
+		typedef std::vector tqmasks_type;
+		tqmasks_type tqmasks_;
 		unsigned hot_bit_;
 		bool caseinsensitive_;
 		std::string pattern_rest_;
diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui
index be9996c55..3497a9805 100644
--- a/kabc/frontend/mainWindow.ui
+++ b/kabc/frontend/mainWindow.ui
@@ -4,7 +4,7 @@
     
         MainWindow
     
-    
+    
         
             0
             0
@@ -277,7 +277,7 @@
                         
                             Expanding
                         
-                        
+                        
                             
                                 20
                                 20
@@ -540,7 +540,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         20
@@ -867,7 +867,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         20
@@ -1011,7 +1011,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         20
@@ -1405,5 +1405,5 @@
     addressBookUnlocked()
     fileOpenStd()
 
-
+
 
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 96cf79232..b86521dd5 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -86,9 +86,9 @@ void KABC2Mutt::loadingFinished()
       else
         if ( !(*iaddr).familyName().isEmpty() )
           key = (*iaddr).givenName().left( 1 ).lower() +
-                (*iaddr).familyName().lower().replace( space, underscore );
+                (*iaddr).familyName().lower().tqreplace( space, underscore );
         else
-          key = (*iaddr).givenName().lower().replace( space, underscore );
+          key = (*iaddr).givenName().lower().tqreplace( space, underscore );
 
       while ( from != to ) {
         std::cout << "alias " << key;
@@ -101,7 +101,7 @@ void KABC2Mutt::loadingFinished()
 
       if ( !(*iaddr).nickName().isEmpty() ) {
         std::cout << "alias "
-                  << (*iaddr).nickName().lower().replace( space, underscore )
+                  << (*iaddr).nickName().lower().tqreplace( space, underscore )
                   << '\t' << name << " <"
                   << (*iaddr).preferredEmail() << '>' << std::endl;
       }
@@ -140,7 +140,7 @@ void KABC2Mutt::loadingFinished()
         continue;
 
       if ( mFormat == Aliases ) {
-        std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" )
+        std::cout << "alias " << (*iaddr).tqreplace( TQRegExp( " " ), "_" )
                   << '\t' << emails.join( "," ) << std::endl;
       } else {
         std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl;
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index fe39a1084..05cdddb09 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -24,7 +24,7 @@ kde_module_LTLIBRARIES = libkaddressbookpart.la
 
 libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
 libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddressbookpart_la_LIBADD = libkaddressbook.la
+libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) -lDCOP
 
 lib_LTLIBRARIES = libkaddressbook.la
 libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 26924ef8f..ac70cbaa9 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -82,25 +82,25 @@ class TabPressEater : public QObject
 AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 );
-  layout->setSpacing( KDialog::spacingHint() );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
+  tqlayout->setSpacing( KDialog::spacingHint() );
 
   mTypeCombo = new AddressTypeCombo( mAddressList, this );
   connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
            TQT_SLOT( updateAddressEdit() ) );
-  layout->addWidget( mTypeCombo );
+  tqlayout->addWidget( mTypeCombo );
 
   mAddressField = new KActiveLabel( this );
   mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
   mAddressField->setMinimumHeight( 20 );
-  mAddressField->setAlignment( Qt::AlignTop );
+  mAddressField->tqsetAlignment( Qt::AlignTop );
   mAddressField->setTextFormat( Qt::PlainText );
-  layout->addWidget( mAddressField );
+  tqlayout->addWidget( mAddressField );
 
   mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
   connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
 
-  layout->addWidget( mEditButton );
+  tqlayout->addWidget( mEditButton );
 }
 
 AddressEditWidget::~AddressEditWidget()
@@ -274,7 +274,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
   topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Address::streetLabel() ), page );
-  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
+  label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft );
   topLayout->addWidget( label, 1, 0 );
   mStreetTextEdit = new TQTextEdit( page );
   mStreetTextEdit->setTextFormat( Qt::PlainText );
@@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
                  parent, "AddressTypeDialog" )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
   mGroup = new TQButtonGroup( 2, Horizontal, i18n( "street/postal", "Address Types" ), page );
-  layout->addWidget( mGroup );
+  tqlayout->addWidget( mGroup );
 
   mTypeList = KABC::Address::typeList();
   mTypeList.remove( KABC::Address::Pref );
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 429d6b90e..7e6bab403 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
 
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
   if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) {
     mEditorWidget = new SimpleAddresseeEditor( page );
@@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
     mEditorWidget = new AddresseeEditorWidget( page );
   }
   connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) );
-  layout->addWidget( mEditorWidget );
+  tqlayout->addWidget( mEditorWidget );
 
   enableButton( KDialogBase::Apply, false );
 
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index 5c1ddcec6..ab8572ce8 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -36,14 +36,14 @@
 AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
   : KAB::ExtensionWidget( core, parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor )
     mAddresseeEditor = new SimpleAddresseeEditor( this );
   else
     mAddresseeEditor = new AddresseeEditorWidget( this );
 
-  layout->addWidget( mAddresseeEditor );
+  tqlayout->addWidget( mAddresseeEditor );
 }
 
 AddresseeEditorExtension::~AddresseeEditorExtension()
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 631d1a3ac..519a817f1 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& )
 
 void AddresseeEditorWidget::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mTabWidget = new TQTabWidget( this );
-  layout->addWidget( mTabWidget );
+  tqlayout->addWidget( mTabWidget );
 
   setupTab1();
   setupTab2();
@@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1()
   // This is the General tab
   TQWidget *tab1 = new TQWidget( mTabWidget );
 
-  TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 );
-  layout->setMargin( KDialogBase::marginHint() );
-  layout->setSpacing( KDialogBase::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 );
+  tqlayout->setMargin( KDialogBase::marginHint() );
+  tqlayout->setSpacing( KDialogBase::spacingHint() );
 
   TQLabel *label;
   KSeparator* bar;
@@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1()
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
                                                       KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   // First name
   button = new TQPushButton( i18n( "Edit Name..." ), tab1 );
@@ -178,16 +178,16 @@ void AddresseeEditorWidget::setupTab1()
     mNameLabel->show();
   }
 
-  layout->addWidget( button, 0, 1 );
-  layout->addWidget( mNameEdit, 0, 2 );
-  layout->addWidget( mNameLabel, 0, 2 );
+  tqlayout->addWidget( button, 0, 1 );
+  tqlayout->addWidget( mNameEdit, 0, 2 );
+  tqlayout->addWidget( mNameLabel, 0, 2 );
   label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mRoleEdit );
-  layout->addWidget( label, 1, 1 );
-  layout->addWidget( mRoleEdit, 1, 2 );
+  tqlayout->addWidget( label, 1, 1 );
+  tqlayout->addWidget( mRoleEdit, 1, 2 );
 
   // Organization
   label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
@@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1()
   label->setBuddy( mOrgEdit );
   connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( organizationTextChanged( const TQString& ) ) );
-  layout->addWidget( label, 2, 1 );
-  layout->addWidget( mOrgEdit, 2, 2 );
+  tqlayout->addWidget( label, 2, 1 );
+  tqlayout->addWidget( mOrgEdit, 2, 2 );
 
   // File as (formatted name)
   label = new TQLabel( i18n( "Formatted name:" ), tab1 );
   mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
-  layout->addWidget( label, 3, 1 );
-  layout->addWidget( mFormattedNameLabel, 3, 2 );
+  tqlayout->addWidget( label, 3, 1 );
+  tqlayout->addWidget( mFormattedNameLabel, 3, 2 );
 
   // Left hand separator. This separator doesn't go all the way
   // across so the dialog still flows from top to bottom
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
+  tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 );
 
   //////////////////////////////////////
   // Phone numbers (upper right)
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
+  tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 );
 
   mPhoneEditWidget = new PhoneEditWidget( tab1 );
   connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
+  tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
 
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
+  tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 );
 
   //////////////////////////////////////
   // Addresses (lower left)
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 );
 
   mAddressEditWidget = new AddressEditWidget( tab1 );
   connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
+  tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
 
   //////////////////////////////////////
   // Email / Web (lower right)
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
+  tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 );
 
   mEmailWidget = new EmailEditWidget( tab1 );
   connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
+  tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
 
   // add the separator
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
+  tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 );
 
   TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 );
 
@@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1()
   label->setBuddy( mURLEdit );
   homePageLayout->addWidget( label );
   homePageLayout->addWidget( mURLEdit );
-  layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
+  tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
 
   TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 );
   label = new TQLabel( i18n("Blog feed:"), tab1 );
@@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1()
   connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
            TQT_SLOT( textChanged( const TQString & ) ) );
   label->setBuddy( mBlogEdit );
-  layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
+  tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
 
   mIMWidget = new IMEditWidget( tab1, mAddressee );
   connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
+  tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
 
-  layout->addColSpacing( 6, 50 );
+  tqlayout->addColSpacing( 6, 50 );
 
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 11, 11, 0, 6 );
+  tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 );
 
   ///////////////////////////////////////
   TQHBox *categoryBox = new TQHBox( tab1 );
@@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1()
   mSecrecyWidget = new SecrecyWidget( categoryBox );
   connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
 
-  layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
+  tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
 
-  // Build the layout and add to the tab widget
-  layout->activate(); // required
+  // Build the tqlayout and add to the tab widget
+  tqlayout->activate(); // required
 
   mTabWidget->addTab( tab1, i18n( "&General" ) );
 }
@@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2()
   // This is the Details tab
   TQWidget *tab2 = new TQWidget( mTabWidget );
 
-  TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 );
-  layout->setMargin( KDialogBase::marginHint() );
-  layout->setSpacing( KDialogBase::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 );
+  tqlayout->setMargin( KDialogBase::marginHint() );
+  tqlayout->setSpacing( KDialogBase::spacingHint() );
 
   TQLabel *label;
   KSeparator* bar;
@@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2()
   label = new TQLabel( tab2 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   label = new TQLabel( i18n( "Department:" ), tab2 );
-  layout->addWidget( label, 0, 1 );
+  tqlayout->addWidget( label, 0, 1 );
   mDepartmentEdit = new KLineEdit( tab2 );
   connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mDepartmentEdit );
-  layout->addWidget( mDepartmentEdit, 0, 2 );
+  tqlayout->addWidget( mDepartmentEdit, 0, 2 );
 
   label = new TQLabel( i18n( "Office:" ), tab2 );
-  layout->addWidget( label, 1, 1 );
+  tqlayout->addWidget( label, 1, 1 );
   mOfficeEdit = new KLineEdit( tab2 );
   connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mOfficeEdit );
-  layout->addWidget( mOfficeEdit, 1, 2 );
+  tqlayout->addWidget( mOfficeEdit, 1, 2 );
 
   label = new TQLabel( i18n( "Profession:" ), tab2 );
-  layout->addWidget( label, 2, 1 );
+  tqlayout->addWidget( label, 2, 1 );
   mProfessionEdit = new KLineEdit( tab2 );
   connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mProfessionEdit );
-  layout->addWidget( mProfessionEdit, 2, 2 );
+  tqlayout->addWidget( mProfessionEdit, 2, 2 );
 
   label = new TQLabel( i18n( "Manager\'s name:" ), tab2 );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
   mManagerEdit = new KPIM::AddresseeLineEdit( tab2 );
   connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mManagerEdit );
-  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
+  tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
 
   label = new TQLabel( i18n( "Assistant's name:" ), tab2 );
-  layout->addWidget( label, 1, 3 );
+  tqlayout->addWidget( label, 1, 3 );
   mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 );
   connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mAssistantEdit );
-  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
+  tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
 
   label = new TQLabel( i18n( ":", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
-  layout->addWidget( label, 2, 3 );
+  tqlayout->addWidget( label, 2, 3 );
   mTitleEdit = new KLineEdit( tab2 );
   connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mTitleEdit );
-  layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
+  tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
 
   bar = new KSeparator( KSeparator::HLine, tab2 );
-  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
+  tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 );
 
   /////////////////////////////////////////////////
   // Personal info
@@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2()
   label = new TQLabel( tab2 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 );
 
   label = new TQLabel( i18n( "Nickname:" ), tab2 );
-  layout->addWidget( label, 4, 1 );
+  tqlayout->addWidget( label, 4, 1 );
   mNicknameEdit = new KLineEdit( tab2 );
   connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mNicknameEdit );
-  layout->addWidget( mNicknameEdit, 4, 2 );
+  tqlayout->addWidget( mNicknameEdit, 4, 2 );
 
   label = new TQLabel( i18n( "Partner's name:" ), tab2 );
-  layout->addWidget( label, 5, 1 );
+  tqlayout->addWidget( label, 5, 1 );
   mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 );
   connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mSpouseEdit );
-  layout->addWidget( mSpouseEdit, 5, 2 );
+  tqlayout->addWidget( mSpouseEdit, 5, 2 );
 
   label = new TQLabel( i18n( "Birthdate:" ), tab2 );
-  layout->addWidget( label, 4, 3 );
+  tqlayout->addWidget( label, 4, 3 );
   mBirthdayPicker = new KDateEdit( tab2 );
   connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
            TQT_SLOT( dateChanged( const TQDate& ) ) );
   connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( emitModified() ) );
   label->setBuddy( mBirthdayPicker );
-  layout->addWidget( mBirthdayPicker, 4, 4 );
+  tqlayout->addWidget( mBirthdayPicker, 4, 4 );
 
   label = new TQLabel( i18n( "Anniversary:" ), tab2 );
-  layout->addWidget( label, 5, 3 );
+  tqlayout->addWidget( label, 5, 3 );
   mAnniversaryPicker = new KDateEdit( tab2 );
   connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
            TQT_SLOT( dateChanged( const TQDate& ) ) );
   connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( emitModified() ) );
   label->setBuddy( mAnniversaryPicker );
-  layout->addWidget( mAnniversaryPicker, 5, 4 );
+  tqlayout->addWidget( mAnniversaryPicker, 5, 4 );
 
   bar = new KSeparator( KSeparator::HLine, tab2 );
-  layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
+  tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 );
 
    //////////////////////////////////////
   // Notes
   label = new TQLabel( i18n( "Note:" ), tab2 );
-  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
-  layout->addWidget( label, 7, 0 );
+  label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft );
+  tqlayout->addWidget( label, 7, 0 );
   mNoteEdit = new TQTextEdit( tab2 );
   mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
-  mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
+  mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() );
   connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) );
   label->setBuddy( mNoteEdit );
-  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
+  tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
 
-   // Build the layout and add to the tab widget
-  layout->activate(); // required
+   // Build the tqlayout and add to the tab widget
+  tqlayout->activate(); // required
 
   mTabWidget->addTab( tab2, i18n( "&Details" ) );
 }
@@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
       page->addWidget( widget );
   }
 
-  // query the layout update
+  // query the tqlayout update
   TQDictIterator it( mTabPages );
   for ( ; it.current(); ++it )
     it.current()->updateLayout();
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index b42729e34..c936e5fa8 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict *viewFactoryDict,
 
   TQWidget *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 2, 2 );
-  layout->setSpacing( spacingHint() );
-  layout->setRowStretch( 1, 1 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 );
+  tqlayout->setSpacing( spacingHint() );
+  tqlayout->setRowStretch( 1, 1 );
+  tqlayout->setColStretch( 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "View name:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mViewNameEdit = new TQLineEdit( page );
   connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
-  layout->addWidget( mViewNameEdit, 0, 1 );
+  tqlayout->addWidget( mViewNameEdit, 0, 1 );
 
   mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
   connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
-  layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
-  TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 );
+  tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
+  TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
   groupLayout->setSpacing( spacingHint() );
 
   int row = 0;
@@ -69,7 +69,7 @@ AddViewDialog::AddViewDialog( TQDict *viewFactoryDict,
     TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()),
                                              mTypeGroup, (*iter)->type().latin1() );
     label = new TQLabel( (*iter)->description(), mTypeGroup );
-    label->setAlignment( Qt::WordBreak );
+    label->tqsetAlignment( Qt::WordBreak );
 
     groupLayout->addWidget( button, row, 0, Qt::AlignTop );
     groupLayout->addWidget( label, row, 1, Qt::AlignTop );
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index b1788c509..c2f5dc404 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly )
 
 void AdvancedCustomFields::initGUI( const TQString &uiFile )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mFields = new KPIM::DesignerFields( uiFile, this );
-  layout->addWidget( mFields );
+  tqlayout->addWidget( mFields );
 
   connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) );
 }
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index 688cab99f..5c7c8c0c7 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase
 
     void setLocationMapURL( const TQString &locationMapURL )
     {
-      if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) )
+      if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) )
         mLocationMapURL = locationMapURL;
     }
 
@@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase
 
     void setLocationMapURLs( const TQStringList &locationMapURLs )
     {
-      if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) )
+      if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) )
         mLocationMapURLs = locationMapURLs;
     }
 
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index efae019c3..5788e6fcd 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
   }
 
 #if KDE_VERSION >= 319
-  return urlTemplate.replace( "%s", addr.street() ).
-                     replace( "%r", addr.region() ).
-                     replace( "%l", addr.locality() ).
-                     replace( "%z", addr.postalCode() ).
-                     replace( "%c", addr.countryToISO( addr.country() ) );
+  return urlTemplate.tqreplace( "%s", addr.street() ).
+                     tqreplace( "%r", addr.region() ).
+                     tqreplace( "%l", addr.locality() ).
+                     tqreplace( "%z", addr.postalCode() ).
+                     tqreplace( "%c", addr.countryToISO( addr.country() ) );
 #else
-  return urlTemplate.replace( "%s", addr.street() ).
-                     replace( "%r", addr.region() ).
-                     replace( "%l", addr.locality() ).
-                     replace( "%z", addr.postalCode() ).
-                     replace( "%c", "" );
+  return urlTemplate.tqreplace( "%s", addr.street() ).
+                     tqreplace( "%r", addr.region() ).
+                     tqreplace( "%l", addr.locality() ).
+                     tqreplace( "%z", addr.postalCode() ).
+                     tqreplace( "%c", "" );
 #endif
 }
 
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index 6a6a68d99..d48be3d93 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -41,7 +41,7 @@
 ContactEditorWidgetManager *ContactEditorWidgetManager::mSelf = 0;
 
 ContactEditorWidgetManager::ContactEditorWidgetManager()
-  : TQObject( qApp )
+  : TQObject( tqApp )
 {
   reload();
 }
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index d0b03ddf5..4b78b17f3 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -94,7 +94,7 @@ class ContactEditorTabPage : public QWidget
     void setReadOnly( bool readOnly );
 
     /**
-      Calculates the layout of the widgets and moves them to the
+      Calculates the tqlayout of the widgets and moves them to the
       correct position.
      */
     void updateLayout();
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index c9f4d8610..3d992be1e 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
 {
   TQWidget *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Title:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new KLineEdit( page );
   mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
   label->setBuddy( mTitle );
-  layout->addWidget( mTitle, 0, 1 );
+  tqlayout->addWidget( mTitle, 0, 1 );
 
   label = new TQLabel( i18n( "Type:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mType = new KComboBox( page );
   label->setBuddy( mType );
-  layout->addWidget( mType, 1, 1 );
+  tqlayout->addWidget( mType, 1, 1 );
 
   mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page );
   mGlobal->setChecked( true );
-  layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
 
   connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
            this, TQT_SLOT( nameChanged( const TQString& ) ) );
@@ -103,7 +103,7 @@ TQString AddFieldDialog::title() const
 TQString AddFieldDialog::identifier() const
 {
   TQString id = mTitle->text().lower();
-  return id.replace( ",", "_" ).replace( " ", "_" );
+  return id.tqreplace( ",", "_" ).tqreplace( " ", "_" );
 }
 
 TQString AddFieldDialog::type() const
@@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name )
 FieldWidget::FieldWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
-  mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  mGlobalLayout->setAlignment( Qt::AlignTop );
+  mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  mGlobalLayout->tqsetAlignment( Qt::AlignTop );
 
   mSeparator = new TQFrame( this );
   mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
   mSeparator->hide();
-  layout->addWidget( mSeparator );
+  tqlayout->addWidget( mSeparator );
 
-  mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  mLocalLayout->setAlignment( Qt::AlignTop );
+  mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  mLocalLayout->tqsetAlignment( Qt::AlignTop );
 }
 
 void FieldWidget::addField( const TQString &identifier, const TQString &title,
@@ -238,13 +238,13 @@ void FieldWidget::clearFields()
       wdg->setChecked( true );
     } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) {
       QDateEdit *wdg = static_cast( (*fieldIt).mWidget );
-      wdg->setDate( TQDate::currentDate() );
+      wdg->setDate( TQDate::tqcurrentDate() );
     } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) {
       QTimeEdit *wdg = static_cast( (*fieldIt).mWidget );
       wdg->setTime( TQTime::currentTime() );
     } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) {
       QDateTimeEdit *wdg = static_cast( (*fieldIt).mWidget );
-      wdg->setDateTime( TQDateTime::currentDateTime() );
+      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     }
   }
 }
@@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout()
 
   FieldRecordList::ConstIterator it;
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
-    maxWidth = QMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() );
+    maxWidth = QMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() );
 
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
     (*it).mLabel->setMinimumWidth( maxWidth );
@@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField()
 
 void CustomFieldsWidget::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mFieldWidget = new FieldWidget( this );
-  layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Field..." ), this );
-  layout->addWidget( mAddButton, 1, 1, Qt::AlignRight );
+  tqlayout->addWidget( mAddButton, 1, 1, Qt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this );
   mRemoveButton->setEnabled( false );
-  layout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight );
 
   // load global fields
   TQStringList globalFields = KABPrefs::instance()->globalCustomFields();
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index c088978f3..ac0115fe4 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -67,16 +67,16 @@ public:
 KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
 {
     Q_ASSERT( m_addressBook );
-    TQBoxLayout* layout = new TQHBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQBoxLayout* tqlayout = new TQHBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this );
     connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
              this, TQT_SLOT( textChanged( const TQString& ) ) );
-    layout->addWidget( m_lineEdit );
+    tqlayout->addWidget( m_lineEdit );
     m_clearButton = new TQToolButton( this );
     m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
     m_clearButton->setEnabled( false );
-    layout->addWidget( m_clearButton );
+    tqlayout->addWidget( m_clearButton );
     connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
 }
 
@@ -106,7 +106,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin
         return KABC::Addressee();
 
     typedef KABC::Addressee::List List;
-    const List byEmail = m_addressBook->findByEmail( email );
+    const List byEmail = m_addressBook->tqfindByEmail( email );
     if ( !byEmail.isEmpty() )
     {
         const List::ConstIterator end = byEmail.end();
@@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const
     KPIM::DistributionList::Entry res;
     if ( !m_uid.isNull() )
     {
-        const KABC::Addressee addr = m_addressBook->findByUid( m_uid );
+        const KABC::Addressee addr = m_addressBook->tqfindByUid( m_uid );
         if ( m_initialText == text || addr.formattedName() == name )
             res.addressee = addr;
     }
@@ -188,7 +188,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     d->scrollView->setFrameShape( TQFrame::NoFrame );
     mainLayout->addWidget( d->scrollView );
     d->memberListWidget = new TQWidget( d->scrollView->viewport() );
-    d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
+    d->memberListWidget->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
     TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget );
     d->addresseeLayout = new TQVBoxLayout;
     d->addresseeLayout->setSpacing( KDialog::spacingHint() );
@@ -200,7 +200,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     setMainWidget( main );
 
     KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() );
-    const TQSize hint = sizeHint();
+    const TQSize hint = tqsizeHint();
     resize( hint.width() * 3L/2, hint.height() );
 }
 
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index c28cbec2b..42e90a3b2 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     TQLabel* distLabel = new TQLabel( this );
     distLabel->setText( i18n( "Distribution list:" ) );
-    distLabel->setAlignment( Qt::SingleLine );
+    distLabel->tqsetAlignment( Qt::SingleLine );
     distLayout->addWidget( distLabel );
 
     m_distListLabel = new KURLLabel( this );
@@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     TQLabel* emailLabel = new TQLabel( this );
     emailLabel->setText( i18n( "Email address to use in this list:" ) );
-    emailLabel->setAlignment( Qt::SingleLine );
+    emailLabel->tqsetAlignment( Qt::SingleLine );
     m_mainLayout->addWidget( emailLabel );
 
     TQBoxLayout* emailLayout = new TQHBoxLayout;
@@ -110,7 +110,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
     m_distListLabel->setURL( m_list.name() );
     m_distListLabel->setText( m_list.name() );
     m_resourceLabel->setText( i18n( "Address book: %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
-    m_resourceLabel->setAlignment( Qt::SingleLine );
+    m_resourceLabel->tqsetAlignment( Qt::SingleLine );
  
     m_emailGroup = new TQVButtonGroup( this );
     m_emailGroup->setFlat( true );
@@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
              this, TQT_SLOT( emailButtonClicked( int ) ) ); 
     m_radioLayout->addWidget( m_emailGroup, 0, 0 );
     m_emailGroup->setShown( true );
-    m_mainLayout->invalidate();
+    m_mainLayout->tqinvalidate();
 }
 
 
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index a43c76d0a..7858e2957 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
     enableButton( Ok, false );
     setButtonText( User1, i18n( "Add New Distribution List" ) );
     TQWidget* main = new TQWidget( this );
-    TQGridLayout* layout = new TQGridLayout( main );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQGridLayout* tqlayout = new TQGridLayout( main );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     m_label = new TQLabel( main );
-    layout->addWidget( m_label, 0, 0 );
+    tqlayout->addWidget( m_label, 0, 0 );
     m_listBox = new KListBox( main );
-    layout->addWidget( m_listBox, 1, 0 );
+    tqlayout->addWidget( m_listBox, 1, 0 );
     connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ),
              this, TQT_SLOT( entrySelected( const TQString& ) ) ); 
     connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ),
@@ -97,7 +97,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
         if ( name.isEmpty() )
             return;
 
-        validName = !listNames.contains( name );
+        validName = !listNames.tqcontains( name );
 
         if ( validName )
         {
diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am
index e611bb5ea..bb39762bd 100644
--- a/kaddressbook/editors/Makefile.am
+++ b/kaddressbook/editors/Makefile.am
@@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
 
 libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
 libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
-libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS)
+libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
 
 noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h
 
diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui
index f62ac00d7..2f608a083 100644
--- a/kaddressbook/editors/imaddressbase.ui
+++ b/kaddressbook/editors/imaddressbase.ui
@@ -4,7 +4,7 @@
     
         IMAddressBase
     
-    
+    
         
             0
             0
@@ -85,5 +85,5 @@
     slotProtocolChanged( const QString & )
     slotProtocolChanged()
 
-
+
 
diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui
index 24a5696a9..3c8e36010 100644
--- a/kaddressbook/editors/imeditorbase.ui
+++ b/kaddressbook/editors/imeditorbase.ui
@@ -4,7 +4,7 @@
     
         IMEditorBase
     
-    
+    
         
             0
             0
@@ -37,7 +37,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     16
@@ -116,7 +116,7 @@
                     0
                 
             
-            
+            
                 
                     200
                     28
@@ -152,8 +152,8 @@
 
 
 
-
-
+
+
 
     kpushbutton.h
     kpushbutton.h
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index ad84505c2..30c3ca981 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const
 }
 
 void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
-                              int column, int width, int alignment )
+                              int column, int width, int tqalignment )
 {
   if ( mPreferred ) {
     TQFont font = p->font();
@@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
     p->setFont( font );
   }
 
-  KListViewItem::paintCell( p, cg, column, width, alignment );
+  KListViewItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 void IMAddressLVI::setAddress( const TQString &address )
@@ -166,8 +166,8 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
   //mWidget->btnUp->setEnabled( false );
   //mWidget->btnDown->setEnabled( false );
   mPreferred = preferredIM;
-  mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
-  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
+  mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true );
+  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
 
   // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
   TQMap protocolMap;
@@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr )
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) {
-      if ( name == TQString::fromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) {
+      if ( name == TQString::tqfromLatin1( "All" ) ) {
         KPluginInfo *protocol = protocolFromString( app );
         if ( protocol ) {
           TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
@@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr )
 
     TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString();
     if ( !lst.isEmpty() )
-      addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
+      addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
     else
-      addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) );
+      addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) );
   }
 }
 
@@ -271,7 +271,7 @@ void IMEditorWidget::slotSetStandard()
           return; //Selected is already preferred
         else {
           item->setPreferred( false );
-          mWidget->lvAddresses->repaintItem( item );
+          mWidget->lvAddresses->tqrepaintItem( item );
           break;
         }
       }
@@ -282,7 +282,7 @@ void IMEditorWidget::slotSetStandard()
     mPreferred = current->address();
     current->setPreferred( true );
     setModified( true );
-    mWidget->lvAddresses->repaintItem( current );
+    mWidget->lvAddresses->tqrepaintItem( current );
   }
 }
 
@@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete()
 TQString IMEditorWidget::preferred() const
 {
   TQString retval( mPreferred );
-  return retval.replace( TQChar( 0xE120 ), " on " );
+  return retval.tqreplace( TQChar( 0xE120 ), " on " );
 }
 
 
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 0184ccca4..25fd9804d 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -115,7 +115,7 @@ class IMAddressLVI : public KListViewItem
     bool preferred() const;
 
   protected:
-    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
+    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment );
 
   private:
     KPluginInfo * mProtocol;
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 6d52c90ba..3cc2de14f 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -184,7 +184,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent,
   mEmailListBox = new TQListBox( page );
 
   // Make sure there is room for the scrollbar
-  mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 );
+  mEmailListBox->setMinimumHeight( mEmailListBox->tqsizeHint().height() + 30 );
   connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ),
            TQT_SLOT( selectionChanged( int ) ) );
   connect( mEmailListBox, TQT_SIGNAL( selected( int ) ),
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 93da52d0e..aa4a5c009 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
       mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
 {
   Q_ASSERT( mExtensionBar );
-  TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar );
   mSplitter = new TQSplitter( mExtensionBar );
   mSplitter->setOrientation( TQSplitter::Vertical );
-  layout->addWidget( mSplitter );
+  tqlayout->addWidget( mSplitter );
 
   createExtensionWidgets();
 
@@ -74,7 +74,7 @@ void ExtensionManager::restoreSettings()
 
   typedef TQMap::ConstIterator ConstIterator;
   for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
-    if ( activeExtensions.contains( it.data().identifier ) ) {
+    if ( activeExtensions.tqcontains( it.data().identifier ) ) {
       KToggleAction *action = static_cast( it.data().action );
       if ( action )
         action->setChecked( true );
@@ -102,20 +102,20 @@ void ExtensionManager::reconfigure()
 
 bool ExtensionManager::isQuickEditVisible() const
 {
-  return mActiveExtensions.contains( "contact_editor" );
+  return mActiveExtensions.tqcontains( "contact_editor" );
 }
 
 void ExtensionManager::setSelectionChanged()
 {
   for ( TQStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) {
-    if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget )
+    if ( mExtensionMap.tqcontains( *it ) && mExtensionMap[*it].widget )
       mExtensionMap[*it].widget->contactsSelectionChanged();
   }
 }
 
 void ExtensionManager::activationToggled( const TQString &extid )
 {
-  if ( !mExtensionMap.contains( extid ) )
+  if ( !mExtensionMap.tqcontains( extid ) )
     return;
   const ExtensionData data = mExtensionMap[ extid ];
   const bool activated = data.action->isChecked();
@@ -124,9 +124,9 @@ void ExtensionManager::activationToggled( const TQString &extid )
 
 void ExtensionManager::setExtensionActive( const TQString& extid, bool active )
 {
-  if ( !mExtensionMap.contains( extid ) )
+  if ( !mExtensionMap.tqcontains( extid ) )
     return;
-  if ( mActiveExtensions.contains( extid ) == active )
+  if ( mActiveExtensions.tqcontains( extid ) == active )
     return;
   const ExtensionData data = mExtensionMap[ extid ];
   if ( active ) {
@@ -174,7 +174,7 @@ void ExtensionManager::createActions()
     mMapper->setMapping( data.action, data.identifier );
     mActionList.append( data.action );
 
-    if ( mActiveExtensions.contains( data.identifier ) )
+    if ( mActiveExtensions.tqcontains( data.identifier ) )
       data.action->setChecked( true );
   }
 
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am
index d3311c77b..a2b5db399 100644
--- a/kaddressbook/features/Makefile.am
+++ b/kaddressbook/features/Makefile.am
@@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
 if compile_newdistrlists
 libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
 libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS)
+libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
 else
 libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
 libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS)
+libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
 endif
 
 libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
 libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS)
+libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources
 
 noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
 
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 4ca4e365e..d6b1d7d96 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event )
         event->ignore();
     }
     else {
-        event->accept( itemRect( item ) );
+        event->accept( tqitemRect( item ) );
     }
 }
 
@@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const
 
 KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
 
     TQHBoxLayout *buttonLayout = new TQHBoxLayout();
-    layout->addLayout( buttonLayout );
+    tqlayout->addLayout( buttonLayout );
 
     TQLabel *label = new TQLabel( this );
     label->setText( i18n( "Distribution Lists" ) );
@@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
     connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
              this, TQT_SLOT( itemSelected( int ) ) );
     connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
-    layout->addWidget( mListBox );
+    tqlayout->addWidget( mListBox );
 
     connect( core, TQT_SIGNAL( contactsUpdated() ),
              this, TQT_SLOT( updateEntries() ) );
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 93a00bdfa..878ede7aa 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -255,9 +255,9 @@ void DistributionListWidget::selectionContactViewChanged()
 bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const
 {
 #ifdef KDEPIM_NEW_DISTRLISTS
-  return core()->distributionListNames().contains( distrListName );
+  return core()->distributionListNames().tqcontains( distrListName );
 #else
-  return mManager->listNames().contains( distrListName );
+  return mManager->listNames().tqcontains( distrListName );
 #endif
 }
 
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 2b6607376..a6ccd462c 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -71,7 +71,7 @@ void FilterEditDialog::setFilter( const Filter &filter )
   TQStringList categories = filter.categories();
   TQListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
-    if ( categories.contains( item->text( 0 ) ) ) {
+    if ( categories.tqcontains( item->text( 0 ) ) ) {
       TQCheckListItem *checkItem = static_cast( item );
       checkItem->setOn( true );
     }
@@ -272,7 +272,7 @@ void FilterDialog::initGUI()
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
 
-  buttonBox->layout();
+  buttonBox->tqlayout();
   topLayout->addWidget( buttonBox, 0, 1 );
 }
 
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index 096c1d583..5b588fcfc 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -35,15 +35,15 @@
 FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::ContactEditorWidget( ab, parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mURL = new KURLRequester( this );
   label->setBuddy( mURL );
-  layout->addWidget( mURL );
+  tqlayout->addWidget( mURL );
 
   connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
            this, TQT_SLOT( setModified() ) );
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 40631147b..ec8c92f9b 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  label->setAlignment( Qt::AlignTop );
+  label->tqsetAlignment( Qt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
 
   mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this );
@@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
   topLayout->addWidget( mCityCombo, 0, 1 );
 
   TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
-  TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(),
+  TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
                                                     2, 5, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup );
@@ -404,7 +404,7 @@ void GeoDialog::loadCityList()
       pos = name.search(line, pos);
       if ( pos > 0 ) {
         n = line.mid( pos, name.matchedLength() ).stripWhiteSpace();
-        n.replace( '_', " " );
+        n.tqreplace( '_', " " );
       }
 
       if ( !c.isEmpty() && !n.isEmpty() ) {
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 7d8ac8f51..4a8ab340a 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                             KDialog::spacingHint() );
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
-  TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
 
   mImageButton = new ImageButton( i18n( "Picture" ), box );
   mImageButton->setFixedSize( 100, 140 );
   mImageButton->setImageLoader( mImageLoader );
-  layout->addWidget( mImageButton );
+  tqlayout->addWidget( mImageButton );
 
   topLayout->addWidget( box );
 
@@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const
 ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::ContactEditorWidget( ab, parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this );
-  layout->addWidget( mPhotoWidget );
+  tqlayout->addWidget( mPhotoWidget );
 
   mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this );
-  layout->addWidget( mLogoWidget );
+  tqlayout->addWidget( mLogoWidget );
 
   connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
   connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 479f79c73..74349bd72 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -40,32 +40,32 @@
 IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
     : TQWidget( parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
 
   TQToolButton *button = new TQToolButton( this );
-  button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
+  button->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
   button->setPixmap( SmallIcon( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
   button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) );
   button->setAutoRaise( true );
   TQToolTip::add( button, i18n( "Reset" ) );
-  layout->addWidget( button );
+  tqlayout->addWidget( button );
 
   TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" );
-  label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
-  layout->addWidget( label );
+  label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
+  tqlayout->addWidget( label );
 
   mSearchText = new KLineEdit( this );
-  mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+  mSearchText->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
   TQWhatsThis::add( mSearchText, i18n( "The incremental search
Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) );
   label->setBuddy( mSearchText );
-  layout->addWidget( mSearchText );
+  tqlayout->addWidget( mSearchText );
 
   label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" );
-  label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
-  layout->addWidget( label );
+  label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
+  tqlayout->addWidget( label );
 
   mFieldCombo = new TQComboBox( false, this );
-  layout->addWidget( mFieldCombo );
+  tqlayout->addWidget( mFieldCombo );
   label->setBuddy(mFieldCombo);
 
   TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) );
diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp
index 8c98e5e0f..75622935c 100644
--- a/kaddressbook/interfaces/extensionwidget.cpp
+++ b/kaddressbook/interfaces/extensionwidget.cpp
@@ -55,7 +55,7 @@ KABC::Addressee::List ExtensionWidget::selectedContacts()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt = uids.end();
   for ( it = uids.begin(); it != endIt; ++it )
-    list.append( mCore->addressBook()->findByUid( *it ) );
+    list.append( mCore->addressBook()->tqfindByUid( *it ) );
 
   return list;
 }
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 53be55197..798ebf559 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -99,7 +99,7 @@ KABC::AddressBook *XXPort::addressBook() const
   return mAddressBook;
 }
 
-TQWidget *XXPort::parentWidget() const
+TQWidget *XXPort::tqparentWidget() const
 {
   return mParentWidget;
 }
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 29b54acc1..d8b83c401 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -113,14 +113,14 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
   signals:
     /**
       Emitted whenever the export action is activated.
-      The parameter contains the @ref identifier() for
+      The parameter tqcontains the @ref identifier() for
       unique identification.
      */
     void exportActivated( const TQString&, const TQString& );
 
     /**
       Emitted whenever the import action is activated.
-      The parameter contains the @ref identifier() for
+      The parameter tqcontains the @ref identifier() for
       unique identification.
      */
     void importActivated( const TQString&, const TQString& );
@@ -145,7 +145,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
       Returns a pointer to the parent widget. It can be used as parent for
       message boxes.
      */
-    TQWidget *parentWidget() const;
+    TQWidget *tqparentWidget() const;
 
   private slots:
     void slotImportActivated( const TQString& );
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index baa84ce23..aa7cb891c 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -67,15 +67,15 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam
 {
   setMinimumSize( 1, 1 );
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 );
-  layout->setAlignment( Qt::AlignTop );
-  layout->setAutoAdd( true );
-  layout->setResizeMode( TQLayout::FreeResize );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 );
+  tqlayout->tqsetAlignment( Qt::AlignTop );
+  tqlayout->setAutoAdd( true );
+  tqlayout->setResizeMode( TQLayout::FreeResize );
 
   mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
   mGroupBox->setExclusive( true );
-  mGroupBox->layout()->setSpacing( 0 );
-  mGroupBox->layout()->setMargin( 0 );
+  mGroupBox->tqlayout()->setSpacing( 0 );
+  mGroupBox->tqlayout()->setMargin( 0 );
   mGroupBox->setFrameStyle( TQFrame::NoFrame );
 }
 
@@ -121,7 +121,7 @@ void JumpButtonBar::updateButtons()
       return;
     }
 
-    if ( !character.isEmpty() && !characters.contains( character ) )
+    if ( !character.isEmpty() && !characters.tqcontains( character ) )
       characters.append( character );
   }
 
@@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons()
   int maxWidth = 0;
   TQPushButton *button;
   for ( button = mButtons.first(); button; button = mButtons.next() )
-    maxWidth = QMAX( maxWidth, button->sizeHint().width() );
+    maxWidth = QMAX( maxWidth, button->tqsizeHint().width() );
 
   setFixedWidth( maxWidth );
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7951cded0..66b0bb81e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -334,7 +334,7 @@ KAboutData *KABCore::createAboutData()
   return about;
 }
 
-void KABCore::setStatusBar( KStatusBar *statusBar )
+void KABCore::seStatusBar( KStatusBar *statusBar )
 {
   mStatusBar = statusBar;
 }
@@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid )
       return;
   }
 
-  KABC::Addressee addr = mAddressBook->findByUid( uid );
+  KABC::Addressee addr = mAddressBook->tqfindByUid( uid );
   if ( !mDetailsViewer->isHidden() )
     mDetailsViewer->setAddressee( addr );
 #ifdef KDEPIM_NEW_DISTRLISTS
@@ -433,7 +433,7 @@ void KABCore::setContactSelected( const TQString &uid )
     QClipboard *cb = TQApplication::clipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
     const TQMimeSource *data = cb->data( QClipboard::Clipboard );
-    list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+    list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
     list = AddresseeUtil::clipboardToAddressees( cb->text() );
 #endif
@@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
     TQStringList::ConstIterator it = uids.begin();
     const TQStringList::ConstIterator endIt( uids.end() );
     while ( it != endIt ) {
-      KABC::Addressee addr = mAddressBook->findByUid( *it );
+      KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
       names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
       ++it;
     }
@@ -578,7 +578,7 @@ void KABCore::pasteContacts()
   QClipboard *cb = TQApplication::clipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
   const TQMimeSource *data = cb->data( QClipboard::Clipboard );
-  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
 #endif
@@ -692,7 +692,7 @@ void KABCore::contactModified( const KABC::Addressee &addr )
   Command *command = 0;
 
   // check if it exists already
-  KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
+  KABC::Addressee origAddr = mAddressBook->tqfindByUid( addr.uid() );
   if ( origAddr.isEmpty() ) {
     KABC::Addressee::List addressees;
     addressees.append( addr );
@@ -778,7 +778,7 @@ void KABCore::addEmail( const TQString &aStr )
   const KABC::AddressBook::Iterator endIt( mAddressBook->end() );
   for ( it = mAddressBook->begin(); !found && (it != endIt); ++it ) {
     emailList = (*it).emails();
-    if ( emailList.contains( email ) > 0 ) {
+    if ( emailList.tqcontains( email ) > 0 ) {
       found = true;
       (*it).setNameFromString( fullName );
       editContact( (*it).uid() );
@@ -829,7 +829,7 @@ void KABCore::editContact( const TQString &uid )
   }
 #endif
 
-  KABC::Addressee addr = mAddressBook->findByUid( localUID );
+  KABC::Addressee addr = mAddressBook->tqfindByUid( localUID );
   if ( !addr.isEmpty() ) {
     AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
     if ( !dialog ) {
@@ -950,7 +950,7 @@ void KABCore::extensionModified( const KABC::Addressee::List &list )
       Command *command = 0;
 
       // check if it exists already
-      KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() );
+      KABC::Addressee origAddr = mAddressBook->tqfindByUid( (*it).uid() );
       if ( origAddr.isEmpty() ) {
         KABC::Addressee::List addressees;
         addressees.append( *it );
@@ -1005,7 +1005,7 @@ TQString KABCore::getNameByPhone( const TQString &phone )
     const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() );
     for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
-      if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
+      if ( (*phoneIter).number().tqreplace( r, "" ) == localPhone.tqreplace( r, "" ) ) {
         ownerName = (*iter).realName();
         found = true;
       }
@@ -1084,7 +1084,7 @@ void KABCore::showContactsAddress( const TQString &addrUid )
   if ( uidList.isEmpty() )
     return;
 
-  KABC::Addressee addr = mAddressBook->findByUid( uidList.first() );
+  KABC::Addressee addr = mAddressBook->tqfindByUid( uidList.first() );
   if ( addr.isEmpty() )
     return;
 
@@ -1224,7 +1224,7 @@ void KABCore::initGUI()
   viewLayout->setSpacing( KDialog::spacingHint() );
 
   mViewHeaderLabel = new TQLabel( viewWidget );
-//  mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+//  mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
   mViewHeaderLabel->setText( i18n( "Contacts" ) );
   viewLayout->addWidget( mViewHeaderLabel );
   mViewManager = new ViewManager( this, viewWidget );
@@ -1477,7 +1477,7 @@ TQStringList KABCore::allCategories() const
     categories = (*it).categories();
     const TQStringList::ConstIterator catEndIt( categories.end() );
     for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
-      if ( !allCategories.contains( *catIt ) )
+      if ( !allCategories.tqcontains( *catIt ) )
         allCategories.append( *catIt );
 	}
   }
@@ -1510,7 +1510,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( uids.end() );
   for ( it = uids.begin(); it != endIt; ++it ) {
-    KABC::Addressee addr = mAddressBook->findByUid( *it );
+    KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
     if ( !addr.isEmpty() ) {
       if ( !merge )
         addr.setCategories( categories );
@@ -1519,7 +1519,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
         TQStringList::ConstIterator catIt;
         const TQStringList::ConstIterator catEndIt( categories.end() );
         for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
-          if ( !addrCategories.contains( *catIt ) )
+          if ( !addrCategories.tqcontains( *catIt ) )
             addrCategories.append( *catIt );
         }
         addr.setCategories( addrCategories );
@@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList()
   TQStringList::ConstIterator it = uids.begin();
   const TQStringList::ConstIterator endIt( uids.end() );
   while ( it != endIt ) {
-    KABC::Addressee addr = mAddressBook->findByUid( *it );
+    KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
     names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
     ++it;
   }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 2e6fded32..d1c275751 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -139,7 +139,7 @@ class KDE_EXPORT KABCore : public KAB::Core
 
     static KAboutData *createAboutData();
 
-    void setStatusBar( KStatusBar *statusBar );
+    void seStatusBar( KStatusBar *statusBar );
 
     KStatusBar *statusBar() const;
 
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 7e6b5c9cd..83571a7a9 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -39,12 +39,12 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
   uint number = 0;
   do {
     name = addressee.givenName() + "_" + addressee.familyName() + uniquePart + ".vcf";
-    name.replace( ' ', '_' );
-    name.replace( '/', '_' );
+    name.tqreplace( ' ', '_' );
+    name.tqreplace( '/', '_' );
 
     ++number;
     uniquePart = TQString( "_%1" ).arg( number );
-  } while ( existingFiles.contains( name ) );
+  } while ( existingFiles.tqcontains( name ) );
 
   existingFiles.append( name );
 
@@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
   TQStringList::ConstIterator it( uids.begin() );
   const TQStringList::ConstIterator endIt( uids.end() );
   for ( ; it != endIt; ++it ) {
-    KABC::Addressee addressee = ab->findByUid( *it );
+    KABC::Addressee addressee = ab->tqfindByUid( *it );
 
     if ( addressee.isEmpty() )
       continue;
@@ -141,7 +141,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     KABC::Address::List::ConstIterator addrIt( addresses.begin() );
     const KABC::Address::List::ConstIterator addrEndIt( addresses.end() );
     for ( ; addrIt != addrEndIt; ++addrIt ) {
-      if ( !masterAddresses.contains( *addrIt ) )
+      if ( !masterAddresses.tqcontains( *addrIt ) )
         masterAddressee.insertAddress( *addrIt );
     }
 
@@ -156,7 +156,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     TQStringList::ConstIterator it( categories.begin() );
     TQStringList::ConstIterator endIt( categories.end() );
     for ( it = categories.begin(); it != endIt; ++it )
-      if ( !masterCategories.contains( *it ) )
+      if ( !masterCategories.tqcontains( *it ) )
         newCategories.append( *it );
     masterAddressee.setCategories( newCategories );
 
@@ -169,7 +169,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     const TQStringList masterEmails = masterAddressee.emails();
     endIt = emails.end();
     for ( it = emails.begin(); it != endIt; ++it )
-      if ( !masterEmails.contains( *it ) )
+      if ( !masterEmails.tqcontains( *it ) )
         masterAddressee.insertEmail( *it, false );
 
     // FN
@@ -239,7 +239,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() );
     const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() );
     for ( ; phoneIt != phoneEndIt; ++phoneIt )
-      if ( !masterPhones.contains( *phoneIt ) )
+      if ( !masterPhones.tqcontains( *phoneIt ) )
         masterAddressee.insertPhoneNumber( *phoneIt );
 
     // TITLE
@@ -262,7 +262,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     TQStringList newCustoms( masterCustoms );
     endIt = customs.end();
     for ( it = customs.begin(); it != endIt; ++it )
-      if ( !masterCustoms.contains( *it ) )
+      if ( !masterCustoms.tqcontains( *it ) )
         newCustoms.append( *it );
     masterAddressee.setCustoms( newCustoms );
   }
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 34e651846..39216b8f4 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -42,7 +42,7 @@
 typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory;
 K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory )
 
-KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
+KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
                                     TQObject *parent, const char *name,
                                     const TQStringList & )
   : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name )
@@ -50,7 +50,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa
   setInstance( KAddressbookFactory::instance() );
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget( parentWidget, widgetName );
+  TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
   canvas->setFocusPolicy( TQWidget::ClickFocus );
   setWidget( canvas );
 
@@ -63,7 +63,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa
   topLayout->addWidget( mCore->widget() );
 
   KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension( this );
-  mCore->setStatusBar( statusBar->statusBar() );
+  mCore->seStatusBar( statusBar->statusBar() );
 
   setXMLFile( "kaddressbook_part.rc" );
 }
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index b0a2c391c..c2e6b10fc 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -39,7 +39,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
   Q_OBJECT
 
   public:
-    KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
+    KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
                       TQObject *parent, const char *name, const TQStringList& );
     virtual ~KAddressbookPart();
 
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index f54c18828..cf67d2eef 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -64,7 +64,7 @@ KAddressBookMain::KAddressBookMain( const TQString &file )
 
   statusBar()->addWidget( progressWidget, 0, true );
 
-  mCore->setStatusBar( statusBar() );
+  mCore->seStatusBar( statusBar() );
 
   setStandardToolBarMenuEnabled( true );
 
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 28fd81afd..2059fbb35 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -79,7 +79,7 @@ TQString KAddressBookView::selectedEmails()
 
   TQStringList::ConstIterator it;
   for ( it = uidList.begin(); it != uidList.end(); ++it ) {
-    addr = mCore->addressBook()->findByUid( *it );
+    addr = mCore->addressBook()->tqfindByUid( *it );
 
     if ( !addr.isEmpty() ) {
       TQString m = TQString::null;
@@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees()
 
 void KAddressBookView::initGUI()
 {
-  // Create the layout
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  // Create the tqlayout
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   // Add the view widget
   mViewWidget = new TQWidget( this );
-  layout->addWidget( mViewWidget );
+  tqlayout->addWidget( mViewWidget );
 }
 
 KABC::Field::List KAddressBookView::fields() const
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 14abca147..c09e5b945 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const
   mServer = server;
 
   TQWidget *page = plainPage();
-  TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() );
 
   mCfg = new KABC::LdapConfigWidget(
        KABC::LdapConfigWidget::W_USER |
@@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const
        KABC::LdapConfigWidget::W_AUTHBOX,
         page );
 
-  layout->addWidget( mCfg );
+  tqlayout->addWidget( mCfg );
   mCfg->setHost( mServer->host() );
   mCfg->setPort( mServer->port() );
   mCfg->setDn( mServer->baseDN() );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 1c074d397..a7d9ebe6f 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
                                 TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mTitle( title ), mLabel( label )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
   TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                               KDialog::spacingHint() );
 
   mBox = new TQListBox( group );
@@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
   mEditButton->setEnabled( false );
   mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
-  bbox->layout();
+  bbox->tqlayout();
   groupLayout->addWidget( bbox, 0, 1 );
 
-  layout->addWidget( group );
+  tqlayout->addWidget( group );
 }
 
 NamePartWidget::~NamePartWidget()
@@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
 AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this );
-  layout->addWidget( mPrefix, 0, 0 );
+  tqlayout->addWidget( mPrefix, 0, 0 );
 
   mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this );
-  layout->addWidget( mInclusion, 0, 1 );
+  tqlayout->addWidget( mInclusion, 0, 1 );
 
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this );
-  layout->addWidget( mSuffix, 0, 2 );
+  tqlayout->addWidget( mSuffix, 0, 2 );
 
   TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mFormattedNameCombo = new KComboBox( this );
   mFormattedNameCombo->insertItem( i18n( "Empty" ) );
@@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
-  layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
 
   connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
   connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 80f73f469..0758f320c 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC
                  name, true, true ), mWidget( 0 ), mConfig( config )
 {
   TQFrame *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
 
   mWidget = factory->configureWidget( page, "ExtensionConfigWidget" );
-  layout->addWidget( mWidget, 0, 0 );
+  tqlayout->addWidget( mWidget, 0, 0 );
 
   mWidget->restoreSettings( mConfig );
 }
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index e4fea7409..d1888624e 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   // General page
   TQWidget *generalPage = new TQWidget( this );
-  TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
-  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
-  boxLayout->setAlignment( Qt::AlignTop );
+  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
+  boxLayout->tqsetAlignment( Qt::AlignTop );
 
   mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
@@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   editorLayout->addStretch( 1 );
 
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
-  TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
+  TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
   grid->addWidget( label, 0, 0 );
@@ -124,14 +124,14 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   grid->setColStretch( 1, 1 );
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
-  boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
-  boxLayout->setAlignment( Qt::AlignTop );
+  boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
+  boxLayout->tqsetAlignment( Qt::AlignTop );
 
   mLocationMapURL = new TQComboBox( true, groupBox );
-  mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   TQToolTip::add( mLocationMapURL, i18n( "
     
  • %s: Street
    • "
                                  "
  • %r: Region
    • "
                                  "
  • %l: Location
    • "
@@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
                                  "
  • %c: Country ISO Code
    •  
" ) );
   mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() );
   boxLayout->addWidget( mLocationMapURL );
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
   connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 6b516249a..f112c4c89 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -43,9 +43,9 @@ extern "C"
 KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
-  layout->addWidget( mConfigWidget );
+  tqlayout->addWidget( mConfigWidget );
 
   connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
 
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index e899198b5..4cadf2633 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -44,9 +44,9 @@ extern "C"
 KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new LDAPOptionsWidget( this );
-  layout->addWidget( mConfigWidget );
+  tqlayout->addWidget( mConfigWidget );
 
   connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
 
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 3825ac1d8..639cec027 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults()
 
 void LDAPOptionsWidget::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this );
   groupBox->setInsideSpacing( KDialog::spacingHint() );
@@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI()
   TQWidget* spacer = new TQWidget( upDownBox );
   upDownBox->setStretchFactor( spacer, 100 );
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   KButtonBox *buttons = new KButtonBox( this );
   buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
@@ -293,11 +293,11 @@ void LDAPOptionsWidget::initGUI()
   mEditButton->setEnabled( false );
   mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
   mRemoveButton->setEnabled( false );
-  buttons->layout();
+  buttons->tqlayout();
 
-  layout->addWidget( buttons );
+  tqlayout->addWidget( buttons );
 
-  resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) );
+  resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) );
 }
 
 #include "ldapoptionswidget.moc"
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 57558cb46..0e3094521 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -41,25 +41,25 @@
 KeyWidget::KeyWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Keys:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mKeyCombo = new KComboBox( this );
-  layout->addWidget( mKeyCombo, 0, 1 );
+  tqlayout->addWidget( mKeyCombo, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add..." ), this );
-  layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
 
   mExportButton = new TQPushButton( i18n( "Export..." ), this );
   mExportButton->setEnabled( false );
-  layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
+  tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) );
@@ -98,7 +98,7 @@ void KeyWidget::addKey()
   KABC::Key::TypeList::ConstIterator it;
   for ( it = typeList.begin(); it != typeList.end(); ++it ) {
     if ( (*it) != KABC::Key::Custom &&
-         !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
+         !existingKeyTypes.tqcontains( KABC::Key::typeLabel( *it ) ) ) {
       keyMap.insert( KABC::Key::typeLabel( *it ), *it );
       keyTypeNames.append( KABC::Key::typeLabel( *it ) );
     }
@@ -110,7 +110,7 @@ void KeyWidget::addKey()
     return;
 
   int type = keyMap[ name ];
-  if ( !keyTypeNames.contains( name ) )
+  if ( !keyTypeNames.tqcontains( name ) )
     type = KABC::Key::Custom;
 
   KURL url = KFileDialog::getOpenURL();
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index c42ff6693..7074a5966 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
   groupBox->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
 
   TQSize buttonSize;
   mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox );
-  buttonSize = mSearchButton->sizeHint();
+  buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setText( i18n( "&Search" ) );
-  if ( buttonSize.width() < mSearchButton->sizeHint().width() )
-    buttonSize = mSearchButton->sizeHint();
+  if ( buttonSize.width() < mSearchButton->tqsizeHint().width() )
+    buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setFixedWidth( buttonSize.width() );
 
   mSearchButton->setDefault( true );
@@ -208,7 +208,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
 
   topLayout->addWidget( buttons );
 
-  resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) );
 
   setButtonText( User1, i18n( "Add Selected" ) );
 
@@ -560,7 +560,7 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
 KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList& selectedItems,
                                                                        KABC::Resource * const resource )
 {
-    const TQDateTime now = TQDateTime::currentDateTime();
+    const TQDateTime now = TQDateTime::tqcurrentDateTime();
     TQStringList importedAddrs;
     KABC::Addressee::List localAddrs;
 
@@ -569,7 +569,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
     for ( TQValueList::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) {
       const ContactListItem * const cli = *it;
       KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
-      const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
+      const KABC::Addressee::List existing = mCore->addressBook()->tqfindByEmail( addr.preferredEmail() );
 
       if ( existing.isEmpty() ) {
         addr.setUid( KApplication::randomString( 10 ) );
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 3e2191ff9..f713ef4e2 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
                  Ok, parent, name, true ), mAddressee( addr )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page );
-  layout->setSpacing( spacingHint() );
-  layout->addColSpacing( 2, 100 );
+  TQGridLayout *tqlayout = new TQGridLayout( page );
+  tqlayout->setSpacing( spacingHint() );
+  tqlayout->addColSpacing( 2, 100 );
   TQLabel *label;
 
   label = new TQLabel( i18n( "Honorific prefixes:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
   mPrefixCombo = new KComboBox( page );
   mPrefixCombo->setDuplicatesEnabled( false );
   mPrefixCombo->setEditable( true );
   mPrefixCombo->setEnabled( !readOnly );
   label->setBuddy( mPrefixCombo );
-  layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
 
   TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) );
 
   label = new TQLabel( i18n( "Given name:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
   mGivenNameEdit = new KLineEdit( page );
   mGivenNameEdit->setReadOnly( readOnly );
   label->setBuddy( mGivenNameEdit );
-  layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
 
   label = new TQLabel( i18n( "Additional names:" ), page );
-  layout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( label, 2, 0 );
   mAdditionalNameEdit = new KLineEdit( page );
   mAdditionalNameEdit->setReadOnly( readOnly );
   label->setBuddy( mAdditionalNameEdit );
-  layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
 
   label = new TQLabel( i18n( "Family names:" ), page );
-  layout->addWidget( label, 3, 0 );
+  tqlayout->addWidget( label, 3, 0 );
   mFamilyNameEdit = new KLineEdit( page );
   mFamilyNameEdit->setReadOnly( readOnly );
   label->setBuddy( mFamilyNameEdit );
-  layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
+  tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
 
   label = new TQLabel( i18n( "Honorific suffixes:" ), page );
-  layout->addWidget( label, 4, 0 );
+  tqlayout->addWidget( label, 4, 0 );
   mSuffixCombo = new KComboBox( page );
   mSuffixCombo->setDuplicatesEnabled( false );
   mSuffixCombo->setEditable( true );
   mSuffixCombo->setEnabled( !readOnly );
   label->setBuddy( mSuffixCombo );
-  layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
+  tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
 
   TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) );
 
   label = new TQLabel( i18n( "Formatted name:" ), page );
-  layout->addWidget( label, 5, 0 );
+  tqlayout->addWidget( label, 5, 0 );
 
   mFormattedNameCombo = new KComboBox( page );
   mFormattedNameCombo->setEnabled( !readOnly );
-  layout->addWidget( mFormattedNameCombo, 5, 1 );
+  tqlayout->addWidget( mFormattedNameCombo, 5, 1 );
   connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) );
 
   mFormattedNameEdit = new KLineEdit( page );
   mFormattedNameEdit->setEnabled( type == CustomName && !readOnly );
-  layout->addWidget( mFormattedNameEdit, 5, 2 );
+  tqlayout->addWidget( mFormattedNameEdit, 5, 2 );
 
   mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page );
   mParseBox->setEnabled( !readOnly );
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) );
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) );
-  layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
+  tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
 
   // Fill in the values
   mFamilyNameEdit->setText( addr.familyName() );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 71a9f504f..46efcba98 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -68,7 +68,7 @@ PhoneTypeCombo::~PhoneTypeCombo()
 
 void PhoneTypeCombo::setType( int type )
 {
-  if ( !mTypeList.contains( type ) )
+  if ( !mTypeList.tqcontains( type ) )
     mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), type );
 
   mType = type;
@@ -117,7 +117,7 @@ void PhoneTypeCombo::otherSelected()
   PhoneTypeDialog dlg( mType, this );
   if ( dlg.exec() ) {
     mType = dlg.type();
-    if ( !mTypeList.contains( mType ) )
+    if ( !mTypeList.tqcontains( mType ) )
       mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), mType );
   } else {
     setType( mTypeList[ mLastSelected ] );
@@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected()
 PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
 
   mTypeCombo = new PhoneTypeCombo( this );
   mNumberEdit = new KLineEdit( this );
 
-  layout->addWidget( mTypeCombo );
-  layout->addWidget( mNumberEdit );
+  tqlayout->addWidget( mTypeCombo );
+  tqlayout->addWidget( mNumberEdit );
 
   connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
   connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
@@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
 PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mReadOnly( false )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2 );
-  layout->setSpacing( KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
+  tqlayout->setSpacing( KDialog::spacingHint() );
 
-  mWidgetLayout = new TQVBoxLayout( layout );
-  layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
+  mWidgetLayout = new TQVBoxLayout( tqlayout );
+  tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add" ), this );
-  mAddButton->setMaximumSize( mAddButton->sizeHint() );
-  layout->addWidget( mAddButton, 1, 0, Qt::AlignRight );
+  mAddButton->setMaximumSize( mAddButton->tqsizeHint() );
+  tqlayout->addWidget( mAddButton, 1, 0, Qt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
-  mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
-  layout->addWidget( mRemoveButton, 1, 1 );
+  mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() );
+  tqlayout->addWidget( mRemoveButton, 1, 1 );
 
   mMapper = new TQSignalMapper( this );
   connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
@@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
 {
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() );
 
   mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
-  layout->addWidget( mPreferredBox );
+  tqlayout->addWidget( mPreferredBox );
 
   mGroup = new TQButtonGroup( 2, Horizontal, i18n( "Types" ), page );
-  layout->addWidget( mGroup );
+  tqlayout->addWidget( mGroup );
 
   // fill widgets
   mTypeList = KABC::PhoneNumber::typeList();
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 39046481c..4cd597801 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
   mPageAppearance->kcbHeaderTextColor->setColor(
       config->readColorEntry( ContactHeaderForeColor, &Qt::white ) );
 
-  mPageAppearance->layout()->setMargin( KDialog::marginHint() );
-  mPageAppearance->layout()->setSpacing( KDialog::spacingHint() );
+  mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() );
+  mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() );
 }
 
 DetailledPrintStyle::~DetailledPrintStyle()
diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui
index 2fe5ce208..03ca4b58a 100644
--- a/kaddressbook/printing/ds_appearance.ui
+++ b/kaddressbook/printing/ds_appearance.ui
@@ -4,7 +4,7 @@
     
         AppearancePage
     
-    
+    
         
             0
             0
@@ -68,7 +68,7 @@
             
                 false
             
-            
+            
                 AlignVCenter|AlignLeft
             
         
@@ -138,7 +138,7 @@
                             
                                 Details font:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -149,7 +149,7 @@
                             
                                 Size:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -160,7 +160,7 @@
                             
                                 Body font:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -171,7 +171,7 @@
                             
                                 Size:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -182,7 +182,7 @@
                             
                                 Fixed font:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -203,7 +203,7 @@
                             
                                 Size:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -245,7 +245,7 @@
                             
                                 Contact header font:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -274,7 +274,7 @@
                             
                                 Size:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -285,7 +285,7 @@
                             
                                 Size:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -301,7 +301,7 @@
                             
                                 Headlines:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -400,7 +400,7 @@
                             
                                 Headline background color:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -411,7 +411,7 @@
                             
                                 Headline text color:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -475,5 +475,5 @@
         setDisabled(bool)
     
 
-
+
 
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index c7432d5d0..c74e4e410 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -139,7 +139,7 @@ int KABEntryPainter::hits( const QRectList& list, const TQPoint &p )
   int count = 0;
 
   for ( pos = list.begin(); pos != list.end(); ++pos ) {
-    if ( (*pos).contains( p ) )
+    if ( (*pos).tqcontains( p ) )
       return count;
 
     ++count;
@@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   KABC::Address address;
 
   // this is used to prepare some fields for printing and decide about
-  // the layout later:
+  // the tqlayout later:
   TQValueList parts;
   TQValueList contents;
 
@@ -189,7 +189,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   painter->setPen( mBackgroundColor );
   text = addr.realName();
 
-  // replacement for: api->addressbook()->literalName(entry, text);
+  // tqreplacement for: api->addressbook()->literalName(entry, text);
   rect = painter->boundingRect( Ruler1, y, Width, Height,
                                 Qt::AlignVCenter | Qt::AlignLeft, text );
   rect.setHeight( (int)( 1.25 * rect.height() ) );
@@ -241,7 +241,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   if ( !( addr.prefix().isEmpty() ) )
     y += fmBody.lineSpacing() / 2;
 
-  // fill the parts stringlist, it contains "parts" (printable areas)
+  // fill the parts stringlist, it tqcontains "parts" (printable areas)
   // that will be combined to fill the page as effectively as possible:
   // Email addresses:
   if ( !addr.emails().isEmpty() && mShowEmails ) {
@@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
           line1 = i18n( "Preferred Address" );
       }
 
-      line1 += TQString::fromLatin1( ":" );
+      line1 += TQString::tqfromLatin1( ":" );
       text = TQString::null;
 
       if ( !address.extended().isEmpty() )
         text = address.extended().stripWhiteSpace();
 
       if ( !text.isEmpty() ) {
-        line1 = line1 + TQString::fromLatin1( " (" ) + text +
-        TQString::fromLatin1( ")" );
+        line1 = line1 + TQString::tqfromLatin1( " (" ) + text +
+        TQString::tqfromLatin1( ")" );
       }
 
       line1 = line1.stripWhiteSpace();
       line2 = address.street();
       if ( !address.postOfficeBox().isEmpty() )
-        line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox();
+        line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox();
 
       // print address in american style, this will need localisation:
       line3 = address.locality() + ( address.region().isEmpty() ?
-              TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) +
+              TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) +
               address.region() ) + ( address.postalCode().isEmpty()
-              ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " )
+              ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " )
               + address.postalCode() );
       line4 = address.country();
 
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 9ecc57f56..26312ee1c 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font )
   TQFontMetrics fm( font );
 
   TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" )
-                 .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+                 .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
   p.setPen( Qt::black );
   p.drawText( 0, fm.height(), text );
@@ -226,14 +226,14 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
 
   // Determine which half of the fields is higher
   for ( int i = 0; i < numFields / 2; i++ )
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
 
   height = halfHeight;
 
   // now the second half
   halfHeight = 0;
   for ( int i = numFields / 2; i < numFields; i++ )
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
 
   height = QMAX( height, halfHeight );
 
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 2bf6deaf8..8f2e98f20 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -162,7 +162,7 @@ void PrintingWizard::print()
     if ( mSelectionPage->useSelection() ) {
       TQStringList::ConstIterator it;
       for ( it = mSelection.begin(); it != mSelection.end(); ++it ) {
-        KABC::Addressee addr = addressBook()->findByUid( *it );
+        KABC::Addressee addr = addressBook()->tqfindByUid( *it );
         if ( !addr.isEmpty() )
           list.append( addr );
       }
@@ -186,7 +186,7 @@ void PrintingWizard::print()
         const TQStringList tmp( (*it).categories() );
         TQStringList::ConstIterator tmpIt;
         for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
-          if ( categories.contains( *tmpIt ) ) {
+          if ( categories.tqcontains( *tmpIt ) ) {
             list.append( *it );
             break;
           }
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 43aec8cf7..a66ca960e 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name )
   mProgressBar->setProgress( 0 );
   topLayout->addWidget( mProgressBar, 1, 0 );
 
-  resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) );
 }
 
 PrintProgress::~PrintProgress()
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index 3e8bde5f8..e926d0dba 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
   mButtonGroup = new TQButtonGroup( this );
   mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
-  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
+  mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 88e2e71cf..172e7df7c 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -122,9 +122,9 @@ void StylePage::initGUI()
 
   TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
   group->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2,
+  TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->setAlignment( Qt::AlignTop );
+  sortLayout->tqsetAlignment( Qt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), group );
   sortLayout->addWidget( label, 0, 0 );
@@ -142,7 +142,7 @@ void StylePage::initGUI()
 
   group = new TQButtonGroup( i18n( "Print Style" ), this );
   group->setColumnLayout( 0, Qt::Vertical );
-  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(),
+  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
                                               KDialog::spacingHint() );
 
   mStyleCombo = new KComboBox( false, group );
@@ -153,7 +153,7 @@ void StylePage::initGUI()
   font.setPointSize( 20 );
   mPreview->setFont( font );
   mPreview->setScaledContents( true );
-  mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
+  mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
   styleLayout->addWidget( mPreview );
 
   topLayout->addWidget( group, 1, 1 );
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 5a39ddfa7..4db7197a1 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -32,10 +32,10 @@
 SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
   mSecrecyCombo = new KComboBox( this );
-  layout->addWidget( mSecrecyCombo );
+  tqlayout->addWidget( mSecrecyCombo );
 
   const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList();
   KABC::Secrecy::TypeList::ConstIterator it;
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index ca0a9bfde..f94a72d24 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
   TQLabel *label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  label->setAlignment( Qt::AlignTop );
+  label->tqsetAlignment( Qt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   mPlayButton = new TQPushButton( i18n( "Play" ), this );
@@ -77,7 +77,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
   connect( mPlayButton, TQT_SIGNAL( clicked() ),
            TQT_SLOT( playSound() ) );
 
-  TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) );
+  TQWhatsThis::add( this, i18n( "This field stores a sound file which tqcontains the name of the contact to clarify the pronunciation." ) );
   TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) );
 }
 
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 3de0220f0..6a8e495d5 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -130,7 +130,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
   TQStringList phoneNumbers;
   for (unsigned int no=0; no::updateTypes()
     int type = ( mTypeList[ i ].type() & ~( T::Pref ) );
     TQString label = mTypeList[ i ].typeLabel( type );
     int count = 1;
-    if ( labelCount.contains( type ) ) {
+    if ( labelCount.tqcontains( type ) ) {
       count = labelCount[ type ] + 1;
     }
     labelCount[ type ] = count;
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 0f6e555d4..bd26270fa 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -84,7 +84,7 @@ void DeleteCommand::execute()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( mUIDList.end() );
   for ( it = mUIDList.begin(); it != endIt; ++it ) {
-    addr = addressBook()->findByUid( *it );
+    addr = addressBook()->tqfindByUid( *it );
     lock()->lock( addr.resource() );
     mAddresseeList.append( addr );
     AddresseeConfig cfg( addr );
@@ -273,7 +273,7 @@ void CutCommand::execute()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( mUIDList.end() );
   for ( it = mUIDList.begin(); it != endIt; ++it ) {
-    addr = addressBook()->findByUid( *it );
+    addr = addressBook()->tqfindByUid( *it );
     mAddresseeList.append( addr );
     lock()->lock( addr.resource() );
   }
@@ -332,7 +332,7 @@ void CopyToCommand::execute()
   TQStringList::Iterator it( mUIDList.begin() );
   const TQStringList::Iterator endIt( mUIDList.end() );
   while ( it != endIt ) {
-    KABC::Addressee addr = addressBook()->findByUid( *it++ );
+    KABC::Addressee addr = addressBook()->tqfindByUid( *it++ );
     if ( !addr.isEmpty() ) {
       KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
@@ -379,7 +379,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
     TQStringList::Iterator it( mUIDList.begin() );
     const TQStringList::Iterator endIt( mUIDList.end() );
     while ( it != endIt ) {
-        KABC::Addressee addr = addressBook()->findByUid( *it++ );
+        KABC::Addressee addr = addressBook()->tqfindByUid( *it++ );
         if ( !addr.isEmpty() ) {
             KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index f83a8c925..453f47587 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -262,16 +262,16 @@ void ViewConfigureFieldsPage::initGUI()
   vb2->addStretch();
   gl->addLayout( vb2, 1, 3 );
 
-  TQSize sizeHint = mUnSelectedBox->sizeHint();
+  TQSize tqsizeHint = mUnSelectedBox->tqsizeHint();
 
   // make sure we fill the list with all items, so that we can
   // get the maxItemWidth we need to not truncate the view
   slotShowFields( 0 );
 
-  sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() );
-  sizeHint.setWidth( mUnSelectedBox->maxItemWidth() );
-  mUnSelectedBox->setMinimumSize( sizeHint );
-  mSelectedBox->setMinimumSize( sizeHint );
+  tqsizeHint = tqsizeHint.expandedTo( mSelectedBox->tqsizeHint() );
+  tqsizeHint.setWidth( mUnSelectedBox->maxItemWidth() );
+  mUnSelectedBox->setMinimumSize( tqsizeHint );
+  mSelectedBox->setMinimumSize( tqsizeHint );
 
   gl->activate();
 
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 7a07b050b..923743f85 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent,
   " this view is displayed. This feature allows you to configure views that only"
   " interact with certain types of information based on the filter. Once the view"
   " is activated, the filter can be changed at anytime." ), this );
-  label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
+  label->tqsetAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
   topLayout->addWidget( label );
 
   TQWidget *spacer = new TQWidget( this );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 5dab74e25..46eb653b5 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -133,7 +133,7 @@ KABC::Addressee::List ViewManager::selectedAddressees() const
   const TQStringList uids = selectedUids();
   TQStringList::ConstIterator it;
   for ( it = uids.begin(); it != uids.end(); ++it ) {
-    KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
+    KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it );
     if ( !addr.isEmpty() )
       list.append( addr );
   }
@@ -342,7 +342,7 @@ void ViewManager::addView()
     // Check for name conflicts
     bool firstConflict = true;
     int numTries = 1;
-    while ( mViewNameList.contains( newName ) > 0 ) {
+    while ( mViewNameList.tqcontains( newName ) > 0 ) {
       if ( !firstConflict ) {
         newName = newName.left( newName.length() - 4 );
         firstConflict = false;
@@ -436,7 +436,7 @@ void ViewManager::dropped( TQDropEvent *e )
   } else if ( KVCardDrag::decode( e, list ) ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
-      KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() );
+      KABC::Addressee a = mCore->addressBook()->tqfindByUid( (*it).uid() );
       if ( a.isEmpty() ) { // not yet in address book
         mCore->addressBook()->insertAddressee( *it );
         emit modified();
@@ -459,7 +459,7 @@ void ViewManager::startDrag()
 
   TQStringList::ConstIterator it;
   for ( it = uidList.begin(); it != uidList.end(); ++it )
-    addrList.append( mCore->addressBook()->findByUid( *it ) );
+    addrList.append( mCore->addressBook()->tqfindByUid( *it ) );
 
   KMultipleDrag *drag = new KMultipleDrag( this );
 
@@ -601,9 +601,9 @@ void ViewManager::initActions()
 
 void ViewManager::initGUI()
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
   mViewWidgetStack = new TQWidgetStack( this );
-  layout->addWidget( mViewWidgetStack );
+  tqlayout->addWidget( mViewWidgetStack );
 }
 
 #include "viewmanager.moc"
diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am
index 39db0f589..98cf458ad 100644
--- a/kaddressbook/views/Makefile.am
+++ b/kaddressbook/views/Makefile.am
@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
                                  configurecardviewdialog.cpp \
                                  kaddressbookcardview.cpp
 libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
 
 libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
 libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
 
 libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
                                   contactlistview.cpp \
                                   kaddressbooktableview.cpp
 libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
 
 noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
                  configuretableviewdialog.h contactlistview.h \
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 6e7d71d67..5c8ccf827 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -107,9 +107,9 @@ class CardViewSeparator
                    cg.brush(TQColorGroup::Button) );
     }
 
-    void repaintSeparator()
+    void tqrepaintSeparator()
     {
-      mView->repaintContents( mRect );
+      mView->tqrepaintContents( mRect );
     }
 
   private:
@@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const
   for ( iter.toFirst(); iter.current(); ++iter ) {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
-    lines = QMIN( (*iter)->second.contains( '\n' ) + 1, maxLines );
+    lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;
   }
 
@@ -448,16 +448,16 @@ CardViewItem *CardViewItem::nextItem() const
   return item;
 }
 
-void CardViewItem::repaintCard()
+void CardViewItem::tqrepaintCard()
 {
   if ( mView )
-    mView->repaintItem( this );
+    mView->tqrepaintItem( this );
 }
 
 void CardViewItem::setCaption( const TQString &caption )
 {
   d->mCaption = caption;
-  repaintCard();
+  tqrepaintCard();
 }
 
 TQString CardViewItem::fieldValue( const TQString &label ) const
@@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     Field *_f;
     for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() )
       if ( se || ! _f->second.isEmpty() )
-        y += ( QMIN( _f->second.contains( '\n' ) + 1, maxLines ) * fh ) + 2;
+        y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
 
     if ( isLabel && itempos.y() > y + fh )
       return;
@@ -521,7 +521,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
       trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
     } else {
       TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height() / fh >  QMIN( s.contains( '\n' ) + 1, maxLines );
+      trimmed = r.width() > mw || r.height() / fh >  QMIN( s.tqcontains( '\n' ) + 1, maxLines );
     }
   }
 
@@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
   Field *f;
   for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) {
     if ( showEmpty || !f->second.isEmpty() )
-      ypos += (QMIN( f->second.contains( '\n' )+1, maxLines ) * fh) + 2;
+      ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
     if ( iy <= ypos )
       break;
   }
@@ -653,9 +653,9 @@ void CardView::setCurrentItem( CardViewItem *item )
     CardViewItem *it = d->mCurrentItem;
     d->mCurrentItem = item;
     if ( it )
-      it->repaintCard();
+      it->tqrepaintCard();
 
-    item->repaintCard();
+    item->tqrepaintCard();
   }
 
   if ( ! d->mOnSeparator )
@@ -671,7 +671,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
   bool found = false;
   for ( iter.toFirst(); iter.current() && !found; ++iter ) {
     item = *iter;
-    if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).contains( viewPos ) )
+    if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).tqcontains( viewPos ) )
       found = true;
   }
 
@@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
   return 0;
 }
 
-TQRect CardView::itemRect( const CardViewItem *item ) const
+TQRect CardView::tqitemRect( const CardViewItem *item ) const
 {
   return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 }
@@ -692,9 +692,9 @@ void CardView::ensureItemVisible( const CardViewItem *item )
   ensureVisible( item->d->x + d->mItemWidth, item->d->y, d->mItemSpacing, 0 );
 }
 
-void CardView::repaintItem( const CardViewItem *item )
+void CardView::tqrepaintItem( const CardViewItem *item )
 {
-  repaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) );
+  tqrepaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) );
 }
 
 void CardView::setSelectionMode( CardView::SelectionMode mode )
@@ -716,7 +716,7 @@ void CardView::selectAll( bool state )
     for ( iter.toFirst(); iter.current(); ++iter ) {
       if ( (*iter)->isSelected() ) {
         (*iter)->setSelected( false );
-        (*iter)->repaintCard();
+        (*iter)->tqrepaintCard();
       }
     }
 
@@ -743,7 +743,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
     CardViewItem *it = d->mCurrentItem;
     d->mCurrentItem = item;
     if ( it )
-      it->repaintCard();
+      it->tqrepaintCard();
   }
 
   if ( d->mSelectionMode == CardView::Single ) {
@@ -754,7 +754,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
 
     if ( selected ) {
       item->setSelected( selected );
-      item->repaintCard();
+      item->tqrepaintCard();
       emit selectionChanged();
       emit selectionChanged( item );
     } else {
@@ -763,7 +763,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
     }
   } else if ( d->mSelectionMode == CardView::Multi ) {
     item->setSelected( selected );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
     bool b = signalsBlocked();
@@ -772,7 +772,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
     blockSignals( b );
 
     item->setSelected( selected );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged();
   }
 }
@@ -860,7 +860,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
     item = *iter;
     cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 
-    if ( clipRect.intersects( cardRect ) || clipRect.contains( cardRect ) ) {
+    if ( clipRect.intersects( cardRect ) || clipRect.tqcontains( cardRect ) ) {
       // Tell the card to paint
       p->save();
       p->translate( cardRect.x(), cardRect.y() );
@@ -875,7 +875,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
     sep = *sepIter;
     sepRect = sep->mRect;
 
-    if ( clipRect.intersects( sepRect ) || clipRect.contains( sepRect ) ) {
+    if ( clipRect.intersects( sepRect ) || clipRect.tqcontains( sepRect ) ) {
       p->save();
       p->translate( sepRect.x(), sepRect.y() );
       sep->paintSeparator( p, cg );
@@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event )
 
 void CardView::calcLayout()
 {
-  // Start in the upper left corner and layout all the
+  // Start in the upper left corner and tqlayout all the
   // cars using their height and width
   int maxWidth = 0;
   int maxHeight = 0;
@@ -1048,12 +1048,12 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
     blockSignals( b );
 
     item->setSelected( true );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged( item );
   } else if ( d->mSelectionMode == CardView::Multi ) {
     // toggle the selection
     item->setSelected( !item->isSelected() );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
     if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ShiftButton) ) {
@@ -1079,13 +1079,13 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       for ( ; from <= to; from++ ) {
         aItem = d->mItemList.at( from );
         aItem->setSelected( s );
-        repaintItem( aItem );
+        tqrepaintItem( aItem );
       }
 
       emit selectionChanged();
     } else if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ControlButton) ) {
       item->setSelected( !item->isSelected() );
-      item->repaintCard();
+      item->tqrepaintCard();
       emit selectionChanged();
     } else if ( e->button() & Qt::LeftButton ) {
       bool b = signalsBlocked();
@@ -1094,7 +1094,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       blockSignals( b );
 
       item->setSelected( true );
-      item->repaintCard();
+      item->tqrepaintCard();
       emit selectionChanged();
     }
   }
@@ -1202,13 +1202,13 @@ void CardView::focusInEvent( TQFocusEvent* )
   if ( !d->mCurrentItem && d->mItemList.count() )
     setCurrentItem( d->mItemList.first() );
   else if ( d->mCurrentItem )
-    d->mCurrentItem->repaintCard();
+    d->mCurrentItem->tqrepaintCard();
 }
 
 void CardView::focusOutEvent( TQFocusEvent* )
 {
   if ( d->mCurrentItem )
-    d->mCurrentItem->repaintCard();
+    d->mCurrentItem->tqrepaintCard();
 }
 
 void CardView::keyPressEvent( TQKeyEvent *e )
@@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
       break;
     case Key_Menu:
       emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal(
-                                 itemRect(d->mCurrentItem).center() ) );
+                                 tqitemRect(d->mCurrentItem).center() ) );
       break;
     default:
       if ( (e->state() & ControlButton) && e->key() == Key_A ) {
@@ -1363,7 +1363,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
         for ( ; from <= to; from++ ) {
           item = d->mItemList.at( from );
           item->setSelected( s );
-          repaintItem( item );
+          tqrepaintItem( item );
         }
 
         emit selectionChanged();
@@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty )
 {
   if ( d->mLayoutDirty != dirty ) {
     d->mLayoutDirty = dirty;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled )
 {
   if ( enabled != d->mDrawCardBorder ) {
     d->mDrawCardBorder = enabled;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled )
 {
   if ( enabled != d->mDrawFieldLabels ) {
     d->mDrawFieldLabels = enabled;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -1462,7 +1462,7 @@ void CardView::tryShowFullText()
   CardViewItem *item = itemAt( cpos );
   if ( item ) {
     // query it for a value to display
-    TQPoint ipos = cpos - itemRect( item ).topLeft();
+    TQPoint ipos = cpos - tqitemRect( item ).topLeft();
     item->showFullString( ipos, d->mTip );
   }
 }
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 5ab75e6ca..a5410419a 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -87,10 +87,10 @@ class CardViewItem
     virtual void paintCard( TQPainter *p, TQColorGroup &cg );
 
     /**
-      Repaints the card. This is done by sending a repaint event to the
+      Repaints the card. This is done by sending a tqrepaint event to the
       view with the clip rect defined as this card.
      */
-    virtual void repaintCard();
+    virtual void tqrepaintCard();
 
     /**
       Adds a field to the card.
@@ -244,7 +244,7 @@ class CardView : public QScrollView
     /**
       @return The bounding rect of the given item.
      */
-    TQRect itemRect( const CardViewItem *item ) const;
+    TQRect tqitemRect( const CardViewItem *item ) const;
 
     /**
       Ensures that the given item is in the viewable area of the widget
@@ -254,7 +254,7 @@ class CardView : public QScrollView
     /**
       Repaints the given item.
      */
-    void repaintItem( const CardViewItem *item );
+    void tqrepaintItem( const CardViewItem *item );
 
     enum SelectionMode { Single, Multi, Extended, NoSelection };
 
@@ -515,7 +515,7 @@ class CardView : public QScrollView
     void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph );
 
     /**
-      Sets the layout to dirty and repaints.
+      Sets the tqlayout to dirty and tqrepaints.
      */
     void resizeEvent( TQResizeEvent* );
 
@@ -525,13 +525,13 @@ class CardView : public QScrollView
     void contentsWheelEvent( TQWheelEvent* );
 
     /**
-      Sets the layout to dirty and calls for a repaint.
+      Sets the tqlayout to dirty and calls for a tqrepaint.
      */
     void setLayoutDirty( bool dirty );
 
     /**
       Does the math based on the bounding rect of the cards to properly
-      lay the cards out on the screen. This is only done if the layout is
+      lay the cards out on the screen. This is only done if the tqlayout is
       marked as dirty.
      */
     void calcLayout();
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index ed7cfda1f..919e49878 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   c = KGlobalSettings::baseColor();
   lbColors->insertItem( new ColorListItem( i18n("Background Color"),
         config->readColorEntry( "BackgroundColor", &c ) ) );
-  c = colorGroup().foreground();
+  c = tqcolorGroup().foreground();
   lbColors->insertItem( new ColorListItem( i18n("Text Color"),
         config->readColorEntry( "TextColor", &c ) ) );
-  c = colorGroup().button();
+  c = tqcolorGroup().button();
   lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"),
         config->readColorEntry( "HeaderColor", &c ) ) );
-  c = colorGroup().buttonText();
+  c = tqcolorGroup().buttonText();
   lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
         config->readColorEntry( "HeaderTextColor", &c ) ) );
-  c = colorGroup().highlight();
+  c = tqcolorGroup().highlight();
   lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
         config->readColorEntry( "HighlightColor", &c ) ) );
-  c = colorGroup().highlightedText();
+  c = tqcolorGroup().highlightedText();
   lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"),
         config->readColorEntry( "HighlightedTextColor", &c ) ) );
 
@@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
   enableFonts();
 
-  // layout
+  // tqlayout
   sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) );
   sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) );
   sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) );
@@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config )
     config->writeEntry( "TextFont", lTextFont->font() );
     config->writeEntry( "HeaderFont", lHeaderFont->font() );
   }
-  // layout
+  // tqlayout
   config->writeEntry( "ItemMargin", sbMargin->value() );
   config->writeEntry( "ItemSpacing", sbSpacing->value() );
   config->writeEntry( "SeparatorWidth", sbSepWidth->value() );
@@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI()
   TQTabWidget *tabs = new TQTabWidget( this );
 
   // Layout
-  TQVBox *loTab = new TQVBox( this, "layouttab" );
+  TQVBox *loTab = new TQVBox( this, "tqlayouttab" );
 
   loTab->setSpacing( spacing );
   loTab->setMargin( margin );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index c79ef5244..d65f42d38 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config )
 
 void LookAndFeelPage::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
 
   TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
                                          i18n("Row Separator"), this);
-  layout->addWidget(group);
+  tqlayout->addWidget(group);
 
   mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"),
                                       group, "mAlternateButton");
@@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI()
 
   // Background Checkbox/Selector
   TQHBoxLayout *backgroundLayout = new TQHBoxLayout();
-  layout->addLayout(backgroundLayout);
+  tqlayout->addLayout(backgroundLayout);
 
   mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
                                  "mBackgroundBox");
@@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI()
   // ToolTip Checkbox
   mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this,
                               "mToolTipBox");
-  layout->addWidget(mToolTipBox);
+  tqlayout->addWidget(mToolTipBox);
 #if KDE_IS_VERSION(3,2,90)
   mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" );
-  layout->addWidget( mIMPresenceBox );
+  tqlayout->addWidget( mIMPresenceBox );
 #endif
 }
 
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 58bac86d3..2e3378b4c 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -58,7 +58,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
 };
 
 /**
-  Internal class. It is only defined here for moc
+  Internal class. It is only defined here for tqmoc
 */
 class LookAndFeelPage : public QWidget
 {
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 0bc7c041d..5b9ecbf11 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *parent)
 
 void DynamicTip::maybeTip( const TQPoint &pos )
 {
-  if (!parentWidget()->inherits( "ContactListView" ))
+  if (!tqparentWidget()->inherits( "ContactListView" ))
     return;
 
-  ContactListView *plv = (ContactListView*)parentWidget();
+  ContactListView *plv = (ContactListView*)tqparentWidget();
   if (!plv->tooltips())
     return;
 
@@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
     return;
 
   TQString s;
-  TQRect r = plv->itemRect( lvi );
+  TQRect r = plv->tqitemRect( lvi );
   r.moveBy( posVp.x(), posVp.y() );
 
     //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()
@@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
         linew += fm.width( notes[i] );
 
       if ( lastSpace >= a && notes[i] != '\n' )
-        if  (linew >= parentWidget()->width()) {
+        if  (linew >= tqparentWidget()->width()) {
           doBreak = true;
           if ( lastSpace > a ) {
             i = lastSpace;
@@ -222,7 +222,7 @@ void ContactListViewItem::refresh()
   }
 
   // Update our addressee, since it may have changed elsewhere
-  mAddressee = mDocument->findByUid(mAddressee.uid());
+  mAddressee = mDocument->tqfindByUid(mAddressee.uid());
   if (mAddressee.isEmpty())
     return;
 
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 7ba89a0ed..2f0c859c5 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->findByUid( mAddressee.uid() );
+      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() ) {
         clearFields();
@@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem
         const KABC::Field::List::ConstIterator endIt( mFields.end() );
         for ( ; it != endIt; ++it ) {
           // insert empty fields or not? not doing so saves a bit of memory and CPU
-          // (during geometry calculations), but prevents having equally
+          // (during tqgeometry calculations), but prevents having equally
           // wide label columns in all cards, unless CardViewItem/CardView search
           // globally for the widest label. (anders)
 
@@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
 {
   mShowEmptyFields = false;
 
-  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
 
   mCardView = new AddresseeCardView( viewWidget(), "mCardView" );
   mCardView->setSelectionMode( CardView::Extended );
-  layout->addWidget( mCardView );
+  tqlayout->addWidget( mCardView );
 
   // Connect up the signals
   connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 6d02acf73..58b4a3409 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->findByUid( mAddressee.uid() );
+      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() )
         setText( mAddressee.givenName() + " " + mAddressee.familyName() );
@@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
                                             TQWidget *parent, const char *name)
   : KAddressBookView( core, parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
 
   mIconView = new AddresseeIconView( viewWidget(), "mIconView" );
-  layout->addWidget( mIconView );
+  tqlayout->addWidget( mIconView );
 
   // Connect up the signals
   connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 7f822ae4d..89caa0455 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config )
   if ( config->readBoolEntry( "Background", false ) )
     mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) );
 
-  // Restore the layout of the listview
+  // Restore the tqlayout of the listview
   mListView->restoreLayout( config, config->group() );
 }
 
@@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid )
 
     // Sometimes the background pixmap gets messed up when we add lots
     // of items.
-    mListView->repaint();
+    mListView->tqrepaint();
 
     if ( currentItem ) {
       mListView->setCurrentItem( currentItem );
diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index 5aebc23f2..f88d91d19 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
          $(top_builddir)/libkdepim/libkdepim.la
 
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) \
                                     $(top_builddir)/kaddressbook/libkaddressbook.la \
                                     $(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la
 
 libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 noinst_HEADERS = csvimportdialog.h
 
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index b1ee94047..52286d3b7 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
       return true;
 
   if( TQFileInfo(url.path()).exists() ) {                                                                                                   
-      if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)        
+      if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)        
         return false;                                                                                                                      
   }
 
@@ -58,7 +58,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       TQString txt = i18n( "Unable to open file %1.%2." );
-      KMessageBox::error( parentWidget(), txt.arg( url.url() )
+      KMessageBox::error( tqparentWidget(), txt.arg( url.url() )
                           .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
@@ -66,19 +66,19 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
   } else {
     TQFile file( url.path() );
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "Unable to open file %1." );
-      KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
+      KMessageBox::error( tqparentWidget(), txt.arg( url.path() ) );
       return false;
     }
 
     doExport( &file, list );
     file.close();
 
-    KMessageBox::information( parentWidget(), i18n( "The contacts have been exported successfully." ) );
+    KMessageBox::information( tqparentWidget(), i18n( "The contacts have been exported successfully." ) );
 
     return true;
   }
@@ -86,7 +86,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
 
 KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
 {
-  CSVImportDialog dlg( addressBook(), parentWidget() );
+  CSVImportDialog dlg( addressBook(), tqparentWidget() );
   if ( dlg.exec() )
     return dlg.contacts();
   else
@@ -123,7 +123,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
       if ( !first )
         t << ",";
 
-      t << "\"" << (*fieldIter)->value( addr ).replace( "\n", "\\n" ) << "\"";
+      t << "\"" << (*fieldIter)->value( addr ).tqreplace( "\n", "\\n" ) << "\"";
       first = false;
     }
 
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index bbcd74d2a..36f760540 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -367,7 +367,7 @@ void CSVImportDialog::initGUI()
 {
   mPage = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(),
                                          spacingHint() );
   TQHBoxLayout *hbox = new TQHBoxLayout();
   hbox->setSpacing( spacingHint() );
@@ -379,16 +379,16 @@ void CSVImportDialog::initGUI()
   mUrlRequester->setFilter( "*.csv" );
   hbox->addWidget( mUrlRequester );
 
-  layout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
+  tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
 
   // Delimiter: comma, semicolon, tab, space, other
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
   mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
-  mDelimiterBox->layout()->setSpacing( spacingHint() );
-  mDelimiterBox->layout()->setMargin( marginHint() );
-  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
-  delimiterLayout->setAlignment( Qt::AlignTop );
-  layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
+  mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
+  mDelimiterBox->tqlayout()->setMargin( marginHint() );
+  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
+  delimiterLayout->tqsetAlignment( Qt::AlignTop );
+  tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
 
   mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox );
   mRadioComma->setChecked( true );
@@ -411,13 +411,13 @@ void CSVImportDialog::initGUI()
 
   mComboLine = new TQComboBox( false, mPage );
   mComboLine->insertItem( i18n( "1" ) );
-  layout->addWidget( mComboLine, 2, 3 );
+  tqlayout->addWidget( mComboLine, 2, 3 );
 
   mComboQuote = new TQComboBox( false, mPage );
   mComboQuote->insertItem( i18n( "\"" ), 0 );
   mComboQuote->insertItem( i18n( "'" ), 1 );
   mComboQuote->insertItem( i18n( "None" ), 2 );
-  layout->addWidget( mComboQuote, 2, 2 );
+  tqlayout->addWidget( mComboQuote, 2, 2 );
 
   mDatePatternEdit = new TQLineEdit( mPage );
   mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default
@@ -427,28 +427,28 @@ void CSVImportDialog::initGUI()
                                          "
  • M: month with 2 digits
    • "
                                          "
  • d: day with 1 or 2 digits
    • "
                                          "
  • D: day with 2 digits
    • " ) );
-  layout->addWidget( mDatePatternEdit, 2, 4 );
+  tqlayout->addWidget( mDatePatternEdit, 2, 4 );
 
   label = new TQLabel( i18n( "Start at line:" ), mPage );
-  layout->addWidget( label, 1, 3 );
+  tqlayout->addWidget( label, 1, 3 );
 
   label = new TQLabel( i18n( "Textquote:" ), mPage );
-  layout->addWidget( label, 1, 2 );
+  tqlayout->addWidget( label, 1, 2 );
 
   label = new TQLabel( i18n( "Date format:" ), mPage );
-  layout->addWidget( label, 1, 4 );
+  tqlayout->addWidget( label, 1, 4 );
 
   mIgnoreDuplicates = new TQCheckBox( mPage );
   mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
-  layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
+  tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
 
   mCodecCombo = new TQComboBox( mPage );
-  layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
+  tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
 
   mTable = new TQTable( 0, 0, mPage );
   mTable->setSelectionMode( TQTable::NoSelection );
   mTable->horizontalHeader()->hide();
-  layout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
+  tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
 
   setButtonText( User1, i18n( "Apply Template..." ) );
   setButtonText( User2, i18n( "Save Template..." ) );
@@ -854,7 +854,7 @@ void CSVImportDialog::saveTemplate()
   if ( fileName.isEmpty() )
     return;
 
-  if ( !fileName.contains( ".desktop" ) )
+  if ( !fileName.tqcontains( ".desktop" ) )
     fileName += ".desktop";
 
   if( TQFileInfo(fileName).exists() ) {                                                                                                   
diff --git a/kaddressbook/xxport/dateparser.h b/kaddressbook/xxport/dateparser.h
index 3087d339a..569969515 100644
--- a/kaddressbook/xxport/dateparser.h
+++ b/kaddressbook/xxport/dateparser.h
@@ -29,7 +29,7 @@
 /**
   This class parses the date out of a given string with the
   help of a pattern.
-  The pattern can contains the following key characters:
+  The pattern can tqcontains the following key characters:
     y = year (e.g. 82)
     Y = year (e.g. 1982)
     m = month (e.g. 7, 07 or 12)
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index c6bd0917d..faf527073 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -173,9 +173,9 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 
 static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 {
-	TQString format = TQString::fromLatin1("%1%2");
+	TQString format = TQString::tqfromLatin1("%1%2");
 
-	return TQString::fromLatin1("%1
    %2%3%4%5%6

    ")
+	return TQString::tqfromLatin1("%1
    %2%3%4%5%6

    ")
 		.arg(i18n("Mobile Phone information:"))
 		.arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
 		.arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
@@ -272,7 +272,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		TQDateTime datetime;
 		gn_timestamp ts = gn_lib_get_pb_date(state);
 		if (ts.year<1998)
-			datetime = TQDateTime::currentDateTime();
+			datetime = TQDateTime::tqcurrentDateTime();
 		else
 			datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day),
 							  TQTime(ts.hour, ts.minute, ts.second) );
@@ -481,14 +481,14 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		if (Addr->isEmpty()) continue;
 		TQStringList a;
 		TQChar sem(';');
-		TQString sem_repl(TQString::fromLatin1(","));
-      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
-		a.append( Addr->extended()     .replace( sem, sem_repl ) );
-		a.append( Addr->street()       .replace( sem, sem_repl ) );
-		a.append( Addr->locality()     .replace( sem, sem_repl ) );
-		a.append( Addr->region()       .replace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
-		a.append( Addr->country()      .replace( sem, sem_repl ) );
+		TQString sem_repl(TQString::tqfromLatin1(","));
+      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
+		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
+		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
 		s = a.join(sem);
 		gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
 			GN_PHONEBOOK_ENTRY_Postal, GN_PHONEBOOK_NUMBER_General, GN_TO(s));
@@ -528,7 +528,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
 	KABC::AddresseeList addrList;
 
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("Please connect your Mobile Phone to your computer and press "
 		     "Continue to start importing the personal contacts.

    "
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -536,7 +536,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
                      "KAddressbook will behave unresponsively.    ") ))
 	  return addrList;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Import"),
 		i18n("
    Establishing connection to the Mobile Phone.

    "
 		     "Please wait...
    ") );
@@ -555,7 +555,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return addrList;
 	}
@@ -577,7 +577,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 
 bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
 {
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("Please connect your Mobile Phone to your computer and press "
 		     "Continue to start exporting the selected personal contacts.

    "
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -585,7 +585,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 		     "KAddressbook will behave unresponsively.    ") ))
 	  return false;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Export"),
 		i18n("
    Establishing connection to the Mobile Phone.

    "
 		     "Please wait...
    ") );
@@ -612,7 +612,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return false;
 	}
@@ -641,11 +641,11 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	phone_count = memstat.used;
 
 	if (memstat.free >= (int) list.count()) {
-		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
+		if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(),
 			i18n("Do you want the selected contacts to be appended to "
-			     "the current mobile phonebook or should they replace all "
+			     "the current mobile phonebook or should they tqreplace all "
 			     "currently existing phonebook entries ?

    "
-			     "Please note, that in case you choose to replace the phonebook "
+			     "Please note, that in case you choose to tqreplace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
 			     "the newly exported contacts will be available from inside your phone.    "),
 			i18n("Export to Mobile Phone"),
@@ -760,7 +760,7 @@ finish:
 
 	if (!failedList.isEmpty()) {
 		GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
-		KMessageBox::informationList(parentWidget(),
+		KMessageBox::informationList(tqparentWidget(),
                         i18n("The following contacts could not be exported to the Mobile Phone. "
 			     "Possible Reasons for this problem could be:
      "
 			     "
    • The contacts contain more information per entry than the phone can store.
      • "
@@ -827,7 +827,7 @@ static TQString businit(void)
 		return i18n("Gnokii is not yet configured.");
 
 	// uncomment to debug all gnokii communication on stderr.
-	// gn_log_debug_mask = GN_LOG_T_STDERR;
+	// gn_log_debug_tqmask = GN_LOG_T_STDERR;
 
 	gn_data_clear(&data);
 
@@ -947,9 +947,9 @@ static bool phone_entry_empty( const int index, const gn_memory_type memtype )
 
 static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 {
-	TQString format = TQString::fromLatin1("%1%2");
+	TQString format = TQString::tqfromLatin1("%1%2");
 
-	return TQString::fromLatin1("%1
      %2%3%4%5%6

      ")
+	return TQString::tqfromLatin1("%1
      %2%3%4%5%6

      ")
 		.arg(i18n("Mobile Phone information:"))
 		.arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
 		.arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
@@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// evaluate timestamp (ignore timezone)
 		TQDateTime datetime;
 		if (entry.date.year<1998)
-			datetime = TQDateTime::currentDateTime();
+			datetime = TQDateTime::tqcurrentDateTime();
 		else
 			datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day),
 							  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
@@ -1267,14 +1267,14 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		subentry->entry_type  = GN_PHONEBOOK_ENTRY_Postal;
 		TQStringList a;
 		TQChar sem(';');
-		TQString sem_repl(TQString::fromLatin1(","));
-      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
-		a.append( Addr->extended()     .replace( sem, sem_repl ) );
-		a.append( Addr->street()       .replace( sem, sem_repl ) );
-		a.append( Addr->locality()     .replace( sem, sem_repl ) );
-		a.append( Addr->region()       .replace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
-		a.append( Addr->country()      .replace( sem, sem_repl ) );
+		TQString sem_repl(TQString::tqfromLatin1(","));
+      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
+		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
+		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
 		s = a.join(sem);
 		strncpy(subentry->data.number, GN_TO(s), sizeof(subentry->data.number)-1);
 		entry.subentries_count++;
@@ -1323,7 +1323,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
 	KABC::AddresseeList addrList;
 
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("Please connect your Mobile Phone to your computer and press "
 		     "Continue to start importing the personal contacts.

      "
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -1331,7 +1331,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
                      "KAddressbook will behave unresponsively.      ") ))
 	  return addrList;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Import"),
 		i18n("
      Establishing connection to the Mobile Phone.

      "
 		     "Please wait...
      ") );
@@ -1350,7 +1350,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return addrList;
 	}
@@ -1372,7 +1372,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 
 bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
 {
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("Please connect your Mobile Phone to your computer and press "
 		     "Continue to start exporting the selected personal contacts.

      "
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -1380,7 +1380,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 		     "KAddressbook will behave unresponsively.      ") ))
 	  return false;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Export"),
 		i18n("
      Establishing connection to the Mobile Phone.

      "
 		     "Please wait...
      ") );
@@ -1407,7 +1407,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return false;
 	}
@@ -1436,11 +1436,11 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	phone_count = memstat.used;
 
 	if (memstat.free >= (int) list.count()) {
-		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
+		if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(),
 			i18n("Do you want the selected contacts to be appended to "
-			     "the current mobile phonebook or should they replace all "
+			     "the current mobile phonebook or should they tqreplace all "
 			     "currently existing phonebook entries ?

      "
-			     "Please note, that in case you choose to replace the phonebook "
+			     "Please note, that in case you choose to tqreplace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
 			     "the newly exported contacts will be available from inside your phone.      "),
 			i18n("Export to Mobile Phone"),
@@ -1555,7 +1555,7 @@ finish:
 
 	if (!failedList.isEmpty()) {
 		GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
-		KMessageBox::informationList(parentWidget(),
+		KMessageBox::informationList(tqparentWidget(),
                         i18n("The following contacts could not be exported to the Mobile Phone. "
 			     "Possible Reasons for this problem could be:
        "
 			     "
      • The contacts contain more information per entry than the phone can store.
        • "
@@ -1583,7 +1583,7 @@ finish:
 KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
 	KABC::AddresseeList addrList;
-	KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
+	KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n"
 		"Please ask your distributor to add gnokii at compile time."));
 	return addrList;
 }
@@ -1591,7 +1591,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
 {
 	Q_UNUSED(list);
-	KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
+	KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n"
 		"Please ask your distributor to add gnokii at compile time."));
 	return true;
 }
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 92a311023..fb03e2c32 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -49,11 +49,11 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
 {
   TQString fileName = locateLocal( "data", "kabc/std.vcf" );
   if ( !TQFile::exists( fileName ) ) {
-    KMessageBox::sorry( parentWidget(), i18n( "Could not find a KDE 2 address book %1." ).arg( fileName ) );
+    KMessageBox::sorry( tqparentWidget(), i18n( "Could not find a KDE 2 address book %1." ).arg( fileName ) );
     return KABC::AddresseeList();
   }
 
-  int result = KMessageBox::questionYesNoCancel( parentWidget(),
+  int result = KMessageBox::questionYesNoCancel( tqparentWidget(),
       i18n( "Override previously imported entries?" ),
       i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") );
 
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 92143c7e2..799e4ca35 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) ) {
     TQString msg = i18n( "Unable to open %1 for reading." );
-    KMessageBox::error( parentWidget(), msg.arg( fileName ) );
+    KMessageBox::error( tqparentWidget(), msg.arg( fileName ) );
     return addrList;
   }
 
@@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
       return true;
 
   if( TQFileInfo(url.path()).exists() ) {
-      if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)   
+      if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)   
         return false;
   }
 
@@ -106,7 +106,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       TQString txt = i18n( "Unable to open file %1.%2." );
-      KMessageBox::error( parentWidget(), txt.arg( url.url() )
+      KMessageBox::error( tqparentWidget(), txt.arg( url.url() )
                           .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
@@ -114,14 +114,14 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
 
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "Unable to open file %1." );
-      KMessageBox::error( parentWidget(), txt.arg( filename ) );
+      KMessageBox::error( tqparentWidget(), txt.arg( filename ) );
       return false;
     }
 
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 474a66723..c10a28523 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -48,14 +48,14 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
 {
   KABC::AddresseeList addrList;
 
-  TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) );
+  TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) );
   if ( fileName.isEmpty() )
     return addrList;
 
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) ) {
     TQString msg = i18n( "Unable to open %1 for reading." );
-    KMessageBox::error( parentWidget(), msg.arg( fileName ) );
+    KMessageBox::error( tqparentWidget(), msg.arg( fileName ) );
     return addrList;
   }
 
@@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
   while ( !stream.atEnd() ) {
     line = stream.readLine();
     line = line.stripWhiteSpace();
-    if ( line == TQString::fromLatin1( "#CONTACT" ) ) {
+    if ( line == TQString::tqfromLatin1( "#CONTACT" ) ) {
       parseContact = true;
       addr = KABC::Addressee();
       continue;
@@ -87,9 +87,9 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
       int sep = line.find( '=' );
       key = line.left( sep ).lower();
       value = line.mid( sep + 1 );
-      if ( key == TQString::fromLatin1( "name" ) )
+      if ( key == TQString::tqfromLatin1( "name" ) )
         addr.setNameFromString( value );
-      else if ( key == TQString::fromLatin1( "mail" ) ) {
+      else if ( key == TQString::tqfromLatin1( "mail" ) ) {
         TQStringList emails = TQStringList::split( separator, value );
 
         TQStringList::Iterator it = emails.begin();
@@ -98,20 +98,20 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
           addr.insertEmail( *it, preferred );
           preferred = false;
         }
-      } else if ( key == TQString::fromLatin1( "phone" ) )
+      } else if ( key == TQString::tqfromLatin1( "phone" ) )
         addr.insertPhoneNumber( KABC::PhoneNumber( value ) );
-      else if ( key == TQString::fromLatin1( "fax" ) )
+      else if ( key == TQString::tqfromLatin1( "fax" ) )
         addr.insertPhoneNumber( KABC::PhoneNumber( value,
                               KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) );
-      else if ( key == TQString::fromLatin1( "postaladdress" ) ) {
+      else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) {
         KABC::Address address( KABC::Address::Home );
-        address.setLabel( value.replace( separator, "\n" ) );
+        address.setLabel( value.tqreplace( separator, "\n" ) );
         addr.insertAddress( address );
-      } else if ( key == TQString::fromLatin1( "description" ) )
-        addr.setNote( value.replace( separator, "\n" ) );
-      else if ( key == TQString::fromLatin1( "url" ) )
+      } else if ( key == TQString::tqfromLatin1( "description" ) )
+        addr.setNote( value.tqreplace( separator, "\n" ) );
+      else if ( key == TQString::tqfromLatin1( "url" ) )
         addr.setUrl( KURL( value ) );
-      else if ( key == TQString::fromLatin1( "pictureurl" ) ) {
+      else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) {
         KABC::Picture pic( value );
         addr.setPhoto( pic );
       }
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 21ac67c07..6aa818503 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
   if ( fileName.isEmpty() )
     return addrList;
   if ( !TQFile::exists( fileName ) ) {
-    KMessageBox::sorry( parentWidget(), i18n( "Could not find a MS Exchange Personal Address Book %1." ).arg( fileName ) );
+    KMessageBox::sorry( tqparentWidget(), i18n( "Could not find a MS Exchange Personal Address Book %1." ).arg( fileName ) );
     return addrList;
   }
 
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 1dfc9bcc4..69f854f33 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
     TQString msg = i18n( "You have selected a list of contacts, shall they be "
                         "exported to several files?" );
 
-    switch ( KMessageBox::questionYesNo( parentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) {
+    switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) {
       case KMessageBox::Yes: {
         KURL baseUrl = KFileDialog::getExistingURL();
         if ( baseUrl.isEmpty() )
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
           else
             testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();
 
-          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
+          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, tqparentWidget() ) ) {
             counter++;
             url = testUrl + TQString::number( counter ) + ".vcf";
           } else
@@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 #endif
   } else {
     if ( XXPortManager::importURL.isEmpty() )
-      urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", parentWidget(),
+      urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", tqparentWidget(),
                                        i18n( "Select vCard to Import" ) );
     else
       urls.append( XXPortManager::importURL );
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     bool anyFailures = false;
     KURL::List::Iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
-      if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
+      if ( KIO::NetAccess::download( *it, fileName, tqparentWidget() ) ) {
 
         TQFile file( fileName );
 
@@ -237,12 +237,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 
             TQString vCardText;
 
-            // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1()
+            // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1()
             // and hope that are fields are encoded correctly.
-            if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) {
+            if ( TQString::tqfromLatin1( rawData ).lower().tqcontains( "version:3.0" ) ) {
               vCardText = TQString::fromUtf8( rawData );
             } else {
-              vCardText = TQString::fromLatin1( rawData );
+              vCardText = TQString::tqfromLatin1( rawData );
             }
             addrList += parseVCard( vCardText );
           }
@@ -253,13 +253,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
           text = text.arg( (*it).url() );
           text = text.arg( kapp->translate( "TQFile",
                                             file.errorString().latin1() ) );
-          KMessageBox::error( parentWidget(), text, caption );
+          KMessageBox::error( tqparentWidget(), text, caption );
           anyFailures = true;
         }
       } else {
         TQString text = i18n( "Unable to access vCard: %1" );
         text = text.arg( KIO::NetAccess::lastErrorString() );
-        KMessageBox::error( parentWidget(), text, caption );
+        KMessageBox::error( tqparentWidget(), text, caption );
         anyFailures = true;
       }
     }
@@ -267,12 +267,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     if ( !XXPortManager::importURL.isEmpty() ) { // a vcard was passed via cmd
       if ( addrList.isEmpty() ) {
         if ( anyFailures && urls.count() > 1 )
-          KMessageBox::information( parentWidget(),
+          KMessageBox::information( tqparentWidget(),
                                     i18n( "No contacts were imported, due to errors with the vCards." ) );
         else if ( !anyFailures )
-          KMessageBox::information( parentWidget(), i18n( "The vCard does not contain any contacts." ) );
+          KMessageBox::information( tqparentWidget(), i18n( "The vCard does not contain any contacts." ) );
       } else {
-        VCardViewerDialog dlg( addrList, parentWidget() );
+        VCardViewerDialog dlg( addrList, tqparentWidget() );
         dlg.exec();
         addrList = dlg.contacts();
       }
@@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
 bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
 {
   if( TQFileInfo(url.path()).exists() ) {
-    if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+    if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
       return false;
   }
   KTempFile tmpFile;
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
   tmpFile.file()->writeBlock( data.data(), data.size() );
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
 }
 #else
 KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
 bool VCardXXPort::doExport( const KURL &url, const TQString &data )
 {
   if( TQFileInfo(url.path()).exists() ) {
-    if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+    if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
       return false;
   }
   KTempFile tmpFile;
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
   stream << data;
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
 }
 #endif
 
@@ -338,7 +338,7 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
   if ( addrList.isEmpty() )
     return addrList;
 
-  VCardExportSelectionDialog dlg( parentWidget() );
+  VCardExportSelectionDialog dlg( tqparentWidget() );
   if ( !dlg.exec() )
     return list;
 
@@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
     mContacts( list )
 {
   TQFrame *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page );
   TQFont font = label->font();
   font.setBold( true );
   label->setFont( font );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mView = new KPIM::AddresseeView( page );
   mView->enableLinks( 0 );
   mView->setVScrollBarMode( TQScrollView::Auto );
-  layout->addWidget( mView );
+  tqlayout->addWidget( mView );
 
   setButtonText( Apply, i18n( "Import All..." ) );
 
@@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
 {
   TQFrame *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page );
-  layout->addWidget( mPrivateBox );
+  tqlayout->addWidget( mPrivateBox );
 
   mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page );
-  layout->addWidget( mBusinessBox );
+  tqlayout->addWidget( mBusinessBox );
 
   mOtherBox = new TQCheckBox( i18n( "Other fields" ), page );
-  layout->addWidget( mOtherBox );
+  tqlayout->addWidget( mOtherBox );
 
   mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
-  layout->addWidget( mEncryptionKeys );
+  tqlayout->addWidget( mEncryptionKeys );
 
   KConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 1cbf75a56..9b84961dd 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -94,7 +94,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
   if ( mUseSelection->isChecked() ) {
     TQStringList::ConstIterator it;
     for ( it = selection.begin(); it != selection.end(); ++it ) {
-      KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
+      KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it );
       if ( !addr.isEmpty() )
         list.append( addr );
     }
@@ -119,7 +119,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
       const TQStringList tmp( (*it).categories() );
       TQStringList::ConstIterator tmpIt;
       for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
-        if ( categorieList.contains( *tmpIt ) ) {
+        if ( categorieList.tqcontains( *tmpIt ) ) {
           list.append( *it );
           break;
         }
@@ -187,11 +187,11 @@ void XXPortSelectDialog::initGUI()
 
   mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
-  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
+  mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
@@ -226,9 +226,9 @@ void XXPortSelectDialog::initGUI()
 
   TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page );
   sortingGroup->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2,
+  TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->setAlignment( Qt::AlignTop );
+  sortLayout->tqsetAlignment( Qt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), sortingGroup );
   sortLayout->addWidget( label, 0, 0 );
diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am
index af4896a29..909198b79 100644
--- a/kalarm/Makefile.am
+++ b/kalarm/Makefile.am
@@ -21,7 +21,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
 	templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
 	templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
 	emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
-kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdenetwork/qgpgme
 if include_ARTS
 ARTSLIB = -lartskde
 endif
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 4b03f3050..274bf0c81 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -61,17 +61,17 @@ using namespace KCal;
 
 TQString AlarmCalendar::icalProductId()
 {
-	return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
+	return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
 }
 
 static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = {
 	KAEvent::ACTIVE, KAEvent::EXPIRED, KAEvent::DISPLAYING, KAEvent::TEMPLATE
 };
 static const TQString calendarNames[AlarmCalendar::NCALS] = {
-	TQString::fromLatin1("calendar.ics"),
-	TQString::fromLatin1("expired.ics"),
-	TQString::fromLatin1("displaying.ics"),
-	TQString::fromLatin1("template.ics")
+	TQString::tqfromLatin1("calendar.ics"),
+	TQString::tqfromLatin1("expired.ics"),
+	TQString::tqfromLatin1("displaying.ics"),
+	TQString::tqfromLatin1("template.ics")
 };
 static KStaticDeleter calendarDeleter[AlarmCalendar::NCALS];    // ensure that the calendar destructors are called
 
@@ -83,7 +83,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 * There are 4 calendars:
 *  1) A user-independent one containing the active alarms;
 *  2) A historical one containing expired alarms;
-*  3) A user-specific one which contains details of alarms which are currently
+*  3) A user-specific one which tqcontains details of alarms which are currently
 *     being displayed to that user and which have not yet been acknowledged;
 *  4) One containing alarm templates.
 * Reply = true if success, false if calendar name error.
@@ -91,10 +91,10 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 bool AlarmCalendar::initialiseCalendars()
 {
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::fromLatin1("General"));
-	TQString activeKey   = TQString::fromLatin1("Calendar");
-	TQString expiredKey  = TQString::fromLatin1("ExpiredCalendar");
-	TQString templateKey = TQString::fromLatin1("TemplateCalendar");
+	config->setGroup(TQString::tqfromLatin1("General"));
+	TQString activeKey   = TQString::tqfromLatin1("Calendar");
+	TQString expiredKey  = TQString::tqfromLatin1("ExpiredCalendar");
+	TQString templateKey = TQString::tqfromLatin1("TemplateCalendar");
 	TQString displayCal, activeCal, expiredCal, templateCal;
 	calendarDeleter[ACTIVE].setObject(mCalendars[ACTIVE], createCalendar(ACTIVE, config, activeCal, activeKey));
 	calendarDeleter[EXPIRED].setObject(mCalendars[EXPIRED], createCalendar(EXPIRED, config, expiredCal, expiredKey));
@@ -152,8 +152,8 @@ bool AlarmCalendar::initialiseCalendars()
 */
 AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey)
 {
-	static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$"));
-	static TQString ical = TQString::fromLatin1(".ics");
+	static TQRegExp vcsRegExp(TQString::tqfromLatin1("\\.vcs$"));
+	static TQString ical = TQString::tqfromLatin1(".ics");
 
 	if (configKey.isNull())
 	{
@@ -164,7 +164,7 @@ AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQStri
 	{
 		TQString readPath = config->readPathEntry(configKey, locateLocal("appdata", calendarNames[type]));
 		writePath = readPath;
-		writePath.replace(vcsRegExp, ical);
+		writePath.tqreplace(vcsRegExp, ical);
 		return new AlarmCalendar(readPath, type, writePath, configKey);
 	}
 }
@@ -261,7 +261,7 @@ bool AlarmCalendar::open()
 
 	kdDebug(5950) << "AlarmCalendar::open(" << mUrl.prettyURL() << ")\n";
 	if (!mCalendar)
-		mCalendar = new CalendarLocal(TQString::fromLatin1("UTC"));
+		mCalendar = new CalendarLocal(TQString::tqfromLatin1("UTC"));
 	mCalendar->setLocalTime();    // write out using local time (i.e. no time zone)
 
 	// Check for file's existence, assuming that it does exist when uncertain,
@@ -404,7 +404,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
 		if (!mConfigKey.isNull())
 		{
 			KConfig* config = kapp->config();
-			config->setGroup(TQString::fromLatin1("General"));
+			config->setGroup(TQString::tqfromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
 		}
@@ -445,8 +445,8 @@ void AlarmCalendar::close()
 */
 bool AlarmCalendar::importAlarms(TQWidget* parent)
 {
-	KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":importalarms"),
-	                                   TQString::fromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent);
+	KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
+	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent);
 	if (url.isEmpty())
 	{
 		kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -484,7 +484,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 	}
 
 	// Read the calendar and add its alarms to the current calendars
-	CalendarLocal cal(TQString::fromLatin1("UTC"));
+	CalendarLocal cal(TQString::tqfromLatin1("UTC"));
 	cal.setLocalTime();    // write out using local time (i.e. no time zone)
 	success = cal.load(filename);
 	if (!success)
@@ -616,7 +616,7 @@ void AlarmCalendar::convertToICal()
 		if (!mConfigKey.isNull())
 		{
 			KConfig* config = kapp->config();
-			config->setGroup(TQString::fromLatin1("General"));
+			config->setGroup(TQString::tqfromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
 		}
@@ -688,7 +688,7 @@ void AlarmCalendar::purgeIfQueued()
 		{
 			kdDebug(5950) << "AlarmCalendar::purgeIfQueued(" << mPurgeDaysQueued << ")\n";
 			bool changed = false;
-			TQDate cutoff = TQDate::currentDate().addDays(-mPurgeDaysQueued);
+			TQDate cutoff = TQDate::tqcurrentDate().addDays(-mPurgeDaysQueued);
 			Event::List events = mCalendar->rawEvents();
 			for (Event::List::ConstIterator it = events.begin();  it != events.end();  ++it)
 			{
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 34ce46a29..52206342b 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -44,7 +44,7 @@ const TQCString APPNAME("KALARM");
 // KAlarm version which first used the current calendar/event format.
 // If this changes, KAEvent::convertKCalEvents() must be changed correspondingly.
 // The string version is the KAlarm version string used in the calendar file.
-TQString KAEvent::calVersionString()  { return TQString::fromLatin1("1.5.0"); }
+TQString KAEvent::calVersionString()  { return TQString::tqfromLatin1("1.5.0"); }
 int     KAEvent::calVersion()        { return KAlarm::Version(1,5,0); }
 
 // Custom calendar properties.
@@ -54,16 +54,16 @@ static const TQCString NEXT_RECUR_PROPERTY("NEXTRECUR");     // X-KDE-KALARM-NEX
 static const TQCString REPEAT_PROPERTY("REPEAT");            // X-KDE-KALARM-REPEAT property
 // - General alarm properties
 static const TQCString TYPE_PROPERTY("TYPE");    // X-KDE-KALARM-TYPE property
-static const TQString FILE_TYPE                  = TQString::fromLatin1("FILE");
-static const TQString AT_LOGIN_TYPE              = TQString::fromLatin1("LOGIN");
-static const TQString REMINDER_TYPE              = TQString::fromLatin1("REMINDER");
-static const TQString REMINDER_ONCE_TYPE         = TQString::fromLatin1("REMINDER_ONCE");
-static const TQString ARCHIVE_REMINDER_ONCE_TYPE = TQString::fromLatin1("ONCE");
-static const TQString TIME_DEFERRAL_TYPE         = TQString::fromLatin1("DEFERRAL");
-static const TQString DATE_DEFERRAL_TYPE         = TQString::fromLatin1("DATE_DEFERRAL");
-static const TQString DISPLAYING_TYPE            = TQString::fromLatin1("DISPLAYING");   // used only in displaying calendar
-static const TQString PRE_ACTION_TYPE            = TQString::fromLatin1("PRE");
-static const TQString POST_ACTION_TYPE           = TQString::fromLatin1("POST");
+static const TQString FILE_TYPE                  = TQString::tqfromLatin1("FILE");
+static const TQString AT_LOGIN_TYPE              = TQString::tqfromLatin1("LOGIN");
+static const TQString REMINDER_TYPE              = TQString::tqfromLatin1("REMINDER");
+static const TQString REMINDER_ONCE_TYPE         = TQString::tqfromLatin1("REMINDER_ONCE");
+static const TQString ARCHIVE_REMINDER_ONCE_TYPE = TQString::tqfromLatin1("ONCE");
+static const TQString TIME_DEFERRAL_TYPE         = TQString::tqfromLatin1("DEFERRAL");
+static const TQString DATE_DEFERRAL_TYPE         = TQString::tqfromLatin1("DATE_DEFERRAL");
+static const TQString DISPLAYING_TYPE            = TQString::tqfromLatin1("DISPLAYING");   // used only in displaying calendar
+static const TQString PRE_ACTION_TYPE            = TQString::tqfromLatin1("PRE");
+static const TQString POST_ACTION_TYPE           = TQString::tqfromLatin1("POST");
 static const TQCString NEXT_REPEAT_PROPERTY("NEXTREPEAT");   // X-KDE-KALARM-NEXTREPEAT property
 // - Display alarm properties
 static const TQCString FONT_COLOUR_PROPERTY("FONTCOLOR");    // X-KDE-KALARM-FONTCOLOR property
@@ -74,27 +74,27 @@ static const TQCString VOLUME_PROPERTY("VOLUME");            // X-KDE-KALARM-VOL
 static const TQCString SPEAK_PROPERTY("SPEAK");              // X-KDE-KALARM-SPEAK property
 
 // Event categories
-static const TQString DATE_ONLY_CATEGORY        = TQString::fromLatin1("DATE");
-static const TQString EMAIL_BCC_CATEGORY        = TQString::fromLatin1("BCC");
-static const TQString CONFIRM_ACK_CATEGORY      = TQString::fromLatin1("ACKCONF");
-static const TQString LATE_CANCEL_CATEGORY      = TQString::fromLatin1("LATECANCEL;");
-static const TQString AUTO_CLOSE_CATEGORY       = TQString::fromLatin1("LATECLOSE;");
-static const TQString TEMPL_AFTER_TIME_CATEGORY = TQString::fromLatin1("TMPLAFTTIME;");
-static const TQString KMAIL_SERNUM_CATEGORY     = TQString::fromLatin1("KMAIL:");
-static const TQString KORGANIZER_CATEGORY       = TQString::fromLatin1("KORG");
-static const TQString DEFER_CATEGORY            = TQString::fromLatin1("DEFER;");
-static const TQString ARCHIVE_CATEGORY          = TQString::fromLatin1("SAVE");
-static const TQString ARCHIVE_CATEGORIES        = TQString::fromLatin1("SAVE:");
-static const TQString LOG_CATEGORY              = TQString::fromLatin1("LOG:");
-static const TQString xtermURL = TQString::fromLatin1("xterm:");
+static const TQString DATE_ONLY_CATEGORY        = TQString::tqfromLatin1("DATE");
+static const TQString EMAIL_BCC_CATEGORY        = TQString::tqfromLatin1("BCC");
+static const TQString CONFIRM_ACK_CATEGORY      = TQString::tqfromLatin1("ACKCONF");
+static const TQString LATE_CANCEL_CATEGORY      = TQString::tqfromLatin1("LATECANCEL;");
+static const TQString AUTO_CLOSE_CATEGORY       = TQString::tqfromLatin1("LATECLOSE;");
+static const TQString TEMPL_AFTER_TIME_CATEGORY = TQString::tqfromLatin1("TMPLAFTTIME;");
+static const TQString KMAIL_SERNUM_CATEGORY     = TQString::tqfromLatin1("KMAIL:");
+static const TQString KORGANIZER_CATEGORY       = TQString::tqfromLatin1("KORG");
+static const TQString DEFER_CATEGORY            = TQString::tqfromLatin1("DEFER;");
+static const TQString ARCHIVE_CATEGORY          = TQString::tqfromLatin1("SAVE");
+static const TQString ARCHIVE_CATEGORIES        = TQString::tqfromLatin1("SAVE:");
+static const TQString LOG_CATEGORY              = TQString::tqfromLatin1("LOG:");
+static const TQString xtermURL = TQString::tqfromLatin1("xterm:");
 
 // Event status strings
-static const TQString DISABLED_STATUS           = TQString::fromLatin1("DISABLED");
+static const TQString DISABLED_STATUS           = TQString::tqfromLatin1("DISABLED");
 
-static const TQString EXPIRED_UID    = TQString::fromLatin1("-exp-");
-static const TQString DISPLAYING_UID = TQString::fromLatin1("-disp-");
-static const TQString TEMPLATE_UID   = TQString::fromLatin1("-tmpl-");
-static const TQString KORGANIZER_UID = TQString::fromLatin1("-korg-");
+static const TQString EXPIRED_UID    = TQString::tqfromLatin1("-exp-");
+static const TQString DISPLAYING_UID = TQString::tqfromLatin1("-disp-");
+static const TQString TEMPLATE_UID   = TQString::tqfromLatin1("-tmpl-");
+static const TQString KORGANIZER_UID = TQString::tqfromLatin1("-korg-");
 
 struct AlarmData
 {
@@ -927,7 +927,7 @@ TQString KAEvent::uid(const TQString& id, Status status)
 			case TEMPLATE:    part = TEMPLATE_UID;  break;
 			case KORGANIZER:  part = KORGANIZER_UID;  break;
 		}
-		result.replace(i, len, part);
+		result.tqreplace(i, len, part);
 	}
 	return result;
 }
@@ -1039,7 +1039,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 		if (params.count() > 0)
 		{
 			TQString cat = ARCHIVE_CATEGORIES;
-			cat += params.join(TQString::fromLatin1(";"));
+			cat += params.join(TQString::tqfromLatin1(";"));
 			cats.append(cat);
 		}
 		else
@@ -1097,9 +1097,9 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 		else if (mAtLoginDateTime.isValid())
 			dtl = mAtLoginDateTime;
 		else if (mStartDateTime.isDateOnly())
-			dtl = TQDate::currentDate().addDays(-1);
+			dtl = TQDate::tqcurrentDate().addDays(-1);
 		else
-			dtl = TQDateTime::currentDateTime();
+			dtl = TQDateTime::tqcurrentDateTime();
 		initKCalAlarm(ev, dtl, AT_LOGIN_TYPE);
 		if (!ancillaryType  &&  dtl.isValid())
 		{
@@ -1243,7 +1243,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 		case KAAlarm::AUDIO_ALARM:
 			alarm->setAudioAlarm(mAudioFile);  // empty for a beep or for speaking
 			if (mSpeak)
-				alarm->setCustomProperty(APPNAME, SPEAK_PROPERTY, TQString::fromLatin1("Y"));
+				alarm->setCustomProperty(APPNAME, SPEAK_PROPERTY, TQString::tqfromLatin1("Y"));
 			if (mRepeatSound)
 			{
 				alarm->setRepeatCount(-1);
@@ -1251,7 +1251,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 			}
 			if (!mAudioFile.isEmpty()  &&  mSoundVolume >= 0)
 				alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY,
-				              TQString::fromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
+				              TQString::tqfromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
 				                                             .arg(TQString::number(mFadeVolume, 'f', 2))
 				                                             .arg(mFadeSeconds));
 			break;
@@ -1277,7 +1277,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 				case T_MESSAGE:
 					alarm->setDisplayAlarm(AlarmText::toCalendarText(mText));
 					alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
-						      TQString::fromLatin1("%1;%2;%3").arg(mBgColour.name())
+						      TQString::tqfromLatin1("%1;%2;%3").arg(mBgColour.name())
 										     .arg(mFgColour.name())
 										     .arg(mDefaultFont ? TQString::null : mFont.toString()));
 					break;
@@ -1601,7 +1601,7 @@ bool KAEvent::defer(const DateTime& dateTime, bool reminder, bool adjustRecurren
 			set_deferral(NORMAL_DEFERRAL);
 		if (adjustRecurrence)
 		{
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			if (mainEndRepeatTime() < now)
 			{
 				// The last repetition (if any) of the current recurrence has already passed.
@@ -1641,7 +1641,7 @@ void KAEvent::cancelDefer()
 		// Set the deferral time to be the same as the next recurrence/repetition.
 		// This prevents an immediate retriggering of the alarm.
 		if (mMainExpired
-		||  nextOccurrence(TQDateTime::currentDateTime(), mDeferralTime, RETURN_REPETITION) == NO_OCCURRENCE)
+		||  nextOccurrence(TQDateTime::tqcurrentDateTime(), mDeferralTime, RETURN_REPETITION) == NO_OCCURRENCE)
 		{
 			// The main alarm has expired, so simply delete the deferral
 			mDeferralTime = DateTime();
@@ -1678,7 +1678,7 @@ DateTime KAEvent::deferralLimit(KAEvent::DeferLimitType* limitType) const
 		// It's a repeated alarm. Don't allow it to be deferred past its
 		// next occurrence or repetition.
 		DateTime reminderTime;
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		OccurType type = nextOccurrence(now, endTime, RETURN_REPETITION);
 		if (type & OCCURRENCE_REPEAT)
 			ltype = LIMIT_REPETITION;
@@ -1695,7 +1695,7 @@ DateTime KAEvent::deferralLimit(KAEvent::DeferLimitType* limitType) const
 			ltype = LIMIT_RECURRENCE;
 	}
 	else if ((mReminderMinutes  ||  mDeferral == REMINDER_DEFERRAL  ||  mArchiveReminderMinutes)
-		 &&  TQDateTime::currentDateTime() < mNextMainDateTime.dateTime())
+		 &&  TQDateTime::tqcurrentDateTime() < mNextMainDateTime.dateTime())
 	{
 		// It's an reminder alarm. Don't allow it to be deferred past its main alarm time.
 		endTime = mNextMainDateTime;
@@ -2633,21 +2633,21 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 	static const TQChar   LATE_CANCEL_CODE = 'C';
 	static const TQChar   AT_LOGIN_CODE    = 'L';   // subsidiary alarm at every login
 	static const TQChar   DEFERRAL_CODE    = 'D';   // extra deferred alarm
-	static const TQString TEXT_PREFIX      = TQString::fromLatin1("TEXT:");
-	static const TQString FILE_PREFIX      = TQString::fromLatin1("FILE:");
-	static const TQString COMMAND_PREFIX   = TQString::fromLatin1("CMD:");
+	static const TQString TEXT_PREFIX      = TQString::tqfromLatin1("TEXT:");
+	static const TQString FILE_PREFIX      = TQString::tqfromLatin1("FILE:");
+	static const TQString COMMAND_PREFIX   = TQString::tqfromLatin1("CMD:");
 
 	// KAlarm pre-0.9.2 codes held in the event's CATEGORY property
-	static const TQString BEEP_CATEGORY    = TQString::fromLatin1("BEEP");
+	static const TQString BEEP_CATEGORY    = TQString::tqfromLatin1("BEEP");
 
 	// KAlarm pre-1.1.1 LATECANCEL category with no parameter
-	static const TQString LATE_CANCEL_CAT = TQString::fromLatin1("LATECANCEL");
+	static const TQString LATE_CANCEL_CAT = TQString::tqfromLatin1("LATECANCEL");
 
 	// KAlarm pre-1.3.0 TMPLDEFTIME category with no parameter
-	static const TQString TEMPL_DEF_TIME_CAT = TQString::fromLatin1("TMPLDEFTIME");
+	static const TQString TEMPL_DEF_TIME_CAT = TQString::tqfromLatin1("TMPLDEFTIME");
 
 	// KAlarm pre-1.3.1 XTERM category
-	static const TQString EXEC_IN_XTERM_CAT  = TQString::fromLatin1("XTERM");
+	static const TQString EXEC_IN_XTERM_CAT  = TQString::tqfromLatin1("XTERM");
 
 	// KAlarm pre-1.4.22 properties
 	static const TQCString KMAIL_ID_PROPERTY("KMAILID");    // X-KDE-KALARM-KMAILID property
@@ -2844,7 +2844,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 					Alarm* alarm = *alit;
 					if (alarm->type() == Alarm::Display)
 						alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
-						                         TQString::fromLatin1("%1;;").arg(cats[0]));
+						                         TQString::tqfromLatin1("%1;;").arg(cats[0]));
 				}
 				cats.remove(cats.begin());
 			}
diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h
index 91bf24289..0436d3fb5 100644
--- a/kalarm/alarmevent.h
+++ b/kalarm/alarmevent.h
@@ -153,7 +153,7 @@ class KAAlarm : public KAAlarmEventBase
 		{
 			INVALID_ALARM       = 0,     // not an alarm
 			MAIN_ALARM          = 1,     // THE real alarm. Must be the first in the enumeration.
-			// The following values may be used in combination as a bitmask 0x0E
+			// The following values may be used in combination as a bitqmask 0x0E
 			REMINDER_ALARM      = 0x02,  // reminder in advance of main alarm
 			DEFERRED_ALARM      = 0x04,  // deferred alarm
 			DEFERRED_REMINDER_ALARM = REMINDER_ALARM | DEFERRED_ALARM,  // deferred early warning
@@ -170,7 +170,7 @@ class KAAlarm : public KAAlarmEventBase
 		{
 			INVALID__ALARM                = INVALID_ALARM,
 			MAIN__ALARM                   = MAIN_ALARM,
-			// The following values may be used in combination as a bitmask 0x0E
+			// The following values may be used in combination as a bitqmask 0x0E
 			REMINDER__ALARM               = REMINDER_ALARM,
 			TIMED_DEFERRAL_FLAG           = 0x08,  // deferral has a time; if clear, it is date-only
 			DEFERRED_DATE__ALARM          = DEFERRED_ALARM,  // deferred alarm - date-only
@@ -263,7 +263,7 @@ class KAEvent : public KAAlarmEventBase
 			DATE_DEFERRAL   = DEFERRAL,
 			TIME_DEFERRAL   = DEFERRAL | TIMED_FLAG,
 			DISPLAYING_     = 0x80000,
-			READ_ONLY_FLAGS = 0xF0000   // mask for all read-only internal values
+			READ_ONLY_FLAGS = 0xF0000   // tqmask for all read-only internal values
 		};
 		/** The category of an event, indicated by the middle part of its UID. */
 		enum Status
@@ -288,7 +288,7 @@ class KAEvent : public KAAlarmEventBase
 			RECURRENCE_DATE             = 0x02,   // a recurrence with only a date, not a time
 			RECURRENCE_DATE_TIME        = 0x03,   // a recurrence with a date and time
 			LAST_RECURRENCE             = 0x04,   // the last recurrence
-			OCCURRENCE_REPEAT = 0x10,    // (bitmask for a repetition of an occurrence)
+			OCCURRENCE_REPEAT = 0x10,    // (bitqmask for a repetition of an occurrence)
 			FIRST_OR_ONLY_OCCURRENCE_REPEAT = OCCURRENCE_REPEAT | FIRST_OR_ONLY_OCCURRENCE,     // a repetition of the first occurrence
 			RECURRENCE_DATE_REPEAT      = OCCURRENCE_REPEAT | RECURRENCE_DATE,      // a repetition of a date-only recurrence
 			RECURRENCE_DATE_TIME_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE_TIME, // a repetition of a date/time recurrence
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 8fb72fe31..2d4e39d62 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -167,7 +167,7 @@ void AlarmListView::populate()
 	KAEvent event;
 	KCal::Event::List events;
 	KCal::Event::List::ConstIterator it;
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	if (mShowExpired)
 	{
 		AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen();
@@ -257,7 +257,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay)
 {
 	if (forceDisplay  ||  columnWidth(mColumn[TIME_TO_COLUMN]))
 	{
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		for (AlarmListViewItem* item = firstChild();  item;  item = item->nextSibling())
 			item->updateTimeToAlarm(now, forceDisplay);
 	}
@@ -269,7 +269,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay)
 */
 void AlarmListView::addEvent(const KAEvent& event, EventListViewBase* view)
 {
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	for (InstanceListConstIterator it = mInstanceList.begin();  it != mInstanceList.end();  ++it)
 		static_cast(*it)->addEntry(event, now, true, (*it == view));
 }
@@ -290,7 +290,7 @@ AlarmListViewItem* AlarmListView::addEntry(const KAEvent& event, const TQDateTim
 */
 EventListViewItemBase* AlarmListView::createItem(const KAEvent& event)
 {
-	return new AlarmListViewItem(this, event, TQDateTime::currentDateTime());
+	return new AlarmListViewItem(this, event, TQDateTime::tqcurrentDateTime());
 }
 
 /******************************************************************************
@@ -373,7 +373,7 @@ void AlarmListView::contentsMouseMoveEvent(TQMouseEvent* e)
 		// Create a calendar object containing all the currently selected alarms
 		kdDebug(5950) << "AlarmListView::contentsMouseMoveEvent(): drag started" << endl;
 		mMousePressed = false;
-		KCal::CalendarLocal cal(TQString::fromLatin1("UTC"));
+		KCal::CalendarLocal cal(TQString::tqfromLatin1("UTC"));
 		cal.setLocalTime();    // write out using local time (i.e. no time zone)
 		TQValueList items = selectedItems();
 		if (!items.count())
@@ -503,7 +503,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
 		{
 			// Initialise the position of the hour within the time string, if leading
 			// zeroes are omitted, so that displayed times can be aligned with each other.
-			mTimeHourPos = -1;     // default = alignment isn't possible/sensible
+			mTimeHourPos = -1;     // default = tqalignment isn't possible/sensible
 			if (!TQApplication::reverseLayout())    // don't try to align right-to-left languages
 			{
 				TQString fmt = locale->timeFormat();
@@ -514,7 +514,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
 		}
 		if (mTimeHourPos >= 0  &&  (int)time.length() > mTimeHourPos + 1
 		&&  time[mTimeHourPos].isDigit()  &&  !time[mTimeHourPos + 1].isDigit())
-			dateTimeText += '~';     // improve alignment of times with no leading zeroes
+			dateTimeText += '~';     // improve tqalignment of times with no leading zeroes
 		dateTimeText += time;
 	}
 	return dateTimeText + ' ';
@@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in
 */
 int AlarmListViewItem::typeIconWidth(AlarmListView* v)
 {
-	return iconWidth() +  2 * v->style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+	return iconWidth() +  2 * v->style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
 }
 
 /******************************************************************************
@@ -684,7 +684,7 @@ TQString AlarmListViewItem::key(int column, bool) const
 */
 void AlarmListTooltip::maybeTip(const TQPoint& pt)
 {
-	AlarmListView* listView = (AlarmListView*)parentWidget()->parentWidget();
+	AlarmListView* listView = (AlarmListView*)tqparentWidget()->tqparentWidget();
 	int column = listView->column(AlarmListView::MESSAGE_COLUMN);
 	int xOffset = listView->contentsX();
 	if (listView->header()->sectionAt(pt.x() + xOffset) == column)
@@ -700,7 +700,7 @@ void AlarmListTooltip::maybeTip(const TQPoint& pt)
 				if (columnX + widthNeeded <= listView->viewport()->width())
 					return;
 			}
-			TQRect rect = listView->itemRect(item);
+			TQRect rect = listView->tqitemRect(item);
 			rect.setLeft(columnX);
 			rect.setWidth(columnWidth);
 			kdDebug(5950) << "AlarmListTooltip::maybeTip(): display\n";
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index f2ad5b2c2..a722ac238 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -107,7 +107,7 @@ class AlarmListView : public EventListViewBase
 		virtual TQString        whatsThisText(int column) const;
 		virtual bool           shouldShowEvent(const KAEvent& e) const  { return mShowExpired || !e.expired(); }
 		AlarmListViewItem*     addEntry(const KAEvent& e, bool setSize = false)
-		                               { return addEntry(e, TQDateTime::currentDateTime(), setSize); }
+		                               { return addEntry(e, TQDateTime::tqcurrentDateTime(), setSize); }
 		AlarmListViewItem*     updateEntry(AlarmListViewItem* item, const KAEvent& newEvent, bool setSize = false)
 		                               { return (AlarmListViewItem*)EventListViewBase::updateEntry(item, newEvent, setSize); }
 		virtual void           contentsMousePressEvent(TQMouseEvent*);
diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp
index 460517118..5be991f0d 100644
--- a/kalarm/alarmtext.cpp
+++ b/kalarm/alarmtext.cpp
@@ -32,17 +32,17 @@ TQString AlarmText::mToPrefix;
 TQString AlarmText::mCcPrefix;
 TQString AlarmText::mDatePrefix;
 TQString AlarmText::mSubjectPrefix;
-TQString AlarmText::mFromPrefixEn    = TQString::fromLatin1("From:");
-TQString AlarmText::mToPrefixEn      = TQString::fromLatin1("To:");
-TQString AlarmText::mCcPrefixEn      = TQString::fromLatin1("Cc:");
-TQString AlarmText::mDatePrefixEn    = TQString::fromLatin1("Date:");
-TQString AlarmText::mSubjectPrefixEn = TQString::fromLatin1("Subject:");
+TQString AlarmText::mFromPrefixEn    = TQString::tqfromLatin1("From:");
+TQString AlarmText::mToPrefixEn      = TQString::tqfromLatin1("To:");
+TQString AlarmText::mCcPrefixEn      = TQString::tqfromLatin1("Cc:");
+TQString AlarmText::mDatePrefixEn    = TQString::tqfromLatin1("Date:");
+TQString AlarmText::mSubjectPrefixEn = TQString::tqfromLatin1("Subject:");
 
 
 void AlarmText::setText(const TQString& text)
 {
 	mBody     = text;
-	mIsScript = text.startsWith(TQString::fromLatin1("#!"));
+	mIsScript = text.startsWith(TQString::tqfromLatin1("#!"));
 	mIsEmail  = false;
 	mTo = mFrom = mCc = mTime = mSubject = TQString::null;
 	mKMailSerialNum = 0;
@@ -271,7 +271,7 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated)
 	}
 	if (truncated)
 		*truncated = false;
-	if (text.contains('\n') < maxLines)
+	if (text.tqcontains('\n') < maxLines)
 		return text;
 	int newline = -1;
 	for (int i = 0;  i < maxLines;  ++i)
@@ -284,5 +284,5 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated)
 		return text.left(newline);    // text ends in newline
 	if (truncated)
 		*truncated = true;
-	return text.left(newline + (maxLines <= 1 ? 0 : 1)) + TQString::fromLatin1("...");
+	return text.left(newline + (maxLines <= 1 ? 0 : 1)) + TQString::tqfromLatin1("...");
 }
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 5c3316bce..2e4263300 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -93,14 +93,14 @@ void AlarmTimeWidget::init(int mode)
 
 	// At time radio button/label
 	mAtTimeRadio = new RadioButton(((mode & DEFER_TIME) ? i18n("&Defer to date/time:") : i18n("At &date/time:")), this, "atTimeRadio");
-	mAtTimeRadio->setFixedSize(mAtTimeRadio->sizeHint());
+	mAtTimeRadio->setFixedSize(mAtTimeRadio->tqsizeHint());
 	TQWhatsThis::add(mAtTimeRadio,
 	                ((mode & DEFER_TIME) ? i18n("Reschedule the alarm to the specified date and time.")
 	                                     : i18n("Schedule the alarm at the specified date and time.")));
 
 	// Date edit box
 	mDateEdit = new DateEdit(this);
-	mDateEdit->setFixedSize(mDateEdit->sizeHint());
+	mDateEdit->setFixedSize(mDateEdit->tqsizeHint());
 	connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged()));
 	static const TQString enterDateText = i18n("Enter the date to schedule the alarm.");
 	TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText
@@ -111,7 +111,7 @@ void AlarmTimeWidget::init(int mode)
 	TQHBox* timeBox = new TQHBox(this);
 	timeBox->setSpacing(2*KDialog::spacingHint());
 	mTimeEdit = new TimeEdit(timeBox);
-	mTimeEdit->setFixedSize(mTimeEdit->sizeHint());
+	mTimeEdit->setFixedSize(mTimeEdit->tqsizeHint());
 	connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged()));
 	static const TQString enterTimeText = i18n("Enter the time to schedule the alarm.");
 	TQWhatsThis::add(mTimeEdit,
@@ -128,7 +128,7 @@ void AlarmTimeWidget::init(int mode)
 	{
 		mAnyTimeAllowed = true;
 		mAnyTimeCheckBox = new CheckBox(i18n("An&y time"), timeBox);
-		mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->sizeHint());
+		mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->tqsizeHint());
 		connect(mAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
 		TQWhatsThis::add(mAnyTimeCheckBox, i18n("Schedule the alarm for any time during the day"));
 	}
@@ -136,7 +136,7 @@ void AlarmTimeWidget::init(int mode)
 	// 'Time from now' radio button/label
 	mAfterTimeRadio = new RadioButton(((mode & DEFER_TIME) ? i18n("Defer for time &interval:") : i18n_w_TimeFromNow()),
 	                                  this, "afterTimeRadio");
-	mAfterTimeRadio->setFixedSize(mAfterTimeRadio->sizeHint());
+	mAfterTimeRadio->setFixedSize(mAfterTimeRadio->tqsizeHint());
 	TQWhatsThis::add(mAfterTimeRadio,
 	                ((mode & DEFER_TIME) ? i18n("Reschedule the alarm for the specified time interval after now.")
 	                                     : i18n("Schedule the alarm after the specified time interval from now.")));
@@ -144,14 +144,14 @@ void AlarmTimeWidget::init(int mode)
 	// Delay time spin box
 	mDelayTimeEdit = new TimeSpinBox(1, maxDelayTime, this);
 	mDelayTimeEdit->setValue(maxDelayTime);
-	mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint());
+	mDelayTimeEdit->setFixedSize(mDelayTimeEdit->tqsizeHint());
 	connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int)));
 	TQWhatsThis::add(mDelayTimeEdit,
 	                ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis())
 	                                     : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis())));
 	mAfterTimeRadio->setFocusWidget(mDelayTimeEdit);
 
-	// Set up the layout, either narrow or wide
+	// Set up the tqlayout, either narrow or wide
 	if (mode & NARROW)
 	{
 		TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint());
@@ -160,10 +160,10 @@ void AlarmTimeWidget::init(int mode)
 		grid->addWidget(timeBox, 1, 1, Qt::AlignAuto);
 		grid->setColStretch(2, 1);
 		topLayout->addStretch();
-		TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
-		layout->addWidget(mAfterTimeRadio);
-		layout->addWidget(mDelayTimeEdit);
-		layout->addStretch();
+		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+		tqlayout->addWidget(mAfterTimeRadio);
+		tqlayout->addWidget(mDelayTimeEdit);
+		tqlayout->addStretch();
 	}
 	else
 	{
@@ -226,7 +226,7 @@ DateTime AlarmTimeWidget::getDateTime(int* minsFromNow, bool checkExpired, bool
 	if (errorWidget)
 		*errorWidget = 0;
 	TQTime nowt = TQTime::currentTime();
-	TQDateTime now(TQDate::currentDate(), TQTime(nowt.hour(), nowt.minute()));
+	TQDateTime now(TQDate::tqcurrentDate(), TQTime(nowt.hour(), nowt.minute()));
 	if (mAtTimeRadio->isOn())
 	{
 		bool anyTime = mAnyTimeAllowed && mAnyTimeCheckBox && mAnyTimeCheckBox->isChecked();
@@ -328,7 +328,7 @@ void AlarmTimeWidget::setMinDateTimeIsCurrent()
 {
 	mMinDateTimeIsNow = true;
 	mMinDateTime = TQDateTime();
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	mDateEdit->setMinDate(now.date());
 	setMaxMinTimeIf(now);
 }
@@ -342,7 +342,7 @@ void AlarmTimeWidget::setMinDateTime(const TQDateTime& dt)
 	mMinDateTimeIsNow = false;
 	mMinDateTime = dt;
 	mDateEdit->setMinDate(dt.date());
-	setMaxMinTimeIf(TQDateTime::currentDateTime());
+	setMaxMinTimeIf(TQDateTime::tqcurrentDateTime());
 }
 
 /******************************************************************************
@@ -357,7 +357,7 @@ void AlarmTimeWidget::setMaxDateTime(const DateTime& dt)
 	else
 		mMaxDateTime = dt.dateTime();
 	mDateEdit->setMaxDate(mMaxDateTime.date());
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	setMaxMinTimeIf(now);
 	setMaxDelayTime(now);
 }
@@ -452,13 +452,13 @@ void AlarmTimeWidget::slotTimer()
 	if (mMinDateTimeIsNow)
 	{
 		// Make sure that the minimum date is updated when the day changes
-		now = TQDateTime::currentDateTime();
+		now = TQDateTime::tqcurrentDateTime();
 		mDateEdit->setMinDate(now.date());
 	}
 	if (mMaxDateTime.isValid())
 	{
 		if (!now.isValid())
-			now = TQDateTime::currentDateTime();
+			now = TQDateTime::tqcurrentDateTime();
 		if (!mPastMax)
 		{
 			// Check whether the maximum date/time has now been reached
@@ -502,7 +502,7 @@ void AlarmTimeWidget::slotButtonSet(int)
 		mAnyTimeCheckBox->setEnabled(at && mAnyTimeAllowed);
 	// Ensure that the value of the delay edit box is > 0.
 	TQDateTime dt(mDateEdit->date(), mTimeEdit->time());
-	int minutes = (TQDateTime::currentDateTime().secsTo(dt) + 59) / 60;
+	int minutes = (TQDateTime::tqcurrentDateTime().secsTo(dt) + 59) / 60;
 	if (minutes <= 0)
 		mDelayTimeEdit->setValid(true);
 	mDelayTimeEdit->setEnabled(!at);
@@ -525,7 +525,7 @@ void AlarmTimeWidget::slotAnyTimeToggled(bool on)
 void AlarmTimeWidget::dateTimeChanged()
 {
 	TQDateTime dt(mDateEdit->date(), mTimeEdit->time());
-	int minutes = (TQDateTime::currentDateTime().secsTo(dt) + 59) / 60;
+	int minutes = (TQDateTime::tqcurrentDateTime().secsTo(dt) + 59) / 60;
 	bool blocked = mDelayTimeEdit->signalsBlocked();
 	mDelayTimeEdit->blockSignals(true);     // prevent infinite recursion between here and delayTimeChanged()
 	if (minutes <= 0  ||  minutes > mDelayTimeEdit->maxValue())
@@ -543,7 +543,7 @@ void AlarmTimeWidget::delayTimeChanged(int minutes)
 {
 	if (mDelayTimeEdit->isValid())
 	{
-		TQDateTime dt = TQDateTime::currentDateTime().addSecs(minutes * 60);
+		TQDateTime dt = TQDateTime::tqcurrentDateTime().addSecs(minutes * 60);
 		bool blockedT = mTimeEdit->signalsBlocked();
 		bool blockedD = mDateEdit->signalsBlocked();
 		mTimeEdit->blockSignals(true);     // prevent infinite recursion between here and dateTimeChanged()
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 9e1e2535b..e3580d735 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -52,7 +52,7 @@ class AlarmTimeWidget : public ButtonGroup
 		bool             anyTime() const               { return mAnyTime; }
 		void             enableAnyTime(bool enable);
 		void             selectTimeFromNow(int minutes = 0);
-		TQSize            sizeHint() const              { return minimumSizeHint(); }
+		TQSize            tqsizeHint() const              { return tqminimumSizeHint(); }
 
 		static TQString   i18n_w_TimeFromNow();     // text of 'Time from now:' radio button, with 'w' shortcut
 		static TQString   i18n_TimeAfterPeriod();
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 98a4b629c..2e2997853 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -81,15 +81,15 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	// Prefix and suffix to the name in the alarm text
 	// Get default prefix and suffix texts from config file
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::fromLatin1("General"));
-	mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
-	mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
+	config->setGroup(TQString::tqfromLatin1("General"));
+	mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: "));
+	mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix"));
 
 	TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget);
 	topLayout->addWidget(textGroup);
 	TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup);
 	mPrefix = new BLineEdit(mPrefixText, textGroup);
-	mPrefix->setMinimumSize(mPrefix->sizeHint());
+	mPrefix->setMinimumSize(mPrefix->tqsizeHint());
 	label->setBuddy(mPrefix);
 	connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus()));
 	TQWhatsThis::add(mPrefix,
@@ -98,7 +98,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 
 	label = new TQLabel(i18n("S&uffix:"), textGroup);
 	mSuffix = new BLineEdit(mSuffixText, textGroup);
-	mSuffix->setMinimumSize(mSuffix->sizeHint());
+	mSuffix->setMinimumSize(mSuffix->tqsizeHint());
 	label->setBuddy(mSuffix);
 	connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus()));
 	TQWhatsThis::add(mSuffix,
@@ -128,12 +128,12 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 
 	// Font and colour choice button and sample text
 	mFontColourButton = new FontColourButton(group);
-	mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height() * 3/2);
+	mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height() * 3/2);
 	groupLayout->addWidget(mFontColourButton);
 
 	// Sound checkbox and file selector
 	mSoundPicker = new SoundPicker(group);
-	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
+	mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint());
 	groupLayout->addWidget(mSoundPicker, 0, Qt::AlignAuto);
 
 	// How much to advance warning to give
@@ -142,36 +142,36 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	                         i18n("Enter the number of days before each birthday to display a reminder. "
 	                              "This is in addition to the alarm which is displayed on the birthday."),
 	                         false, false, group);
-	mReminder->setFixedSize(mReminder->sizeHint());
+	mReminder->setFixedSize(mReminder->tqsizeHint());
 	mReminder->setMaximum(0, 364);
 	mReminder->setMinutes(0, true);
 	groupLayout->addWidget(mReminder, 0, Qt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
-	TQHBoxLayout* layout = new TQHBoxLayout(groupLayout, 2*spacingHint());
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint());
 	mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group);
-	layout->addWidget(mConfirmAck);
-	layout->addSpacing(2*spacingHint());
-	layout->addStretch();
+	tqlayout->addWidget(mConfirmAck);
+	tqlayout->addSpacing(2*spacingHint());
+	tqlayout->addStretch();
 
 	if (ShellProcess::authorised())    // don't display if shell commands not allowed (e.g. kiosk mode)
 	{
 		// Special actions button
 		mSpecialActionsButton = new SpecialActionsButton(i18n("Special Actions..."), group);
-		layout->addWidget(mSpecialActionsButton);
+		tqlayout->addWidget(mSpecialActionsButton);
 	}
 
 	// Late display checkbox - default = allow late display
-	layout = new TQHBoxLayout(groupLayout, 2*spacingHint());
+	tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint());
 	mLateCancel = new LateCancelSelector(false, group);
-	layout->addWidget(mLateCancel);
-	layout->addStretch();
+	tqlayout->addWidget(mLateCancel);
+	tqlayout->addStretch();
 
 	// Sub-repetition button
 	mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), false, group);
 	mSubRepetition->set(0, 0, true, 364*24*60);
 	TQWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition"));
-	layout->addWidget(mSubRepetition);
+	tqlayout->addWidget(mSubRepetition);
 
 	// Set the values to their defaults
 	mFontColourButton->setDefaultFont();
@@ -295,7 +295,7 @@ void BirthdayDlg::updateSelectionList()
 TQValueList BirthdayDlg::events() const
 {
 	TQValueList list;
-	TQDate today = TQDate::currentDate();
+	TQDate today = TQDate::tqcurrentDate();
 	TQDateTime todayNoon(today, TQTime(12, 0, 0));
 	int thisYear = today.year();
 	int reminder = mReminder->minutes();
@@ -344,9 +344,9 @@ void BirthdayDlg::slotOk()
 {
 	// Save prefix and suffix texts to use as future defaults
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::fromLatin1("General"));
-	config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text());
-	config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text());
+	config->setGroup(TQString::tqfromLatin1("General"));
+	config->writeEntry(TQString::tqfromLatin1("BirthdayPrefix"), mPrefix->text());
+	config->writeEntry(TQString::tqfromLatin1("BirthdaySuffix"), mSuffix->text());
 	config->sync();
 
 	mFlags = (mSoundPicker->sound() == SoundPicker::BEEP ? KAEvent::BEEP : 0)
diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp
index 50d76c508..f0a349197 100644
--- a/kalarm/calendarcompat.cpp
+++ b/kalarm/calendarcompat.cpp
@@ -80,7 +80,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
 	const TQString& prodid = calendar.productId();
 
 	// Find the KAlarm identifier
-	TQString progname = TQString::fromLatin1(" KAlarm ");
+	TQString progname = TQString::tqfromLatin1(" KAlarm ");
 	int i = prodid.find(progname, 0, false);
 	if (i < 0)
 	{
@@ -100,7 +100,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
 		i = j;
 	if (i <= 0)
 		return 0;    // missing version string
-	ver = ver.left(i);     // ver now contains the KAlarm version string
+	ver = ver.left(i);     // ver now tqcontains the KAlarm version string
 	if (ver == KAlarm::currentCalendarVersionString())
 		return 0;      // the calendar is in the current KAlarm format
 	return KAlarm::getVersionNumber(ver, &subVersion);
@@ -124,9 +124,9 @@ bool CalendarCompat::isUTC(const TQString& localFile)
 	file.close();
 
 	// Extract the CREATED property for the first VEVENT from the calendar
-	TQString VCALENDAR = TQString::fromLatin1("BEGIN:VCALENDAR");
-	TQString VEVENT    = TQString::fromLatin1("BEGIN:VEVENT");
-	TQString CREATED   = TQString::fromLatin1("CREATED:");
+	TQString VCALENDAR = TQString::tqfromLatin1("BEGIN:VCALENDAR");
+	TQString VEVENT    = TQString::tqfromLatin1("BEGIN:VEVENT");
+	TQString CREATED   = TQString::tqfromLatin1("CREATED:");
 	TQStringList lines = TQStringList::split(TQChar('\n'), text);
 	for (TQStringList::ConstIterator it = lines.begin();  it != lines.end(); ++it)
 	{
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index d2d2b2343..a129de8a3 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -134,7 +134,7 @@ bool Daemon::start()
 				return true;     // we're currently waiting for the daemon to start
 			// Start the alarm daemon. It is a KUniqueApplication, which means that
 			// there is automatically only one instance of the alarm daemon running.
-			TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME));
+			TQString execStr = locate("exe", TQString::tqfromLatin1(DAEMON_APP_NAME));
 			if (execStr.isEmpty())
 			{
 				KMessageBox::error(0, i18n("Alarm daemon not found."));
@@ -221,7 +221,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 		failed = true;
 		kdError(5950) << "Daemon::registrationResult(" << reregister << "): kalarmd reports incompatible version " << version << endl;
 		errmsg = i18n("Cannot enable alarms.\nInstallation or configuration error: Alarm Daemon (%1) version is incompatible.")
-		              .arg(TQString::fromLatin1(DAEMON_APP_NAME));
+		              .arg(TQString::tqfromLatin1(DAEMON_APP_NAME));
 	}
 	else
 	{
@@ -236,7 +236,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 				kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n";
 				KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n"
 							   "(Installation or configuration error: %1 cannot locate %2 executable.)")
-							   .arg(TQString::fromLatin1(DAEMON_APP_NAME))
+							   .arg(TQString::tqfromLatin1(DAEMON_APP_NAME))
 							   .arg(kapp->aboutData()->appName()));
 				break;
 			case KAlarmd::FAILURE:
@@ -248,7 +248,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 				if (!reregister)
 				{
 					errmsg = i18n("Cannot enable alarms:\nFailed to register with Alarm Daemon (%1)")
-					              .arg(TQString::fromLatin1(DAEMON_APP_NAME));
+					              .arg(TQString::tqfromLatin1(DAEMON_APP_NAME));
 				}
 				break;
 		}
@@ -304,7 +304,7 @@ void Daemon::checkIfStarted()
 	if (err)
 	{
 		kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl;
-		KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME)));
+		KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
 	}
 }
 
@@ -414,8 +414,8 @@ void Daemon::enableAutoStart(bool enable)
 	// The return status doesn't report failure even if the daemon isn't running,
 	// so in case of failure, rewrite the config file in any case.
 	KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
-	adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
-	adconfig.writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), enable);
+	adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+	adconfig.writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), enable);
 	adconfig.sync();
 }
 
@@ -437,8 +437,8 @@ void Daemon::notifyTimeChanged()
 bool Daemon::autoStart()
 {
 	KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
-	adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
-	return adconfig.readBoolEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), true);
+	adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+	return adconfig.readBoolEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), true);
 }
 
 /******************************************************************************
@@ -700,7 +700,7 @@ void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString&
 void NotificationHandler::handleEvent(const TQString& url, const TQString& eventId)
 {
 	TQString id = eventId;
-	if (id.startsWith(TQString::fromLatin1("ad:")))
+	if (id.startsWith(TQString::tqfromLatin1("ad:")))
 	{
 		// It's a notification from the alarm deamon
 		id = id.mid(3);
diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp
index 8c37ffd88..42af4ce9b 100644
--- a/kalarm/dcophandler.cpp
+++ b/kalarm/dcophandler.cpp
@@ -344,7 +344,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
 		else
 		{
 			// It's a time, so use today as the date
-			start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate));
+			start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate));
 		}
 	}
 	if (!start.isValid())
@@ -486,17 +486,17 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 	kdDebug(5950) << "DcopHandlerOld::process(): " << func << endl;
 	enum
 	{
-		OPERATION      = 0x0007,    // mask for main operation
+		OPERATION      = 0x0007,    // tqmask for main operation
 		  HANDLE       = 0x0001,
 		  CANCEL       = 0x0002,
 		  TRIGGER      = 0x0003,
 		  SCHEDULE     = 0x0004,
-		ALARM_TYPE     = 0x00F0,    // mask for SCHEDULE alarm type
+		ALARM_TYPE     = 0x00F0,    // tqmask for SCHEDULE alarm type
 		  MESSAGE      = 0x0010,
 		  FILE         = 0x0020,
 		  COMMAND      = 0x0030,
 		  EMAIL        = 0x0040,
-		SCH_FLAGS      = 0x0F00,    // mask for SCHEDULE flags
+		SCH_FLAGS      = 0x0F00,    // tqmask for SCHEDULE flags
 		  REP_COUNT    = 0x0100,
 		  REP_END      = 0x0200,
 		  FONT         = 0x0400,
@@ -516,111 +516,111 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 		function = TRIGGER;
 
 	//                scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE;
 	//                scheduleMessage(message, dateTime, colour, colourfg, font, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,const TQFont&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQFont,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,const TQFont&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQFont,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | FONT;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQString&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,const TQString&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | FILE;
 	//                scheduleCommand(commandLine, dateTime, flags, recurrence)
-	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,const TQString&)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,TQString)")
+	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQString)")
 		function = SCHEDULE | COMMAND;
 	//                scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurrence)
-	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,const TQString&)"
-	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,TQString)")
+	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,TQ_UINT32,TQString)")
 		function = SCHEDULE | EMAIL;
 
 	//                scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurType, interval, recurCount)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | MESSAGE | REP_COUNT;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurType, interval, recurCount)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | FILE | REP_COUNT;
 	//                scheduleCommand(commandLine, dateTime, flags, recurType, interval, recurCount)
-	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | COMMAND | REP_COUNT;
 	//                scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurType, interval, recurCount)
-	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | EMAIL | REP_COUNT;
 
 	//                scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurType, interval, endTime)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | MESSAGE | REP_END;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurType, interval, endTime)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | FILE | REP_END;
 	//                scheduleCommand(commandLine, dateTime, flags, recurType, interval, endTime)
-	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | COMMAND | REP_END;
 	//                scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurType, interval, endTime)
-	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | EMAIL | REP_END;
 
 	// Deprecated methods: backwards compatibility with KAlarm pre-0.9.6
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | PRE_096;
 	//                scheduleMessage(message, dateTime, colour, font, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQFont&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQFont,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQFont&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQFont,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | FONT | PRE_096;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurType, interval, recurCount)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | MESSAGE | REP_COUNT | PRE_096;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurType, interval, endTime)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | MESSAGE | REP_END | PRE_096;
 
 	// Deprecated methods: backwards compatibility with KAlarm pre-0.9.1
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | PRE_091;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString)")
 		function = SCHEDULE | FILE | PRE_091;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, recurType, interval, recurCount)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | MESSAGE | REP_COUNT | PRE_091;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, recurType, interval, recurCount)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | FILE | REP_COUNT | PRE_091;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, recurType, interval, endTime)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | MESSAGE | REP_END | PRE_091;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, recurType, interval, endTime)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | FILE | REP_END | PRE_091;
 
 	// Obsolete methods: backwards compatibility with KAlarm pre-0.7
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32)"
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32)"
 	// Obsolete methods: backwards compatibility with KAlarm pre-0.6
 	||       func == "cancelMessage(const TQString&,const TQString&)"
 	||       func == "cancelMessage(TQString,TQString)"
@@ -677,10 +677,10 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 			TQColor       bgColour;
 			TQColor       fgColour(Qt::black);
 			TQFont        font;
-			Q_UINT32     flags;
+			TQ_UINT32     flags;
 			int          lateCancel = 0;
 			KARecurrence recurrence;
-			Q_INT32      reminderMinutes = 0;
+			TQ_INT32      reminderMinutes = 0;
 			if (action == KAEvent::EMAIL)
 			{
 				TQString addresses, attachments;
@@ -731,9 +731,9 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 			if (function & (REP_COUNT | REP_END))
 			{			
 				KARecurrence::Type recurType;
-				Q_INT32 recurCount = 0;
-				Q_INT32 recurInterval;
-				Q_INT32 type;
+				TQ_INT32 recurCount = 0;
+				TQ_INT32 recurInterval;
+				TQ_INT32 type;
 				arg >> type >> recurInterval;
 				switch (type)
 				{
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 60fce82c5..9df852a93 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -48,14 +48,14 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
 
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup");
 	mTimeWidget->setDateTime(initialDT);
 	mTimeWidget->setMinDateTimeIsCurrent();
 	connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit()));
-	layout->addWidget(mTimeWidget);
-	layout->addSpacing(spacingHint());
+	tqlayout->addWidget(mTimeWidget);
+	tqlayout->addSpacing(spacingHint());
 
 	setButtonWhatsThis(Ok, i18n("Defer the alarm until the specified time."));
 	setButtonWhatsThis(User1, i18n("Cancel the deferred alarm. This does not affect future recurrences."));
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index bd22fdd9a..e5cd07dcd 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -102,7 +102,7 @@ class PickAlarmFileRadio : public PickFileRadio
 	virtual TQString pickFile()    // called when browse button is pressed to select a file to display
 	{
 		return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(),
-		                          TQString::null, KFile::ExistingOnly, parentWidget(), "pickAlarmFile");
+		                          TQString::null, KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile");
 	}
     private:
 	TQString mDefaultDir;   // default directory for file browse button
@@ -119,7 +119,7 @@ class PickLogFileRadio : public PickFileRadio
 	virtual TQString pickFile()    // called when browse button is pressed to select a log file
 	{
 		return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString::null,
-		                          KFile::LocalOnly, parentWidget(), "pickLogFile");
+		                          KFile::LocalOnly, tqparentWidget(), "pickLogFile");
 	}
     private:
 	TQString mDefaultDir;   // default directory for log file browse button
@@ -129,7 +129,7 @@ inline TQString recurText(const KAEvent& event)
 {
 	TQString r;
 	if (event.repeatCount())
-		r = TQString::fromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
+		r = TQString::tqfromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
 	else
 		r = event.recurrenceText();
 	return i18n("&Recurrence - [%1]").arg(r);
@@ -196,12 +196,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		TQHBox* box = new TQHBox(mainWidget);
 		box->setSpacing(spacingHint());
 		TQLabel* label = new TQLabel(i18n("Template name:"), box);
-		label->setFixedSize(label->sizeHint());
+		label->setFixedSize(label->tqsizeHint());
 		mTemplateName = new TQLineEdit(box);
 		mTemplateName->setReadOnly(mReadOnly);
 		label->setBuddy(mTemplateName);
 		TQWhatsThis::add(box, i18n("Enter the name of the alarm template"));
-		box->setFixedHeight(box->sizeHint().height());
+		box->setFixedHeight(box->tqsizeHint().height());
 	}
 	mTabs = new TQTabWidget(mainWidget);
 	mTabs->setMargin(marginHint());
@@ -230,13 +230,13 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup");
 	connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int)));
 	topLayout->addWidget(mActionGroup, 1);
-	TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
-	layout->addSpacing(fontMetrics().lineSpacing()/2);
-	TQGridLayout* grid = new TQGridLayout(layout, 1, 5);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
+	tqlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQGridLayout* grid = new TQGridLayout(tqlayout, 1, 5);
 
 	// Message radio button
 	mMessageRadio = new RadioButton(i18n("Te&xt"), mActionGroup, "messageButton");
-	mMessageRadio->setFixedSize(mMessageRadio->sizeHint());
+	mMessageRadio->setFixedSize(mMessageRadio->tqsizeHint());
 	TQWhatsThis::add(mMessageRadio,
 	      i18n("If checked, the alarm will display a text message."));
 	grid->addWidget(mMessageRadio, 1, 0);
@@ -244,7 +244,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 
 	// File radio button
 	mFileRadio = new PickAlarmFileRadio(i18n("&File"), mActionGroup, "fileButton");
-	mFileRadio->setFixedSize(mFileRadio->sizeHint());
+	mFileRadio->setFixedSize(mFileRadio->tqsizeHint());
 	TQWhatsThis::add(mFileRadio,
 	      i18n("If checked, the alarm will display the contents of a text or image file."));
 	grid->addWidget(mFileRadio, 1, 2);
@@ -252,7 +252,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 
 	// Command radio button
 	mCommandRadio = new RadioButton(i18n("Co&mmand"), mActionGroup, "cmdButton");
-	mCommandRadio->setFixedSize(mCommandRadio->sizeHint());
+	mCommandRadio->setFixedSize(mCommandRadio->tqsizeHint());
 	TQWhatsThis::add(mCommandRadio,
 	      i18n("If checked, the alarm will execute a shell command."));
 	grid->addWidget(mCommandRadio, 1, 4);
@@ -260,81 +260,81 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 
 	// Email radio button
 	mEmailRadio = new RadioButton(i18n("&Email"), mActionGroup, "emailButton");
-	mEmailRadio->setFixedSize(mEmailRadio->sizeHint());
+	mEmailRadio->setFixedSize(mEmailRadio->tqsizeHint());
 	TQWhatsThis::add(mEmailRadio,
 	      i18n("If checked, the alarm will send an email."));
 	grid->addWidget(mEmailRadio, 1, 6);
 
 	initDisplayAlarms(mActionGroup);
-	layout->addWidget(mDisplayAlarmsFrame);
+	tqlayout->addWidget(mDisplayAlarmsFrame);
 	initCommand(mActionGroup);
-	layout->addWidget(mCommandFrame);
+	tqlayout->addWidget(mCommandFrame);
 	initEmail(mActionGroup);
-	layout->addWidget(mEmailFrame);
+	tqlayout->addWidget(mEmailFrame);
 
 	// Deferred date/time: visible only for a deferred recurring event.
 	mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
 	topLayout->addWidget(mDeferGroup);
 	TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mDeferTimeLabel = new TQLabel(mDeferGroup);
 
 	mDeferChangeButton = new TQPushButton(i18n("C&hange..."), mDeferGroup);
-	mDeferChangeButton->setFixedSize(mDeferChangeButton->sizeHint());
+	mDeferChangeButton->setFixedSize(mDeferChangeButton->tqsizeHint());
 	connect(mDeferChangeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditDeferral()));
 	TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral"));
 	mDeferGroup->addSpace(0);
 
-	layout = new TQHBoxLayout(topLayout);
+	tqlayout = new TQHBoxLayout(topLayout);
 
 	// Date and time entry
 	if (mTemplate)
 	{
 		mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup");
 		connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int)));
-		layout->addWidget(mTemplateTimeGroup);
+		tqlayout->addWidget(mTemplateTimeGroup);
 		grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint());
 		grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
-		// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-		int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+		// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+		int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 		mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton");
-		mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->sizeHint());
+		mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->tqsizeHint());
 		mTemplateDefaultTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateDefaultTime,
 		      i18n("Do not specify a start time for alarms based on this template. "
 		           "The normal default start time will be used."));
-		grid->addWidget(mTemplateDefaultTime, 0, 0, alignment);
+		grid->addWidget(mTemplateDefaultTime, 0, 0, tqalignment);
 
 		TQHBox* box = new TQHBox(mTemplateTimeGroup);
 		box->setSpacing(spacingHint());
 		mTemplateUseTime = new RadioButton(i18n("Time:"), box, "templateTimeButton");
-		mTemplateUseTime->setFixedSize(mTemplateUseTime->sizeHint());
+		mTemplateUseTime->setFixedSize(mTemplateUseTime->tqsizeHint());
 		mTemplateUseTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateUseTime,
 		      i18n("Specify a start time for alarms based on this template."));
 		mTemplateTimeGroup->insert(mTemplateUseTime);
 		mTemplateTime = new TimeEdit(box, "templateTimeEdit");
-		mTemplateTime->setFixedSize(mTemplateTime->sizeHint());
+		mTemplateTime->setFixedSize(mTemplateTime->tqsizeHint());
 		mTemplateTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateTime,
 		      TQString("%1\n\n%2").arg(i18n("Enter the start time for alarms based on this template."))
 		                         .arg(TimeSpinBox::shiftWhatsThis()));
 		box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-		box->setFixedHeight(box->sizeHint().height());
-		grid->addWidget(box, 0, 1, alignment);
+		box->setFixedHeight(box->tqsizeHint().height());
+		grid->addWidget(box, 0, 1, tqalignment);
 
 		mTemplateAnyTime = new RadioButton(i18n("An&y time"), mTemplateTimeGroup, "templateAnyTimeButton");
-		mTemplateAnyTime->setFixedSize(mTemplateAnyTime->sizeHint());
+		mTemplateAnyTime->setFixedSize(mTemplateAnyTime->tqsizeHint());
 		mTemplateAnyTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateAnyTime,
 		      i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time")));
-		grid->addWidget(mTemplateAnyTime, 1, 0, alignment);
+		grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment);
 
 		box = new TQHBox(mTemplateTimeGroup);
 		box->setSpacing(spacingHint());
 		mTemplateUseTimeAfter = new RadioButton(AlarmTimeWidget::i18n_w_TimeFromNow(), box, "templateFromNowButton");
-		mTemplateUseTimeAfter->setFixedSize(mTemplateUseTimeAfter->sizeHint());
+		mTemplateUseTimeAfter->setFixedSize(mTemplateUseTimeAfter->tqsizeHint());
 		mTemplateUseTimeAfter->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateUseTimeAfter,
 		      i18n("Set alarms based on this template to start after the specified time "
@@ -342,15 +342,15 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		mTemplateTimeGroup->insert(mTemplateUseTimeAfter);
 		mTemplateTimeAfter = new TimeSpinBox(1, maxDelayTime, box);
 		mTemplateTimeAfter->setValue(1439);
-		mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->sizeHint());
+		mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->tqsizeHint());
 		mTemplateTimeAfter->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateTimeAfter,
 		      TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod())
 		                         .arg(TimeSpinBox::shiftWhatsThis()));
-		box->setFixedHeight(box->sizeHint().height());
-		grid->addWidget(box, 1, 1, alignment);
+		box->setFixedHeight(box->tqsizeHint().height());
+		grid->addWidget(box, 1, 1, tqalignment);
 
-		layout->addStretch();
+		tqlayout->addStretch();
 	}
 	else
 	{
@@ -365,7 +365,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	                         i18n("Check to additionally display a reminder in advance of the main alarm time(s)."),
 	                         TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()),
 	                         true, true, mainPage);
-	mReminder->setFixedSize(mReminder->sizeHint());
+	mReminder->setFixedSize(mReminder->tqsizeHint());
 	topLayout->addWidget(mReminder, 0, Qt::AlignAuto);
 
 	// Late cancel selector - default = allow late display
@@ -373,20 +373,20 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	topLayout->addWidget(mLateCancel, 0, Qt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
-	layout = new TQHBoxLayout(topLayout, 0);
+	tqlayout = new TQHBoxLayout(topLayout, 0);
 	mConfirmAck = createConfirmAckCheckbox(mainPage);
-	mConfirmAck->setFixedSize(mConfirmAck->sizeHint());
-	layout->addWidget(mConfirmAck);
-	layout->addSpacing(2*spacingHint());
-	layout->addStretch();
+	mConfirmAck->setFixedSize(mConfirmAck->tqsizeHint());
+	tqlayout->addWidget(mConfirmAck);
+	tqlayout->addSpacing(2*spacingHint());
+	tqlayout->addStretch();
 
 	if (theApp()->korganizerEnabled())
 	{
 		// Show in KOrganizer checkbox
 		mShowInKorganizer = new CheckBox(i18n_ShowInKOrganizer(), mainPage);
-		mShowInKorganizer->setFixedSize(mShowInKorganizer->sizeHint());
+		mShowInKorganizer->setFixedSize(mShowInKorganizer->tqsizeHint());
 		TQWhatsThis::add(mShowInKorganizer, i18n("Check to copy the alarm into KOrganizer's calendar"));
-		layout->addWidget(mShowInKorganizer);
+		tqlayout->addWidget(mShowInKorganizer);
 	}
 
 	setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time."));
@@ -436,40 +436,40 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
 	// File browse button
 	mFileBrowseButton = new TQPushButton(mFileBox);
 	mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
-	mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
+	mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint());
 	TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
 	TQWhatsThis::add(mFileBrowseButton, i18n("Select a text or image file to display."));
 	mFileRadio->init(mFileBrowseButton, mFileMessageEdit);
 
 	// Font and colour choice button and sample text
 	mFontColourButton = new FontColourButton(mDisplayAlarmsFrame);
-	mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height());
+	mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height());
 	frameLayout->addWidget(mFontColourButton);
 
-	TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(frameLayout, 0, 0);
 	mBgColourBox = new TQHBox(mDisplayAlarmsFrame);
 	mBgColourBox->setSpacing(spacingHint());
-	layout->addWidget(mBgColourBox);
-	layout->addStretch();
+	tqlayout->addWidget(mBgColourBox);
+	tqlayout->addStretch();
 	TQLabel* label = new TQLabel(i18n("&Background color:"), mBgColourBox);
 	mBgColourButton = new ColourCombo(mBgColourBox);
 	label->setBuddy(mBgColourButton);
 	TQWhatsThis::add(mBgColourBox, i18n("Select the alarm message background color"));
 
 	// Sound checkbox and file selector
-	layout = new TQHBoxLayout(frameLayout);
+	tqlayout = new TQHBoxLayout(frameLayout);
 	mSoundPicker = new SoundPicker(mDisplayAlarmsFrame);
-	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
-	layout->addWidget(mSoundPicker);
-	layout->addSpacing(2*spacingHint());
-	layout->addStretch();
+	mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint());
+	tqlayout->addWidget(mSoundPicker);
+	tqlayout->addSpacing(2*spacingHint());
+	tqlayout->addStretch();
 
 	if (ShellProcess::authorised())    // don't display if shell commands not allowed (e.g. kiosk mode)
 	{
 		// Special actions button
 		mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame);
-		mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint());
-		layout->addWidget(mSpecialActionsButton);
+		mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint());
+		tqlayout->addWidget(mSpecialActionsButton);
 	}
 
 	// Top-adjust the controls
@@ -488,7 +488,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint());
 
 	mCmdTypeScript = new CheckBox(i18n_p_EnterScript(), mCommandFrame);
-	mCmdTypeScript->setFixedSize(mCmdTypeScript->sizeHint());
+	mCmdTypeScript->setFixedSize(mCmdTypeScript->tqsizeHint());
 	connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool)));
 	TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line"));
 	frameLayout->addWidget(mCmdTypeScript, 0, Qt::AlignAuto);
@@ -505,20 +505,20 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 
 	mCmdOutputGroup = new ButtonGroup(i18n("Command Output"), mCommandFrame);
 	frameLayout->addWidget(mCmdOutputGroup);
-	TQBoxLayout* layout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint());
-	layout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint());
+	tqlayout->addSpacing(fontMetrics().lineSpacing()/2);
 
 	// Execute in terminal window
 	RadioButton* button = new RadioButton(i18n_u_ExecInTermWindow(), mCmdOutputGroup, "execInTerm");
-	button->setFixedSize(button->sizeHint());
+	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window"));
 	mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL);
-	layout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, Qt::AlignAuto);
 
 	// Log file name edit box
 	TQHBox* box = new TQHBox(mCmdOutputGroup);
 	(new TQWidget(box))->setFixedWidth(button->style().subRect(TQStyle::SR_RadioButtonIndicator, button).width());   // indent the edit box
-//	(new TQWidget(box))->setFixedWidth(button->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth));   // indent the edit box
+//	(new TQWidget(box))->setFixedWidth(button->style().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth));   // indent the edit box
 	mCmdLogFileEdit = new LineEdit(LineEdit::Url, box);
 	mCmdLogFileEdit->setAcceptDrops(true);
 	TQWhatsThis::add(mCmdLogFileEdit, i18n("Enter the name or path of the log file."));
@@ -527,25 +527,25 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	// The file browser dialogue is activated by the PickLogFileRadio class.
 	TQPushButton* browseButton = new TQPushButton(box);
 	browseButton->setPixmap(SmallIcon("fileopen"));
-	browseButton->setFixedSize(browseButton->sizeHint());
+	browseButton->setFixedSize(browseButton->tqsizeHint());
 	TQToolTip::add(browseButton, i18n("Choose a file"));
 	TQWhatsThis::add(browseButton, i18n("Select a log file."));
 
 	// Log output to file
 	button = new PickLogFileRadio(browseButton, mCmdLogFileEdit, i18n_g_LogToFile(), mCmdOutputGroup, "cmdLog");
-	button->setFixedSize(button->sizeHint());
+	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button,
 	      i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file."));
 	mCmdOutputGroup->insert(button, LOG_TO_FILE);
-	layout->addWidget(button, 0, Qt::AlignAuto);
-	layout->addWidget(box);
+	tqlayout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(box);
 
 	// Discard output
 	button = new RadioButton(i18n("Discard"), mCmdOutputGroup, "cmdDiscard");
-	button->setFixedSize(button->sizeHint());
+	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button, i18n("Check to discard command output."));
 	mCmdOutputGroup->insert(button, DISCARD_OUTPUT);
-	layout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, Qt::AlignAuto);
 
 	// Top-adjust the controls
 	mCmdPadding = new TQHBox(mCommandFrame);
@@ -560,8 +560,8 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 {
 	mEmailFrame = new TQFrame(parent);
 	mEmailFrame->setFrameStyle(TQFrame::NoFrame);
-	TQBoxLayout* layout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
-	TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint());
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
+	TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint());
 	grid->setColStretch(1, 1);
 
 	mEmailFromList = 0;
@@ -569,11 +569,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 	{
 		// Email sender identity
 		TQLabel* label = new TQLabel(i18n_EmailFrom(), mEmailFrame);
-		label->setFixedSize(label->sizeHint());
+		label->setFixedSize(label->tqsizeHint());
 		grid->addWidget(label, 0, 0);
 
 		mEmailFromList = new EmailIdCombo(KAMail::identityManager(), mEmailFrame);
-		mEmailFromList->setMinimumSize(mEmailFromList->sizeHint());
+		mEmailFromList->setMinimumSize(mEmailFromList->tqsizeHint());
 		label->setBuddy(mEmailFromList);
 		TQWhatsThis::add(mEmailFromList,
 		      i18n("Your email identity, used to identify you as the sender when sending email alarms."));
@@ -582,11 +582,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 
 	// Email recipients
 	TQLabel* label = new TQLabel(i18n_EmailTo(), mEmailFrame);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 1, 0);
 
 	mEmailToEdit = new LineEdit(LineEdit::Emails, mEmailFrame);
-	mEmailToEdit->setMinimumSize(mEmailToEdit->sizeHint());
+	mEmailToEdit->setMinimumSize(mEmailToEdit->tqsizeHint());
 	TQWhatsThis::add(mEmailToEdit,
 	      i18n("Enter the addresses of the email recipients. Separate multiple addresses by "
 	           "commas or semicolons."));
@@ -594,7 +594,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 
 	mEmailAddressButton = new TQPushButton(mEmailFrame);
 	mEmailAddressButton->setPixmap(SmallIcon("contents"));
-	mEmailAddressButton->setFixedSize(mEmailAddressButton->sizeHint());
+	mEmailAddressButton->setFixedSize(mEmailAddressButton->tqsizeHint());
 	connect(mEmailAddressButton, TQT_SIGNAL(clicked()), TQT_SLOT(openAddressBook()));
 	TQToolTip::add(mEmailAddressButton, i18n("Open address book"));
 	TQWhatsThis::add(mEmailAddressButton, i18n("Select email addresses from your address book."));
@@ -602,11 +602,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 
 	// Email subject
 	label = new TQLabel(i18n_j_EmailSubject(), mEmailFrame);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 2, 0);
 
 	mEmailSubjectEdit = new LineEdit(mEmailFrame);
-	mEmailSubjectEdit->setMinimumSize(mEmailSubjectEdit->sizeHint());
+	mEmailSubjectEdit->setMinimumSize(mEmailSubjectEdit->tqsizeHint());
 	label->setBuddy(mEmailSubjectEdit);
 	TQWhatsThis::add(mEmailSubjectEdit, i18n("Enter the email subject."));
 	grid->addMultiCellWidget(mEmailSubjectEdit, 2, 2, 1, 2);
@@ -614,19 +614,19 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 	// Email body
 	mEmailMessageEdit = new TextEdit(mEmailFrame);
 	TQWhatsThis::add(mEmailMessageEdit, i18n("Enter the email message."));
-	layout->addWidget(mEmailMessageEdit);
+	tqlayout->addWidget(mEmailMessageEdit);
 
 	// Email attachments
-	grid = new TQGridLayout(layout, 2, 3, spacingHint());
+	grid = new TQGridLayout(tqlayout, 2, 3, spacingHint());
 	label = new TQLabel(i18n("Attachment&s:"), mEmailFrame);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 0, 0);
 
 	mEmailAttachList = new TQComboBox(true, mEmailFrame);
-	mEmailAttachList->setMinimumSize(mEmailAttachList->sizeHint());
+	mEmailAttachList->setMinimumSize(mEmailAttachList->tqsizeHint());
 	mEmailAttachList->lineEdit()->setReadOnly(true);
 TQListBox* list = mEmailAttachList->listBox();
-TQRect rect = list->geometry();
+TQRect rect = list->tqgeometry();
 list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
 	label->setBuddy(mEmailAttachList);
 	TQWhatsThis::add(mEmailAttachList,
@@ -646,7 +646,7 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
 
 	// BCC email to sender
 	mEmailBcc = new CheckBox(i18n_s_CopyEmailToSelf(), mEmailFrame);
-	mEmailBcc->setFixedSize(mEmailBcc->sizeHint());
+	mEmailBcc->setFixedSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc,
 	      i18n("If checked, the email will be blind copied to you."));
 	grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, Qt::AlignAuto);
@@ -708,7 +708,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 			if (event->isTemplate())
 			{
 				// Initialising from an alarm template: use current date
-				TQDateTime now = TQDateTime::currentDateTime();
+				TQDateTime now = TQDateTime::tqcurrentDateTime();
 				int afterTime = event->templateAfterTime();
 				if (afterTime >= 0)
 				{
@@ -750,7 +750,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 		                        TimePeriod::HOURS_MINUTES);
 		mLateCancel->showAutoClose(action == KAEvent::MESSAGE || action == KAEvent::FILE);
 		mLateCancel->setAutoClose(event->autoClose());
-		mLateCancel->setFixedSize(mLateCancel->sizeHint());
+		mLateCancel->setFixedSize(mLateCancel->tqsizeHint());
 		if (mShowInKorganizer)
 			mShowInKorganizer->setChecked(event->copyToKOrganizer());
 		mConfirmAck->setChecked(event->confirmAck());
@@ -804,7 +804,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 		mFontColourButton->setBgColour(Preferences::defaultBgColour());
 		mFontColourButton->setFgColour(Preferences::defaultFgColour());
 		mBgColourButton->setColour(Preferences::defaultBgColour());
-		TQDateTime defaultTime = TQDateTime::currentDateTime().addSecs(60);
+		TQDateTime defaultTime = TQDateTime::tqcurrentDateTime().addSecs(60);
 		if (mTemplate)
 		{
 			mTemplateTimeGroup->setButton(mTemplateTimeGroup->id(mTemplateDefaultTime));
@@ -817,7 +817,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 		mLateCancel->setMinutes((Preferences::defaultLateCancel() ? 1 : 0), false, TimePeriod::HOURS_MINUTES);
 		mLateCancel->showAutoClose(true);
 		mLateCancel->setAutoClose(Preferences::defaultAutoClose());
-		mLateCancel->setFixedSize(mLateCancel->sizeHint());
+		mLateCancel->setFixedSize(mLateCancel->tqsizeHint());
 		if (mShowInKorganizer)
 			mShowInKorganizer->setChecked(Preferences::defaultCopyToKOrganizer());
 		mConfirmAck->setChecked(Preferences::defaultConfirmAck());
@@ -1212,7 +1212,7 @@ void EditAlarmDlg::setEvent(KAEvent& event, const TQString& text, bool trial)
 		if (mRecurrenceEdit->repeatType() != RecurrenceEdit::NO_RECUR)
 		{
 			mRecurrenceEdit->updateEvent(event, !mTemplate);
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			bool dateOnly = mAlarmDateTime.isDateOnly();
 			if (dateOnly  &&  mAlarmDateTime.date() < now.date()
 			||  !dateOnly  &&  mAlarmDateTime.rawDateTime() < now)
@@ -1232,7 +1232,7 @@ void EditAlarmDlg::setEvent(KAEvent& event, const TQString& text, bool trial)
 					DateTime remindTime = mAlarmDateTime.addMins(-reminder);
 					if (mDeferDateTime >= remindTime)
 					{
-						if (remindTime > TQDateTime::currentDateTime())
+						if (remindTime > TQDateTime::tqcurrentDateTime())
 							deferral = false;    // ignore deferral if it's after next reminder
 						else if (mDeferDateTime > remindTime)
 							deferReminder = true;    // it's the reminder which is being deferred
@@ -1298,7 +1298,7 @@ void EditAlarmDlg::showEvent(TQShowEvent* se)
 		if (KAlarm::readConfigWindowSize(EDIT_DIALOG_NAME, s))
 			s.setHeight(s.height() + (mDeferGroup->isHidden() ? 0 : mDeferGroupHeight));
 		else
-			s = minimumSize();
+			s = tqminimumSize();
 		resize(s);
 	}
 	KWin::setOnDesktop(winId(), mDesktop);    // ensure it displays on the desktop expected by the user
@@ -1381,7 +1381,7 @@ void EditAlarmDlg::slotOk()
 	{
 		if (timedRecurrence)
 		{
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			if (mAlarmDateTime.date() < now.date()
 			||  mAlarmDateTime.date() == now.date()
 			    && !mAlarmDateTime.isDateOnly() && mAlarmDateTime.time() < now.time())
@@ -1530,7 +1530,7 @@ void EditAlarmDlg::slotEditDeferral()
 			return;
 		limit = false;
 	}
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	if (limit)
 	{
 		if (repeatCount  &&  start < now)
@@ -1557,7 +1557,7 @@ void EditAlarmDlg::slotEditDeferral()
 		if (reminder)
 		{
 			DateTime remindTime = start.addMins(-reminder);
-			if (TQDateTime::currentDateTime() < remindTime)
+			if (TQDateTime::tqcurrentDateTime() < remindTime)
 				start = remindTime;
 		}
 		deferDlg.setLimit(start.addSecs(-60));
@@ -1604,7 +1604,7 @@ void EditAlarmDlg::slotShowRecurrenceEdit()
 	mRecurPageIndex = mTabs->currentPageIndex();
 	if (!mReadOnly  &&  !mTemplate)
 	{
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		mAlarmDateTime = mTimeWidget->getDateTime(0, false, false);
 		bool expired = (mAlarmDateTime.dateTime() < now);
 		if (mRecurSetDefaultEndDate)
@@ -1826,7 +1826,7 @@ void EditAlarmDlg::slotAlarmTypeChanged(int)
 		focus = mEmailToEdit;
 	}
 	mLateCancel->showAutoClose(displayAlarm);
-	mLateCancel->setFixedSize(mLateCancel->sizeHint());
+	mLateCancel->setFixedSize(mLateCancel->tqsizeHint());
 	if (focus)
 		focus->setFocus();
 }
@@ -1948,7 +1948,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 		enum Err { NONE = 0, BLANK, NONEXISTENT, DIRECTORY, UNREADABLE, NOT_TEXT_IMAGE };
 		Err err = NONE;
 		KURL url;
-		int i = alarmtext.find(TQString::fromLatin1("/"));
+		int i = alarmtext.find(TQString::tqfromLatin1("/"));
 		if (i > 0  &&  alarmtext[i - 1] == ':')
 		{
 			url = alarmtext;
@@ -1973,7 +1973,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 			TQDir::setCurrent(TQDir::homeDirPath());
 			alarmtext = info.absFilePath();
 			url.setPath(alarmtext);
-			alarmtext = TQString::fromLatin1("file:") + alarmtext;
+			alarmtext = TQString::tqfromLatin1("file:") + alarmtext;
 			if (!err)
 			{
 				if      (info.isDir())        err = DIRECTORY;
@@ -2030,7 +2030,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 TextEdit::TextEdit(TQWidget* parent, const char* name)
 	: KTextEdit(parent, name)
 {
-	TQSize tsize = sizeHint();
+	TQSize tsize = tqsizeHint();
 	tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth());
 	setMinimumSize(tsize);
 }
diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp
index a0f5d4952..23af4aafc 100644
--- a/kalarm/eventlistviewbase.cpp
+++ b/kalarm/eventlistviewbase.cpp
@@ -458,8 +458,8 @@ TQString EventListWhatsThisBase::text(const TQPoint& pt)
 	int column = -1;
 	TQPoint viewportPt = mListView->viewport()->mapFrom(mListView, pt);
 	TQRect frame = mListView->header()->frameGeometry();
-	if (frame.contains(pt)
-	||  mListView->itemAt(TQPoint(mListView->itemMargin(), viewportPt.y())) && frame.contains(TQPoint(pt.x(), frame.y())))
+	if (frame.tqcontains(pt)
+	||  mListView->itemAt(TQPoint(mListView->itemMargin(), viewportPt.y())) && frame.tqcontains(TQPoint(pt.x(), frame.y())))
 		column = mListView->header()->sectionAt(pt.x());
 	return mListView->whatsThisText(column);
 }
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index a05517826..1bec3c7a8 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -90,24 +90,24 @@ void Find::display()
 		mDialog = new KFindDialog(false, mListView, "FindDlg", mOptions, mHistory, (mListView->selectedCount() > 1));
 #endif
 		mDialog->setHasSelection(false);
-		TQWidget* kalarmWidgets = mDialog->findExtension();
+		TQWidget* kalarmWidgets = mDialog->tqfindExtension();
 
 		// Alarm types
-		TQBoxLayout* layout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint());
+		TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint());
 		TQGroupBox* group = new TQGroupBox(i18n("Alarm Type"), kalarmWidgets);
-		layout->addWidget(group);
+		tqlayout->addWidget(group);
 		TQGridLayout* grid = new TQGridLayout(group, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 		grid->addRowSpacing(0, mDialog->fontMetrics().lineSpacing()/2);
 		grid->setColStretch(1, 1);
 
 		// Live & expired alarm selection
 		mLive = new TQCheckBox(i18n("Acti&ve"), group);
-		mLive->setFixedSize(mLive->sizeHint());
+		mLive->setFixedSize(mLive->tqsizeHint());
 		TQWhatsThis::add(mLive, i18n("Check to include active alarms in the search."));
 		grid->addWidget(mLive, 1, 0, Qt::AlignAuto);
 
 		mExpired = new TQCheckBox(i18n("Ex&pired"), group);
-		mExpired->setFixedSize(mExpired->sizeHint());
+		mExpired->setFixedSize(mExpired->tqsizeHint());
 		TQWhatsThis::add(mExpired,
 		      i18n("Check to include expired alarms in the search. "
 		           "This option is only available if expired alarms are currently being displayed."));
@@ -118,22 +118,22 @@ void Find::display()
 
 		// Alarm actions
 		mMessageType = new TQCheckBox(i18n("Text"), group, "message");
-		mMessageType->setFixedSize(mMessageType->sizeHint());
+		mMessageType->setFixedSize(mMessageType->tqsizeHint());
 		TQWhatsThis::add(mMessageType, i18n("Check to include text message alarms in the search."));
 		grid->addWidget(mMessageType, 3, 0);
 
 		mFileType = new TQCheckBox(i18n("Fi&le"), group, "file");
-		mFileType->setFixedSize(mFileType->sizeHint());
+		mFileType->setFixedSize(mFileType->tqsizeHint());
 		TQWhatsThis::add(mFileType, i18n("Check to include file alarms in the search."));
 		grid->addWidget(mFileType, 3, 2);
 
 		mCommandType = new TQCheckBox(i18n("Co&mmand"), group, "command");
-		mCommandType->setFixedSize(mCommandType->sizeHint());
+		mCommandType->setFixedSize(mCommandType->tqsizeHint());
 		TQWhatsThis::add(mCommandType, i18n("Check to include command alarms in the search."));
 		grid->addWidget(mCommandType, 4, 0);
 
 		mEmailType = new TQCheckBox(i18n("&Email"), group, "email");
-		mEmailType->setFixedSize(mEmailType->sizeHint());
+		mEmailType->setFixedSize(mEmailType->tqsizeHint());
 		TQWhatsThis::add(mEmailType, i18n("Check to include email alarms in the search."));
 		grid->addWidget(mEmailType, 4, 2);
 
@@ -211,7 +211,7 @@ void Find::slotFind()
 {
 	if (!mDialog)
 		return;
-	mHistory = mDialog->findHistory();    // save search history so that it can be displayed again
+	mHistory = mDialog->tqfindHistory();    // save search history so that it can be displayed again
 	mOptions = mDialog->options() & ~FIND_KALARM_OPTIONS;
 	mOptions |= (mLive->isEnabled()        && mLive->isChecked()        ? FIND_LIVE : 0)
 	         |  (mExpired->isEnabled()     && mExpired->isChecked()     ? FIND_EXPIRED : 0)
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 4273125a3..94497b969 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -57,8 +57,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
 		topLayout = new TQVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint());
 		topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint());
 	}
-	TQHBoxLayout* hlayout = new TQHBoxLayout(topLayout);
-	TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout);
+	TQHBoxLayout* htqlayout = new TQHBoxLayout(topLayout);
+	TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout);
 	if (fg)
 	{
 		TQHBox* box = new TQHBox(page);    // to group widgets for TQWhatsThis text
@@ -83,35 +83,35 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
 	connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour()));
 	label->setBuddy(mBgColourButton);
 	TQWhatsThis::add(box, i18n("Select the alarm message background color"));
-	hlayout->addStretch();
+	htqlayout->addStretch();
 
 	if (editColours)
 	{
-		TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
+		TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
 		TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page);
-		button->setFixedSize(button->sizeHint());
+		button->setFixedSize(button->tqsizeHint());
 		connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour()));
 		TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list."));
-		layout->addWidget(button);
+		tqlayout->addWidget(button);
 
 		mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page);
-		mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint());
+		mRemoveColourButton->setFixedSize(mRemoveColourButton->tqsizeHint());
 		connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour()));
 		TQWhatsThis::add(mRemoveColourButton,
 		      i18n("Remove the color currently shown in the background color chooser, from the color selection list."));
-		layout->addWidget(mRemoveColourButton);
+		tqlayout->addWidget(mRemoveColourButton);
 	}
 
 	if (defaultFont)
 	{
-		TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
+		TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
 		mDefaultFont = new CheckBox(i18n("Use &default font"), page);
-		mDefaultFont->setMinimumSize(mDefaultFont->sizeHint());
+		mDefaultFont->setMinimumSize(mDefaultFont->tqsizeHint());
 		connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool)));
 		TQWhatsThis::add(mDefaultFont,
 		      i18n("Check to use the default font current at the time the alarm is displayed."));
-		layout->addWidget(mDefaultFont);
-		layout->addWidget(new TQWidget(page));    // left adjust the widget
+		tqlayout->addWidget(mDefaultFont);
+		tqlayout->addWidget(new TQWidget(page));    // left adjust the widget
 	}
 	else
 		mDefaultFont = 0;
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index 48d0f9220..62888d462 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -43,26 +43,26 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name)
 	  mReadOnly(false)
 {
 	setFrameStyle(NoFrame);
-	TQHBoxLayout* layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
 
 	mButton = new PushButton(i18n("Font && Co&lor..."), this);
-	mButton->setFixedSize(mButton->sizeHint());
+	mButton->setFixedSize(mButton->tqsizeHint());
 	connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed()));
 	TQWhatsThis::add(mButton,
 	      i18n("Choose the font, and foreground and background color, for the alarm message."));
-	layout->addWidget(mButton);
+	tqlayout->addWidget(mButton);
 
 	// Font and colour sample display
 	mSample = new TQLineEdit(this);
 	mSample->setMinimumHeight(QMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2));
-	mSample->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding);
+	mSample->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding);
 	mSample->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
 	mSample->setCursorPosition(0);
-	mSample->setAlignment(Qt::AlignCenter);
+	mSample->tqsetAlignment(Qt::AlignCenter);
 	TQWhatsThis::add(mSample,
 	      i18n("This sample text illustrates the current font and color settings. "
 	           "You may edit it to test special characters."));
-	layout->addWidget(mSample);
+	tqlayout->addWidget(mSample);
 }
 
 void FontColourButton::setDefaultFont()
@@ -125,7 +125,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 	mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString::null, false, true, true);
 	mChooser->setBgColour(bgColour);
 	mChooser->setFgColour(fgColour);
@@ -133,8 +133,8 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c
 		mChooser->setDefaultFont();
 	else
 		mChooser->setFont(font);
-	layout->addWidget(mChooser);
-	layout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mChooser);
+	tqlayout->addSpacing(KDialog::spacingHint());
 }
 
 /******************************************************************************
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 28f73499d..db0ff7d34 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -174,7 +174,7 @@ bool addExpiredEvent(KAEvent& event)
 		return false;
 	bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE);
 	if (archiving)
-		event.setSaveDateTime(TQDateTime::currentDateTime());   // time stamp to control purging
+		event.setSaveDateTime(TQDateTime::tqcurrentDateTime());   // time stamp to control purging
 	KCal::Event* kcalEvent = cal->addEvent(event);
 	cal->save();
 
@@ -429,7 +429,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool
 	// Delete the event from the expired calendar file
 	if (KAEvent::uidStatus(id) == KAEvent::EXPIRED)
 	{
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		if (event.occursAfter(now, true))
 		{
 			if (event.recurs()  ||  event.repeatCount())
@@ -639,7 +639,7 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
 	{
 		if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
 		                              TQString::null, i18n("Enable"), i18n("Keep Disabled"),
-		                              TQString::fromLatin1("EditEnableAlarms"))
+		                              TQString::tqfromLatin1("EditEnableAlarms"))
 		                == KMessageBox::Yes)
 			Daemon::setAlarmsEnabled();
 	}
@@ -712,8 +712,8 @@ TQString runKMail(bool minimise)
 /******************************************************************************
 *  Start another program for DCOP access if it isn't already running.
 *  If 'windowName' is not empty, the program's window of that name is iconised.
-*  On exit, 'dcopName' contains the DCOP name to access the application, and
-*  'errorMessage' contains an error message if failure.
+*  On exit, 'dcopName' tqcontains the DCOP name to access the application, and
+*  'errorMessage' tqcontains an error message if failure.
 *  Reply = true if the program is now running.
 */
 bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage)
@@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 	if (!kapp->dcopClient()->isApplicationRegistered(program))
 	{
 		// KOrganizer is not already running, so start it
-		if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString::null, &errorMessage, &dcopName))
+		if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString::null, &errorMessage, &dcopName))
 		{
 			kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n";
 			return false;
@@ -746,10 +746,10 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 bool readConfigWindowSize(const char* window, TQSize& result)
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::fromLatin1(window));
+	config->setGroup(TQString::tqfromLatin1(window));
 	TQWidget* desktop = KApplication::desktop();
-	TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
-	                config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
+	TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), 0),
+	                config->readNumEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), 0));
 	if (s.isEmpty())
 		return false;
 	result = s;
@@ -763,10 +763,10 @@ bool readConfigWindowSize(const char* window, TQSize& result)
 void writeConfigWindowSize(const char* window, const TQSize& size)
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::fromLatin1(window));
+	config->setGroup(TQString::tqfromLatin1(window));
 	TQWidget* desktop = KApplication::desktop();
-	config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
-	config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
+	config->writeEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), size.width());
+	config->writeEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), size.height());
 	config->sync();
 }
 
@@ -793,7 +793,7 @@ int getVersionNumber(const TQString& version, TQString* subVersion)
 	//      if the representation returned by this method changes.
 	if (subVersion)
 		*subVersion = TQString::null;
-	int count = version.contains('.') + 1;
+	int count = version.tqcontains('.') + 1;
 	if (count < 2)
 		return 0;
 	bool ok;
@@ -834,20 +834,20 @@ FileType fileType(const TQString& mimetype)
 	static const char* formattedTextTypes[] = {
 		"html", "xml", 0 };
 
-	if (mimetype.startsWith(TQString::fromLatin1("image/")))
+	if (mimetype.startsWith(TQString::tqfromLatin1("image/")))
 		return Image;
 	int slash = mimetype.find('/');
 	if (slash < 0)
 		return Unknown;
 	TQString type = mimetype.mid(slash + 1);
 	const char* typel = type.latin1();
-	if (mimetype.startsWith(TQString::fromLatin1("application")))
+	if (mimetype.startsWith(TQString::tqfromLatin1("application")))
 	{
 		for (int i = 0;  applicationTypes[i];  ++i)
 			if (!strcmp(typel, applicationTypes[i]))
 				return TextApplication;
 	}
-	else if (mimetype.startsWith(TQString::fromLatin1("text")))
+	else if (mimetype.startsWith(TQString::tqfromLatin1("text")))
 	{
 		for (int i = 0;  formattedTextTypes[i];  ++i)
 			if (!strcmp(typel, formattedTextTypes[i]))
@@ -905,7 +905,7 @@ TQString stripAccel(const TQString& text)
 {
 	unsigned len = text.length();
 	TQString out = TQDeepCopy(text);
-	TQChar *corig = (TQChar*)out.unicode();
+	TQChar *corig = (TQChar*)out.tqunicode();
 	TQChar *cout  = corig;
 	TQChar *cin   = cout;
 	while (len)
@@ -1032,7 +1032,7 @@ bool runKOrganizer()
 {
 	TQString error;
 	TQCString dcopService;
-	int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService);
+	int result = KDCOPServiceStarter::self()->tqfindServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService);
 	if (result)
 	{
 		kdDebug(5950) << "Unable to start DCOP/Organizer: " << dcopService << " " << error << endl;
@@ -1042,7 +1042,7 @@ bool runKOrganizer()
 	// to load KOrganizer into Kontact. But if KOrganizer is running independently,
 	// the load() method doesn't exist.
 	TQCString dummy;
-	if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+	if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 	{
 		DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper
 		DCOPReply reply = ref.call("load()");
@@ -1051,7 +1051,7 @@ bool runKOrganizer()
 			kdWarning(5950) << "Error loading " << dcopService << endl;
 			return false;
 		}
-		if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+		if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 		{
 			kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
 			return false;
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 7607892db..a0f008f03 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -121,8 +121,8 @@ KAlarmApp::KAlarmApp()
 		connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged()));
 
 		KConfig* config = kapp->config();
-		config->setGroup(TQString::fromLatin1("General"));
-		mNoSystemTray           = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false);
+		config->setGroup(TQString::tqfromLatin1("General"));
+		mNoSystemTray           = config->readBoolEntry(TQString::tqfromLatin1("NoSystemTray"), false);
 		mSavedNoSystemTray      = mNoSystemTray;
 		mOldRunInSystemTray     = wantRunInSystemTray();
 		mDisableAlarmsIfStopped = mOldRunInSystemTray && !mNoSystemTray && Preferences::disableAlarmsIfStopped();
@@ -139,7 +139,7 @@ KAlarmApp::KAlarmApp()
 	if (!mSpeechEnabled)
 		kdDebug(5950) << "KAlarmApp::KAlarmApp(): speech synthesis disabled (KTTSD not found)" << endl;
 	// Check if KOrganizer is installed
-	TQString korg = TQString::fromLatin1("korganizer");
+	TQString korg = TQString::tqfromLatin1("korganizer");
 	mKOrganizerEnabled = !locate("exe", korg).isNull()  ||  !KStandardDirs::findExe(korg).isNull();
 	if (!mKOrganizerEnabled)
 		kdDebug(5950) << "KAlarmApp::KAlarmApp(): KOrganizer options disabled (KOrganizer not found)" << endl;
@@ -205,7 +205,7 @@ bool KAlarmApp::restoreSession()
 	for (int i = 1;  KMainWindow::canBeRestored(i);  ++i)
 	{
 		TQString type = KMainWindow::classNameOfToplevel(i);
-		if (type == TQString::fromLatin1("MainWindow"))
+		if (type == TQString::tqfromLatin1("MainWindow"))
 		{
 			MainWindow* win = MainWindow::create(true);
 			win->restore(i, false);
@@ -214,7 +214,7 @@ bool KAlarmApp::restoreSession()
 			else
 				win->show();
 		}
-		else if (type == TQString::fromLatin1("MessageWin"))
+		else if (type == TQString::tqfromLatin1("MessageWin"))
 		{
 			MessageWin* win = new MessageWin;
 			win->restore(i, false);
@@ -329,9 +329,9 @@ int KAlarmApp::newInstance()
 				if (args->isSet("triggerEvent"))  { function = EVENT_TRIGGER;  option = "triggerEvent";  ++count; }
 				if (args->isSet("cancelEvent"))   { function = EVENT_CANCEL;   option = "cancelEvent";   ++count; }
 				if (!count)
-					USAGE(i18n("%1 requires %2, %3 or %4").arg(TQString::fromLatin1("--calendarURL")).arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent")))
+					USAGE(i18n("%1 requires %2, %3 or %4").arg(TQString::tqfromLatin1("--calendarURL")).arg(TQString::tqfromLatin1("--handleEvent")).arg(TQString::tqfromLatin1("--triggerEvent")).arg(TQString::tqfromLatin1("--cancelEvent")))
 				if (count > 1)
-					USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent")));
+					USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::tqfromLatin1("--handleEvent")).arg(TQString::tqfromLatin1("--triggerEvent")).arg(TQString::tqfromLatin1("--cancelEvent")));
 				if (!initCheck(true))   // open the calendar, don't register with daemon yet
 				{
 					exitCode = 1;
@@ -341,11 +341,11 @@ int KAlarmApp::newInstance()
 				{
 					TQString calendarUrl = args->getOption("calendarURL");
 					if (KURL(calendarUrl).url() != AlarmCalendar::activeCalendar()->urlString())
-						USAGE(i18n("%1: wrong calendar file").arg(TQString::fromLatin1("--calendarURL")))
+						USAGE(i18n("%1: wrong calendar file").arg(TQString::tqfromLatin1("--calendarURL")))
 				}
 				TQString eventID = args->getOption(option);
 				args->clear();      // free up memory
-				if (eventID.startsWith(TQString::fromLatin1("ad:")))
+				if (eventID.startsWith(TQString::tqfromLatin1("ad:")))
 				{
 					// It's a notification from the alarm deamon
 					eventID = eventID.mid(3);
@@ -369,7 +369,7 @@ int KAlarmApp::newInstance()
 				}
 				if (!KAlarm::edit(eventID))
 				{
-					USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::fromLatin1("--edit")).arg(eventID))
+					USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::tqfromLatin1("--edit")).arg(eventID))
 					exitCode = 1;
 					break;
 				}
@@ -401,11 +401,11 @@ int KAlarmApp::newInstance()
 				{
 					kdDebug(5950)<<"KAlarmApp::newInstance(): file\n";
 					if (args->isSet("exec"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--exec")).arg(TQString::fromLatin1("--file")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--exec")).arg(TQString::tqfromLatin1("--file")))
 					if (args->isSet("mail"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--file")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--mail")).arg(TQString::tqfromLatin1("--file")))
 					if (args->count())
-						USAGE(i18n("message incompatible with %1").arg(TQString::fromLatin1("--file")))
+						USAGE(i18n("message incompatible with %1").arg(TQString::tqfromLatin1("--file")))
 					alMessage = args->getOption("file");
 					action = KAEvent::FILE;
 				}
@@ -413,7 +413,7 @@ int KAlarmApp::newInstance()
 				{
 					kdDebug(5950)<<"KAlarmApp::newInstance(): exec\n";
 					if (args->isSet("mail"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--exec")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--mail")).arg(TQString::tqfromLatin1("--exec")))
 					alMessage = args->getOption("exec");
 					int n = args->count();
 					for (int i = 0;  i < n;  ++i)
@@ -435,7 +435,7 @@ int KAlarmApp::newInstance()
 					{
 						TQString addr = TQString::fromLocal8Bit(*i);
 						if (!KAMail::checkAddress(addr))
-							USAGE(i18n("%1: invalid email address").arg(TQString::fromLatin1("--mail")))
+							USAGE(i18n("%1: invalid email address").arg(TQString::tqfromLatin1("--mail")))
 						alAddresses += KCal::Person(TQString::null, addr);
 					}
 					params = args->getOptionList("attach");
@@ -453,13 +453,13 @@ int KAlarmApp::newInstance()
 				if (action != KAEvent::EMAIL)
 				{
 					if (args->isSet("subject"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--subject")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--subject")).arg(TQString::tqfromLatin1("--mail")))
 					if (args->isSet("from-id"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--from-id")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--from-id")).arg(TQString::tqfromLatin1("--mail")))
 					if (args->isSet("attach"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--attach")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--attach")).arg(TQString::tqfromLatin1("--mail")))
 					if (args->isSet("bcc"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--bcc")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--bcc")).arg(TQString::tqfromLatin1("--mail")))
 				}
 
 				bool      alarmNoTime = false;
@@ -475,10 +475,10 @@ int KAlarmApp::newInstance()
 					TQCString colourText = args->getOption("color");
 					if (static_cast(colourText)[0] == '0'
 					&&  tolower(static_cast(colourText)[1]) == 'x')
-						colourText.replace(0, 2, "#");
+						colourText.tqreplace(0, 2, "#");
 					bgColour.setNamedColor(colourText);
 					if (!bgColour.isValid())
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--color")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--color")))
 				}
 				if (args->isSet("colorfg"))
 				{
@@ -486,28 +486,28 @@ int KAlarmApp::newInstance()
 					TQCString colourText = args->getOption("colorfg");
 					if (static_cast(colourText)[0] == '0'
 					&&  tolower(static_cast(colourText)[1]) == 'x')
-						colourText.replace(0, 2, "#");
+						colourText.tqreplace(0, 2, "#");
 					fgColour.setNamedColor(colourText);
 					if (!fgColour.isValid())
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--colorfg")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--colorfg")))
 				}
 
 				if (args->isSet("time"))
 				{
 					TQCString dateTime = args->getOption("time");
 					if (!convWakeTime(dateTime, alarmTime, alarmNoTime))
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--time")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--time")))
 				}
 				else
-					alarmTime = TQDateTime::currentDateTime();
+					alarmTime = TQDateTime::tqcurrentDateTime();
 
 				bool haveRecurrence = args->isSet("recurrence");
 				if (haveRecurrence)
 				{
 					if (args->isSet("login"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--recurrence")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--login")).arg(TQString::tqfromLatin1("--recurrence")))
 					if (args->isSet("until"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--recurrence")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--recurrence")))
 					TQCString rule = args->getOption("recurrence");
 					recurrence.set(TQString::fromLocal8Bit(static_cast(rule)));
 				}
@@ -516,24 +516,24 @@ int KAlarmApp::newInstance()
 					// Repeat count is specified
 					int count;
 					if (args->isSet("login"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--login")).arg(TQString::tqfromLatin1("--interval")))
 					bool ok;
 					if (args->isSet("repeat"))
 					{
 						count = args->getOption("repeat").toInt(&ok);
 						if (!ok || !count || count < -1 || (count < 0 && haveRecurrence))
-							USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--repeat")))
+							USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--repeat")))
 					}
 					else if (haveRecurrence)
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--interval")).arg(TQString::tqfromLatin1("--repeat")))
 					else if (args->isSet("until"))
 					{
 						count = 0;
 						TQCString dateTime = args->getOption("until");
 						if (!convWakeTime(dateTime, endTime, alarmNoTime))
-							USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--until")))
+							USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--until")))
 						if (endTime < alarmTime)
-							USAGE(i18n("%1 earlier than %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--time")))
+							USAGE(i18n("%1 earlier than %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--time")))
 					}
 					else
 						count = -1;
@@ -543,16 +543,16 @@ int KAlarmApp::newInstance()
 					KARecurrence::Type recurType;
 					if (!convInterval(args->getOption("interval"), recurType, interval, !haveRecurrence)
 					||  interval < 0)
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--interval")))
 					if (alarmNoTime  &&  recurType == KARecurrence::MINUTELY)
-						USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::tqfromLatin1("--interval")))
 
 					if (haveRecurrence)
 					{
 						// There is a also a recurrence specified, so set up a sub-repetition
 						int longestInterval = recurrence.longestInterval();
 						if (count * interval > longestInterval)
-							USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--recurrence")));
+							USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::tqfromLatin1("--interval")).arg(TQString::tqfromLatin1("--repeat")).arg(TQString::tqfromLatin1("--recurrence")));
 						repeatCount    = count;
 						repeatInterval = interval;
 					}
@@ -566,9 +566,9 @@ int KAlarmApp::newInstance()
 				else
 				{
 					if (args->isSet("repeat"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--repeat")).arg(TQString::tqfromLatin1("--interval")))
 					if (args->isSet("until"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--interval")))
 				}
 
 				TQCString audioFile;
@@ -582,11 +582,11 @@ int KAlarmApp::newInstance()
 				{
 					// Play a sound with the alarm
 					if (audioRepeat  &&  args->isSet("play"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--play")).arg(TQString::tqfromLatin1("--play-repeat")))
 					if (args->isSet("beep"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--beep")).arg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
 					if (args->isSet("speak"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--speak")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--speak")).arg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
 					audioFile = args->getOption(audioRepeat ? "play-repeat" : "play");
 #ifndef WITHOUT_ARTS
 					if (args->isSet("volume"))
@@ -594,21 +594,21 @@ int KAlarmApp::newInstance()
 						bool ok;
 						int volumepc = args->getOption("volume").toInt(&ok);
 						if (!ok  ||  volumepc < 0  ||  volumepc > 100)
-							USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--volume")))
+							USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--volume")))
 						audioVolume = static_cast(volumepc) / 100;
 					}
 #endif
 				}
 #ifndef WITHOUT_ARTS
 				else if (args->isSet("volume"))
-					USAGE(i18n("%1 requires %2 or %3").arg(TQString::fromLatin1("--volume")).arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat")))
+					USAGE(i18n("%1 requires %2 or %3").arg(TQString::tqfromLatin1("--volume")).arg(TQString::tqfromLatin1("--play")).arg(TQString::tqfromLatin1("--play-repeat")))
 #endif
 				if (args->isSet("speak"))
 				{
 					if (args->isSet("beep"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1("--speak")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--beep")).arg(TQString::tqfromLatin1("--speak")))
 					if (!mSpeechEnabled)
-						USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::fromLatin1("--speak")))
+						USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::tqfromLatin1("--speak")))
 				}
 				int reminderMinutes = 0;
 				bool onceOnly = args->isSet("reminder-once");
@@ -616,12 +616,12 @@ int KAlarmApp::newInstance()
 				{
 					// Issue a reminder alarm in advance of the main alarm
 					if (onceOnly  &&  args->isSet("reminder"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--reminder")).arg(TQString::fromLatin1("--reminder-once")))
-					TQString opt = onceOnly ? TQString::fromLatin1("--reminder-once") : TQString::fromLatin1("--reminder");
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--reminder")).arg(TQString::tqfromLatin1("--reminder-once")))
+					TQString opt = onceOnly ? TQString::tqfromLatin1("--reminder-once") : TQString::tqfromLatin1("--reminder");
 					if (args->isSet("exec"))
-						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--exec")))
+						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::tqfromLatin1("--exec")))
 					if (args->isSet("mail"))
-						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::tqfromLatin1("--mail")))
 					KARecurrence::Type recurType;
 					TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder");
 					if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes))
@@ -636,10 +636,10 @@ int KAlarmApp::newInstance()
 					KARecurrence::Type recurType;
 					bool ok = convInterval(args->getOption("late-cancel"), recurType, lateCancel);
 					if (!ok  ||  lateCancel <= 0)
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("late-cancel")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("late-cancel")))
 				}
 				else if (args->isSet("auto-close"))
-					USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--auto-close")).arg(TQString::fromLatin1("--late-cancel")))
+					USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--auto-close")).arg(TQString::tqfromLatin1("--late-cancel")))
 
 				int flags = KAEvent::DEFAULT_FONT;
 				if (args->isSet("ack-confirm"))
@@ -683,52 +683,52 @@ int KAlarmApp::newInstance()
 				// No arguments - run interactively & display the main window
 				kdDebug(5950)<<"KAlarmApp::newInstance(): interactive\n";
 				if (args->isSet("ack-confirm"))
-					usage += TQString::fromLatin1("--ack-confirm ");
+					usage += TQString::tqfromLatin1("--ack-confirm ");
 				if (args->isSet("attach"))
-					usage += TQString::fromLatin1("--attach ");
+					usage += TQString::tqfromLatin1("--attach ");
 				if (args->isSet("auto-close"))
-					usage += TQString::fromLatin1("--auto-close ");
+					usage += TQString::tqfromLatin1("--auto-close ");
 				if (args->isSet("bcc"))
-					usage += TQString::fromLatin1("--bcc ");
+					usage += TQString::tqfromLatin1("--bcc ");
 				if (args->isSet("beep"))
-					usage += TQString::fromLatin1("--beep ");
+					usage += TQString::tqfromLatin1("--beep ");
 				if (args->isSet("color"))
-					usage += TQString::fromLatin1("--color ");
+					usage += TQString::tqfromLatin1("--color ");
 				if (args->isSet("colorfg"))
-					usage += TQString::fromLatin1("--colorfg ");
+					usage += TQString::tqfromLatin1("--colorfg ");
 				if (args->isSet("disable"))
-					usage += TQString::fromLatin1("--disable ");
+					usage += TQString::tqfromLatin1("--disable ");
 				if (args->isSet("from-id"))
-					usage += TQString::fromLatin1("--from-id ");
+					usage += TQString::tqfromLatin1("--from-id ");
 				if (args->isSet("korganizer"))
-					usage += TQString::fromLatin1("--korganizer ");
+					usage += TQString::tqfromLatin1("--korganizer ");
 				if (args->isSet("late-cancel"))
-					usage += TQString::fromLatin1("--late-cancel ");
+					usage += TQString::tqfromLatin1("--late-cancel ");
 				if (args->isSet("login"))
-					usage += TQString::fromLatin1("--login ");
+					usage += TQString::tqfromLatin1("--login ");
 				if (args->isSet("play"))
-					usage += TQString::fromLatin1("--play ");
+					usage += TQString::tqfromLatin1("--play ");
 #ifndef WITHOUT_ARTS
 				if (args->isSet("play-repeat"))
-					usage += TQString::fromLatin1("--play-repeat ");
+					usage += TQString::tqfromLatin1("--play-repeat ");
 #endif
 				if (args->isSet("reminder"))
-					usage += TQString::fromLatin1("--reminder ");
+					usage += TQString::tqfromLatin1("--reminder ");
 				if (args->isSet("reminder-once"))
-					usage += TQString::fromLatin1("--reminder-once ");
+					usage += TQString::tqfromLatin1("--reminder-once ");
 				if (args->isSet("speak"))
-					usage += TQString::fromLatin1("--speak ");
+					usage += TQString::tqfromLatin1("--speak ");
 				if (args->isSet("subject"))
-					usage += TQString::fromLatin1("--subject ");
+					usage += TQString::tqfromLatin1("--subject ");
 				if (args->isSet("time"))
-					usage += TQString::fromLatin1("--time ");
+					usage += TQString::tqfromLatin1("--time ");
 #ifndef WITHOUT_ARTS
 				if (args->isSet("volume"))
-					usage += TQString::fromLatin1("--volume ");
+					usage += TQString::tqfromLatin1("--volume ");
 #endif
 				if (!usage.isEmpty())
 				{
-					usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::fromLatin1("--file")).arg(TQString::fromLatin1("--exec"));
+					usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::tqfromLatin1("--file")).arg(TQString::tqfromLatin1("--exec"));
 					break;
 				}
 
@@ -1043,8 +1043,8 @@ bool KAlarmApp::checkSystemTray()
 		// tray and alarms are disabled when KAlarm is not running, registering with
 		// NO_START_NOTIFY could result in alarms never being seen.
 		KConfig* config = kapp->config();
-		config->setGroup(TQString::fromLatin1("General"));
-		config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray);
+		config->setGroup(TQString::tqfromLatin1("General"));
+		config->writeEntry(TQString::tqfromLatin1("NoSystemTray"), mNoSystemTray);
 		config->sync();
 
 		// Update other settings and reregister with the alarm daemon
@@ -1174,7 +1174,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons
 	kdDebug(5950) << "KAlarmApp::scheduleEvent(): " << text << endl;
 	if (!dateTime.isValid())
 		return false;
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	if (lateCancel  &&  dateTime < now.addSecs(-maxLateness(lateCancel)))
 		return true;               // alarm time was already expired too long ago
 	TQDateTime alarmTime = dateTime;
@@ -1266,7 +1266,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function)
 		case EVENT_TRIGGER:    // handle it if it's due, else execute it regardless
 		case EVENT_HANDLE:     // handle it if it's due
 		{
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			bool updateCalAndDisplay = false;
 			bool alarmToExecuteValid = false;
 			KAAlarm alarmToExecute;
@@ -1502,7 +1502,7 @@ void KAlarmApp::rescheduleAlarm(KAEvent& event, const KAAlarm& alarm, bool updat
 	else
 	{
 		// Reschedule the alarm for its next recurrence.
-		KAEvent::OccurType type = event.setNextOccurrence(TQDateTime::currentDateTime());
+		KAEvent::OccurType type = event.setNextOccurrence(TQDateTime::tqcurrentDateTime());
 		switch (type)
 		{
 			case KAEvent::NO_OCCURRENCE:
@@ -1592,9 +1592,9 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 			MessageWin* win = MessageWin::findEvent(event.id());
 			// Find if we're changing a reminder message to the real message
 			bool reminder = (alarm.type() & KAAlarm::REMINDER_ALARM);
-			bool replaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM);
+			bool tqreplaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM);
 			if (!reminder  &&  !event.deferred()
-			&&  (replaceReminder || !win)  &&  !noPreAction
+			&&  (tqreplaceReminder || !win)  &&  !noPreAction
 			&&  !event.preAction().isEmpty()  &&  ShellProcess::authorised())
 			{
 				// It's not a reminder or a deferred alarm, and there is no message window
@@ -1622,11 +1622,11 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 				delete win;        // event is disabled - close its window
 			else if (!win
 			     ||  !win->hasDefer() && !alarm.repeatAtLogin()
-			     ||  replaceReminder)
+			     ||  tqreplaceReminder)
 			{
 				// Either there isn't already a message for this event,
 				// or there is a repeat-at-login message with no Defer
-				// button, which needs to be replaced with a new message,
+				// button, which needs to be tqreplaced with a new message,
 				// or the caption needs to be changed from "Reminder" to "Message".
 				if (win)
 					win->setRecreating();    // prevent post-alarm actions
@@ -1704,43 +1704,43 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 	{
 		// Execute the command in a terminal window.
 		cmd = Preferences::cmdXTermCommand();
-		cmd.replace("%t", aboutData()->programName());     // set the terminal window title
+		cmd.tqreplace("%t", aboutData()->programName());     // set the terminal window title
 		if (cmd.find("%C") >= 0)
 		{
 			// Execute the command from a temporary script file
 			if (flags & ProcData::TEMP_FILE)
-				cmd.replace("%C", command);    // the command is already calling a temporary file
+				cmd.tqreplace("%C", command);    // the command is already calling a temporary file
 			else
 			{
 				tmpXtermFile = createTempScriptFile(command, true, event, *alarm);
 				if (tmpXtermFile.isEmpty())
 					return 0;
-				cmd.replace("%C", tmpXtermFile);    // %C indicates where to insert the command
+				cmd.tqreplace("%C", tmpXtermFile);    // %C indicates where to insert the command
 			}
 		}
 		else if (cmd.find("%W") >= 0)
 		{
 			// Execute the command from a temporary script file,
 			// with a sleep after the command is executed
-			tmpXtermFile = createTempScriptFile(command + TQString::fromLatin1("\nsleep 86400\n"), true, event, *alarm);
+			tmpXtermFile = createTempScriptFile(command + TQString::tqfromLatin1("\nsleep 86400\n"), true, event, *alarm);
 			if (tmpXtermFile.isEmpty())
 				return 0;
-			cmd.replace("%W", tmpXtermFile);    // %w indicates where to insert the command
+			cmd.tqreplace("%W", tmpXtermFile);    // %w indicates where to insert the command
 		}
 		else if (cmd.find("%w") >= 0)
 		{
 			// Append a sleep to the command.
-			// Quote the command in case it contains characters such as [>|;].
-			TQString exec = KShellProcess::quote(command + TQString::fromLatin1("; sleep 86400"));
-			cmd.replace("%w", exec);    // %w indicates where to insert the command string
+			// Quote the command in case it tqcontains characters such as [>|;].
+			TQString exec = KShellProcess::quote(command + TQString::tqfromLatin1("; sleep 86400"));
+			cmd.tqreplace("%w", exec);    // %w indicates where to insert the command string
 		}
 		else
 		{
 			// Set the command to execute.
-			// Put it in quotes in case it contains characters such as [>|;].
+			// Put it in quotes in case it tqcontains characters such as [>|;].
 			TQString exec = KShellProcess::quote(command);
 			if (cmd.find("%c") >= 0)
-				cmd.replace("%c", exec);    // %c indicates where to insert the command string
+				cmd.tqreplace("%c", exec);    // %c indicates where to insert the command string
 			else
 				cmd.append(exec);           // otherwise, simply append the command string
 		}
@@ -1759,7 +1759,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 		// Set up a logging process to write the command's output to.
 		connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
 		connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
-		logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile()));
+		logproc = new ShellProcess(TQString::tqfromLatin1("cat >>%1").arg(event.logFile()));
 		connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
 		logproc->start(KProcess::Stdin);
 		TQCString heading;
@@ -2068,7 +2068,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool&
 	else
 	{
 		// Compile the values into a date/time structure
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		if (dt[0] < 0)
 			date.setYMD(now.date().year(),
 			            (dt[1] < 0 ? now.date().month() : dt[1]),
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 1f325be48..1b738b043 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -37,7 +37,7 @@ TQStringList             ADCalendar::mCalendarUrls;    // never delete or reorde
 
 
 ADCalendar::ADCalendar(const TQString& url, const TQCString& appname)
-	: KCal::CalendarLocal(TQString::fromLatin1("UTC")),
+	: KCal::CalendarLocal(TQString::tqfromLatin1("UTC")),
 	  mUrlString(url),
 	  mAppName(appname),
 	  mLoaded(false),
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index c8c5dd355..68344fa28 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -31,13 +31,13 @@
 #include "adconfigdata.h"
 
 // Config file key strings
-const TQString CLIENT_GROUP(TQString::fromLatin1("Client "));
+const TQString CLIENT_GROUP(TQString::tqfromLatin1("Client "));
 const TQRegExp CLIENT_GROUP_SEARCH("^Client ");
 // Client data file key strings
-const TQString CALENDAR_KEY(TQString::fromLatin1("Calendar"));
-const TQString TITLE_KEY(TQString::fromLatin1("Title"));
-const TQString DCOP_OBJECT_KEY(TQString::fromLatin1("DCOP object"));
-const TQString START_CLIENT_KEY(TQString::fromLatin1("Start"));
+const TQString CALENDAR_KEY(TQString::tqfromLatin1("Calendar"));
+const TQString TITLE_KEY(TQString::tqfromLatin1("Title"));
+const TQString DCOP_OBJECT_KEY(TQString::tqfromLatin1("DCOP object"));
+const TQString START_CLIENT_KEY(TQString::tqfromLatin1("Start"));
 
 
 /******************************************************************************
@@ -139,8 +139,8 @@ void ADConfigData::enableAutoStart(bool on)
         kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
         KConfig* config = KGlobal::config();
 	config->reparseConfiguration();
-        config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
-        config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
+        config->setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+        config->writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), on);
         config->sync();
 }
 
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index d8bcf83a2..4b6495728 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -54,8 +54,8 @@ static const int KALARM_AUTOSTART_TIMEOUT = 30;
 static const int SECS_PER_DAY = 3600 * 24;
 
 // KAlarm config file keys
-static const TQString START_OF_DAY(TQString::fromLatin1("StartOfDay"));
-static const TQString AUTOSTART_TRAY(TQString::fromLatin1("AutostartTray"));
+static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay"));
+static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray"));
 
 
 AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
@@ -84,7 +84,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 		 * itself and instead will simply open a new window.
 		 */
 		KConfig kaconfig(locate("config", "kalarmrc"));
-		kaconfig.setGroup(TQString::fromLatin1("General"));
+		kaconfig.setGroup(TQString::tqfromLatin1("General"));
 		autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
 		if (autostart)
 		{
@@ -119,8 +119,8 @@ void AlarmDaemon::autostartKAlarm()
 	}
 	kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
 	TQStringList args;
-	args << TQString::fromLatin1("--tray");
-	int ret = KApplication::kdeinitExec(TQString::fromLatin1("kalarm"), args);
+	args << TQString::tqfromLatin1("--tray");
+	int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args);
 	if (ret)
 		kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
 	else
@@ -365,7 +365,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 	if (!cal->loaded()  ||  !cal->enabled())
 		return;
 
-	TQDateTime now  = TQDateTime::currentDateTime();
+	TQDateTime now  = TQDateTime::tqcurrentDateTime();
 	kdDebug(5901) << "  To: " << now.toString() << endl;
 	TQValueList alarms = cal->alarmsTo(now);
 	if (!alarms.count())
@@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 		// The times for non-due alarms are set invalid in 'alarmtimes'.
 		bool recurs = event->doesRecur();
 		const TQStringList cats = event->categories();
-		bool floats = (cats.find(TQString::fromLatin1("DATE")) != cats.end());
+		bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end());
 		TQDateTime nextDateTime = event->dtStart();
 		if (recurs)
 		{
@@ -478,7 +478,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 		return false;
 	}
 	kdDebug(5900) << "AlarmDaemon::notifyEvent(" << appname << ", " << eventID << "): notification type=" << client->startClient() << endl;
-	TQString id = TQString::fromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
+	TQString id = TQString::tqfromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
 
 	// Check if the client application is running and ready to receive notification
 	bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast(appname));
@@ -595,7 +595,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 void AlarmDaemon::readKAlarmConfig()
 {
 	KConfig config(locate("config", "kalarmrc"));
-	config.setGroup(TQString::fromLatin1("General"));
+	config.setGroup(TQString::tqfromLatin1("General"));
 	TQDateTime defTime(TQDate(1900,1,1), TQTime());
 	mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();
 	kdDebug(5900) << "AlarmDaemon::readKAlarmConfig()" << endl;
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 18bb03945..ab4747e34 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -100,7 +100,7 @@ KPIM::IdentityManager* KAMail::identityManager()
 /******************************************************************************
 * Send the email message specified in an event.
 * Reply = true if the message was sent - 'errmsgs' may contain copy error messages.
-*       = false if the message was not sent - 'errmsgs' contains the error messages.
+*       = false if the message was not sent - 'errmsgs' tqcontains the error messages.
 */
 bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
 {
@@ -153,30 +153,30 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
 	{
 		// Use sendmail to send the message
 		TQString textComplete;
-		TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
-		                                         TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+		TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
+		                                         TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
 		if (!command.isNull())
 		{
-			command += TQString::fromLatin1(" -f ");
+			command += TQString::tqfromLatin1(" -f ");
 			command += KPIM::getEmailAddress(from);
-			command += TQString::fromLatin1(" -oi -t ");
+			command += TQString::tqfromLatin1(" -oi -t ");
 			textComplete = initHeaders(data, false);
 		}
 		else
 		{
-			command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
+			command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
 			if (command.isNull())
 			{
-				errmsgs = errors(i18n("%1 not found").arg(TQString::fromLatin1("sendmail"))); // give up
+				errmsgs = errors(i18n("%1 not found").arg(TQString::tqfromLatin1("sendmail"))); // give up
 				return false;
 			}
 
-			command += TQString::fromLatin1(" -s ");
+			command += TQString::tqfromLatin1(" -s ");
 			command += KShellProcess::quote(event.emailSubject());
 
 			if (!data.bcc.isEmpty())
 			{
-				command += TQString::fromLatin1(" -b ");
+				command += TQString::tqfromLatin1(" -b ");
 				command += KShellProcess::quote(data.bcc);
 			}
 
@@ -249,7 +249,7 @@ TQString KAMail::sendKMail(const KAMailData& data)
 		if (func.left(5) == "bool ")
 		{
 			func = func.mid(5);
-			func.replace(TQRegExp(" [0-9A-Za-z_:]+"), "");
+			func.tqreplace(TQRegExp(" [0-9A-Za-z_:]+"), "");
 			useSend = (func == sendFunction);
 		}
 	}
@@ -321,7 +321,7 @@ TQString KAMail::addToKMailFolder(const KAMailData& data, const char* folder, bo
 		// Notify KMail of the message in the temporary file
 		TQByteArray  callData;
 		TQDataStream arg(callData, IO_WriteOnly);
-		arg << TQString::fromLatin1(folder) << tmpFile.name();
+		arg << TQString::tqfromLatin1(folder) << tmpFile.name();
 		if (callKMail(callData, "KMailIface", "dcopAddMessage(TQString,TQString)", "int"))
 			return TQString::null;
 		err = i18n("Error calling KMail");
@@ -341,13 +341,13 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons
 	||  replyType != funcType)
 	{
 		TQCString funcname = function;
-		funcname.replace(TQRegExp("(.+$"), "()");
+		funcname.tqreplace(TQRegExp("(.+$"), "()");
 		kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call failed\n";;
 		return false;
 	}
 	TQDataStream replyStream(replyData, IO_ReadOnly);
 	TQCString funcname = function;
-	funcname.replace(TQRegExp("(.+$"), "()");
+	funcname.tqreplace(TQRegExp("(.+$"), "()");
 	if (replyType == "int")
 	{
 		int result;
@@ -385,16 +385,16 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
 		char buff[64];
 		strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow));
 		TQString from = data.from;
-		from.replace(TQRegExp("^.*<"), TQString::null).replace(TQRegExp(">.*$"), TQString::null);
-		message = TQString::fromLatin1(buff);
-		message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
+		from.tqreplace(TQRegExp("^.*<"), TQString::null).tqreplace(TQRegExp(">.*$"), TQString::null);
+		message = TQString::tqfromLatin1(buff);
+		message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
 	}
-	message += TQString::fromLatin1("From: ") + data.from;
-	message += TQString::fromLatin1("\nTo: ") + data.event.emailAddresses(", ");
+	message += TQString::tqfromLatin1("From: ") + data.from;
+	message += TQString::tqfromLatin1("\nTo: ") + data.event.emailAddresses(", ");
 	if (!data.bcc.isEmpty())
-		message += TQString::fromLatin1("\nBcc: ") + data.bcc;
-	message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject();
-	message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
+		message += TQString::tqfromLatin1("\nBcc: ") + data.bcc;
+	message += TQString::tqfromLatin1("\nSubject: ") + data.event.emailSubject();
+	message += TQString::tqfromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
 	return message;
 }
 
@@ -426,13 +426,13 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 		time(&timenow);
 		TQCString boundary;
 		boundary.sprintf("------------_%lu_-%lx=", 2*timenow, timenow);
-		message += TQString::fromLatin1("\nMIME-Version: 1.0");
-		message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n  boundary=\"%1\"\n").arg(boundary);
+		message += TQString::tqfromLatin1("\nMIME-Version: 1.0");
+		message += TQString::tqfromLatin1("\nContent-Type: multipart/mixed;\n  boundary=\"%1\"\n").arg(boundary);
 
 		if (!event.message().isEmpty())
 		{
 			// There is a message body
-			message += TQString::fromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").arg(boundary);
+			message += TQString::tqfromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").arg(boundary);
 			message += event.message();
 		}
 
@@ -463,10 +463,10 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 					text = (mimeType == textMimeTypes[i]);
 			}
 
-			message += TQString::fromLatin1("\n--%1").arg(boundary);
-			message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text());
-			message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::fromLatin1(text ? "8bit" : "BASE64"));
-			message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text());
+			message += TQString::tqfromLatin1("\n--%1").arg(boundary);
+			message += TQString::tqfromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text());
+			message += TQString::tqfromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::tqfromLatin1(text ? "8bit" : "BASE64"));
+			message += TQString::tqfromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text());
 
 			// Read the file contents
 			TQString tmpFile;
@@ -481,7 +481,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 			}
 			TQIODevice::Offset size = file.size();
 			char* contents = new char [size + 1];
-			Q_LONG bytes = file.readBlock(contents, size);
+			TQ_LONG bytes = file.readBlock(contents, size);
 			file.close();
 			contents[size] = 0;
 			bool atterror = false;
@@ -504,14 +504,14 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 					atterror = true;
 				}
 				else
-					message += TQString::fromLatin1(base64, base64Size);
+					message += TQString::tqfromLatin1(base64, base64Size);
 				delete[] base64;
 			}
 			delete[] contents;
 			if (atterror)
 				return attachError.arg(attachment);
 		}
-		message += TQString::fromLatin1("\n--%1--\n.\n").arg(boundary);
+		message += TQString::tqfromLatin1("\n--%1--\n.\n").arg(boundary);
 	}
 	return TQString::null;
 }
@@ -523,7 +523,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 void KAMail::notifyQueued(const KAEvent& event)
 {
 	KMime::Types::Address addr;
-	TQString localhost = TQString::fromLatin1("localhost");
+	TQString localhost = TQString::tqfromLatin1("localhost");
 	TQString hostname  = getHostName();
 	const EmailAddressList& addresses = event.emailAddresses();
 	for (TQValueList::ConstIterator it = addresses.begin();  it != addresses.end();  ++it)
@@ -925,7 +925,7 @@ TQStringList KAMail::errors(const TQString& err, bool sendfail)
 	                          : i18n("Error copying sent email to KMail %1 folder").arg(i18n_sent_mail());
 	if (err.isEmpty())
 		return TQStringList(error1);
-	TQStringList errs(TQString::fromLatin1("%1:").arg(error1));
+	TQStringList errs(TQString::tqfromLatin1("%1:").arg(error1));
 	errs += err;
 	return errs;
 }
@@ -933,7 +933,7 @@ TQStringList KAMail::errors(const TQString& err, bool sendfail)
 /******************************************************************************
 *  Get the body of an email, given its serial number.
 */
-TQString KAMail::getMailBody(Q_UINT32 serialNumber)
+TQString KAMail::getMailBody(TQ_UINT32 serialNumber)
 {
 	// Get the body of the email from KMail
 	TQCString    replyType;
@@ -943,7 +943,7 @@ TQString KAMail::getMailBody(Q_UINT32 serialNumber)
 	arg << serialNumber;
 	arg << (int)0;
 	TQString body;
-	if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(Q_UINT32,int)", data, replyType, replyData)
+	if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
 	&&  replyType == "TQString")
 	{
 		TQDataStream reply_stream(replyData, IO_ReadOnly);
diff --git a/kalarm/kamail.h b/kalarm/kamail.h
index 3ef561506..6e2d03004 100644
--- a/kalarm/kamail.h
+++ b/kalarm/kamail.h
@@ -45,7 +45,7 @@ class KAMail
 		static bool        identitiesExist();
 		static uint        identityUoid(const TQString& identityUoidOrName);
 		static TQString     controlCentreAddress();
-		static TQString     getMailBody(Q_UINT32 serialNumber);
+		static TQString     getMailBody(TQ_UINT32 serialNumber);
 		static TQString     i18n_NeedFromEmailAddress();
 		static TQString     i18n_sent_mail();
 
diff --git a/kalarm/karecurrence.cpp b/kalarm/karecurrence.cpp
index 8b7e9068f..4221a5ada 100644
--- a/kalarm/karecurrence.cpp
+++ b/kalarm/karecurrence.cpp
@@ -165,7 +165,7 @@ bool KARecurrence::init(RecurrenceRule::PeriodType recurType, int freq, int coun
  */
 bool KARecurrence::set(const TQString& icalRRULE)
 {
-	static TQString RRULE = TQString::fromLatin1("RRULE:");
+	static TQString RRULE = TQString::tqfromLatin1("RRULE:");
 	mCachedType = -1;
 	clear();
 	if (icalRRULE.isEmpty())
@@ -606,7 +606,7 @@ bool KARecurrence::recursOn(const TQDate& dt) const
 		return true;
 	// We know now that it isn't in EXDATES or EXRULES,
 	// so we just need to check if it's in RDATES or RRULES
-	if (rDates().contains(dt))
+	if (rDates().tqcontains(dt))
 		return true;
 	RecurrenceRule::List rulelist = rRules();
 	for (RecurrenceRule::List::ConstIterator rr = rulelist.begin();  rr != rulelist.end();  ++rr)
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index 3c7fab3b2..274ad9b72 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -58,31 +58,31 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c
 	mCheckboxFrame = new TQFrame(mStack);
 	mCheckboxFrame->setFrameStyle(TQFrame::NoFrame);
 	mStack->addWidget(mCheckboxFrame, 1);
-	TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mCheckboxFrame, 0, 0);
 	mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame);
-	mCheckbox->setFixedSize(mCheckbox->sizeHint());
+	mCheckbox->setFixedSize(mCheckbox->tqsizeHint());
 	connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
 	TQWhatsThis::add(mCheckbox, whatsThis);
-	layout->addWidget(mCheckbox, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mCheckbox, 0, Qt::AlignAuto);
 
 	mTimeSelectorFrame = new TQFrame(mStack);
 	mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame);
 	mStack->addWidget(mTimeSelectorFrame, 2);
-	layout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0);
+	tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0);
 	mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString::null,
 	                                 whatsThis, i18n("Enter how late will cause the alarm to be canceled"),
 	                                 allowHourMinute, mTimeSelectorFrame);
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
-	layout->addWidget(mTimeSelector);
+	tqlayout->addWidget(mTimeSelector);
 	mLayout->addWidget(mStack);
 
-	layout = new TQHBoxLayout(mLayout, KDialog::spacingHint());
-	layout->addSpacing(3*KDialog::spacingHint());
+	tqlayout = new TQHBoxLayout(mLayout, KDialog::spacingHint());
+	tqlayout->addSpacing(3*KDialog::spacingHint());
 	mAutoClose = new CheckBox(i18n_AutoCloseWin(), this);
-	mAutoClose->setFixedSize(mAutoClose->sizeHint());
+	mAutoClose->setFixedSize(mAutoClose->tqsizeHint());
 	TQWhatsThis::add(mAutoClose, i18n("Automatically close the alarm window after the expiry of the late-cancelation period"));
-	layout->addWidget(mAutoClose);
-	layout->addStretch();
+	tqlayout->addWidget(mAutoClose);
+	tqlayout->addStretch();
 
 	mAutoClose->hide();
 	mAutoClose->setEnabled(false);
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 04d08d62f..5b9146489 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -54,8 +54,8 @@ class LateCancelSelector : public QFrame
 		void           slotToggled(bool);
 
 	private:
-		TQBoxLayout*    mLayout;            // overall layout for the widget
-		TQWidgetStack*  mStack;             // contains mCheckboxFrame and mTimeSelectorFrame
+		TQBoxLayout*    mLayout;            // overall tqlayout for the widget
+		TQWidgetStack*  mStack;             // tqcontains mCheckboxFrame and mTimeSelectorFrame
 		TQFrame*        mCheckboxFrame;
 		CheckBox*      mCheckbox;          // displayed when late cancellation is not selected
 		TQFrame*        mTimeSelectorFrame;
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index fc7f82cbd..389e66231 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -62,7 +62,7 @@ class CheckBox : public QCheckBox
 		 */
 		virtual void setReadOnly(bool readOnly);
 		/** Returns the widget which receives focus when the user selects the check box by clicking on it. */
-		TQWidget*     focusWidget() const         { return mFocusWidget; }
+		TQWidget*     tqfocusWidget() const         { return mFocusWidget; }
 		/** Specifies a widget to receive focus when the user selects the check box by clicking on it.
 		 *  @param widget Widget to receive focus.
 		 *  @param enable If true, @p widget will be enabled before receiving focus. If
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 9cf09ce13..0345104e0 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -57,7 +57,7 @@ void ColourCombo::setColours(const ColourList& colours)
 {
 	mColourList = colours;
 	if (mSelectedColour != mCustomColour
-	&&  !mColourList.contains(mSelectedColour))
+	&&  !mColourList.tqcontains(mSelectedColour))
 	{
 		// The current colour has been deleted
 		mSelectedColour = mColourList.count() ? mColourList.first() : mCustomColour;
@@ -168,7 +168,7 @@ void ColourCombo::addColours()
 void ColourCombo::drawCustomItem(TQRect& rect, bool insert)
 {
 	TQPen pen;
-	if (qGray(mCustomColour.rgb()) < 128)
+	if (tqGray(mCustomColour.rgb()) < 128)
 		pen.setColor(Qt::white);
 	else
 		pen.setColor(Qt::black);
diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h
index a20a44d6a..8ec2b2a94 100644
--- a/kalarm/lib/colourlist.h
+++ b/kalarm/lib/colourlist.h
@@ -82,8 +82,8 @@ class ColourList
 		const_iterator fromLast() const                      { return mList.fromLast(); }
 		/** Returns an iterator pointing to the colour at position @p i in the list. */
 		const_iterator at(size_type i) const                 { return mList.at(i); }
-		/** Returns true if the list contains the colour @p c. */
-		size_type      contains(const TQColor& c) const       { return mList.contains(c.rgb()); }
+		/** Returns true if the list tqcontains the colour @p c. */
+		size_type      tqcontains(const TQColor& c) const       { return mList.tqcontains(c.rgb()); }
 		/** Returns an iterator pointing to the first occurrence of colour @p c in the list.
 		 *  Returns end() if colour @p c is not in the list.
 		 */
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 2fef25de5..2cc106982 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -77,7 +77,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons
 	TQString errString = error;
 	if (errString.isNull())
 	{
-		if (limit == TQDate::currentDate())
+		if (limit == TQDate::tqcurrentDate())
 			errString = i18n("today");
 		else
 			errString = KGlobal::locale()->formatDate(limit, true);
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index c7c015785..7ea09e01b 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -43,7 +43,7 @@ class DateEdit : public KDateEdit
 		 *  @param name The name of this widget.
 		 */
 		explicit DateEdit(TQWidget* parent = 0, const char* name = 0);
-		/** Returns true if the widget contains a valid date. */
+		/** Returns true if the widget tqcontains a valid date. */
 		bool         isValid() const              { return date().isValid(); }
 		/** Returns the earliest date which can be entered.
 		 *  If there is no minimum date, returns an invalid date.
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index 69cef7544..92f07402a 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
 
 void LabelFocusWidget::focusInEvent(TQFocusEvent*)
 {
-	Label* parent = (Label*)parentWidget();
+	Label* parent = (Label*)tqparentWidget();
 	parent->activated();
 
 }
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index 64c79ea7b..4dcdc15f8 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -122,7 +122,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 			if (mType == Emails)
 				newText = mailList.first().from();
 			else
-				setText(mailList.first().subject());    // replace any existing text
+				setText(mailList.first().subject());    // tqreplace any existing text
 		}
 	}
 	// This must come before KURLDrag
@@ -144,12 +144,12 @@ void LineEdit::dropEvent(TQDropEvent* e)
 		{
 			case Url:
 				// URL entry field - ignore all but the first dropped URL
-				setText(files.first().prettyURL());    // replace any existing text
+				setText(files.first().prettyURL());    // tqreplace any existing text
 				break;
 			case Emails:
 			{
 				// Email entry field - ignore all but mailto: URLs
-				TQString mailto = TQString::fromLatin1("mailto");
+				TQString mailto = TQString::tqfromLatin1("mailto");
 				for (KURL::List::Iterator it = files.begin();  it != files.end();  ++it)
 				{
 					if ((*it).protocol() == mailto)
@@ -168,7 +168,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 		if (mType == Emails)
 		{
 			// Remove newlines from a list of email addresses, and allow an eventual mailto: protocol
-			TQString mailto = TQString::fromLatin1("mailto:");
+			TQString mailto = TQString::tqfromLatin1("mailto:");
 			newEmails = TQStringList::split(TQRegExp("[\r\n]+"), txt);
 			for (TQStringList::Iterator it = newEmails.begin();  it != newEmails.end();  ++it)
 			{
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 612b12a33..5d36de3c5 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -45,14 +45,14 @@ class LineEdit : public KLineEdit
 		Q_OBJECT
 	public:
 		/** Types of drag and drop content which will be accepted.
-		 *  @li Text   - the line edit contains general text. It accepts text, a URL
+		 *  @li Text   - the line edit tqcontains general text. It accepts text, a URL
 		 *               or an email from KMail (the subject line is used). If multiple
 		 *               URLs or emails are dropped, only the first is used; the
 		 *               rest are ignored.
-		 *  @li Url    - the line edit contains a URL. It accepts text or a URL. If
+		 *  @li Url    - the line edit tqcontains a URL. It accepts text or a URL. If
 		 *               multiple URLs are dropped, only the first URL is used; the
 		 *               rest are ignored.
-		 *  @li Emails - the line edit contains email addresses. It accepts text,
+		 *  @li Emails - the line edit tqcontains email addresses. It accepts text,
 		 *               mailto: URLs, emails from KMail (the From address is used)
 		 *               or vcard data (e.g. from KAddressBook). If multiple emails
 		 *               are dropped, only the first is used; the rest are ignored.
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index 48c18f1cd..3345c9c4b 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -109,7 +109,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa
 		return false;
 	// First check whether there is an existing setting
 	KConfig* config = mConfig ? mConfig : KGlobal::config();
-	config->setGroup(TQString::fromLatin1("Notification Messages"));
+	config->setGroup(TQString::tqfromLatin1("Notification Messages"));
 	if (config->hasKey(dontShowAgainName))
 		return false;
 
@@ -168,10 +168,10 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno
 	if (dontShowAgainName.isEmpty())
 		return;
 	KConfig* config = mConfig ? mConfig : KGlobal::config();
-	config->setGroup(TQString::fromLatin1("Notification Messages"));
+	config->setGroup(TQString::tqfromLatin1("Notification Messages"));
 	bool global = (dontShowAgainName[0] == ':');
 	if (yesno)
-		config->writeEntry(dontShowAgainName, TQString::fromLatin1(dontShow ? yesnoResult : ""), true, global);
+		config->writeEntry(dontShowAgainName, TQString::tqfromLatin1(dontShow ? yesnoResult : ""), true, global);
 	else
 		config->writeEntry(dontShowAgainName, !dontShow, true, global);
 	config->sync();
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index c87ef97b8..d95d13fa5 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -62,7 +62,7 @@ class RadioButton : public QRadioButton
 		 */
 		virtual void setReadOnly(bool readOnly);
 		/** Returns the widget which receives focus when the button is clicked. */
-		TQWidget* focusWidget() const         { return mFocusWidget; }
+		TQWidget* tqfocusWidget() const         { return mFocusWidget; }
 		/** Specifies a widget to receive focus when the button is clicked.
 		 *  @param widget Widget to receive focus.
 		 *  @param enable If true, @p widget will be enabled before receiving focus. If
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 6145114a3..42d91a914 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -468,9 +468,9 @@ int SpinBox::shiftStepAdjustment(int oldValue, int shiftStep)
 */
 int SpinBox::whichButton(const TQPoint& pos)
 {
-	if (upRect().contains(pos))
+	if (upRect().tqcontains(pos))
 		return UP;
-	if (downRect().contains(pos))
+	if (downRect().tqcontains(pos))
 		return DOWN;
 	return NO_BUTTON;
 }
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 48b88d51c..db74cc595 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -142,7 +142,7 @@ void SpinBox2::setLineStep(int step)
 {
 	mLineStep = step;
 	if (reverseButtons())
-		mUpdown2->setLineStep(step);   // reverse layout, but still set the right buttons
+		mUpdown2->setLineStep(step);   // reverse tqlayout, but still set the right buttons
 	else
 		mSpinbox->setLineStep(step);
 }
@@ -153,7 +153,7 @@ void SpinBox2::setSteps(int line, int page)
 	mPageStep = page;
 	if (reverseButtons())
 	{
-		mUpdown2->setLineStep(line);   // reverse layout, but still set the right buttons
+		mUpdown2->setLineStep(line);   // reverse tqlayout, but still set the right buttons
 		mSpinbox->setLineStep(page);
 	}
 	else
@@ -169,7 +169,7 @@ void SpinBox2::setShiftSteps(int line, int page)
 	mPageShiftStep = page;
 	if (reverseButtons())
 	{
-		mUpdown2->setLineShiftStep(line);   // reverse layout, but still set the right buttons
+		mUpdown2->setLineShiftStep(line);   // reverse tqlayout, but still set the right buttons
 		mSpinbox->setLineShiftStep(page);
 	}
 	else
@@ -225,18 +225,18 @@ void SpinBox2::showEvent(TQShowEvent*)
 	arrange();
 }
 
-TQSize SpinBox2::sizeHint() const
+TQSize SpinBox2::tqsizeHint() const
 {
 	getMetrics();
-	TQSize size = mSpinbox->sizeHint();
+	TQSize size = mSpinbox->tqsizeHint();
 	size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap);
 	return size;
 }
 
-TQSize SpinBox2::minimumSizeHint() const
+TQSize SpinBox2::tqminimumSizeHint() const
 {
 	getMetrics();
-	TQSize size = mSpinbox->minimumSizeHint();
+	TQSize size = mSpinbox->tqminimumSizeHint();
 	size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap);
 	return size;
 }
@@ -251,7 +251,7 @@ void SpinBox2::styleChange(TQStyle&)
 }
 
 /******************************************************************************
-* Called when the extra pair of spin buttons has repainted after a style change. 
+* Called when the extra pair of spin buttons has tqrepainted after a style change. 
 * Updates the mirror image of the spin buttons.
 */
 void SpinBox2::updateMirror()
@@ -265,14 +265,14 @@ void SpinBox2::updateMirror()
 void SpinBox2::arrange()
 {
 	getMetrics();
-	TQRect arrowRect = TQStyle::visualRect(TQRect(0, 0, wUpdown2, height()), this);
+	TQRect arrowRect = TQStyle::tqvisualRect(TQRect(0, 0, wUpdown2, height()), this);
 	mUpdown2Frame->setGeometry(arrowRect);
 	mUpdown2->setGeometry(-xUpdown2, 0, mUpdown2->width(), height());
-	mSpinboxFrame->setGeometry(TQStyle::visualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this));
+	mSpinboxFrame->setGeometry(TQStyle::tqvisualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this));
 	mSpinbox->setGeometry(-xSpinbox, 0, mSpinboxFrame->width() + xSpinbox, height());
 	mSpinMirror->resize(wUpdown2, mUpdown2->height());
 	mSpinMirror->setGeometry(arrowRect);
-//mSpinMirror->setGeometry(TQStyle::visualRect(TQRect(0, 11, wUpdown2, height()), this));
+//mSpinMirror->setGeometry(TQStyle::tqvisualRect(TQRect(0, 11, wUpdown2, height()), this));
 	mSpinMirror->setNormalButtons(TQPixmap::grabWidget(mUpdown2Frame, 0, 0));
 }
 
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index 06a48d1af..b1d2927d4 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -114,8 +114,8 @@ class SpinBox2 : public QFrame
 		 */
 		bool                wrapping() const            { return mSpinbox->wrapping(); }
 
-		/** Set the text alignment of the widget */
-		void                setAlignment(int a)         { mSpinbox->setAlignment(a); }
+		/** Set the text tqalignment of the widget */
+		void                tqsetAlignment(int a)         { mSpinbox->tqsetAlignment(a); }
 		/** Sets the button symbols to use (arrows or plus/minus). */
 		virtual void        setButtonSymbols(TQSpinBox::ButtonSymbols);
 		/** Returns the button symbols currently in use (arrows or plus/minus). */
@@ -130,8 +130,8 @@ class SpinBox2 : public QFrame
 		 */
 		const TQValidator*   validator() const           { return mSpinbox->validator(); }
 
-		virtual TQSize       sizeHint() const;
-		virtual TQSize       minimumSizeHint() const;
+		virtual TQSize       tqsizeHint() const;
+		virtual TQSize       tqminimumSizeHint() const;
 
 		/** Returns the minimum value of the spin box. */
 		int                 minValue() const            { return mMinValue; }
@@ -148,13 +148,13 @@ class SpinBox2 : public QFrame
 		/** Returns the specified value clamped to the range of the spin box. */
 		int                 bound(int val) const;
 
-		/** Returns the geometry of the right-hand "up" button. */
+		/** Returns the tqgeometry of the right-hand "up" button. */
 		TQRect               upRect() const              { return mSpinbox->upRect(); }
-		/** Returns the geometry of the right-hand "down" button. */
+		/** Returns the tqgeometry of the right-hand "down" button. */
 		TQRect               downRect() const            { return mSpinbox->downRect(); }
-		/** Returns the geometry of the left-hand "up" button. */
+		/** Returns the tqgeometry of the left-hand "up" button. */
 		TQRect               up2Rect() const;
-		/** Returns the geometry of the left-hand "down" button. */
+		/** Returns the tqgeometry of the left-hand "down" button. */
 		TQRect               down2Rect() const;
 
 		/** Returns the unshifted step increment for the right-hand spin buttons,
@@ -285,7 +285,7 @@ class SpinBox2 : public QFrame
 				                : SpinBox(parent, name), owner(sb2) { }
 				MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0)
 				                : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { }
-				void            setAlignment(int a)       { editor()->setAlignment(a); }
+				void            tqsetAlignment(int a)       { editor()->tqsetAlignment(a); }
 				virtual TQString mapValueToText(int v)     { return owner->mapValueToText(v); }
 				virtual int     mapTextToValue(bool* ok)  { return owner->mapTextToValue(ok); }
 				TQString         mapValToText(int v)       { return SpinBox::mapValueToText(v); }
@@ -298,8 +298,8 @@ class SpinBox2 : public QFrame
 		enum { NO_BUTTON = -1, UP, DOWN, UP2, DOWN2 };
 
 		static int       mReverseLayout;  // widgets are mirrored right to left
-		TQFrame*          mUpdown2Frame;   // contains visible part of the extra pair of spin buttons
-		TQFrame*          mSpinboxFrame;   // contains the main spin box
+		TQFrame*          mUpdown2Frame;   // tqcontains visible part of the extra pair of spin buttons
+		TQFrame*          mSpinboxFrame;   // tqcontains the main spin box
 		ExtraSpinBox*    mUpdown2;        // the extra pair of spin buttons
 		MainSpinBox*     mSpinbox;        // the visible spin box
 		SpinMirror*      mSpinMirror;     // image of the extra pair of spin buttons
@@ -309,7 +309,7 @@ class SpinBox2 : public QFrame
 		int              mLineShiftStep;      // right button increment with shift pressed
 		int              mPageStep;           // left button increment
 		int              mPageShiftStep;      // left button increment with shift pressed
-		bool             mReverseWithLayout;  // reverse button positions if reverse layout (default = true)
+		bool             mReverseWithLayout;  // reverse button positions if reverse tqlayout (default = true)
 
 	friend class MainSpinBox;
 };
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index 682c84b8d..d25579f9d 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -45,7 +45,7 @@ class ExtraSpinBox : public SpinBox
 		virtual void paintEvent(TQPaintEvent*);
 		virtual void styleChange(TQStyle&)    { mNewStylePending = true; }
 	private:
-		bool         mNewStylePending;  // style has changed, but not yet repainted
+		bool         mNewStylePending;  // style has changed, but not yet tqrepainted
 };
 
 
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index eecef7d4b..caed93d7b 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -196,7 +196,7 @@ void DailyTimer::changeTime(const TQTime& newTimeOfDay, bool triggerMissed)
 void DailyTimer::start()
 {
 	// TIMEZONE = local time
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	// Find out whether to trigger today or tomorrow.
 	// In preference, use the last trigger date to determine this, since
 	// that will avoid possible errors due to daylight savings time changes.
@@ -224,7 +224,7 @@ void DailyTimer::start()
 void DailyTimer::slotTimer()
 {
 	// TIMEZONE = local time
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	mLastDate = now.date();
 	TQDateTime next = TQDateTime(mLastDate.addDays(1), mTime);
 	uint interval = next.toTime_t() - now.toTime_t();
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 01152fcee..170914922 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -37,13 +37,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
 {
 	bool use12hour = KGlobal::locale()->use12Clock();
 	mSpinBox = new TimeSpinBox(!use12hour, this);
-	mSpinBox->setFixedSize(mSpinBox->sizeHint());
+	mSpinBox->setFixedSize(mSpinBox->tqsizeHint());
 	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
 	if (use12hour)
 	{
 		mAmPm = new ComboBox(this);
 		setAmPmCombo(1, 1);     // add "am" and "pm" options to the combo box
-		mAmPm->setFixedSize(mAmPm->sizeHint());
+		mAmPm->setFixedSize(mAmPm->tqsizeHint());
 		connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int)));
 	}
 }
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 9cbfb6f8c..45c0abd8e 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -64,7 +64,7 @@ class TimeEdit : public QHBox
 		 *  @param readOnly True to set the widget read-only, false to set it read-write.
 		 */
 		virtual void  setReadOnly(bool readOnly);
-		/** Returns true if the widget contains a valid value. */
+		/** Returns true if the widget tqcontains a valid value. */
 		bool          isValid() const;
 		/** Sets whether the edit value is valid.
 		 *  If newly invalid, the value is displayed as asterisks.
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index e372615a7..291ba0872 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -71,7 +71,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
 	connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int)));
 	mSpinStack->addWidget(mTimeSpinBox, 1);
 
-	mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint()));
+	mSpinStack->setFixedSize(mSpinBox->tqsizeHint().expandedTo(mTimeSpinBox->tqsizeHint()));
 	mHourMinuteRaised = mNoHourMinute;
 	showHourMin(!mNoHourMinute);
 
@@ -87,7 +87,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
 	mUnitsCombo->insertItem(i18n_days());
 	mUnitsCombo->insertItem(i18n_weeks());
 	mMaxUnitShown = WEEKS;
-	mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint());
+	mUnitsCombo->setFixedSize(mUnitsCombo->tqsizeHint());
 	connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int)));
 
 	setFocusProxy(mUnitsCombo);
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index 20073d878..ea10cb1aa 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -69,7 +69,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
 	setReverseWithLayout(false);   // keep buttons the same way round even if right-to-left language
 	setShiftSteps(5, 360);    // shift-left button increments 5 min / 6 hours
 	setSelectOnStep(false);
-	setAlignment(Qt::AlignHCenter);
+	tqsetAlignment(Qt::AlignHCenter);
 	connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
 }
 
@@ -88,7 +88,7 @@ TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const c
 	setReverseWithLayout(false);   // keep buttons the same way round even if right-to-left language
 	setShiftSteps(5, 300);    // shift-left button increments 5 min / 5 hours
 	setSelectOnStep(false);
-	setAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight);
+	tqsetAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight);
 }
 
 TQString TimeSpinBox::shiftWhatsThis()
@@ -211,7 +211,7 @@ void TimeSpinBox::setValid(bool valid)
 	{
 		mInvalid = true;
 		SpinBox2::setMinValue(mMinimumValue - 1);
-		setSpecialValueText(TQString::fromLatin1("**:**"));
+		setSpecialValueText(TQString::tqfromLatin1("**:**"));
 		SpinBox2::setValue(mMinimumValue - 1);
 	}
 }
@@ -280,16 +280,16 @@ void TimeSpinBox::slotValueChanged(int value)
 	mPm = mValidator->mPm = (value >= 720);
 }
 
-TQSize TimeSpinBox::sizeHint() const
+TQSize TimeSpinBox::tqsizeHint() const
 {
-	TQSize sz = SpinBox2::sizeHint();
+	TQSize sz = SpinBox2::tqsizeHint();
 	TQFontMetrics fm(font());
 	return TQSize(sz.width() + fm.width(":"), sz.height());
 }
 
-TQSize TimeSpinBox::minimumSizeHint() const
+TQSize TimeSpinBox::tqminimumSizeHint() const
 {
-	TQSize sz = SpinBox2::minimumSizeHint();
+	TQSize sz = SpinBox2::tqminimumSizeHint();
 	TQFontMetrics fm(font());
 	return TQSize(sz.width() + fm.width(":"), sz.height());
 }
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index 909541ad9..901c97e2e 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -90,8 +90,8 @@ class TimeSpinBox : public SpinBox2
 		 */
 		static TQString  shiftWhatsThis();
 
-		virtual TQSize   sizeHint() const;
-		virtual TQSize   minimumSizeHint() const;
+		virtual TQSize   tqsizeHint() const;
+		virtual TQSize   tqminimumSizeHint() const;
 
 	public slots:
 		/** Sets the value of the spin box.
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index a3e8e423f..6ebe19c81 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -71,11 +71,11 @@ using namespace KCal;
 static const char* UI_FILE     = "kalarmui.rc";
 static const char* WINDOW_NAME = "MainWindow";
 
-static const TQString VIEW_GROUP         = TQString::fromLatin1("View");
-static const TQString SHOW_TIME_KEY      = TQString::fromLatin1("ShowAlarmTime");
-static const TQString SHOW_TIME_TO_KEY   = TQString::fromLatin1("ShowTimeToAlarm");
-static const TQString SHOW_ARCHIVED_KEY  = TQString::fromLatin1("ShowArchivedAlarms");
-static const TQString SHOW_RESOURCES_KEY = TQString::fromLatin1("ShowResources");
+static const TQString VIEW_GROUP         = TQString::tqfromLatin1("View");
+static const TQString SHOW_TIME_KEY      = TQString::tqfromLatin1("ShowAlarmTime");
+static const TQString SHOW_TIME_TO_KEY   = TQString::tqfromLatin1("ShowTimeToAlarm");
+static const TQString SHOW_ARCHIVED_KEY  = TQString::tqfromLatin1("ShowArchivedAlarms");
+static const TQString SHOW_RESOURCES_KEY = TQString::tqfromLatin1("ShowResources");
 
 static TQString   undoText;
 static TQString   undoTextStripped;
@@ -123,7 +123,7 @@ MainWindow::MainWindow(bool restored)
 	  mHiddenTrayParent(false)
 {
 	kdDebug(5950) << "MainWindow::MainWindow()\n";
-	setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME));    // save window sizes etc.
+	setAutoSaveSettings(TQString::tqfromLatin1(WINDOW_NAME));    // save window sizes etc.
 	setPlainCaption(kapp->aboutData()->programName());
 	KConfig* config = KGlobal::config();
 	config->setGroup(VIEW_GROUP);
@@ -136,8 +136,8 @@ MainWindow::MainWindow(bool restored)
 		if (KAlarm::readConfigWindowSize(WINDOW_NAME, s))
 			resize(s);
 	}
-	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
-	TQValueList order = config->readIntListEntry(TQString::fromLatin1("ColumnOrder"));
+	config->setGroup(TQString::tqfromLatin1(WINDOW_NAME));
+	TQValueList order = config->readIntListEntry(TQString::tqfromLatin1("ColumnOrder"));
 
 	setAcceptDrops(true);         // allow drag-and-drop onto this window
 	if (!mShowTimeTo)
@@ -201,10 +201,10 @@ MainWindow::~MainWindow()
 */
 void MainWindow::saveProperties(KConfig* config)
 {
-	config->writeEntry(TQString::fromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
-	config->writeEntry(TQString::fromLatin1("ShowExpired"), mShowExpired);
-	config->writeEntry(TQString::fromLatin1("ShowTime"), mShowTime);
-	config->writeEntry(TQString::fromLatin1("ShowTimeTo"), mShowTimeTo);
+	config->writeEntry(TQString::tqfromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
+	config->writeEntry(TQString::tqfromLatin1("ShowExpired"), mShowExpired);
+	config->writeEntry(TQString::tqfromLatin1("ShowTime"), mShowTime);
+	config->writeEntry(TQString::tqfromLatin1("ShowTimeTo"), mShowTimeTo);
 }
 
 /******************************************************************************
@@ -214,10 +214,10 @@ void MainWindow::saveProperties(KConfig* config)
 */
 void MainWindow::readProperties(KConfig* config)
 {
-	mHiddenTrayParent = config->readBoolEntry(TQString::fromLatin1("HiddenTrayParent"));
-	mShowExpired      = config->readBoolEntry(TQString::fromLatin1("ShowExpired"));
-	mShowTime         = config->readBoolEntry(TQString::fromLatin1("ShowTime"));
-	mShowTimeTo       = config->readBoolEntry(TQString::fromLatin1("ShowTimeTo"));
+	mHiddenTrayParent = config->readBoolEntry(TQString::tqfromLatin1("HiddenTrayParent"));
+	mShowExpired      = config->readBoolEntry(TQString::tqfromLatin1("ShowExpired"));
+	mShowTime         = config->readBoolEntry(TQString::tqfromLatin1("ShowTime"));
+	mShowTimeTo       = config->readBoolEntry(TQString::tqfromLatin1("ShowTimeTo"));
 }
 
 /******************************************************************************
@@ -294,7 +294,7 @@ void MainWindow::show()
 		// Show error message now that the main window has been displayed.
 		// Waiting until now lets the user easily associate the message with
 		// the main window which is faulty.
-		KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").arg(TQString::fromLatin1(UI_FILE)));
+		KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").arg(TQString::tqfromLatin1(UI_FILE)));
 		mMenuError = false;
 	}
 }
@@ -315,8 +315,8 @@ void MainWindow::hideEvent(TQHideEvent* he)
 void MainWindow::columnsReordered()
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
-	config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder());
+	config->setGroup(TQString::tqfromLatin1(WINDOW_NAME));
+	config->writeEntry(TQString::tqfromLatin1("ColumnOrder"), mListView->columnOrder());
 	config->sync();
 }
 
@@ -367,8 +367,8 @@ void MainWindow::initActions()
 	mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo");
 	mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo");
 	KStdAction::find(mListView, TQT_SLOT(slotFind()), actions);
-	mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions);
-	mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
+	mActionFindNext = KStdAction::tqfindNext(mListView, TQT_SLOT(slotFindNext()), actions);
+	mActionFindPrev = KStdAction::tqfindPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
 	KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions);
 	KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions);
 	KStdAction::quit(this, TQT_SLOT(slotQuit()), actions);
@@ -1196,7 +1196,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 	AlarmText      alarmText;
 	KPIM::MailList mailList;
 	KURL::List     files;
-	KCal::CalendarLocal calendar(TQString::fromLatin1("UTC"));
+	KCal::CalendarLocal calendar(TQString::tqfromLatin1("UTC"));
 	calendar.setLocalTime();    // default to local time (i.e. no time zone)
 #ifndef NDEBUG
 	TQCString fmts;
@@ -1213,7 +1213,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 	 * Don't change them without careful thought !!
 	 */
 	if (e->provides("message/rfc822")
-	&&  !(bytes = e->encodedData("message/rfc822")).isEmpty())
+	&&  !(bytes = e->tqencodedData("message/rfc822")).isEmpty())
 	{
 		// Email message(s). Ignore all but the first.
 		kdDebug(5950) << "MainWindow::executeDropEvent(email)" << endl;
@@ -1299,7 +1299,7 @@ void MainWindow::slotSelection()
 	bool enableEnableDisable = true;
 	bool enableEnable = false;
 	bool enableDisable = false;
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	for (TQValueList::Iterator it = items.begin();  it != items.end();  ++it)
 	{
 		const KAEvent& event = ((AlarmListViewItem*)(*it))->event();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 35d769c50..0b527ac35 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -101,7 +101,7 @@ class MessageText : public QTextEdit
 		}
 		int scrollBarHeight() const     { return horizontalScrollBar()->height(); }
 		int scrollBarWidth() const      { return verticalScrollBar()->width(); }
-		virtual TQSize sizeHint() const  { return TQSize(contentsWidth() + scrollBarWidth(), contentsHeight() + scrollBarHeight()); }
+		virtual TQSize tqsizeHint() const  { return TQSize(contentsWidth() + scrollBarWidth(), contentsHeight() + scrollBarHeight()); }
 };
 
 
@@ -125,7 +125,7 @@ class MWMimeSourceFactory : public QMimeSourceFactory
 // Basic flags for the window
 static const Qt::WFlags WFLAGS = Qt::WStyle_StaysOnTop | Qt::WDestructiveClose;
 
-// Error message bit masks
+// Error message bit tqmasks
 enum {
 	ErrMsg_Speak     = 0x01,
 	ErrMsg_AudioFile = 0x02,
@@ -191,7 +191,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu
 	kdDebug(5950) << "MessageWin::MessageWin(event)" << endl;
 	// Set to save settings automatically, but don't save window size.
 	// File alarm window size is saved elsewhere.
-	setAutoSaveSettings(TQString::fromLatin1("MessageWin"), false);
+	setAutoSaveSettings(TQString::tqfromLatin1("MessageWin"), false);
 	initView();
 	mWindowList.append(this);
 	if (event.autoClose())
@@ -298,13 +298,13 @@ void MessageWin::initView()
 	{
 		// Show the alarm date/time, together with an "Advance reminder" text where appropriate
 		TQFrame* frame = 0;
-		TQVBoxLayout* layout = topLayout;
+		TQVBoxLayout* tqlayout = topLayout;
 		if (reminder)
 		{
 			frame = new TQFrame(topWidget);
 			frame->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 			topLayout->addWidget(frame, 0, Qt::AlignHCenter);
-			layout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading);
+			tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading);
 		}
 
 		// Alarm date/time
@@ -314,8 +314,8 @@ void MessageWin::initView()
 		               : KGlobal::locale()->formatDateTime(mDateTime.dateTime()));
 		if (!frame)
 			label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
-		label->setFixedSize(label->sizeHint());
-		layout->addWidget(label, 0, Qt::AlignHCenter);
+		label->setFixedSize(label->tqsizeHint());
+		tqlayout->addWidget(label, 0, Qt::AlignHCenter);
 		TQWhatsThis::add(label,
 		      i18n("The scheduled date/time for the message (as opposed to the actual time of display)."));
 
@@ -323,9 +323,9 @@ void MessageWin::initView()
 		{
 			label = new TQLabel(frame);
 			label->setText(i18n("Reminder"));
-			label->setFixedSize(label->sizeHint());
-			layout->addWidget(label, 0, Qt::AlignHCenter);
-			frame->setFixedSize(frame->sizeHint());
+			label->setFixedSize(label->tqsizeHint());
+			tqlayout->addWidget(label, 0, Qt::AlignHCenter);
+			frame->setFixedSize(frame->tqsizeHint());
 		}
 	}
 
@@ -339,7 +339,7 @@ void MessageWin::initView()
 				// Display the file name
 				TQLabel* label = new TQLabel(mMessage, topWidget);
 				label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				TQWhatsThis::add(label, i18n("The file whose contents are displayed below"));
 				topLayout->addWidget(label, 0, Qt::AlignHCenter);
 
@@ -357,7 +357,7 @@ void MessageWin::initView()
 						opened = true;
 						KTextBrowser* view = new KTextBrowser(topWidget, "fileContents");
 						MWMimeSourceFactory msf(tmpFile, view);
-						view->setMinimumSize(view->sizeHint());
+						view->setMinimumSize(view->tqsizeHint());
 						topLayout->addWidget(view);
 
 						// Set the default size to 20 lines square.
@@ -365,7 +365,7 @@ void MessageWin::initView()
 						// is overridden by the user-set default stored in the config file.
 						// So there is no need to calculate an accurate size.
 						int h = 20*view->fontMetrics().lineSpacing() + 2*view->frameWidth();
-						view->resize(TQSize(h, h).expandedTo(view->sizeHint()));
+						view->resize(TQSize(h, h).expandedTo(view->tqsizeHint()));
 						TQWhatsThis::add(view, i18n("The contents of the file to be displayed"));
 					}
 					KIO::NetAccess::removeTempFile(tmpFile);
@@ -388,7 +388,7 @@ void MessageWin::initView()
 				text->setPaletteForegroundColor(mFgColour);
 				text->setFont(mFont);
 				int lineSpacing = text->fontMetrics().lineSpacing();
-				TQSize s = text->sizeHint();
+				TQSize s = text->tqsizeHint();
 				int h = s.height();
 				text->setMaximumHeight(h + text->scrollBarHeight());
 				text->setMinimumHeight(QMIN(h, lineSpacing*4));
@@ -401,14 +401,14 @@ void MessageWin::initView()
 				// Don't include any horizontal margins if message is 2/3 screen width
 				if (!mWinModule)
 					mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
-				if (text->sizeHint().width() >= mWinModule->workArea().width()*2/3)
+				if (text->tqsizeHint().width() >= mWinModule->workArea().width()*2/3)
 					topLayout->addWidget(text, 1, Qt::AlignHCenter);
 				else
 				{
-					TQBoxLayout* layout = new TQHBoxLayout(topLayout);
-					layout->addSpacing(hspace);
-					layout->addWidget(text, 1, Qt::AlignHCenter);
-					layout->addSpacing(hspace);
+					TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
+					tqlayout->addSpacing(hspace);
+					tqlayout->addWidget(text, 1, Qt::AlignHCenter);
+					tqlayout->addSpacing(hspace);
 				}
 				if (!reminder)
 					topLayout->addStretch();
@@ -426,7 +426,7 @@ void MessageWin::initView()
 			mRemainingText = new TQLabel(topWidget);
 			mRemainingText->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 			mRemainingText->setMargin(leading);
-			if (mDateTime.isDateOnly()  ||  TQDate::currentDate().daysTo(mDateTime.date()) > 0)
+			if (mDateTime.isDateOnly()  ||  TQDate::tqcurrentDate().daysTo(mDateTime.date()) > 0)
 			{
 				setRemainingTextDay();
 				MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay()));    // update every day
@@ -456,17 +456,17 @@ void MessageWin::initView()
 				TQGridLayout* grid = new TQGridLayout(frame, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 
 				TQLabel* label = new TQLabel(i18n("Email addressee", "To:"), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 0, 0, Qt::AlignLeft);
 				label = new TQLabel(mEvent.emailAddresses("\n"), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 0, 1, Qt::AlignLeft);
 
 				label = new TQLabel(i18n("Email subject", "Subject:"), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 1, 0, Qt::AlignLeft);
 				label = new TQLabel(mEvent.emailSubject(), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 1, 1, Qt::AlignLeft);
 				break;
 			}
@@ -484,21 +484,21 @@ void MessageWin::initView()
 	else
 	{
 		setCaption(i18n("Error"));
-		TQBoxLayout* layout = new TQHBoxLayout(topLayout);
-		layout->setMargin(2*KDialog::marginHint());
-		layout->addStretch();
+		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
+		tqlayout->setMargin(2*KDialog::marginHint());
+		tqlayout->addStretch();
 		TQLabel* label = new TQLabel(topWidget);
 		label->setPixmap(DesktopIcon("error"));
-		label->setFixedSize(label->sizeHint());
-		layout->addWidget(label, 0, Qt::AlignRight);
-		TQBoxLayout* vlayout = new TQVBoxLayout(layout);
+		label->setFixedSize(label->tqsizeHint());
+		tqlayout->addWidget(label, 0, Qt::AlignRight);
+		TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout);
 		for (TQStringList::Iterator it = mErrorMsgs.begin();  it != mErrorMsgs.end();  ++it)
 		{
 			label = new TQLabel(*it, topWidget);
-			label->setFixedSize(label->sizeHint());
-			vlayout->addWidget(label, 0, Qt::AlignLeft);
+			label->setFixedSize(label->tqsizeHint());
+			vtqlayout->addWidget(label, 0, Qt::AlignLeft);
 		}
-		layout->addStretch();
+		tqlayout->addStretch();
 	}
 
 	TQGridLayout* grid = new TQGridLayout(1, 4);
@@ -511,7 +511,7 @@ void MessageWin::initView()
 	// Prevent accidental acknowledgement of the message if the user is typing when the window appears
 	mOkButton->clearFocus();
 	mOkButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
-	mOkButton->setFixedSize(mOkButton->sizeHint());
+	mOkButton->setFixedSize(mOkButton->tqsizeHint());
 	connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
 	grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
 	TQWhatsThis::add(mOkButton, i18n("Acknowledge the alarm"));
@@ -521,7 +521,7 @@ void MessageWin::initView()
 		// Edit button
 		mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
 		mEditButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
-		mEditButton->setFixedSize(mEditButton->sizeHint());
+		mEditButton->setFixedSize(mEditButton->tqsizeHint());
 		connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 		grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter);
 		TQWhatsThis::add(mEditButton, i18n("Edit the alarm."));
@@ -532,7 +532,7 @@ void MessageWin::initView()
 		// Defer button
 		mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget);
 		mDeferButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
-		mDeferButton->setFixedSize(mDeferButton->sizeHint());
+		mDeferButton->setFixedSize(mDeferButton->tqsizeHint());
 		connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer()));
 		grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter);
 		TQWhatsThis::add(mDeferButton,
@@ -549,7 +549,7 @@ void MessageWin::initView()
 		TQPixmap pixmap = MainBarIcon("player_stop");
 		mSilenceButton = new TQPushButton(topWidget);
 		mSilenceButton->setPixmap(pixmap);
-		mSilenceButton->setFixedSize(mSilenceButton->sizeHint());
+		mSilenceButton->setFixedSize(mSilenceButton->tqsizeHint());
 		connect(mSilenceButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopPlay()));
 		grid->addWidget(mSilenceButton, 0, gridIndex++, AlignHCenter);
 		TQToolTip::add(mSilenceButton, i18n("Stop sound"));
@@ -563,10 +563,10 @@ void MessageWin::initView()
 	if (mKMailSerialNumber)
 	{
 		// KMail button
-		TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1("kmail"), KIcon::MainToolbar);
+		TQPixmap pixmap = iconLoader.loadIcon(TQString::tqfromLatin1("kmail"), KIcon::MainToolbar);
 		mKMailButton = new TQPushButton(topWidget);
 		mKMailButton->setPixmap(pixmap);
-		mKMailButton->setFixedSize(mKMailButton->sizeHint());
+		mKMailButton->setFixedSize(mKMailButton->tqsizeHint());
 		connect(mKMailButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowKMailMessage()));
 		grid->addWidget(mKMailButton, 0, gridIndex++, AlignHCenter);
 		TQToolTip::add(mKMailButton, i18n("Locate this email in KMail", "Locate in KMail"));
@@ -576,10 +576,10 @@ void MessageWin::initView()
 		mKMailButton = 0;
 
 	// KAlarm button
-	TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar);
+	TQPixmap pixmap = iconLoader.loadIcon(TQString::tqfromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar);
 	mKAlarmButton = new TQPushButton(topWidget);
 	mKAlarmButton->setPixmap(pixmap);
-	mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
+	mKAlarmButton->setFixedSize(mKAlarmButton->tqsizeHint());
 	connect(mKAlarmButton, TQT_SIGNAL(clicked()), TQT_SLOT(displayMainWindow()));
 	grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter);
 	TQString actKAlarm = i18n("Activate KAlarm");
@@ -598,7 +598,7 @@ void MessageWin::initView()
 	mKAlarmButton->setEnabled(false);
 
 	topLayout->activate();
-	setMinimumSize(TQSize(grid->sizeHint().width() + 2*KDialog::marginHint(), sizeHint().height()));
+	setMinimumSize(TQSize(grid->tqsizeHint().width() + 2*KDialog::marginHint(), tqsizeHint().height()));
 
 	bool modal = !(getWFlags() & Qt::WX11BypassWM);
 
@@ -615,7 +615,7 @@ void MessageWin::initView()
 void MessageWin::setRemainingTextDay()
 {
 	TQString text;
-	int days = TQDate::currentDate().daysTo(mDateTime.date());
+	int days = TQDate::tqcurrentDate().daysTo(mDateTime.date());
 	if (days <= 0  &&  !mDateTime.isDateOnly())
 	{
 		// The alarm is due today, so start refreshing every minute
@@ -642,7 +642,7 @@ void MessageWin::setRemainingTextDay()
 void MessageWin::setRemainingTextMinute()
 {
 	TQString text;
-	int mins = (TQDateTime::currentDateTime().secsTo(mDateTime.dateTime()) + 59) / 60;
+	int mins = (TQDateTime::tqcurrentDateTime().secsTo(mDateTime.dateTime()) + 59) / 60;
 	if (mins < 60)
 		text = i18n("in 1 minute's time", "in %n minutes' time", (mins > 0 ? mins : 0));
 	else if (mins % 60 == 0)
@@ -662,38 +662,38 @@ void MessageWin::saveProperties(KConfig* config)
 {
 	if (mShown  &&  !mErrorWindow)
 	{
-		config->writeEntry(TQString::fromLatin1("EventID"), mEventID);
-		config->writeEntry(TQString::fromLatin1("AlarmType"), mAlarmType);
-		config->writeEntry(TQString::fromLatin1("Message"), mMessage);
-		config->writeEntry(TQString::fromLatin1("Type"), mAction);
-		config->writeEntry(TQString::fromLatin1("Font"), mFont);
-		config->writeEntry(TQString::fromLatin1("BgColour"), mBgColour);
-		config->writeEntry(TQString::fromLatin1("FgColour"), mFgColour);
-		config->writeEntry(TQString::fromLatin1("ConfirmAck"), mConfirmAck);
+		config->writeEntry(TQString::tqfromLatin1("EventID"), mEventID);
+		config->writeEntry(TQString::tqfromLatin1("AlarmType"), mAlarmType);
+		config->writeEntry(TQString::tqfromLatin1("Message"), mMessage);
+		config->writeEntry(TQString::tqfromLatin1("Type"), mAction);
+		config->writeEntry(TQString::tqfromLatin1("Font"), mFont);
+		config->writeEntry(TQString::tqfromLatin1("BgColour"), mBgColour);
+		config->writeEntry(TQString::tqfromLatin1("FgColour"), mFgColour);
+		config->writeEntry(TQString::tqfromLatin1("ConfirmAck"), mConfirmAck);
 		if (mDateTime.isValid())
 		{
-			config->writeEntry(TQString::fromLatin1("Time"), mDateTime.dateTime());
-			config->writeEntry(TQString::fromLatin1("DateOnly"), mDateTime.isDateOnly());
+			config->writeEntry(TQString::tqfromLatin1("Time"), mDateTime.dateTime());
+			config->writeEntry(TQString::tqfromLatin1("DateOnly"), mDateTime.isDateOnly());
 		}
 		if (mCloseTime.isValid())
-			config->writeEntry(TQString::fromLatin1("Expiry"), mCloseTime);
+			config->writeEntry(TQString::tqfromLatin1("Expiry"), mCloseTime);
 #ifndef WITHOUT_ARTS
 		if (mAudioRepeat  &&  mSilenceButton  &&  mSilenceButton->isEnabled())
 		{
 			// Only need to restart sound file playing if it's being repeated
-			config->writePathEntry(TQString::fromLatin1("AudioFile"), mAudioFile);
-			config->writeEntry(TQString::fromLatin1("Volume"), static_cast(mVolume * 100));
+			config->writePathEntry(TQString::tqfromLatin1("AudioFile"), mAudioFile);
+			config->writeEntry(TQString::tqfromLatin1("Volume"), static_cast(mVolume * 100));
 		}
 #endif
-		config->writeEntry(TQString::fromLatin1("Speak"), mSpeak);
-		config->writeEntry(TQString::fromLatin1("Height"), height());
-		config->writeEntry(TQString::fromLatin1("DeferMins"), mDefaultDeferMinutes);
-		config->writeEntry(TQString::fromLatin1("NoDefer"), mNoDefer);
-		config->writeEntry(TQString::fromLatin1("NoPostAction"), mNoPostAction);
-		config->writeEntry(TQString::fromLatin1("KMailSerial"), mKMailSerialNumber);
+		config->writeEntry(TQString::tqfromLatin1("Speak"), mSpeak);
+		config->writeEntry(TQString::tqfromLatin1("Height"), height());
+		config->writeEntry(TQString::tqfromLatin1("DeferMins"), mDefaultDeferMinutes);
+		config->writeEntry(TQString::tqfromLatin1("NoDefer"), mNoDefer);
+		config->writeEntry(TQString::tqfromLatin1("NoPostAction"), mNoPostAction);
+		config->writeEntry(TQString::tqfromLatin1("KMailSerial"), mKMailSerialNumber);
 	}
 	else
-		config->writeEntry(TQString::fromLatin1("Invalid"), true);
+		config->writeEntry(TQString::tqfromLatin1("Invalid"), true);
 }
 
 /******************************************************************************
@@ -703,34 +703,34 @@ void MessageWin::saveProperties(KConfig* config)
 */
 void MessageWin::readProperties(KConfig* config)
 {
-	mInvalid             = config->readBoolEntry(TQString::fromLatin1("Invalid"), false);
-	mEventID             = config->readEntry(TQString::fromLatin1("EventID"));
-	mAlarmType           = KAAlarm::Type(config->readNumEntry(TQString::fromLatin1("AlarmType")));
-	mMessage             = config->readEntry(TQString::fromLatin1("Message"));
-	mAction              = KAEvent::Action(config->readNumEntry(TQString::fromLatin1("Type")));
-	mFont                = config->readFontEntry(TQString::fromLatin1("Font"));
-	mBgColour            = config->readColorEntry(TQString::fromLatin1("BgColour"));
-	mFgColour            = config->readColorEntry(TQString::fromLatin1("FgColour"));
-	mConfirmAck          = config->readBoolEntry(TQString::fromLatin1("ConfirmAck"));
+	mInvalid             = config->readBoolEntry(TQString::tqfromLatin1("Invalid"), false);
+	mEventID             = config->readEntry(TQString::tqfromLatin1("EventID"));
+	mAlarmType           = KAAlarm::Type(config->readNumEntry(TQString::tqfromLatin1("AlarmType")));
+	mMessage             = config->readEntry(TQString::tqfromLatin1("Message"));
+	mAction              = KAEvent::Action(config->readNumEntry(TQString::tqfromLatin1("Type")));
+	mFont                = config->readFontEntry(TQString::tqfromLatin1("Font"));
+	mBgColour            = config->readColorEntry(TQString::tqfromLatin1("BgColour"));
+	mFgColour            = config->readColorEntry(TQString::tqfromLatin1("FgColour"));
+	mConfirmAck          = config->readBoolEntry(TQString::tqfromLatin1("ConfirmAck"));
 	TQDateTime invalidDateTime;
-	TQDateTime dt         = config->readDateTimeEntry(TQString::fromLatin1("Time"), &invalidDateTime);
-	bool dateOnly        = config->readBoolEntry(TQString::fromLatin1("DateOnly"));
+	TQDateTime dt         = config->readDateTimeEntry(TQString::tqfromLatin1("Time"), &invalidDateTime);
+	bool dateOnly        = config->readBoolEntry(TQString::tqfromLatin1("DateOnly"));
 	mDateTime.set(dt, dateOnly);
-	mCloseTime           = config->readDateTimeEntry(TQString::fromLatin1("Expiry"), &invalidDateTime);
+	mCloseTime           = config->readDateTimeEntry(TQString::tqfromLatin1("Expiry"), &invalidDateTime);
 #ifndef WITHOUT_ARTS
-	mAudioFile           = config->readPathEntry(TQString::fromLatin1("AudioFile"));
-	mVolume              = static_cast(config->readNumEntry(TQString::fromLatin1("Volume"))) / 100;
+	mAudioFile           = config->readPathEntry(TQString::tqfromLatin1("AudioFile"));
+	mVolume              = static_cast(config->readNumEntry(TQString::tqfromLatin1("Volume"))) / 100;
 	mFadeVolume          = -1;
 	mFadeSeconds         = 0;
 	if (!mAudioFile.isEmpty())
 		mAudioRepeat = true;
 #endif
-	mSpeak               = config->readBoolEntry(TQString::fromLatin1("Speak"));
-	mRestoreHeight       = config->readNumEntry(TQString::fromLatin1("Height"));
-	mDefaultDeferMinutes = config->readNumEntry(TQString::fromLatin1("DeferMins"));
-	mNoDefer             = config->readBoolEntry(TQString::fromLatin1("NoDefer"));
-	mNoPostAction        = config->readBoolEntry(TQString::fromLatin1("NoPostAction"));
-	mKMailSerialNumber   = config->readUnsignedLongNumEntry(TQString::fromLatin1("KMailSerial"));
+	mSpeak               = config->readBoolEntry(TQString::tqfromLatin1("Speak"));
+	mRestoreHeight       = config->readNumEntry(TQString::tqfromLatin1("Height"));
+	mDefaultDeferMinutes = config->readNumEntry(TQString::tqfromLatin1("DeferMins"));
+	mNoDefer             = config->readBoolEntry(TQString::tqfromLatin1("NoDefer"));
+	mNoPostAction        = config->readBoolEntry(TQString::tqfromLatin1("NoPostAction"));
+	mKMailSerialNumber   = config->readUnsignedLongNumEntry(TQString::tqfromLatin1("KMailSerial"));
 	mShowEdit            = false;
 	kdDebug(5950) << "MessageWin::readProperties(" << mEventID << ")" << endl;
 	if (mAlarmType != KAAlarm::INVALID_ALARM)
@@ -789,7 +789,7 @@ void MessageWin::playAudio()
 			return;    // ensure zero volume doesn't play anything
 #ifdef WITHOUT_ARTS
 		TQString play = mAudioFile;
-		TQString file = TQString::fromLatin1("file:");
+		TQString file = TQString::tqfromLatin1("file:");
 		if (mAudioFile.startsWith(file))
 			play = mAudioFile.mid(file.length());
 		KAudioPlayer::play(TQFile::encodeName(play));
@@ -883,7 +883,7 @@ void MessageWin::slotPlayAudio()
 			if (!haveErrorMessage(ErrMsg_Volume))
 			{
 				KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError),
-				                         TQString::null, TQString::fromLatin1("KMixError"));
+				                         TQString::null, TQString::tqfromLatin1("KMixError"));
 				clearErrorMessage(ErrMsg_Volume);
 			}
 		}
@@ -1183,7 +1183,7 @@ void MessageWin::show()
 	if (mCloseTime.isValid())
 	{
 		// Set a timer to auto-close the window
-		int delay = TQDateTime::currentDateTime().secsTo(mCloseTime);
+		int delay = TQDateTime::tqcurrentDateTime().secsTo(mCloseTime);
 		if (delay < 0)
 			delay = 0;
 		TQTimer::singleShot(delay * 1000, this, TQT_SLOT(close()));
@@ -1200,18 +1200,18 @@ void MessageWin::show()
 *  For message windows, the size if limited to fit inside the working area of
 *  the desktop.
 */
-TQSize MessageWin::sizeHint() const
+TQSize MessageWin::tqsizeHint() const
 {
 	if (mAction != KAEvent::MESSAGE)
-		return MainWindowBase::sizeHint();
+		return MainWindowBase::tqsizeHint();
 	if (!mWinModule)
 		mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
 	TQSize frame = frameGeometry().size();
-	TQSize contents = geometry().size();
+	TQSize contents = tqgeometry().size();
 	TQSize desktop  = mWinModule->workArea().size();
 	TQSize maxSize(desktop.width() - (frame.width() - contents.width()),
 	              desktop.height() - (frame.height() - contents.height()));
-	return MainWindowBase::sizeHint().boundedTo(maxSize);
+	return MainWindowBase::tqsizeHint().boundedTo(maxSize);
 }
 
 /******************************************************************************
@@ -1233,7 +1233,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 			 * method is called, so for large windows the size needs to be
 			 * set again later.
 			 */
-			TQSize s = sizeHint();     // fit the window round the message
+			TQSize s = tqsizeHint();     // fit the window round the message
 			if (mAction == KAEvent::FILE  &&  !mErrorMsgs.count())
 				KAlarm::readConfigWindowSize("FileMessage", s);
 			resize(s);
@@ -1246,10 +1246,10 @@ void MessageWin::showEvent(TQShowEvent* se)
 				 * To achieve this, move the window so that the OK button is as far away
 				 * from the cursor as possible. If the buttons are still too close to the
 				 * cursor, disable the buttons for a short time.
-				 * N.B. This can't be done in show(), since the geometry of the window
+				 * N.B. This can't be done in show(), since the tqgeometry of the window
 				 *      is not known until it is displayed. Unfortunately by moving the
 				 *      window in showEvent(), a flicker is unavoidable.
-				 *      See the Qt documentation on window geometry for more details.
+				 *      See the Qt documentation on window tqgeometry for more details.
 				 */
 				// PROBLEM: The frame size is not known yet!
 
@@ -1267,7 +1267,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 					desk &= dw->screenGeometry(dw->screenNumber(cursor));
 
 				TQRect frame = frameGeometry();
-				TQRect rect  = geometry();
+				TQRect rect  = tqgeometry();
 				// Find the offsets from the outside of the frame to the edges of the OK button
 				TQRect button(mOkButton->mapToParent(TQPoint(0, 0)), mOkButton->mapToParent(mOkButton->rect().bottomRight()));
 				int buttonLeft   = button.left() + rect.left() - frame.left();
@@ -1282,7 +1282,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 
 				// Find the enclosing rectangle for the new button positions
 				// and check if the cursor is too near
-				TQRect buttons = mOkButton->geometry().unite(mKAlarmButton->geometry());
+				TQRect buttons = mOkButton->tqgeometry().unite(mKAlarmButton->tqgeometry());
 				buttons.moveBy(rect.left() + x - frame.left(), rect.top() + y - frame.top());
 				int minDistance = proximityMultiple * mOkButton->height();
 				if ((abs(cursor.x() - buttons.left()) < minDistance
@@ -1328,7 +1328,7 @@ void MessageWin::moveEvent(TQMoveEvent* e)
 */
 void MessageWin::setMaxSize()
 {
-	TQSize s = sizeHint();
+	TQSize s = tqsizeHint();
 	if (width() > s.width()  ||  height() > s.height())
 		resize(s);
 }
@@ -1437,8 +1437,8 @@ void MessageWin::slotShowKMailMessage()
 	TQCString    replyType;
 	TQByteArray  data, replyData;
 	TQDataStream arg(data, IO_WriteOnly);
-	arg << (Q_UINT32)mKMailSerialNumber << TQString::null;
-	if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(Q_UINT32,TQString)", data, replyType, replyData)
+	arg << (TQ_UINT32)mKMailSerialNumber << TQString::null;
+	if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
 	&&  replyType == "bool")
 	{
 		bool result;
@@ -1468,7 +1468,7 @@ void MessageWin::slotEdit()
 		KAlarm::UpdateStatus status;
 		if (AlarmCalendar::activeCalendar()->event(mEventID))
 		{
-			// The old alarm hasn't expired yet, so replace it
+			// The old alarm hasn't expired yet, so tqreplace it
 			status = KAlarm::modifyEvent(mEvent, event, 0, &editDlg);
 			Undo::saveEdit(mEvent, event);
 		}
@@ -1516,7 +1516,7 @@ void MessageWin::checkDeferralLimit()
 {
 	if (!mDeferButton  ||  !mDeferLimit.isValid())
 		return;
-	int n = TQDate::currentDate().daysTo(mDeferLimit.date());
+	int n = TQDate::tqcurrentDate().daysTo(mDeferLimit.date());
 	if (n > 0)
 		return;
 	MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit()));
@@ -1540,7 +1540,7 @@ void MessageWin::checkDeferralLimit()
 */
 void MessageWin::slotDefer()
 {
-	mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime::currentDateTime().addSecs(60),
+	mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime::tqcurrentDateTime().addSecs(60),
 	                              false, this, "deferDlg");
 	if (mDefaultDeferMinutes > 0)
 		mDeferDlg->setDeferMinutes(mDefaultDeferMinutes);
@@ -1622,7 +1622,7 @@ void MessageWin::displayMainWindow()
 */
 bool MessageWin::haveErrorMessage(unsigned msg) const
 {
-	if (!mErrorMessages.contains(mEventID))
+	if (!mErrorMessages.tqcontains(mEventID))
 		mErrorMessages.insert(mEventID, 0);
 	bool result = (mErrorMessages[mEventID] & msg);
 	mErrorMessages[mEventID] |= msg;
@@ -1631,7 +1631,7 @@ bool MessageWin::haveErrorMessage(unsigned msg) const
 
 void MessageWin::clearErrorMessage(unsigned msg) const
 {
-	if (mErrorMessages.contains(mEventID))
+	if (mErrorMessages.tqcontains(mEventID))
 	{
 		if (mErrorMessages[mEventID] == msg)
 			mErrorMessages.remove(mEventID);
@@ -1673,7 +1673,7 @@ MWMimeSourceFactory::MWMimeSourceFactory(const TQString& absPath, KTextBrowser*
 	  mLast(0)
 {
 	view->setMimeSourceFactory(this);
-	TQString type = KMimeType::findByPath(absPath)->name();
+	TQString type = KMimeType::tqfindByPath(absPath)->name();
 	switch (KAlarm::fileType(type))
 	{
 		case KAlarm::TextPlain:
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index f3ac45f4a..52c86c5fc 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -56,7 +56,7 @@ class MessageWin : public MainWindowBase
 		bool                hasDefer() const       { return !!mDeferButton; }
 		bool                isValid() const        { return !mInvalid; }
 		virtual void        show();
-		virtual TQSize       sizeHint() const;
+		virtual TQSize       tqsizeHint() const;
 		static int          instanceCount()        { return mWindowList.count(); }
 		static MessageWin*  findEvent(const TQString& eventID);
 
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index ff312416d..70e720dc0 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -81,12 +81,12 @@
 // %C = temporary command file to execute in terminal
 // %W = temporary command file to execute in terminal, with 'sleep 86400' appended
 static TQString xtermCommands[] = {
-	TQString::fromLatin1("xterm -sb -hold -title %t -e %c"),
-	TQString::fromLatin1("konsole --noclose -T %t -e ${SHELL:-sh} -c %c"),
-	TQString::fromLatin1("gnome-terminal -t %t -e %W"),
-	TQString::fromLatin1("eterm --pause -T %t -e %C"),    // some systems use eterm...
-	TQString::fromLatin1("Eterm --pause -T %t -e %C"),    // while some use Eterm
-	TQString::fromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"),
+	TQString::tqfromLatin1("xterm -sb -hold -title %t -e %c"),
+	TQString::tqfromLatin1("konsole --noclose -T %t -e ${SHELL:-sh} -c %c"),
+	TQString::tqfromLatin1("gnome-terminal -t %t -e %W"),
+	TQString::tqfromLatin1("eterm --pause -T %t -e %C"),    // some systems use eterm...
+	TQString::tqfromLatin1("Eterm --pause -T %t -e %C"),    // while some use Eterm
+	TQString::tqfromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"),
 	TQString::null       // end of list indicator - don't change!
 };
 
@@ -169,7 +169,7 @@ void KAlarmPrefDlg::slotApply()
 	TQString errmsg = mEmailPage->validate();
 	if (!errmsg.isEmpty())
 	{
-		showPage(pageIndex(mEmailPage->parentWidget()));
+		showPage(pageIndex(mEmailPage->tqparentWidget()));
 		if (KMessageBox::warningYesNo(this, errmsg) != KMessageBox::Yes)
 		{
 			mValid = false;
@@ -179,7 +179,7 @@ void KAlarmPrefDlg::slotApply()
 	errmsg = mEditPage->validate();
 	if (!errmsg.isEmpty())
 	{
-		showPage(pageIndex(mEditPage->parentWidget()));
+		showPage(pageIndex(mEditPage->tqparentWidget()));
 		KMessageBox::sorry(this, errmsg);
 		mValid = false;
 		return;
@@ -250,8 +250,8 @@ void PrefsTabBase::apply(bool syncToDisc)
 MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 	TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
 	TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint());
@@ -262,18 +262,18 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 
 	// Run-on-demand radio button
 	mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand");
-	mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint());
+	mRunOnDemand->setFixedSize(mRunOnDemand->tqsizeHint());
 	connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
 	TQWhatsThis::add(mRunOnDemand,
 	      i18n("Check to run KAlarm only when required.\n\n"
 	           "Notes:\n"
 	           "1. Alarms are displayed even when KAlarm is not running, since alarm monitoring is done by the alarm daemon.\n"
 	           "2. With this option selected, the system tray icon can be displayed or hidden independently of KAlarm."));
-	grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, alignment);
+	grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, tqalignment);
 
 	// Run-in-system-tray radio button
 	mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray");
-	mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint());
+	mRunInSystemTray->setFixedSize(mRunInSystemTray->tqsizeHint());
 	connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
 	TQWhatsThis::add(mRunInSystemTray,
 	      i18n("Check to run KAlarm continuously in the KDE system tray.\n\n"
@@ -281,39 +281,39 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	           "1. With this option selected, closing the system tray icon will quit KAlarm.\n"
 	           "2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon."
 	           " Running in the system tray simply provides easy access and a status indication."));
-	grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, alignment);
+	grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, tqalignment);
 
 	// Run continuously options
 	mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
-	mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint());
+	mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->tqsizeHint());
 	connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool)));
 	TQWhatsThis::add(mDisableAlarmsIfStopped,
 	      i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible."));
-	grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment);
+	grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, tqalignment);
 
 	mQuitWarn = new TQCheckBox(i18n("Warn before &quitting"), group, "disableAl");
-	mQuitWarn->setFixedSize(mQuitWarn->sizeHint());
+	mQuitWarn->setFixedSize(mQuitWarn->tqsizeHint());
 	TQWhatsThis::add(mQuitWarn,
 	      i18n("Check to display a warning prompt before quitting KAlarm."));
-	grid->addWidget(mQuitWarn, 4, 2, alignment);
+	grid->addWidget(mQuitWarn, 4, 2, tqalignment);
 
 	mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray");
 #ifdef AUTOSTART_BY_KALARMD
 	connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool)));
 #endif
-	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment);
+	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, tqalignment);
 
 	// Autostart alarm daemon
 	mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon");
-	mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint());
+	mAutostartDaemon->setFixedSize(mAutostartDaemon->tqsizeHint());
 	connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked()));
 	TQWhatsThis::add(mAutostartDaemon,
 	      i18n("Automatically start alarm monitoring whenever you start KDE, by running the alarm daemon (%1).\n\n"
 	           "This option should always be checked unless you intend to discontinue use of KAlarm.")
-	          .arg(TQString::fromLatin1(DAEMON_APP_NAME)));
-	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, alignment);
+	          .arg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
+	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment);
 
-	group->setFixedHeight(group->sizeHint().height());
+	group->setFixedHeight(group->tqsizeHint().height());
 
 	// Start-of-day time
 	TQHBox* itemBox = new TQHBox(mPage);
@@ -321,22 +321,22 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	box->setSpacing(KDialog::spacingHint());
 	TQLabel* label = new TQLabel(i18n("&Start of day for date-only alarms:"), box);
 	mStartOfDay = new TimeEdit(box);
-	mStartOfDay->setFixedSize(mStartOfDay->sizeHint());
+	mStartOfDay->setFixedSize(mStartOfDay->tqsizeHint());
 	label->setBuddy(mStartOfDay);
 	static const TQString startOfDayText = i18n("The earliest time of day at which a date-only alarm (i.e. "
 	                                           "an alarm with \"any time\" specified) will be triggered.");
 	TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis()));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
-	itemBox->setFixedHeight(box->sizeHint().height());
+	itemBox->setFixedHeight(box->tqsizeHint().height());
 
 	// Confirm alarm deletion?
 	itemBox = new TQHBox(mPage);   // this is to allow left adjustment
 	mConfirmAlarmDeletion = new TQCheckBox(i18n("Con&firm alarm deletions"), itemBox, "confirmDeletion");
-	mConfirmAlarmDeletion->setMinimumSize(mConfirmAlarmDeletion->sizeHint());
+	mConfirmAlarmDeletion->setMinimumSize(mConfirmAlarmDeletion->tqsizeHint());
 	TQWhatsThis::add(mConfirmAlarmDeletion,
 	      i18n("Check to be prompted for confirmation each time you delete an alarm."));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
-	itemBox->setFixedHeight(itemBox->sizeHint().height());
+	itemBox->setFixedHeight(itemBox->tqsizeHint().height());
 
 	// Expired alarms
 	group = new TQGroupBox(i18n("Expired Alarms"), mPage);
@@ -345,35 +345,35 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	grid->addColSpacing(0, indentWidth());
 	grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 	mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired");
-	mKeepExpired->setFixedSize(mKeepExpired->sizeHint());
+	mKeepExpired->setFixedSize(mKeepExpired->tqsizeHint());
 	connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
 	TQWhatsThis::add(mKeepExpired,
 	      i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered)."));
-	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment);
+	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, tqalignment);
 
 	box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
 	mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired");
-	mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint());
+	mPurgeExpired->setMinimumSize(mPurgeExpired->tqsizeHint());
 	connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
 	mPurgeAfter = new SpinBox(box);
 	mPurgeAfter->setMinValue(1);
 	mPurgeAfter->setLineShiftStep(10);
-	mPurgeAfter->setMinimumSize(mPurgeAfter->sizeHint());
+	mPurgeAfter->setMinimumSize(mPurgeAfter->tqsizeHint());
 	mPurgeAfterLabel = new TQLabel(i18n("da&ys"), box);
-	mPurgeAfterLabel->setMinimumSize(mPurgeAfterLabel->sizeHint());
+	mPurgeAfterLabel->setMinimumSize(mPurgeAfterLabel->tqsizeHint());
 	mPurgeAfterLabel->setBuddy(mPurgeAfter);
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to store expired alarms indefinitely. Check to enter how long expired alarms should be stored."));
-	grid->addWidget(box, 2, 1, alignment);
+	grid->addWidget(box, 2, 1, tqalignment);
 
 	mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group);
-	mClearExpired->setFixedSize(mClearExpired->sizeHint());
+	mClearExpired->setFixedSize(mClearExpired->tqsizeHint());
 	connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired()));
 	TQWhatsThis::add(mClearExpired,
 	      i18n("Delete all existing expired alarms."));
-	grid->addWidget(mClearExpired, 3, 1, alignment);
-	group->setFixedHeight(group->sizeHint().height());
+	grid->addWidget(mClearExpired, 3, 1, tqalignment);
+	group->setFixedHeight(group->tqsizeHint().height());
 
 	// Terminal window to use for command alarms
 	group = new TQGroupBox(i18n("Terminal for Command Alarms"), mPage);
@@ -395,15 +395,15 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		if (args.isEmpty()  ||  KStandardDirs::findExe(args[0]).isEmpty())
 			continue;
 		TQRadioButton* radio = new TQRadioButton(args[0], group);
-		radio->setMinimumSize(radio->sizeHint());
+		radio->setMinimumSize(radio->tqsizeHint());
 		mXtermType->insert(radio, mXtermCount);
 		if (mXtermFirst < 0)
 			mXtermFirst = mXtermCount;   // note the id of the first button
-		cmd.replace("%t", kapp->aboutData()->programName());
-		cmd.replace("%c", "");
-		cmd.replace("%w", "");
-		cmd.replace("%C", "[command]");
-		cmd.replace("%W", "[command; sleep]");
+		cmd.tqreplace("%t", kapp->aboutData()->programName());
+		cmd.tqreplace("%c", "");
+		cmd.tqreplace("%w", "");
+		cmd.tqreplace("%C", "[command]");
+		cmd.tqreplace("%W", "[command; sleep]");
 		TQWhatsThis::add(radio, whatsThis.arg(cmd));
 		grid->addWidget(radio, (row = index/3 + 1), index % 3, Qt::AlignAuto);
 		++index;
@@ -412,7 +412,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	box = new TQHBox(group);
 	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, Qt::AlignAuto);
 	TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool)));
 	mXtermType->insert(radio, mXtermCount);
 	if (mXtermFirst < 0)
@@ -604,13 +604,13 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	mEmailClient = new ButtonGroup(box);
 	mEmailClient->hide();
 	RadioButton* radio = new RadioButton(i18n("&KMail"), box, "kmail");
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mEmailClient->insert(radio, Preferences::KMAIL);
 	radio = new RadioButton(i18n("&Sendmail"), box, "sendmail");
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mEmailClient->insert(radio, Preferences::SENDMAIL);
 	connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int)));
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 	TQWhatsThis::add(box,
 	      i18n("Choose how to send email when an email alarm is triggered.\n"
 	           "KMail: The email is sent automatically via KMail. KMail is started first if necessary.\n"
@@ -619,11 +619,11 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	box = new TQHBox(mPage);   // this is to allow left adjustment
 	mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box);
-	mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->sizeHint());
+	mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->tqsizeHint());
 	TQWhatsThis::add(mEmailCopyToKMail,
 	      i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 
 	// Your Email Address group box
 	TQGroupBox* group = new TQGroupBox(i18n("Your Email Address"), mPage);
@@ -633,7 +633,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'From' email address controls ...
 	label = new Label(EditAlarmDlg::i18n_f_EmailFrom(), group);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 1, 0);
 	mFromAddressGroup = new ButtonGroup(group);
 	mFromAddressGroup->hide();
@@ -642,7 +642,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	// Line edit to enter a 'From' email address
 	radio = new RadioButton(group);
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_ADDR);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	label->setBuddy(radio);
 	grid->addWidget(radio, 1, 1);
 	mEmailAddress = new TQLineEdit(group);
@@ -655,7 +655,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'From' email address to be taken from Control Centre
 	radio = new RadioButton(i18n("&Use address from Control Center"), group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms."));
@@ -663,7 +663,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'From' email address to be picked from KMail's identities when the email alarm is configured
 	radio = new RadioButton(i18n("Use KMail &identities"), group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_KMAIL);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use KMail's email identities to identify you as the sender when sending email alarms. "
@@ -674,7 +674,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	// 'Bcc' email address controls ...
 	grid->addRowSpacing(4, KDialog::spacingHint());
 	label = new Label(i18n("'Bcc' email address", "&Bcc:"), group);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 5, 0);
 	mBccAddressGroup = new ButtonGroup(group);
 	mBccAddressGroup->hide();
@@ -682,7 +682,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// Line edit to enter a 'Bcc' email address
 	radio = new RadioButton(group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_ADDR);
 	label->setBuddy(radio);
 	grid->addWidget(radio, 5, 1);
@@ -696,22 +696,22 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'Bcc' email address to be taken from Control Centre
 	radio = new RadioButton(i18n("Us&e address from Control Center"), group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself."));
 	grid->addMultiCellWidget(radio, 6, 6, 1, 2, Qt::AlignAuto);
 
-	group->setFixedHeight(group->sizeHint().height());
+	group->setFixedHeight(group->tqsizeHint().height());
 
 	box = new TQHBox(mPage);   // this is to allow left adjustment
 	mEmailQueuedNotify = new TQCheckBox(i18n("&Notify when remote emails are queued"), box);
-	mEmailQueuedNotify->setFixedSize(mEmailQueuedNotify->sizeHint());
+	mEmailQueuedNotify->setFixedSize(mEmailQueuedNotify->tqsizeHint());
 	TQWhatsThis::add(mEmailQueuedNotify,
 	      i18n("Display a notification message whenever an email alarm has queued an email for sending to a remote system. "
 	           "This could be useful if, for example, you have a dial-up connection, so that you can then ensure that the email is actually transmitted."));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 
 	mPage->setStretchFactor(new TQWidget(mPage), 1);    // top adjust the widgets
 }
@@ -825,12 +825,12 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
 	mFontChooser = new FontColourChooser(mPage, 0, false, TQStringList(), i18n("Message Font && Color"), true, false);
 	mPage->setStretchFactor(mFontChooser, 1);
 
-	TQFrame* layoutBox = new TQFrame(mPage);
-	TQHBoxLayout* hlayout = new TQHBoxLayout(layoutBox);
-	TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
-	hlayout->addStretch();
+	TQFrame* tqlayoutBox = new TQFrame(mPage);
+	TQHBoxLayout* htqlayout = new TQHBoxLayout(tqlayoutBox);
+	TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
+	htqlayout->addStretch();
 
-	TQHBox* box = new TQHBox(layoutBox);    // to group widgets for TQWhatsThis text
+	TQHBox* box = new TQHBox(tqlayoutBox);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint()/2);
 	colourLayout->addWidget(box);
 	TQLabel* label1 = new TQLabel(i18n("Di&sabled alarm color:"), box);
@@ -840,7 +840,7 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Choose the text color in the alarm list for disabled alarms."));
 
-	box = new TQHBox(layoutBox);    // to group widgets for TQWhatsThis text
+	box = new TQHBox(tqlayoutBox);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint()/2);
 	colourLayout->addWidget(box);
 	TQLabel* label2 = new TQLabel(i18n("E&xpired alarm color:"), box);
@@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults()
 EditPrefTab::EditPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get alignment to use in TQLabel::setAlignment(alignment | Qt::WordBreak)
+	// Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | Qt::WordBreak)
 	// (AlignAuto doesn't work correctly there)
-	int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 	int groupTopMargin = fontMetrics().lineSpacing()/2;
 	TQString defsetting   = i18n("The default setting for \"%1\" in the alarm edit dialog.");
@@ -897,118 +897,118 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	// DISPLAY ALARMS
 	TQGroupBox* group = new TQGroupBox(i18n("Display Alarms"), mPage);
-	TQBoxLayout* layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
 
 	mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
-	mConfirmAck->setMinimumSize(mConfirmAck->sizeHint());
+	mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint());
 	TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
-	layout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
 
 	mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
-	mAutoClose->setMinimumSize(mAutoClose->sizeHint());
+	mAutoClose->setMinimumSize(mAutoClose->tqsizeHint());
 	TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
-	layout->addWidget(mAutoClose, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mAutoClose, 0, Qt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	TQLabel* label = new TQLabel(i18n("Reminder &units:"), box);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mReminderUnits = new TQComboBox(box, "defWarnUnits");
 	mReminderUnits->insertItem(TimePeriod::i18n_Minutes(), TimePeriod::MINUTES);
 	mReminderUnits->insertItem(TimePeriod::i18n_Hours_Mins(), TimePeriod::HOURS_MINUTES);
 	mReminderUnits->insertItem(TimePeriod::i18n_Days(), TimePeriod::DAYS);
 	mReminderUnits->insertItem(TimePeriod::i18n_Weeks(), TimePeriod::WEEKS);
-	mReminderUnits->setFixedSize(mReminderUnits->sizeHint());
+	mReminderUnits->setFixedSize(mReminderUnits->tqsizeHint());
 	label->setBuddy(mReminderUnits);
 	TQWhatsThis::add(box,
 	      i18n("The default units for the reminder in the alarm edit dialog."));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the control
 
 	mSpecialActionsButton = new SpecialActionsButton(EditAlarmDlg::i18n_SpecialActions(), box);
-	mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint());
+	mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint());
 
 	// SOUND
 	TQButtonGroup* bgroup = new TQButtonGroup(SoundPicker::i18n_Sound(), mPage, "soundGroup");
-	layout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
+	tqlayout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
 
-	TQBoxLayout* hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
+	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 	mSound = new TQComboBox(false, bgroup, "defSound");
 	mSound->insertItem(SoundPicker::i18n_None());         // index 0
 	mSound->insertItem(SoundPicker::i18n_Beep());         // index 1
 	mSound->insertItem(SoundPicker::i18n_File());         // index 2
 	if (theApp()->speechEnabled())
 		mSound->insertItem(SoundPicker::i18n_Speak());  // index 3
-	mSound->setMinimumSize(mSound->sizeHint());
+	mSound->setMinimumSize(mSound->tqsizeHint());
 	TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
-	hlayout->addWidget(mSound);
-	hlayout->addStretch(1);
+	htqlayout->addWidget(mSound);
+	htqlayout->addStretch(1);
 
 #ifndef WITHOUT_ARTS
 	mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound");
-	mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint());
+	mSoundRepeat->setMinimumSize(mSoundRepeat->tqsizeHint());
 	TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat()));
-	hlayout->addWidget(mSoundRepeat);
+	htqlayout->addWidget(mSoundRepeat);
 #endif
 
 	box = new TQHBox(bgroup);   // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mSoundFileLabel = new TQLabel(i18n("Sound &file:"), box);
-	mSoundFileLabel->setFixedSize(mSoundFileLabel->sizeHint());
+	mSoundFileLabel->setFixedSize(mSoundFileLabel->tqsizeHint());
 	mSoundFile = new TQLineEdit(box);
 	mSoundFileLabel->setBuddy(mSoundFile);
 	mSoundFileBrowse = new TQPushButton(box);
 	mSoundFileBrowse->setPixmap(SmallIcon("fileopen"));
-	mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint());
+	mSoundFileBrowse->setFixedSize(mSoundFileBrowse->tqsizeHint());
 	connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile()));
 	TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file"));
 	TQWhatsThis::add(box,
 	      i18n("Enter the default sound file to use in the alarm edit dialog."));
-	box->setFixedHeight(box->sizeHint().height());
-	layout->addWidget(box);
-	bgroup->setFixedHeight(bgroup->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
+	tqlayout->addWidget(box);
+	bgroup->setFixedHeight(bgroup->tqsizeHint().height());
 
 	// COMMAND ALARMS
 	group = new TQGroupBox(i18n("Command Alarms"), mPage);
-	layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
-	layout = new TQHBoxLayout(layout, KDialog::spacingHint());
+	tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
+	tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
 	mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
-	mCmdScript->setMinimumSize(mCmdScript->sizeHint());
+	mCmdScript->setMinimumSize(mCmdScript->tqsizeHint());
 	TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
-	layout->addWidget(mCmdScript);
-	layout->addStretch();
+	tqlayout->addWidget(mCmdScript);
+	tqlayout->addStretch();
 
 	mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
-	mCmdXterm->setMinimumSize(mCmdXterm->sizeHint());
+	mCmdXterm->setMinimumSize(mCmdXterm->tqsizeHint());
 	TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
-	layout->addWidget(mCmdXterm);
+	tqlayout->addWidget(mCmdXterm);
 
 	// EMAIL ALARMS
 	group = new TQGroupBox(i18n("Email Alarms"), mPage);
-	layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
+	tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
 
 	// BCC email to sender
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
-	mEmailBcc->setMinimumSize(mEmailBcc->sizeHint());
+	mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
-	layout->addWidget(mEmailBcc, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mEmailBcc, 0, Qt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer
 	mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg");
-	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint());
+	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->tqsizeHint());
 	TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer()));
 
 	// Late cancellation
 	box = new TQHBox(mPage);
 	box->setSpacing(KDialog::spacingHint());
 	mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate");
-	mLateCancel->setMinimumSize(mLateCancel->sizeHint());
+	mLateCancel->setMinimumSize(mLateCancel->tqsizeHint());
 	TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the control
 
@@ -1016,7 +1016,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQHBox* itemBox = new TQHBox(box);   // this is to control the TQWhatsThis text display area
 	itemBox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("&Recurrence:"), itemBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mRecurPeriod = new TQComboBox(itemBox, "defRecur");
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_NoRecur());
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_AtLogin());
@@ -1025,17 +1025,17 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_Weekly());
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_Monthly());
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_Yearly());
-	mRecurPeriod->setFixedSize(mRecurPeriod->sizeHint());
+	mRecurPeriod->setFixedSize(mRecurPeriod->tqsizeHint());
 	label->setBuddy(mRecurPeriod);
 	TQWhatsThis::add(itemBox,
 	      i18n("The default setting for the recurrence rule in the alarm edit dialog."));
-	box->setFixedHeight(itemBox->sizeHint().height());
+	box->setFixedHeight(itemBox->tqsizeHint().height());
 
 	// How to handle February 29th in yearly recurrences
 	TQVBox* vbox = new TQVBox(mPage);   // this is to control the TQWhatsThis text display area
 	vbox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox);
-	label->setAlignment(alignment | Qt::WordBreak);
+	label->tqsetAlignment(tqalignment | Qt::WordBreak);
 	itemBox = new TQHBox(vbox);
 	itemBox->setSpacing(2*KDialog::spacingHint());
 	mFeb29 = new TQButtonGroup(itemBox);
@@ -1043,15 +1043,15 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQWidget* widget = new TQWidget(itemBox);
 	widget->setFixedWidth(3*KDialog::spacingHint());
 	TQRadioButton* radio = new TQRadioButton(i18n("February 2&8th"), itemBox);
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mFeb29->insert(radio, KARecurrence::FEB29_FEB28);
 	radio = new TQRadioButton(i18n("March &1st"), itemBox);
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mFeb29->insert(radio, KARecurrence::FEB29_MAR1);
 	radio = new TQRadioButton(i18n("Do ¬ repeat"), itemBox);
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mFeb29->insert(radio, KARecurrence::FEB29_FEB29);
-	itemBox->setFixedHeight(itemBox->sizeHint().height());
+	itemBox->setFixedHeight(itemBox->tqsizeHint().height());
 	TQWhatsThis::add(vbox,
 	      i18n("For yearly recurrences, choose what date, if any, alarms due on February 29th should occur in non-leap years.\n"
 	           "Note that the next scheduled occurrence of existing alarms is not re-evaluated when you change this setting."));
@@ -1200,7 +1200,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 
 	mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow");
-	mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint());
+	mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->tqsizeHint());
 	connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool)));
 	TQWhatsThis::add(mTooltipShowAlarms,
 	      i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
@@ -1209,25 +1209,25 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
 	mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax");
-	mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint());
+	mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->tqsizeHint());
 	connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool)));
 	mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box);
 	mTooltipMaxAlarmCount->setLineShiftStep(5);
-	mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint());
+	mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->tqsizeHint());
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. "
 	           "Check to enter an upper limit on the number to be displayed."));
 	grid->addMultiCellWidget(box, 2, 2, 1, 2, Qt::AlignAuto);
 
 	mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime");
-	mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint());
+	mTooltipShowTime->setMinimumSize(mTooltipShowTime->tqsizeHint());
 	connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTime,
 	      i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
 	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, Qt::AlignAuto);
 
 	mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo");
-	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint());
+	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->tqsizeHint());
 	connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTimeTo,
 	      i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
@@ -1236,17 +1236,17 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	box = new TQHBox(group);   // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mTooltipTimeToPrefixLabel = new TQLabel(i18n("&Prefix:"), box);
-	mTooltipTimeToPrefixLabel->setFixedSize(mTooltipTimeToPrefixLabel->sizeHint());
+	mTooltipTimeToPrefixLabel->setFixedSize(mTooltipTimeToPrefixLabel->tqsizeHint());
 	mTooltipTimeToPrefix = new TQLineEdit(box);
 	mTooltipTimeToPrefixLabel->setBuddy(mTooltipTimeToPrefix);
 	TQWhatsThis::add(box,
 	      i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip"));
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 	grid->addWidget(box, 5, 2, Qt::AlignAuto);
-	group->setMaximumHeight(group->sizeHint().height());
+	group->setMaximumHeight(group->tqsizeHint().height());
 
 	mModalMessages = new TQCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg");
-	mModalMessages->setMinimumSize(mModalMessages->sizeHint());
+	mModalMessages->setMinimumSize(mModalMessages->tqsizeHint());
 	TQWhatsThis::add(mModalMessages,
 	      i18n("Specify the characteristics of alarm message windows:\n"
 	           "- If checked, the window is a normal window with a title bar, which grabs keyboard input when it is displayed.\n"
@@ -1259,13 +1259,13 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQLabel* label = new TQLabel(i18n("System tray icon &update interval:"), box);
 	mDaemonTrayCheckInterval = new SpinBox(1, 9999, 1, box, "daemonCheck");
 	mDaemonTrayCheckInterval->setLineShiftStep(10);
-	mDaemonTrayCheckInterval->setMinimumSize(mDaemonTrayCheckInterval->sizeHint());
+	mDaemonTrayCheckInterval->setMinimumSize(mDaemonTrayCheckInterval->tqsizeHint());
 	label->setBuddy(mDaemonTrayCheckInterval);
 	label = new TQLabel(i18n("seconds"), box);
 	TQWhatsThis::add(box,
 	      i18n("How often to update the system tray icon to indicate whether or not the Alarm Daemon is monitoring alarms."));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
-	itemBox->setFixedHeight(box->sizeHint().height());
+	itemBox->setFixedHeight(box->tqsizeHint().height());
 
 	mPage->setStretchFactor(new TQWidget(mPage), 1);    // top adjust the widgets
 }
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 3c2b5f185..93e6a60b0 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -58,7 +58,7 @@ const int                        Preferences::default_messageButtonDelay      =
 const int                        Preferences::default_tooltipAlarmCount       = 5;
 const bool                       Preferences::default_showTooltipAlarmTime    = true;
 const bool                       Preferences::default_showTooltipTimeToAlarm  = true;
-const TQString                    Preferences::default_tooltipTimeToPrefix     = TQString::fromLatin1("+");
+const TQString                    Preferences::default_tooltipTimeToPrefix     = TQString::tqfromLatin1("+");
 const int                        Preferences::default_daemonTrayCheckInterval = 10;     // (seconds)
 const bool                       Preferences::default_emailCopyToKMail        = false;
 const bool                       Preferences::default_emailQueuedNotify       = false;
@@ -139,65 +139,65 @@ TQTime                      Preferences::mOldStartOfDay;
 bool                       Preferences::mStartOfDayChanged;
 
 
-static const TQString defaultFeb29RecurType    = TQString::fromLatin1("Mar1");
-static const TQString defaultEmailClient       = TQString::fromLatin1("kmail");
+static const TQString defaultFeb29RecurType    = TQString::tqfromLatin1("Mar1");
+static const TQString defaultEmailClient       = TQString::tqfromLatin1("kmail");
 
 // Config file entry names
-static const TQString GENERAL_SECTION          = TQString::fromLatin1("General");
-static const TQString VERSION_NUM              = TQString::fromLatin1("Version");
-static const TQString MESSAGE_COLOURS          = TQString::fromLatin1("MessageColours");
-static const TQString MESSAGE_BG_COLOUR        = TQString::fromLatin1("MessageBackgroundColour");
-static const TQString MESSAGE_FONT             = TQString::fromLatin1("MessageFont");
-static const TQString RUN_IN_SYSTEM_TRAY       = TQString::fromLatin1("RunInSystemTray");
-static const TQString DISABLE_IF_STOPPED       = TQString::fromLatin1("DisableAlarmsIfStopped");
-static const TQString AUTOSTART_TRAY           = TQString::fromLatin1("AutostartTray");
-static const TQString FEB29_RECUR_TYPE         = TQString::fromLatin1("Feb29Recur");
-static const TQString MODAL_MESSAGES           = TQString::fromLatin1("ModalMessages");
-static const TQString MESSAGE_BUTTON_DELAY     = TQString::fromLatin1("MessageButtonDelay");
-static const TQString TOOLTIP_ALARM_COUNT      = TQString::fromLatin1("TooltipAlarmCount");
-static const TQString TOOLTIP_ALARM_TIME       = TQString::fromLatin1("ShowTooltipAlarmTime");
-static const TQString TOOLTIP_TIME_TO_ALARM    = TQString::fromLatin1("ShowTooltipTimeToAlarm");
-static const TQString TOOLTIP_TIME_TO_PREFIX   = TQString::fromLatin1("TooltipTimeToPrefix");
-static const TQString DAEMON_TRAY_INTERVAL     = TQString::fromLatin1("DaemonTrayCheckInterval");
-static const TQString EMAIL_CLIENT             = TQString::fromLatin1("EmailClient");
-static const TQString EMAIL_COPY_TO_KMAIL      = TQString::fromLatin1("EmailCopyToKMail");
-static const TQString EMAIL_FROM               = TQString::fromLatin1("EmailFrom");
-static const TQString EMAIL_BCC_ADDRESS        = TQString::fromLatin1("EmailBccAddress");
-static const TQString CMD_XTERM_COMMAND        = TQString::fromLatin1("CmdXTerm");
-static const TQString START_OF_DAY             = TQString::fromLatin1("StartOfDay");
-static const TQString START_OF_DAY_CHECK       = TQString::fromLatin1("Sod");
-static const TQString DISABLED_COLOUR          = TQString::fromLatin1("DisabledColour");
-static const TQString EXPIRED_COLOUR           = TQString::fromLatin1("ExpiredColour");
-static const TQString EXPIRED_KEEP_DAYS        = TQString::fromLatin1("ExpiredKeepDays");
-static const TQString DEFAULTS_SECTION         = TQString::fromLatin1("Defaults");
-static const TQString DEF_LATE_CANCEL          = TQString::fromLatin1("DefLateCancel");
-static const TQString DEF_AUTO_CLOSE           = TQString::fromLatin1("DefAutoClose");
-static const TQString DEF_CONFIRM_ACK          = TQString::fromLatin1("DefConfirmAck");
-static const TQString DEF_COPY_TO_KORG         = TQString::fromLatin1("DefCopyKOrg");
-static const TQString DEF_SOUND_TYPE           = TQString::fromLatin1("DefSoundType");
-static const TQString DEF_SOUND_FILE           = TQString::fromLatin1("DefSoundFile");
-static const TQString DEF_SOUND_VOLUME         = TQString::fromLatin1("DefSoundVolume");
-static const TQString DEF_SOUND_REPEAT         = TQString::fromLatin1("DefSoundRepeat");
-static const TQString DEF_CMD_SCRIPT           = TQString::fromLatin1("DefCmdScript");
-static const TQString DEF_CMD_LOG_TYPE         = TQString::fromLatin1("DefCmdLogType");
-static const TQString DEF_LOG_FILE             = TQString::fromLatin1("DefLogFile");
-static const TQString DEF_EMAIL_BCC            = TQString::fromLatin1("DefEmailBcc");
-static const TQString DEF_RECUR_PERIOD         = TQString::fromLatin1("DefRecurPeriod");
-static const TQString DEF_REMIND_UNITS         = TQString::fromLatin1("RemindUnits");
-static const TQString DEF_PRE_ACTION           = TQString::fromLatin1("DefPreAction");
-static const TQString DEF_POST_ACTION          = TQString::fromLatin1("DefPostAction");
+static const TQString GENERAL_SECTION          = TQString::tqfromLatin1("General");
+static const TQString VERSION_NUM              = TQString::tqfromLatin1("Version");
+static const TQString MESSAGE_COLOURS          = TQString::tqfromLatin1("MessageColours");
+static const TQString MESSAGE_BG_COLOUR        = TQString::tqfromLatin1("MessageBackgroundColour");
+static const TQString MESSAGE_FONT             = TQString::tqfromLatin1("MessageFont");
+static const TQString RUN_IN_SYSTEM_TRAY       = TQString::tqfromLatin1("RunInSystemTray");
+static const TQString DISABLE_IF_STOPPED       = TQString::tqfromLatin1("DisableAlarmsIfStopped");
+static const TQString AUTOSTART_TRAY           = TQString::tqfromLatin1("AutostartTray");
+static const TQString FEB29_RECUR_TYPE         = TQString::tqfromLatin1("Feb29Recur");
+static const TQString MODAL_MESSAGES           = TQString::tqfromLatin1("ModalMessages");
+static const TQString MESSAGE_BUTTON_DELAY     = TQString::tqfromLatin1("MessageButtonDelay");
+static const TQString TOOLTIP_ALARM_COUNT      = TQString::tqfromLatin1("TooltipAlarmCount");
+static const TQString TOOLTIP_ALARM_TIME       = TQString::tqfromLatin1("ShowTooltipAlarmTime");
+static const TQString TOOLTIP_TIME_TO_ALARM    = TQString::tqfromLatin1("ShowTooltipTimeToAlarm");
+static const TQString TOOLTIP_TIME_TO_PREFIX   = TQString::tqfromLatin1("TooltipTimeToPrefix");
+static const TQString DAEMON_TRAY_INTERVAL     = TQString::tqfromLatin1("DaemonTrayCheckInterval");
+static const TQString EMAIL_CLIENT             = TQString::tqfromLatin1("EmailClient");
+static const TQString EMAIL_COPY_TO_KMAIL      = TQString::tqfromLatin1("EmailCopyToKMail");
+static const TQString EMAIL_FROM               = TQString::tqfromLatin1("EmailFrom");
+static const TQString EMAIL_BCC_ADDRESS        = TQString::tqfromLatin1("EmailBccAddress");
+static const TQString CMD_XTERM_COMMAND        = TQString::tqfromLatin1("CmdXTerm");
+static const TQString START_OF_DAY             = TQString::tqfromLatin1("StartOfDay");
+static const TQString START_OF_DAY_CHECK       = TQString::tqfromLatin1("Sod");
+static const TQString DISABLED_COLOUR          = TQString::tqfromLatin1("DisabledColour");
+static const TQString EXPIRED_COLOUR           = TQString::tqfromLatin1("ExpiredColour");
+static const TQString EXPIRED_KEEP_DAYS        = TQString::tqfromLatin1("ExpiredKeepDays");
+static const TQString DEFAULTS_SECTION         = TQString::tqfromLatin1("Defaults");
+static const TQString DEF_LATE_CANCEL          = TQString::tqfromLatin1("DefLateCancel");
+static const TQString DEF_AUTO_CLOSE           = TQString::tqfromLatin1("DefAutoClose");
+static const TQString DEF_CONFIRM_ACK          = TQString::tqfromLatin1("DefConfirmAck");
+static const TQString DEF_COPY_TO_KORG         = TQString::tqfromLatin1("DefCopyKOrg");
+static const TQString DEF_SOUND_TYPE           = TQString::tqfromLatin1("DefSoundType");
+static const TQString DEF_SOUND_FILE           = TQString::tqfromLatin1("DefSoundFile");
+static const TQString DEF_SOUND_VOLUME         = TQString::tqfromLatin1("DefSoundVolume");
+static const TQString DEF_SOUND_REPEAT         = TQString::tqfromLatin1("DefSoundRepeat");
+static const TQString DEF_CMD_SCRIPT           = TQString::tqfromLatin1("DefCmdScript");
+static const TQString DEF_CMD_LOG_TYPE         = TQString::tqfromLatin1("DefCmdLogType");
+static const TQString DEF_LOG_FILE             = TQString::tqfromLatin1("DefLogFile");
+static const TQString DEF_EMAIL_BCC            = TQString::tqfromLatin1("DefEmailBcc");
+static const TQString DEF_RECUR_PERIOD         = TQString::tqfromLatin1("DefRecurPeriod");
+static const TQString DEF_REMIND_UNITS         = TQString::tqfromLatin1("RemindUnits");
+static const TQString DEF_PRE_ACTION           = TQString::tqfromLatin1("DefPreAction");
+static const TQString DEF_POST_ACTION          = TQString::tqfromLatin1("DefPostAction");
 
 // Config file entry name for temporary use
-static const TQString TEMP                     = TQString::fromLatin1("Temp");
+static const TQString TEMP                     = TQString::tqfromLatin1("Temp");
 
 // Values for EmailFrom entry
-static const TQString FROM_CONTROL_CENTRE      = TQString::fromLatin1("@ControlCenter");
-static const TQString FROM_KMAIL               = TQString::fromLatin1("@KMail");
+static const TQString FROM_CONTROL_CENTRE      = TQString::tqfromLatin1("@ControlCenter");
+static const TQString FROM_KMAIL               = TQString::tqfromLatin1("@KMail");
 
 // Config file entry names for notification messages
-const TQString Preferences::QUIT_WARN              = TQString::fromLatin1("QuitWarn");
-const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::fromLatin1("ConfirmAlarmDeletion");
-const TQString Preferences::EMAIL_QUEUED_NOTIFY    = TQString::fromLatin1("EmailQueuedNotify");
+const TQString Preferences::QUIT_WARN              = TQString::tqfromLatin1("QuitWarn");
+const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::tqfromLatin1("ConfirmAlarmDeletion");
+const TQString Preferences::EMAIL_QUEUED_NOTIFY    = TQString::tqfromLatin1("EmailQueuedNotify");
 
 static const int SODxor = 0x82451630;
 inline int Preferences::startOfDayCheck()
@@ -338,10 +338,10 @@ void Preferences::read()
 	TQCString feb29            = config->readEntry(FEB29_RECUR_TYPE, defaultFeb29RecurType).local8Bit();
 	mDefaultFeb29Type         = (feb29 == "Mar1") ? KARecurrence::FEB29_MAR1 : (feb29 == "Feb28") ? KARecurrence::FEB29_FEB28 : KARecurrence::FEB29_FEB29;
 	TQString remindUnits       = config->readEntry(DEF_REMIND_UNITS);
-	mDefaultReminderUnits     = (remindUnits == TQString::fromLatin1("Minutes"))      ? TimePeriod::MINUTES
-	                          : (remindUnits == TQString::fromLatin1("HoursMinutes")) ? TimePeriod::HOURS_MINUTES
-	                          : (remindUnits == TQString::fromLatin1("Days"))         ? TimePeriod::DAYS
-	                          : (remindUnits == TQString::fromLatin1("Weeks"))        ? TimePeriod::WEEKS : default_defaultReminderUnits;
+	mDefaultReminderUnits     = (remindUnits == TQString::tqfromLatin1("Minutes"))      ? TimePeriod::MINUTES
+	                          : (remindUnits == TQString::tqfromLatin1("HoursMinutes")) ? TimePeriod::HOURS_MINUTES
+	                          : (remindUnits == TQString::tqfromLatin1("Days"))         ? TimePeriod::DAYS
+	                          : (remindUnits == TQString::tqfromLatin1("Weeks"))        ? TimePeriod::WEEKS : default_defaultReminderUnits;
 	mDefaultPreAction         = config->readEntry(DEF_PRE_ACTION, default_defaultPreAction);
 	mDefaultPostAction        = config->readEntry(DEF_POST_ACTION, default_defaultPostAction);
 	mInstance->emitPreferencesChanged();
@@ -406,10 +406,10 @@ void Preferences::save(bool syncToDisc)
 	TQString value;
 	switch (mDefaultReminderUnits)
 	{
-		case TimePeriod::MINUTES:       value = TQString::fromLatin1("Minutes");      break;
-		case TimePeriod::HOURS_MINUTES: value = TQString::fromLatin1("HoursMinutes"); break;
-		case TimePeriod::DAYS:          value = TQString::fromLatin1("Days");         break;
-		case TimePeriod::WEEKS:         value = TQString::fromLatin1("Weeks");        break;
+		case TimePeriod::MINUTES:       value = TQString::tqfromLatin1("Minutes");      break;
+		case TimePeriod::HOURS_MINUTES: value = TQString::tqfromLatin1("HoursMinutes"); break;
+		case TimePeriod::DAYS:          value = TQString::tqfromLatin1("Days");         break;
+		case TimePeriod::WEEKS:         value = TQString::tqfromLatin1("Weeks");        break;
 		default:                        value = TQString::null; break;
 	}
 	config->writeEntry(DEF_REMIND_UNITS, value);
@@ -558,12 +558,12 @@ void Preferences::convertOldPrefs()
 	if (version <= KAlarm::Version(1,4,21))
 	{
 		// Convert KAlarm 1.4.21 preferences
-		static const TQString OLD_REMIND_UNITS = TQString::fromLatin1("DefRemindUnits");
+		static const TQString OLD_REMIND_UNITS = TQString::tqfromLatin1("DefRemindUnits");
 		config->setGroup(DEFAULTS_SECTION);
 		int intUnit     = config->readNumEntry(OLD_REMIND_UNITS, 0);
-		TQString strUnit = (intUnit == 1) ? TQString::fromLatin1("Days")
-		                : (intUnit == 2) ? TQString::fromLatin1("Weeks")
-		                :                  TQString::fromLatin1("HoursMinutes");
+		TQString strUnit = (intUnit == 1) ? TQString::tqfromLatin1("Days")
+		                : (intUnit == 2) ? TQString::tqfromLatin1("Weeks")
+		                :                  TQString::tqfromLatin1("HoursMinutes");
 		config->deleteEntry(OLD_REMIND_UNITS);
 		config->writeEntry(DEF_REMIND_UNITS, strUnit);
 	}
@@ -571,11 +571,11 @@ void Preferences::convertOldPrefs()
 	if (version <= KAlarm::Version(1,4,20))
 	{
 		// Convert KAlarm 1.4.20 preferences
-		static const TQString VIEW_SECTION = TQString::fromLatin1("View");
-		static const TQString SHOW_ARCHIVED_ALARMS = TQString::fromLatin1("ShowArchivedAlarms");
-		static const TQString SHOW_EXPIRED_ALARMS  = TQString::fromLatin1("ShowExpiredAlarms");
-		static const TQString SHOW_ALARM_TIME      = TQString::fromLatin1("ShowAlarmTime");
-		static const TQString SHOW_TIME_TO_ALARM   = TQString::fromLatin1("ShowTimeToAlarm");
+		static const TQString VIEW_SECTION = TQString::tqfromLatin1("View");
+		static const TQString SHOW_ARCHIVED_ALARMS = TQString::tqfromLatin1("ShowArchivedAlarms");
+		static const TQString SHOW_EXPIRED_ALARMS  = TQString::tqfromLatin1("ShowExpiredAlarms");
+		static const TQString SHOW_ALARM_TIME      = TQString::tqfromLatin1("ShowAlarmTime");
+		static const TQString SHOW_TIME_TO_ALARM   = TQString::tqfromLatin1("ShowTimeToAlarm");
 		config->setGroup(GENERAL_SECTION);
 		bool showExpired = config->readBoolEntry(SHOW_EXPIRED_ALARMS, false);
 		bool showTime    = config->readBoolEntry(SHOW_ALARM_TIME, true);
@@ -592,7 +592,7 @@ void Preferences::convertOldPrefs()
 	if (version <= KAlarm::Version(1,4,5))
 	{
 		// Convert KAlarm 1.4.5 preferences
-		static const TQString DEF_SOUND = TQString::fromLatin1("DefSound");
+		static const TQString DEF_SOUND = TQString::tqfromLatin1("DefSound");
 		config->setGroup(DEFAULTS_SECTION);
 		bool sound = config->readBoolEntry(DEF_SOUND, false);
 		if (!sound)
@@ -603,9 +603,9 @@ void Preferences::convertOldPrefs()
 	if (version < KAlarm::Version(1,3,0))
 	{
 		// Convert KAlarm pre-1.3 preferences
-		static const TQString EMAIL_ADDRESS             = TQString::fromLatin1("EmailAddress");
-		static const TQString EMAIL_USE_CTRL_CENTRE     = TQString::fromLatin1("EmailUseControlCenter");
-		static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::fromLatin1("EmailBccUseControlCenter");
+		static const TQString EMAIL_ADDRESS             = TQString::tqfromLatin1("EmailAddress");
+		static const TQString EMAIL_USE_CTRL_CENTRE     = TQString::tqfromLatin1("EmailUseControlCenter");
+		static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailBccUseControlCenter");
 		TQMap entries = config->entryMap(GENERAL_SECTION);
 		if (entries.find(EMAIL_FROM) == entries.end()
 		&&  entries.find(EMAIL_USE_CTRL_CENTRE) != entries.end())
@@ -628,7 +628,7 @@ void Preferences::convertOldPrefs()
 			config->deleteEntry(EMAIL_USE_CTRL_CENTRE);
 		}
 		// Convert KAlarm 1.2 preferences
-		static const TQString DEF_CMD_XTERM = TQString::fromLatin1("DefCmdXterm");
+		static const TQString DEF_CMD_XTERM = TQString::tqfromLatin1("DefCmdXterm");
 		config->setGroup(DEFAULTS_SECTION);
 		if (config->hasKey(DEF_CMD_XTERM))
 		{
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index bc70e4fe0..3924d428b 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -93,7 +93,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	  mNoEmitTypeChanged(true),
 	  mReadOnly(readOnly)
 {
-	TQBoxLayout* layout;
+	TQBoxLayout* tqlayout;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
 	/* Create the recurrence rule Group box which holds the recurrence period
@@ -106,11 +106,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
 	topLayout->addWidget(recurGroup);
 	TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame");
-	layout = new TQVBoxLayout(ruleFrame, 0);
-	layout->addSpacing(KDialog::spacingHint()/2);
+	tqlayout = new TQVBoxLayout(ruleFrame, 0);
+	tqlayout->addSpacing(KDialog::spacingHint()/2);
 
-	layout = new TQHBoxLayout(layout, 0);
-	TQBoxLayout* lay = new TQVBoxLayout(layout, 0);
+	tqlayout = new TQHBoxLayout(tqlayout, 0);
+	TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0);
 	mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame);
 	mRuleButtonGroup->setInsideMargin(0);
 	mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame);
@@ -119,43 +119,43 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int)));
 
 	mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup);
-	mNoneButton->setFixedSize(mNoneButton->sizeHint());
+	mNoneButton->setFixedSize(mNoneButton->tqsizeHint());
 	mNoneButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoneButton, i18n("Do not repeat the alarm"));
 
 	mAtLoginButton = new RadioButton(i18n_l_Atlogin(), mRuleButtonGroup);
-	mAtLoginButton->setFixedSize(mAtLoginButton->sizeHint());
+	mAtLoginButton->setFixedSize(mAtLoginButton->tqsizeHint());
 	mAtLoginButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mAtLoginButton,
 	      i18n("Trigger the alarm at the specified date/time and at every login until then.\n"
 	           "Note that it will also be triggered any time the alarm daemon is restarted."));
 
 	mSubDailyButton = new RadioButton(i18n_u_HourlyMinutely(), mRuleButtonGroup);
-	mSubDailyButton->setFixedSize(mSubDailyButton->sizeHint());
+	mSubDailyButton->setFixedSize(mSubDailyButton->tqsizeHint());
 	mSubDailyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mSubDailyButton,
 	      i18n("Repeat the alarm at hourly/minutely intervals"));
 
 	mDailyButton = new RadioButton(i18n_d_Daily(), mRuleButtonGroup);
-	mDailyButton->setFixedSize(mDailyButton->sizeHint());
+	mDailyButton->setFixedSize(mDailyButton->tqsizeHint());
 	mDailyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mDailyButton,
 	      i18n("Repeat the alarm at daily intervals"));
 
 	mWeeklyButton = new RadioButton(i18n_w_Weekly(), mRuleButtonGroup);
-	mWeeklyButton->setFixedSize(mWeeklyButton->sizeHint());
+	mWeeklyButton->setFixedSize(mWeeklyButton->tqsizeHint());
 	mWeeklyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mWeeklyButton,
 	      i18n("Repeat the alarm at weekly intervals"));
 
 	mMonthlyButton = new RadioButton(i18n_m_Monthly(), mRuleButtonGroup);
-	mMonthlyButton->setFixedSize(mMonthlyButton->sizeHint());
+	mMonthlyButton->setFixedSize(mMonthlyButton->tqsizeHint());
 	mMonthlyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mMonthlyButton,
 	      i18n("Repeat the alarm at monthly intervals"));
 
 	mYearlyButton = new RadioButton(i18n_y_Yearly(), mRuleButtonGroup);
-	mYearlyButton->setFixedSize(mYearlyButton->sizeHint());
+	mYearlyButton->setFixedSize(mYearlyButton->tqsizeHint());
 	mYearlyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mYearlyButton,
 	      i18n("Repeat the alarm at annual intervals"));
@@ -170,7 +170,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 
 	// Sub-repetition button
 	mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame);
-	mSubRepetition->setFixedSize(mSubRepetition->sizeHint());
+	mSubRepetition->setFixedSize(mSubRepetition->tqsizeHint());
 	mSubRepetition->setReadOnly(mReadOnly);
 	connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation()));
 	connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged()));
@@ -178,16 +178,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	lay->addSpacing(KDialog::spacingHint());
 	lay->addWidget(mSubRepetition);
 
-	lay = new TQVBoxLayout(layout);
+	lay = new TQVBoxLayout(tqlayout);
 
 	lay->addStretch();
-	layout = new TQHBoxLayout(lay);
+	tqlayout = new TQHBoxLayout(lay);
 
-	layout->addSpacing(KDialog::marginHint());
+	tqlayout->addSpacing(KDialog::marginHint());
 	TQFrame* divider = new TQFrame(ruleFrame);
 	divider->setFrameStyle(TQFrame::VLine | TQFrame::Sunken);
-	layout->addWidget(divider);
-	layout->addSpacing(KDialog::marginHint());
+	tqlayout->addWidget(divider);
+	tqlayout->addSpacing(KDialog::marginHint());
 
 	mNoRule       = new NoRule(ruleFrame, "noFrame");
 	mSubDailyRule = new SubDailyRule(mReadOnly, ruleFrame, "subdayFrame");
@@ -203,39 +203,39 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
 
 	mRuleStack = new TQWidgetStack(ruleFrame);
-	layout->addWidget(mRuleStack);
-	layout->addStretch(1);
+	tqlayout->addWidget(mRuleStack);
+	tqlayout->addStretch(1);
 	mRuleStack->addWidget(mNoRule, 0);
 	mRuleStack->addWidget(mSubDailyRule, 1);
 	mRuleStack->addWidget(mDailyRule, 2);
 	mRuleStack->addWidget(mWeeklyRule, 3);
 	mRuleStack->addWidget(mMonthlyRule, 4);
 	mRuleStack->addWidget(mYearlyRule, 5);
-	layout->addSpacing(KDialog::marginHint());
+	tqlayout->addSpacing(KDialog::marginHint());
 
-	// Create the recurrence range group which contains the controls
+	// Create the recurrence range group which tqcontains the controls
 	// which specify how long the recurrence is to last.
 
 	mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup");
 	connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked()));
 	topLayout->addWidget(mRangeButtonGroup);
 
-	TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
-	vlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
+	vtqlayout->addSpacing(fontMetrics().lineSpacing()/2);
 	mNoEndDateButton = new RadioButton(i18n("No &end"), mRangeButtonGroup);
-	mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint());
+	mNoEndDateButton->setFixedSize(mNoEndDateButton->tqsizeHint());
 	mNoEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely"));
-	vlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto);
+	vtqlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto);
 	TQSize size = mNoEndDateButton->size();
 
-	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 	mRepeatCountButton = new RadioButton(i18n("End a&fter:"), mRangeButtonGroup);
 	mRepeatCountButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mRepeatCountButton,
 	      i18n("Repeat the alarm for the number of times specified"));
 	mRepeatCountEntry = new SpinBox(1, 9999, 1, mRangeButtonGroup);
-	mRepeatCountEntry->setFixedSize(mRepeatCountEntry->sizeHint());
+	mRepeatCountEntry->setFixedSize(mRepeatCountEntry->tqsizeHint());
 	mRepeatCountEntry->setLineShiftStep(10);
 	mRepeatCountEntry->setSelectOnStep(false);
 	mRepeatCountEntry->setReadOnly(mReadOnly);
@@ -244,44 +244,44 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	      i18n("Enter the total number of times to trigger the alarm"));
 	mRepeatCountButton->setFocusWidget(mRepeatCountEntry);
 	mRepeatCountLabel = new TQLabel(i18n("occurrence(s)"), mRangeButtonGroup);
-	mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint());
-	layout->addWidget(mRepeatCountButton);
-	layout->addSpacing(KDialog::spacingHint());
-	layout->addWidget(mRepeatCountEntry);
-	layout->addWidget(mRepeatCountLabel);
-	layout->addStretch();
-	size = size.expandedTo(mRepeatCountButton->sizeHint());
-
-	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+	mRepeatCountLabel->setFixedSize(mRepeatCountLabel->tqsizeHint());
+	tqlayout->addWidget(mRepeatCountButton);
+	tqlayout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mRepeatCountEntry);
+	tqlayout->addWidget(mRepeatCountLabel);
+	tqlayout->addStretch();
+	size = size.expandedTo(mRepeatCountButton->tqsizeHint());
+
+	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 	mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup);
 	mEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mEndDateButton,
 	      i18n("Repeat the alarm until the date/time specified.\n\n"
 	           "Note: This applies to the main recurrence only. It does not limit any sub-repetition which will occur regardless after the last main recurrence."));
 	mEndDateEdit = new DateEdit(mRangeButtonGroup);
-	mEndDateEdit->setFixedSize(mEndDateEdit->sizeHint());
+	mEndDateEdit->setFixedSize(mEndDateEdit->tqsizeHint());
 	mEndDateEdit->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mEndDateEdit,
 	      i18n("Enter the last date to repeat the alarm"));
 	mEndDateButton->setFocusWidget(mEndDateEdit);
 	mEndTimeEdit = new TimeEdit(mRangeButtonGroup);
-	mEndTimeEdit->setFixedSize(mEndTimeEdit->sizeHint());
+	mEndTimeEdit->setFixedSize(mEndTimeEdit->tqsizeHint());
 	mEndTimeEdit->setReadOnly(mReadOnly);
 	static const TQString lastTimeText = i18n("Enter the last time to repeat the alarm.");
 	TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").arg(lastTimeText).arg(TimeSpinBox::shiftWhatsThis()));
 	mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup);
-	mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint());
+	mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->tqsizeHint());
 	mEndAnyTimeCheckBox->setReadOnly(mReadOnly);
 	connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
 	TQWhatsThis::add(mEndAnyTimeCheckBox,
 	      i18n("Stop repeating the alarm after your first login on or after the specified end date"));
-	layout->addWidget(mEndDateButton);
-	layout->addSpacing(KDialog::spacingHint());
-	layout->addWidget(mEndDateEdit);
-	layout->addWidget(mEndTimeEdit);
-	layout->addWidget(mEndAnyTimeCheckBox);
-	layout->addStretch();
-	size = size.expandedTo(mEndDateButton->sizeHint());
+	tqlayout->addWidget(mEndDateButton);
+	tqlayout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mEndDateEdit);
+	tqlayout->addWidget(mEndTimeEdit);
+	tqlayout->addWidget(mEndAnyTimeCheckBox);
+	tqlayout->addStretch();
+	size = size.expandedTo(mEndDateButton->tqsizeHint());
 
 	// Line up the widgets to the right of the radio buttons
 	mRepeatCountButton->setFixedSize(size);
@@ -293,17 +293,17 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	mExceptionGroup = new TQGroupBox(i18n("E&xceptions"), this, "mExceptionGroup");
 	topLayout->addWidget(mExceptionGroup);
 	topLayout->setStretchFactor(mExceptionGroup, 2);
-	vlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint());
-	vlayout->addSpacing(fontMetrics().lineSpacing()/2);
-	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
-	vlayout = new TQVBoxLayout(layout);
+	vtqlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint());
+	vtqlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+	vtqlayout = new TQVBoxLayout(tqlayout);
 
 	mExceptionDateList = new TQListBox(mExceptionGroup);
-	mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	mExceptionDateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons()));
 	TQWhatsThis::add(mExceptionDateList,
 	      i18n("The list of exceptions, i.e. dates/times excluded from the recurrence"));
-	vlayout->addWidget(mExceptionDateList);
+	vtqlayout->addWidget(mExceptionDateList);
 
 	if (mReadOnly)
 	{
@@ -313,36 +313,36 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	}
 	else
 	{
-		vlayout = new TQVBoxLayout(layout);
+		vtqlayout = new TQVBoxLayout(tqlayout);
 		mExceptionDateEdit = new DateEdit(mExceptionGroup);
-		mExceptionDateEdit->setFixedSize(mExceptionDateEdit->sizeHint());
-		mExceptionDateEdit->setDate(TQDate::currentDate());
+		mExceptionDateEdit->setFixedSize(mExceptionDateEdit->tqsizeHint());
+		mExceptionDateEdit->setDate(TQDate::tqcurrentDate());
 		TQWhatsThis::add(mExceptionDateEdit,
 		      i18n("Enter a date to insert in the exceptions list. "
 		           "Use in conjunction with the Add or Change button below."));
-		vlayout->addWidget(mExceptionDateEdit);
+		vtqlayout->addWidget(mExceptionDateEdit);
 
-		layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+		tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 		TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup);
-		button->setFixedSize(button->sizeHint());
+		button->setFixedSize(button->tqsizeHint());
 		connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException()));
 		TQWhatsThis::add(button,
 		      i18n("Add the date entered above to the exceptions list"));
-		layout->addWidget(button);
+		tqlayout->addWidget(button);
 
 		mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup);
-		mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint());
+		mChangeExceptionButton->setFixedSize(mChangeExceptionButton->tqsizeHint());
 		connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException()));
 		TQWhatsThis::add(mChangeExceptionButton,
 		      i18n("Replace the currently highlighted item in the exceptions list with the date entered above"));
-		layout->addWidget(mChangeExceptionButton);
+		tqlayout->addWidget(mChangeExceptionButton);
 
 		mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup);
-		mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint());
+		mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->tqsizeHint());
 		connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException()));
 		TQWhatsThis::add(mDeleteExceptionButton,
 		      i18n("Remove the currently highlighted item from the exceptions list"));
-		layout->addWidget(mDeleteExceptionButton);
+		tqlayout->addWidget(mDeleteExceptionButton);
 	}
 
 	mNoEmitTypeChanged = false;
@@ -1029,30 +1029,30 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b
 	box->setSpacing(KDialog::spacingHint());
 
 	TQLabel* label = new TQLabel(i18n("Recur e&very"), box);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	if (time)
 	{
 		mIntSpinBox = 0;
 		mSpinBox = mTimeSpinBox = new TimeSpinBox(1, 5999, box);
-		mTimeSpinBox->setFixedSize(mTimeSpinBox->sizeHint());
+		mTimeSpinBox->setFixedSize(mTimeSpinBox->tqsizeHint());
 		mTimeSpinBox->setReadOnly(readOnly);
 	}
 	else
 	{
 		mTimeSpinBox = 0;
 		mSpinBox = mIntSpinBox = new SpinBox(1, 999, 1, box);
-		mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint());
+		mIntSpinBox->setFixedSize(mIntSpinBox->tqsizeHint());
 		mIntSpinBox->setReadOnly(readOnly);
 	}
 	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged()));
 	label->setBuddy(mSpinBox);
 	label = new TQLabel(freqText, box);
-	label->setFixedSize(label->sizeHint());
-	box->setFixedSize(sizeHint());
+	label->setFixedSize(label->tqsizeHint());
+	box->setFixedSize(tqsizeHint());
 	TQWhatsThis::add(box, freqWhatsThis);
 
 	new TQWidget(freqBox);     // left adjust the visible widgets
-	freqBox->setFixedHeight(freqBox->sizeHint().height());
+	freqBox->setFixedHeight(freqBox->tqsizeHint().height());
 	freqBox->setFocusProxy(mSpinBox);
 }
 
@@ -1112,11 +1112,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 	: Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
 	  mSavedDays(7)
 {
-	TQGridLayout* grid = new TQGridLayout(layout(), 1, 4, KDialog::spacingHint());
+	TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint());
 	grid->setRowStretch(0, 1);
 
 	TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 0, 0, Qt::AlignRight | Qt::AlignTop);
 	grid->addColSpacing(1, KDialog::spacingHint());
 
@@ -1129,11 +1129,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 	{
 		int day = KAlarm::localeDayInWeek_to_weekDay(i);
 		mDayBox[i] = new CheckBox(calendar->weekDayName(day), box);
-		mDayBox[i]->setFixedSize(mDayBox[i]->sizeHint());
+		mDayBox[i]->setFixedSize(mDayBox[i]->tqsizeHint());
 		mDayBox[i]->setReadOnly(readOnly);
 		dgrid->addWidget(mDayBox[i], i%4, i/4, Qt::AlignAuto);
 	}
-	box->setFixedSize(box->sizeHint());
+	box->setFixedSize(box->tqsizeHint());
 	TQWhatsThis::add(box, daysWhatsThis);
 	grid->addWidget(box, 0, 2, Qt::AlignAuto);
 	label->setBuddy(mDayBox[0]);
@@ -1258,10 +1258,10 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	// Month day selector
 	TQHBox* box = new TQHBox(this);
 	box->setSpacing(KDialog::spacingHint());
-	layout()->addWidget(box);
+	tqlayout()->addWidget(box);
 
 	mDayButton = new RadioButton(i18n("On day number in the month", "O&n day"), box);
-	mDayButton->setFixedSize(mDayButton->sizeHint());
+	mDayButton->setFixedSize(mDayButton->tqsizeHint());
 	mDayButton->setReadOnly(readOnly);
 	mDayButtonId = mButtonGroup->insert(mDayButton);
 	TQWhatsThis::add(mDayButton, i18n("Repeat the alarm on the selected day of the month"));
@@ -1271,22 +1271,22 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	for (int i = 0;  i < 31;  ++i)
 		mDayCombo->insertItem(TQString::number(i + 1));
 	mDayCombo->insertItem(i18n("Last day of month", "Last"));
-	mDayCombo->setFixedSize(mDayCombo->sizeHint());
+	mDayCombo->setFixedSize(mDayCombo->tqsizeHint());
 	mDayCombo->setReadOnly(readOnly);
 	TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm"));
 	mDayButton->setFocusWidget(mDayCombo);
 	connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int)));
 
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 
 	// Month position selector
 	box = new TQHBox(this);
 	box->setSpacing(KDialog::spacingHint());
-	layout()->addWidget(box);
+	tqlayout()->addWidget(box);
 
 	mPosButton = new RadioButton(i18n("On the 1st Tuesday", "On t&he"), box);
-	mPosButton->setFixedSize(mPosButton->sizeHint());
+	mPosButton->setFixedSize(mPosButton->tqsizeHint());
 	mPosButton->setReadOnly(readOnly);
 	mPosButtonId = mButtonGroup->insert(mPosButton);
 	TQWhatsThis::add(mPosButton,
@@ -1309,7 +1309,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 		mWeekCombo->setSizeLimit(11);
 	}
 	TQWhatsThis::add(mWeekCombo, i18n("Select the week of the month in which to repeat the alarm"));
-	mWeekCombo->setFixedSize(mWeekCombo->sizeHint());
+	mWeekCombo->setFixedSize(mWeekCombo->tqsizeHint());
 	mWeekCombo->setReadOnly(readOnly);
 	mPosButton->setFocusWidget(mWeekCombo);
 
@@ -1324,7 +1324,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	TQWhatsThis::add(mDayOfWeekCombo, i18n("Select the day of the week on which to repeat the alarm"));
 
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int)));
 }
 
@@ -1456,47 +1456,47 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
 	       true, readOnly, parent, name)
 {
 	// Set up the month selection widgets
-	TQBoxLayout* hlayout = new TQHBoxLayout(layout(), KDialog::spacingHint());
+	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint());
 	TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this);
-	label->setFixedSize(label->sizeHint());
-	hlayout->addWidget(label, 0, Qt::AlignAuto | Qt::AlignTop);
+	label->setFixedSize(label->tqsizeHint());
+	htqlayout->addWidget(label, 0, Qt::AlignAuto | Qt::AlignTop);
 
 	// List the months of the year.
 	TQWidget* w = new TQWidget(this);   // this is to control the TQWhatsThis text display area
-	hlayout->addWidget(w, 1, Qt::AlignAuto);
+	htqlayout->addWidget(w, 1, Qt::AlignAuto);
 	TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint());
 	const KCalendarSystem* calendar = KGlobal::locale()->calendar();
-	int year = TQDate::currentDate().year();
+	int year = TQDate::tqcurrentDate().year();
 	for (int i = 0;  i < 12;  ++i)
 	{
 		mMonthBox[i] = new CheckBox(calendar->monthName(i + 1, year, true), w);
-		mMonthBox[i]->setFixedSize(mMonthBox[i]->sizeHint());
+		mMonthBox[i]->setFixedSize(mMonthBox[i]->tqsizeHint());
 		mMonthBox[i]->setReadOnly(readOnly);
 		grid->addWidget(mMonthBox[i], i%3, i/3, Qt::AlignAuto);
 	}
 	connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29()));
-	w->setFixedHeight(w->sizeHint().height());
+	w->setFixedHeight(w->tqsizeHint().height());
 	TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm"));
 
 	// February 29th handling option
 	TQHBox* f29box = new TQHBox(this);
-	layout()->addWidget(f29box);
+	tqlayout()->addWidget(f29box);
 	TQHBox* box = new TQHBox(f29box);    // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mFeb29Label = new TQLabel(i18n("February 2&9th alarm in non-leap years:"), box);
-	mFeb29Label->setFixedSize(mFeb29Label->sizeHint());
+	mFeb29Label->setFixedSize(mFeb29Label->tqsizeHint());
 	mFeb29Combo = new ComboBox(false, box);
 	mFeb29Combo->insertItem(i18n("No date", "None"));
 	mFeb29Combo->insertItem(i18n("1st March (short form)", "1 Mar"));
 	mFeb29Combo->insertItem(i18n("28th February (short form)", "28 Feb"));
-	mFeb29Combo->setFixedSize(mFeb29Combo->sizeHint());
+	mFeb29Combo->setFixedSize(mFeb29Combo->tqsizeHint());
 	mFeb29Combo->setReadOnly(readOnly);
 	mFeb29Label->setBuddy(mFeb29Combo);
-	box->setFixedSize(box->sizeHint());
+	box->setFixedSize(box->tqsizeHint());
 	TQWhatsThis::add(box,
 	      i18n("Select which date, if any, the February 29th alarm should trigger in non-leap years"));
 	new TQWidget(f29box);     // left adjust the visible widgets
-	f29box->setFixedHeight(f29box->sizeHint().height());
+	f29box->setFixedHeight(f29box->tqsizeHint().height());
 }
 
 void YearlyRule::setDefaultValues(int dayOfMonth, int dayOfWeek, int month)
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 47dfaa6c2..51a7085db 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -53,7 +53,7 @@ class Rule : public NoRule
 		int              frequency() const;
 		void             setFrequency(int);
 		virtual void     setFrequencyFocus()     { mSpinBox->setFocus(); }
-		TQVBoxLayout*     layout() const          { return mLayout; }
+		TQVBoxLayout*     tqlayout() const          { return mLayout; }
 		virtual TQWidget* validate(TQString&)      { return 0; }
 		virtual void     saveState();
 		virtual bool     stateChanged() const;
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index 60c603368..e10e04e22 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -51,19 +51,19 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c
 
 	mTime = new TimeSelector(caption, i18n("in advance"), reminderWhatsThis,
 	                       valueWhatsThis, allowHourMinute, this, "timeOption");
-	mTime->setFixedSize(mTime->sizeHint());
+	mTime->setFixedSize(mTime->tqsizeHint());
 	connect(mTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotReminderToggled(bool)));
 	topLayout->addWidget(mTime);
 
 	if (showOnceOnly)
 	{
-		TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
-		layout->addSpacing(3*KDialog::spacingHint());
+		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+		tqlayout->addSpacing(3*KDialog::spacingHint());
 		mOnceOnly = new CheckBox(i18n_u_first_recurrence_only(), this);
-		mOnceOnly->setFixedSize(mOnceOnly->sizeHint());
+		mOnceOnly->setFixedSize(mOnceOnly->tqsizeHint());
 		TQWhatsThis::add(mOnceOnly, i18n("Display the reminder only before the first time the alarm is scheduled"));
-		layout->addWidget(mOnceOnly);
-		layout->addStretch();
+		tqlayout->addWidget(mOnceOnly);
+		tqlayout->addStretch();
 	}
 	else
 		mOnceOnly = 0;
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 2df201300..b2241b716 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -165,7 +165,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	                       "checking this option makes the alarm trigger multiple times at each recurrence."),
 	                  i18n("Enter the time between repetitions of the alarm"),
 	                  true, page);
-	mTimeSelector->setFixedSize(mTimeSelector->sizeHint());
+	mTimeSelector->setFixedSize(mTimeSelector->tqsizeHint());
 	connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool)));
 	topLayout->addWidget(mTimeSelector, 0, Qt::AlignAuto);
@@ -174,38 +174,38 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked()));
 	topLayout->addWidget(mButtonGroup);
 
-	TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
-	TQBoxLayout* layout = new TQHBoxLayout(vlayout, spacing);
+	TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
+	TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing);
 	mCountButton = new RadioButton(i18n("&Number of repetitions:"), mButtonGroup);
-	mCountButton->setFixedSize(mCountButton->sizeHint());
+	mCountButton->setFixedSize(mCountButton->tqsizeHint());
 	TQWhatsThis::add(mCountButton,
 	      i18n("Check to specify the number of times the alarm should repeat after each recurrence"));
-	layout->addWidget(mCountButton);
+	tqlayout->addWidget(mCountButton);
 	mCount = new SpinBox(1, MAX_COUNT, 1, mButtonGroup);
-	mCount->setFixedSize(mCount->sizeHint());
+	mCount->setFixedSize(mCount->tqsizeHint());
 	mCount->setLineShiftStep(10);
 	mCount->setSelectOnStep(false);
 	connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int)));
 	TQWhatsThis::add(mCount,
 	      i18n("Enter the number of times to trigger the alarm after its initial occurrence"));
-	layout->addWidget(mCount);
+	tqlayout->addWidget(mCount);
 	mCountButton->setFocusWidget(mCount);
-	layout->addStretch();
+	tqlayout->addStretch();
 
-	layout = new TQHBoxLayout(vlayout, spacing);
+	tqlayout = new TQHBoxLayout(vtqlayout, spacing);
 	mDurationButton = new RadioButton(i18n("&Duration:"), mButtonGroup);
-	mDurationButton->setFixedSize(mDurationButton->sizeHint());
+	mDurationButton->setFixedSize(mDurationButton->tqsizeHint());
 	TQWhatsThis::add(mDurationButton,
 	      i18n("Check to specify how long the alarm is to be repeated"));
-	layout->addWidget(mDurationButton);
+	tqlayout->addWidget(mDurationButton);
 	mDuration = new TimePeriod(true, mButtonGroup);
-	mDuration->setFixedSize(mDuration->sizeHint());
+	mDuration->setFixedSize(mDuration->tqsizeHint());
 	connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int)));
 	TQWhatsThis::add(mDuration,
 	      i18n("Enter the length of time to repeat the alarm"));
-	layout->addWidget(mDuration);
+	tqlayout->addWidget(mDuration);
 	mDurationButton->setFocusWidget(mDuration);
-	layout->addStretch();
+	tqlayout->addStretch();
 
 	mCountButton->setChecked(true);
 	repetitionToggled(false);
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index 2df7542b1..691ba936f 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -78,14 +78,14 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	// File play button
 	TQHBox* box = new TQHBox(page);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	mFilePlay = new TQPushButton(box);
 	mFilePlay->setPixmap(SmallIcon("player_play"));
-	mFilePlay->setFixedSize(mFilePlay->sizeHint());
+	mFilePlay->setFixedSize(mFilePlay->tqsizeHint());
 	connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound()));
 	TQToolTip::add(mFilePlay, i18n("Test the sound"));
 	TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file."));
@@ -98,36 +98,36 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	// File browse button
 	mFileBrowseButton = new PushButton(box);
 	mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
-	mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
+	mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint());
 	connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
 	TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
 	TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play."));
 
 	// Sound repetition checkbox
 	mRepeatCheckbox = new CheckBox(i18n_p_Repeat(), page);
-	mRepeatCheckbox->setFixedSize(mRepeatCheckbox->sizeHint());
+	mRepeatCheckbox->setFixedSize(mRepeatCheckbox->tqsizeHint());
 	TQWhatsThis::add(mRepeatCheckbox,
 	      i18n("If checked, the sound file will be played repeatedly for as long as the message is displayed."));
-	layout->addWidget(mRepeatCheckbox);
+	tqlayout->addWidget(mRepeatCheckbox);
 
 	// Volume
 	TQGroupBox* group = new TQGroupBox(i18n("Volume"), page);
-	layout->addWidget(group);
+	tqlayout->addWidget(group);
 	TQGridLayout* grid = new TQGridLayout(group, 4, 3, marginHint(), spacingHint());
 	grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint());
 	grid->setColStretch(2, 1);
 	int indentWidth = 3 * KDialog::spacingHint();
 	grid->addColSpacing(0, indentWidth);
 	grid->addColSpacing(1, indentWidth);
-	// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 	// 'Set volume' checkbox
 	box = new TQHBox(group);
 	box->setSpacing(spacingHint());
 	grid->addMultiCellWidget(box, 1, 1, 0, 2);
 	mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box);
-	mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint());
+	mVolumeCheckbox->setFixedSize(mVolumeCheckbox->tqsizeHint());
 	connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool)));
 	TQWhatsThis::add(mVolumeCheckbox,
 	      i18n("Select to choose the volume for playing the sound file."));
@@ -136,30 +136,30 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box);
 	mVolumeSlider->setTickmarks(TQSlider::Below);
 	mVolumeSlider->setTickInterval(10);
-	mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+	mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 	TQWhatsThis::add(mVolumeSlider, i18n("Choose the volume for playing the sound file."));
 	mVolumeCheckbox->setFocusWidget(mVolumeSlider);
 
 	// Fade checkbox
 	mFadeCheckbox = new CheckBox(i18n("Fade"), group);
-	mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint());
+	mFadeCheckbox->setFixedSize(mFadeCheckbox->tqsizeHint());
 	connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool)));
 	TQWhatsThis::add(mFadeCheckbox,
 	      i18n("Select to fade the volume when the sound file first starts to play."));
-	grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment);
+	grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, tqalignment);
 
 	// Fade time
 	mFadeBox = new TQHBox(group);
 	mFadeBox->setSpacing(spacingHint());
-	grid->addWidget(mFadeBox, 3, 2, alignment);
+	grid->addWidget(mFadeBox, 3, 2, tqalignment);
 	TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mFadeTime = new SpinBox(1, 999, 1, mFadeBox);
 	mFadeTime->setLineShiftStep(10);
-	mFadeTime->setFixedSize(mFadeTime->sizeHint());
+	mFadeTime->setFixedSize(mFadeTime->tqsizeHint());
 	label->setBuddy(mFadeTime);
 	label = new TQLabel(i18n("seconds"), mFadeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	TQWhatsThis::add(mFadeBox, i18n("Enter how many seconds to fade the sound before reaching the set volume."));
 
 	// Fade slider
@@ -167,11 +167,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	mFadeVolumeBox->setSpacing(spacingHint());
 	grid->addWidget(mFadeVolumeBox, 4, 2);
 	label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox);
 	mFadeSlider->setTickmarks(TQSlider::Below);
 	mFadeSlider->setTickInterval(10);
-	mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+	mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 	label->setBuddy(mFadeSlider);
 	TQWhatsThis::add(mFadeVolumeBox, i18n("Choose the initial volume for playing the sound file."));
 
@@ -412,7 +412,7 @@ bool SoundDlg::checkFile()
 #endif
 	{
 		// It's a relative path.
-		// Find the first sound resource that contains files.
+		// Find the first sound resource that tqcontains files.
 		TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound");
 		if (!soundDirs.isEmpty())
 		{
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index cd40a778f..ec09c2b86 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -64,7 +64,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
 	mTypeBox->setSpacing(KDialog::spacingHint());
 
 	TQLabel* label = new TQLabel(i18n("An audio sound", "&Sound:"), mTypeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 
 	// Sound type combo box
 	// The order of combo box entries must correspond with the 'Type' enum.
@@ -81,7 +81,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
 	// Sound file picker button
 	mFilePicker = new PushButton(this);
 	mFilePicker->setPixmap(SmallIcon("playsound"));
-	mFilePicker->setFixedSize(mFilePicker->sizeHint());
+	mFilePicker->setFixedSize(mFilePicker->tqsizeHint());
 	connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
 	TQToolTip::add(mFilePicker, i18n("Configure sound file"));
 	TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed."));
@@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi
 		defaultDir = kdeSoundDir;
 	}
 #ifdef WITHOUT_ARTS
-	TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
+	TQString filter = TQString::tqfromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
 #else
 	TQStringList filters = KDE::PlayObjectFactory::mimeTypes();
 	TQString filter = filters.join(" ");
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index ed8555859..fabff6edd 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -95,12 +95,12 @@ SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString&
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	mActions = new SpecialActions(page);
 	mActions->setActions(preAction, postAction);
-	layout->addWidget(mActions);
-	layout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mActions);
+	tqlayout->addSpacing(KDialog::spacingHint());
 
 	TQSize s;
 	if (KAlarm::readConfigWindowSize(SPEC_ACT_DIALOG_NAME, s))
@@ -142,7 +142,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name)
 
 	// Pre-alarm action
 	TQLabel* label = new TQLabel(i18n("Pre-a&larm action:"), this);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	topLayout->addWidget(label, 0, Qt::AlignAuto);
 
 	mPreAction = new KLineEdit(this);
@@ -156,7 +156,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name)
 
 	// Post-alarm action
 	label = new TQLabel(i18n("Post-alar&m action:"), this);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	topLayout->addWidget(label, 0, Qt::AlignAuto);
 
 	mPostAction = new KLineEdit(this);
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index f586f2e7b..dab8b45d2 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -50,34 +50,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
 	TQBoxLayout* topLayout = new TQHBoxLayout(topWidget);
 	topLayout->setSpacing(spacingHint());
 
-	TQBoxLayout* layout = new TQVBoxLayout(topLayout);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout);
 	mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget);
 	mTemplateList->setSelectionMode(TQListView::Extended);
-	mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	mTemplateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
-	layout->addWidget(mTemplateList);
+	tqlayout->addWidget(mTemplateList);
 
-	layout = new TQVBoxLayout(topLayout);
+	tqlayout = new TQVBoxLayout(topLayout);
 	TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget);
 	connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()));
 	TQWhatsThis::add(button, i18n("Create a new alarm template"));
-	layout->addWidget(button);
+	tqlayout->addWidget(button);
 
 	mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
 	connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 	TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template"));
-	layout->addWidget(mEditButton);
+	tqlayout->addWidget(mEditButton);
 
 	mCopyButton = new TQPushButton(i18n("Co&py"), topWidget);
 	connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy()));
 	TQWhatsThis::add(mCopyButton,
 	      i18n("Create a new alarm template based on a copy of the currently highlighted template"));
-	layout->addWidget(mCopyButton);
+	tqlayout->addWidget(mCopyButton);
 
 	mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget);
 	connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete()));
 	TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template"));
-	layout->addWidget(mDeleteButton);
+	tqlayout->addWidget(mDeleteButton);
 
 	KAccel* accel = new KAccel(this);
 	accel->insert(KStdAccel::SelectAll, mTemplateList, TQT_SLOT(slotSelectAll()));
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index 9ec5c9813..31e69d749 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -41,18 +41,18 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix,
 {
 	setFrameStyle(TQFrame::NoFrame);
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
-	TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 	mSelect = new CheckBox(selectText, this);
-	mSelect->setFixedSize(mSelect->sizeHint());
+	mSelect->setFixedSize(mSelect->tqsizeHint());
 	connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool)));
 	TQWhatsThis::add(mSelect, selectWhatsThis);
-	layout->addWidget(mSelect);
+	tqlayout->addWidget(mSelect);
 
 	TQHBox* box = new TQHBox(this);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint());
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	mPeriod = new TimePeriod(allowHourMinute, box);
-	mPeriod->setFixedSize(mPeriod->sizeHint());
+	mPeriod->setFixedSize(mPeriod->tqsizeHint());
 	mPeriod->setSelectOnStep(false);
 	connect(mPeriod, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(periodChanged(int)));
 	mSelect->setFocusWidget(mPeriod);
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 14ee6bf4a..41fd9e4db 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -226,7 +226,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
 	KAEvent event;
 	const TQString& prefix = Preferences::tooltipTimeToPrefix();
 	int maxCount = Preferences::tooltipAlarmCount();
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 
 	// Get today's and tomorrow's alarms, sorted in time order
 	TQValueList items;
@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
 */
 void TrayTooltip::maybeTip(const TQPoint&)
 {
-	TrayWindow* parent = (TrayWindow*)parentWidget();
+	TrayWindow* parent = (TrayWindow*)tqparentWidget();
 	TQString text;
 	if (Daemon::monitoringAlarms())
 		text = kapp->aboutData()->programName();
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 8d6a46a32..e1998e9cf 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -68,7 +68,7 @@ class UndoItem
 		UndoItem(Undo::Type);
 		static TQString    addDeleteActionText(KAEvent::Status, bool add);
 		TQString           description(const KAEvent&) const;
-		void              replaceWith(UndoItem* item)   { Undo::replace(this, item); }
+		void              tqreplaceWith(UndoItem* item)   { Undo::tqreplace(this, item); }
 
 		int               mId;     // unique identifier (only for mType = UNDO, REDO)
 		Undo::Type        mType;   // which list (if any) the object is in
@@ -298,7 +298,7 @@ void Undo::removeRedos(const TQString& eventID)
 		{
 			if (item->deleteID(id))
 			{
-				// The old multi-redo was replaced with a new single redo
+				// The old multi-redo was tqreplaced with a new single redo
 				delete item;
 			}
 			++it;
@@ -398,7 +398,7 @@ void Undo::remove(UndoItem* item, bool undo)
 /******************************************************************************
 *  Replace an undo item in one of the lists.
 */
-void Undo::replace(UndoItem* old, UndoItem* New)
+void Undo::tqreplace(UndoItem* old, UndoItem* New)
 {
 	Type type = old->type();
 	List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0;
@@ -654,8 +654,8 @@ UndoItem* UndoMulti::restore()
 /******************************************************************************
 *  If one of the multiple items has the specified ID, delete it.
 *  If an item is deleted and there is only one item left, the UndoMulti
-*  instance is removed from its list and replaced by the remaining UndoItem instead.
-*  Reply = true if this instance was replaced. The caller must delete it.
+*  instance is removed from its list and tqreplaced by the remaining UndoItem instead.
+*  Reply = true if this instance was tqreplaced. The caller must delete it.
 *        = false otherwise.
 */
 template 
@@ -672,7 +672,7 @@ bool UndoMulti::deleteID(const TQString& id)
 			{
 				// There is only one entry left after removal.
 				// Replace 'this' multi instance with the remaining single entry.
-				replaceWith(item);
+				tqreplaceWith(item);
 				return true;
 			}
 			else
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 0af181530..cca197f89 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -70,7 +70,7 @@ class Undo : public QObject
 		// Methods for use by UndoItem class
 		static void        add(UndoItem*, bool undo);
 		static void        remove(UndoItem*, bool undo);
-		static void        replace(UndoItem* old, UndoItem* New);
+		static void        tqreplace(UndoItem* old, UndoItem* New);
 
 	private:
 		typedef TQValueList::Iterator Iterator;
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 092074c6e..7231a6bee 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -4,7 +4,7 @@
     
         CmdPropertiesDialog_base
     
-    
+    
         
             0
             0
@@ -110,7 +110,7 @@
             
                 Expanding
             
-            
+            
                 
                     79
                     20
@@ -168,5 +168,5 @@
     editParameterName(QListViewItem *)
     slotAccept()
 
-
+
 
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 86f075148..fec40b7ff 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -430,7 +430,7 @@ void MobileGui::writePhonebook()
 void MobileGui::writePhonebookPostProcessing()
 {
   mLastWriteId = "";
-  emit transientStatusMessage( i18n( "Wrote mobile phonebook." ) );
+  emit transienStatusMessage( i18n( "Wrote mobile phonebook." ) );
   PushButton12->setEnabled( true );
   setMobState( LOADED );
   updateMobileBook();
@@ -640,7 +640,7 @@ void MobileGui::readKabc()
   // Display KAB entries
   updateKabBook();
   
-  emit transientStatusMessage( i18n( "Read KDE address book." ) );
+  emit transienStatusMessage( i18n( "Read KDE address book." ) );
   
   setKabState( LOADED );
 }
@@ -922,7 +922,7 @@ void MobileGui::writeKabc()
         *fields = TQStringList::split( ',', name );
 	
 	if ( fields->count() > 1 ) {
-	  // Name string contains comma separated entry so that we
+	  // Name string tqcontains comma separated entry so that we
 	  // need to build family and given names out of them.
 	  TQString givenName = "";
 	  
@@ -933,7 +933,7 @@ void MobileGui::writeKabc()
 	    givenName += stripWhiteSpaces( (*fields)[ i ] ) + " ";
 	  entry.setGivenName( stripWhiteSpaces( givenName ) );
 	} else
-	  // Name string contains only one string without comma.
+	  // Name string tqcontains only one string without comma.
 	  entry.setFamilyName( stripWhiteSpaces( name ) );
 
         entry.insertPhoneNumber( KABC::PhoneNumber( phoneNumber, phoneType ) );
@@ -948,7 +948,7 @@ void MobileGui::writeKabc()
   
   addressBook->save( ticket );
   
-  emit transientStatusMessage( i18n( "Wrote KDE address book." ) );
+  emit transienStatusMessage( i18n( "Wrote KDE address book." ) );
   
   setKabState( LOADED );
 }
@@ -1159,7 +1159,7 @@ void MobileGui::fillPhonebook( ATCommand *cmd )
   // Display mobile entries
   updateMobileBook();
 
-  emit transientStatusMessage(i18n("Read mobile phonebook."));
+  emit transienStatusMessage(i18n("Read mobile phonebook."));
   emit phonebookRead();
   
   setMobState( LOADED );
@@ -1398,7 +1398,7 @@ void MobileGui::mergePhonebooks()
   updateKabBook();
   updateMobileBook();
 
-  emit transientStatusMessage( i18n( "Synced phonebooks." ) );
+  emit transienStatusMessage( i18n( "Synced phonebooks." ) );
   PushButton8_3->setEnabled( true );
 }
 
@@ -1561,7 +1561,7 @@ void MobileGui::warnKabState( ABState newState )
 {
   if ( ( mKabState == MODIFIED ) && ( newState != MODIFIED ) ) {
     TQString text = "" + i18n( "Warning" ) + "
        ";
-    text += i18n( "The KDE address book contains unsaved changes." ) +
+    text += i18n( "The KDE address book tqcontains unsaved changes." ) +
             "
        ";
       
     TQMessageBox *msg = new TQMessageBox( i18n( "Unsaved Changes" ), text,
@@ -1646,7 +1646,7 @@ bool MobileGui::warnMobState( ABState newState )
   if ( ( mMobState == MODIFIED ) && ( newState != MODIFIED ) )
   {
     TQString text = "" + i18n( "Warning" ) + "
        ";
-    text += i18n( "The mobile phone book contains unsaved changes." ) +
+    text += i18n( "The mobile phone book tqcontains unsaved changes." ) +
             "
        ";
       
     TQMessageBox *msg = new TQMessageBox( i18n( "Unsaved Changes" ), text,
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index 2d0f3b073..de698729e 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -52,7 +52,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
     void phonebookRead();
 
     void statusMessage( const TQString & );
-    void transientStatusMessage( const TQString & );
+    void transienStatusMessage( const TQString & );
     void connectModem();
     void disconnectModem();
 
diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui
index 6361e5477..9379abab2 100644
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@@ -4,7 +4,7 @@
     
         MobileGui_base
     
-    
+    
         
             0
             0
@@ -124,7 +124,7 @@
                     
                 	Expanding
                     
-                    
+                    
                 	
                 	    20
                 	    20
@@ -207,7 +207,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         20
@@ -261,7 +261,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         40
@@ -318,7 +318,7 @@
                     
                     
                         
-                            layout21
+                            tqlayout21
                         
                         
                             
@@ -342,7 +342,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         321
                                         20
@@ -439,7 +439,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                         
@@ -579,5 +579,5 @@
     toggleConnection()
     deleteMobPhonebook()
 
-
+
 
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 6143dec7b..851b78295 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -57,8 +57,8 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs)
   statusBar()->insertItem(i18n(" Disconnected "),1,0,true);
   connect(mView,TQT_SIGNAL(statusMessage(const TQString &)),
           TQT_SLOT(showStatusMessage(const TQString &)));
-  connect(mView,TQT_SIGNAL(transientStatusMessage(const TQString &)),
-          TQT_SLOT(showTransientStatusMessage(const TQString &)));
+  connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)),
+          TQT_SLOT(showTransienStatusMessage(const TQString &)));
 
   statusBar()->show();
 
@@ -152,7 +152,7 @@ void MobileMain::showStatusMessage(const TQString& text)
   statusBar()->message(text);
 }
 
-void MobileMain::showTransientStatusMessage(const TQString& text)
+void MobileMain::showTransienStatusMessage(const TQString& text)
 {
   // display the text on the statusbar for 2 s.
   statusBar()->message(text,2000);
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 46c8bc576..d414d15e7 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -95,7 +95,7 @@ class MobileMain : public KMainWindow
     void newToolbarConfig();
 
     void showStatusMessage(const TQString& text);
-    void showTransientStatusMessage(const TQString& text);
+    void showTransienStatusMessage(const TQString& text);
     void changeCaption(const TQString& text);
 
 
diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui
index 45ecde5de..0c985127a 100644
--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@@ -4,7 +4,7 @@
     
         CSVExportDialogBase
     
-    
+    
         
             0
             0
@@ -29,7 +29,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     29
@@ -46,7 +46,7 @@
             
                 Expanding
             
-            
+            
                 
                     160
                     20
@@ -317,7 +317,7 @@
                             0
                         
                     
-                    
+                    
                         
                             30
                             32767
@@ -405,7 +405,7 @@
 
     enableExportButton()
 
-
+
 
     kdateedit.h
     kdateedit.h
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index deab87548..04f4d9d13 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -96,7 +96,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
     return;
   }
 
-  // If desktop contains entries then configure desktopTracker
+  // If desktop tqcontains entries then configure desktopTracker
   // If a desktop was disabled, it will not be stopped automatically.
   // If enabled: Start it now.
   if (desktopList.size()>0) {
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index aa8de2e27..f7fdd69c7 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -33,7 +33,7 @@ class DesktopTracker: public QObject
     KWinModule kWinModule;
 
     // define vectors for at most 16 virtual desktops
-    // E.g.: desktopTrackerStop[3] contains a vector with
+    // E.g.: desktopTrackerStop[3] tqcontains a vector with
     // all tasks to be notified, when switching to/from desk 3.
     TaskVector desktopTracker[maxDesktops];
     int _previousDesktop;
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 74d3417bd..b7b1abe75 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -87,7 +87,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   // Time
   _timeLA = new TQLabel( i18n("&Time:"), page, "time" );
   lay3->addWidget( _timeLA, 0, 0 );
-  _timeLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _timeLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -110,7 +110,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   _sessionTW = new KArmTimeWidget( page, "_sessionTW" );
   lay3->addWidget( _sessionTW, 1, 1 );
   _sessionLA->setBuddy( _sessionTW );
-  _sessionLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _sessionLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -132,9 +132,9 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   lay4->addSpacing(20);
   
   _operator = new TQComboBox(page);
-  _operator->insertItem( TQString::fromLatin1( "+" ) );
-  _operator->insertItem( TQString::fromLatin1( "-" ) );
-  _operator->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _operator->insertItem( TQString::tqfromLatin1( "+" ) );
+  _operator->insertItem( TQString::tqfromLatin1( "-" ) );
+  _operator->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -148,7 +148,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
 
   desktopCount = kwinmodule.numberOfDesktops();
   
-  // If desktopList contains higher numbered desktops than desktopCount then
+  // If desktopList tqcontains higher numbered desktops than desktopCount then
   // delete those from desktopList. This may be the case if the user has
   // configured virtual desktops. The values in desktopList are sorted.
   if ( (desktopList != 0) && (desktopList->size() > 0) ) 
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index b2b17a29c..53f17c8c6 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -67,7 +67,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
 
   _timer->stop();
 
-  TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds);
+  TQDateTime idleStart = TQDateTime::tqcurrentDateTime().addSecs(-idleSeconds);
   TQString idleStartQString = KGlobal::locale()->formatTime(idleStart.time());
 
   int id =  TQMessageBox::warning( 0, i18n("Idle Detection"),
@@ -76,13 +76,13 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
                                      i18n("Revert && Stop"),
                                      i18n("Revert && Continue"),
                                      i18n("Continue Timing"),0,2);
-  TQDateTime end = TQDateTime::currentDateTime();
+  TQDateTime end = TQDateTime::tqcurrentDateTime();
   int diff = idleStart.secsTo(end)/secsPerMinute;
 
   if (id == 0) 
   {
     // Revert And Stop
-    kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl;
+    kdDebug(5970) << "Now it is " << TQDateTime::tqcurrentDateTime() << endl;
     kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl;
     emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness.
     emit(stopAllTimersAt(idleStart));
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index c535bec41..d44c4ac14 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -21,17 +21,17 @@
 #include 
 #include "mainwindow.h"
 
-karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
+karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName,
                                   TQObject *parent, const char *name )
     : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), 
-    _accel     ( new KAccel( parentWidget ) ),
-    _watcher   ( new KAccelMenuWatch( _accel, parentWidget ) )
+    _accel     ( new KAccel( tqparentWidget ) ),
+    _watcher   ( new KAccelMenuWatch( _accel, tqparentWidget ) )
 {
     // we need an instance
     setInstance( karmPartFactory::instance() );
 
     // this should be your custom internal widget
-    _taskView = new TaskView( parentWidget, widgetName );
+    _taskView = new TaskView( tqparentWidget, widgetName );
 
     // setup PreferenceDialog.
     _preferences = Preferences::instance();
@@ -134,12 +134,12 @@ void karmPart::makeMenus()
       actionCollection(),
       "reset_all_times");
   actionStart = new KAction( i18n("&Start"),
-      TQString::fromLatin1("1rightarrow"), Key_S,
+      TQString::tqfromLatin1("1rightarrow"), Key_S,
       _taskView,
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new KAction( i18n("S&top"),
-      TQString::fromLatin1("stop"), 0,
+      TQString::tqfromLatin1("stop"), 0,
       _taskView,
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
@@ -151,55 +151,55 @@ void karmPart::makeMenus()
   actionStopAll->setEnabled(false);
 
   actionNew = new KAction( i18n("&New..."),
-      TQString::fromLatin1("filenew"), CTRL+Key_N,
+      TQString::tqfromLatin1("filenew"), CTRL+Key_N,
       _taskView,
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new KAction( i18n("New &Subtask..."),
-      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
+      TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
       _taskView,
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new KAction( i18n("&Delete"),
-      TQString::fromLatin1("editdelete"), Key_Delete,
+      TQString::tqfromLatin1("editdelete"), Key_Delete,
       _taskView,
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new KAction( i18n("&Edit..."),
-      TQString::fromLatin1("edit"), CTRL + Key_E,
+      TQString::tqfromLatin1("edit"), CTRL + Key_E,
       _taskView,
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new KAction( i18n("&Add Comment..."),
-//      TQString::fromLatin1("document"),
+//      TQString::tqfromLatin1("document"),
 //      CTRL+ALT+Key_E,
 //      _taskView,
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+Key_C,
       _taskView,
       TQT_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
   actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+ALT+Key_C,
       _taskView,
       TQT_SLOT( clipHistory() ),
@@ -322,7 +322,7 @@ bool karmPart::openFile()
     _taskView->load(m_file);
 
     // just for fun, set the status bar
-    emit setStatusBarText( m_url.prettyURL() );
+    emit seStatusBarText( m_url.prettyURL() );
 
     return true;
 }
@@ -387,12 +387,12 @@ karmPartFactory::~karmPartFactory()
     s_instance = 0L;
 }
 
-KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
                                                         TQObject *parent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    karmPart* obj = new karmPart( parentWidget, widgetName, parent, name );
+    karmPart* obj = new karmPart( tqparentWidget, widgetName, parent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/karm/karm_part.h b/karm/karm_part.h
index ed0098ad8..2d5b98bfe 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -58,7 +58,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
     friend class KarmTray;
 
 public:
-    karmPart(TQWidget *parentWidget, const char *widgetName,
+    karmPart(TQWidget *tqparentWidget, const char *widgetName,
              TQObject *parent, const char *name);
     // DCOP
     void quit();
@@ -124,7 +124,7 @@ class karmPartFactory : public KParts::Factory
 public:
     karmPartFactory();
     virtual ~karmPartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
+    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index e895d2639..7a6bfcb9b 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -102,7 +102,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
 
   // If file doesn't exist, create a blank one to avoid ResourceLocal load
   // error.  We make it user and group read/write, others read.  This is
-  // masked by the users umask.  (See man creat)
+  // tqmasked by the users umask.  (See man creat)
   if ( ! remoteResource( _icalfile ) )
   {
     int handle;
@@ -135,7 +135,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
   TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)),
   	            view, TQT_SLOT(iCalFileModified(ResourceCalendar *)));
   _calendar->setTimeZoneId( KPimPrefs::timezone() );
-  _calendar->setResourceName( TQString::fromLatin1("KArm") );
+  _calendar->setResourceName( TQString::tqfromLatin1("KArm") );
   _calendar->open();
   _calendar->load();
 
@@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   while ( tasknr < taskview->count() && !dialog.wasCancelled() )
   {
     dialog.progressBar()->advance( 1 );
-    if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow
+    if ( tasknr % 15 == 0 ) kapp->processEvents(); // tqrepainting is slow
     if ( taskview->item_at_index(tasknr)->depth() > maxdepth )
       maxdepth = taskview->item_at_index(tasknr)->depth();
     tasknr++;
@@ -627,9 +627,9 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
 
     /*
     // CSV compliance
-    // Surround the field with quotes if the field contains
+    // Surround the field with quotes if the field tqcontains
     // a comma (delim) or a double quote
-    if (task->name().contains(delim) || task->name().contains(dquote))
+    if (task->name().tqcontains(delim) || task->name().tqcontains(dquote))
       to_quote = true;
     else
       to_quote = false;
@@ -639,8 +639,8 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
     if (to_quote)
       retval += dquote;
 
-    // Double quotes replaced by a pair of consecutive double quotes
-    retval += task->name().replace( dquote, double_dquote );
+    // Double quotes tqreplaced by a pair of consecutive double quotes
+    retval += task->name().tqreplace( dquote, double_dquote );
 
     if (to_quote)
       retval += dquote;
@@ -661,7 +661,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   }
 
   // save, either locally or remote
-  if ((rc.url.isLocalFile()) || (!rc.url.url().contains("/")))
+  if ((rc.url.isLocalFile()) || (!rc.url.url().tqcontains("/")))
   {
     TQString filename=rc.url.path();
     if (filename.isEmpty()) filename=rc.url.url();
@@ -680,13 +680,13 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   else // use remote file
   {
     KTempFile tmpFile;
-    if ( tmpFile.status() != 0 ) err = TQString::fromLatin1( "Unable to get temporary file" );
+    if ( tmpFile.status() != 0 ) err = TQString::tqfromLatin1( "Unable to get temporary file" );
     else
     {
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload");
     }
   }
 
@@ -794,7 +794,7 @@ long KarmStorage::printTaskHistory (
   TQString double_dquote = dquote + dquote;
   bool to_quote = true;
 
-  const TQString cr = TQString::fromLatin1("\n");
+  const TQString cr = TQString::tqfromLatin1("\n");
   TQString buf;
   TQString daytaskkey, daykey;
   TQDate day;
@@ -807,19 +807,19 @@ long KarmStorage::printTaskHistory (
   while (day <= to)
   {
     // write the time in seconds for the given task for the given day to s
-    daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
-    daytaskkey = TQString::fromLatin1("%1_%2")
+    daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
+    daytaskkey = TQString::tqfromLatin1("%1_%2")
       .arg(daykey)
       .arg(task->uid());
 
-    if (taskdaytotals.contains(daytaskkey))
+    if (taskdaytotals.tqcontains(daytaskkey))
     {
-      cell.push_back(TQString::fromLatin1("%1")
+      cell.push_back(TQString::tqfromLatin1("%1")
         .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
       sum += taskdaytotals[daytaskkey];  // in seconds
 
-      if (daytotals.contains(daykey))
-        daytotals.replace(daykey, daytotals[daykey]+taskdaytotals[daytaskkey]);
+      if (daytotals.tqcontains(daykey))
+        daytotals.tqreplace(daykey, daytotals[daykey]+taskdaytotals[daytaskkey]);
       else
         daytotals.insert(daykey, taskdaytotals[daytaskkey]);
     }
@@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory (
   }
 
   // Total for task
-  cell.push_back(TQString::fromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes)));
+  cell.push_back(TQString::tqfromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes)));
 
   // room for the recursive total time (that cannot be calculated now)
   cell.push_back(delim);
@@ -842,16 +842,16 @@ long KarmStorage::printTaskHistory (
 
   /*
   // CSV compliance
-  // Surround the field with quotes if the field contains
+  // Surround the field with quotes if the field tqcontains
   // a comma (delim) or a double quote
-  to_quote = task->name().contains(delim) || task->name().contains(dquote);
+  to_quote = task->name().tqcontains(delim) || task->name().tqcontains(dquote);
   */
   to_quote = true;
   if ( to_quote) cell.push_back(dquote);
 
 
-  // Double quotes replaced by a pair of consecutive double quotes
-  cell.push_back(task->name().replace( dquote, double_dquote ));
+  // Double quotes tqreplaced by a pair of consecutive double quotes
+  cell.push_back(task->name().tqreplace( dquote, double_dquote ));
 
   if ( to_quote) cell.push_back(dquote);
 
@@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory (
     add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix,
                       rc );
   }
-  cell[colrectot]=(TQString::fromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes )));
+  cell[colrectot]=(TQString::tqfromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes )));
   for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i];
   return add+sum;
 }
@@ -890,7 +890,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
                                             const ReportCriteria &rc)
 {
   TQString delim = rc.delimiter;
-  const TQString cr = TQString::fromLatin1("\n");
+  const TQString cr = TQString::tqfromLatin1("\n");
   TQString err;
 
   // below taken from timekard.cpp
@@ -910,7 +910,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   // parameter-plausi
   if ( from > to )
   {
-    err = TQString::fromLatin1 (
+    err = TQString::tqfromLatin1 (
             "'to' has to be a date later than or equal to 'from'.");
   }
 
@@ -921,7 +921,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     .arg(KGlobal::locale()->formatDate(to));
   retval += cr;
   retval += i18n("Printed on: %1")
-    .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
+    .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
   retval += cr;
 
   day=from;
@@ -936,13 +936,13 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   // so times are accumulated for each task.
   for (event = events.begin(); event != events.end(); ++event)
   {
-    daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd"));
-    daytaskkey = TQString(TQString::fromLatin1("%1_%2"))
+    daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
+    daytaskkey = TQString(TQString::tqfromLatin1("%1_%2"))
         .arg(daykey)
         .arg((*event).todoUid());
 
-    if (taskdaytotals.contains(daytaskkey))
-        taskdaytotals.replace(daytaskkey,
+    if (taskdaytotals.tqcontains(daytaskkey))
+        taskdaytotals.tqreplace(daytaskkey,
                 taskdaytotals[daytaskkey] + (*event).duration());
     else
         taskdaytotals.insert(daytaskkey, (*event).duration());
@@ -953,7 +953,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   while ( dayheading <= to )
   {
     // Use ISO 8601 format for date.
-    retval += dayheading.toString(TQString::fromLatin1("yyyy-MM-dd"));
+    retval += dayheading.toString(TQString::tqfromLatin1("yyyy-MM-dd"));
     retval += delim;
     dayheading=dayheading.addDays(1);
   }
@@ -993,11 +993,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     day = from;
     while (day<=to)
     {
-      daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
+      daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
 
-      if (daytotals.contains(daykey))
+      if (daytotals.tqcontains(daykey))
       {
-        retval += TQString::fromLatin1("%1")
+        retval += TQString::tqfromLatin1("%1")
             .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
         sum += daytotals[daykey];  // in seconds
       }
@@ -1005,7 +1005,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
       day = day.addDays(1);
     }
 
-    retval += TQString::fromLatin1("%1%2%3%4")
+    retval += TQString::tqfromLatin1("%1%2%3%4")
         .arg( formatTime( sum/60, rc.decimalMinutes ) )
         .arg( delim ).arg( delim )
         .arg( i18n( "Total" ) );
@@ -1015,7 +1015,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
 
   // save, either locally or remote
 
-  if ((rc.url.isLocalFile()) || (!rc.url.url().contains("/")))
+  if ((rc.url.isLocalFile()) || (!rc.url.url().tqcontains("/")))
   {
     TQString filename=rc.url.path();
     if (filename.isEmpty()) filename=rc.url.url();
@@ -1036,14 +1036,14 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 )
     {
-      err = TQString::fromLatin1( "Unable to get temporary file" );
+      err = TQString::tqfromLatin1( "Unable to get temporary file" );
     }
     else
     {
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload");
     }
   }
   return err;
@@ -1166,7 +1166,7 @@ TQValueList KarmStorage::getHistory(const TQDate& from,
     {
 
       // KArm events have the custom property X-KDE-Karm-duration
-      if (! processed.contains( (*event)->uid()))
+      if (! processed.tqcontains( (*event)->uid()))
       {
         // If an event spans multiple days, CalendarLocal::rawEventsForDate
         // will return the same event on both days.  To avoid double-counting
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index c9d91e15f..d94064f60 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -239,7 +239,7 @@ class KarmStorage
      *
      * @param task   The task the timer was stopped for.
      */
-    void stopTimer(const Task* task, TQDateTime when=TQDateTime::currentDateTime());
+    void stopTimer(const Task* task, TQDateTime when=TQDateTime::tqcurrentDateTime());
 
     /**
      * Log a new comment for this task.
diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp
index 8a2de530a..d13a3f6ed 100644
--- a/karm/karmutility.cpp
+++ b/karm/karmutility.cpp
@@ -12,7 +12,7 @@ TQString formatTime( long minutes, bool decimal )
   TQString time;
   if ( decimal ) {
     time.sprintf("%.2f", minutes / 60.0);
-    time.replace( '.', KGlobal::locale()->decimalSymbol() );
+    time.tqreplace( '.', KGlobal::locale()->decimalSymbol() );
   }
   else time.sprintf("%s%ld:%02ld",
     (minutes < 0) ? KGlobal::locale()->negativeSign().utf8().data() : "",
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index 9de79d9dd..dba305fef 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -63,38 +63,38 @@ protected:
 KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
   : TQWidget(parent, name)
 {
-  TQHBoxLayout *layout = new TQHBoxLayout(this);
+  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
   _hourLE = new TQLineEdit( this);
   // 9999 hours > 1 year!
   // 999 hours = 41 days  (That should be enough ...)
   _hourLE->setFixedWidth( fontMetrics().maxWidth() * 3
                           + 2 * _hourLE->frameWidth() + 2);
-  layout->addWidget(_hourLE);
+  tqlayout->addWidget(_hourLE);
   TimeValidator *validator = new TimeValidator( HOUR, _hourLE,
                                                 "Validator for _hourLE");
   _hourLE->setValidator( validator );
-  _hourLE->setAlignment( Qt::AlignRight );
+  _hourLE->tqsetAlignment( Qt::AlignRight );
 
 
   TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this );
-  layout->addWidget( hr );
+  tqlayout->addWidget( hr );
 
   _minuteLE = new KarmLineEdit(this);
 
   // Minutes lineedit: Make room for 2 digits
   _minuteLE->setFixedWidth( fontMetrics().maxWidth() * 2
                             + 2 * _minuteLE->frameWidth() + 2);
-  layout->addWidget(_minuteLE);
+  tqlayout->addWidget(_minuteLE);
   validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE");
   _minuteLE->setValidator( validator );
   _minuteLE->setMaxLength(2);
-  _minuteLE->setAlignment( Qt::AlignRight );
+  _minuteLE->tqsetAlignment( Qt::AlignRight );
 
   TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this );
-  layout->addWidget( min );
+  tqlayout->addWidget( min );
 
-  layout->addStretch(1);
+  tqlayout->addStretch(1);
   setFocusProxy( _hourLE );
 }
 
@@ -111,7 +111,7 @@ void KArmTimeWidget::setTime( long minutes )
 
   dummy.setNum( minutepart );
   if (minutepart < 10 ) {
-    dummy = TQString::fromLatin1( "0" ) + dummy;
+    dummy = TQString::tqfromLatin1( "0" ) + dummy;
   }
   _minuteLE->setText( dummy );
 }
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 6a80fa009..4440ab1a5 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -47,7 +47,7 @@ MainWindow::MainWindow( const TQString &icsfile )
 
   setCentralWidget( _taskView );
   // status bar
-  startStatusBar();
+  starStatusBar();
 
   // setup PreferenceDialog.
   _preferences = Preferences::instance();
@@ -63,8 +63,8 @@ MainWindow::MainWindow( const TQString &icsfile )
            this, TQT_SLOT(slotSelectionChanged()));
   connect( _taskView, TQT_SIGNAL( updateButtons() ),
            this, TQT_SLOT(slotSelectionChanged()));
-  connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ),
-           this, TQT_SLOT(setStatusBar( TQString )));
+  connect( _taskView, TQT_SIGNAL( seStatusBar( TQString ) ),
+           this, TQT_SLOT(seStatusBar( TQString )));
 
   loadGeometry();
 
@@ -134,7 +134,7 @@ void MainWindow::slotSelectionChanged()
 //  actionAddComment->setEnabled( on );
 //}
 
-void MainWindow::setStatusBar(TQString qs)
+void MainWindow::seStatusBar(TQString qs)
 {
   statusBar()->message(i18n(qs.ascii()));
 }
@@ -208,7 +208,7 @@ void MainWindow::updateStatusBar( )
   statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1);
 }
 
-void MainWindow::startStatusBar()
+void MainWindow::starStatusBar()
 {
   statusBar()->insertItem( i18n("Session"), 0, 0, true );
   statusBar()->insertItem( i18n("Total" ), 1, 0, true );
@@ -272,12 +272,12 @@ void MainWindow::makeMenus()
       actionCollection(),
       "reset_all_times");
   actionStart = new KAction( i18n("&Start"),
-      TQString::fromLatin1("1rightarrow"), Key_S,
+      TQString::tqfromLatin1("1rightarrow"), Key_S,
       _taskView,
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new KAction( i18n("S&top"),
-      TQString::fromLatin1("stop"), Key_S,
+      TQString::tqfromLatin1("stop"), Key_S,
       _taskView,
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
@@ -289,48 +289,48 @@ void MainWindow::makeMenus()
   actionStopAll->setEnabled(false);
 
   actionNew = new KAction( i18n("&New..."),
-      TQString::fromLatin1("filenew"), CTRL+Key_N,
+      TQString::tqfromLatin1("filenew"), CTRL+Key_N,
       _taskView,
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new KAction( i18n("New &Subtask..."),
-      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
+      TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
       _taskView,
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new KAction( i18n("&Delete"),
-      TQString::fromLatin1("editdelete"), Key_Delete,
+      TQString::tqfromLatin1("editdelete"), Key_Delete,
       _taskView,
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new KAction( i18n("&Edit..."),
-      TQString::fromLatin1("edit"), CTRL + Key_E,
+      TQString::tqfromLatin1("edit"), CTRL + Key_E,
       _taskView,
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new KAction( i18n("&Add Comment..."),
-//      TQString::fromLatin1("document"),
+//      TQString::tqfromLatin1("document"),
 //      CTRL+ALT+Key_E,
 //      _taskView,
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+Key_C,
       _taskView,
       TQT_SLOT( clipTotals() ),
@@ -338,14 +338,14 @@ void MainWindow::makeMenus()
       "clip_totals");
   // actionClipTotals will never be used again, overwrite it
   actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       0,
       _taskView,
       TQT_SLOT( clipSession() ),
       actionCollection(),
       "clip_session");
   actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+ALT+Key_C,
       _taskView,
       TQT_SLOT( clipHistory() ),
@@ -372,7 +372,7 @@ void MainWindow::makeMenus()
                             "import_korg_events");
   */
 
-  setXMLFile( TQString::fromLatin1("karmui.rc") );
+  setXMLFile( TQString::tqfromLatin1("karmui.rc") );
   createGUI( 0 );
 
   // Tool tips must be set after the createGUI.
@@ -442,11 +442,11 @@ void MainWindow::loadGeometry()
   {
     KConfig &config = *kapp->config();
 
-    config.setGroup( TQString::fromLatin1("Main Window Geometry") );
-    int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
-    int h = config.readNumEntry( TQString::fromLatin1("Height"), 100 );
-    w = QMAX( w, sizeHint().width() );
-    h = QMAX( h, sizeHint().height() );
+    config.setGroup( TQString::tqfromLatin1("Main Window Geometry") );
+    int w = config.readNumEntry( TQString::tqfromLatin1("Width"), 100 );
+    int h = config.readNumEntry( TQString::tqfromLatin1("Height"), 100 );
+    w = QMAX( w, tqsizeHint().width() );
+    h = QMAX( h, tqsizeHint().height() );
     resize(w, h);
   }
 }
@@ -455,9 +455,9 @@ void MainWindow::loadGeometry()
 void MainWindow::saveGeometry()
 {
   KConfig &config = *KGlobal::config();
-  config.setGroup( TQString::fromLatin1("Main Window Geometry"));
-  config.writeEntry( TQString::fromLatin1("Width"), width());
-  config.writeEntry( TQString::fromLatin1("Height"), height());
+  config.setGroup( TQString::tqfromLatin1("Main Window Geometry"));
+  config.writeEntry( TQString::tqfromLatin1("Width"), width());
+  config.writeEntry( TQString::tqfromLatin1("Height"), height());
   config.sync();
 }
 
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index b6d77e8a3..2f275be16 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -88,7 +88,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
     TQString importplannerfile( TQString filename );
 
   public slots:
-    void setStatusBar( TQString );
+    void seStatusBar( TQString );
     void quit();
 
   protected slots:
@@ -107,7 +107,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 //    void timeLoggingChanged( bool on );
 
   protected:
-    void startStatusBar();
+    void starStatusBar();
     virtual void saveProperties( KConfig* );
     virtual void readProperties( KConfig* );
     void saveGeometry();
diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp
index 67f7bd53f..7ac13a5e3 100644
--- a/karm/plannerparser.cpp
+++ b/karm/plannerparser.cpp
@@ -55,15 +55,15 @@ test cases:
     int     taskComplete=0;
     
     // only s within  are processed
-    if (qName == TQString::fromLatin1("tasks")) withInTasks=true;
-    if ((qName == TQString::fromLatin1("task")) && (withInTasks))
+    if (qName == TQString::tqfromLatin1("tasks")) withInTasks=true;
+    if ((qName == TQString::tqfromLatin1("task")) && (withInTasks))
     {
 	
       // find out name and percent-complete
       for (int i=0; isetColStretch( 1, 1 );
+  TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 );
+  tqlayout->setColStretch( 1, 1 );
 
   _doIdleDetectionW = new QCheckBox
     ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW");
@@ -62,9 +62,9 @@ void Preferences::makeBehaviorPage()
   _promptDeleteW = new QCheckBox
     ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" );
 
-  layout->addWidget(_doIdleDetectionW, 0, 0 );
-  layout->addWidget(_idleDetectValueW, 0, 1 );
-  layout->addWidget(_promptDeleteW, 1, 0 );
+  tqlayout->addWidget(_doIdleDetectionW, 0, 0 );
+  tqlayout->addWidget(_idleDetectValueW, 0, 1 );
+  tqlayout->addWidget(_promptDeleteW, 1, 0 );
 
   topLevel->addStretch();
 
@@ -79,8 +79,8 @@ void Preferences::makeDisplayPage()
       icon );
 
   TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() );
-  TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 );
+  tqlayout->setColStretch( 1, 1 );
 
   TQLabel* _displayColumnsLabelW = new TQLabel( i18n("Columns displayed:"),
       displayPage );
@@ -93,11 +93,11 @@ void Preferences::makeDisplayPage()
   _displayTotalTimeW = new TQCheckBox ( i18n("Total task time"),
       displayPage, "_displayTotalTimeW");
 
-  layout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 );
-  layout->addWidget(_displaySessionW, 1, 1 );
-  layout->addWidget(_displayTimeW, 2, 1 );
-  layout->addWidget(_displayTotalSessionW, 3, 1 );
-  layout->addWidget(_displayTotalTimeW, 4, 1 );
+  tqlayout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 );
+  tqlayout->addWidget(_displaySessionW, 1, 1 );
+  tqlayout->addWidget(_displayTimeW, 2, 1 );
+  tqlayout->addWidget(_displayTotalSessionW, 3, 1 );
+  tqlayout->addWidget(_displayTotalTimeW, 4, 1 );
 
   topLevel->addStretch();
 }
@@ -109,8 +109,8 @@ void Preferences::makeStoragePage()
       icon );
 
   TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() );
-  TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 );
+  tqlayout->setColStretch( 1, 1 );
 
   // autosave
   _doAutoSaveW = new QCheckBox
@@ -121,19 +121,19 @@ void Preferences::makeStoragePage()
   // iCalendar
   TQLabel* _iCalFileLabel = new TQLabel( i18n("iCalendar file:"), storagePage);
   _iCalFileW = new KURLRequester(storagePage, "_iCalFileW");
-  _iCalFileW->setFilter(TQString::fromLatin1("*.ics"));
+  _iCalFileW->setFilter(TQString::tqfromLatin1("*.ics"));
   _iCalFileW->setMode(KFile::File);
 
   // Log time?
   _loggingW = new TQCheckBox 
     ( i18n("Log history"), storagePage, "_loggingW" );
 
-  // add widgets to layout
-  layout->addWidget(_doAutoSaveW, 0, 0);
-  layout->addWidget(_autoSaveValueW, 0, 1);
-  layout->addWidget(_iCalFileLabel, 1, 0 );
-  layout->addWidget(_iCalFileW, 1, 1 );
-  layout->addWidget(_loggingW, 2, 0 );
+  // add widgets to tqlayout
+  tqlayout->addWidget(_doAutoSaveW, 0, 0);
+  tqlayout->addWidget(_autoSaveValueW, 0, 1);
+  tqlayout->addWidget(_iCalFileLabel, 1, 0 );
+  tqlayout->addWidget(_iCalFileW, 1, 1 );
+  tqlayout->addWidget(_loggingW, 2, 0 );
 
   topLevel->addStretch();
 
@@ -253,32 +253,32 @@ void Preferences::load()
 {
   KConfig &config = *kapp->config();
 
-  config.setGroup( TQString::fromLatin1("Idle detection") );
-  _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
+  config.setGroup( TQString::tqfromLatin1("Idle detection") );
+  _doIdleDetectionV = config.readBoolEntry( TQString::tqfromLatin1("enabled"),
      true );
-  _idleDetectValueV = config.readNumEntry(TQString::fromLatin1("period"), 15);
+  _idleDetectValueV = config.readNumEntry(TQString::tqfromLatin1("period"), 15);
 
-  config.setGroup( TQString::fromLatin1("Saving") );
+  config.setGroup( TQString::tqfromLatin1("Saving") );
   _iCalFileV = config.readPathEntry
-    ( TQString::fromLatin1("ical file"), 
-      locateLocal( "appdata", TQString::fromLatin1( "karm.ics")));
+    ( TQString::tqfromLatin1("ical file"), 
+      locateLocal( "appdata", TQString::tqfromLatin1( "karm.ics")));
   _doAutoSaveV = config.readBoolEntry
-    ( TQString::fromLatin1("auto save"), true);
+    ( TQString::tqfromLatin1("auto save"), true);
   _autoSaveValueV = config.readNumEntry
-    ( TQString::fromLatin1("auto save period"), 5);
+    ( TQString::tqfromLatin1("auto save period"), 5);
   _promptDeleteV = config.readBoolEntry
-    ( TQString::fromLatin1("prompt delete"), true);
+    ( TQString::tqfromLatin1("prompt delete"), true);
   _loggingV = config.readBoolEntry
-    ( TQString::fromLatin1("logging"), true);
+    ( TQString::tqfromLatin1("logging"), true);
 
   _displayColumnV[0] = config.readBoolEntry
-    ( TQString::fromLatin1("display session time"), true);
+    ( TQString::tqfromLatin1("display session time"), true);
   _displayColumnV[1] = config.readBoolEntry
-    ( TQString::fromLatin1("display time"), true);
+    ( TQString::tqfromLatin1("display time"), true);
   _displayColumnV[2] = config.readBoolEntry
-    ( TQString::fromLatin1("display total session time"), true);
+    ( TQString::tqfromLatin1("display total session time"), true);
   _displayColumnV[3] = config.readBoolEntry
-    ( TQString::fromLatin1("display total time"), true);
+    ( TQString::tqfromLatin1("display total time"), true);
 
   KEMailSettings settings;
   _userRealName = settings.getSetting( KEMailSettings::RealName );
@@ -288,24 +288,24 @@ void Preferences::save()
 {
   KConfig &config = *KGlobal::config();
 
-  config.setGroup( TQString::fromLatin1("Idle detection"));
-  config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV);
-  config.writeEntry( TQString::fromLatin1("period"), _idleDetectValueV);
+  config.setGroup( TQString::tqfromLatin1("Idle detection"));
+  config.writeEntry( TQString::tqfromLatin1("enabled"), _doIdleDetectionV);
+  config.writeEntry( TQString::tqfromLatin1("period"), _idleDetectValueV);
 
-  config.setGroup( TQString::fromLatin1("Saving"));
-  config.writePathEntry( TQString::fromLatin1("ical file"), _iCalFileV);
-  config.writeEntry( TQString::fromLatin1("auto save"), _doAutoSaveV);
-  config.writeEntry( TQString::fromLatin1("logging"), _loggingV);
-  config.writeEntry( TQString::fromLatin1("auto save period"), _autoSaveValueV);
-  config.writeEntry( TQString::fromLatin1("prompt delete"), _promptDeleteV);
+  config.setGroup( TQString::tqfromLatin1("Saving"));
+  config.writePathEntry( TQString::tqfromLatin1("ical file"), _iCalFileV);
+  config.writeEntry( TQString::tqfromLatin1("auto save"), _doAutoSaveV);
+  config.writeEntry( TQString::tqfromLatin1("logging"), _loggingV);
+  config.writeEntry( TQString::tqfromLatin1("auto save period"), _autoSaveValueV);
+  config.writeEntry( TQString::tqfromLatin1("prompt delete"), _promptDeleteV);
 
-  config.writeEntry( TQString::fromLatin1("display session time"),
+  config.writeEntry( TQString::tqfromLatin1("display session time"),
       _displayColumnV[0]);
-  config.writeEntry( TQString::fromLatin1("display time"),
+  config.writeEntry( TQString::tqfromLatin1("display time"),
       _displayColumnV[1]);
-  config.writeEntry( TQString::fromLatin1("display total session time"),
+  config.writeEntry( TQString::tqfromLatin1("display total session time"),
       _displayColumnV[2]);
-  config.writeEntry( TQString::fromLatin1("display total time"),
+  config.writeEntry( TQString::tqfromLatin1("display total time"),
       _displayColumnV[3]);
 
   config.sync();
diff --git a/karm/print.cpp b/karm/print.cpp
index 1badb4f9f..a7ddd4ba9 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -75,7 +75,7 @@ void MyPrinter::print()
     painter.setFont(newFont);
     
     int height = metrics.height();
-    TQString now = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+    TQString now = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
     
     painter.drawText(xMargin, yoff, pageWidth, height,
          TQPainter::AlignCenter, 
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 92a306a01..6b3ca85b4 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -48,14 +48,14 @@ PrintDialog::PrintDialog()
   setMainWidget(page);
   int year, month;
 
-  TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint());
-  layout->addSpacing(10);
-  layout->addStretch(1);
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint());
+  tqlayout->addSpacing(10);
+  tqlayout->addStretch(1);
 
   // Date Range
   TQGroupBox *rangeGroup = new TQGroupBox(1, Horizontal, i18n("Date Range"),
       page);
-  layout->addWidget(rangeGroup);
+  tqlayout->addWidget(rangeGroup);
 
   TQWidget *rangeWidget = new TQWidget(rangeGroup);
   TQHBoxLayout *rangeLayout = new TQHBoxLayout(rangeWidget, 0, spacingHint());
@@ -64,29 +64,29 @@ PrintDialog::PrintDialog()
   _from = new KDateEdit(rangeWidget);
 
   // Default from date to beginning of the month
-  year = TQDate::currentDate().year();
-  month = TQDate::currentDate().month();
+  year = TQDate::tqcurrentDate().year();
+  month = TQDate::tqcurrentDate().month();
   _from->setDate(TQDate(year, month, 1));
   rangeLayout->addWidget(_from);
   rangeLayout->addWidget(new TQLabel(i18n("To:"), rangeWidget));
   _to = new KDateEdit(rangeWidget);
   rangeLayout->addWidget(_to);
 
-  layout->addSpacing(10);
-  layout->addStretch(1);
+  tqlayout->addSpacing(10);
+  tqlayout->addStretch(1);
 
   _allTasks = new TQComboBox( page );
   _allTasks->insertItem( i18n( "Selected Task" ) );
   _allTasks->insertItem( i18n( "All Tasks" ) );
-  layout->addWidget( _allTasks );
+  tqlayout->addWidget( _allTasks );
 
   _perWeek = new TQCheckBox( i18n( "Summarize per week" ), page );
-  layout->addWidget( _perWeek );
+  tqlayout->addWidget( _perWeek );
   _totalsOnly = new TQCheckBox( i18n( "Totals only" ), page );
-  layout->addWidget( _totalsOnly );
+  tqlayout->addWidget( _totalsOnly );
 
-  layout->addSpacing(10);
-  layout->addStretch(1);
+  tqlayout->addSpacing(10);
+  tqlayout->addStretch(1);
 }
 
 TQDate PrintDialog::from() const
diff --git a/karm/reportcriteria.h b/karm/reportcriteria.h
index c6c1106e5..dae6a48e4 100644
--- a/karm/reportcriteria.h
+++ b/karm/reportcriteria.h
@@ -29,7 +29,7 @@ class TQString;
  Stores entries from export dialog.
 
  Keeps details (like CSV export dialog control names) out of the TaskView
- class, which contains the slot triggered by the export action.  
+ class, which tqcontains the slot triggered by the export action.  
  
  The dialog and the report logic can change all they want and the TaskView
  logic can stay the same.
diff --git a/karm/task.cpp b/karm/task.cpp
index 7d84bcd2c..b150a94db 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -75,13 +75,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
 
   _removing = false;
   _name = taskName.stripWhiteSpace();
-  _lastStart = TQDateTime::currentDateTime();
+  _lastStart = TQDateTime::tqcurrentDateTime();
   _totalTime = _time = minutes;
   _totalSessionTime = _sessionTime = sessionTime;
   _timer = new TQTimer(this);
   _desktops = desktops;
   connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
-  setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
+  setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
   _currentPic = 0;
   _percentcomplete = percent_complete;
 
@@ -119,7 +119,7 @@ void Task::setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted, TQ
       if ( ! _removing ) 
       {
         storage->stopTimer(this, whenStopped);
-        setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
+        setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
       }
     }
   }
@@ -290,7 +290,7 @@ TQString Task::fullName() const
   if (isRoot())
     return name();
   else
-    return parent()->fullName() + TQString::fromLatin1("/") + name();
+    return parent()->fullName() + TQString::tqfromLatin1("/") + name();
 }
 
 KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -349,7 +349,7 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes,
 
   TQString desktopList = incident->customProperty( kapp->instanceName(),
       TQCString( "desktopList" ) );
-  TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","),
+  TQStringList desktopStrList = TQStringList::split( TQString::tqfromLatin1(","),
       desktopList );
   desktops.clear();
 
@@ -380,7 +380,7 @@ TQString Task::getDesktopStr() const
   for ( DesktopList::const_iterator iter = _desktops.begin();
         iter != _desktops.end();
         ++iter ) {
-    desktopstr += TQString::number( *iter ) + TQString::fromLatin1( "," );
+    desktopstr += TQString::number( *iter ) + TQString::tqfromLatin1( "," );
   }
   desktopstr.remove( desktopstr.length() - 1, 1 );
   return desktopstr;
@@ -419,7 +419,7 @@ void Task::update()
 
 void Task::addComment( TQString comment, KarmStorage* storage )
 {
-  _comment = _comment + TQString::fromLatin1("\n") + comment;
+  _comment = _comment + TQString::tqfromLatin1("\n") + comment;
   storage->addComment(this, comment);
 }
 
diff --git a/karm/task.h b/karm/task.h
index 8114b3cb6..276b25034 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -179,11 +179,11 @@ class Task : public TQObject, public QListViewItem
        *  @param on       true or false for starting or stopping a task
        *  @param storage a pointer to a KarmStorage object.
        *  @param whenStarted time when the task was started. Normally
-				    TQDateTime::currentDateTime, but if calendar has 
+				    TQDateTime::tqcurrentDateTime, but if calendar has 
 				    been changed by another program and being reloaded
  				    the task is set to running with another start date
        */
-      void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::currentDateTime(), TQDateTime whenStopped=TQDateTime::currentDateTime());
+      void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::tqcurrentDateTime(), TQDateTime whenStopped=TQDateTime::tqcurrentDateTime());
 
       /** return the state of a task - if it's running or not
        *  @return         true or false depending on whether the task is running
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 0af5c7bd4..a410806a0 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -367,7 +367,7 @@ TQString TaskView::save()
 {
   kdDebug(5970) << "Entering TaskView::save" << endl;
   TQString err = _storage->save(this);
-  emit(setStatusBar(err));
+  emit(seStatusBar(err));
   return err;
 }
 
diff --git a/karm/taskview.h b/karm/taskview.h
index a3a1a6769..a3b88413d 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -172,7 +172,7 @@ class TaskView : public KListView
      * @param task      task to start timer of
      * @param startTime if taskview has been modified by another program, we 
 			     have to set the starting time to not-now. */
-    void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::currentDateTime() );
+    void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::tqcurrentDateTime() );
     void stopTimerFor( Task* task );
 
     /** clears all active tasks. Needed e.g. if iCal file was modified by
@@ -200,7 +200,7 @@ class TaskView : public KListView
     void timersActive();
     void timersInactive();
     void tasksChanged( TQPtrList activeTasks );
-    void setStatusBar( TQString );
+    void seStatusBar( TQString );
 
   private: // member variables
     IdleTimeDetector *_idleTimeDetector;
diff --git a/karm/test/lockerthread.cpp b/karm/test/lockerthread.cpp
index 914682210..aeff6cc76 100644
--- a/karm/test/lockerthread.cpp
+++ b/karm/test/lockerthread.cpp
@@ -26,7 +26,7 @@ void LockerThread::run()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( m_icsfile );
   lock      = calendars->requestSaveTicket( calendar );
   if ( lock )
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 940a344d1..2c18d4fed 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -23,7 +23,7 @@ short test1()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
   lock      = calendars->requestSaveTicket( calendar );
 
@@ -62,7 +62,7 @@ short test2()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
 
   LockerThread thread( icalfilename );
@@ -88,7 +88,7 @@ short test3()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
 
   // lock then unlock
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index f9fa9d9e0..816314368 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -94,7 +94,7 @@ void Script::terminate()
 
 void Script::exit()
 {
-  m_status = m_proc->exitStatus();
+  m_status = m_proc->exiStatus();
   delete m_proc;
   m_proc = 0;
 }
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index 984baf741..d7de48402 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -43,7 +43,7 @@ const int timeWidth = 6;
 const int totalTimeWidth = 7;
 const int reportWidth = taskWidth + timeWidth;
 
-const TQString cr = TQString::fromLatin1("\n");
+const TQString cr = TQString::tqfromLatin1("\n");
 
 TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime which)
 // Print the total Times as text. If justThisTask, use activeTask, else, all tasks
@@ -59,9 +59,9 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
 
   // header
   retval += i18n("Task Totals") + cr;
-  retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+  retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
   retval += cr + cr;
-  retval += TQString(TQString::fromLatin1("%1    %2"))
+  retval += TQString(TQString::tqfromLatin1("%1    %2"))
     .arg(i18n("Time"), timeWidth)
     .arg(i18n("Task"));
   retval += cr;
@@ -92,8 +92,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
 
     // total
     buf.fill('-', reportWidth);
-    retval += TQString(TQString::fromLatin1("%1")).arg(buf, timeWidth) + cr;
-    retval += TQString(TQString::fromLatin1("%1 %2"))
+    retval += TQString(TQString::tqfromLatin1("%1")).arg(buf, timeWidth) + cr;
+    retval += TQString(TQString::tqfromLatin1("%1 %2"))
       .arg(formatTime(sum),timeWidth)
       .arg(i18n("Total"));
   }
@@ -109,7 +109,7 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which)
   TQString buf;
 
   s += buf.fill(' ', level);
-  s += TQString(TQString::fromLatin1("%1    %2"))
+  s += TQString(TQString::tqfromLatin1("%1    %2"))
     .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
     .arg(task->name());
   s += cr;
@@ -134,22 +134,22 @@ void TimeKard::printTaskHistory(const Task *task,
   long sectionsum = 0;
   for ( TQDate day = from; day <= to; day = day.addDays(1) )
   {
-    TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
-    TQString daytaskkey = TQString::fromLatin1("%1_%2")
+    TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
+    TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
                          .arg(daykey)
                          .arg(task->uid());
 
-    if (taskdaytotals.contains(daytaskkey))
+    if (taskdaytotals.tqcontains(daytaskkey))
     {
       if ( !totalsOnly )
       {
-        s += TQString::fromLatin1("%1")
+        s += TQString::tqfromLatin1("%1")
              .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth);
       }
       sectionsum += taskdaytotals[daytaskkey];  // in seconds
 
-      if (daytotals.contains(daykey))
-        daytotals.replace(daykey, daytotals[daykey] + taskdaytotals[daytaskkey]);
+      if (daytotals.tqcontains(daykey))
+        daytotals.tqreplace(daykey, daytotals[daykey] + taskdaytotals[daytaskkey]);
       else
         daytotals.insert(daykey, taskdaytotals[daytaskkey]);
     }
@@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task,
   }
 
   // Total for task this section (e.g. week)
-  s += TQString::fromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth);
+  s += TQString::tqfromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth);
 
   // Task name
   TQString buf;
   s += buf.fill(' ', level + 1);
-  s += TQString::fromLatin1("%1").arg(task->name());
+  s += TQString::tqfromLatin1("%1").arg(task->name());
   s += cr;
 
   for (Task* subTask = task->firstChild();
@@ -221,13 +221,13 @@ TQString TimeKard::sectionHistoryAsText(
   // so times are accumulated for each task.
   for (TQValueList::iterator event = events.begin(); event != events.end(); ++event)
   {
-    TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd"));
-    TQString daytaskkey = TQString::fromLatin1("%1_%2")
+    TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
+    TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
                          .arg(daykey)
                          .arg((*event).todoUid());
 
-    if (taskdaytotals.contains(daytaskkey))
-      taskdaytotals.replace(daytaskkey,
+    if (taskdaytotals.tqcontains(daytaskkey))
+      taskdaytotals.tqreplace(daytaskkey,
                             taskdaytotals[daytaskkey] + (*event).duration());
     else
       taskdaytotals.insert(daytaskkey, (*event).duration());
@@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText(
     // day headings
     for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
     {
-      retval += TQString::fromLatin1("%1").arg(day.day(), timeWidth);
+      retval += TQString::tqfromLatin1("%1").arg(day.day(), timeWidth);
     }
     retval += cr;
     retval += line;
@@ -280,13 +280,13 @@ TQString TimeKard::sectionHistoryAsText(
     long sum = 0;
     for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
     {
-      TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
+      TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
 
-      if (daytotals.contains(daykey))
+      if (daytotals.tqcontains(daykey))
       {
         if ( !totalsOnly )
         {
-          retval += TQString::fromLatin1("%1")
+          retval += TQString::tqfromLatin1("%1")
                     .arg(formatTime(daytotals[daykey]/60), timeWidth);
         }
         sum += daytotals[daykey];  // in seconds
@@ -298,7 +298,7 @@ TQString TimeKard::sectionHistoryAsText(
       }
     }
 
-    retval += TQString::fromLatin1("%1 %2")
+    retval += TQString::tqfromLatin1("%1 %2")
               .arg(formatTime(sum/60), totalTimeWidth)
               .arg(i18n("Total"));
   }
@@ -317,7 +317,7 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from,
     .arg(KGlobal::locale()->formatDate(to));
   retval += cr;
   retval += i18n("Printed on: %1")
-    .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
+    .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
 
   if ( perWeek )
   {
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index bdd166c5e..79d7e18d3 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -46,7 +46,7 @@
 #define TQPtrList QList
 #define TQMemArray QArray
 #endif
-#include "qlayoutengine_p.h"
+#include "tqlayoutengine_p.h"
 #include "tqobjectlist.h"
 #include "tqstyle.h"
 #include "tqapplication.h" //sendPostedEvents
@@ -73,7 +73,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
     setMouseTracking( true );
 }
 
-TQSize KDGanttSplitterHandle::sizeHint() const
+TQSize KDGanttSplitterHandle::tqsizeHint() const
 {
     return TQSize(8,8);
 }
@@ -99,7 +99,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
     if ( _activeButton != 0)
         return;
 
-    QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
+    QCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
 		 - mouseOffset;
     if ( opaque() ) {
 	s->moveSplitter( pos, id() );
@@ -117,7 +117,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         if ( _activeButton != 0)
-            repaint();
+            tqrepaint();
         updateCursor( e->pos() );
     }
 }
@@ -168,13 +168,13 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
     }
     else {
         if ( !opaque() && e->button() == LeftButton ) {
-            QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
+            QCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
         }
     }
-    repaint();
+    tqrepaint();
 }
 
 int KDGanttSplitterHandle::onButton( const TQPoint& p )
@@ -187,7 +187,7 @@ int KDGanttSplitterHandle::onButton( const TQPoint& p )
         rect.setRight( rect.right() + 4);
         rect.setTop( rect.top()- 4 );
         rect.setBottom( rect.bottom() + 4);
-        if ( rect.contains( p ) ) {
+        if ( rect.tqcontains( p ) ) {
             return index;
         }
         index++;
@@ -247,16 +247,16 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     TQPainter p( &buffer );
 
     // Draw the splitter rectangle
-    p.setBrush( colorGroup().background() );
-    p.setPen( colorGroup().foreground() );
+    p.setBrush( tqcolorGroup().background() );
+    p.setPen( tqcolorGroup().foreground() );
     p.drawRect( rect() );
-    parentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
-                                           parentWidget()->colorGroup());
+    tqparentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
+                                           tqparentWidget()->tqcolorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
 
     // arrow color
-    TQColor col = colorGroup().background().dark( 200 );
+    TQColor col = tqcolorGroup().background().dark( 200 );
     p.setBrush( col );
     p.setPen( col  );
 
@@ -265,8 +265,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     for ( TQValueList::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) {
             p.save();
-            p.translate( parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                         parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+            p.translate( tqparentWidget()->style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                         tqparentWidget()->style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
             p.drawPolygon( *it, true );
             p.restore();
         }
@@ -374,10 +374,10 @@ static TQSize minSize( const TQWidget* /*w*/ )
 // This is the original version of minSize
 static TQSize minSizeHint( const TQWidget* w )
 {
-    TQSize min = w->minimumSize();
+    TQSize min = w->tqminimumSize();
     TQSize s;
     if ( min.height() <= 0 || min.width() <= 0 )
-	s = w->minimumSizeHint();
+	s = w->tqminimumSizeHint();
     if ( min.height() > 0 )
 	s.setHeight( min.height() );
     if ( min.width() > 0 )
@@ -430,9 +430,9 @@ void KDGanttMinimizeSplitter::init()
 {
     data = new QSplitterData;
     if ( orient == Horizontal )
-	setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
+	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
     else
-	setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
+	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
 }
 #endif
 
@@ -452,9 +452,9 @@ void KDGanttMinimizeSplitter::setOrientation( Orientation o )
     orient = o;
 
     if ( orient == Horizontal )
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
     else
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
@@ -499,7 +499,7 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fir
 	s->wid = newHandle;
 	newHandle->setId(data->list.count());
 	s->isSplitter = TRUE;
-	s->sizer = pick( newHandle->sizeHint() );
+	s->sizer = pick( newHandle->tqsizeHint() );
 	if ( first )
 	    data->list.insert( 0, s );
 	else
@@ -508,8 +508,8 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fir
     s = new QSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
-    if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
-	s->sizer = pick( w->sizeHint() );
+    if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() )
+	s->sizer = pick( w->tqsizeHint() );
     else
 	s->sizer = pick( w->size() );
     s->isSplitter = FALSE;
@@ -582,7 +582,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     paint.setRasterOp( XorROP );
     TQRect r = contentsRect();
     const int rBord = 3; //Themable????
-    int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
     if ( orient == Horizontal ) {
 	if ( opaqueOldPos >= 0 )
 	    paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
@@ -622,7 +622,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
 void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
 			      QCOORD x, QCOORD y, QCOORD w, QCOORD h )
 {
-    style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
+    style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(),
 			  (orientation() == Qt::Horizontal ?
 			   TQStyle::Style_Horizontal : 0));
 }
@@ -653,7 +653,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const
   close as possible to position \a p, which is the distance from the
   left (or top) edge of the widget.
 
-  For Arabic and Hebrew the layout is reversed, and using this
+  For Arabic and Hebrew the tqlayout is reversed, and using this
   function to set the position of the splitter might lead to
   unexpected results, since in Arabic and Hebrew the position of
   splitter one is to the left of the position of splitter zero.
@@ -726,13 +726,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     } else {
 	int dd, newLeft, nextPos;
 	if( TQApplication::reverseLayout() && orient == Horizontal ) {
-	    dd = w->geometry().right() - pos;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = w->tqgeometry().right() - pos;
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos+1;
 	    nextPos = newLeft + dd;
 	} else {
 	    dd = pos - pick( w->pos() ) + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	}
@@ -781,13 +781,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 	int right, dd,/* newRight,*/ newLeft, nextPos;
 	if ( TQApplication::reverseLayout() && orient == Horizontal ) {
 	    dd = pos - left + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	} else {
-	    right = pick( w->geometry().bottomRight() );
+	    right = pick( w->tqgeometry().bottomRight() );
 	    dd = right - pos + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    /*newRight = pos+dd-1;*/
 	    newLeft = pos;
 	    nextPos = newLeft + dd;
@@ -841,7 +841,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	    maxB += s->sizer;
 	} else {
 	    minB += pick( minSize(s->wid) );
-	    maxB += pick( s->wid->maximumSize() );
+	    maxB += pick( s->wid->tqmaximumSize() );
 	}
     }
     for ( i = id; i < n; i++ ) {
@@ -853,12 +853,12 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	    maxA += s->sizer;
 	} else {
 	    minA += pick( minSize(s->wid) );
-	    maxA += pick( s->wid->maximumSize() );
+	    maxA += pick( s->wid->tqmaximumSize() );
 	}
     }
     TQRect r = contentsRect();
     if ( orient == Horizontal && TQApplication::reverseLayout() ) {
-	int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
+	int splitterWidth = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
 	if ( min )
 	    *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
 	if ( max )
@@ -900,27 +900,27 @@ void KDGanttMinimizeSplitter::doResize()
 	QSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    a[i].stretch = 0;
-	    a[i].sizeHint = a[i].minimumSize = 0;
-	    a[i].maximumSize = 0;
+	    a[i].tqsizeHint = a[i].tqminimumSize = 0;
+	    a[i].tqmaximumSize = 0;
 	} else if ( s->isSplitter ) {
 	    a[i].stretch = 0;
-	    a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer;
+	    a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
 	    a[i].empty = FALSE;
 	} else if ( s->mode == KeepSize ) {
 	    a[i].stretch = 0;
-	    a[i].minimumSize = pick( minSize(s->wid) );
-	    a[i].sizeHint = s->sizer;
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
+	    a[i].tqminimumSize = pick( minSize(s->wid) );
+	    a[i].tqsizeHint = s->sizer;
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
 	    a[i].empty = FALSE;
 	} else if ( s->mode == FollowSizeHint ) {
 	    a[i].stretch = 0;
-	    a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() );
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
+	    a[i].tqminimumSize = a[i].tqsizeHint = pick( s->wid->tqsizeHint() );
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
 	    a[i].empty = FALSE;
 	} else { //proportional
 	    a[i].stretch = s->sizer;
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
-	    a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) );
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
+	    a[i].tqsizeHint = a[i].tqminimumSize = pick( minSize(s->wid) );
 	    a[i].empty = FALSE;
 	}
     }
@@ -974,16 +974,16 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 	    } else {
 		TQSize minS = minSize(s->wid);
 		minl += pick( minS );
-		maxl += pick( s->wid->maximumSize() );
+		maxl += pick( s->wid->tqmaximumSize() );
 		mint = QMAX( mint, trans( minS ));
-		int tm = trans( s->wid->maximumSize() );
+		int tm = trans( s->wid->tqmaximumSize() );
 		if ( tm > 0 )
 		    maxt = QMIN( maxt, tm );
 	    }
 	}
     }
     if ( empty ) {
-        if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) {
+        if ( tqparentWidget() != 0 && tqparentWidget()->inherits("KDGanttMinimizeSplitter") ) {
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
@@ -1126,7 +1126,7 @@ void KDGanttMinimizeSplitter::recalcId()
 
 /*! Reimplemented from superclass.
 */
-TQSize KDGanttMinimizeSplitter::sizeHint() const
+TQSize KDGanttMinimizeSplitter::tqsizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1140,7 +1140,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
 	    ++it;
 	    if ( o->isWidgetType() &&
 		 !((TQWidget*)o)->isHidden() ) {
-		TQSize s = ((TQWidget*)o)->sizeHint();
+		TQSize s = ((TQWidget*)o)->tqsizeHint();
 		if ( s.isValid() ) {
 		    l += pick( s );
 		    t = QMAX( t, trans( s ) );
@@ -1156,7 +1156,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
 \reimp
 */
 
-TQSize KDGanttMinimizeSplitter::minimumSizeHint() const
+TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1250,7 +1250,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const
   splitter.
 
   Giving the values to another splitter's setSizes() function will
-  produce a splitter with the same layout as this one.
+  produce a splitter with the same tqlayout as this one.
 
   Note that if you want to iterate over the list, you should
   iterate over a copy, e.g.
@@ -1291,7 +1291,7 @@ TQValueList KDGanttMinimizeSplitter::sizes() const
   top to bottom.
   Extra values in \a list are ignored.
 
-  If \a list contains too few values, the result is undefined
+  If \a list tqcontains too few values, the result is undefined
   but the program will still be well-behaved.
 
   \sa sizes()
@@ -1330,7 +1330,7 @@ void KDGanttMinimizeSplitter::processChildEvents()
 
 void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
 {
-    int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
@@ -1364,7 +1364,7 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
 }
 
 /*
-  This is a copy of qGeomCalc() in qlayoutengine.cpp which
+  This is a copy of qGeomCalc() in qtqlayoutengine.cpp which
   unfortunately isn't exported.
 */
 static inline int toFixed( int i ) { return i * 256; }
@@ -1387,9 +1387,9 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
     int i;
     for ( i = start; i < start + count; i++ ) {
 	chain[i].done = FALSE;
-	cHint += chain[i].sizeHint;
-	cMin += chain[i].minimumSize;
-	cMax += chain[i].maximumSize;
+	cHint += chain[i].tqsizeHint;
+	cMin += chain[i].tqminimumSize;
+	cMax += chain[i].tqmaximumSize;
 	sumStretch += chain[i].stretch;
 	if ( !chain[i].empty )
 	    spacerCount++;
@@ -1402,11 +1402,11 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
     if ( space < cMin + spacerCount * spacer ) {
 	//	qDebug("not enough space");
 	for ( i = start; i < start+count; i++ ) {
-	    chain[i].size = chain[i].minimumSize;
+	    chain[i].size = chain[i].tqminimumSize;
 	    chain[i].done = TRUE;
 	}
     } else if ( space < cHint + spacerCount*spacer ) {
-	// Less space than sizeHint, but more than minimum.
+	// Less space than tqsizeHint, but more than minimum.
 	// Currently take space equally from each, like in Qt 2.x.
 	// Commented-out lines will give more space to stretchier items.
 	int n = count;
@@ -1414,10 +1414,10 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
 	int overdraft = cHint - space_left;
 	//first give to the fixed ones:
 	for ( i = start; i < start+count; i++ ) {
-	    if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) {
-		chain[i].size = chain[i].sizeHint;
+	    if ( !chain[i].done && chain[i].tqminimumSize >= chain[i].tqsizeHint) {
+		chain[i].size = chain[i].tqsizeHint;
 		chain[i].done = TRUE;
-		space_left -= chain[i].sizeHint;
+		space_left -= chain[i].tqsizeHint;
 		// sumStretch -= chain[i].stretch;
 		n--;
 	    }
@@ -1436,13 +1436,13 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
 		// else
 		//    fp_w += (fp_over * chain[i].stretch) / sumStretch;
 		int w = fRound( fp_w );
-		chain[i].size = chain[i].sizeHint - w;
+		chain[i].size = chain[i].tqsizeHint - w;
 		fp_w -= toFixed( w ); //give the difference to the next
-		if ( chain[i].size < chain[i].minimumSize ) {
+		if ( chain[i].size < chain[i].tqminimumSize ) {
 		    chain[i].done = TRUE;
-		    chain[i].size = chain[i].minimumSize;
+		    chain[i].size = chain[i].tqminimumSize;
 		    finished = FALSE;
-		    overdraft -= chain[i].sizeHint - chain[i].minimumSize;
+		    overdraft -= chain[i].tqsizeHint - chain[i].tqminimumSize;
 		    // sumStretch -= chain[i].stretch;
 		    n--;
 		    break;
@@ -1454,11 +1454,11 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
 	int space_left = space - spacerCount*spacer;
 	// first give to the fixed ones, and handle non-expansiveness
 	for ( i = start; i < start + count; i++ ) {
-	    if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint
+	    if ( !chain[i].done && (chain[i].tqmaximumSize <= chain[i].tqsizeHint
 				    || wannaGrow && !chain[i].expansive) ) {
-		chain[i].size = chain[i].sizeHint;
+		chain[i].size = chain[i].tqsizeHint;
 		chain[i].done = TRUE;
-		space_left -= chain[i].sizeHint;
+		space_left -= chain[i].tqsizeHint;
 		sumStretch -= chain[i].stretch;
 		n--;
 	    }
@@ -1490,20 +1490,20 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
 		int w = fRound( fp_w );
 		chain[i].size = w;
 		fp_w -= toFixed( w ); // give the difference to the next
-		if ( w < chain[i].sizeHint ) {
-		    deficit +=  chain[i].sizeHint - w;
-		} else if ( w > chain[i].maximumSize ) {
-		    surplus += w - chain[i].maximumSize;
+		if ( w < chain[i].tqsizeHint ) {
+		    deficit +=  chain[i].tqsizeHint - w;
+		} else if ( w > chain[i].tqmaximumSize ) {
+		    surplus += w - chain[i].tqmaximumSize;
 		}
 	    }
 	    if ( deficit > 0 && surplus <= deficit ) {
 		// give to the ones that have too little
 		for ( i = start; i < start+count; i++ ) {
 		    if ( !chain[i].done &&
-			 chain[i].size < chain[i].sizeHint ) {
-			chain[i].size = chain[i].sizeHint;
+			 chain[i].size < chain[i].tqsizeHint ) {
+			chain[i].size = chain[i].tqsizeHint;
 			chain[i].done = TRUE;
-			space_left -= chain[i].sizeHint;
+			space_left -= chain[i].tqsizeHint;
 			sumStretch -= chain[i].stretch;
 			n--;
 		    }
@@ -1513,10 +1513,10 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, in
 		// take from the ones that have too much
 		for ( i = start; i < start+count; i++ ) {
 		    if ( !chain[i].done &&
-			 chain[i].size > chain[i].maximumSize ) {
-			chain[i].size = chain[i].maximumSize;
+			 chain[i].size > chain[i].tqmaximumSize ) {
+			chain[i].size = chain[i].tqmaximumSize;
 			chain[i].done = TRUE;
-			space_left -= chain[i].maximumSize;
+			space_left -= chain[i].tqmaximumSize;
 			sumStretch -= chain[i].stretch;
 			n--;
 		    }
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 801fc0112..15429e5a9 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -74,8 +74,8 @@ public:
     void moveToLast( TQWidget * );
 
     void refresh() { recalc( TRUE ); }
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     TQValueList sizes() const;
     void setSizes( TQValueList );
@@ -152,7 +152,7 @@ public:
 
     bool opaque() const { return s->opaqueResize(); }
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     int id() const { return myId; } // data->list.at(id())->wid == this
     void setId( int i ) { myId = i; }
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index e81b77817..47d089506 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -247,9 +247,9 @@ KDGanttSemiSizingControl::ArrowPosition KDGanttSemiSizingControl::arrowPosition(
 void KDGanttSemiSizingControl::init()
 {
     _but = new TQPushButton( this );
-    _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    _but->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) );
-    _layout = 0;
+    _tqlayout = 0;
     TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget");
     TQToolTip::add( _but, "Show / hide legend");
 
@@ -258,19 +258,19 @@ void KDGanttSemiSizingControl::init()
 
 void KDGanttSemiSizingControl::setup()
 {
-    //-------------------------------------------------- Setup layout
-    delete _layout;
-    TQBoxLayout* butLayout; // _layout will delete me
+    //-------------------------------------------------- Setup tqlayout
+    delete _tqlayout;
+    TQBoxLayout* butLayout; // _tqlayout will delete me
 
     if ( _orient == Horizontal || isMinimized() )
-        _layout = new TQHBoxLayout( this );
+        _tqlayout = new TQHBoxLayout( this );
     else
-        _layout = new TQVBoxLayout( this );
+        _tqlayout = new TQVBoxLayout( this );
 
     if ( _orient == Vertical && !isMinimized() )
-        butLayout = new TQHBoxLayout( _layout );
+        butLayout = new TQHBoxLayout( _tqlayout );
     else
-        butLayout = new TQVBoxLayout( _layout );
+        butLayout = new TQVBoxLayout( _tqlayout );
 
 
 
@@ -306,9 +306,9 @@ void KDGanttSemiSizingControl::setup()
        widget = _maximizedWidget;
        if( widget ) {
        if ( _arrowPos == Before  || _orient == Vertical && !isMinimized() )
-       _layout->addWidget( widget, 1 );
+       _tqlayout->addWidget( widget, 1 );
        else
-       _layout->insertWidget( 0, widget, 1 );
+       _tqlayout->insertWidget( 0, widget, 1 );
 	}
      ************************************************** */
     // hack for the usage in KDGantt as pop-up legend widget
@@ -319,16 +319,16 @@ void KDGanttSemiSizingControl::setup()
        widget = _minimizedWidget;
        if( widget ) {
 	 if ( _arrowPos == Before  || _orient == Vertical && !isMinimized() )
-	   _layout->addWidget( widget, 1 );
+	   _tqlayout->addWidget( widget, 1 );
 	 else
-	   _layout->insertWidget( 0, widget, 1 );
+	   _tqlayout->insertWidget( 0, widget, 1 );
        }
     }
     else {
       if ( _arrowPos == Before  || _orient == Vertical && !isMinimized() )
-	_layout->addStretch( 1 );
+	_tqlayout->addStretch( 1 );
       else
-	_layout->insertStretch( 0, 1 );
+	_tqlayout->insertStretch( 0, 1 );
       widget = _maximizedWidget;
       // the following is only the special case
       // arrowPos == Before  and  _orient == Vertical
@@ -395,7 +395,7 @@ TQPixmap KDGanttSemiSizingControl::pixmap( Direction direction ) {
 
     TQPainter p( &pix );
     p.setPen( black );
-    p.setBrush( colorGroup().button() );
+    p.setBrush( tqcolorGroup().button() );
     p.drawPolygon( arr );
     TQBitmap bit( s, s );
     bit.fill( color0 );
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index ad7569951..6b43f7c2e 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -82,7 +82,7 @@ private:
     ArrowPosition _arrowPos;
     TQWidget* _minimizedWidget;
     TQWidget* _maximizedWidget;
-    TQBoxLayout* _layout;
+    TQBoxLayout* _tqlayout;
     TQPushButton* _but;
 };
 
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 9403c10ff..6e2e4b4b6 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -69,7 +69,7 @@
   In order to set up a Gantt view, create an object of this class, and
   populate it with a number of \a KDGanttViewItem objects.
 
-  If you experience problems with the repainting of the content of the
+  If you experience problems with the tqrepainting of the content of the
   Gantt View after scrolling, call \a setRepaintMode().
 */
 
@@ -186,7 +186,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name  )
     fDropEnabled = false;
     closingBlocked = false;
    myTimeHeader->computeTicks();
-   centerTimelineAfterShow( TQDateTime::currentDateTime () );
+   centerTimelineAfterShow( TQDateTime::tqcurrentDateTime () );
    setDisplayEmptyTasksAsLine( false );
    TQValueList list;
    list.append(240);
@@ -296,7 +296,7 @@ void KDGanttView::show()
 }
 /*!
   Closes the widget.
-  The closing is rejected, if a repainting is currently being done.
+  The closing is rejected, if a tqrepainting is currently being done.
   \param alsoDelete if true, the widget is deleted
   \return true, if the widget was closed
 */
@@ -313,12 +313,12 @@ bool KDGanttView::close ( bool alsoDelete )
 /*!
   Returns a useful size for the view.
   Returned width:
-  sizeHint().width() of the list view + width of TimeTable
+  tqsizeHint().width() of the list view + width of TimeTable
   Returned height:
   height() of TimeHeader + height() of TimeTable + height() of Legend (if shown)
 */
 
-TQSize KDGanttView::sizeHint() const
+TQSize KDGanttView::tqsizeHint() const
 {
   bool block = myTimeTable->blockUpdating();
   myTimeTable->setBlockUpdating( false );
@@ -328,7 +328,7 @@ TQSize KDGanttView::sizeHint() const
    * there is a legitimate gui updating issue here somewhere, it will need
    * to be solved differently.
    */
-  //qApp->processEvents();
+  //tqApp->processEvents();
   int hintHeight = myTimeHeader->height();
   int legendHeight = 0;
   if ( showLegendButton() )
@@ -342,9 +342,9 @@ TQSize KDGanttView::sizeHint() const
   if ( myLegend->isShown() )
     hintHeight += myLegend->legendSizeHint().height() +10;
   hintHeight += myTimeTable->minimumHeight+myListView->frameWidth()*2+2;
-  int hintWid = myListView->sizeHint().width();
+  int hintWid = myListView->tqsizeHint().width();
   //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width();
-  hintWid += myCanvasView->sizeHint().width();
+  hintWid += myCanvasView->tqsizeHint().width();
   // add 10 for the splitter-bars
   // qDebug("sizehint %d %d ",hintWid+10, hintHeight );
   myTimeTable->setBlockUpdating( block );
@@ -525,14 +525,14 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item,
 
 
 /*!
-  Specifies whether the content should be repainted after scrolling or
+  Specifies whether the content should be tqrepainted after scrolling or
   not.
 
-  \param mode If No, there is no repainting after scrolling. This is
+  \param mode If No, there is no tqrepainting after scrolling. This is
                  the fastest mode.
-              If Medium, there is extra repainting after releasing the
+              If Medium, there is extra tqrepainting after releasing the
                  scrollbar. This provides fast scrolling with updated content
-                 after scrolling. Recommended, when repaint problems occur.
+                 after scrolling. Recommended, when tqrepaint problems occur.
                  This is the default value after startup.
               If Always, there is an extra update after every move of the
                  scrollbar. This entails slow scrolling with updated
@@ -615,7 +615,7 @@ void KDGanttView::slotHeaderSizeChanged()
     // legend is cleared - reinit legend with list
     legendItem* li;
     for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) {
-      myLegend->addLegendItem(li->shape, li->color, li->text );
+      myLegend->addLegendItem(li->tqshape, li->color, li->text );
     }
   }
 }
@@ -691,9 +691,9 @@ void KDGanttView::setShowListView( bool show )
     if(listViewIsVisible == show) return;
     listViewIsVisible = show;
     if (listViewIsVisible)
-        myListView->parentWidget()->show();
+        myListView->tqparentWidget()->show();
     else
-        myListView->parentWidget()->hide();
+        myListView->tqparentWidget()->hide();
 }
 
 
@@ -868,7 +868,7 @@ void KDGanttView::print( TQPrinter* printer ,
   TQSize size = drawContents( 0, printListView, printTimeLine, printLegend );
 
   // at the top, we want to print current time/date
-  TQString date = "Printing Time: " + TQDateTime::currentDateTime().toString();
+  TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString();
   int hei = p.boundingRect(0,0, 5, 5, Qt::AlignLeft, date ).height();
   p.drawText( 0, 0, date );
 
@@ -979,7 +979,7 @@ TQSize KDGanttView::drawContents( TQPainter* p,
     }
     if ( drawTimeLine ) {
       p->translate( myCanvasView->frameWidth(), 0);
-      myTimeHeader->repaintMe( 0, myTimeHeader->width(), p );
+      myTimeHeader->tqrepaintMe( 0, myTimeHeader->width(), p );
       p->translate( -myCanvasView->frameWidth(), thY);
       myCanvasView->drawToPainter( p );
       if ( drawListView )
@@ -1209,7 +1209,7 @@ bool KDGanttView::showTaskLinks() const
 void KDGanttView::setFont(const TQFont& font)
 {
     myListView->setFont(font);
-    myListView->repaint();
+    myListView->tqrepaint();
     myTimeHeader->setFont(font);
     myLegend->setFont( font );
     TQWidget::setFont( font );
@@ -1299,21 +1299,21 @@ bool KDGanttView::showTimeTablePopupMenu() const
 
 
 /*!
-  Sets the shapes for a certain type of Gantt item. Not all items use
-  all three shapes (e.g., only summary items use the middle shape).
+  Sets the tqshapes for a certain type of Gantt item. Not all items use
+  all three tqshapes (e.g., only summary items use the middle tqshape).
 
-  This setting overrides any shape settings made on individual items.
+  This setting overrides any tqshape settings made on individual items.
   These settings will be taken as initial values of any newly created
   item of this certain type.
   See also the documentation of the KDGanttViewItem class.
 
-  \param type the type of Gantt items for which to set the shapes
-  \param start the shape to use for the beginning of the item
-  \param middle the shape to use for the middle of the item
-  \param end the shape to use for the end of the item
-  \param overwriteExisting if true, overwrites existing shape settings
+  \param type the type of Gantt items for which to set the tqshapes
+  \param start the tqshape to use for the beginning of the item
+  \param middle the tqshape to use for the middle of the item
+  \param end the tqshape to use for the end of the item
+  \param overwriteExisting if true, overwrites existing tqshape settings
   in the individual items
-  \sa shapes()
+  \sa tqshapes()
 */
 void KDGanttView::setShapes( KDGanttViewItem::Type type,
                              KDGanttViewItem::Shape start,
@@ -1337,18 +1337,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type,
 
 
 /*!
-  Queries the shapes for a particular type of Gantt item.
+  Queries the tqshapes for a particular type of Gantt item.
 
-  \param type the type of Gantt items for which to query the shapes
-  \param start the start shape is returned in this parameter
-  \param middle the middle shape is returned in this parameter
-  \param end the end shape is returned in this parameter
-  \return true if there was a general shape set for the specified
-  type. If the return value is false, the values of the three shape
+  \param type the type of Gantt items for which to query the tqshapes
+  \param start the start tqshape is returned in this parameter
+  \param middle the middle tqshape is returned in this parameter
+  \param end the end tqshape is returned in this parameter
+  \return true if there was a general tqshape set for the specified
+  type. If the return value is false, the values of the three tqshape
   parameters are undefined.
   \sa setShapes()
 */
-bool KDGanttView::shapes( KDGanttViewItem::Type type,
+bool KDGanttView::tqshapes( KDGanttViewItem::Type type,
                           KDGanttViewItem::Shape& start,
                           KDGanttViewItem::Shape& middle,
                           KDGanttViewItem::Shape& end ) const
@@ -1562,19 +1562,19 @@ void KDGanttView::clearLegend( )
 /*!
   Adds an item to the legend.
 
-  \param shape the shape to display
-  \param shapeColor the color in which to display the shape
+  \param tqshape the tqshape to display
+  \param tqshapeColor the color in which to display the tqshape
   \param text the text to display
   \sa clearLegend()
 */
-void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape,
-                                 const TQColor& shapeColor,
+void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape,
+                                 const TQColor& tqshapeColor,
                                  const TQString& text )
 {
-    myLegend->addLegendItem( shape,shapeColor,text );
+    myLegend->addLegendItem( tqshape,tqshapeColor,text );
     legendItem* item = new legendItem;
-    item->shape = shape;
-    item->color = shapeColor;
+    item->tqshape = tqshape;
+    item->color = tqshapeColor;
     item->text = text;
     myLegendItems->append( item );
 }
@@ -2341,7 +2341,7 @@ KDGanttViewItem* KDGanttView::firstChild() const
 /*!
   This method turns calendar mode on and off.  In calendar mode, only
   those items can be opened which have subitems which have
-  subitems. I.e., if an item contains multiple calendars, it can be
+  subitems. I.e., if an item tqcontains multiple calendars, it can be
   opened, but not a calendar item itself.  If you want to use this
   GanttView as a calendar view, you have to call
   setDisplaySubitemsAsGroup( true ); to use the root items as calendar
@@ -3415,58 +3415,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
                            showTimeTablePopupMenu() );
 
     // the Shapes element
-    TQDomElement shapesElement = doc.createElement( "Shapes" );
-    docRoot.appendChild( shapesElement );
-    TQDomElement shapesEventElement = doc.createElement( "Event" );
-    shapesElement.appendChild( shapesEventElement );
+    TQDomElement tqshapesElement = doc.createElement( "Shapes" );
+    docRoot.appendChild( tqshapesElement );
+    TQDomElement tqshapesEventElement = doc.createElement( "Event" );
+    tqshapesElement.appendChild( tqshapesEventElement );
     KDGanttViewItem::Shape start, middle, end;
-    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
-                                 KDGanttViewItem::shapeToString( start ) );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
-                                 KDGanttViewItem::shapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
-                                 KDGanttViewItem::shapeToString( end ) );
+    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
+                                 KDGanttViewItem::tqshapeToString( start ) );
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
+                                 KDGanttViewItem::tqshapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
+                                 KDGanttViewItem::tqshapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
                                  "Undefined" );
     }
-    TQDomElement shapesTaskElement = doc.createElement( "Task" );
-    shapesElement.appendChild( shapesTaskElement );
-    if( shapes( KDGanttViewItem::Task, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
-                                 KDGanttViewItem::shapeToString( start ) );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
-                                 KDGanttViewItem::shapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
-                                 KDGanttViewItem::shapeToString( end ) );
+    TQDomElement tqshapesTaskElement = doc.createElement( "Task" );
+    tqshapesElement.appendChild( tqshapesTaskElement );
+    if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
+                                 KDGanttViewItem::tqshapeToString( start ) );
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
+                                 KDGanttViewItem::tqshapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
+                                 KDGanttViewItem::tqshapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
                                  "Undefined" );
     }
-    TQDomElement shapesSummaryElement = doc.createElement( "Summary" );
-    shapesElement.appendChild( shapesSummaryElement );
-    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
-                                 KDGanttViewItem::shapeToString( start ) );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
-                                 KDGanttViewItem::shapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
-                                 KDGanttViewItem::shapeToString( end ) );
+    TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" );
+    tqshapesElement.appendChild( tqshapesSummaryElement );
+    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
+                                 KDGanttViewItem::tqshapeToString( start ) );
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
+                                 KDGanttViewItem::tqshapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
+                                 KDGanttViewItem::tqshapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
                                  "Undefined" );
     }
 
@@ -3604,7 +3604,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
         TQDomElement legendItemElement = doc.createElement( "LegendItem" );
         legendItemsElement.appendChild( legendItemElement );
         KDGanttXML::createStringNode( doc, legendItemElement, "Shape",
-                                 KDGanttViewItem::shapeToString( current->shape ) );
+                                 KDGanttViewItem::tqshapeToString( current->tqshape ) );
         KDGanttXML::createColorNode( doc, legendItemElement, "Color",
                                 current->color );
         KDGanttXML::createStringNode( doc, legendItemElement, "Text",
@@ -3757,17 +3757,17 @@ void KDGanttView::editItem( KDGanttViewItem*  item)
 
 
 /*!
-  This method returns the pixmap used for a certain shape, in the
+  This method returns the pixmap used for a certain tqshape, in the
   selected color and size.
 
-  \param shape the shape to generate
-  \param shapeColor the foreground color of the shape
-  \param backgroundColor the background color of the shape
-  \param itemSize the size of the shape
-  \return the generated shape pixmap
+  \param tqshape the tqshape to generate
+  \param tqshapeColor the foreground color of the tqshape
+  \param backgroundColor the background color of the tqshape
+  \param itemSize the size of the tqshape
+  \return the generated tqshape pixmap
 */
-TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
-                                const TQColor& shapeColor,
+TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
+                                const TQColor& tqshapeColor,
                                 const TQColor& backgroundColor, int itemSize)
 {
   // 10 is a good value as size
@@ -3777,11 +3777,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
   p.fill( backgroundColor );
   TQPainter paint (&p);
   TQBrush b = TQBrush ( Qt::SolidPattern );
-  b.setColor( shapeColor );
+  b.setColor( tqshapeColor );
   paint.setBrush( b );
   TQPen pen( Qt::black, 1 ) ;
   paint.setPen( pen );
-  switch (shape) {
+  switch (tqshape) {
   case KDGanttViewItem::TriangleDown:{
     TQPointArray arr = TQPointArray(3);
     arr.setPoint(0,-size/2,-hei);
@@ -3864,8 +3864,8 @@ void KDGanttView::initDefaults()
     myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] =  Qt::cyan;//summary
     myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] =  Qt::red;
 
-    // setting the default shape types
-    // currently, we take for each item for all three shapes (start, middle, end) the same default shape
+    // setting the default tqshape types
+    // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape
     for (i = 0;i<3;++i) {
       myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] =  KDGanttViewItem::Diamond; //event
       myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] =  KDGanttViewItem::Square; //task
@@ -4239,7 +4239,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const
   may add as many widgets as you want. They are ordered horizontally
   from left to right.  To remove a widget from the spacer widget, call
   widget->reparent(newParent,...) or delete the widget.  Since the spacer
-  is a TQHBox, the layout of the added widgets is managed by this
+  is a TQHBox, the tqlayout of the added widgets is managed by this
   TQHBox.
 
   \param w A pointer to the widget to be added.
@@ -4800,7 +4800,7 @@ bool KDGanttView::isLinkItemsEnabled() const
   const TQString& text )
 
   This signal is emitted whenever the user changes the name of an item
-  in the list view using in-place editing. \a text contains the new
+  in the list view using in-place editing. \a text tqcontains the new
   text in the list view.
 */
 
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 4e6b338a6..0f135e5a4 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -192,7 +192,7 @@ public:
                     KDGanttViewItem::Shape middle,
                     KDGanttViewItem::Shape end,
 		    bool overwriteExisting = true  );
-    bool shapes( KDGanttViewItem::Type type,
+    bool tqshapes( KDGanttViewItem::Type type,
                  KDGanttViewItem::Shape& start,
                  KDGanttViewItem::Shape& middle,
                  KDGanttViewItem::Shape& end ) const;
@@ -227,7 +227,7 @@ public:
     TQPtrList taskLinkGroups() const;
 
     // Legend-related stuff
-    void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
+    void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
     void clearLegend();
     // Header-related stuff
     void setHorizonStart( const TQDateTime& start );
@@ -261,7 +261,7 @@ public:
 				   Scale mini =  KDGanttView::Minute ,
 				   Scale maxi =  KDGanttView::Month);
 #if 0
-   // This API has been replaced with KDIntervalColorRectangle and addIntervalBackgroundColor
+   // This API has been tqreplaced with KDIntervalColorRectangle and addIntervalBackgroundColor
     void setIntervalBackgroundColor( const TQDateTime& start,
 				     const TQDateTime& end,
 				     const TQColor& color,
@@ -297,7 +297,7 @@ public:
     void setWeekendDays( int start, int end );
     void weekendDays( int& start, int& end ) const;
 
-    static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize);
+    static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize);
 
     void setHeaderVisible( bool );
     bool headerVisible() const;
@@ -329,7 +329,7 @@ public:
     virtual void lvStartDrag (KDGanttViewItem*);
     virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*);
     virtual void lvDragEnterEvent (TQDragEnterEvent * e );
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     KDGanttViewItem* getItemByName( const TQString& name ) const;
     TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const;
     KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const;
@@ -421,7 +421,7 @@ private slots:
     void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse );
 private:
     struct legendItem {
-      KDGanttViewItem::Shape shape;
+      KDGanttViewItem::Shape tqshape;
       TQColor color;
       TQString text;
     };
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 19bfaeb90..eadef6a1b 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -209,7 +209,7 @@ void KDGanttViewEventItem::hideMe()
 void KDGanttViewEventItem::showItem(bool show, int coordY)
 {
   isVisibleInGanttView = show;
-  invalidateHeight () ;
+  tqinvalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 3d36683b2..c250d22f6 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -52,20 +52,20 @@
   directly. Instead, you should create items of one of the
   subclasses. This class provides methods common to all Gantt items.
 
-  The initialization of the shapes/colors of the item works as follows:
+  The initialization of the tqshapes/colors of the item works as follows:
 
   Shapes:
-  When a new item is created, the shapes are set to the default values
+  When a new item is created, the tqshapes are set to the default values
   for items of the type of this item, defined in the KDGanttView class with
   void setShapes( KDGanttViewItem::Type type,
   KDGanttViewItem::Shape start,
   KDGanttViewItem::Shape middle,
   KDGanttViewItem::Shape end );
   If there is no default value defined for this type,
-  the shapes are set as follows:
-  For TaskViewItems all three shapes are set to Square.
-  For SummaryViewItems all three shapes are set to TriangleDown.
-  For EventViewItems all three shapes are set to Diamond.
+  the tqshapes are set as follows:
+  For TaskViewItems all three tqshapes are set to Square.
+  For SummaryViewItems all three tqshapes are set to TriangleDown.
+  For EventViewItems all three tqshapes are set to Diamond.
 
   Colors:
   When a new item is created, the colors are set to the default values
@@ -75,7 +75,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the colors of the shapes are set to the default color for items of this type,
+  the colors of the tqshapes are set to the default color for items of this type,
   defined in the KDGanttView class with:
   void setDefaultColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default color in the KDGanttView class is set to
@@ -92,7 +92,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the highlight colors of the shapes are set to the default color for
+  the highlight colors of the tqshapes are set to the default color for
   items of this type, defined in the KDGanttView class with:
   void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default highlight color in the KDGanttView class is set to red
@@ -138,7 +138,7 @@
 
   Example 1, Color:
   If you create an instance of a KDGanttView class and add a SummaryViewItem
-  without setting any color/shape values, you get an item with three shapes
+  without setting any color/tqshape values, you get an item with three tqshapes
   of the form TriangleDown in the color magenta. If the item is highlighted,
   the color will change to the highlight color red.
 
@@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const
 
 
 /*!
-  Specifies the shapes to be used for this item.
+  Specifies the tqshapes to be used for this item.
 
-  It is advisable not to use this method, but rather set the shapes
+  It is advisable not to use this method, but rather set the tqshapes
   for all items of a type with KDGanttView::setShapes() in order to
   get a uniform Gantt view.
 
-  \param start the start shape
-  \param middle the middle shape
-  \param end the end shape
-  \sa shapes(), setColors(), colors()
+  \param start the start tqshape
+  \param middle the middle tqshape
+  \param end the end tqshape
+  \sa tqshapes(), setColors(), colors()
 */
 void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 {
@@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 
 
 /*!
-  Creates shapes of the specified type \a shape.
-  The background shape color is set to black and the background shape
-  is slightly bit bigger than the foreground shape to have a black border
-  around the foreground shape.
+  Creates tqshapes of the specified type \a tqshape.
+  The background tqshape color is set to black and the background tqshape
+  is slightly bit bigger than the foreground tqshape to have a black border
+  around the foreground tqshape.
 
-  \param itemShape the foreground shape
-  \param middle itemShapeBack  the background shape
-  \param shape the type of the shape
+  \param itemShape the foreground tqshape
+  \param middle itemShapeBack  the background tqshape
+  \param tqshape the type of the tqshape
    (may be TriangleDown, TriangleUp, Diamond, Square, Circle)
-  \sa shapes(), setColors(), colors()
+  \sa tqshapes(), setColors(), colors()
 */
 void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
                                    KDCanvasPolygonItem* &itemShapeBack,
-                                   Shape shape )
+                                   Shape tqshape )
 {
   if ( itemShape && type() ==  Task )
     return;
@@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
     TQCanvasPolygonalItem * itemBack;
     int size = myItemSize+2;
     int hei = (myItemSize/3)/2;
-    switch (shape) {
+    switch (tqshape) {
     case TriangleDown:
         {
             item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem);
@@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
             break;
         }
     default:
-        // Uninitialized shape, can e.g. be the case with free-busy
-        // items which don't have any shapes
+        // Uninitialized tqshape, can e.g. be the case with free-busy
+        // items which don't have any tqshapes
         return;
     }
     item->setBrush(Qt::SolidPattern);
@@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
 
 
 /*!
-  Returns the shapes used for this item
+  Returns the tqshapes used for this item
 
-  \param start returns the start shape
-  \param middle returns the middle shape
-  \param end returns the end shape
+  \param start returns the start tqshape
+  \param middle returns the middle tqshape
+  \param end returns the end tqshape
   \sa setShapes(), setColors(), colors()
 */
-void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
+void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
 {
     start = myStartShape;
     middle = myMiddleShape;
@@ -943,16 +943,16 @@ void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
 
 
 /*!
-  Specifies the colors in which to draw the shapes of this item.
+  Specifies the colors in which to draw the tqshapes of this item.
 
   It is advisable not to use this method, but rather set the colors
   for all items of a type with KDGanttView::setColors() in order to
   get a uniform Gantt view.
 
-  \param start the color for the start shape
-  \param middle the color for the middle shape
-  \param end the color for the end shape
-  \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
+  \param start the color for the start tqshape
+  \param middle the color for the middle tqshape
+  \param end the color for the end tqshape
+  \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
                                  const TQColor& end )
@@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
   \param start returns the start color
   \param middle returns the middle color
   \param end returns the end color
-  \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
+  \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -992,7 +992,7 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
 
 
 /*!
-  Specifies the highlight colors in which to draw the shapes of this item.
+  Specifies the highlight colors in which to draw the tqshapes of this item.
 
   It is advisable not to use this method, but rather set the highlight
   colors for all items of a type with
@@ -1003,10 +1003,10 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
-  \param start the highlight color for the start shape
-  \param middle the highlight color for the middle shape
-  \param end the highlight color for the end shape
-  \sa highlightColors(), setShapes(), shapes()
+  \param start the highlight color for the start tqshape
+  \param middle the highlight color for the middle tqshape
+  \param end the highlight color for the end tqshape
+  \sa highlightColors(), setShapes(), tqshapes()
 */
 void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end )
 {
@@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m
   \param start returns the start highlight color
   \param middle returns the middle highlight color
   \param end returns the end highlight color
-  \sa setHighlightColors(), setShapes(), shapes()
+  \sa setHighlightColors(), setShapes(), tqshapes()
 */
 void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const
 /*!
   \enum KDGanttViewItem::Shape
 
-  This enum is used in order to specify the shapes of a Gantt chart
+  This enum is used in order to specify the tqshapes of a Gantt chart
   item.
 */
 
@@ -1469,10 +1469,10 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     setDefaultColor( myGanttView->defaultColor(myType));
     // set default highlight color
     setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType));
-    // set shapes
-    if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
+    // set tqshapes
+    if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
 
-        //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes");
+        //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes");
     };
 
     setShapes(myStartShape,myMiddleShape,myEndShape);
@@ -1486,12 +1486,12 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     floatStartShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
     floatEndShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
 
-    // set color of shapes
+    // set color of tqshapes
     if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) {
 
     };
     setColors(defaultColor(),defaultColor(), defaultColor());
-    // set highlight color of shapes
+    // set highlight color of tqshapes
     if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) {
 
     };
@@ -1508,9 +1508,9 @@ void KDGanttViewItem::initColorAndShapes(Type t)
 }
 
 
-TQString KDGanttViewItem::shapeToString( Shape shape )
+TQString KDGanttViewItem::tqshapeToString( Shape tqshape )
 {
-    switch( shape ) {
+    switch( tqshape ) {
     case TriangleDown:
         return "TriangleDown";
     case TriangleUp:
@@ -1571,13 +1571,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc,
     KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() );
     KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() );
     Shape startShape, middleShape, endShape;
-    shapes( startShape, middleShape, endShape );
+    tqshapes( startShape, middleShape, endShape );
     KDGanttXML::createStringNode( doc, itemElement, "StartShape",
-                             shapeToString( startShape ) );
+                             tqshapeToString( startShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "MiddleShape",
-                             shapeToString( middleShape ) );
+                             tqshapeToString( middleShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "EndShape",
-                             shapeToString( endShape ) );
+                             tqshapeToString( endShape ) );
     KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() );
     TQColor startColor, middleColor, endColor;
     colors( startColor, middleColor, endColor );
@@ -2294,7 +2294,7 @@ void  KDGanttViewItem::resetSubitemVisibility()
   In calendar mode, only those items can be opened
   which have subitems which have subitems.
   An item which has subitems which have no subitems is called a calendar.
-  I.e., an item that contains
+  I.e., an item that tqcontains
   multiple calendars can be opened, while a calendar item itself cannot.
   But if all calendars of an item do not have any subitem (e.g at startup),
   the program cannot detect automatically that it should be possible to open
@@ -2365,37 +2365,37 @@ bool KDGanttViewItem::isCalendar( ) const
 /*!
   \var KDGanttViewItem::startShape
 
-  the shape at the beginning of the item
+  the tqshape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShape
 
-  the shape in the middle of the item
+  the tqshape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShape
 
-  the shape at the end of the item
+  the tqshape at the end of the item
 */
 
 /*!
   \var KDGanttViewItem::startShapeBack
 
-  the background shape at the beginning of the item
+  the background tqshape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShapeBack
 
-  the background shape in the middle of the item
+  the background tqshape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShapeBack
 
-  the background shape at the end of the item
+  the background tqshape at the end of the item
 */
 
 
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index cebced302..80cc258d4 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -146,7 +146,7 @@ public:
   //bool isCalendar( ) const;
 
     void setShapes( Shape start, Shape middle, Shape end );
-    void shapes( Shape& start, Shape& middle, Shape& end ) const;
+    void tqshapes( Shape& start, Shape& middle, Shape& end ) const;
     void setDefaultColor( const TQColor& );
     TQColor defaultColor() const;
     void setColors( const TQColor& start, const TQColor& middle,
@@ -202,7 +202,7 @@ private:
     friend class KDGanttViewItemDrag;
     friend class itemAttributeDialog;
 
-    static TQString shapeToString( Shape shape );
+    static TQString tqshapeToString( Shape tqshape );
     static Shape stringToShape( const TQString& string );
     static TQString typeToString( Type type );
 
@@ -242,7 +242,7 @@ private:
     bool isMyTextCanvas(TQCanvasItem *tc);
     TQPoint myTextOffset;
     TQString _name;
-    bool shapeDefined;
+    bool tqshapeDefined;
     int _priority;
     static TQDict sItemDict;
 
diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp
index 23bf90ac9..5ced61b38 100644
--- a/kdgantt/KDGanttViewItemDrag.cpp
+++ b/kdgantt/KDGanttViewItemDrag.cpp
@@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
         pix = *(item->pixmap()) ;
     else {
         KDGanttViewItem::Shape start,  middle, end;
-        item->shapes( start, middle, end );
+        item->tqshapes( start, middle, end );
         TQColor st, mi, en;
         item->colors( st, mi, en );
         pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 );
@@ -86,7 +86,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
   \param c the format of the data
   \return the encoded data of the drag object
 */
-TQByteArray KDGanttViewItemDrag::encodedData( const char * c) const
+TQByteArray KDGanttViewItemDrag::tqencodedData( const char * c) const
 {
     TQString s ( c );
     if ( s == "x-application/x-KDGanttViewItemDrag" ) {
@@ -132,7 +132,7 @@ bool KDGanttViewItemDrag::canDecode (  const TQMimeSource * e )
 bool KDGanttViewItemDrag::decode (  const TQMimeSource * e , TQString &  string)
 {
     TQByteArray arr;
-    arr = e->encodedData( "x-application/x-KDGanttViewItemDrag");
+    arr = e->tqencodedData( "x-application/x-KDGanttViewItemDrag");
     TQDataStream s( arr, IO_ReadOnly );
     s >> string;
     return true;
diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h
index 2512711ea..d29ec2143 100644
--- a/kdgantt/KDGanttViewItemDrag.h
+++ b/kdgantt/KDGanttViewItemDrag.h
@@ -44,7 +44,7 @@ class KDGanttViewItemDrag :public QStoredDrag
 public:
   KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source,  const char * name  ) ;
 
-  TQByteArray encodedData( const char * c) const;
+  TQByteArray tqencodedData( const char * c) const;
   KDGanttViewItem* getItem();
   static bool canDecode ( const TQMimeSource * e );
   static bool decode ( const TQMimeSource * e, TQString & );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index ffec65282..daabcb593 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -140,14 +140,14 @@ void KDTimeTableWidget::removeItemFromTasklinks( KDGanttViewItem* item)
 
 void KDTimeTableWidget::expandItem( TQListViewItem * item)
 {
-    item->invalidateHeight () ;
-    //qApp->processEvents();
+    item->tqinvalidateHeight () ;
+    //tqApp->processEvents();
     updateMyContent();
 }
 void KDTimeTableWidget::collapseItem( TQListViewItem * item)
 {
-    item->invalidateHeight () ;
-    //qApp->processEvents();
+    item->tqinvalidateHeight () ;
+    //tqApp->processEvents();
     updateMyContent();
 }
 
@@ -160,7 +160,7 @@ void KDTimeTableWidget::highlightItem( TQListViewItem * item )
     highlightedItem = ( KDGanttViewItem*)item;
     itemwashighlighted = highlightedItem->highlight();
     highlightedItem->setHighlight(true);
-    item->invalidateHeight () ;
+    item->tqinvalidateHeight () ;
     myGanttView->myListView->contentsY();
     updateMyContent();
 }
@@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
     mySizeHint = 0;
     myGanttView = gant;
     flagDoNotRecomputeAfterChange = true;
-    TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600);
+    TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600);
     setHorizonStart(start);
     setHorizonEnd( start.addSecs(3600*2));
     flagStartTimeSet = false;
     flagEndTimeSet = false;
-    myCenterDateTime = TQDateTime::currentDateTime ();
+    myCenterDateTime = TQDateTime::tqcurrentDateTime ();
     setScale(KDGanttView::Auto);
     //setScale(KDGanttView::Hour);
     myMaxScale = KDGanttView::Month;
@@ -830,14 +830,14 @@ void KDTimeHeaderWidget::addTickRight( int num )
 {
     int secs = ((num*getTickTime())-30);
     setHorizonEnd(getDateTimeForIndex(width()).addSecs(secs));
-    //qApp->processEvents();
+    //tqApp->processEvents();
 }
 
 void KDTimeHeaderWidget::addTickLeft( int num )
 {
     int secs = ((num*getTickTime())-30);
     setHorizonStart(getDateTimeForIndex(0).addSecs(-secs));
-    //qApp->processEvents();
+    //tqApp->processEvents();
 }
 // the time in secs of one minor grid tick
 int KDTimeHeaderWidget::getTickTime()
@@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end)
     }
     flagDoNotRepaintAfterChange = false;
     updateTimeTable();
-    repaint();
+    tqrepaint();
     moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2));
     // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
     if (myGanttView && myGanttView->myCanvasView)
@@ -1436,7 +1436,7 @@ void KDTimeHeaderWidget::setShowMinorTicks( bool show )
     flagShowMinorTicks = show;
     if (show)
         setShowMajorTicks(false );
-    //repaintMe();
+    //tqrepaintMe();
     updateTimeTable();
 }
 
@@ -1487,7 +1487,7 @@ void KDTimeHeaderWidget::computeIntervals( int height )
 {
     IntervalColorList::const_iterator it;
     for ( it = icList.begin(); it != icList.end(); ++it ) {
-      (*it)->layout( this, height );
+      (*it)->tqlayout( this, height );
     }
 }
 
@@ -1861,7 +1861,7 @@ int KDTimeHeaderWidget::autoScaleMinorTickCount()
 }
 
 
-void KDTimeHeaderWidget::repaintMe(int left,int paintwid, TQPainter* painter)
+void KDTimeHeaderWidget::tqrepaintMe(int left,int paintwid, TQPainter* painter)
 {
     if (flagDoNotRecomputeAfterChange) return;
     TQColorGroup qcg =TQColorGroup( white, black,white, darkGray,black,gray,gray) ;
@@ -2086,7 +2086,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     TQPainter p(this);
     int Width, Height;
     TQString testTextMinor,testTextMajor, tempStr;
-    TQRect itemRectMinor, itemRectMajor;
+    TQRect tqitemRectMinor, tqitemRectMajor;
     TQDate tempDate = myRealStart.date();
     myRealEnd = myRealStart;
     // preparing the testtext for the differennt scales
@@ -2109,25 +2109,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
                 testTextMinor = "12 AM";
             testTextMajor = "Mon Aug 30, x";
             if ( yearFormat() != KDGanttView::NoDate )
-                testTextMajor += getYear(TQDate::currentDate());
+                testTextMajor += getYear(TQDate::tqcurrentDate());
             minorPerMajor = 2400;
             break;
         case KDGanttView::Day:
             minorItems = minorItems/(60*24);
             testTextMinor = "88";
-            testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate());
+            testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 700;
             break;
         case KDGanttView::Week:
             minorItems = minorItems/(60*24*7);
             testTextMinor = "88";
-            testTextMajor = "Aug x"+getYear(TQDate::currentDate());
+            testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 435; // 435 = 365days/12months/7days * 100
             break;
         case KDGanttView::Month:
             minorItems = (minorItems*12)/(60*24*365);
             testTextMinor = "M";
-            testTextMajor = "x"+getYear(TQDate::currentDate());
+            testTextMajor = "x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 1200;
             break;
         case KDGanttView::Auto:
@@ -2135,12 +2135,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
             qDebug("             RealScale == Auto : This may not be! ");
             break;
         }
-    itemRectMinor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMinor);
-    itemRectMajor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMajor);
+    tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMinor);
+    tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMajor);
     p.end();
     //qDebug("     tempMinorScaleCount %d ", tempMinorScaleCount);
-    Height = itemRectMinor.height()+itemRectMajor.height()+11;
-    Width = (itemRectMinor.width()+5);
+    Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11;
+    Width = (tqitemRectMinor.width()+5);
     if (Width < minimumColumnWidth()) Width = minimumColumnWidth();
     // if the desired width is greater than the maximum width of this widget
     // increase the minorscalecount
@@ -2197,7 +2197,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     // checking, if enough space for majorscale
     // if not, increasing MajorScaleCount
 
-    while ((minorPerMajor*Width)/100 < itemRectMajor.width()) {
+    while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) {
         minorPerMajor = minorPerMajor/tempMajorScaleCount;
         ++tempMajorScaleCount;
         minorPerMajor = minorPerMajor*tempMajorScaleCount;
@@ -2207,13 +2207,13 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGridMinorWidth = Width;
     // the width of this widget is the gridwidth * the amount of items
     Width *= minorItems;
-    // if size changed, reset geometry
+    // if size changed, reset tqgeometry
     if (width() != Width   || height() != Height  )
         {
             resize( Width, Height );
             emit  sizeChanged( Width );
         }
-    myMajorGridHeight = itemRectMajor.height()+5;
+    myMajorGridHeight = tqitemRectMajor.height()+5;
     TQTime tempTime = myRealStart.time();
     TQDateTime tempDateTime;
     int i;
@@ -2343,7 +2343,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGanttView->myTimeTable->setBlockUpdating( block );
     updateTimeTable();
     centerDateTime(myCenterDateTime);
-    repaint();
+    tqrepaint();
 }
 
 
@@ -2371,7 +2371,7 @@ void KDTimeHeaderWidget::centerDateTime( const TQDateTime& center )
 
 void KDTimeHeaderWidget::paintEvent(TQPaintEvent *p)
 {
-    repaintMe(p->rect().x(),p->rect().width());
+    tqrepaintMe(p->rect().x(),p->rect().width());
 }
 
 
@@ -2489,7 +2489,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent *  )
         //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) );
     }
     mouseDown = false;
-    repaint();
+    tqrepaint();
 }
 
 
@@ -2504,11 +2504,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
     if ( mouseDown ) {
         if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) {
             mouseDown = false;
-            repaint();
+            tqrepaint();
             return;
         }
         endMouseDown = e->pos().x();
-        //repaint;
+        //tqrepaint;
         int val = -1;
         if (endMouseDown <  -x() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() -
@@ -2517,19 +2517,19 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
                 val = 0;
             }
         }
-        if (endMouseDown >  -x() +parentWidget()->width() ) {
+        if (endMouseDown >  -x() +tqparentWidget()->width() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() +
                 myGanttView->myCanvasView->horizontalScrollBar()->lineStep();
 
         }
-        repaintMe(-x(),parentWidget()->width());
+        tqrepaintMe(-x(),tqparentWidget()->width());
         if ( val > -1 ) {
             if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) {
                 val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue();
             }
             myGanttView->myCanvasView->horizontalScrollBar()->setValue( val );
         }
-        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y());
+        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),tqparentWidget()->width() , e->pos().y());
     }
 }
 
@@ -2631,7 +2631,7 @@ TQSize KDLegendWidget::legendSize()
 TQSize KDLegendWidget::legendSizeHint()
 {
     TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-    return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height());
+    return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height());
 }
 
 
@@ -2652,7 +2652,7 @@ void KDLegendWidget::clearLegend ( )
     myLegend->setFont( font() );
     scroll->addChild(  myLegend );
     scroll->setResizePolicy( TQScrollView::AutoOneFit );
-    myLegend->layout()->setMargin( 11 );
+    myLegend->tqlayout()->setMargin( 11 );
     myLegend->setFrameStyle( TQFrame::NoFrame );
     if ( dock )
         scroll->setMaximumHeight( 32000 );
@@ -2661,10 +2661,10 @@ void KDLegendWidget::clearLegend ( )
 }
 
 
-void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text )
+void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text )
 {
     TQLabel * temp;
-    TQPixmap p = KDGanttView::getPixmap( shape,  shapeColor, Qt::white, 10);
+    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, Qt::white, 10);
     TQWidget *w = new TQWidget( myLegend );
     w->setBackgroundColor( Qt::white );
     TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6);
@@ -2949,7 +2949,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
                 p->translate( rleft, crtop );
                 //kdDebug()<i->text(0)<i->paintBranches( p, colorGroup(), treeStepSize(),
+                current->i->paintBranches( p, tqcolorGroup(), treeStepSize(),
                                         rtop - crtop, r.height() );
                 p->restore();
             }
@@ -3510,7 +3510,7 @@ KDGanttCanvasView::MovingOperation KDGanttCanvasView::gvItemHitTest( KDGanttView
 void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
 {
     //qDebug("mousepress! %d ", this);
-    //qDebug("focus %d ",qApp->focusWidget());
+    //qDebug("focus %d ",tqApp->tqfocusWidget());
     setFocus();
     currentLink = 0;
     currentItem = 0;
@@ -3819,14 +3819,14 @@ void KDGanttCanvasView::contentsMouseMoveEvent ( TQMouseEvent *e )
 
     const TQPoint p = e->pos();
     if ( movingItem ) {
-      int x = qRound( movingItem->x() );
+      int x = tqRound( movingItem->x() );
       int width = movingItem->width();
       switch( movingOperation ) {
       case Moving:
         x += p.x() - movingStart.x();
         break;
       case ResizingLeft: {
-        width = qRound( movingItem->x() + movingItem->width() - p.x() );
+        width = tqRound( movingItem->x() + movingItem->width() - p.x() );
         x = p.x();
         break;
       }
@@ -4003,7 +4003,7 @@ void KDIntervalColorRectangle::setDateTimes( const TQDateTime& start,
   mStart = start;
   mEnd = end;
   if ( mEnd < mStart )
-    qSwap( mStart, mEnd );
+    tqSwap( mStart, mEnd );
 }
 
 /*!
@@ -4018,7 +4018,7 @@ void KDIntervalColorRectangle::setColor( const TQColor& color )
 /*!
   \internal
 */
-void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int height )
+void KDIntervalColorRectangle::tqlayout( KDTimeHeaderWidget* timeHeader, int height )
 {
   int left = timeHeader->getCoordX(mStart);
   int right = timeHeader->getCoordX(mEnd);
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 1a88411a3..de771800e 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -138,7 +138,7 @@ public:
 				  Scale mini =  KDGanttView::Minute ,
 				  Scale maxi =  KDGanttView::Month);
 #if 0
-   // This API has been replaced with KDIntervalColorRectangle and addIntervalBackgroundColor
+   // This API has been tqreplaced with KDIntervalColorRectangle and addIntervalBackgroundColor
    void setIntervalBackgroundColor( const TQDateTime& start,
 				    const TQDateTime& end,
 				  const TQColor& color,
@@ -174,7 +174,7 @@ public:
       return ccList;
     }
    TQColor weekdayColor[8];
-   void repaintMe(int left, int wid, TQPainter *p = 0);
+   void tqrepaintMe(int left, int wid, TQPainter *p = 0);
 
    void centerDateTime( const TQDateTime& center );
 
@@ -334,7 +334,7 @@ public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
-  void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
+  void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
   void clearLegend();
   void setFont( TQFont );
   void drawToPainter( TQPainter *p );
@@ -467,7 +467,7 @@ public:
   enum HitTest { Start, Middle, End };
   HitTest hitTest( KDTimeHeaderWidget* timeHeader, const TQPoint& pos ) const;
 
-  void layout( KDTimeHeaderWidget* timeHeader, int height );
+  void tqlayout( KDTimeHeaderWidget* timeHeader, int height );
 
   static const int RTTI = 0x0c58;
   /*reimp*/ int rtti() const { return RTTI; }
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index cb7e2893c..95ca682d2 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -267,7 +267,7 @@ void KDGanttViewSummaryItem::hideMe()
 void KDGanttViewSummaryItem::showItem( bool show, int coordY )
 {
   isVisibleInGanttView = show;
-  invalidateHeight () ;
+  tqinvalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index 1bcb96a65..f2ba122c1 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -43,7 +43,7 @@
 
   This class represents calendar items in Gantt charts.
 
-  A calendar item in a Gantt chart has no start/end shape,
+  A calendar item in a Gantt chart has no start/end tqshape,
   it is displayed as a rectangle.
   You can set the colors as usual, where only the first argument of
   setColors( col, col, col )
@@ -201,7 +201,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
 
   //qDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1());
   isVisibleInGanttView = show;
-  invalidateHeight () ;
+  tqinvalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index 8b8d5518e..10fac5d62 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -4,7 +4,7 @@
     
         itemAttributeDialog
     
-    
+    
         
             0
             0
@@ -64,7 +64,7 @@
             
                 Expanding
             
-            
+            
                 
                     0
                     16
@@ -383,7 +383,7 @@
             
                 Expanding
             
-            
+            
                 
                     0
                     16
@@ -462,7 +462,7 @@
                             
                                 Text color:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                         
@@ -733,5 +733,5 @@
     PrioSlider_valueChanged( int val )
     getItem()
 
-
+
 
diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h
index 2ca8b6718..348b3e972 100644
--- a/kdgantt/itemAttributeDialog.ui.h
+++ b/kdgantt/itemAttributeDialog.ui.h
@@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked()
       myItem->setTextColor( c );
     TQPixmap *  pix  = (TQPixmap *)ChangeText->pixmap();
     pix->fill( myItem->textColor() );
-    ChangeText->repaint();
+    ChangeText->tqrepaint();
 }
 
 
@@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = QColorDialog::getColor( st, this );
@@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked()
 {
     if ( !myItem) return;
      KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = QColorDialog::getColor( mi, this );
@@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
      TQColor c = QColorDialog::getColor( en, this );
@@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item )
   //  DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10));
     LineEdit1->setText( item->text() );
     KDGanttViewItem::Shape start,  middle, end;
-    item->shapes( start, middle, end );
+    item->tqshapes( start, middle, end );
     TQColor st, mi, en;
     item->colors( st, mi, en );
     ChangeStart->setPixmap(  KDGanttView::getPixmap( start, st, backgroundColor(), 10 )  );
@@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = QColorDialog::getColor( st, this );
@@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = QColorDialog::getColor( mi, this );
@@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked()
 {
     if ( !myItem) return;
    KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = QColorDialog::getColor( en, this );
@@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & )
 void itemAttributeDialog::StartBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     start = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s )
 void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     middle = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 void itemAttributeDialog::EndBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     end = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h
index fed046aeb..2681ff733 100644
--- a/kdgantt/qlayoutengine_p.h
+++ b/kdgantt/qlayoutengine_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
-// of qlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
+// of qtqlayout.cpp, qtqlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
@@ -56,21 +56,21 @@
 
 
 #ifndef QT_H
-#include "tqabstractlayout.h"
+#include "tqabstractqlayout.h"
 #endif // QT_H
 
 #ifndef QT_NO_LAYOUT
 struct QLayoutStruct
 {
-    void initParameters() { minimumSize = sizeHint = 0;
-    maximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
+    void initParameters() { tqminimumSize = tqsizeHint = 0;
+    tqmaximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
     void init() { stretch = 0; initParameters(); }
     //permanent storage:
     int stretch;
     //parameters:
-    QCOORD sizeHint;
-    QCOORD maximumSize;
-    QCOORD minimumSize;
+    QCOORD tqsizeHint;
+    QCOORD tqmaximumSize;
+    QCOORD tqminimumSize;
     bool expansive;
     bool empty;
     //temporary storage:
diff --git a/kfile-plugins/ics/kfile_ics.cpp b/kfile-plugins/ics/kfile_ics.cpp
index 0d85344e7..b8346f4f4 100644
--- a/kfile-plugins/ics/kfile_ics.cpp
+++ b/kfile-plugins/ics/kfile_ics.cpp
@@ -59,7 +59,7 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
 {
   KFileMetaInfoGroup group = appendGroup( info, "ICSInfo");
 
-  CalendarLocal cal ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) );
   if( !cal.load( info.path() ) ) {
     kdDebug() << "Could not load calendar" << endl;
     return false;
@@ -80,7 +80,7 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     Todo *todo = *it;
     if ( todo->isCompleted() )
       ++completed;
-    else if ( todo->hasDueDate() && todo->dtDue().date() < TQDate::currentDate() )
+    else if ( todo->hasDueDate() && todo->dtDue().date() < TQDate::tqcurrentDate() )
       ++overdue;
   }
 
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp
index 5dcfc2c17..6c083895b 100644
--- a/kfile-plugins/vcf/kfile_vcf.cpp
+++ b/kfile-plugins/vcf/kfile_vcf.cpp
@@ -91,7 +91,7 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     TQStringList phoneNumbers;
     for (unsigned int no=0; nosetMode(KGanttItem::Rubberband);
     _deleteItem = true;
   }
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index fbde52d73..5cfe559c1 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -49,7 +49,7 @@
 /**
  *  \mainpage KGantt Module 
         
  *
- *  The kgantt module contains several classes (KGanttItem, KGantt)
+ *  The kgantt module tqcontains several classes (KGanttItem, KGantt)
  *  for drawing and editing gantt-diagramms.
  *
  *  This example shows how to use the gantt module:
@@ -66,8 +66,8 @@
 
        KGanttItem* t1 = new KGanttItem(toplevel, 
                                        "task 1, no subtasks", 
-                	               TQDateTime::currentDateTime().addDays(10),
-                                       TQDateTime::currentDateTime().addDays(20) );
+                	               TQDateTime::tqcurrentDateTime().addDays(10),
+                                       TQDateTime::tqcurrentDateTime().addDays(20) );
 
        ...
 
@@ -83,7 +83,7 @@
 
 ///  Gantt Widget.
 /*!
- *   A gantt widget contains two parts, a list view and a
+ *   A gantt widget tqcontains two parts, a list view and a
  *   bar view.
  */
 ////////////////////////////////
diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp
index 4ddddf01a..3632e1706 100644
--- a/kgantt/kgantt/KGanttItem.cpp
+++ b/kgantt/kgantt/KGanttItem.cpp
@@ -90,7 +90,7 @@ KGanttRelation*
 KGanttItem::addRelation(KGanttItem* from, KGanttItem* to,
 			const TQString& text)
 {
-  if(_subitems.containsRef(from) > 0 && _subitems.containsRef(to) >0) {
+  if(_subitems.tqcontainsRef(from) > 0 && _subitems.tqcontainsRef(to) >0) {
     KGanttRelation* rel = new KGanttRelation(from,to,text);
     _relations.append(rel);
 
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index 9971508cc..fb7feb04d 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -46,8 +46,8 @@
 
 ///  KGanttItem.
 /*!
- *   This class describes a item. It contains dates on which the item starts and
- *   ends. It also contains attributes that gouverns the graphical representation
+ *   This class describes a item. It tqcontains dates on which the item starts and
+ *   ends. It also tqcontains attributes that gouverns the graphical representation
  *   in a gantt diagramm.
  */
 //////////////////////////////////
@@ -121,7 +121,7 @@ public:
     //  Draw handlke for opening/closing item.
     DrawHandle      = 16,
     
-    /// Draw handle only if item contains subitems
+    /// Draw handle only if item tqcontains subitems
     DrawHandleWSubitems = 32,
     
     DrawAll         = 255 
@@ -342,7 +342,7 @@ public:
 
   ///  Get date of starting.
   /*!
-   *   If mode == ´Rubberband´ and this item contains
+   *   If mode == ´Rubberband´ and this item tqcontains
    *   subitems, start of the item is determined by the start of the
    *   earliest subitem. 
        
    */
diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h
index 548789500..8ab96c5df 100644
--- a/kgantt/kgantt/KGanttRelation.h
+++ b/kgantt/kgantt/KGanttRelation.h
@@ -40,8 +40,8 @@ class KGanttItem;
 
 ///  KGanttRelation.
 /*!
- *   This class describes a item. It contains dates on which the item starts and
- *   ends. It also contains attributes that gouverns the graphical representation
+ *   This class describes a item. It tqcontains dates on which the item starts and
+ *   ends. It also tqcontains attributes that gouverns the graphical representation
  *   in a gantt diagramm.
  */
 //////////////////////////////////
@@ -175,7 +175,7 @@ public:
 
   ///  Get date of starting.
   /*!
-   *   If mode == ´Rubberband´ and this item contains
+   *   If mode == ´Rubberband´ and this item tqcontains
    *   subitems, start of the item is determined by the start of the
    *   earliest subitem. 
        
    */
diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui
index e50689e68..3be22f9e4 100644
--- a/kgantt/kgantt/itemedit.ui
+++ b/kgantt/kgantt/itemedit.ui
@@ -4,7 +4,7 @@
     
         Form1
     
-    
+    
         
             0
             0
@@ -12,9 +12,9 @@
             431
         
     
-    
+    
     
-    
+    
     
     
         
@@ -38,7 +38,7 @@
                     0
                 
             
-            
+            
                 
                     32767
                     30
@@ -47,7 +47,7 @@
             
                 Item text:
             
-            
+            
                 AlignBottom|AlignLeft
             
             
@@ -74,7 +74,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             50
                             20
@@ -85,7 +85,7 @@
                     
                         _minStartMinuetEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -99,7 +99,7 @@
                     
                         _minStartHourEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -177,7 +177,7 @@
                     
                         _maxStartHourEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -210,7 +210,7 @@
                     
                         _maxStartMinuetEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -230,7 +230,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             50
                             20
@@ -308,7 +308,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             356
                             20
@@ -354,7 +354,7 @@
                     
                         _startHourEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -368,7 +368,7 @@
                     
                         _startMinuetEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -395,7 +395,7 @@
                     
                         _endMinuetEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -415,7 +415,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             356
                             20
@@ -477,7 +477,7 @@
                     
                         _endHourEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -605,7 +605,7 @@
         
     
 
-
+
 
     knuminput.h
 
diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui
index 7ef1fa002..bdcc0eb70 100644
--- a/kgantt/kgantt/itemedit2.ui
+++ b/kgantt/kgantt/itemedit2.ui
@@ -4,7 +4,7 @@
     
         Form1
     
-    
+    
         
             0
             0
@@ -12,9 +12,9 @@
             345
         
     
-    
+    
     
-    
+    
     
     
         
@@ -217,7 +217,7 @@
                     
                         _dateTimeHourEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -245,7 +245,7 @@
                     
                         _dateTimeMinuetEdit
                     
-                    
+                    
                         
                             20
                             30
@@ -265,7 +265,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             194
                             20
@@ -302,7 +302,7 @@
                     0
                 
             
-            
+            
                 
                     32767
                     30
@@ -314,7 +314,7 @@
             
                 PlainText
             
-            
+            
                 WordBreak|AlignBottom|AlignLeft
             
             
@@ -322,7 +322,7 @@
         
     
 
-
+
 
     knuminput.h
 
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index b0985dd7f..2ee7ad02f 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -424,7 +424,7 @@ xQGanttBarViewPort::recalc(KGanttItem* item, int xPos, int yPos,
     new xQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS,
 		       _textPosX, _textPosY, depth);
   
-  _gItemList.replace(item, tpos );
+  _gItemList.tqreplace(item, tpos );
 
   tpos->_screenHandleX = xPos + dd;
   tpos->_screenHandleW = 2 * dd;
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 2290c6787..b5d1071f1 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -251,7 +251,7 @@ IMAP4Protocol::get (const KURL & _url)
       if (aUpper.find ("BODY.PEEK[]") != -1)
       {
         if (!hasCapability("IMAP4rev1")) // imap4 does not know BODY.PEEK[]
-          aSection.replace("BODY.PEEK[]", "RFC822.PEEK");
+          aSection.tqreplace("BODY.PEEK[]", "RFC822.PEEK");
       }
       aSection.prepend("UID RFC822.SIZE FLAGS ");
     }
@@ -309,7 +309,7 @@ IMAP4Protocol::get (const KURL & _url)
       {
         // get the MIME header and fill getLastHandled()
         TQString mySection = aSection;
-        mySection.replace("]", ".MIME]");
+        mySection.tqreplace("]", ".MIME]");
         cmd = sendCommand (imapCommand::clientFetch (aSequence, mySection));
         do
         {
@@ -1816,7 +1816,7 @@ IMAP4Protocol::slave_status ()
 {
   bool connected = (getState() != ISTATE_NO) && isConnectionValid();
   kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
-  slaveStatus ( connected ? myHost : TQString::null, connected );
+  slavetqStatus ( connected ? myHost : TQString::null, connected );
 }
 
 void
@@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url)
       ok = true;
     else
     {
-      imapCommand *cmd = doCommand(imapCommand::clientStatus(aBox, aSection));
+      imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection));
       ok = cmd->result() == "OK";
       cmdInfo = cmd->resultInfo();
       completeQueue.removeRef(cmd);
@@ -1887,13 +1887,13 @@ IMAP4Protocol::stat (const KURL & _url)
         error(KIO::ERR_DOES_NOT_EXIST, aBox);
       return;
     }
-    if ((aSection == "UIDNEXT" && getStatus().uidNextAvailable())
-      || (aSection == "UNSEEN" && getStatus().unseenAvailable()))
+    if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
+      || (aSection == "UNSEEN" && geStatus().unseenAvailable()))
     {
       atom.m_uds = UDS_SIZE;
       atom.m_str = TQString::null;
-      atom.m_long = (aSection == "UIDNEXT") ? getStatus().uidNext()
-        : getStatus().unseen();
+      atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext()
+        : geStatus().unseen();
       entry.append(atom);
     }
   } else
@@ -1910,9 +1910,9 @@ IMAP4Protocol::stat (const KURL & _url)
       // only do this if the box is not selected
       // the server might change the validity for new select/examine
       imapCommand *cmd =
-        doCommand (imapCommand::clientStatus (aBox, "UIDVALIDITY"));
+        doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY"));
       completeQueue.removeRef (cmd);
-      validity = getStatus ().uidValidity ();
+      validity = geStatus ().uidValidity ();
     }
     validity = 0;               // temporary
 
@@ -2108,7 +2108,7 @@ bool IMAP4Protocol::makeLogin ()
       }
     }
 
-    if ( greeting.contains(  TQRegExp(  "Cyrus IMAP4 v2.1" ) ) ) {
+    if ( greeting.tqcontains(  TQRegExp(  "Cyrus IMAP4 v2.1" ) ) ) {
       removeCapability( "ANNOTATEMORE" );
     }
 
@@ -2473,7 +2473,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
   // get the delimiter
   TQString myNamespace = namespaceForBox( _box );
   kdDebug(7116) << "IMAP4::parseURL - namespace=" << myNamespace << endl;
-  if ( namespaceToDelimiter.contains(myNamespace) )
+  if ( namespaceToDelimiter.tqcontains(myNamespace) )
   {
     _hierarchyDelimiter = namespaceToDelimiter[myNamespace];
     kdDebug(7116) << "IMAP4::parseURL - delimiter=" << _hierarchyDelimiter << endl;
@@ -2524,7 +2524,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
             }
             // if we got no list response for the box see if it's a prefix
             if ( retVal == ITYPE_UNKNOWN &&
-                 namespaceToDelimiter.contains(_box) ) {
+                 namespaceToDelimiter.tqcontains(_box) ) {
               retVal = ITYPE_DIR;
             }
           } else {
@@ -2636,7 +2636,7 @@ void IMAP4Protocol::flushOutput(TQString contentEncoding)
     else
       decoded = outputCache;
 
-    TQString mimetype = KMimeType::findByContent( decoded )->name();
+    TQString mimetype = KMimeType::tqfindByContent( decoded )->name();
     kdDebug(7116) << "IMAP4::flushOutput - mimeType " << mimetype << endl;
     mimeType(mimetype);
     decodeContent = false;
@@ -2715,10 +2715,10 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
     // Doing this means a server roundtrip and since assureBox is called
     // after every mail, we do it with a timeout.
     kdDebug(7116) << "IMAP4Protocol::assureBox - reusing box" << endl;
-    if ( mTimeOfLastNoop.secsTo( TQDateTime::currentDateTime() ) > 10 ) {
+    if ( mTimeOfLastNoop.secsTo( TQDateTime::tqcurrentDateTime() ) > 10 ) {
       cmd = doCommand (imapCommand::clientNoop ());
       completeQueue.removeRef (cmd);
-      mTimeOfLastNoop = TQDateTime::currentDateTime();
+      mTimeOfLastNoop = TQDateTime::tqcurrentDateTime();
       kdDebug(7116) << "IMAP4Protocol::assureBox - noop timer fired" << endl;
     }
   }
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index 9920ecac4..a44b4eb78 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -37,8 +37,8 @@ enum IMAP_TYPE
 {
   ITYPE_UNKNOWN, /*< unknown type */
   ITYPE_DIR,     /*< Object is a directory. i.e. does not contain message, just mailboxes */
-  ITYPE_BOX,     /*< Object is a mailbox. i.e. contains mails */
-  ITYPE_DIR_AND_BOX, /*< Object contains both mails and mailboxes */
+  ITYPE_BOX,     /*< Object is a mailbox. i.e. tqcontains mails */
+  ITYPE_DIR_AND_BOX, /*< Object tqcontains both mails and mailboxes */
   ITYPE_MSG,   /*< Object is a mail */
   ITYPE_ATTACH   /*< Object is an attachment */
 };
@@ -193,7 +193,7 @@ private:
   bool relayEnabled, cacheOutput, decodeContent;
   TQByteArray outputCache;
   TQBuffer outputBuffer;
-  Q_ULONG outputBufferIndex;
+  TQ_ULONG outputBufferIndex;
   KIO::filesize_t mProcessedSize;
 
   char readBuffer[IMAP_BUFFER];
diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc
index ae26f0ab2..979562003 100644
--- a/kioslaves/imap4/imapcommand.cc
+++ b/kioslaves/imap4/imapcommand.cc
@@ -236,7 +236,7 @@ imapCommand::clientAppend (const TQString & box, const TQString & flags,
 }
 
 imapCommand *
-imapCommand::clientStatus (const TQString & path, const TQString & parameters)
+imapCommand::clienStatus (const TQString & path, const TQString & parameters)
 {
   return new imapCommand ("STATUS",
                           TQString ("\"") + rfcDecoder::toIMAP (path) +
diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h
index f91b93292..4c9552023 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/kioslaves/imap4/imapcommand.h
@@ -212,7 +212,7 @@ public:
    * @param parameters
    * @return a STATUS imapCommand
    */
-  static imapCommand *clientStatus (const TQString & path,
+  static imapCommand *clienStatus (const TQString & path,
                                     const TQString & parameters);
   /**
    * @brief Create a COPY command
diff --git a/kioslaves/imap4/imapinfo.cc b/kioslaves/imap4/imapinfo.cc
index 4d1fc805c..c65eca0c7 100644
--- a/kioslaves/imap4/imapinfo.cc
+++ b/kioslaves/imap4/imapinfo.cc
@@ -206,29 +206,29 @@ ulong imapInfo::_flags (const TQCString & inFlags)
 
     if (entry.isEmpty ())
       flagsString.clear();
-    else if (0 != entry.contains ("\\SEEN"))
+    else if (0 != entry.tqcontains ("\\SEEN"))
       flags ^= Seen;
-    else if (0 != entry.contains ("\\ANSWERED"))
+    else if (0 != entry.tqcontains ("\\ANSWERED"))
       flags ^= Answered;
-    else if (0 != entry.contains ("\\FLAGGED"))
+    else if (0 != entry.tqcontains ("\\FLAGGED"))
       flags ^= Flagged;
-    else if (0 != entry.contains ("\\DELETED"))
+    else if (0 != entry.tqcontains ("\\DELETED"))
       flags ^= Deleted;
-    else if (0 != entry.contains ("\\DRAFT"))
+    else if (0 != entry.tqcontains ("\\DRAFT"))
       flags ^= Draft;
-    else if (0 != entry.contains ("\\RECENT"))
+    else if (0 != entry.tqcontains ("\\RECENT"))
       flags ^= Recent;
-    else if (0 != entry.contains ("\\*"))
+    else if (0 != entry.tqcontains ("\\*"))
       flags ^= User;
 
     // non standard kmail falgs
-    else if ( entry.contains( "KMAILFORWARDED" ) || entry.contains( "$FORWARDED" ) )
+    else if ( entry.tqcontains( "KMAILFORWARDED" ) || entry.tqcontains( "$FORWARDED" ) )
       flags = flags | Forwarded;
-    else if ( entry.contains( "KMAILTODO" ) || entry.contains( "$TODO" ) )
+    else if ( entry.tqcontains( "KMAILTODO" ) || entry.tqcontains( "$TODO" ) )
       flags = flags | Todo;
-    else if ( entry.contains( "KMAILWATCHED" ) || entry.contains( "$WATCHED" ) )
+    else if ( entry.tqcontains( "KMAILWATCHED" ) || entry.tqcontains( "$WATCHED" ) )
       flags = flags | Watched;
-    else if ( entry.contains( "KMAILIGNORED" ) || entry.contains( "$IGNORED" ) )
+    else if ( entry.tqcontains( "KMAILIGNORED" ) || entry.tqcontains( "$IGNORED" ) )
       flags = flags | Ignored;
   }
 
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index e4294bd06..0cd8938eb 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -273,7 +273,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
   TQString firstCommand = aAuth;
   if ( !challenge.isEmpty() ) {
     firstCommand += " ";
-    firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+    firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
   }
   cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
 
@@ -349,11 +349,11 @@ imapParser::parseUntagged (parseString & result)
   {
     //the status responses
   case 'B':                    // BAD or BYE
-    if (qstrncmp(what, "BAD", what.size()) == 0)
+    if (tqstrncmp(what, "BAD", what.size()) == 0)
     {
       parseResult (what, result);
     }
-    else if (qstrncmp(what, "BYE", what.size()) == 0)
+    else if (tqstrncmp(what, "BYE", what.size()) == 0)
     {
       parseResult (what, result);
       if ( sentQueue.count() ) {
@@ -370,7 +370,7 @@ imapParser::parseUntagged (parseString & result)
     {
       parseResult (what, result);
     }
-    else if (qstrncmp(what, "NAMESPACE", what.size()) == 0)
+    else if (tqstrncmp(what, "NAMESPACE", what.size()) == 0)
     {
       parseNamespace (result);
     }
@@ -380,20 +380,20 @@ imapParser::parseUntagged (parseString & result)
     if (what[1] == 'K' && what.size() == 2)
     {
       parseResult (what, result);
-    } else if (qstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
+    } else if (tqstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
       parseOtherUser (result);
-    } else if (qstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
+    } else if (tqstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
       parseOutOfOffice (result);
     }
     break;
   case 'D':
-    if (qstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
+    if (tqstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
       parseDelegate (result);
     }
     break;
 
   case 'P':                    // PREAUTH
-    if (qstrncmp(what, "PREAUTH", what.size()) == 0)
+    if (tqstrncmp(what, "PREAUTH", what.size()) == 0)
     {
       parseResult (what, result);
       currentState = ISTATE_LOGIN;
@@ -402,67 +402,67 @@ imapParser::parseUntagged (parseString & result)
 
     // parse the other responses
   case 'C':                    // CAPABILITY
-    if (qstrncmp(what, "CAPABILITY", what.size()) == 0)
+    if (tqstrncmp(what, "CAPABILITY", what.size()) == 0)
     {
       parseCapability (result);
     }
     break;
 
   case 'F':                    // FLAGS
-    if (qstrncmp(what, "FLAGS", what.size()) == 0)
+    if (tqstrncmp(what, "FLAGS", what.size()) == 0)
     {
       parseFlags (result);
     }
     break;
 
   case 'L':                    // LIST or LSUB or LISTRIGHTS
-    if (qstrncmp(what, "LIST", what.size()) == 0)
+    if (tqstrncmp(what, "LIST", what.size()) == 0)
     {
       parseList (result);
     }
-    else if (qstrncmp(what, "LSUB", what.size()) == 0)
+    else if (tqstrncmp(what, "LSUB", what.size()) == 0)
     {
       parseLsub (result);
     }
-    else if (qstrncmp(what, "LISTRIGHTS", what.size()) == 0)
+    else if (tqstrncmp(what, "LISTRIGHTS", what.size()) == 0)
     {
       parseListRights (result);
     }
     break;
 
   case 'M': // MYRIGHTS
-    if (qstrncmp(what, "MYRIGHTS", what.size()) == 0)
+    if (tqstrncmp(what, "MYRIGHTS", what.size()) == 0)
     {
       parseMyRights (result);
     }
     break;
   case 'S':                    // SEARCH or STATUS
-    if (qstrncmp(what, "SEARCH", what.size()) == 0)
+    if (tqstrncmp(what, "SEARCH", what.size()) == 0)
     {
       parseSearch (result);
     }
-    else if (qstrncmp(what, "STATUS", what.size()) == 0)
+    else if (tqstrncmp(what, "STATUS", what.size()) == 0)
     {
       parseStatus (result);
     }
     break;
 
   case 'A': // ACL or ANNOTATION
-    if (qstrncmp(what, "ACL", what.size()) == 0)
+    if (tqstrncmp(what, "ACL", what.size()) == 0)
     {
       parseAcl (result);
     }
-    else if (qstrncmp(what, "ANNOTATION", what.size()) == 0)
+    else if (tqstrncmp(what, "ANNOTATION", what.size()) == 0)
     {
       parseAnnotation (result);
     }
     break;
   case 'Q': // QUOTA or QUOTAROOT
-    if ( what.size() > 5 && qstrncmp(what, "QUOTAROOT", what.size()) == 0)
+    if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0)
     {
       parseQuotaRoot( result );
     }
-    else if (qstrncmp(what, "QUOTA", what.size()) == 0)
+    else if (tqstrncmp(what, "QUOTA", what.size()) == 0)
     {
       parseQuota( result );
     }
@@ -485,18 +485,18 @@ imapParser::parseUntagged (parseString & result)
         switch (what[0])
         {
         case 'E':
-          if (qstrncmp(what, "EXISTS", what.size()) == 0)
+          if (tqstrncmp(what, "EXISTS", what.size()) == 0)
           {
             parseExists (number, result);
           }
-          else if (qstrncmp(what, "EXPUNGE", what.size()) == 0)
+          else if (tqstrncmp(what, "EXPUNGE", what.size()) == 0)
           {
             parseExpunge (number, result);
           }
           break;
 
         case 'F':
-          if (qstrncmp(what, "FETCH", what.size()) == 0)
+          if (tqstrncmp(what, "FETCH", what.size()) == 0)
           {
             seenUid = TQString::null;
             parseFetch (number, result);
@@ -504,7 +504,7 @@ imapParser::parseUntagged (parseString & result)
           break;
 
         case 'S':
-          if (qstrncmp(what, "STORE", what.size()) == 0)  // deprecated store
+          if (tqstrncmp(what, "STORE", what.size()) == 0)  // deprecated store
           {
             seenUid = TQString::null;
             parseFetch (number, result);
@@ -512,7 +512,7 @@ imapParser::parseUntagged (parseString & result)
           break;
 
         case 'R':
-          if (qstrncmp(what, "RECENT", what.size()) == 0)
+          if (tqstrncmp(what, "RECENT", what.size()) == 0)
           {
             parseRecent (number, result);
           }
@@ -626,20 +626,20 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
   {
   case 'A':
     if (command == "AUTHENTICATE")
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_LOGIN;
     break;
 
   case 'L':
     if (command == "LOGIN")
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_LOGIN;
     break;
 
   case 'E':
     if (command == "EXAMINE")
     {
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_SELECT;
       else
       {
@@ -654,7 +654,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
   case 'S':
     if (command == "SELECT")
     {
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_SELECT;
       else
       {
@@ -847,7 +847,7 @@ void imapParser::parseSearch (parseString & result)
 
 void imapParser::parseStatus (parseString & inWords)
 {
-  lastStatus = imapInfo ();
+  lasStatus = imapInfo ();
 
   parseLiteralC(inWords);       // swallow the box
   if (inWords.isEmpty() || inWords[0] != '(')
@@ -864,15 +864,15 @@ void imapParser::parseStatus (parseString & inWords)
     if (parseOneNumber (inWords, value))
     {
       if (label == "MESSAGES")
-        lastStatus.setCount (value);
+        lasStatus.setCount (value);
       else if (label == "RECENT")
-        lastStatus.setRecent (value);
+        lasStatus.setRecent (value);
       else if (label == "UIDVALIDITY")
-        lastStatus.setUidValidity (value);
+        lasStatus.setUidValidity (value);
       else if (label == "UNSEEN")
-        lastStatus.setUnseen (value);
+        lasStatus.setUnseen (value);
       else if (label == "UIDNEXT")
-        lastStatus.setUidNext (value);
+        lasStatus.setUidNext (value);
     }
   }
 
@@ -1675,7 +1675,7 @@ void imapParser::parseNamespace (parseString & result)
     return;
 
   TQString delimEmpty;
-  if ( namespaceToDelimiter.contains( TQString::null ) )
+  if ( namespaceToDelimiter.tqcontains( TQString::null ) )
     delimEmpty = namespaceToDelimiter[TQString::null];
 
   namespaceToDelimiter.clear();
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index 2595d094b..d40524d1c 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -404,9 +404,9 @@ public:
   };
 
   /** @brief return the last status code */
-  const imapInfo & getStatus ()
+  const imapInfo & geStatus ()
   {
-    return lastStatus;
+    return lasStatus;
   };
   /** return the select info */
   const imapInfo & getSelected ()
@@ -450,7 +450,7 @@ protected:
   imapInfo selectInfo;
 
   /** @brief the results from the last status command */
-  imapInfo lastStatus;
+  imapInfo lasStatus;
 
   /** @brief the results from the capabilities, split at ' ' */
   TQStringList imapCapabilities;
diff --git a/kioslaves/imap4/mailheader.h b/kioslaves/imap4/mailheader.h
index 633d61b78..72ac6e48d 100644
--- a/kioslaves/imap4/mailheader.h
+++ b/kioslaves/imap4/mailheader.h
@@ -94,7 +94,7 @@ public:
   }
 
   /**
-   * set a unicode subject
+   * set a tqunicode subject
    */
   void setSubject (const TQString & _str)
   {
@@ -109,7 +109,7 @@ public:
   }
 
   /** 
-   * get the unicode subject
+   * get the tqunicode subject
    */
   const TQString getSubject ()
   {
diff --git a/kioslaves/imap4/mimehdrline.h b/kioslaves/imap4/mimehdrline.h
index e31c18649..210f5a7c4 100644
--- a/kioslaves/imap4/mimehdrline.h
+++ b/kioslaves/imap4/mimehdrline.h
@@ -52,10 +52,10 @@ and report characters slurped */
   static int parseAlphaNum (const char *);
 
 protected:                     // Protected attributes
-  /** contains the Value 
+  /** tqcontains the Value 
  */
     TQCString mimeValue;
-  /** contains the Label of the line
+  /** tqcontains the Label of the line
  */
   TQCString mimeLabel;
 protected:                     // Protected methods
diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc
index 676e0d72f..1d0b7ab9e 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/kioslaves/imap4/mimeheader.cc
@@ -650,7 +650,7 @@ mimeHeader::bodyDecoded ()
   TQByteArray temp;
 
   temp = bodyDecodedBinary ();
-  return TQString::fromLatin1 (temp.data (), temp.count ());
+  return TQString::tqfromLatin1 (temp.data (), temp.count ());
 }
 
 QByteArray
diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
index 0aa237d6b..5470901ed 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/kioslaves/imap4/rfcdecoder.cc
@@ -154,7 +154,7 @@ TQString rfcDecoder::fromIMAP (const TQString & inSrc)
   return TQString::fromUtf8 (dst.data ());
 }
 
-/* replace " with \" and \ with \\ " and \ characters */
+/* tqreplace " with \" and \ with \\ " and \ characters */
 TQString rfcDecoder::quoteIMAP(const TQString &src)
 {
   uint len = src.length();
@@ -311,7 +311,7 @@ rfcDecoder::codecForName (const TQString & _str)
   if (_str.isEmpty ())
     return NULL;
   return TQTextCodec::codecForName (_str.lower ().
-                                   replace ("windows", "cp").latin1 ());
+                                   tqreplace ("windows", "cp").latin1 ());
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kioslaves/imap4/rfcdecoder.h b/kioslaves/imap4/rfcdecoder.h
index 2095b2ed2..50ab948e3 100644
--- a/kioslaves/imap4/rfcdecoder.h
+++ b/kioslaves/imap4/rfcdecoder.h
@@ -44,7 +44,7 @@ public:
 /** Convert Unicode path to modified UTF-7 IMAP mailbox
  */
   static TQString toIMAP (const TQString & inSrc);
-/** replace " with \" and \ with \\ " and \ characters */
+/** tqreplace " with \" and \ with \\ " and \ characters */
   static TQString quoteIMAP (const TQString & src);
 
   /** remove \ from a string 
diff --git a/kioslaves/mbox/Makefile.am b/kioslaves/mbox/Makefile.am
index b4840ee72..13e370f44 100644
--- a/kioslaves/mbox/Makefile.am
+++ b/kioslaves/mbox/Makefile.am
@@ -12,7 +12,7 @@ kio_mbox_la_SOURCES = \
 	readmbox.cc \
 	stat.cc \
 	urlinfo.cc
-kio_mbox_la_LIBADD  = $(LIB_KIO)
+kio_mbox_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 kio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = \
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 35b24db45..7cf67e32f 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -104,7 +104,7 @@ bool ReadMBox::nextLine()
 	} else if( m_only_new )
 	{
 		if( m_header && m_current_line->left( 7 ) == "Status:" &&
-		    ! m_current_line->contains( "U" ) && ! m_current_line->contains( "N" ) )
+		    ! m_current_line->tqcontains( "U" ) && ! m_current_line->tqcontains( "N" ) )
 		{
 			m_status = false;
 		}
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 55525aff3..ad15b155b 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -146,8 +146,8 @@ void OpenGroupware::getFreeBusy( const KURL &url )
       // FIXME get from server
 
       // FIXME: Read range from configuration or URL parameters.
-      TQDate start = TQDate::currentDate().addDays( -3 );
-      TQDate end = TQDate::currentDate().addDays( 60 );
+      TQDate start = TQDate::tqcurrentDate().addDays( -3 );
+      TQDate end = TQDate::tqcurrentDate().addDays( 60 );
 
       fb->setDtStart( start );
       fb->setDtEnd( end );
diff --git a/kioslaves/sieve/Makefile.am b/kioslaves/sieve/Makefile.am
index 830c8258e..844d3f5c7 100644
--- a/kioslaves/sieve/Makefile.am
+++ b/kioslaves/sieve/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
 kde_module_LTLIBRARIES = kio_sieve.la
 
 kio_sieve_la_SOURCES = sieve.cpp
-kio_sieve_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
+kio_sieve_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_KDECORE)
 kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = sieve.h
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index bc7811662..6d2f90b8b 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -245,14 +245,14 @@ bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
 		ksDebug() << "Looping receive" << endl;
 
 		if (r.getType() == kio_sieveResponse::ACTION) {
-			if ( r.getAction().contains("ok", false) != -1 ) {
+			if ( r.getAction().tqcontains("ok", false) != -1 ) {
 				ksDebug() << "Sieve server ready & awaiting authentication." << endl;
 				break;
 			} else
 				ksDebug() << "Unknown action " << r.getAction() << "." << endl;
 
 		} else if (r.getKey() == "IMPLEMENTATION") {
-			if (r.getVal().contains("sieve", false) != -1) {
+			if (r.getVal().tqcontains("sieve", false) != -1) {
 				ksDebug() << "Connected to Sieve server: " << r.getVal() << endl;
 				ret = true;
 				setMetaData("implementation", r.getVal());
@@ -876,7 +876,7 @@ void kio_sieveProtocol::stat(const KURL& url)
 
 		while(receiveData()) {
 			if (r.getType() == kio_sieveResponse::ACTION) {
-				if (r.getAction().contains("OK", false) == 1)
+				if (r.getAction().tqcontains("OK", false) == 1)
 					// Script list completed
 					break;
 
@@ -929,7 +929,7 @@ void kio_sieveProtocol::listDir(const KURL& url)
 
 	while(receiveData()) {
 		if (r.getType() == kio_sieveResponse::ACTION) {
-			if (r.getAction().contains("OK", false) == 1)
+			if (r.getAction().tqcontains("OK", false) == 1)
 				// Script list completed.
 				break;
 
@@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate()
 
 	ksDebug() << "Preferred authentication method is " << mechusing << "." << endl;
 
-  TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\"";
+  TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\"";
   tmp.setRawData( out, outlen );
   KCodecs::base64Encode( tmp, challenge );
   tmp.resetRawData( out, outlen );
   if ( !challenge.isEmpty() ) {
     firstCommand += " \"";
-    firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+    firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
     firstCommand += "\"";
   }
 
@@ -1222,7 +1222,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
 		buffer[SIEVE_DEFAULT_RECIEVE_BUFFER-1] = '\0';
 
 		// strip LF/CR
-		interpret = TQCString(buffer).left(qstrlen(buffer) - 2);
+		interpret = TQCString(buffer).left(tqstrlen(buffer) - 2);
 
 	} else {
 		interpret = reparse->copy();
diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index bc94e2208..a3fd4f2a0 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -146,7 +146,7 @@ TQString Group::name() const
 {
   Q_ASSERT( mGroup );
 
-  return TQString::fromLatin1( osync_group_get_name( mGroup ) );
+  return TQString::tqfromLatin1( osync_group_get_name( mGroup ) );
 }
 
 void Group::setLastSynchronization( const TQDateTime &dateTime )
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index 35cb04632..5ed409861 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) );
 }
 
 TQString Member::pluginName() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) );
 }
 
 Plugin Member::plugin() const
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index acd54447a..fd7600499 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -43,20 +43,20 @@ TQString Plugin::name() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) );
 }
 
 TQString Plugin::longName() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) );
 }
 
 TQString Plugin::description() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) );
 }
 
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 53d9c4401..27ff6b220 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -82,7 +82,7 @@ class SyncChange
     TQString data() const;
 
     /**
-      Returns whether the change contains data.
+      Returns whether the change tqcontains data.
      */
     bool hasData() const;
 
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 7f94fc173..429e54254 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -33,14 +33,15 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                             configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
-                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la
+                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la \
+                           $(LIB_QT)
 
 # KPart
 kde_module_LTLIBRARIES = libkitchensyncpart.la
 
 libkitchensyncpart_la_SOURCES = part.cpp
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la
+libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_KDECORE) $(LIB_KDEUI)
 
 # Resources
 kitchensyncdatadir = $(kde_datadir)/kitchensync
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 0909fa0fc..3d5b1f047 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -51,7 +51,7 @@ static TQString readFile( const TQString &fileName )
 AboutPage::AboutPage( TQWidget *parent )
   : TQWidget( parent, "AboutPage" )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQString location = locate( "data", "kitchensync/about/main.html" );
   TQString content = readFile( location );
@@ -62,7 +62,7 @@ AboutPage::AboutPage( TQWidget *parent )
     content = content.arg( "" );
 
   KHTMLPart *part = new KHTMLPart( this );
-  layout->addWidget( part->view() );
+  tqlayout->addWidget( part->view() );
 
   part->begin( KURL( location ) );
 
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index c313ce3ab..716bce78a 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const
 
 void ConfigGuiEvo2::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
   mAddressPath = new KURLRequester( this );
   mAddressPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
   mCalendarPath = new KURLRequester( this );
   mCalendarPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
   mTasksPath = new KURLRequester( this );
   mTasksPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
 }
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 38f2fbf3a..84db02752 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -37,14 +37,14 @@
 ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   // Model
   TQLabel *label = new TQLabel( i18n("Model:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mModel = new KComboBox( true, this );
-  layout->addWidget( mModel, 0, 1 );
+  tqlayout->addWidget( mModel, 0, 1 );
   mModel->insertItem( "2110" ); 
   mModel->insertItem( "3110" ); 
   mModel->insertItem( "6110" ); 
@@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
 
   // Connection
   label = new TQLabel( i18n("Connection:"), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mConnection = new TQComboBox( this );
-  layout->addWidget( mConnection, 1, 1 );
+  tqlayout->addWidget( mConnection, 1, 1 );
 
   connect( mConnection, TQT_SIGNAL (activated( int ) ),
       	    this, TQT_SLOT( slotConnectionChanged ( int ) ) );
@@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mBluetooth = new BluetoothWidget( connectionWidget ); 
   mBluetooth->hide();
 
-  layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
 
   // Port
   mPortLabel = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( mPortLabel, 2, 0 );
+  tqlayout->addWidget( mPortLabel, 2, 0 );
   mPortLabel->hide();
 
   mPort = new KComboBox( true, this );
-  layout->addWidget( mPort, 2, 1 );
+  tqlayout->addWidget( mPort, 2, 1 );
   mPort->hide();
 
   mPort->insertItem( "/dev/ircomm0" );
@@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mPort->insertItem( "/dev/ttyUSB0" );
   mPort->insertItem( "/dev/ttyUSB1" );
 
-  layout->setColStretch( 1, 1 );
+  tqlayout->setColStretch( 1, 1 );
 
   topLayout()->addStretch( 1 );
 }
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index b3bff63af..94108d300 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const
 
 void ConfigGuiGpe::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
   mConnectionMode = new KComboBox( this );
-  layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
   mIP = new KLineEdit( this );
   mIP->setInputMask( "000.000.000.000" );
-  layout->addWidget( mIP, 1, 1 );
+  tqlayout->addWidget( mIP, 1, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
   mPort = new TQSpinBox( 1, 65536, 1, this );
-  layout->addWidget( mPort, 1, 3 );
+  tqlayout->addWidget( mPort, 1, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
   mUser = new KLineEdit( this );
-  layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
+  tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
 }
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 2b37ad424..158eb2253 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const
 
 void ConfigGuiJescs::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
   mUrl = new KLineEdit( this );
-  layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
   mUsername = new KLineEdit( this );
-  layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
   mPassword = new KLineEdit( this );
   mPassword->setEchoMode( KLineEdit::Password );
-  layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
 
   mDelNotify = new TQCheckBox( this );
   mDelNotify->setText( "Notify attendees about event/task deletion" );
-  layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
+  tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
 }
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 3ef451c36..417e58d0b 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const
 
 void ConfigGuiLdap::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
                                             KABC::LdapConfigWidget::W_PORT |
@@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI()
   mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
   mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
 
-  layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
-  layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
-  layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
-  layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
-  layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
-  layout->addWidget( mEncryption, 12, 0 );
-  layout->addWidget( mReadLdap, 13, 0 );
-  layout->addWidget( mWriteLdap, 13, 3 );
+  tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
+  tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
+  tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
+  tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
+  tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
+  tqlayout->addWidget( mEncryption, 12, 0 );
+  tqlayout->addWidget( mReadLdap, 13, 0 );
+  tqlayout->addWidget( mWriteLdap, 13, 3 );
 
 }
 
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index a310692f0..c44a2b406 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const
 
 void ConfigGuiMoto::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
   mDeviceString = new KLineEdit( this );
-  layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
 }
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index e823ffe3e..ed8aa15f4 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -33,52 +33,52 @@
 ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   TQLabel *label = new TQLabel( i18n("Device IP:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mDeviceIP = new TQLineEdit( this );
   mDeviceIP->setInputMask( "000.000.000.000" );
   label->setBuddy( mDeviceIP );
-  layout->addWidget( mDeviceIP, 0, 1 );
+  tqlayout->addWidget( mDeviceIP, 0, 1 );
 
   label = new TQLabel( i18n("Device Type:"), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mDeviceType = new TQComboBox( this );
   label->setBuddy( mDeviceType );
-  layout->addWidget( mDeviceType, 1, 1 );
+  tqlayout->addWidget( mDeviceType, 1, 1 );
 
   label = new TQLabel( i18n("Username:"), this );
-  layout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( label, 2, 0 );
 
   mUserName = new TQLineEdit( this );
   label->setBuddy( mUserName );
-  layout->addWidget( mUserName, 2, 1 );
+  tqlayout->addWidget( mUserName, 2, 1 );
 
   label = new TQLabel( i18n("Password:"), this );
-  layout->addWidget( label, 3, 0 );
+  tqlayout->addWidget( label, 3, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  layout->addWidget( mPassword, 3, 1 );
+  tqlayout->addWidget( mPassword, 3, 1 );
 
   label = new TQLabel( i18n("Protocol:"), this );
-  layout->addWidget( label, 4, 0 );
+  tqlayout->addWidget( label, 4, 0 );
 
   mConnectionType = new TQComboBox( this );
   label->setBuddy( mConnectionType );
-  layout->addWidget( mConnectionType, 4, 1 );
+  tqlayout->addWidget( mConnectionType, 4, 1 );
 
   label = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( label, 5, 0 );
+  tqlayout->addWidget( label, 5, 0 );
 
   mPort = new TQSpinBox( this );
   mPort->setRange( 0, 65335 );
   label->setBuddy( mPort );
-  layout->addWidget( mPort, 5, 1 );
+  tqlayout->addWidget( mPort, 5, 1 );
 
   mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
   mDeviceType->insertItem( i18n("Qtopia2") );
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index 99e86f3c7..b0da28cad 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -57,14 +57,14 @@ ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *paren
 
   KPushButton *mLocalAddButton = new KPushButton( mLocalWidget );
   mLocalAddButton->setText( i18n( "Add new calendar" ) );
-  mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mLocalAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( mLocalAddButton );
   connect( mLocalAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addLocalCalendar() ) );
 
   KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget );
   mWebdavAddButton->setText( i18n( "Add new calendar" ) );
-  mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mWebdavAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( mWebdavAddButton );
   connect( mWebdavAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addWebdavCalendar() ) );
@@ -100,7 +100,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
 
       LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget );
       mLocalLayout->removeItem( mLocalSpacer );
-      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mLocalLayout->addWidget( cal );
       mLocalLayout->addItem( mLocalSpacer );
       mLocalList.append( cal );
@@ -122,7 +122,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
       WebdavCalendar *cal = new WebdavCalendar( username, password,
                                                 url, defaultcal, days, mWebdavWidget );
       mWebdavLayout->removeItem( mWebdavSpacer );
-      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mWebdavLayout->addWidget( cal );
       mWebdavLayout->addItem( mWebdavSpacer );
       mWebdavList.append( cal );
@@ -175,7 +175,7 @@ void ConfigGuiSunbird::addLocalCalendar()
 {
   LocalCalendar *cal = new LocalCalendar( mLocalWidget );
   mLocalLayout->removeItem( mLocalSpacer );
-  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( cal );
   mLocalLayout->addItem( mLocalSpacer );
   mLocalList.append( cal );
@@ -194,7 +194,7 @@ void ConfigGuiSunbird::addWebdavCalendar()
 {
   WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget );
   mWebdavLayout->removeItem( mWebdavSpacer );
-  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( cal );
   mWebdavLayout->addItem( mWebdavSpacer );
   mWebdavList.append( cal );
@@ -239,7 +239,7 @@ void LocalCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
@@ -253,7 +253,7 @@ void LocalCalendar::initGui()
   mPathRequester = new KURLRequester( this );
 
   KPushButton *removeButton = new KPushButton( this );
-  removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  removeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   removeButton->setText( i18n( "Remove" ) );
   connect( removeButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( deleteWidget() ) );
@@ -308,7 +308,7 @@ void WebdavCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 6e521beeb..b83e85683 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const
 
 void ConfigGuiSynce::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mContacts = new TQCheckBox( this );
   mContacts->setText( "Sync Contacts" );
-  layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
 
   mTodos = new TQCheckBox( this );
   mTodos->setText( "Sync \'Todo\' items" );
-  layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
 
   mCalendar = new TQCheckBox( this );
   mCalendar->setText( "Sync Calendar" );
-  layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
   mFile = new KLineEdit( this );
-  layout->addWidget( mFile, 3, 1 );
+  tqlayout->addWidget( mFile, 3, 1 );
 }
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 26a8c2241..08c596bc1 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -174,7 +174,7 @@ void ConfigGuiSyncmlHttp::load( const TQString &xml )
         mMaxObjSize->setValue( element.text().toInt() );
     } else if ( element.tagName() == "usestringtable" ) {
       mUseStringTable->setChecked( element.text() == "1" );
-    } else if ( element.tagName() == "onlyreplace" ) {
+    } else if ( element.tagName() == "onlytqreplace" ) {
       mOnlyReplace->setChecked( element.text() == "1" );
     } else if ( element.tagName() == "contact_db" ) {
       mContactDb->setCurrentText( element.text() );
@@ -208,12 +208,12 @@ TQString ConfigGuiSyncmlHttp::save() const
     xml += "0";
   xml += "\n";
 
-  xml += "";
+  xml += "";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "\n";
+  xml += "\n";
 
   xml += "" + mContactDb->currentText() + "\n";
   xml += "" + mCalendarDb->currentText() + "\n";
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 372cf9261..fe7354ed4 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -225,7 +225,7 @@ void ConfigGuiSyncmlObex::load( const TQString &xml )
       if ( mMaxObjSize ) mMaxObjSize->setValue( element.text().toInt() );
     } else if ( element.tagName() == "usestringtable" ) {
       mUseStringTable->setChecked( element.text() == "1" );
-    } else if ( element.tagName() == "onlyreplace" ) {
+    } else if ( element.tagName() == "onlytqreplace" ) {
       mOnlyReplace->setChecked( element.text() == "1" );
     } else if ( element.tagName() == "contact_db" ) {
       mContactDb->setCurrentText( element.text() );
@@ -293,12 +293,12 @@ TQString ConfigGuiSyncmlObex::save() const
     xml += "0";
   xml += "\n";
 
-  xml += "";
+  xml += "";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "\n";
+  xml += "\n";
 
   xml += "" + mContactDb->currentText() + "\n";
   xml += "" + mCalendarDb->currentText() + "\n";
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index ac5277fb7..bb25c271d 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -43,24 +43,24 @@
 BluetoothWidget::BluetoothWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
 
   mAddress = new KLineEdit( this );
   mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" );
-  layout->addWidget( mAddress, 1, 0 );
+  tqlayout->addWidget( mAddress, 1, 0 );
 
   TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this );
   label->setBuddy( mAddress );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mChannel = new KLineEdit( this );
-  layout->addWidget( mChannel, 1, 1 );
+  tqlayout->addWidget( mChannel, 1, 1 );
 
   mChannelLabel = new TQLabel( i18n( "Channel:" ), this );
   mChannelLabel->setBuddy( mChannel );
-  layout->addWidget( mChannelLabel, 0, 1 );
+  tqlayout->addWidget( mChannelLabel, 0, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void BluetoothWidget::hideChannel()
@@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const
 IRWidget::IRWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
 
   mDevice = new KLineEdit( this );
   mSerialNumber = new KLineEdit( this );
 
-  layout->addWidget( mDevice, 1, 0 );
-  layout->addWidget( mSerialNumber, 1, 1 );
+  tqlayout->addWidget( mDevice, 1, 0 );
+  tqlayout->addWidget( mSerialNumber, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Name:" ), this );
   label->setBuddy( mDevice );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Serial Number:" ), this );
   label->setBuddy( mSerialNumber );
-  layout->addWidget( label, 0, 1 );
+  tqlayout->addWidget( label, 0, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void IRWidget::load( const TQDomElement &parent )
@@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
 CableWidget::CableWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
 
   mManufacturer = new KComboBox( this );
   mDevice = new KComboBox( true, this );
 
-  layout->addWidget( mManufacturer, 0, 1 );
-  layout->addWidget( mDevice, 1, 1 );
+  tqlayout->addWidget( mManufacturer, 0, 1 );
+  tqlayout->addWidget( mDevice, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this );
   label->setBuddy( mManufacturer );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Device:" ), this );
   label->setBuddy( mDevice );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 
   mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) );
   mManufacturer->insertItem( i18n( "Siemens" ) );
@@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
 UsbWidget::UsbWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3);
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
 
   mInterface = new TQSpinBox( this );
-  layout->addWidget( mInterface, 0, 1 );
+  tqlayout->addWidget( mInterface, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this );
   label->setBuddy( mInterface );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void UsbWidget::setInterface( int interface )
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index cfedcbfad..2d1ccbc56 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -50,8 +50,8 @@ GroupConfig::GroupConfig( TQWidget *parent )
   TQFrame *titleFrame = new TQFrame( this );
   topLayout->addWidget( titleFrame );
 
-  titleFrame->setPaletteForegroundColor( colorGroup().light() );
-  titleFrame->setPaletteBackgroundColor( colorGroup().mid() );
+  titleFrame->setPaletteForegroundColor( tqcolorGroup().light() );
+  titleFrame->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
   nameLayout->setMargin( 4 );
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index 9f629c4d2..d5c89bc8f 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -41,8 +41,8 @@
 ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
+  tqlayout->setMargin( 0 );
 
   const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
 
@@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
       continue;
 
     TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
-    layout->addWidget( objectCheckBox, row, col );
+    tqlayout->addWidget( objectCheckBox, row, col );
     mObjectTypeChecks.insert( objectType, objectCheckBox );
 
     col++;
@@ -103,7 +103,7 @@ void ObjectTypeSelector::load( const QSync::Group &group )
   TQMap::ConstIterator it;
   for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
     TQCheckBox *check = it.data();
-    check->setChecked( objectTypes.contains( it.key() ) || initialLoad );
+    check->setChecked( objectTypes.tqcontains( it.key() ) || initialLoad );
   }
 }
 
@@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group )
 GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
 
   mGroupName = new KLineEdit( this );
-  layout->addWidget( mGroupName, 0, 1 );
+  tqlayout->addWidget( mGroupName, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
+  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
 
   mObjectTypeSelector = new ObjectTypeSelector( this );
-  layout->addWidget( mObjectTypeSelector, 1, 1 );
+  tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 784991c6f..0a27fb9e9 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
   boldFont.setBold( true );
   boldFont.setPointSize( boldFont.pointSize() + 2 );
 
-  TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
   mBox = new TQVBox( this );
   mBox->setMargin( 5 );
@@ -71,36 +71,36 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
 
   mIcon = new TQLabel( hbox );
   mIcon->setPixmap( icon );
-  mIcon->setFixedSize( mIcon->sizeHint() );
-  mIcon->setPaletteBackgroundColor( colorGroup().mid() );
+  mIcon->setFixedSize( mIcon->tqsizeHint() );
+  mIcon->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   mGroupName = new TQLabel( hbox );
-  mGroupName->setAlignment( AlignLeft | AlignVCenter );
+  mGroupName->tqsetAlignment( AlignLeft | AlignVCenter );
   mGroupName->setIndent( KDialog::spacingHint() );
   mGroupName->setFont( boldFont );
-  mGroupName->setPaletteForegroundColor( colorGroup().light() );
-  mGroupName->setPaletteBackgroundColor( colorGroup().mid() );
+  mGroupName->setPaletteForegroundColor( tqcolorGroup().light() );
+  mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   mStatus = new TQLabel( hbox );
-  mStatus->setAlignment( Qt::AlignRight );
-  mStatus->setAlignment( AlignRight | AlignVCenter );
+  mStatus->tqsetAlignment( Qt::AlignRight );
+  mStatus->tqsetAlignment( AlignRight | AlignVCenter );
   mStatus->setIndent( KDialog::spacingHint() );
   mStatus->setFont( boldFont );
-  mStatus->setPaletteForegroundColor( colorGroup().light() );
-  mStatus->setPaletteBackgroundColor( colorGroup().mid() );
+  mStatus->setPaletteForegroundColor( tqcolorGroup().light() );
+  mStatus->setPaletteBackgroundColor( tqcolorGroup().mid() );
   mStatus->setText( i18n( "Ready" ) );
 
-  hbox->setPaletteBackgroundColor( colorGroup().mid() );
-  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
+  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
 
-  layout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
-  layout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
-  layout->addWidget( mTime, 2, 0 );
-  layout->addWidget( mSyncAction, 2, 1 );
-  layout->addWidget( mConfigureAction, 2, 2 );
-  layout->addWidget( mProgressBar, 2, 3 );
-  layout->setColStretch( 0, 1 );
-  layout->setRowStretch( 3, 1 );
+  tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
+  tqlayout->addWidget( mTime, 2, 0 );
+  tqlayout->addWidget( mSyncAction, 2, 1 );
+  tqlayout->addWidget( mConfigureAction, 2, 2 );
+  tqlayout->addWidget( mProgressBar, 2, 3 );
+  tqlayout->setColStretch( 0, 1 );
+  tqlayout->setRowStretch( 3, 1 );
 
   setPaletteBackgroundColor( kapp->palette().active().base() );
 
@@ -157,7 +157,7 @@ void GroupItem::update()
   for ( ; memberIt != memberEndIt; ++memberIt ) {
     MemberItem *item = new MemberItem( mBox, mSyncProcess, *memberIt );
     item->show();
-    item->setStatusMessage( i18n( "Ready" ) );
+    item->seStatusMessage( i18n( "Ready" ) );
     mMemberItems.append( item );
   }
 }
@@ -259,7 +259,7 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       break;
     case QSync::SyncEngineUpdate::SyncSuccessfull:
       mStatus->setText( i18n( "Successfully synchronized" ) );
-      mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() );
+      mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() );
       mSyncProcess->group().save();
       this->update();
 
@@ -286,31 +286,31 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update )
     if ( (*it)->member() == update.member() ) {
       switch ( update.type() ) {
         case QSync::SyncMemberUpdate::Connected:
-          (*it)->setStatusMessage( i18n( "Connected" ) );
+          (*it)->seStatusMessage( i18n( "Connected" ) );
           break;
         case QSync::SyncMemberUpdate::SentChanges:
-          (*it)->setStatusMessage( i18n( "Changes read" ) );
+          (*it)->seStatusMessage( i18n( "Changes read" ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAll:
-          (*it)->setStatusMessage( i18n( "Changes written" ) );
+          (*it)->seStatusMessage( i18n( "Changes written" ) );
           break;
         case QSync::SyncMemberUpdate::Disconnected:
-          (*it)->setStatusMessage( i18n( "Disconnected" ) );
+          (*it)->seStatusMessage( i18n( "Disconnected" ) );
           break;
         case QSync::SyncMemberUpdate::ConnectError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::GetChangesError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAllError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::SyncDoneError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::DisconnectedError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         default:
           break;
@@ -358,17 +358,17 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
   QSync::Plugin plugin = member.plugin();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQHBox* box = new TQHBox( this );
   box->setMargin( 5 );
   box->setSpacing( 6 );
-  layout->addWidget( box );
+  tqlayout->addWidget( box );
 
   mIcon = new TQLabel( box );
   mIcon->setPixmap( icon );
-  mIcon->setAlignment( Qt::AlignTop );
-  mIcon->setFixedWidth( mIcon->sizeHint().width() );
+  mIcon->tqsetAlignment( Qt::AlignTop );
+  mIcon->setFixedWidth( mIcon->tqsizeHint().width() );
 
   TQVBox *nameBox = new TQVBox( box );
   mMemberName = new TQLabel( nameBox );
@@ -381,7 +381,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
   mDescription->setText( plugin.longName() );
 }
 
-void MemberItem::setStatusMessage( const TQString &msg )
+void MemberItem::seStatusMessage( const TQString &msg )
 {
   mStatus->setText( msg );
 }
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 5f2543a72..dc7248901 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -96,7 +96,7 @@ class MemberItem : public QWidget
     SyncProcess* syncProcess() const { return mSyncProcess; }
     QSync::Member member() const { return mMember; }
 
-    void setStatusMessage( const TQString &msg );
+    void seStatusMessage( const TQString &msg );
 
   private:
     SyncProcess *mSyncProcess;
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index d34fcb2b3..e8c1b791a 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -69,7 +69,7 @@ void KWidgetList::appendItem( KWidgetListItem *item )
   if ( !item )
     return;
 
-  if ( !d->mItems.contains( item ) ) {
+  if ( !d->mItems.tqcontains( item ) ) {
     d->mItems.append( item );
     item->reparent( d->mBox, 0, TQPoint( 0, 0 ), true );
     item->setSelected( false );
@@ -129,7 +129,7 @@ void KWidgetList::setSelected( KWidgetListItem *item )
   if ( !item )
     return;
 
-  if ( d->mItems.contains( item ) == 0 )
+  if ( d->mItems.tqcontains( item ) == 0 )
     return;
 
   if ( d->mSelectedItem )
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 7d7805c42..e7c037610 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem
       : KWidgetListItem( parent ),
         mChange( change )
     {
-      TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+      TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
       MemberInfo mi( change.member() );
-      layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
+      tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
 
       TQString type;
       switch ( change.changeType() ) {
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
           break;
       }
 
-      layout->addWidget( new TQLabel( type, this ), 1, 0 );
+      tqlayout->addWidget( new TQLabel( type, this ), 1, 0 );
     }
 
     QSync::SyncChange change() const { return mChange; }
@@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange()
 
 void MultiConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
 
   mWidgetList = new KWidgetList( this );
-  layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
-  layout->addWidget( button, 2, 0 );
+  tqlayout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
+  tqlayout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
+  tqlayout->addWidget( button, 2, 2 );
 }
 
 #include "multiconflictdialog.moc"
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index f66eece63..0e5c5c0c3 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -36,14 +36,14 @@
 typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
 K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
 
-KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
+KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
                                   TQObject *parent, const char *name,
                                   const TQStringList& )
   : KParts::ReadOnlyPart( parent, name )
 {
   setInstance( KitchenSyncFactory::instance() );
 
-  TQVBox *canvas = new TQVBox( parentWidget, widgetName );
+  TQVBox *canvas = new TQVBox( tqparentWidget, widgetName );
   setWidget( canvas );
 
   new MainWidget( this, canvas );
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 3e053bbdc..d9e03a3f0 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -32,7 +32,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
   Q_OBJECT
 
   public:
-    KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
+    KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
                      TQObject *parent, const char *name, const TQStringList& );
     virtual ~KitchenSyncPart();
 
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index d981599bd..d8d6c46d5 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -38,11 +38,11 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   : KWidgetListItem( list ), mPlugin( plugin )
 {
   TQString iconName = MemberInfo::pluginIconName( mPlugin.name() );
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *icon = new TQLabel( this );
   icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
-  icon->setFixedSize( icon->sizeHint() );
+  icon->setFixedSize( icon->tqsizeHint() );
 
   TQLabel *name = new TQLabel( plugin.longName(), this );
   TQLabel *description = new TQLabel( plugin.description(), this );
@@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   font.setBold( true );
   name->setFont( font );
 
-  layout->addWidget( icon, 0, 0 );
-  layout->addWidget( name, 0, 1 );
-  layout->addWidget( description, 1, 1 );
+  tqlayout->addWidget( icon, 0, 0 );
+  tqlayout->addWidget( name, 0, 1 );
+  tqlayout->addWidget( description, 1, 1 );
 }
 
 
 PluginPicker::PluginPicker( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQBoxLayout *layout = new TQVBoxLayout( this );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mPluginList = new KWidgetList( this );
-  layout->addWidget( mPluginList );
+  tqlayout->addWidget( mPluginList );
 
   connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ),
            TQT_SIGNAL( selected() ) );
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 8975b6f98..f9228e174 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange()
 
 void SingleConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
   mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
 
-  layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
+  tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
-  layout->addWidget( button, 2, 0 );
+  tqlayout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
+  tqlayout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
+  tqlayout->addWidget( button, 2, 2 );
 
   button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
-  layout->addWidget( button, 2, 3 );
+  tqlayout->addWidget( button, 2, 3 );
 }
 
 #include "singleconflictdialog.moc"
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 60310b803..924151bd9 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -90,7 +90,7 @@ void SyncProcess::applyObjectTypeFilter()
   const TQStringList activeObjectTypes = mGroup.config().activeObjectTypes();
 
   for ( uint i = 0; i < objectTypes.count(); ++i ) {
-    if ( activeObjectTypes.contains( objectTypes[ i ] ) ) {
+    if ( activeObjectTypes.tqcontains( objectTypes[ i ] ) ) {
       kdDebug() << "Enabled object type: " <<  objectTypes[ i ] << endl;
       /*
        * This is not required. Also this lead to filtering problems when sync with "file-sync".
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 629390928..7d0ed2382 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -25,8 +25,8 @@ INDEXLIB=../indexlib/libindex.la
 endif
 
 lib_LTLIBRARIES = libkmailprivate.la
-libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libkmailprivate_la_LIBADD  = \
+libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libkdepim
+libkmailprivate_la_LIBADD = \
         ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \
         ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
@@ -49,7 +49,7 @@ linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
 link_DATA = application_octetstream.desktop
 
 bin_PROGRAMS = kmail
-kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdepim -lkdepim
 kmail_LDADD   = libkmailprivate.la
 
 libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index e525fae49..19d25574f 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -156,7 +156,7 @@ namespace KMail {
   };
 
   static const about_data credits[] = {
-    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
+    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons tqreplacement
     { "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)
@@ -196,7 +196,7 @@ namespace KMail {
       "jan@simonson.pp.se", 0 },
     { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up
     { "Will Stephenson", 0, 0, 0 }, // added IM status indicator
-    { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor
+    { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor
     { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"),
       "patrick.vogt@unibas.ch", 0 },
     { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"),
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 8254bac9a..51c729772 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -156,11 +156,11 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
     default_Location += '/';
     default_Location += getenv("USER");
   }
-  if ( !mSpoolFiles.contains(default_Location) )
+  if ( !mSpoolFiles.tqcontains(default_Location) )
     mSpoolFiles << default_Location;
 
   default_Location = default_Location + ".lock";
-  if ( !mLockFiles.contains(default_Location) )
+  if ( !mLockFiles.tqcontains(default_Location) )
     mLockFiles << default_Location;
 }
 
@@ -173,7 +173,7 @@ void
 ProcmailRCParser::processGlobalLock(const TQString &s)
 {
   TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace());
-  if ( !mLockFiles.contains(val) )
+  if ( !mLockFiles.tqcontains(val) )
     mLockFiles << val;
 }
 
@@ -215,7 +215,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       line.insert(0, *(mVars["MAILDIR"]) + '/');
 
     // now we have the spoolfile name
-    if ( !mSpoolFiles.contains(line) )
+    if ( !mSpoolFiles.tqcontains(line) )
       mSpoolFiles << line;
 
     if( colonPos > 0 && (!val || val.isEmpty()) ) {
@@ -230,7 +230,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
         val += ".lock";
     }
 
-    if ( !val.isNull() && !mLockFiles.contains(val) ) {
+    if ( !val.isNull() && !mLockFiles.tqcontains(val) ) {
       mLockFiles << val;
     }
   }
@@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s)
   TQAsciiDictIterator it( mVars ); // iterator for dict
 
   while ( it.current() ) {
-    expS.replace(TQString::fromLatin1("$") + it.currentKey(), *it.current());
+    expS.tqreplace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current());
     ++it;
   }
 
@@ -306,7 +306,7 @@ AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
   else
   {
     TQString msg = i18n( "Account type is not supported." );
-    KMessageBox::information( topLevelWidget(),msg,i18n("Configure Account") );
+    KMessageBox::information( tqtopLevelWidget(),msg,i18n("Configure Account") );
     return;
   }
 
@@ -358,10 +358,10 @@ void AccountDialog::makeLocalAccountPage()
 
   TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
   group->setColumnLayout(0, Qt::Horizontal);
-  group->layout()->setSpacing( 0 );
-  group->layout()->setMargin( 0 );
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  group->tqlayout()->setSpacing( 0 );
+  group->tqlayout()->setMargin( 0 );
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
@@ -806,7 +806,7 @@ void AccountDialog::makePopAccountPage()
   mPop.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mPop.authGroup, "auth digest-md5" );
   mPop.authNTLM = new TQRadioButton( i18n("&NTLM"), mPop.authGroup, "auth ntlm" );
   mPop.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mPop.authGroup, "auth gssapi" );
-  if ( KProtocolInfo::capabilities("pop3").contains("SASL") == 0 )
+  if ( KProtocolInfo::capabilities("pop3").tqcontains("SASL") == 0 )
   {
     mPop.authNTLM->hide();
     mPop.authGSSAPI->hide();
@@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   // button to reload
   TQToolButton* button = new TQToolButton( box );
   button->setAutoRaise(true);
-  button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   button->setFixedSize( 22, 22 );
   button->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) );
@@ -924,7 +924,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editPNS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editPNS->setAutoRaise( true );
-  mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editPNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editPNS->setFixedSize( 22, 22 );
   connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) );
 
@@ -936,7 +936,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editONS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editONS->setAutoRaise( true );
-  mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editONS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editONS->setFixedSize( 22, 22 );
   connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) );
 
@@ -948,7 +948,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editSNS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editSNS->setAutoRaise( true );
-  mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editSNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editSNS->setFixedSize( 22, 22 );
   connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) );
 
@@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
 
   // TODO (marc/bo): Test this
   mSieveConfigEditor = new SieveConfigEditor( tabWidget );
-  mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() );
+  mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() );
   tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") );
 
   connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged()));
@@ -1451,7 +1451,7 @@ void AccountDialog::slotLeaveOnServerClicked()
     slotEnableLeaveOnServerSize( state );
   }
   if ( !( mCurCapa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support unique "
                                    "message numbers, but this is a "
                                    "requirement for leaving messages on the "
@@ -1466,7 +1466,7 @@ void AccountDialog::slotLeaveOnServerClicked()
 void AccountDialog::slotFilterOnServerClicked()
 {
   if ( !( mCurCapa & TOP ) && mPop.filterOnServerCheck->isChecked() ) {
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support "
                                    "fetching message headers, but this is a "
                                    "requirement for filtering messages on the "
@@ -1481,7 +1481,7 @@ void AccountDialog::slotFilterOnServerClicked()
 void AccountDialog::slotPipeliningClicked()
 {
   if (mPop.usePipeliningCheck->isChecked())
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
       i18n("Please note that this feature can cause some POP3 servers "
       "that do not support pipelining to send corrupted mail;\n"
       "this is configurable, though, because some servers support pipelining "
@@ -1636,7 +1636,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   mPop.authAPOP->setEnabled( capa & APOP );
   if ( !( capa & Pipelining ) && mPop.usePipeliningCheck->isChecked() ) {
     mPop.usePipeliningCheck->setChecked( false );
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support "
                                    "pipelining; therefore, this option has "
                                    "been disabled.\n"
@@ -1655,7 +1655,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   }
   if ( !( capa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
     mPop.leaveOnServerCheck->setChecked( false );
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support unique "
                                    "message numbers, but this is a "
                                    "requirement for leaving messages on the "
@@ -1668,7 +1668,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   }
   if ( !( capa & TOP ) && mPop.filterOnServerCheck->isChecked() ) {
     mPop.filterOnServerCheck->setChecked( false );
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support "
                                    "fetching message headers, but this is a "
                                    "requirement for filtering messages on the "
@@ -2307,7 +2307,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
     button->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) );
     button->setAutoRaise( true );
-    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     button->setFixedSize( 22, 22 );
     mLineEditMap[ mBg->insert( button ) ] = edit;
   }
@@ -2315,7 +2315,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
 
 void NamespaceEditDialog::slotRemoveEntry( int id )
 {
-  if ( mLineEditMap.contains( id ) ) {
+  if ( mLineEditMap.tqcontains( id ) ) {
     // delete the lineedit and remove namespace from map
     NamespaceLineEdit* edit = mLineEditMap[id];
     mDelimMap.remove( edit->text() );
@@ -2343,7 +2343,7 @@ void NamespaceEditDialog::slotOk()
       mDelimMap.remove( edit->lastText() );
     }
   }
-  mNamespaceMap->replace( mType, mDelimMap );
+  mNamespaceMap->tqreplace( mType, mDelimMap );
   KDialogBase::slotOk();
 }
 
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 0610622f7..5484c66d8 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
   if ( mAcctChecking.isEmpty() ) {
     // all checks finished, display summary
     if ( mDisplaySummary )
-      KPIM::BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      KPIM::BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
           mTotalNewMailsArrived );
     emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -222,7 +222,7 @@ void AccountManager::processNextCheck( bool _newMail )
   connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
-  KPIM::BroadcastStatus::instance()->setStatusMsg(
+  KPIM::BroadcasStatus::instance()->seStatusMsg(
       i18n("Checking account %1 for new mail").arg(curAccount->name()));
 
   kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
@@ -358,11 +358,11 @@ void AccountManager::checkMail( bool _interactive )
 
 //-----------------------------------------------------------------------------
 void AccountManager::singleInvalidateIMAPFolders(KMAccount *account) {
-  account->invalidateIMAPFolders();
+  account->tqinvalidateIMAPFolders();
 }
 
 
-void AccountManager::invalidateIMAPFolders()
+void AccountManager::tqinvalidateIMAPFolders()
 {
   for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
     singleInvalidateIMAPFolders( *it );
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 94bf470ad..f693180f1 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -82,7 +82,7 @@ public:
   void checkMail( bool interactive = true );
 
   /** Delete all IMAP folders and resync them */
-  void invalidateIMAPFolders();
+  void tqinvalidateIMAPFolders();
 
   TQStringList getAccounts() const;
 
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 589ef5d63..0dfb503d9 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage()
 void AccountWizard::setupAccountInformationPage()
 {
   mAccountInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage );
   mRealName = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mRealName );
 
-  layout->addWidget( label, 0, 0 );
-  layout->addWidget( mRealName, 0, 1 );
+  tqlayout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( mRealName, 0, 1 );
 
   label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage );
   mEMailAddress = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mEMailAddress );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mEMailAddress, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mEMailAddress, 1, 1 );
 
   label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage );
   mOrganization = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mOrganization );
 
-  layout->addWidget( label, 2, 0 );
-  layout->addWidget( mOrganization, 2, 1 );
+  tqlayout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( mOrganization, 2, 1 );
 
   addPage( mAccountInformationPage, i18n( "Account Information" ) );
 }
@@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage()
 void AccountWizard::setupLoginInformationPage()
 {
   mLoginInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage );
   mLoginName = new KLineEdit( mLoginInformationPage );
   label->setBuddy( mLoginName );
 
-  layout->addWidget( label, 0, 0 );
-  layout->addWidget( mLoginName, 0, 1 );
+  tqlayout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( mLoginName, 0, 1 );
 
   label = new TQLabel( i18n( "Password:" ), mLoginInformationPage );
   mPassword = new KLineEdit( mLoginInformationPage );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mPassword, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mPassword, 1, 1 );
 
   addPage( mLoginInformationPage, i18n( "Login Information" ) );
 }
@@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage()
 void AccountWizard::setupServerInformationPage()
 {
   mServerInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   mIncomingLabel = new TQLabel( mServerInformationPage );
@@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage()
   connect( mChooseLocation, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( chooseLocation() ) );
 
-  layout->addWidget( mIncomingLabel, 0, 0, AlignTop );
-  layout->addWidget( mIncomingLocationWdg, 0, 1 );
-  layout->addWidget( mIncomingServerWdg, 0, 1 );
+  tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop );
+  tqlayout->addWidget( mIncomingLocationWdg, 0, 1 );
+  tqlayout->addWidget( mIncomingServerWdg, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage );
   mOutgoingServer = new KLineEdit( mServerInformationPage );
   label->setBuddy( mOutgoingServer );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mOutgoingServer, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mOutgoingServer, 1, 1 );
 
   mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage );
-  layout->addWidget( mOutgoingUseSSL, 2, 1 );
+  tqlayout->addWidget( mOutgoingUseSSL, 2, 1 );
 
   mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ),
                                   mServerInformationPage );
-  layout->addWidget( mLocalDelivery, 3, 0 );
+  tqlayout->addWidget( mLocalDelivery, 3, 0 );
 
   connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ),
            mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) );
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 1f9b6bb5d..9926cc463 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -122,7 +122,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions )
 
 KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
 {
-  TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) );
+  TQString perm = TQString::tqfromLatin1( permissionsToIMAPRights( permissions ) );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index 2a868540b..d6a9b245b 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -51,7 +51,7 @@ namespace KMail {
   typedef TQValueVector ACLList;
 
 /**
- * This namespace contains functions that return jobs for ACL operations.
+ * This namespace tqcontains 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
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 0af6cdd4f..6975b3fcd 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -157,8 +157,8 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
 {
   srcFolder->open("actionschedsrc");
   if (mSrcFolder) {
-    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-		this, TQT_SLOT(msgAdded(KMFolder*, Q_UINT32)) );
+    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+		this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
     disconnect( mSrcFolder, TQT_SIGNAL(closed()),
                 this, TQT_SLOT(folderClosedOrExpunged()) );
     disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
@@ -170,8 +170,8 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
   for (i = 0; i < mSrcFolder->count(); ++i)
     enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() );
   if (mSrcFolder) {
-    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-	     this, TQT_SLOT(msgAdded(KMFolder*, Q_UINT32)) );
+    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+	     this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
     connect( mSrcFolder, TQT_SIGNAL(closed()),
              this, TQT_SLOT(folderClosedOrExpunged()) );
     connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
@@ -230,9 +230,9 @@ void ActionScheduler::tempCloseFolders()
   mOpenFolders.clear();
 }
 
-void ActionScheduler::execFilters(const TQValueList serNums)
+void ActionScheduler::execFilters(const TQValueList serNums)
 {
-  TQValueListConstIterator it;
+  TQValueListConstIterator it;
   for (it = serNums.begin(); it != serNums.end(); ++it)
     execFilters( *it );
 }
@@ -250,7 +250,7 @@ void ActionScheduler::execFilters(KMMsgBase* msgBase)
   execFilters( msgBase->getMsgSerNum() );
 }
 
-void ActionScheduler::execFilters(Q_UINT32 serNum)
+void ActionScheduler::execFilters(TQ_UINT32 serNum)
 {
   if (mResult != ResultOk) {
       if ((mResult != ResultCriticalError) &&
@@ -279,7 +279,7 @@ void ActionScheduler::execFilters(Q_UINT32 serNum)
   }
 }
 
-KMMsgBase *ActionScheduler::messageBase(Q_UINT32 serNum)
+KMMsgBase *ActionScheduler::messageBase(TQ_UINT32 serNum)
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -299,7 +299,7 @@ KMMsgBase *ActionScheduler::messageBase(Q_UINT32 serNum)
   return msg;
 }
 
-KMMessage *ActionScheduler::message(Q_UINT32 serNum)
+KMMessage *ActionScheduler::message(TQ_UINT32 serNum)
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -380,7 +380,7 @@ void ActionScheduler::finish()
 
 void ActionScheduler::fetchMessage()
 {
-  TQValueListIterator mFetchMessageIt = mFetchSerNums.begin();
+  TQValueListIterator mFetchMessageIt = mFetchSerNums.begin();
   while (mFetchMessageIt != mFetchSerNums.end()) {
     if (!MessageProperty::transferInProgress(*mFetchMessageIt))
       break;
@@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg )
     serNumS.setNum( msg->getMsgSerNum() );
     KMMessage *newMsg = new KMMessage;
     newMsg->fromString(msg->asString());
-    newMsg->setStatus(msg->status());
+    newMsg->seStatus(msg->status());
     newMsg->setComplete(msg->isComplete());
     newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
     mSrcFolder->addMsg( newMsg );
@@ -466,13 +466,13 @@ void ActionScheduler::messageFetched( KMMessage *msg )
   return;
 }
 
-void ActionScheduler::msgAdded( KMFolder*, Q_UINT32 serNum )
+void ActionScheduler::msgAdded( KMFolder*, TQ_UINT32 serNum )
 {
   if (!mIgnore)
     enqueue( serNum );
 }
 
-void ActionScheduler::enqueue(Q_UINT32 serNum)
+void ActionScheduler::enqueue(TQ_UINT32 serNum)
 {
   if (mResult != ResultOk)
     return; // An error has already occurred don't even try to process this msg
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index e785210b6..3c9894502 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -84,10 +84,10 @@ public:
   void clearAccountId() { mAccountId = 0; mAccount = false; }
 
   /** Queue a message for filtering */
-  void execFilters(const TQValueList serNums);
+  void execFilters(const TQValueList serNums);
   void execFilters(const TQPtrList msgList);
   void execFilters(KMMsgBase* msgBase);
-  void execFilters(Q_UINT32 serNum);
+  void execFilters(TQ_UINT32 serNum);
 
   static TQString debug();
   static bool isEnabled();
@@ -101,7 +101,7 @@ public:
 signals:
   /** Emitted when filtering is completed */
   void result(ReturnCode);
-  void filtered(Q_UINT32);
+  void filtered(TQ_UINT32);
 
 public slots:
   /** Called back by asynchronous actions when they have completed */
@@ -111,8 +111,8 @@ public slots:
   void copyMessageFinished( KMCommand *command );
 
 private slots:
-  KMMsgBase* messageBase(Q_UINT32 serNum);
-  KMMessage* message(Q_UINT32 serNum);
+  KMMsgBase* messageBase(TQ_UINT32 serNum);
+  KMMessage* message(TQ_UINT32 serNum);
   void finish();
 
   void folderClosedOrExpunged();
@@ -123,8 +123,8 @@ private slots:
   //Fetching slots
   void fetchMessage();
   void messageFetched( KMMessage *msg );
-  void msgAdded( KMFolder*, Q_UINT32 );
-  void enqueue(Q_UINT32 serNum);
+  void msgAdded( KMFolder*, TQ_UINT32 );
+  void enqueue(TQ_UINT32 serNum);
 
   //Filtering slots
   void processMessage();
@@ -140,9 +140,9 @@ private:
   static KMFolderMgr *tempFolderMgr;
   static int refCount, count;
   static bool sEnabled, sEnabledChecked;
-  TQValueListIterator mMessageIt;
+  TQValueListIterator mMessageIt;
   TQValueListIterator mFilterIt;
-  TQValueList mSerNums, mFetchSerNums;
+  TQValueList mSerNums, mFetchSerNums;
   TQValueList > mOpenFolders;
   TQValueList mFilters, mQueuedFilters;
   KMFilterAction* mFilterAction;
@@ -157,7 +157,7 @@ private:
   bool mAlwaysMatch;
   bool mAccount;
   uint mAccountId;
-  Q_UINT32 mOriginalSerNum;
+  TQ_UINT32 mOriginalSerNum;
   bool mDeleteSrcFolder;
   ReturnCode mResult;
   TQTimer *finishTimer, *fetchMessageTimer, *tempCloseFoldersTimer;
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 2c6ca984d..df3da1ad0 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -50,7 +50,7 @@ struct AnnotationAttribute {
 typedef TQValueVector AnnotationList;
 
 /**
- * This namespace contains functions that return jobs for annotation operations.
+ * This namespace tqcontains 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
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 17d7ed1ed..15b3e7f79 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -150,7 +150,7 @@ void AntiSpamWizard::accept()
 
   KMFilterActionDict dict;
   TQValueList filterList;
-  bool replaceExistingFilters = false;
+  bool tqreplaceExistingFilters = 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 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;
+    // 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;
     for ( TQValueListIterator 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 ( replaceExistingFilters )
+        if ( tqreplaceExistingFilters )
           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 ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       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 ( replaceExistingFilters )
+      if ( tqreplaceExistingFilters )
         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 ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       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 ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       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, replaceExistingFilters );
+          filterList, tqreplaceExistingFilters );
 
   TQDialog::accept();
 }
@@ -505,9 +505,9 @@ void AntiSpamWizard::checkToolAvailability()
       AccountManager* mgr = kmkernel->acctMgr();
       KMAccount* account = mgr->first();
       while ( account ) {
-        if ( account->type() == "pop" || account->type().contains( "imap" ) ) {
+        if ( account->type() == "pop" || account->type().tqcontains( "imap" ) ) {
           const NetworkAccount * n = dynamic_cast( account );
-          if ( n && n->host().lower().contains( pattern.lower() ) ) {
+          if ( n && n->host().lower().tqcontains( pattern.lower() ) ) {
             mInfoPage->addAvailableTool( (*it).getVisibleName() );
             found = true;
           }
@@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary()
 {
   TQString text;
   TQString newFilters;
-  TQString replaceFilters;
+  TQString tqreplaceFilters;
 
   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, replaceFilters );
+        sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters );
       }
     }
-    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters );
+    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters );
 
     // 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, replaceFilters );
+                               newFilters, tqreplaceFilters );
         text += i18n( "
        The folder for messages classified as unsure (probably spam) is " )
               + mSpamRulesPage->selectedUnsureFolderName() + ".
        ";
       }
@@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary()
 
     // Manual classification via toolbar icon / manually applied filter action
     sortFilterOnExistance( i18n( "Classify as spam" ),
-                            newFilters, replaceFilters );
+                            newFilters, tqreplaceFilters );
     sortFilterOnExistance( i18n( "Classify as NOT spam" ),
-                            newFilters, replaceFilters );
+                            newFilters, tqreplaceFilters );
 
     // Show the filters in the summary
     if ( !newFilters.isEmpty() )
       text += i18n( "
        The wizard will create the following filters:
          " )
             + newFilters + "
        ";
-    if ( !replaceFilters.isEmpty() )
-      text += i18n( "
        The wizard will replace the following filters:
          " )
-            + replaceFilters + "
        ";
+    if ( !tqreplaceFilters.isEmpty() )
+      text += i18n( "
        The wizard will tqreplace the following filters:
          " )
+            + tqreplaceFilters + "
        ";
   }
 
   mSummaryPage->setSummaryText( text );
@@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name )
 
 void AntiSpamWizard::sortFilterOnExistance(
         const TQString & intendedFilterName,
-        TQString & newFilters, TQString & replaceFilters )
+        TQString & newFilters, TQString & tqreplaceFilters )
 {
   if ( uniqueNameFor( intendedFilterName ) == intendedFilterName )
     newFilters += "
      • " + intendedFilterName + "
        • ";
   else
-    replaceFilters += "
      • " + intendedFilterName + "
        • ";
+    tqreplaceFilters += "
      • " + intendedFilterName + "
        • ";
 }
 
 
@@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
                               TQWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
-  TQBoxLayout * layout = new TQVBoxLayout( mLayout );
+  TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
   mIntroText = new TQLabel( this );
   mIntroText->setText(
@@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
       "deleting the filter rules created by the wizard to get "
       "back to the former behavior."
       ) );
-  layout->addWidget( mIntroText );
+  tqlayout->addWidget( mIntroText );
 
   mScanProgressText = new TQLabel( this );
   mScanProgressText->setText( "" ) ;
-  layout->addWidget( mScanProgressText );
+  tqlayout->addWidget( mScanProgressText );
 
   mToolsList = new KListBox( this );
   mToolsList->hide();
   mToolsList->setSelectionMode( TQListBox::Multi );
   mToolsList->setRowMode( TQListBox::FixedNumber );
   mToolsList->setRowMode( 10 );
-  layout->addWidget( mToolsList );
+  tqlayout->addWidget( mToolsList );
   connect( mToolsList, TQT_SIGNAL(selectionChanged()),
            this, TQT_SLOT(processSelectionChange(void)) );
 
   mSelectionHint = new TQLabel( this );
   mSelectionHint->setText( "" );
-  layout->addWidget( mSelectionHint );
+  tqlayout->addWidget( mSelectionHint );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 }
 
 
@@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
                                         KMFolderTree * mainFolderTree )
   : ASWizPage( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( mLayout );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
 
   mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this );
   TQWhatsThis::add( mMarkRules,
       i18n( "Mark messages which have been classified as spam as read.") );
-  layout->addWidget( mMarkRules);
+  tqlayout->addWidget( mMarkRules);
 
   mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this );
   TQWhatsThis::add( mMoveSpamRules,
       i18n( "The default folder for spam messages is the trash folder, "
             "but you may change that in the folder view below.") );
-  layout->addWidget( mMoveSpamRules );
+  tqlayout->addWidget( mMoveSpamRules );
 
   mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree );
   mFolderReqForSpamFolder->setFolder( "trash" );
@@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
   mFolderReqForSpamFolder->setShowOutbox( false );
   mFolderReqForSpamFolder->setShowImapFolders( false );
 
-  TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout );
+  TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout );
   hLayout1->addSpacing( KDialog::spacingHint() * 3 );
   hLayout1->addWidget( mFolderReqForSpamFolder );
 
@@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
             "in the folder view below.
        "
             "Not all tools support a classification as unsure. If you haven't "
             "selected a capable tool, you can't select a folder as well.") );
-  layout->addWidget( mMoveUnsureRules );
+  tqlayout->addWidget( mMoveUnsureRules );
 
   mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree );
   mFolderReqForUnsureFolder->setFolder( "inbox" );
@@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
   mFolderReqForUnsureFolder->setShowOutbox( false );
   mFolderReqForUnsureFolder->setShowImapFolders( false );
 
-  TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout );
+  TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout );
   hLayout2->addSpacing( KDialog::spacingHint() * 3 );
   hLayout2->addWidget( mFolderReqForUnsureFolder );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   connect( mMarkRules, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(processSelectionChange(void)) );
@@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange()
 ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
-  TQBoxLayout * layout = new TQVBoxLayout( mLayout );
+  TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
   mSummaryText = new TQLabel( this );
-  layout->addWidget( mSummaryText );
-  layout->addStretch();
+  tqlayout->addWidget( mSummaryText );
+  tqlayout->addStretch();
 }
 
 
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 738d8516a..e80234263 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -259,7 +259,7 @@ namespace KMail {
       /* convenience method to sort out new and existing filters */
       void sortFilterOnExistance( const TQString & intendedFilterName,
                                   TQString & newFilters, 
-                                  TQString & replaceFilters );
+                                  TQString & tqreplaceFilters );
 
       /* The pages in the wizard */
       ASWizInfoPage * mInfoPage;
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 5bf2cf93f..979065e4d 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName )
   }
   return currentPath +
     i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName +
-    "_" + TQDate::currentDate().toString( TQt::ISODate ) + ".tar.bz2";
+    "_" + TQDate::tqcurrentDate().toString( TQt::ISODate ) + ".tar.bz2";
 }
 
 ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
@@ -120,7 +120,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
   mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 );
 
   // Make it a bit bigger, else the folder requester cuts off the text too early
-  resize( 500, minimumSize().height() );
+  resize( 500, tqminimumSize().height() );
 }
 
 void ArchiveFolderDialog::slotUrlChanged( const TQString &text )
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 11c53f123..49fc3935d 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -93,7 +93,7 @@ void AttachmentListView::contentsDropEvent( TQDropEvent* e )
     TQBuffer serNumBuffer( serNums );
     serNumBuffer.open( IO_ReadOnly );
     TQDataStream serNumStream( &serNumBuffer );
-    Q_UINT32 serNum;
+    TQ_UINT32 serNum;
     KMFolder *folder = 0;
     int idx;
     TQPtrList messageList;
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index fd53997b3..a20e4118e 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -165,7 +165,7 @@ void BackupJob::finish()
     }
   }
 
-  mProgressItem->setStatus( i18n( "Archiving finished" ) );
+  mProgressItem->seStatus( i18n( "Archiving finished" ) );
   mProgressItem->setComplete();
   mProgressItem = 0;
 
@@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder()
 
   mCurrentFolder = mPendingFolders.take( 0 );
   kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
-  mProgressItem->setStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
+  mProgressItem->seStatus( 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/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index 6b61b9bce..a69c01bf3 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -302,7 +302,7 @@ static const KMail::BodyPartFormatter * createForApplication( const char * subty
   return AnyTypeBodyPartFormatter::create();
 }
 
-// OK, replace this with a factory with plugin support later on...
+// OK, tqreplace 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/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 04b7a98b8..5c9205849 100644
--- a/kmail/bodyvisitor.cpp
+++ b/kmail/bodyvisitor.cpp
@@ -78,11 +78,11 @@ namespace KMail {
       ++it;
       // skip this part if the parent part is already loading
       if ( part->parent() &&
-           selected.contains( part->parent() ) &&
+           selected.tqcontains( part->parent() ) &&
            part->loadPart() )
         continue;
 
-      if ( part->originalContentTypeStr().contains("SIGNED") )
+      if ( part->originalContentTypeStr().tqcontains("SIGNED") )
       {
         // signed messages have to be loaded completely
         // so construct a new dummy part that loads the body
@@ -115,7 +115,7 @@ namespace KMail {
 
       // check whether to load this part or not:
       // look at the basic list, ask the subclass and check the parent
-      if ( mBasicList.contains( part->originalContentTypeStr() ) ||
+      if ( mBasicList.tqcontains( part->originalContentTypeStr() ) ||
            parentNeedsLoading( part ) ||
            addPartToList( part ) )
       {
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 2393b2576..f80f56744 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
 
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() +
-               TQString::fromLatin1(";UID=%1").arg(uids) );
+               TQString::tqfromLatin1(";UID=%1").arg(uids) );
 
   KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
@@ -248,7 +248,7 @@ void CachedImapJob::expungeFolder()
 {
   KURL url = mAccount->getUrl();
   // Special URL that means EXPUNGE
-  url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
+  url.setPath( mFolder->imapPath() + TQString::tqfromLatin1(";UID=*") );
 
   KIO::SimpleJob *job = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
       mFolder->addMsgInternal( mMsg, true, &index );
 
       if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
-        mFolder->setStatus( index, KMMsgStatusRead, false );
+        mFolder->seStatus( index, KMMsgStatusRead, false );
       }
 
       emit messageRetrieved( mMsg );
@@ -404,7 +404,7 @@ void CachedImapJob::slotPutNextMessage()
   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);
-  TQCString mData(cstr.length() + cstr.contains('\n'));
+  TQCString mData(cstr.length() + cstr.tqcontains('\n'));
   unsigned int i = 0;
   for( char *ch = cstr.data(); *ch; ch++ ) {
     if ( *ch == '\n' ) {
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index be787ff8e..6f5636992 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
   msg->setSubject( subject );
   if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) {
     if ( status == TQString("cancel") )
-      msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Declined: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("tentative") )
-      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("accepted") )
-      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("delegated") )
-      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).tqreplace("Answer: ","") );
   }
   msg->setTo( to );
   msg->setFrom( receiver() );
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index 6c82c379a..ac4d3278a 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
 {
   TQWidget *page = makeMainWidget();
 
-  TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint());
 
   mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page );
-  layout->addWidget( mLabel );
+  tqlayout->addWidget( mLabel );
 
   mListBox = new KListBox( page );
   mListBox->insertStringList( keys );
   const int current = keys.findIndex( currentKey );
   mListBox->setSelected( QMAX( 0, current ), true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 1 );
+  tqlayout->addWidget( mListBox, 1 );
 
   TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page );
-  layout->addWidget( optionLabel );
+  tqlayout->addWidget( optionLabel );
 
   mOptions = new KLineEdit( lastOptions, page );
   optionLabel->setBuddy( mOptions );
-  layout->addWidget( mOptions );
+  tqlayout->addWidget( mOptions );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
   connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 243a17537..183b72163 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -28,7 +28,7 @@
 #include "compactionjob.h"
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldermbox.h"
 #include "kmfoldermaildir.h"
 
@@ -97,7 +97,7 @@ 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() );
-      BroadcastStatus::instance()->setStatusMsg( str );
+      BroadcasStatus::instance()->seStatusMsg( str );
     }
     return 0;
   }
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
   mErrorCode = rc;
 
   if ( !mSilent )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::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 )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui
index c59c7af02..696334e19 100644
--- a/kmail/composercryptoconfiguration.ui
+++ b/kmail/composercryptoconfiguration.ui
@@ -4,7 +4,7 @@
     
         ComposerCryptoConfiguration
     
-    
+    
         
             0
             0
@@ -137,7 +137,7 @@ However, there may be local rules that require you to turn this option on. When
             
                 Expanding
             
-            
+            
                 
                     20
                     20
@@ -154,5 +154,5 @@ However, there may be local rules that require you to turn this option on. When
     mAutoEncrypt
     mNeverEncryptWhenSavingInDrafts
 
-
+
 
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4378c325d..c5824eadc 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -167,7 +167,7 @@ namespace {
 
   void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) {
     g->setTitle( i18n( e.desc ) );
-    g->layout()->setSpacing( KDialog::spacingHint() );
+    g->tqlayout()->setSpacing( KDialog::spacingHint() );
     for ( int i = 0 ; i < e.numItems ; ++i )
       g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i );
   }
@@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  int width = geometry.readNumEntry( "ConfigureDialogWidth" );
-  int height = geometry.readNumEntry( "ConfigureDialogHeight" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
+  int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( "ConfigureDialogWidth", width() );
-  geometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
+  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
 }
 
@@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() {
 // *                                                           *
 // *************************************************************
 TQString IdentityPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-identity");
+  return TQString::tqfromLatin1("configure-identity");
 }
 
 IdentityPage::IdentityPage( TQWidget * parent, const char * name )
@@ -480,7 +480,7 @@ void IdentityPage::slotRenameIdentity( TQListViewItem * i,
 
   TQString newName = s.stripWhiteSpace();
   if ( !newName.isEmpty() &&
-       !kmkernel->identityManager()->shadowIdentities().contains( newName ) ) {
+       !kmkernel->identityManager()->shadowIdentities().tqcontains( newName ) ) {
     KPIM::Identity & ident = item->identity();
     ident.setIdentityName( newName );
     emit changed(true);
@@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl )
 // *                                                           *
 // *************************************************************
 TQString AccountsPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts");
+  return TQString::tqfromLatin1("configure-accounts");
 }
 
 AccountsPage::AccountsPage( TQWidget * parent, const char * name )
@@ -578,7 +578,7 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name )
 }
 
 TQString AccountsPage::SendingTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts-sending");
+  return TQString::tqfromLatin1("configure-accounts-sending");
 }
 
 AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
@@ -597,9 +597,9 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
   // label: zero stretch ### FIXME more
   vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) );
 
-  // hbox layout: stretch 10, spacing inherited from vlay
+  // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
-  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint
+  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint
 
   // transport list: left widget in hlay; stretch 1
   // ### FIXME: allow inline renaming of the account:
@@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
            this, TQT_SLOT(slotModifySelectedTransport()) );
   hlay->addWidget( mTransportList, 1 );
 
-  // a vbox layout for the buttons: zero stretch, spacing inherited from hlay
+  // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay
   btn_vlay = new TQVBoxLayout( hlay );
 
   // "add..." button: stretch 0
@@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
                          i18n("Common Options"), this );
   vlay->addWidget(group);
 
-  // a grid layout for the contents of the "common options" group box
-  glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() );
+  // a grid tqlayout for the contents of the "common options" group box
+  glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() );
   glay->setColStretch( 2, 10 );
 
   // "confirm before send" check box:
@@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport()
   KMTransportInfo *transportInfo = new KMTransportInfo();
   switch ( transportType ) {
   case 0: // smtp
-    transportInfo->type = TQString::fromLatin1("smtp");
+    transportInfo->type = TQString::tqfromLatin1("smtp");
     break;
   case 1: // sendmail
-    transportInfo->type = TQString::fromLatin1("sendmail");
+    transportInfo->type = TQString::tqfromLatin1("sendmail");
     transportInfo->name = i18n("Sendmail");
     transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define
     break;
@@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() {
       buffer[255] = 0;
     else
       buffer[0] = 0;
-    str = TQString::fromLatin1( *buffer ? buffer : "localhost" );
+    str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" );
   }
   mDefaultDomainEdit->setText( str );
 }
@@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() {
 }
 
 TQString AccountsPage::ReceivingTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts-receiving");
+  return TQString::tqfromLatin1("configure-accounts-receiving");
 }
 
 AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
@@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // label: zero stretch
   vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) );
 
-  // hbox layout: stretch 10, spacing inherited from vlay
+  // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
   vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing
 
@@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
            this, TQT_SLOT(slotModifySelectedAccount()) );
   hlay->addWidget( mAccountList, 1 );
 
-  // a vbox layout for the buttons: zero stretch, spacing inherited from hlay
+  // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay
   btn_vlay = new TQVBoxLayout( hlay );
 
   // "add..." button: stretch 0
@@ -1123,11 +1123,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // "New Mail Notification" group box: stretch 0
   group = new TQVGroupBox( i18n("New Mail Notification"), this );
   vlay->addWidget( group );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   // "beep on new mail" check box:
   mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group );
-  mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                                  TQSizePolicy::Fixed ) );
   connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
@@ -1135,7 +1135,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // "Detailed new mail notification" check box
   mVerboseNotificationCheck =
     new TQCheckBox( i18n( "Deta&iled new mail notification" ), group );
-  mVerboseNotificationCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mVerboseNotificationCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                                          TQSizePolicy::Fixed ) );
   TQToolTip::add( mVerboseNotificationCheck,
                  i18n( "Show for each folder the number of newly arrived "
@@ -1147,7 +1147,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
 
   // "Other Actions" button:
   mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group );
-  mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+  mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                                           TQSizePolicy::Fixed ) );
   connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()),
            this, TQT_SLOT(slotEditNotifications()) );
@@ -1223,13 +1223,13 @@ void AccountsPage::ReceivingTab::slotAddAccount() {
 
     default:
       // ### FIXME: How should this happen???
-      // replace with assert.
+      // tqreplace with assert.
       KMessageBox::sorry( this, i18n("Unknown account type selected") );
       return;
   }
 
   KMAccount *account
-    = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) );
+    = kmkernel->acctMgr()->create( TQString::tqfromLatin1( accountType ) );
   if ( !account ) {
     // ### FIXME: Give the user more information. Is this error
     // recoverable?
@@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() {
 // *                                                           *
 // *************************************************************
 TQString AppearancePage::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance");
+  return TQString::tqfromLatin1("configure-appearance");
 }
 
 AppearancePage::AppearancePage( TQWidget * parent, const char * name )
@@ -1525,7 +1525,7 @@ AppearancePage::AppearancePage( TQWidget * parent, const char * name )
 
 
 TQString AppearancePage::FontsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-fonts");
+  return TQString::tqfromLatin1("configure-appearance-fonts");
 }
 
 static const struct {
@@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() {
 }
 
 TQString AppearancePage::ColorsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-colors");
+  return TQString::tqfromLatin1("configure-appearance-colors");
 }
 
 
@@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() {
 }
 
 TQString AppearancePage::LayoutTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-layout");
+  return TQString::tqfromLatin1("configure-appearance-tqlayout");
 }
 
 static const EnumConfigEntryItem folderListModes[] = {
@@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 
 void AppearancePage::LayoutTab::doLoadOther() {
   const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  loadWidget( mFolderListGroup, geometry, folderListMode );
+  loadWidget( mFolderListGroup, tqgeometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode );
+  loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
 void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
   const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup geometry( profile, "Geometry" );
+  const KConfigGroup tqgeometry( profile, "Geometry" );
 
-  loadProfile( mFolderListGroup, geometry, folderListMode );
+  loadProfile( mFolderListGroup, tqgeometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode );
+  loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
 }
 
 void AppearancePage::LayoutTab::save() {
   KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  saveButtonGroup( mFolderListGroup, geometry, folderListMode );
+  saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode );
-  saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode );
+  saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
   GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() );
 }
 
@@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() {
 //
 
 TQString AppearancePage::HeadersTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-headers");
+  return TQString::tqfromLatin1("configure-appearance-headers");
 }
 
 static const struct {
@@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
   // "General Options" group:
   group = new TQVButtonGroup( i18n( "General Options" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group );
 
@@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
   // "Message Header Threading Options" group:
   mNestingPolicy =
     new TQVButtonGroup( i18n("Threaded Message List Options"), this );
-  mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() );
+  mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mNestingPolicy->insert(
     new TQRadioButton( i18n("Always &keep threads open"),
@@ -2053,11 +2053,11 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
   // "Date Display" group:
   mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this );
-  mDateDisplay->layout()->setSpacing( KDialog::spacingHint() );
+  mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) {
     TQString buttonLabel = i18n(dateDisplayConfig[i].displayName);
-    if ( buttonLabel.contains("%1") )
+    if ( buttonLabel.tqcontains("%1") )
       buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
     radio = new TQRadioButton( buttonLabel, mDateDisplay );
     mDateDisplay->insert( radio, i );
@@ -2094,8 +2094,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
              "
      • ss - the seconds with a leading zero (00-59)
        • "
              "
      • z - the milliseconds without leading zeroes (0-999)
        • "
              "
      • zzz - the milliseconds with leading zeroes (000-999)
        • "
-             "
      • AP - switch to AM/PM display. AP will be replaced by either \"AM\" or \"PM\".
        • "
-             "
      • ap - switch to AM/PM display. ap will be replaced by either \"am\" or \"pm\".
        • "
+             "
      • AP - switch to AM/PM display. AP will be tqreplaced by either \"AM\" or \"PM\".
        • "
+             "
      • ap - switch to AM/PM display. ap will be tqreplaced by either \"am\" or \"pm\".
        • "
              "
      • Z - time zone in numeric form (-0500)
        • "
              "
      "
              "
      All other input characters will be ignored."
@@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
 void AppearancePage::HeadersTab::doLoadOther() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
-  mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
+  mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) );
   mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) );
   mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) );
   mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) );
 
   // "Message Header Threading Options":
-  int num = geometry.readNumEntry( "nestingPolicy", 3 );
+  int num = tqgeometry.readNumEntry( "nestingPolicy", 3 );
   if ( num < 0 || num > 3 ) num = 3;
   mNestingPolicy->setButton( num );
 
@@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
 
 void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   KConfigGroup general( profile, "General" );
-  KConfigGroup geometry( profile, "Geometry" );
+  KConfigGroup tqgeometry( profile, "Geometry" );
 
-  if ( geometry.hasKey( "nestedMessages" ) )
-    mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
+  if ( tqgeometry.hasKey( "nestedMessages" ) )
+    mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) );
   if ( general.hasKey( "showMessageSize" ) )
     mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) );
 
@@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   if ( general.hasKey( "showAttachmentIcon" ) )
     mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) );
 
-  if ( geometry.hasKey( "nestingPolicy" ) ) {
-    int num = geometry.readNumEntry( "nestingPolicy" );
+  if ( tqgeometry.hasKey( "nestingPolicy" ) ) {
+    int num = tqgeometry.readNumEntry( "nestingPolicy" );
     if ( num < 0 || num > 3 ) num = 3;
     mNestingPolicy->setButton( num );
   }
@@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 
 void AppearancePage::HeadersTab::save() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  if ( geometry.readBoolEntry( "nestedMessages", false )
+  if ( tqgeometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
     int result = KMessageBox::warningContinueCancel( this,
                    i18n("Changing the global threading setting will override "
                         "all folder specific values."),
                    TQString::null, KStdGuiItem::cont(), "threadOverride" );
     if ( result == KMessageBox::Continue ) {
-      geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
+      tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
       // remove all threadMessagesOverride keys from all [Folder-*] groups:
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
@@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() {
     }
   }
 
-  geometry.writeEntry( "nestingPolicy",
+  tqgeometry.writeEntry( "nestingPolicy",
                        mNestingPolicy->id( mNestingPolicy->selected() ) );
   general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() );
   general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() );
@@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = {
 };
 
 TQString AppearancePage::ReaderTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-reader");
+  return TQString::tqfromLatin1("configure-appearance-reader");
 }
 
 AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
@@ -2276,7 +2276,7 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
   connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged() ) );
 
-  // "replace smileys by emoticons" check box;
+  // "tqreplace smileys by emoticons" check box;
   populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons );
   vlay->addWidget( mShowEmoticonsCheck );
   connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ),
@@ -2367,7 +2367,7 @@ void AppearancePage::ReaderTab::readCurrentFallbackCodec()
   TQStringList::ConstIterator it( encodings.begin() );
   TQStringList::ConstIterator end( encodings.end() );
   TQString currentEncoding = GlobalSettings::self()->fallbackCharacterEncoding();
-  currentEncoding = currentEncoding.replace( "iso ", "iso-", false );
+  currentEncoding = currentEncoding.tqreplace( "iso ", "iso-", false );
   ///kdDebug(5006) << "Looking for encoding: " << currentEncoding << endl;
   int i = 0;
   int indexOfLatin9 = 0;
@@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
 
 
 TQString AppearancePage::SystemTrayTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-systemtray");
+  return TQString::tqfromLatin1("configure-appearance-systemtray");
 }
 
 AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
@@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
 
   // System tray modes
   mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this );
-  mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() );
+  mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
   vlay->addWidget( mSystemTrayGroup );
   connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
@@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() {
 // *************************************************************
 
 TQString ComposerPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer");
+  return TQString::tqfromLatin1("configure-composer");
 }
 
 ComposerPage::ComposerPage( TQWidget * parent, const char * name )
@@ -2596,7 +2596,7 @@ ComposerPage::ComposerPage( TQWidget * parent, const char * name )
 }
 
 TQString ComposerPage::GeneralTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-general");
+  return TQString::tqfromLatin1("configure-composer-general");
 }
 
 ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
@@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
 
   // The "external editor" group:
   group = new TQVGroupBox( i18n("External Editor"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mExternalEditorCheck = new TQCheckBox(
            GlobalSettings::self()->useExternalEditorItem()->label(),
@@ -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("%f will be replaced with the "
+  label = new TQLabel( i18n("%f will be tqreplaced with the "
                            "filename to edit."), group );
   label->setEnabled( false ); // see above
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
@@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( )
 }
 
 TQString ComposerPage::PhrasesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-phrases");
+  return TQString::tqfromLatin1("configure-composer-phrases");
 }
 
 ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
@@ -3020,7 +3020,7 @@ void ComposerPage::PhrasesTab::saveActiveLanguageItem() {
 
 void ComposerPage::PhrasesTab::slotNewLanguage()
 {
-  NewLanguageDialog dialog( mLanguageList, parentWidget(), "New", true );
+  NewLanguageDialog dialog( mLanguageList, tqparentWidget(), "New", true );
   if ( dialog.exec() == TQDialog::Accepted ) slotAddNewLanguage( dialog.language() );
 }
 
@@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() {
 }
 
 TQString ComposerPage::TemplatesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-templates");
+  return TQString::tqfromLatin1("configure-composer-templates");
 }
 
 ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
@@ -3146,7 +3146,7 @@ void ComposerPage::TemplatesTab::save() {
 }
 
 TQString ComposerPage::CustomTemplatesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-custom-templates");
+  return TQString::tqfromLatin1("configure-composer-custom-templates");
 }
 
 ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
@@ -3170,7 +3170,7 @@ void ComposerPage::CustomTemplatesTab::save() {
 }
 
 TQString ComposerPage::SubjectTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-subject");
+  return TQString::tqfromLatin1("configure-composer-subject");
 }
 
 ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
@@ -3185,12 +3185,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
   group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   // row 0: help text:
   label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                            "(entries are case-insensitive regular expressions):"), group );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
 
   // row 1, string list editor:
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3203,7 +3203,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
-  // row 2: "replace [...]" check box:
+  // row 2: "tqreplace [...]" check box:
   mReplaceReplyPrefixCheck = new TQCheckBox(
      GlobalSettings::self()->replaceReplyPrefixItem()->label(),
      group, "kcfg_ReplaceReplyPrefix" );
@@ -3214,12 +3214,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
 
 
   group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this );
-  group->layout()->setSpacing( KDialog::marginHint() );
+  group->tqlayout()->setSpacing( KDialog::marginHint() );
 
   // row 0: help text:
   label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                           "(entries are case-insensitive regular expressions):"), group );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
 
   // row 1: string list editor
   mForwardListEditor =
@@ -3231,7 +3231,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
-  // row 3: "replace [...]" check box:
+  // row 3: "tqreplace [...]" check box:
   mReplaceForwardPrefixCheck = new TQCheckBox(
        GlobalSettings::self()->replaceForwardPrefixItem()->label(),
        group, "kcfg_ReplaceForwardPrefix" );
@@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() {
 }
 
 TQString ComposerPage::CharsetTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-charset");
+  return TQString::tqfromLatin1("configure-composer-charset");
 }
 
 ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
@@ -3268,8 +3268,8 @@ 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 "
-                           "contains all required characters."), this );
-  label->setAlignment( WordBreak);
+                           "tqcontains all required characters."), this );
+  label->tqsetAlignment( WordBreak);
   vlay->addWidget( label );
 
   mCharsetListEditor =
@@ -3297,13 +3297,13 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 
   // KCharsets::codecForName("us-ascii") returns "iso-8859-1" (cf. Bug #49812)
   // therefore we have to treat this case specially
-  if ( charset.lower() == TQString::fromLatin1("us-ascii") ) {
-    charset = TQString::fromLatin1("us-ascii");
+  if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) {
+    charset = TQString::tqfromLatin1("us-ascii");
     return;
   }
 
-  if ( charset.lower() == TQString::fromLatin1("locale") ) {
-    charset =  TQString::fromLatin1("%1 (locale)")
+  if ( charset.lower() == TQString::tqfromLatin1("locale") ) {
+    charset =  TQString::tqfromLatin1("%1 (locale)")
       .arg( TQCString( kmkernel->networkCodec()->mimeName() ).lower() );
     return;
   }
@@ -3311,7 +3311,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
   bool ok = false;
   TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok );
   if ( ok && codec ) {
-    charset = TQString::fromLatin1( codec->mimeName() ).lower();
+    charset = TQString::tqfromLatin1( codec->mimeName() ).lower();
     return;
   }
 
@@ -3325,7 +3325,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
   TQStringList charsets = composer.readListEntry( "pref-charsets" );
   for ( TQStringList::Iterator it = charsets.begin() ;
         it != charsets.end() ; ++it )
-    if ( (*it) == TQString::fromLatin1("locale") ) {
+    if ( (*it) == TQString::tqfromLatin1("locale") ) {
       TQCString cset = kmkernel->networkCodec()->mimeName();
       KPIM::kAsciiToLower( cset.data() );
       (*it) = TQString("%1 (locale)").arg( cset );
@@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() {
 }
 
 TQString ComposerPage::HeadersTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-headers");
+  return TQString::tqfromLatin1("configure-composer-headers");
 }
 
 ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
@@ -3564,7 +3564,7 @@ void ComposerPage::HeadersTab::save() {
 }
 
 TQString ComposerPage::AttachmentsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-attachments");
+  return TQString::tqfromLatin1("configure-composer-attachments");
 }
 
 ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
@@ -3601,7 +3601,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
   // "Attachment key words" label and string list editor
   label = new TQLabel( i18n("Recognize any of the following key words as "
                            "intention to attach a file:"), this );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
   vlay->addWidget( label );
 
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3629,11 +3629,11 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
   TQStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
   if ( attachWordsList.isEmpty() ) {
     // default value
-    attachWordsList << TQString::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
@@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
 // *                                                           *
 // *************************************************************
 TQString SecurityPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-security");
+  return TQString::tqfromLatin1("configure-security");
 }
 
 SecurityPage::SecurityPage( TQWidget * parent, const char * name )
@@ -3716,7 +3716,7 @@ void SecurityPage::installProfile( KConfig * profile ) {
 }
 
 TQString SecurityPage::GeneralTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-reading");
+  return TQString::tqfromLatin1("configure-security-reading");
 }
 
 SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
@@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // "HTML Messages" group box:
   group = new TQVGroupBox( i18n( "HTML Messages" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group );
   TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis );
@@ -3822,14 +3822,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // encrypted messages group
   group = new TQVGroupBox( i18n("Encrypted Messages"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
   mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group );
   connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) );
   vlay->addWidget( group );
 
   // "Message Disposition Notification" groupbox:
   group = new TQVGroupBox( i18n("Message Disposition Notifications"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
 
   // "ignore", "ask", "deny", "always send" radiobutton line:
@@ -3897,7 +3897,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // "Attached keys" group box:
   group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group );
   connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
@@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() {
 
 
 TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-composing");
+  return TQString::tqfromLatin1("configure-security-composing");
 }
 
 SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
@@ -4068,7 +4068,7 @@ void SecurityPage::ComposerCryptoTab::save() {
 }
 
 TQString SecurityPage::WarningTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-warnings");
+  return TQString::tqfromLatin1("configure-security-warnings");
 }
 
 SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
@@ -4177,7 +4177,7 @@ void SecurityPage::WarningTab::slotReenableAllWarningsClicked() {
 ////
 
 TQString SecurityPage::SMimeTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-smime-validation");
+  return TQString::tqfromLatin1("configure-security-smime-validation");
 }
 
 SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
@@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp
 ////
 
 TQString SecurityPage::CryptPlugTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-crypto-backends");
+  return TQString::tqfromLatin1("configure-security-crypto-backends");
 }
 
 SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
@@ -4528,7 +4528,7 @@ void SecurityPage::CryptPlugTab::save() {
 // *                                                           *
 // *************************************************************
 TQString MiscPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-misc");
+  return TQString::tqfromLatin1("configure-misc");
 }
 
 MiscPage::MiscPage( TQWidget * parent, const char * name )
@@ -4543,7 +4543,7 @@ MiscPage::MiscPage( TQWidget * parent, const char * name )
 }
 
 TQString MiscPage::FolderTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-misc-folders");
+  return TQString::tqfromLatin1("configure-misc-folders");
 }
 
 MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
@@ -4797,7 +4797,7 @@ void MiscPage::FolderTab::save() {
 }
 
 TQString MiscPage::GroupwareTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-misc-groupware");
+  return TQString::tqfromLatin1("configure-misc-groupware");
 }
 
 MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 5cc86ccc2..e17e800e8 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -43,7 +43,7 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
   : KDialogBase( parent, name, modal, i18n("New Identity"),
 		 Ok|Cancel|Help, Ok, true )
 {
-  setHelp( TQString::fromLatin1("configure-identity-newidentitydialog") );
+  setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
   TQWidget * page = makeMainWidget();
   TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -169,33 +169,33 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize )
   mVisibleItem = QMAX( 1, visibleItem );
   if( updateSize == true )
   {
-    TQSize s = sizeHint();
-    setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
+    TQSize s = tqsizeHint();
+    setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
 		    lineWidth() * 2, s.height() );
   }
 }
 
 
-TQSize ListView::sizeHint() const
+TQSize ListView::tqsizeHint() const
 {
-  TQSize s = TQListView::sizeHint();
+  TQSize s = TQListView::tqsizeHint();
 
   int h = fontMetrics().height() + 2*itemMargin();
   if( h % 2 > 0 ) { h++; }
 
-  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
+  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
   return s;
 }
 
 
-static TQString flagPng = TQString::fromLatin1("/flag.png");
+static TQString flagPng = TQString::tqfromLatin1("/flag.png");
 
 NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 				      TQWidget *parent, const char *name,
 				      bool modal )
   : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
 {
-  // layout the page (a combobox with label):
+  // tqlayout the page (a combobox with label):
   TQWidget *page = makeMainWidget();
   TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() );
   mComboBox = new TQComboBox( false, page );
@@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
   hlay->addWidget( mComboBox, 1 );
 
   TQStringList pathList = KGlobal::dirs()->findAllResources( "locale",
-                               TQString::fromLatin1("*/entry.desktop") );
+                               TQString::tqfromLatin1("*/entry.desktop") );
   // extract a list of language tags that should not be included:
   TQStringList suppressedAcronyms;
   for ( LanguageItemList::Iterator lit = suppressedLangs.begin();
@@ -224,7 +224,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 
     if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
       // not found:
-      TQString displayname = TQString::fromLatin1("%1 (%2)")
+      TQString displayname = TQString::tqfromLatin1("%1 (%2)")
 	.arg( name ).arg( acronym );
       TQPixmap flag( locate("locale", acronym + flagPng ) );
       mComboBox->insertItem( flag, displayname );
@@ -251,11 +251,11 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name
 
 int LanguageComboBox::insertLanguage( const TQString & language )
 {
-  static TQString entryDesktop = TQString::fromLatin1("/entry.desktop");
+  static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop");
   KSimpleConfig entry( locate("locale", language + entryDesktop) );
   entry.setGroup( "KCM Locale" );
   TQString name = entry.readEntry( "Name" );
-  TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language );
+  TQString output = TQString::tqfromLatin1("%1 (%2)").arg( name ).arg( language );
   insertItem( TQPixmap( locate("locale", language + flagPng ) ), output );
   return listBox()->index( listBox()->findItem(output) );
 }
@@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const
 
 void LanguageComboBox::setLanguage( const TQString & language )
 {
-  TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language );
+  TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
   for (int i = 0; i < count(); i++)
     // ### FIXME: use .endWith():
     if ( text(i).find( parenthizedLanguage ) >= 0 ) {
@@ -323,7 +323,7 @@ void ProfileDialog::slotSelectionChanged()
 void ProfileDialog::setup() {
   mListView->clear();
   // find all profiles (config files named "profile-xyz-rc"):
-  const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc");
+  const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc");
   mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter );
 
   kdDebug(5006) << "Profile manager: found " << mProfileList.count()
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 096ba45a3..f12c39ba1 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -398,7 +398,7 @@ public:
   TQString helpAnchor() const;
 
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef AccountsPageSendingTab SendingTab;
   typedef AccountsPageReceivingTab ReceivingTab;
 
@@ -570,7 +570,7 @@ public:
 
   TQString helpAnchor() const;
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef AppearancePageFontsTab FontsTab;
   typedef AppearancePageColorsTab ColorsTab;
   typedef AppearancePageLayoutTab LayoutTab;
@@ -790,7 +790,7 @@ public:
 
   TQString helpAnchor() const;
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef ComposerPageGeneralTab GeneralTab;
   typedef ComposerPagePhrasesTab PhrasesTab;
   typedef ComposerPageTemplatesTab TemplatesTab;
@@ -1057,7 +1057,7 @@ public:
   void resizeColums();
 
   void setVisibleItem( int visibleItem, bool updateSize=true );
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
 protected:
   virtual void resizeEvent( TQResizeEvent *e );
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index 6a578030e..ab8ecb843 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -1,7 +1,7 @@
 
 CustomTemplatesBase
 
-    
+    
         
             0
             0
@@ -15,7 +15,7 @@
         
         
             
-                layout9
+                tqlayout9
             
             
                 
@@ -26,7 +26,7 @@
                 
                 
                     
-                        layout8
+                        tqlayout8
                     
                     
                         
@@ -47,7 +47,7 @@
                                     0
                                 
                             
-                            
+                            
                                 
                                     100
                                     0
@@ -147,7 +147,7 @@
                 
                 
                     
-                        layout8
+                        tqlayout8
                     
                     
                         
@@ -155,7 +155,7 @@
                         
                         
                             
-                                layout6
+                                tqlayout6
                             
                             
                                 
@@ -181,7 +181,7 @@
                         
                         
                             
-                                layout7
+                                tqlayout7
                             
                             
                                 
@@ -222,7 +222,7 @@
                 
                 
                     
-                        layout4
+                        tqlayout4
                     
                     
                         
@@ -260,7 +260,7 @@
                             
                                 Shortc&ut:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                             
@@ -282,7 +282,7 @@
                             
                                 &Template type:
                             
-                            
+                            
                                 AlignVCenter|AlignRight
                             
                             
@@ -355,7 +355,7 @@
     mAdd_clicked()
     mRemove_clicked()
 
-
+
 
     klineedit.h
     kpushbutton.h
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 470518662..5f590b3b9 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -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 )->findByEmail( email );
+          KABC::StdAddressBook::self( true )->tqfindByEmail( email );
         if ( addressees.isEmpty() ) {
           KABC::Addressee a;
           a.setNameFromString( name );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index dbf5f3f96..bca75762f 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,13 +49,13 @@
 using namespace KMail;
 
 EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
-                             TQObject * parent, TQWidget *parentWidget) :
+                             TQObject * parent, TQWidget *tqparentWidget) :
     TQObject( parent ),
     mUrl( url ),
     mMimeType( mimeType ),
     mOpenWith( openWith ),
     mEditor( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mHaveInotify( false ),
     mFileOpen( false ),
     mEditorRunning( false ),
@@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent()
       struct inotify_event *event = (struct inotify_event *) &buffer[offset];
       size -= sizeof( struct inotify_event ) + event->len;
       offset += sizeof( struct inotify_event ) + event->len;
-      if ( event->mask & IN_OPEN )
+      if ( event->tqmask & IN_OPEN )
         mFileOpen = true;
-      if ( event->mask & IN_CLOSE )
+      if ( event->tqmask & IN_CLOSE )
         mFileOpen = false;
-      if ( event->mask & IN_MODIFY )
+      if ( event->tqmask & IN_MODIFY )
         mFileModified = true;
     }
   }
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index 839386f84..35504d85a 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -43,11 +43,11 @@ class EditorWatcher : public QObject
      * 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 parentWidget the parent widget of this EditorWatcher, which will be used as the parent
+     * @param tqparentWidget the parent widget of this EditorWatcher, which will be used as the parent
      *                     widget for message dialogs.
      */
     EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
-                   TQObject *parent, TQWidget *parentWidget );
+                   TQObject *parent, TQWidget *tqparentWidget );
     bool start();
     bool fileChanged() const { return mFileModified; }
   signals:
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index f036a193b..df595b36d 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -824,7 +824,7 @@ EncodingDetector::EncodingChoiceSource EncodingDetector::encodingChoiceSource()
 const char* EncodingDetector::encoding() const
 {
     d->m_storeDecoderName = d->m_codec->name();
-    d->m_storeDecoderName = d->m_storeDecoderName.lower().replace( "iso ", "iso-" );
+    d->m_storeDecoderName = d->m_storeDecoderName.lower().tqreplace( "iso ", "iso-" );
     return d->m_storeDecoderName.data();
 }
 
diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h
index 378a1e07c..b2dd97660 100644
--- a/kmail/encodingdetector.h
+++ b/kmail/encodingdetector.h
@@ -35,7 +35,7 @@ class EncodingDetectorPrivate;
  * Searches for encoding declaration inside raw data -- meta and xml tags. 
  * In the case it can't find it, uses heuristics for specified language.
  *
- * If it finds unicode BOM marks, it changes encoding regardless of what the user has told
+ * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told
  *
  * Intended lifetime of the object: one instance per document.
  *
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index a97c08429..010a9d003 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -31,7 +31,7 @@
 #include "globalsettings.h"
 #include "folderstorage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmcommands.h"
 
 #include 
@@ -190,7 +190,7 @@ void ExpireJob::done()
     }
   }
   if ( !str.isEmpty() )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::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: ;
   }
-  BroadcastStatus::instance()->setStatusMsg( msg );
+  BroadcasStatus::instance()->seStatusMsg( msg );
 
   deleteLater();
 }
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index c524f8b32..4913d1c6e 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -73,7 +73,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   labelDays2 = new TQLabel( privateLayoutWidget, "labelDays2" );
   labelDays2->setText( i18n( "days" ) );
-  labelDays2->setAlignment( int( TQLabel::AlignTop ) );
+  labelDays2->tqsetAlignment( int( TQLabel::AlignTop ) );
   unreadHBox->addWidget( labelDays2 );
   globalVBox->addLayout( unreadHBox );
 
@@ -81,7 +81,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   expiryActionLabel = new TQLabel( privateLayoutWidget, "expiryActionLabel" );
   expiryActionLabel->setText( i18n( "Expiry action:" ) );
-  expiryActionLabel->setAlignment( int( TQLabel::AlignVCenter ) );
+  expiryActionLabel->tqsetAlignment( int( TQLabel::AlignVCenter ) );
   expiryActionHBox->addWidget( expiryActionLabel );
 
   actionsHBox = new TQVBoxLayout( 0, 0, 6, "actionsHBox");
@@ -111,7 +111,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   note = new TQLabel( privateLayoutWidget, "note" );
   note->setText( i18n( "Note: Expiry action will be applied immediately after confirming settings." ) );
-  note->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  note->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
   globalVBox->addWidget( note );
 
   // Load the values from the folder
@@ -144,7 +144,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
       folderSelector->setFolder( destFolder );
   }
   slotUpdateControls();
-  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 5d8e3d13a..d70986876 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -58,7 +58,7 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
   connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) );
   connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) );
 
-  connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)), TQT_SLOT(updateCount()) );
+  connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) );
@@ -74,7 +74,7 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
 void FavoriteFolderViewItem::nameChanged()
 {
   TQString txt = text( 0 );
-  txt.replace( mOldName, folder()->label() );
+  txt.tqreplace( mOldName, folder()->label() );
   setText( 0, txt );
   mOldName = folder()->label();
 }
@@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item)
   if ( !item ) return;
   if ( !item->isSelected() )
     item->setSelected( true );
-  item->repaint();
+  item->tqrepaint();
   handleGroupwareFolder( static_cast( item ) );
 }
 
@@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder)
       fti->setSelected( true );
       setCurrentItem( fti );
       ensureItemVisible( fti );
-      fti->repaint();
+      fti->tqrepaint();
       found = true;
     } else if ( fti->folder() != folder && fti->isSelected() ) {
       fti->setSelected( false );
-      fti->repaint();
+      fti->tqrepaint();
     }
   }
   blockSignals( false );
@@ -309,7 +309,7 @@ void FavoriteFolderView::dropped(TQDropEvent * e, TQListViewItem * after)
       KMFolderTreeItem *fti = static_cast( it.current() );
       if ( !fti->folder() )
         continue;
-      if( !mFolderToItem.contains( fti->folder() ) )
+      if( !mFolderToItem.tqcontains( fti->folder() ) )
          afterItem = addFolder( fti->folder(), prettyName( fti ), afterItem );
     }
     e->accept();
@@ -369,7 +369,7 @@ void FavoriteFolderView::initializeFavorites()
   assert( ft );
   for ( TQListViewItemIterator it( ft ); it.current(); ++it ) {
     KMFolderTreeItem *fti = static_cast( it.current() );
-    if ( fti->type() == KFolderTreeItem::Inbox && fti->folder() && !seenInboxes.contains( fti->folder()->id() ) ) {
+    if ( fti->type() == KFolderTreeItem::Inbox && fti->folder() && !seenInboxes.tqcontains( fti->folder()->id() ) ) {
       seenInboxes.append( fti->folder()->id() );
       if ( fti->folder() == kmkernel->inboxFolder() && hideLocalInbox() )
         continue;
@@ -457,7 +457,7 @@ void FavoriteFolderView::addFolder()
   KMFolder *folder = dlg.folder();
   if ( !folder )
     return;
-  if ( mFolderToItem.contains( folder ) )
+  if ( mFolderToItem.tqcontains( folder ) )
     return;
 
   KMFolderTreeItem *fti = findFolderTreeItem( folder );
@@ -468,7 +468,7 @@ void KMail::FavoriteFolderView::addFolder(KMFolderTreeItem * fti)
 {
   if ( !fti || !fti->folder() )
     return;
-  if ( !mFolderToItem.contains( fti->folder()  ) )
+  if ( !mFolderToItem.tqcontains( fti->folder()  ) )
     addFolder( fti->folder(), prettyName( fti ) );
 }
 
@@ -524,7 +524,7 @@ void FavoriteFolderView::refresh()
     KMFolderTreeItem* fti = static_cast(it.current());
     if (!fti || !fti->folder())
       continue;
-    fti->repaint();
+    fti->tqrepaint();
   }
   update();
 }
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index d49efb22c..f336621ad 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -135,7 +135,7 @@ namespace KMail {
       /** Non-public constructor needed by the singleton implementation */
       FilterLog();
       
-      /** The list contains the single log pieces */
+      /** The list tqcontains the single log pieces */
       TQStringList mLogEntries;
       
       /** the log status */
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index bebd9c319..58130a05b 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -259,8 +259,8 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
   // since it uses space as a separator (imap4.cc, look for GETACL)
   // 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.contains( ' ' ) )
-    kdWarning(5006) << "Userid contains a space!!!  '" << entry.userId << "'" << endl;
+  if ( entry.userId.tqcontains( ' ' ) )
+    kdWarning(5006) << "Userid tqcontains a space!!!  '" << entry.userId << "'" << endl;
 
   setUserId( entry.userId );
   mPermissions = entry.permissions;
@@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mACLWidget = new TQHBox( mStack );
@@ -352,7 +352,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox );
   mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox );
   TQWidget *spacer = new TQWidget( buttonBox );
-  spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+  spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
   connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
   connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
@@ -632,7 +632,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
     return;
   if ( !ACLitem->isNew() ) {
     if ( mImapAccount && mImapAccount->login() == ACLitem->userId() ) {
-      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( topLevelWidget(),
+      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(),
          i18n( "Do you really want to remove your own permissions for this folder? You will not be able to access it afterwards." ), i18n( "Remove" ) ) )
         return;
     }
@@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
   emit changed(true);
 }
 
-KMail::FolderDiaTab::AcceptStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
 {
   if ( !mChanged || !mImapAccount )
     return Accepted; // (no change made), ok for accepting the dialog immediately
@@ -699,7 +699,7 @@ bool KMail::FolderDiaACLTab::save()
     TQString uid = (*init).userId;
     for( ACLList::ConstIterator it = aclList.begin(); it != aclList.end() && !isInNewList; ++it )
       isInNewList = uid == (*it).userId;
-    if ( !isInNewList && !mRemovedACLs.contains(uid) )
+    if ( !isInNewList && !mRemovedACLs.tqcontains(uid) )
       mRemovedACLs.append( uid );
   }
 
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 6576d13e6..d9116a6b7 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -92,7 +92,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 01cb8dbb5..99954cc2a 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -62,7 +62,7 @@ KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* pare
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mQuotaWidget = new KMail::QuotaWidget( mStack );
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
 }
 
 
-KMail::FolderDiaTab::AcceptStatus KMail::FolderDiaQuotaTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept()
 {
   if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap )
     return Accepted;
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index e0b570ee0..2fc956e96 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -59,7 +59,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index be623fe30..86d399d8c 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
 {
       TQVBoxLayout *box = new TQVBoxLayout(this);
       TQWidget *stuff = new TQWidget( this );
-      TQGridLayout* layout =
+      TQGridLayout* tqlayout =
           new TQGridLayout( stuff, 3, 3,
                            KDialog::marginHint(),
                            KDialog::spacingHint() );
       mInfoLabel = new TQLabel("", stuff );
       mRootLabel = new TQLabel("", stuff );
       mProgressBar = new TQProgressBar( stuff );
-      layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
-      layout->addWidget( mRootLabel, 0, 1 );
-      layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
-      //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
-      layout->addWidget( mInfoLabel, 1, 1 );
-      layout->addWidget( mProgressBar, 2, 1 );
+      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( mInfoLabel, 1, 1 );
+      tqlayout->addWidget( mProgressBar, 2, 1 );
       box->addWidget( stuff );
       box->addStretch( 2 );
 }
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index b1f712512..2988c925c 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -127,7 +127,7 @@ signals:
 
   /**
    * Emitted when a list of messages has been
-   * copied to the specified location. TQPtrList contains
+   * copied to the specified location. TQPtrList tqcontains
    * the list of the copied messages.
    */
   void messageCopied( TQPtrList );
@@ -153,7 +153,7 @@ signals:
   void result( KMail::FolderJob* job );
 
   /**
-   * This progress signal contains the "done" and the "total" numbers so
+   * This progress signal tqcontains 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 417e8df4a..45fa7015b 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -4,7 +4,7 @@
     
         KMFolderDialogUI
     
-    
+    
         
             0
             0
@@ -73,7 +73,7 @@
                     
                         Fixed
                     
-                    
+                    
                         
                             20
                             20
@@ -104,7 +104,7 @@
                     
                         Fixed
                     
-                    
+                    
                         
                             20
                             20
@@ -140,13 +140,13 @@
                             0
                         
                     
-                    
+                    
                         
                             28
                             28
                         
                     
-                    
+                    
                         
                             28
                             28
@@ -166,7 +166,7 @@
                     
                         Fixed
                     
-                    
+                    
                         
                             20
                             20
@@ -188,13 +188,13 @@
                             0
                         
                     
-                    
+                    
                         
                             28
                             28
                         
                     
-                    
+                    
                         
                             28
                             28
@@ -228,7 +228,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             101
                             20
@@ -296,7 +296,7 @@
                     
                         Fixed
                     
-                    
+                    
                         
                             20
                             20
@@ -321,7 +321,7 @@
                     
                         Fixed
                     
-                    
+                    
                         
                             20
                             20
@@ -434,7 +434,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             20
@@ -507,7 +507,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             120
                             80
@@ -633,6 +633,6 @@
 
     slotChangeIcon( QString )
 
-
-
+
+
 
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 553fc5a02..2be44c5aa 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -55,7 +55,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
   button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) );
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
         TQSizePolicy::Fixed ) );
   setFocusPolicy( TQWidget::StrongFocus );
 }
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 30e39c637..9d7493c87 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -38,7 +38,7 @@ class KMFolderTree;
 namespace KMail {
 
   /**
-   * A widget that contains a KLineEdit which shows the current folder
+   * A widget that tqcontains 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
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index c35fd0c1e..147d98a05 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -76,7 +76,7 @@ void FolderSetSelector::setSelectedFolders(const TQValueList< int > & folderIds)
   while ( it.current() ) {
     SimpleFolderTreeItem *item = dynamic_cast*>( it.current() );
     if ( item && item->folder() ) {
-      if ( folderIds.contains( item->folder()->id() ) )
+      if ( folderIds.tqcontains( item->folder()->id() ) )
         item->setOn( true );
       else
         item->setOn( false );
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 78724d502..6744e136e 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
     if (!(msgBase = getMsgBase(i))) continue;
     if (msgBase->isNew())
     {
-      msgBase->setStatus(KMMsgStatusUnread);
+      msgBase->seStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -197,7 +197,7 @@ void FolderStorage::markUnreadAsRead()
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -283,7 +283,7 @@ void FolderStorage::slotEmitChangedTimer()
 //-----------------------------------------------------------------------------
 void FolderStorage::emitMsgAddedSignals(int idx)
 {
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
   if (!mQuiet) {
     emit msgAdded(idx);
   } else {
@@ -388,7 +388,7 @@ void FolderStorage::removeMsg(int idx, bool)
 
   KMMsgBase* mb = getMsgBase(idx);
 
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   if (serNum != 0)
     emit msgRemoved( folder(), serNum );
   mb = takeIndexEntry( idx );
@@ -430,7 +430,7 @@ KMMessage* FolderStorage::take(int idx)
   mb = getMsgBase(idx);
   if (!mb) return 0;
   if (!mb->isMessage()) readMsg(idx);
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   emit msgRemoved( folder(), serNum );
 
   msg = (KMMessage*)takeIndexEntry(idx);
@@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx)
         kdDebug(5006) << "Error: " << location() <<
           " Index file is inconsistent with folder file. This should never happen." << endl;
 
-        // We can't recreate the index at this point, since that would invalidate the current
+        // We can't recreate the index at this point, since that would tqinvalidate the current
         // message list and delete KMMsgBase or KMMessage objects that are in use.
         // Do it later in KMFolderIndex::readIndexHeader() instead.
         mCompactable = false; // Don't compact
@@ -844,7 +844,7 @@ int FolderStorage::countUnread()
   return (unread > 0) ? unread : 0;
 }
 
-Q_INT64 FolderStorage::folderSize() const
+TQ_INT64 FolderStorage::folderSize() const
 {
     if ( mSize != -1 ) {
         return mSize;
@@ -889,7 +889,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
       }
       mChanged = true;
     }
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
     emit msgChanged( folder(), serNum, deltaUnread );
   }
 }
@@ -977,21 +977,21 @@ void FolderStorage::readFolderIdsFile()
 {
   if ( !mExportsSernums ) return;
   if ( KMMsgDict::mutableInstance()->readFolderIds( *this ) == -1 ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
   if ( !KMMsgDict::mutableInstance()->hasFolderIds( *this ) ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
 }
 
-void FolderStorage::invalidateFolder()
+void FolderStorage::tqinvalidateFolder()
 {
   if ( !mExportsSernums ) return;
   unlink(TQFile::encodeName( indexLocation()) + ".sorted");
   unlink(TQFile::encodeName( indexLocation()) + ".ids");
   fillMessageDict();
   KMMsgDict::mutableInstance()->writeFolderIds( *this );
-  emit invalidated( folder() );
+  emit tqinvalidated( folder() );
 }
 
 
@@ -1022,10 +1022,10 @@ int FolderStorage::appendToFolderIdsFile( int idx )
   return ret;
 }
 
-void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
+void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
 {
   if ( !mExportsSernums ) return;
-  KMMsgDict::mutableInstance()->replace( sernum, msg, idx );
+  KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
 }
 
 void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
       msg->toggleStatus(status, idx);
     else
-      msg->setStatus(status, idx);
+      msg->seStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(TQValueList& ids, KMMsgStatus status, bool toggle)
+void FolderStorage::seStatus(TQValueList& ids, KMMsgStatus status, bool toggle)
 {
   for ( TQValueList::Iterator it = ids.begin(); it != ids.end(); ++it )
   {
-    FolderStorage::setStatus(*it, status, toggle);
+    FolderStorage::seStatus(*it, status, toggle);
   }
 }
 
@@ -1135,11 +1135,11 @@ void FolderStorage::slotProcessNextSearchBatch()
 {
   if ( !mSearchPattern )
     return;
-  TQValueList matchingSerNums;
+  TQValueList matchingSerNums;
   const int end = QMIN( mCurrentSearchedMsg + 15, count() );
   for ( int i = mCurrentSearchedMsg; i < end; ++i )
   {
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
     if ( mSearchPattern->matches( serNum ) )
       matchingSerNums.append( serNum );
   }
@@ -1151,7 +1151,7 @@ void FolderStorage::slotProcessNextSearchBatch()
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void FolderStorage::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   bool matches = pattern && pattern->matches( serNum );
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 7d7165431..b7effe082 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -63,7 +63,7 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-typedef TQValueList SerNumList;
+typedef TQValueList SerNumList;
 
 /**
  * @short The FolderStorage class is the bass class for the storage related
@@ -238,13 +238,13 @@ public:
   virtual int countUnread();
 
   /** Total size of the contents of this folder. */
-  Q_INT64 folderSize() const;
+  TQ_INT64 folderSize() const;
 
   /** Return whether the folder is close to its quota limit, which can
    * be reflected in the UI.  */
   virtual bool isCloseToQuota() const;
 
-  /** Called by KMMsgBase::setStatus when status of a message has changed
+  /** Called by KMMsgBase::seStatus 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,
@@ -324,7 +324,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns TRUE if the folder contains deleted messages */
+  /** Returns TRUE if the folder tqcontains deleted messages */
   bool needsCompacting() const { return needsCompact; }
   virtual void setNeedsCompacting(bool f) { needsCompact = f; }
 
@@ -363,10 +363,10 @@ public:
   void deregisterFromMessageDict();
 
   /** Set the status of the message at index @p idx to @p status. */
-  virtual void setStatus(int idx, KMMsgStatus status, bool toggle=false);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  virtual void setStatus(TQValueList& ids, KMMsgStatus status, bool toggle=false);
+  virtual void seStatus(TQValueList& ids, KMMsgStatus status, bool toggle=false);
 
   void removeJobs();
 
@@ -412,7 +412,7 @@ public:
    * Check if the message matches the search criteria
    * The end is signaled with searchDone()
    */
-  virtual void search( const KMSearchPattern*, Q_UINT32 serNum );
+  virtual void search( const KMSearchPattern*, TQ_UINT32 serNum );
 
   /** Returns true if this folder can be moved */
   virtual bool isMoveable() const;
@@ -437,8 +437,8 @@ signals:
   /** Emitted when the folder was closed and ticket owners have to reopen */
   void closed( KMFolder* );
 
-  /** Emitted when the serial numbers of this folder were invalidated. */
-  void invalidated( KMFolder * );
+  /** Emitted when the serial numbers of this folder were tqinvalidated. */
+  void tqinvalidated( KMFolder * );
 
   /** Emitted when the name of the folder changes. */
   void nameChanged();
@@ -459,7 +459,7 @@ signals:
   void noContentChanged();
 
   /** Emitted before a message is removed from the folder. */
-  void msgRemoved(KMFolder*, Q_UINT32 sernum);
+  void msgRemoved(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted after a message is removed from the folder. */
   void msgRemoved( int idx, TQString msgIdMD5 );
@@ -467,10 +467,10 @@ signals:
 
   /** Emitted when a message is added from the folder. */
   void msgAdded(int idx);
-  void msgAdded(KMFolder*, Q_UINT32 sernum);
+  void msgAdded(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32 sernum, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32 sernum, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int);
@@ -489,14 +489,14 @@ signals:
    * The matching serial numbers are included
    * If @p complete is true the search is done
    */
-  void searchResult( KMFolder*, TQValueList,
+  void searchResult( KMFolder*, TQValueList,
                      const KMSearchPattern*, bool complete );
 
   /**
    * Emitted when a search for a single message is completed
    * The serial number and a bool matching yes/no is included
    */
-  void searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool );
+  void searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool );
 
   /** Emitted when the folder's size changes. */
   void folderSizeChanged();
@@ -553,7 +553,7 @@ protected:
 friend class KMMsgDict;
   /** Inserts messages into the message dictionary. The messages will get
    * new serial numbers. This is only used on newly appeared folders, where
-   * there is no .ids file yet, or when that has been invalidated. */
+   * there is no .ids file yet, or when that has been tqinvalidated. */
   virtual void fillMessageDict() {}
 
   /** Read the on-disk cache of serial numbers  of messages in this store
@@ -581,12 +581,12 @@ friend class KMMsgDict;
 
   /** Replaces the serial number for the message @p msg at index @p idx with
    * @p sernum */
-  void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
+  void tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
 
-   /** Called when serial numbers for a folder are invalidated,
-  invalidates/recreates data structures dependent on the
+   /** Called when serial numbers for a folder are tqinvalidated,
+  tqinvalidates/recreates data structures dependent on the
   serial numbers for this folder */
-  void invalidateFolder();
+  void tqinvalidateFolder();
 
   /** Called by KMFolder::remove() to delete the actual contents.
     At the time of the call the folder has already been closed, and
@@ -605,7 +605,7 @@ friend class KMMsgDict;
   virtual void clearIndex(bool autoDelete=true, bool syncDict = false) = 0;
   virtual void truncateIndex() = 0;
 
-  virtual Q_INT64 doFolderSize() const { return 0; };
+  virtual TQ_INT64 doFolderSize() const { return 0; };
 
   int mOpenCount;
   int mQuiet;
@@ -623,7 +623,7 @@ friend class KMMsgDict;
   /** number of unread messages, -1 if not yet set */
   int mUnreadMsgs, mGuessedUnreadMsgs;
   int mTotalMsgs;
-  Q_INT64 mSize;
+  TQ_INT64 mSize;
   bool mWriteConfigEnabled :1;
   /** sven: true if on destruct folder needs to be compacted. */
   bool needsCompact :1;
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index c35c88074..e126263f5 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   // set it
-  bool repaint = false;
+  bool tqrepaint = false;
   if (fti->unreadCount() != count) {
      fti->adjustUnreadCount( count );
-     repaint = true;
+     tqrepaint = true;
   }
   if (isTotalActive() || force)
   {
@@ -196,15 +196,15 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
     // set it
     if ( count != fti->totalCount() ) {
       fti->setTotalCount(count);
-      repaint = true;
+      tqrepaint = true;
     }
   }
   if ( isSizeActive() || force ) {
     if ( !fti->folder()->noContent()) {
-      Q_INT64 size = folder->storage()->folderSize();
+      TQ_INT64 size = folder->storage()->folderSize();
       if ( size != fti->folderSize() ) {
         fti->setFolderSize( size );
-        repaint = true;
+        tqrepaint = true;
       }
     }
   }
@@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   if (fti->parent() && !fti->parent()->isOpen())
-    repaint = false; // we're not visible
-  if (repaint) {
+    tqrepaint = false; // we're not visible
+  if (tqrepaint) {
     fti->setNeedsRepaint( true );
     emit triggerRefresh();
   }
@@ -228,7 +228,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
   if ( !MailListDrag::decode( event, list ) ) {
     kdWarning() << k_funcinfo << "Could not decode drag data!" << endl;
   } else {
-    TQValueList serNums = MessageCopyHelper::serNumListFromMailList( list );
+    TQValueList serNums = MessageCopyHelper::serNumListFromMailList( list );
     int action;
     if ( MessageCopyHelper::inReadOnlyFolder( serNums ) )
       action = DRAG_COPY;
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index bc2ad0ccc..0c8f97207 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -38,7 +38,7 @@ class FolderTreeBase : public KFolderTree
     /** Find index of given folder. Returns 0 if not found */
     virtual TQListViewItem* indexOfFolder( const KMFolder* folder ) const
     {
-       if ( mFolderToItem.contains( folder ) )
+       if ( mFolderToItem.tqcontains( folder ) )
          return mFolderToItem[ folder ];
        else
          return 0;
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 24f9fbbec..ee813bf47 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -20,8 +20,8 @@ class FolderViewToolTip : public QToolTip
       KMFolderTreeItem *item = dynamic_cast( mListView->itemAt( point ) );
       if  ( !item )
         return;
-      const TQRect itemRect = mListView->itemRect( item );
-      if ( !itemRect.isValid() )
+      const TQRect tqitemRect = mListView->tqitemRect( item );
+      if ( !tqitemRect.isValid() )
         return;
       const TQRect headerRect = mListView->header()->sectionRect( 0 );
       if ( !headerRect.isValid() )
@@ -32,7 +32,7 @@ class FolderViewToolTip : public QToolTip
       
       item->updateCount();
       TQString tipText = i18n("%1
      Total: %2
      Unread: %3
      Size: %4" )
-          .arg( item->folder()->prettyURL().replace( " ", " " ) )
+          .arg( item->folder()->prettyURL().tqreplace( " ", " " ) )
           .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
           .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
           .arg( KIO::convertSize( item->folderSize() ) );
@@ -43,7 +43,7 @@ class FolderViewToolTip : public QToolTip
               tipText += i18n("
      Quota: %1").arg( info.toString() );
       }
       
-      tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText );
+      tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText );
     }
 
   private:
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 188e05324..684dd590d 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -138,7 +138,7 @@ TQString HeaderItem::from() const
 }
 
 // Return the serial number
-Q_UINT32 HeaderItem::msgSerNum() const
+TQ_UINT32 HeaderItem::msgSerNum() const
 {
   return mSerNum;
 }
@@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
   }
 
   TQPixmap res( width, height );
-  TQBitmap mask( width, height, true );
+  TQBitmap tqmask( width, height, true );
 
   int x = 0;
   for ( PixmapList::ConstIterator it = pixmaps.begin();
       it != pixmaps.end(); ++it ) {
     bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) );
-    bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() );
+    bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() );
     x += (*it).width();
   }
 
-  res.setMask( mask );
+  res.setMask( tqmask );
   return res;
 }
 
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index ac46cb959..4ada5112a 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -183,7 +183,7 @@ public:
   TQString from() const;
 
   // Return the serial number of the message associated with this item;
-  Q_UINT32 msgSerNum() const;
+  TQ_UINT32 msgSerNum() const;
 
   /** Expands all children of the list view item. */
   void setOpenRecursive( bool open );
@@ -232,7 +232,7 @@ public:
 
 private:
   int mMsgId;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
   TQString mKey;
   bool mAboutToBeDeleted;
   SortCacheItem *mSortCacheItem;
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 69ac5b1f7..a2262744f 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -72,20 +72,20 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
   mStatusCombo->setSizeLimit( 12 );
   mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
 
-  insertStatus( StatusUnread );
-  insertStatus( StatusNew );
-  insertStatus( StatusImportant );
-  insertStatus( StatusReplied );
-  insertStatus( StatusForwarded );
-  insertStatus( StatusToDo );
-  insertStatus( StatusHasAttachment );
-  insertStatus( StatusInvitation );
-  insertStatus( StatusWatched );
-  insertStatus( StatusIgnored );
+  inserStatus( StatusUnread );
+  inserStatus( StatusNew );
+  inserStatus( StatusImportant );
+  inserStatus( StatusReplied );
+  inserStatus( StatusForwarded );
+  inserStatus( StatusToDo );
+  inserStatus( StatusHasAttachment );
+  inserStatus( StatusInvitation );
+  inserStatus( StatusWatched );
+  inserStatus( StatusIgnored );
   mStatusCombo->setCurrentItem( 0 );
   mStatusCombo->installEventFilter( this );
   connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
-           this, TQT_SLOT( slotStatusChanged( int ) ) );
+           this, TQT_SLOT( sloStatusChanged( int ) ) );
 
   label->setBuddy( mStatusCombo );
 
@@ -116,7 +116,7 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
     KMMainWidget *mainWidget = 0;
 
     // Travel up the parents list until we find the main widget
-    for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) {
+    for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) {
       mainWidget = ::qt_cast( curWidget );
       if ( mainWidget )
         break;
@@ -155,10 +155,10 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri
   // The full email address is not visible, but we still want it to be searchable.
   // KListViewSearchLine::itemMatches() only searches in visible columns.
   const HeaderItem *headerItem = static_cast( item );
-  if ( headerItem->from().lower().contains( s.lower() ) ) {
+  if ( headerItem->from().lower().tqcontains( s.lower() ) ) {
     return true;
   }
-  if ( headerItem->to().lower().contains( s.lower() ) ) {
+  if ( headerItem->to().lower().tqcontains( s.lower() ) ) {
     return true;
   }
 
@@ -170,10 +170,10 @@ void HeaderListQuickSearch::reset()
 {
   clear();
   mStatusCombo->setCurrentItem( 0 );
-  slotStatusChanged( 0 );
+  sloStatusChanged( 0 );
 }
 
-void HeaderListQuickSearch::slotStatusChanged( int index )
+void HeaderListQuickSearch::sloStatusChanged( int index )
 {
   if ( index == 0 )
     mStatus = 0;
@@ -182,7 +182,7 @@ void HeaderListQuickSearch::slotStatusChanged( int index )
   updateSearch();
 }
 
-void HeaderListQuickSearch::insertStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
 {
   mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
     i18n( KMail::StatusValues[ which ].text ) );
@@ -196,7 +196,7 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
 }
 
 
-int HeaderListQuickSearch::currentStatus() const
+int HeaderListQuickSearch::currenStatus() const
 {
     return mStatus;
 }
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index 09898f95b..ddef0b40b 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -66,7 +66,7 @@ public:
     /**
      * Returns the currently selected status filter.
      */
-    int currentStatus() const;
+    int currenStatus() const;
 
 public slots:
    void reset();
@@ -76,7 +76,7 @@ signals:
 
 protected:
     /**
-     * checks whether @param item contains the search string and has the status
+     * checks whether @param item tqcontains the search string and has the status
      * currently in mStatus
      */
     virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
@@ -86,11 +86,11 @@ private slots:
    * cache the status in mStatus so as to avoid having to do the comparatively
    * expensive string comparison for each item in itemMatches
    */
-  void slotStatusChanged( int index );
+  void sloStatusChanged( int index );
 
 private:
     /** Helper method for the filling of the status combo. */
-    void insertStatus(KMail::StatusValueTypes which);
+    void inserStatus(KMail::StatusValueTypes which);
     TQComboBox *mStatusCombo;
     KMMsgStatus mStatus;
     TQValueVector statusList;
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index bfe9845be..3fed82ab2 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -243,8 +243,8 @@ namespace KMail {
   }
 
   bool HeaderStrategy::showHeader( const TQString & header ) const {
-    if ( headersToDisplay().contains( header.lower() ) ) return true;
-    if ( headersToHide().contains( header.lower() ) ) return false;
+    if ( headersToDisplay().tqcontains( header.lower() ) ) return true;
+    if ( headersToHide().tqcontains( header.lower() ) ) return false;
     return defaultPolicy() == Display;
   }
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index f099d9822..3f3073ef7 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -124,7 +124,7 @@ namespace KMail {
       strategy = HeaderStrategy::brief();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -223,7 +223,7 @@ namespace KMail {
       strategy = HeaderStrategy::rich();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
 
@@ -394,15 +394,15 @@ namespace KMail {
       { 255,  25,   0 },
       { 255,   0,   0 }
     };
-    meterBar.setColor( 21, qRgb( 255, 255, 255 ) );
-    meterBar.setColor( 22, qRgb( 170, 170, 170 ) );
+    meterBar.setColor( 21, tqRgb( 255, 255, 255 ) );
+    meterBar.setColor( 22, tqRgb( 170, 170, 170 ) );
     if ( percent < 0 ) // grey is for errors
       meterBar.fill( 22 );
     else {
       meterBar.fill( 21 );
       int max = QMIN( 20, static_cast( percent ) / 5 );
       for ( int i = 0; i < max; ++i ) {
-        meterBar.setColor( i+1, qRgb( gradient[i][0], gradient[i][1],
+        meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1],
                                       gradient[i][2] ) );
         meterBar.setPixel( i, 0, i+1 );
       }
@@ -427,7 +427,7 @@ namespace KMail {
 
     // ### from kmreaderwin begin
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
     TQString headerStr = TQString("
      \n").arg(dir);
@@ -478,7 +478,7 @@ namespace KMail {
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
     TQString kabcUid;
     KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-    KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+    KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
     TQString photoURL;
     int photoWidth = 60;
@@ -493,7 +493,7 @@ namespace KMail {
           presence = imProxy->presenceString( kabcUid );
           if ( !presence.isEmpty() )
           {
-            TQString presenceIcon = TQString::fromLatin1( " " )
+            TQString presenceIcon = TQString::tqfromLatin1( " " )
                 .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
@@ -853,7 +853,7 @@ namespace KMail {
     TQBuffer buffer( ba );
     buffer.open( IO_WriteOnly );
     image.save( &buffer, fmt );
-    return TQString::fromLatin1("data:image/%1;base64,%2")
+    return TQString::tqfromLatin1("data:image/%1;base64,%2")
            .arg( fmt, KCodecs::base64Encode( ba ) );
   }
 
@@ -882,7 +882,7 @@ namespace KMail {
 	    strategy = HeaderStrategy::brief();
 
 	// The direction of the header is determined according to the direction
-	// of the application layout.
+	// of the application tqlayout.
 
 	TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -901,7 +901,7 @@ namespace KMail {
 	// colors depend on if its encapsulated or not
         TQColor fontColor(Qt::white);
 	TQString linkColor = "class =\"white\"";
-	const TQColor activeColor = qApp->palette().active().highlight();
+	const TQColor activeColor = tqApp->palette().active().highlight();
 	TQColor activeColorDark = activeColor.dark(130);
         // reverse colors for encapsulated
         if( !topLevel ){
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 2c6e6faff..111ce6cd6 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -52,9 +52,9 @@ KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlag
   : TQLabel( parent, name, f ),
     mMode( Normal )
 {
-  setAlignment( AlignHCenter|AlignTop );
+  tqsetAlignment( AlignHCenter|AlignTop );
   // Don't force a minimum height to the reader widget
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
   upd();
 }
 
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 22b5a4c81..5c3f7df69 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -165,7 +165,7 @@ namespace KMail {
     label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab );
     glay->addWidget( label, row, 0, TQt::AlignTop );
     msg = i18n("
      Email aliases
      "
-               "
      This field contains alias addresses that should also "
+               "
      This field tqcontains alias addresses that should also "
                "be considered as belonging to this identity (as opposed "
                "to representing a different identity).
      "
                "
      Example:
      "
@@ -427,16 +427,16 @@ namespace KMail {
     // Tab Widget: Signature
     //
     mSignatureConfigurator = new SignatureConfigurator( tabWidget );
-    mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") );
 
     mXFaceConfigurator = new XFaceConfigurator( tabWidget );
-    mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    if ( geometry.hasKey( "Identity Dialog size" ) )
-      resize( geometry.readSizeEntry( "Identity Dialog size" ) );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    if ( tqgeometry.hasKey( "Identity Dialog size" ) )
+      resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
 
     connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
@@ -444,8 +444,8 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    geometry.writeEntry( "Identity Dialog size", size() );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    tqgeometry.writeEntry( "Identity Dialog size", size() );
   }
 
   void IdentityDialog::slotAboutToShow( TQWidget * w ) {
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index e8ba4a07e..855206372 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -54,7 +54,7 @@ namespace KMail {
       return 0;
   }
 
-  TQByteArray IdentityDrag::encodedData( const char * mimetype ) const {
+  TQByteArray IdentityDrag::tqencodedData( const char * mimetype ) const {
     TQByteArray a;
 
     if ( !qstrcmp( mimetype, kmailIdentityMimeType ) ) {
@@ -73,7 +73,7 @@ namespace KMail {
   bool IdentityDrag::decode( const TQMimeSource * e, KPIM::Identity & i ) {
 
     if ( e->provides( kmailIdentityMimeType ) ) {
-      TQDataStream s( e->encodedData( kmailIdentityMimeType ), IO_ReadOnly );
+      TQDataStream s( e->tqencodedData( kmailIdentityMimeType ), IO_ReadOnly );
       s >> i;
       return true;
     }
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index 82d6d0262..f48e1a3c7 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -51,7 +51,7 @@ namespace KMail {
     virtual ~IdentityDrag() {}
 
     const char * format( int i ) const; // reimp. QMimeSource
-    TQByteArray encodedData( const char * mimetype ) const; // dto.
+    TQByteArray tqencodedData( const char * mimetype ) const; // dto.
 
     static bool canDecode( const TQMimeSource * e );
     static bool decode( const TQMimeSource * e, KPIM::Identity & ident );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index b0f78c5aa..01e1324c8 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::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmmainwin.h"
 #include "kmfolderimap.h"
 #include "kmmainwidget.h"
@@ -354,7 +354,7 @@ namespace KMail {
       checkDone( false, CheckOK );
     }
     if ( showStatusMsg )
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
           name(), newMails);
   }
 
@@ -669,7 +669,7 @@ namespace KMail {
       // split, allow empty parts as we can get empty namespaces
       TQStringList parts = TQStringList::split( "=", *it, true );
       imapNamespace section = imapNamespace( parts[0].toInt() );
-      if ( map.contains( section ) ) {
+      if ( map.tqcontains( section ) ) {
         nsDelim = map[section];
       } else {
         nsDelim.clear();
@@ -736,31 +736,31 @@ namespace KMail {
         TQString msg = i18n("KMail has detected a prefix entry in the "
             "configuration of the account \"%1\" which is obsolete with the "
             "support of IMAP namespaces.").arg( name() );
-        if ( list.contains( "" ) ) {
-          // replace empty entry with the old prefix
+        if ( list.tqcontains( "" ) ) {
+          // tqreplace empty entry with the old prefix
           list.remove( "" );
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.contains( "" ) ) {
+          if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
             TQString delim = mNamespaceToDelimiter[""];
             mNamespaceToDelimiter.remove( "" );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - replaced empty with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - tqreplaced 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 replace it
+          // only one entry in the personal namespace so tqreplace it
           TQString old = list.first();
           list.clear();
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.contains( old ) ) {
+          if ( mNamespaceToDelimiter.tqcontains( old ) ) {
             TQString delim = mNamespaceToDelimiter[old];
             mNamespaceToDelimiter.remove( old );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - replaced single with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - tqreplaced single with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else {
@@ -812,7 +812,7 @@ namespace KMail {
   {
     //kdDebug(5006) << "delimiterForNamespace " << prefix << endl;
     // try to match exactly
-    if ( mNamespaceToDelimiter.contains(prefix) ) {
+    if ( mNamespaceToDelimiter.tqcontains(prefix) ) {
       return mNamespaceToDelimiter[prefix];
     }
 
@@ -820,17 +820,17 @@ namespace KMail {
     // exclude empty namespace
     for ( namespaceDelim::ConstIterator it = mNamespaceToDelimiter.begin();
           it != mNamespaceToDelimiter.end(); ++it ) {
-      // the namespace definition sometimes contains the delimiter
+      // the namespace definition sometimes tqcontains the delimiter
       // make sure we also match this version
       TQString stripped = it.key().left( it.key().length() - 1 );
       if ( !it.key().isEmpty() &&
-          ( prefix.contains( it.key() ) || prefix.contains( stripped ) ) ) {
+          ( prefix.tqcontains( it.key() ) || prefix.tqcontains( stripped ) ) ) {
         return it.data();
       }
     }
     // see if we have an empty namespace
     // this should always be the case
-    if ( mNamespaceToDelimiter.contains( "" ) ) {
+    if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
       return mNamespaceToDelimiter[""];
     }
     // well, we tried
@@ -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::BroadcastStatus::instance()->setStatusMsg(
+            KPIM::BroadcasStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).arg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
-            KPIM::BroadcastStatus::instance()->setStatusMsg(
+            KPIM::BroadcasStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
@@ -1025,7 +1025,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::processNewMailInFolder( KMFolder* folder, FolderListType type /*= Single*/ )
   {
-    if ( mFoldersQueuedForChecking.contains( folder ) )
+    if ( mFoldersQueuedForChecking.tqcontains( folder ) )
       return;
     mFoldersQueuedForChecking.append( folder );
     mCheckingSingleFolder = ( type == Single );
@@ -1057,7 +1057,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   bool ImapAccountBase::checkingMail( KMFolder *folder )
   {
-    if (checkingMail() && mFoldersQueuedForChecking.contains(folder))
+    if (checkingMail() && mFoldersQueuedForChecking.tqcontains(folder))
       return true;
     return false;
   }
@@ -1215,7 +1215,7 @@ namespace KMail {
      jd.path = path;
      insertJob(job, jd);
      connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+           TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
   void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1237,11 +1237,11 @@ namespace KMail {
      jd.path = path;
      insertJob(job, jd);
      connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+           TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
+  void ImapAccountBase::slotSeStatusResult(KIO::Job * job)
   {
      ImapAccountBase::JobIterator it = findJob(job);
      if ( it == jobsEnd() ) return;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 39fb33b69..0795eb2ab 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -266,9 +266,9 @@ namespace KMail {
 
     /**
      * Called when we're completely done checking mail for this account
-     * When @p setStatusMsg is true a status msg is shown
+     * When @p seStatusMsg is true a status msg is shown
      */
-    void postProcessNewMail( bool setStatusMsg = true );
+    void postProcessNewMail( bool seStatusMsg = true );
 
     /**
      * Check whether we're checking for new mail
@@ -397,7 +397,7 @@ namespace KMail {
       * Returns true if the account has the given capability
       */
      bool hasCapability( const TQString& capa ) {
-      return mCapabilities.contains( capa ); }
+      return mCapabilities.tqcontains( capa ); }
 
      /**
       * Create an IMAP path for a parent folder and a foldername
@@ -437,7 +437,7 @@ namespace KMail {
     /**
      * Only delete information about the job and ignore write errors
      */
-    void slotSetStatusResult(KIO::Job * job);
+    void slotSeStatusResult(KIO::Job * job);
 
     /// Result of getUserRights() job
     void slotGetUserRightsResult( KIO::Job* _job );
@@ -590,7 +590,7 @@ namespace KMail {
 
     /**
      * Emitted when changeSubscription() failed.
-     * @param errorMessage the error message that contains the reason for the failure
+     * @param errorMessage the error message that tqcontains the reason for the failure
      */
     void subscriptionChangeFailed( const TQString &errorMessage );
 
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 560343689..b76c6d2cc 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -133,7 +133,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       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);
-      jd.data.resize( cstr.length() + cstr.contains( "\n" ) - cstr.contains( "\r\n" ) );
+      jd.data.resize( cstr.length() + cstr.tqcontains( "\n" ) - cstr.tqcontains( "\r\n" ) );
       unsigned int i = 0;
       char prevChar = '\0';
       // according to RFC 2060 we need CRLF
@@ -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->setStatus( errorStr );
+      (*it).progressItem->seStatus( errorStr );
     account->handleJobError( job, errorStr );
     return;
   } else {
@@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
   if (job->error())
   {
     if ( (*it).progressItem )
-      (*it).progressItem->setStatus( i18n("Uploading message data failed.") );
+      (*it).progressItem->seStatus( i18n("Uploading message data failed.") );
     account->handlePutError( job, *it, mDestFolder );
     return;
   } else {
     if ( (*it).progressItem )
-      (*it).progressItem->setStatus( i18n("Uploading message data completed.") );
+      (*it).progressItem->seStatus( i18n("Uploading message data completed.") );
     if ( mParentProgressItem )
     {
       mParentProgressItem->incCompletedItems();
@@ -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->setStatus( errStr );
+      (*it).progressItem->seStatus( errStr );
     if ( account->handleJobError( job, errStr  ) )
       deleteLater();
     return;
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index bdae8054d..b446ba0b1 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -73,7 +73,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla
   mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 );
 
   // Make it a bit bigger, else the folder requester cuts off the text too early
-  resize( 500, minimumSize().height() );
+  resize( 500, tqminimumSize().height() );
 }
 
 void ImportArchiveDialog::setFolder( KMFolder *defaultFolder )
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 3a7de1981..cddf6a65e 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -39,11 +39,11 @@
 
 using namespace KMail;
 
-KMail::ImportJob::ImportJob( TQWidget *parentWidget )
-  : TQObject( parentWidget ),
+KMail::ImportJob::ImportJob( TQWidget *tqparentWidget )
+  : TQObject( tqparentWidget ),
     mArchive( 0 ),
     mRootFolder( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mNumberOfImportedMessages( 0 ),
     mCurrentFolder( 0 ),
     mCurrentMessage( 0 ),
@@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage()
       return;
     }
     kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
-    mProgressItem->setStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
+    mProgressItem->seStatus( 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 /* setStatus */ );
+  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ );
   int retIndex;
 
   // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is
diff --git a/kmail/importjob.h b/kmail/importjob.h
index ee7a0ac8b..170441415 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -55,7 +55,7 @@ class ImportJob : public TQObject
 
   public:
 
-    explicit ImportJob( TQWidget *parentWidget = 0 );
+    explicit ImportJob( TQWidget *tqparentWidget = 0 );
     ~ImportJob();
     void start();
     void setFile( const KURL &archiveFile );
diff --git a/kmail/index.cpp b/kmail/index.cpp
index ef1ba7de3..632315a52 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -60,15 +60,15 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled";
 
 #ifdef HAVE_INDEXLIB
 static
-TQValueList vectorToQValueList( const std::vector& input ) {
+TQValueList vectorToQValueList( const std::vector& input ) {
 	TQValueList res;
 	std::copy( input.begin(), input.end(), std::back_inserter( res ) );
 	return res;
 }
 
 static
-std::vector QValueListToVector( const TQValueList& input ) {
-	std::vector res;
+std::vector QValueListToVector( const TQValueList& input ) {
+	std::vector res;
 	// res.assign( input.begin(), input.end() ) doesn't work for some reason
 	for ( TQValueList::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) {
 		res.push_back( *first );
@@ -91,10 +91,10 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 	mSlowDown( false ) {
 	kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl;
 
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) );
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) );
 
 	connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
 	//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
@@ -272,7 +272,7 @@ void KMMsgIndex::maintenance() {
 #endif
 }
 
-int KMMsgIndex::addMessage( Q_UINT32 serNum ) {
+int KMMsgIndex::addMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::addMessage( " << serNum << " )" << endl;
 	if ( mState == s_error ) return 0;
 #ifdef HAVE_INDEXLIB
@@ -407,7 +407,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
 	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) );
 	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) );
 	connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) );
-	connect( search, TQT_SIGNAL( found( Q_UINT32 ) ), s, TQT_SIGNAL( found( Q_UINT32 ) ) );
+	connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) );
 	mSearches.push_back( search );
 	return true;
 }
@@ -449,13 +449,13 @@ bool KMMsgIndex::stopQuery( KMSearch* s ) {
 	return false;
 }
 
-std::vector KMMsgIndex::simpleSearch( TQString s, bool* ok ) const {
+std::vector KMMsgIndex::simpleSearch( TQString s, bool* ok ) const {
 	kdDebug( 5006 ) << "KMMsgIndex::simpleSearch( -" << s.latin1() << "- )" << endl;
 	if ( mState == s_error || mState == s_disabled ) {
 		if ( ok ) *ok = false;
-		return std::vector();
+		return std::vector();
 	}
-	std::vector res;
+	std::vector res;
 #ifdef HAVE_INDEXLIB
 	assert( mIndex );
 	std::vector residx = mIndex->search( s.latin1() )->list();
@@ -482,7 +482,7 @@ bool KMMsgIndex::canHandleQuery( const KMSearchPattern* pat ) const {
 	return false;
 }
 
-void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::slotAddMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::slotAddMessage( . , " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -493,7 +493,7 @@ void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) {
 	scheduleAction();
 }
 
-void KMMsgIndex::slotRemoveMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::slotRemoveMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::slotRemoveMessage( . , " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -509,7 +509,7 @@ void KMMsgIndex::scheduleAction() {
 #endif
 }
 
-void KMMsgIndex::removeMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::removeMessage( " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() {
 			TQString terms;
 			for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) {
 				Q_ASSERT( rule->function() == KMSearchRule::FuncContains );
-				terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() );
+				terms += TQString::tqfromLatin1( " %1 " ).arg( rule->contents() );
 			}
 
 			mValues = kmkernel->msgIndex()->simpleSearch( terms, 0  );
diff --git a/kmail/index.h b/kmail/index.h
index 91c69f2d7..5e7f16dce 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -74,7 +74,7 @@ class KMMsgIndex : public TQObject {
 		/**
 		 * Just return all the uids where the pattern exists
 		 */
-		std::vector simpleSearch( TQString, bool* ) const;
+		std::vector simpleSearch( TQString, bool* ) const;
 
 		/**
 		 * Returns whether the folder is indexable. Only local and dimap
@@ -133,14 +133,14 @@ class KMMsgIndex : public TQObject {
 
 		void continueCreation();
 
-		void slotAddMessage( Q_UINT32 message );
-		void slotRemoveMessage( Q_UINT32 message );
+		void slotAddMessage( TQ_UINT32 message );
+		void slotRemoveMessage( TQ_UINT32 message );
 	private:
 		static TQString defaultPath();
 
 		bool canHandleQuery( const KMSearchPattern* ) const;
-		int addMessage( Q_UINT32 );
-		void removeMessage( Q_UINT32 );
+		int addMessage( TQ_UINT32 );
+		void removeMessage( TQ_UINT32 );
 
 		void scheduleAction();
 		bool creating() const;
@@ -151,16 +151,16 @@ class KMMsgIndex : public TQObject {
 		 * DO NOT USE THIS CLASS
 		 *
 		 * It is conceptually a private class.
-		 * Just needs to be public because of moc limitations
+		 * Just needs to be public because of tqmoc limitations
 		 */
 		class Search;
 	private:
 
-		std::vector mPendingMsgs;
+		std::vector mPendingMsgs;
 		std::vector mPendingFolders;
-		std::vector mAddedMsgs;
-		std::vector mRemovedMsgs;
-		std::vector mExisting;
+		std::vector mAddedMsgs;
+		std::vector mRemovedMsgs;
+		std::vector mExisting;
 
 		enum e_state {
 			s_idle, // doing nothing, index waiting
@@ -199,7 +199,7 @@ class KMMsgIndex::Search : public TQObject {
 		~Search();
 		KMSearch* search() const { return mSearch; }
 	signals:
-		void found( Q_UINT32 );
+		void found( TQ_UINT32 );
 		void finished( bool );
 	private slots:
 		void act();
@@ -211,7 +211,7 @@ class KMMsgIndex::Search : public TQObject {
 		 * handled by the index
 		 */
 		KMSearchPattern* mResidual;
-		std::vector mValues;
+		std::vector mValues;
 		enum { s_none = 0, s_starting, s_emitting, s_emitstopped, s_done } mState;
 };
 
diff --git a/kmail/isubject.cpp b/kmail/isubject.cpp
index d231d365c..caf3ef5f1 100644
--- a/kmail/isubject.cpp
+++ b/kmail/isubject.cpp
@@ -18,12 +18,12 @@ namespace KMail {
 
   void ISubject::attach( Interface::Observer * pObserver )
   {
-    if ( qFind( mObserverList.begin(), mObserverList.end(), pObserver ) == mObserverList.end() )
+    if ( tqFind( mObserverList.begin(), mObserverList.end(), pObserver ) == mObserverList.end() )
       mObserverList.push_back( pObserver );
   }
 
   void ISubject::detach( Interface::Observer * pObserver ) {
-    TQValueVector::iterator it = qFind( mObserverList.begin(), mObserverList.end(), pObserver );
+    TQValueVector::iterator it = tqFind( mObserverList.begin(), mObserverList.end(), pObserver );
     if ( it != mObserverList.end() )
       mObserverList.erase( it );
   }
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index c18b42971..a93e92afb 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -13,9 +13,9 @@
 class KCursorSaver : public Qt
 {
 public:
-    /// constructor taking TQCursor shapes
-    KCursorSaver(Qt::CursorShape shape) {
-        TQApplication::setOverrideCursor( TQCursor(shape) );
+    /// constructor taking TQCursor tqshapes
+    KCursorSaver(Qt::tqCursorShape tqshape) {
+        TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
 
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 3c1a952ca..94edd591c 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1379,7 +1379,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
     SplitInfo & si = v.front();
     for ( std::vector::const_iterator it = v.begin() + 1; it != v.end() ; ++it ) {
       si.keys.insert( si.keys.end(), it->keys.begin(), it->keys.end() );
-      qCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) );
+      tqCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) );
     }
     v.resize( 1 );
   }
@@ -1579,8 +1579,8 @@ std::vector Kleo::KeyResolver::signingKeys( CryptoMessageFormat f )
 
 
 std::vector Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector & selectedKeys ) const {
-  const bool opgp = containsOpenPGP( mCryptoMessageFormats );
-  const bool x509 = containsSMIME( mCryptoMessageFormats );
+  const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats );
+  const bool x509 = tqcontainsSMIME( mCryptoMessageFormats );
 
   Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
 				msg, KPIM::getEmailAddress(person), selectedKeys,
@@ -1770,7 +1770,7 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
     return it->second;
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  const KABC::Addressee::List res = ab->findByEmail( address );
+  const KABC::Addressee::List res = ab->tqfindByEmail( address );
   ContactPreferences pref;
   if ( !res.isEmpty() ) {
     KABC::Addressee addr = res.first();
@@ -1792,7 +1792,7 @@ 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->findByEmail( email );
+  KABC::Addressee::List res = ab->tqfindByEmail( email );
 
   KABC::Addressee addr;
   if ( res.isEmpty() ) {
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 2d29d3c9e..900264cd6 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -86,7 +86,7 @@ namespace KMail {
 
     mHtmlPart->view()->viewport()->setUpdatesEnabled( true );
     mHtmlPart->view()->setUpdatesEnabled( true );
-    mHtmlPart->view()->viewport()->repaint( false );
+    mHtmlPart->view()->viewport()->tqrepaint( false );
     mState = Ended;
   }
 
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index dc0eb6d2c..6baa874be 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -77,11 +77,11 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) {
   return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ;
 }
 
-static inline bool containsSMIME( unsigned int f ) {
+static inline bool tqcontainsSMIME( unsigned int f ) {
   return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ;
 }
 
-static inline bool containsOpenPGP( unsigned int f ) {
+static inline bool tqcontainsOpenPGP( unsigned int f ) {
   return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
 }
 
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index ad0f55b30..8ddf6899a 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::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldercachedimap.h"
 
 #include "progressmanager.h"
@@ -45,7 +45,7 @@ using KMail::FolderJob;
 KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
   : TQObject(parent), mPrecommand(precommand)
 {
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   mPrecommandProcess.setUseShell(true);
@@ -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->setStatus(KMMsgStatusUnread);  // -sanders
-    //    aMsg->setStatus(KMMsgStatusRead);
+      aMsg->seStatus(KMMsgStatusUnread);  // -sanders
+    //    aMsg->seStatus(KMMsgStatusRead);
     else
-      aMsg->setStatus(KMMsgStatusNew);
+      aMsg->seStatus(KMMsgStatusNew);
   }
 /*
 TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 
   KMPrecommand precommandProcess(precommand, this);
 
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
@@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr)
   TQString result;
   for (uint i = 0; i < aStr.length(); i++)
     /* yes, no typo. can't encode ' ' or '!' because
-       they're the unicode BOM. stupid scrambling. stupid. */
-    result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] :
-      TQChar(0x1001F - aStr[i].unicode());
+       they're the tqunicode BOM. stupid scrambling. stupid. */
+    result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] :
+      TQChar(0x1001F - aStr[i].tqunicode());
   return result;
 }
 
@@ -451,7 +451,7 @@ TQString KMAccount::importPassword(const TQString &aStr)
   return encryptStr(result);
 }
 
-void KMAccount::invalidateIMAPFolders()
+void KMAccount::tqinvalidateIMAPFolders()
 {
   // Default: Don't do anything. The IMAP account will handle it
 }
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 44cd67b0d..2872b1110 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -206,9 +206,9 @@ public:
   virtual void setHasInbox( bool has ) { mHasInbox = has; }
 
   /**
-   * If this account is a disconnected IMAP account, invalidate it.
+   * If this account is a disconnected IMAP account, tqinvalidate it.
    */
-  virtual void invalidateIMAPFolders();
+  virtual void tqinvalidateIMAPFolders();
 
   /**
    * Determines whether the account can be checked, currently.
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index b673b5e14..4fc57d2c1 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -336,12 +336,12 @@ void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
   config.writeEntry( "groupwareType", mGroupwareType );
 }
 
-void KMAcctCachedImap::invalidateIMAPFolders()
+void KMAcctCachedImap::tqinvalidateIMAPFolders()
 {
-  invalidateIMAPFolders( mFolder );
+  tqinvalidateIMAPFolders( mFolder );
 }
 
-void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
+void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder )
 {
   if( !folder || !folder->folder() )
     return;
@@ -361,7 +361,7 @@ void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
     KMFolder *f = *it;
     if( f && f->folderType() == KMFolderTypeCachedImap ) {
       KMFolderCachedImap *cfolder = static_cast(f->storage());
-      // This invalidates the folder completely
+      // This tqinvalidates the folder completely
       cfolder->setUidValidity("INVALID");
       cfolder->writeUidCache();
     }
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index 72ed5c7db..5c3aa6c3b 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -97,8 +97,8 @@ public:
   /**
    * Invalidate the local cache.
    */
-  virtual void invalidateIMAPFolders();
-  virtual void invalidateIMAPFolders( KMFolderCachedImap* );
+  virtual void tqinvalidateIMAPFolders();
+  virtual void tqinvalidateIMAPFolders( KMFolderCachedImap* );
 
   /**
    * Remember that a folder got explicitely deleted - including all child folders
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 97dca0d75..6545d4e62 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -24,7 +24,7 @@
 
 class KMAccount;
 
-/** Simple wrapper class that contains the kmail account handling
+/** Simple wrapper class that tqcontains the kmail account handling
  * stuff that is usually not required outside kmail.
  *
  * WARNING: do not add virtual methods in this class. This class is
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 4ead745c7..12d17af89 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
 
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldertree.h"
 #include "kmfoldermgr.h"
 #include "kmfolderimap.h"
@@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
@@ -410,8 +410,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   }
 
   // Filter messages
-  TQValueListIterator filterIt = mFilterSerNums.begin();
-  TQValueList inTransit;
+  TQValueListIterator filterIt = mFilterSerNums.begin();
+  TQValueList inTransit;
 
   if (ActionScheduler::isEnabled() ||
       kmkernel->filterMgr()->atLeastOneOnlineImapFolderTarget()) {
@@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     if (!mScheduler) {
 	mScheduler = new KMail::ActionScheduler( set, filters );
 	mScheduler->setAccountId( id() );
-	connect( mScheduler, TQT_SIGNAL(filtered(Q_UINT32)), this, TQT_SLOT(slotFiltered(Q_UINT32)) );
+	connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) );
     } else {
 	mScheduler->setFilterList( filters );
     }
@@ -496,7 +496,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 }
 
 //-----------------------------------------------------------------------------
-void KMAcctImap::slotFiltered(Q_UINT32 serNum)
+void KMAcctImap::slotFiltered(TQ_UINT32 serNum)
 {
     mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 }
@@ -577,10 +577,10 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
   folder->close( "acctimap" );
 }
 
-void KMAcctImap::execFilters(Q_UINT32 serNum)
+void KMAcctImap::execFilters(TQ_UINT32 serNum)
 {
   if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return;
-  TQValueListIterator findIt = mFilterSerNums.find( serNum );
+  TQValueListIterator findIt = mFilterSerNums.find( serNum );
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
@@ -594,7 +594,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
     return -1;
   }
   msg->setTransferInProgress(false);
-  Q_UINT32 serNum = msg->getMsgSerNum();
+  TQ_UINT32 serNum = msg->getMsgSerNum();
   if ( serNum )
     mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index fac17eebe..f3fcc693f 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -92,13 +92,13 @@ public:
   /**
    * Queues a message for automatic filtering
    */
-  void execFilters(Q_UINT32 serNum);
+  void execFilters(TQ_UINT32 serNum);
     
 public slots:
   /**
    * updates the new-mail-check folderlist
    */
-  void slotFiltered(Q_UINT32 serNum);
+  void slotFiltered(TQ_UINT32 serNum);
   void slotUpdateFolderList();
 
 protected:
@@ -144,7 +144,7 @@ private:
   int mCountRemainChecks;
   /** used to reset connection errors */
   TQTimer mErrorTimer;
-  TQValueList mFilterSerNums;
+  TQValueList mFilterSerNums;
   TQDict mFilterSerNumsToSave;
   KMail::ActionScheduler *mScheduler;
 };
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d1e15f83a..47e04f33b 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
 #include "kmfoldermbox.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
-  //BroadcastStatus::instance()->reset();
-  BroadcastStatus::instance()->setStatusMsg(
+  //BroadcasStatus::instance()->reset();
+  BroadcasStatus::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 );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." ));
+    BroadcasStatus::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 );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::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() );
-    BroadcastStatus::instance()->setStatusMsg( errMsg );
+    BroadcasStatus::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 );
 
-  //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true );
+  //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg()
   if (kmkernel->mailCheckAborted()) break; */
 
   const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
-  //BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  //BroadcasStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->setStatus( statusMsg );
+  mMailCheckProgressItem->seStatus( statusMsg );
 
   msg = mMailFolder->take(0);
   if (msg)
@@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg()
       fileD0.close();  // If data is 0 we just create a zero length file.
     }
 #endif
-    msg->setStatus(msg->headerField("Status").latin1(),
+    msg->seStatus(msg->headerField("Status").latin1(),
       msg->headerField("X-Status").latin1());
     msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
     msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -249,8 +249,8 @@ void KMAcctLocal::postProcess()
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->setStatus(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      mMailCheckProgressItem->seStatus(
         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 b3c5d31c7..ca3789207 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
 #include "kmfoldermaildir.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::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 );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::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 );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") );
+      BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
@@ -165,12 +165,12 @@ void KMAcctMaildir::processNewMail(bool)
     TQString statusMsg = statusMsgStub.arg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setStatus( statusMsg );
+    mMailCheckProgressItem->seStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->setStatus(msg->headerField("Status").latin1(),
+      msg->seStatus(msg->headerField("Status").latin1(),
         msg->headerField("X-Status").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...
-    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->setStatus(
+    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num );
+    mMailCheckProgressItem->seStatus(
       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)
   {
-    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num );
+    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already
 
diff --git a/kmail/kmailIface.h b/kmail/kmailIface.h
index 2338a4c40..eb4677f71 100644
--- a/kmail/kmailIface.h
+++ b/kmail/kmailIface.h
@@ -176,7 +176,7 @@ k_dcop_hidden:
       @param messageId this parameter is ignored.
   */
   /*  @TODO Get rid of the messageId parameter.  */
-  virtual bool showMail( Q_UINT32 serialNumber, TQString messageId ) = 0;
+  virtual bool showMail( TQ_UINT32 serialNumber, TQString messageId ) = 0;
 
   /**
    * DCOP-enabled for KMailUniqueAppHandler in the kontact plugin
@@ -193,9 +193,9 @@ k_dcop_hidden:
    *
    * DCOP-enabled for use in kaddressbook drop
    */
-  virtual TQString getFrom( Q_UINT32 serialNumber ) = 0;
+  virtual TQString getFrom( TQ_UINT32 serialNumber ) = 0;
   virtual TQString debugScheduler() = 0;
-  virtual TQString debugSernum( Q_UINT32 serialNumber ) = 0;
+  virtual TQString debugSernum( TQ_UINT32 serialNumber ) = 0;
 
   /** Does essentially the same as dcopAddMessage except that it doesn't reject
       duplicate messages.
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 22d48f1ee..cb40bc30a 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -60,10 +60,10 @@ using KRecentAddress::RecentAddresses;
 typedef KParts::GenericFactory< KMailPart > KMailFactory;
 K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
 
-KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
+KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
 		     TQObject *parent, const char *name, const TQStringList &) :
   DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
-  mParentWidget( parentWidget )
+  mParentWidget( tqparentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
   kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
@@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget(parentWidget, widgetName);
+  TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
   canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
   KGlobal::iconLoader()->addAppDir("kmail");
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
   mainWidget->initializeFilterActions();
   mainWidget->initializeFolderShortcutActions();
   mainWidget->setupForwardingActionsList();
-  mainWidget->updateVactionScriptStatus();
+  mainWidget->updateVactionScripStatus();
 }
 
 void KMailPart::exit()
@@ -231,7 +231,7 @@ void KMailPart::exit()
   delete this;
 }
 
-TQWidget* KMailPart::parentWidget() const
+TQWidget* KMailPart::tqparentWidget() const
 {
   return mParentWidget;
 }
@@ -244,7 +244,7 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
 
 KMainWindow * KMailStatusBarExtension::mainWindow() const
 {
-  return static_cast( mParent->parentWidget() );
+  return static_cast( mParent->tqparentWidget() );
 }
 
 #include "kmail_part.moc"
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 97a667518..69203db9b 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -53,11 +53,11 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
 {
     Q_OBJECT
   public:
-    KMailPart(TQWidget *parentWidget, const char *widgetName,
+    KMailPart(TQWidget *tqparentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
     virtual ~KMailPart();
 
-    TQWidget* parentWidget() const;
+    TQWidget* tqparentWidget() const;
 
     static KAboutData *createAboutData();
 
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index fc1b7a815..91f15df53 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -75,18 +75,18 @@ k_dcop:
   virtual KMailICalIface::StorageFormat storageFormat( const TQString& resource ) = 0;
 
   virtual KURL getAttachment( const TQString& resource,
-                              Q_UINT32 sernum,
+                              TQ_UINT32 sernum,
                               const TQString& filename ) = 0;
   virtual TQString attachmentMimetype( const TQString &resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       const TQString &filename ) = 0;
 
-  virtual TQStringList listAttachments( const TQString &resource, Q_UINT32 sernum ) = 0;
+  virtual TQStringList listAttachments( const TQString &resource, TQ_UINT32 sernum ) = 0;
 
   /// Update a kolab storage entry. Returns the new mail serial number,
   /// or 0 if something went wrong. Can be used for adding as well.
-  virtual Q_UINT32 update( const TQString& resource,
-                           Q_UINT32 sernum,
+  virtual TQ_UINT32 update( const TQString& resource,
+                           TQ_UINT32 sernum,
                            const TQString& subject,
                            const TQString& plainTextBody,
                            const TQMap& customHeaders,
@@ -96,14 +96,14 @@ k_dcop:
                            const TQStringList& deletedAttachments ) = 0;
 
   virtual bool deleteIncidenceKolab( const TQString& resource,
-                                     Q_UINT32 sernum ) = 0;
+                                     TQ_UINT32 sernum ) = 0;
 
   /// Return the number of mails that need to be looked at by incidencesKolab.
   /// This allows to call incidencesKolab in chunks.
   virtual int incidencesKolabCount( const TQString& mimetype /*ignored*/,
                                     const TQString& resource ) = 0;
 
-  virtual TQMap incidencesKolab( const TQString& mimetype,
+  virtual TQMap incidencesKolab( const TQString& mimetype,
                                                    const TQString& resource,
                                                    int startIndex,
                                                    int nbMessages ) = 0;
@@ -140,8 +140,8 @@ k_dcop:
 
 k_dcop_signals:
   void incidenceAdded( const TQString& type, const TQString& folder,
-                       Q_UINT32 sernum, int format, const TQString& entry );
-  void asyncLoadResult( const TQMap, const TQString& type,
+                       TQ_UINT32 sernum, int format, const TQString& entry );
+  void asyncLoadResult( const TQMap, const TQString& type,
                         const TQString& folder );
   void incidenceDeleted( const TQString& type, const TQString& folder,
                          const TQString& uid );
@@ -164,14 +164,14 @@ inline TQDataStream& operator>>( TQDataStream& str, KMailICalIface::SubResource&
 
 inline TQDataStream& operator<<( TQDataStream& str, const KMailICalIface::StorageFormat& format  )
 {
-  Q_UINT32 foo = format;
+  TQ_UINT32 foo = format;
   str << foo;
   return str;
 }
 
 inline TQDataStream& operator>>( TQDataStream& str, KMailICalIface::StorageFormat& format  )
 {
-  Q_UINT32 foo;
+  TQ_UINT32 foo;
   str >> foo;
   format = ( KMailICalIface::StorageFormat )foo;
   return str;
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 05524e027..41e9f96d7 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -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 replace is looked up by mimetype.
+// If lookupByName if false the attachment to tqreplace is looked up by mimetype.
 // return value: wrong if attachment could not be added/updated
 bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
                                            const TQString& attachmentURL,
@@ -325,7 +325,7 @@ bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQ
 // Delete an attachment in an existing mail.
 // return value: wrong if attachment could not be deleted
 //
-// This code could be optimized: for now we just replace
+// This code could be optimized: for now we just tqreplace
 // the attachment by an empty dummy attachment since Mimelib
 // does not provide an option for deleting attachments yet.
 bool KMailICalIfaceImpl::deleteAttachment( KMMessage& msg,
@@ -402,7 +402,7 @@ static void setXMLContentTypeHeader( KMMessage *msg, const TQString plainTextBod
 }
 
 // Store a new entry that was received from the resource
-Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
+TQ_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
                                                 const TQString& subject,
                                                 const TQString& plainTextBody,
                                                 const TQMap& customHeaders,
@@ -412,7 +412,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 {
   kdDebug(5006) << "KMailICalIfaceImpl::addIncidenceKolab( " << attachmentNames << " )" << endl;
 
-  Q_UINT32 sernum = 0;
+  TQ_UINT32 sernum = 0;
   bool bAttachOK = true;
 
   // Make a new message for the incidence
@@ -477,7 +477,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 }
 
 bool KMailICalIfaceImpl::deleteIncidenceKolab( const TQString& resource,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   // Find the message from the serial number and delete it.
   if( !mUseResourceIMAP )
@@ -530,7 +530,7 @@ int KMailICalIfaceImpl::incidencesKolabCount( const TQString& mimetype,
   return n;
 }
 
-TQMap KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
+TQMap KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
                                                              const TQString& resource,
                                                              int startIndex,
                                                              int nbMessages )
@@ -539,7 +539,7 @@ TQMap KMailICalIfaceImpl::incidencesKolab( const TQString& m
   /// TQMap with serialNumber/attachment pairs.
   /// (serial numbers of the mail are provided for easier later update)
 
-  TQMap aMap;
+  TQMap aMap;
   if( !mUseResourceIMAP )
     return aMap;
 
@@ -613,7 +613,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
 
   KMFolder *parent = msg->parent();
   Q_ASSERT( parent );
-  Q_UINT32 sernum = msg->getMsgSerNum();
+  TQ_UINT32 sernum = msg->getMsgSerNum();
 
   // do we have an accumulator for this folder?
   Accumulator *ac = mAccumulators.find( parent->location() );
@@ -622,7 +622,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
     if ( !vPartFoundAndDecoded( msg, s ) ) return;
     TQString uid( "UID" );
     vPartMicroParser( s, uid );
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
     ac->add( s );
     if( ac->isFull() ) {
@@ -637,7 +637,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
      slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
   }
 
-  if ( mTheUnGetMes.contains( sernum ) ) {
+  if ( mTheUnGetMes.tqcontains( sernum ) ) {
     mTheUnGetMes.remove( sernum );
     int i = 0;
     KMFolder* folder = 0;
@@ -666,24 +666,24 @@ int KMailICalIfaceImpl::dimapAccounts()
 
 static TQString subresourceLabelForPresentation( const KMFolder * folder )
 {
-    if( KMailICalIfaceImpl::getResourceMap()->contains( folder->location() ) ) {
+    if( KMailICalIfaceImpl::getResourceMap()->tqcontains( folder->location() ) ) {
         return folder->label();
     }
 
     TQString label = folder->prettyURL();
-    TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label );
+    TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label );
 
     // In the common special case of some other user's folder shared with us
     // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make
     // those a bit nicer.
-    if ( parts[1] == TQString::fromLatin1("user") ) {
+    if ( parts[1] == TQString::tqfromLatin1("user") ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
         remainder.pop_front();
         label = i18n("%1's %2")
             .arg( parts[2] )
-            .arg( remainder.join( TQString::fromLatin1("/") ) );
+            .arg( remainder.join( TQString::tqfromLatin1("/") ) );
     }
     // Another special case is our own folders, under the imap INBOX, make
     // those prettier too
@@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
           // Fix kolab issue 2531 folder->storage() )->account() can be null
           if( folder->storage() && static_cast( folder->storage() )->account() ) {
           label = i18n( "My %1 (%2)")
-              .arg( remainder.join( TQString::fromLatin1("/") ),
+              .arg( remainder.join( TQString::tqfromLatin1("/") ),
                     static_cast( folder->storage() )->account()->name() );
           } else {
             label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
           }
         } else {
           label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
         }
         break;
       }
@@ -812,8 +812,8 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( const TQStr
   // number, and the mail is just added instead. In this case
   // the deletedAttachments can be forgotten.
 */
-Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
-                                     Q_UINT32 sernum,
+TQ_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
+                                     TQ_UINT32 sernum,
                                      const TQString& subject,
                                      const TQString& plainTextBody,
                                      const TQMap& customHeaders,
@@ -822,7 +822,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
                                      const TQStringList& attachmentNames,
                                      const TQStringList& deletedAttachments )
 {
-  Q_UINT32 rc = 0;
+  TQ_UINT32 rc = 0;
 
    if( !mUseResourceIMAP )
     return rc;
@@ -931,7 +931,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
 }
 
 KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
-                                        Q_UINT32 sernum,
+                                        TQ_UINT32 sernum,
                                         const TQString& filename )
 {
   // This finds the attachment with the filename, saves it to a
@@ -991,7 +991,7 @@ KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
 }
 
 TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
-                                                Q_UINT32 sernum,
+                                                TQ_UINT32 sernum,
                                                 const TQString & filename )
 {
   if( !mUseResourceIMAP )
@@ -1020,7 +1020,7 @@ TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
   return TQString();
 }
 
-TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UINT32 sernum)
+TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, TQ_UINT32 sernum)
 {
   TQStringList rv;
   if( !mUseResourceIMAP )
@@ -1044,7 +1044,7 @@ TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UI
         TQString name;
         DwMediaType& contentType = part->Headers().ContentType();
         if ( TQString( contentType.SubtypeStr().c_str() ).startsWith( "x-vnd.kolab." )
-           || TQString( contentType.SubtypeStr().c_str() ).contains( "tnef" ) )
+           || TQString( contentType.SubtypeStr().c_str() ).tqcontains( "tnef" ) )
           continue;
         if ( !part->Headers().ContentDisposition().Filename().empty() )
           name = part->Headers().ContentDisposition().Filename().c_str();
@@ -1080,7 +1080,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
 
 // KMail added a file to one of the groupware folders
 void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
-                                             Q_UINT32 sernum )
+                                             TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1127,11 +1127,11 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
         folder->unGetMsg( i );
       return;
     }
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
 
     // tell the resource if we didn't trigger this ourselves
-    if ( mInTransit.contains( uid ) ) {
+    if ( mInTransit.tqcontains( uid ) ) {
       mInTransit.remove( uid );
     }
     incidenceAdded( type, folder->location(), sernum, format, s );
@@ -1150,7 +1150,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
 
 // KMail deleted a file
 void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
        GroupwarePage in configuredialog.cpp */
 
     // English
-    folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar");
-    folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks");
-    folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
-    folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
+    folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar");
+    folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks");
+    folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
+    folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
 
     // German
-    folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender");
-    folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben");
-    folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte");
-    folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen");
+    folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender");
+    folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben");
+    folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte");
+    folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen");
 
     // French
-    folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier");
+    folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier");
     // Tasks = Tâches (â == 0xE2 in latin1)
-    folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches");
-    folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
-    folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
+    folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches");
+    folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
+    folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
 
     // Dutch
-    folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda");
-    folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken");
-    folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek");
-    folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen");
-    folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities");
+    folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda");
+    folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken");
+    folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek");
+    folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen");
+    folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities");
   }
 
   if( language < 0 || language > 3 ) {
@@ -1352,7 +1352,7 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
 // Find message matching a given UID
 KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder* folder )
 {
-  if( !folder || !mUIDToSerNum.contains( uid ) ) return 0;
+  if( !folder || !mUIDToSerNum.tqcontains( uid ) ) return 0;
   int i;
   KMFolder *aFolder;
   KMMsgDict::instance()->getLocation( mUIDToSerNum[uid], &aFolder, &i );
@@ -1361,7 +1361,7 @@ KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder*
 }
 
 // Find message matching a given serial number
-KMMessage *KMailICalIfaceImpl::findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder )
+KMMessage *KMailICalIfaceImpl::findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder )
 {
   if( !folder ) return 0;
 
@@ -1560,7 +1560,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
 {
   /* Steffen said: you must issue an authenticated HTTP GET request to
      https://kolabserver/freebusy/trigger/user@domain/Folder/NestedFolder.pfb
-     (replace .pfb with .xpfb for extended fb lists). */
+     (tqreplace .pfb with .xpfb for extended fb lists). */
   KURL httpURL( folderURL );
   // Keep username ("user@domain"), pass, and host from the imap url
   httpURL.setProtocol( "https" );
@@ -1575,7 +1575,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
     return;
   }
   if ( path.startsWith( "/INBOX/", false ) ) {
-    // If INBOX, replace it with the username (which is user@domain)
+    // If INBOX, tqreplace it with the username (which is user@domain)
     path = path.mid( secondSlash );
     path.prepend( folderURL.user() );
   } else {
@@ -1922,8 +1922,8 @@ void KMailICalIfaceImpl::readConfig()
         KMFolderCachedImap *imapFolder = static_cast( storage );
 
         const TQString attributes = imapFolder->folderAttributes();
-        if ( attributes.contains( "X-FolderClass" ) ) {
-          if ( !attributes.contains( "X-SpecialFolder" ) || (*it)->location().contains( "@" ) ) {
+        if ( attributes.tqcontains( "X-FolderClass" ) ) {
+          if ( !attributes.tqcontains( "X-SpecialFolder" ) || (*it)->location().tqcontains( "@" ) ) {
             const Scalix::FolderAttributeParser parser( attributes );
             if ( !parser.folderClass().isEmpty() ) {
               FolderContentsType type = Scalix::Utils::scalixIdToContentsType( parser.folderClass() );
@@ -2051,7 +2051,7 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
       KMFolderCachedImap *imapFolder = static_cast( storage );
 
       const TQString attributes = imapFolder->folderAttributes();
-      if ( attributes.contains( "X-SpecialFolder" ) ) {
+      if ( attributes.tqcontains( "X-SpecialFolder" ) ) {
         const Scalix::FolderAttributeParser parser( attributes );
         if ( contentsType == Scalix::Utils::scalixIdToContentsType( parser.folderClass() ) ) {
           folder = *it;
@@ -2084,10 +2084,10 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
 void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
 {
   // avoid multiple connections
-  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
               this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2098,10 +2098,10 @@ void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
               this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
 
   // Setup the signals to listen for changes
-  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
            this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
     return TQString::null;
 
   if( type == KFolderTreeItem::Contacts )
-    return TQString::fromLatin1( "kmgroupware_folder_contacts" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
   else if( type == KFolderTreeItem::Calendar )
-    return TQString::fromLatin1( "kmgroupware_folder_calendar" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_calendar" );
   else if( type == KFolderTreeItem::Notes )
-    return TQString::fromLatin1( "kmgroupware_folder_notes" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_notes" );
   else if( type == KFolderTreeItem::Tasks )
-    return TQString::fromLatin1( "kmgroupware_folder_tasks" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_tasks" );
   else if( type == KFolderTreeItem::Journals )
-    return TQString::fromLatin1( "kmgroupware_folder_journals" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
 
   return TQString::null;
 }
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index c0308f928..ae2d1d6ec 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -31,7 +31,7 @@
     your version.
 */
 
-/** @file This file contains the class KMailICalIfaceImpl which actually
+/** @file This file tqcontains the class KMailICalIfaceImpl which actually
 * implements the ICal (DCOP) interface for KMail.
 */
 
@@ -95,8 +95,8 @@ public:
   /// given the subject as Subject: header.
   /// Returns the new mail serial number,
   /// or 0 if something went wrong,
-  Q_UINT32 update( const TQString& resource,
-                   Q_UINT32 sernum,
+  TQ_UINT32 update( const TQString& resource,
+                   TQ_UINT32 sernum,
                    const TQString& subject,
                    const TQString& plainTextBody,
                    const TQMap& customHeaders,
@@ -106,10 +106,10 @@ public:
                    const TQStringList& deletedAttachments );
 
   bool deleteIncidenceKolab( const TQString& resource,
-                             Q_UINT32 sernum );
+                             TQ_UINT32 sernum );
   int incidencesKolabCount( const TQString& mimetype,
                             const TQString& resource );
-  TQMap incidencesKolab( const TQString& mimetype,
+  TQMap incidencesKolab( const TQString& mimetype,
                                            const TQString& resource,
                                            int startIndex,
                                            int nbMessages );
@@ -122,14 +122,14 @@ public:
   // "Get" an attachment. This actually saves the attachment in a file
   // and returns a URL to it
   KURL getAttachment( const TQString& resource,
-                      Q_UINT32 sernum,
+                      TQ_UINT32 sernum,
                       const TQString& filename );
 
   TQString attachmentMimetype( const TQString &resource,
-                              Q_UINT32 sernum,
+                              TQ_UINT32 sernum,
                               const TQString &filename );
 
-  TQStringList listAttachments( const TQString &resource, Q_UINT32 sernum );
+  TQStringList listAttachments( const TQString &resource, TQ_UINT32 sernum );
 
 
   bool removeSubresource( const TQString& );
@@ -195,7 +195,7 @@ public:
   /** Find message matching a given UID. */
   KMMessage* findMessageByUID( const TQString& uid, KMFolder* folder );
   /** Find message matching a given serial number. */
-  static KMMessage* findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder );
+  static KMMessage* findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder );
 
   /** Convenience function to delete a message. */
   void deleteMsg( KMMessage* msg );
@@ -231,8 +231,8 @@ public slots:
   void readConfig();
   void slotFolderRemoved( KMFolder* folder );
 
-  void slotIncidenceAdded( KMFolder* folder, Q_UINT32 sernum );
-  void slotIncidenceDeleted( KMFolder* folder, Q_UINT32 sernum );
+  void slotIncidenceAdded( KMFolder* folder, TQ_UINT32 sernum );
+  void slotIncidenceDeleted( KMFolder* folder, TQ_UINT32 sernum );
   void slotRefresh( const TQString& type);
 
   // Called when a folder is made readonly or readwrite, or renamed,
@@ -281,7 +281,7 @@ private:
                          bool lookupByName );
   bool deleteAttachment( KMMessage& msg,
                          const TQString& attachmentURL );
-  Q_UINT32 addIncidenceKolab( KMFolder& folder,
+  TQ_UINT32 addIncidenceKolab( KMFolder& folder,
                               const TQString& subject,
                               const TQString& plainTextBody,
                               const TQMap& customHeaders,
@@ -344,8 +344,8 @@ private:
    * Since these are transient attributes of only a small but changing number
    * of incidences they are not encapsulated in a struct or somesuch.
    */
-  TQMap mUIDToSerNum;
-  TQMap mTheUnGetMes;
+  TQMap mUIDToSerNum;
+  TQMap mTheUnGetMes;
   TQMap mPendingUpdates;
   TQMap mInTransit;
   static TQMap *mSubResourceUINamesMap;
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index a30fe30c8..849676466 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -52,9 +52,9 @@ void KMAtmListViewItem::updateCheckBox( int headerSection, TQCheckBox *cb )
   //Set the correct background color
   TQColor bg;
   if ( isSelected() ) {
-    bg = listView()->colorGroup().highlight();
+    bg = listView()->tqcolorGroup().highlight();
   } else {
-    bg = listView()->colorGroup().base();
+    bg = listView()->tqcolorGroup().base();
   }
   cb->setPaletteBackgroundColor( bg );
 }
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 7bf978b07..907d21100 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -216,7 +216,7 @@ KMMessage *KMCommand::retrievedMessage() const
   return mRetrievedMsgs.getFirst();
 }
 
-TQWidget *KMCommand::parentWidget() const
+TQWidget *KMCommand::tqparentWidget() const
 {
   return mParent;
 }
@@ -296,7 +296,7 @@ void KMCommand::transferSelectedMsgs()
   mCountMsgs = mMsgList.count();
   uint totalSize = 0;
   // the KProgressDialog for the user-feedback. Only enable it if it's needed.
-  // For some commands like KMSetStatusCommand it's not needed. Note, that
+  // For some commands like KMSeStatusCommand it's not needed. Note, that
   // for some reason the KProgressDialog eats the MouseReleaseEvent (if a
   // command is executed after the MousePressEvent), cf. bug #71761.
   if ( mCountMsgs > 0 ) {
@@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent
 
 KMCommand::Result KMAddBookmarksCommand::execute()
 {
-  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,
                                                                     false );
   KBookmarkGroup group = bookManager->root();
@@ -558,7 +558,7 @@ KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
 KMCommand::Result KMMailtoAddAddrBookCommand::execute()
 {
   KAddrBookExternal::addEmail( KMMessage::decodeMailtoUrl( mUrl.path() ),
-                               parentWidget() );
+                               tqparentWidget() );
 
   return OK;
 }
@@ -573,7 +573,7 @@ KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
 KMCommand::Result KMMailtoOpenAddrBookCommand::execute()
 {
   KAddrBookExternal::openEmail( KMMessage::decodeMailtoUrl( mUrl.path() ),
-                                parentWidget() );
+                                tqparentWidget() );
 
   return OK;
 }
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
     clip->setText( address );
     clip->setSelectionMode( false );
     clip->setText( address );
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "Address copied to clipboard." ));
+    KPIM::BroadcasStatus::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::BroadcastStatus::instance()->setStatusMsg( i18n( "URL copied to clipboard." ));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
   }
 
   return OK;
@@ -633,13 +633,13 @@ KMCommand::Result KMUrlSaveCommand::execute()
   if ( mUrl.isEmpty() )
     return OK;
   KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString::null,
-                                         parentWidget() );
+                                         tqparentWidget() );
   if ( saveUrl.isEmpty() )
     return Canceled;
-  if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
+  if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) )
   {
     if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.
      Do you want to replace it?      ")
+        i18n("File %1 exists.
      Do you want to tqreplace it?      ")
         .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         != KMessageBox::Continue)
       return Canceled;
@@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
     viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2,
                   2*TQApplication::desktop()->screenGeometry(scnum).height()/3);
   } else {
-    viewer->resize(TQApplication::desktop()->geometry().width()/2,
-                  2*TQApplication::desktop()->geometry().height()/3);
+    viewer->resize(TQApplication::desktop()->tqgeometry().width()/2,
+                  2*TQApplication::desktop()->tqgeometry().height()/3);
   }
   viewer->show();
 
@@ -763,7 +763,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
 
 static KURL subjectToUrl( const TQString & subject )
 {
-  // We need to replace colons with underscores since those cause problems with KFileDialog (bug
+  // We need to tqreplace 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.
@@ -774,11 +774,11 @@ static KURL subjectToUrl( const TQString & subject )
   // https://issues.kolab.org/issue3805
   const TQString filter = i18n( "*.mbox|email messages (*.mbox)\n*|all files (*)" );
   TQString cleanSubject = subject.stripWhiteSpace()
-                                  .replace( TQDir::separator(), '_' )
-                                  .replace( ": ", "_" )
-                                  .replace( ':', '_' )
-                                  .replace( '.', '_' )
-                                  .replace( '~', '_' );
+                                  .tqreplace( TQDir::separator(), '_' )
+                                  .tqreplace( ": ", "_" )
+                                  .tqreplace( ':', '_' )
+                                  .tqreplace( '.', '_' )
+                                  .tqreplace( '~', '_' );
   return KFileDialog::getSaveURL( cleanSubject, filter );
 }
 
@@ -945,7 +945,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
   ++mMsgListIndex;
   // Get rid of the message.
   if ( msg && msg->parent() && msg->getMsgSerNum() &&
-       mUngetMsgs.contains( msg ) ) {
+       mUngetMsgs.tqcontains( msg ) ) {
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
@@ -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 replace it?")
+        i18n("File %1 exists.\nDo you want to tqreplace it?")
         .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mOffset = 0;
@@ -1006,7 +1006,7 @@ KMCommand::Result KMOpenMsgCommand::execute()
 {
   if ( mUrl.isEmpty() ) {
     mUrl = KFileDialog::getOpenURL( ":OpenMessage", "message/rfc822 application/mbox",
-                                    parentWidget(), i18n("Open Message") );
+                                    tqparentWidget(), i18n("Open Message") );
   }
   if ( mUrl.isEmpty() ) {
     setDeletesItself( false );
@@ -1043,7 +1043,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) {
       startOfMessage = mMsgString.find( '\n' );
       if ( startOfMessage == -1 ) {
-        KMessageBox::sorry( parentWidget(),
+        KMessageBox::sorry( tqparentWidget(),
                             i18n( "The file does not contain a message." ) );
         setResult( Failed );
         emit completed( this );
@@ -1071,7 +1071,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     dwMsg->Parse();
     // check whether we have a message ( no headers => this isn't a message )
     if ( dwMsg->Headers().NumFields() == 0 ) {
-      KMessageBox::sorry( parentWidget(),
+      KMessageBox::sorry( tqparentWidget(),
                           i18n( "The file does not contain a message." ) );
       delete dwMsg; dwMsg = 0;
       setResult( Failed );
@@ -1090,7 +1090,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     win->show();
     if ( multipleMessages )
       KMessageBox::information( win,
-                                i18n( "The file contains multiple messages. "
+                                i18n( "The file tqcontains multiple messages. "
                                       "Only the first message is shown." ) );
     setResult( OK );
     emit completed( this );
@@ -1395,7 +1395,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
       id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt();
     // set the part header
     msgPartText += "--";
-    msgPartText += TQString::fromLatin1( boundary );
+    msgPartText += TQString::tqfromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
     msgPartText += TQString( "; CHARSET=%1" ).arg( msg->charset() );
     msgPartText += '\n';
@@ -1403,7 +1403,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     dwh.MessageId().CreateDefault();
     msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() );
     msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() );
-    if ( !msg->subject().contains( "(fwd)" ) )
+    if ( !msg->subject().tqcontains( "(fwd)" ) )
       msgPartText += " (fwd)";
     msgPartText += "\n\n";
     // remove headers that shouldn't be forwarded
@@ -1422,7 +1422,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     id = mIdentity; // use folder identity if no message had an id set
   fwdMsg->initHeader( id );
   msgPartText += "--";
-  msgPartText += TQString::fromLatin1( boundary );
+  msgPartText += TQString::tqfromLatin1( boundary );
   msgPartText += "--\n";
   TQCString tmp;
   msgPart->setTypeStr( "MULTIPART" );
@@ -1452,7 +1452,7 @@ KMCommand::Result KMRedirectCommand::execute()
   if ( !msg || !msg->codec() )
     return Failed;
 
-  RedirectDialog dlg( parentWidget(), "redirect", true,
+  RedirectDialog dlg( tqparentWidget(), "redirect", true,
                       kmkernel->msgSender()->sendImmediate() );
   if (dlg.exec()==TQDialog::Rejected) return Failed;
 
@@ -1639,18 +1639,18 @@ KMCommand::Result KMPrintCommand::execute()
 }
 
 
-KMSetStatusCommand::KMSetStatusCommand( KMMsgStatus status,
-  const TQValueList &serNums, bool toggle )
+KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
+  const TQValueList &serNums, bool toggle )
   : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
 {
 }
 
-KMCommand::Result KMSetStatusCommand::execute()
+KMCommand::Result KMSeStatusCommand::execute()
 {
-  TQValueListIterator it;
+  TQValueListIterator it;
   int idx = -1;
   KMFolder *folder = 0;
-  bool parentStatus = false;
+  bool parenStatus = false;
 
   // Toggle actions on threads toggle the whole thread
   // depending on the state of the parent.
@@ -1660,9 +1660,9 @@ KMCommand::Result KMSetStatusCommand::execute()
     if (folder) {
       msg = folder->getMsgBase(idx);
       if (msg && (msg->status()&mStatus))
-        parentStatus = true;
+        parenStatus = true;
       else
-        parentStatus = false;
+        parenStatus = false;
     }
   }
   TQMap< KMFolder*, TQValueList > folderMap;
@@ -1678,7 +1678,7 @@ KMCommand::Result KMSetStatusCommand::execute()
             myStatus = true;
           else
             myStatus = false;
-          if (myStatus != parentStatus)
+          if (myStatus != parenStatus)
             continue;
         }
       }
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSetStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->setStatus( (*it2), mStatus, mToggle );
+     f->seStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -1734,15 +1734,15 @@ KMCommand::Result KMFilterActionCommand::execute()
     ProgressManager::createProgressItem ( "filter"+ProgressManager::getUniqueID(),
                                           i18n( "Filtering messages" ) );
   progressItem->setTotalItems( msgCountToFilter );
-  TQValueList::const_iterator it;
+  TQValueList::const_iterator it;
   for ( it = serNumList.begin(); it != serNumList.end(); it++ ) {
-    Q_UINT32 serNum = *it;
+    TQ_UINT32 serNum = *it;
     int diff = msgCountToFilter - ++msgCount;
     if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-      KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
+      KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
@@ -1932,7 +1932,7 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move,
       continue;
     KMFolder *child = static_cast(it);
     TQString label = child->label();
-    label.replace("&","&&");
+    label.tqreplace("&","&&");
     if (child->child() && child->child()->first()) {
       // descend
       TQPopupMenu *subMenu = new TQPopupMenu(menu, "subMenu");
@@ -1994,7 +1994,7 @@ KMCommand::Result KMCopyCommand::execute()
       msg = srcFolder->getMsg(idx);
       // corrupt IMAP cache, see FolderStorage::getMsg()
       if ( msg == 0 ) {
-        KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
+        KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
             "Copying of messages aborted.").arg( srcFolder->prettyURL() ) );
         deleteLater();
         return Failed;
@@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute()
       // make sure the attachment state is only calculated when it's complete
       if (!newMsg->isComplete())
         newMsg->setReadyToShow(false);
-      newMsg->setStatus(msg->status());
+      newMsg->seStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
@@ -2145,7 +2145,7 @@ KMMoveCommand::KMMoveCommand( KMFolder* destFolder,
   mSerNumList.append( msgBase->getMsgSerNum() );
 }
 
-KMMoveCommand::KMMoveCommand( Q_UINT32 )
+KMMoveCommand::KMMoveCommand( TQ_UINT32 )
   : mProgressItem( 0 )
 {
 }
@@ -2180,13 +2180,13 @@ KMCommand::Result KMMoveCommand::execute()
   mCompleteWithAddedMsg = false;
 
   if (mDestFolder) {
-    connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, Q_UINT32)));
+    connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
     mLostBoys = mSerNumList;
   }
   mProgressItem->setTotalItems( mSerNumList.count() );
 
-  for ( TQValueList::ConstIterator it = mSerNumList.constBegin(); it != mSerNumList.constEnd(); ++it ) {
+  for ( TQValueList::ConstIterator it = mSerNumList.constBegin(); it != mSerNumList.constEnd(); ++it ) {
     if ( *it == 0 ) {
       kdDebug(5006) << k_funcinfo << "serial number == 0!" << endl;
       continue; // invalid message
@@ -2305,7 +2305,7 @@ void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool succe
   }
 }
 
-void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum)
+void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum)
 {
   if ( folder != mDestFolder || mLostBoys.find( serNum ) == mLostBoys.end() ) {
     //kdDebug(5006) << "KMMoveCommand::msgAddedToDestFolder different "
@@ -2315,8 +2315,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum)
   mLostBoys.remove(serNum);
   if ( mLostBoys.isEmpty() ) {
     // we are done. All messages transferred to the host succesfully
-    disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, Q_UINT32)));
+    disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
     if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) {
       mDestFolder->sync();
     }
@@ -2370,7 +2370,7 @@ KMDeleteMsgCommand::KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg )
   mOpenedFolders.push_back( srcFolder );
 }
 
-KMDeleteMsgCommand::KMDeleteMsgCommand( Q_UINT32 sernum )
+KMDeleteMsgCommand::KMDeleteMsgCommand( TQ_UINT32 sernum )
 :KMMoveCommand( sernum )
 {
   if ( !sernum ) {
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
            (mUrl.protocol() == "smb")  || (mUrl.protocol() == "fish")  ||
            (mUrl.protocol() == "news"))
   {
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Opening URL..."));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n("Opening URL..."));
     KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
     if (mime->name() == "application/x-desktop" ||
         mime->name() == "application/x-executable" ||
@@ -2555,7 +2555,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
     dirUrl = KDirSelectDialog::selectDirectory( TQString::null, false,
-                                                parentWidget(),
+                                                tqparentWidget(),
                                                 i18n("Save Attachments To") );
     if ( !dirUrl.isValid() ) {
       setResult( Canceled );
@@ -2570,14 +2570,14 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   else {
     // only one item, get the desired filename
     partNode *node = mAttachmentMap.begin().key();
-    // replace all ':' with '_' because ':' isn't allowed on FAT volumes
+    // tqreplace all ':' with '_' because ':' isn't allowed on FAT volumes
     TQString s =
-      node->msgPart().fileName().stripWhiteSpace().replace( ':', '_' );
+      node->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
-      s = node->msgPart().name().stripWhiteSpace().replace( ':', '_' );
+      s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
       s = i18n("filename for an unnamed attachment", "attachment.1");
-    url = KFileDialog::getSaveURL( s, TQString::null, parentWidget(),
+    url = KFileDialog::getSaveURL( s, TQString::null, tqparentWidget(),
                                    TQString::null );
     if ( url.isEmpty() ) {
       setResult( Canceled );
@@ -2598,9 +2598,9 @@ void KMSaveAttachmentsCommand::slotSaveAll()
     if ( !dirUrl.isEmpty() ) {
       curUrl = dirUrl;
       TQString s =
-        it.key()->msgPart().fileName().stripWhiteSpace().replace( ':', '_' );
+        it.key()->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
       if ( s.isEmpty() )
-        s = it.key()->msgPart().name().stripWhiteSpace().replace( ':', '_' );
+        s = it.key()->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
       if ( s.isEmpty() ) {
         ++unnamedAtmCount;
         s = i18n("filename for the %1-th unnamed attachment",
@@ -2619,7 +2619,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      TQString origFile = curUrl.fileName();
      TQString file = origFile;
 
-     while ( renameNumbering.contains(file) ) {
+     while ( renameNumbering.tqcontains(file) ) {
        file = origFile;
        int num = renameNumbering[file] + 1;
        int dotIdx = file.findRev('.');
@@ -2628,21 +2628,21 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      curUrl.setFileName(file);
 
      // Increment the counter for both the old and the new filename
-     if ( !renameNumbering.contains(origFile))
+     if ( !renameNumbering.tqcontains(origFile))
          renameNumbering[origFile] = 1;
      else
          renameNumbering[origFile]++;
 
      if ( file != origFile ) {
-        if ( !renameNumbering.contains(file))
+        if ( !renameNumbering.tqcontains(file))
             renameNumbering[file] = 1;
         else
             renameNumbering[file]++;
      }
 
 
-      if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
-        if ( KMessageBox::warningContinueCancel( parentWidget(),
+      if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) {
+        if ( KMessageBox::warningContinueCancel( tqparentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
               .arg( curUrl.fileName() ),
               i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) {
@@ -2666,7 +2666,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   bool bSaveEncrypted = false;
   bool bEncryptedParts = node->encryptionState() != KMMsgNotEncrypted;
   if( bEncryptedParts )
-    if( KMessageBox::questionYesNo( parentWidget(),
+    if( KMessageBox::questionYesNo( tqparentWidget(),
           i18n( "The part %1 of the message is encrypted. Do you want to keep the encryption when saving?" ).
           arg( url.fileName() ),
           i18n( "KMail Question" ), i18n("Keep Encryption"), i18n("Do Not Keep") ) ==
@@ -2675,7 +2675,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
 
   bool bSaveWithSig = true;
   if( node->signatureState() != KMMsgNotSigned )
-    if( KMessageBox::questionYesNo( parentWidget(),
+    if( KMessageBox::questionYesNo( tqparentWidget(),
           i18n( "The part %1 of the message is signed. Do you want to keep the signature when saving?" ).
           arg( url.fileName() ),
           i18n( "KMail Question" ), i18n("Keep Signature"), i18n("Do Not Keep") ) !=
@@ -2749,7 +2749,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
     file.setName( url.path() );
     if ( !file.open( IO_WriteOnly ) )
     {
-      KMessageBox::error( parentWidget(),
+      KMessageBox::error( tqparentWidget(),
           i18n( "%2 is detailed error description",
             "Could not write the file %1:\n%2" )
           .arg( file.name() )
@@ -2773,9 +2773,9 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   if ( !url.isLocalFile() )
   {
     tf.close();
-    if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
+    if ( !KIO::NetAccess::upload( tf.name(), url, tqparentWidget() ) )
     {
-      KMessageBox::error( parentWidget(),
+      KMessageBox::error( tqparentWidget(),
           i18n( "Could not write the file %1." )
           .arg( url.path() ),
           i18n( "KMail Error" ) );
@@ -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->findByEmail( KPIM::getEmailAddress( addr ) ) ;
+  KABC::AddresseeList addressees = addressBook->tqfindByEmail( KPIM::getEmailAddress( addr ) ) ;
 
   // start chat
   if( addressees.count() == 1 ) {
@@ -3011,11 +3011,11 @@ KMCommand::Result KMIMChatCommand::execute()
       {
           nameList.append( (*it).realName() );
       }
-      TQString names = nameList.join( TQString::fromLatin1( ",\n" ) );
+      TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
       apology = apology.arg( names );
     }
 
-    KMessageBox::sorry( parentWidget(), apology );
+    KMessageBox::sorry( tqparentWidget(), apology );
     return Failed;
   }
 }
@@ -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::findByPath( mAtmName, 0, true /* no disk access */ );
+    mimetype = KMimeType::tqfindByPath( 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::findByFileContent( mAtmName );
+    mimetype = KMimeType::tqfindByFileContent( mAtmName );
   }
   return KServiceTypeProfile::preferredService( mimetype->name(), "Application" );
 }
@@ -3196,13 +3196,13 @@ void KMHandleAttachmentCommand::atmSave()
   parts.append( mNode );
   // save, do not leave encoded
   KMSaveAttachmentsCommand *command =
-    new KMSaveAttachmentsCommand( parentWidget(), parts, mMsg, false );
+    new KMSaveAttachmentsCommand( tqparentWidget(), parts, mMsg, false );
   command->start();
 }
 
 void KMHandleAttachmentCommand::atmProperties()
 {
-  KMMsgPartDialogCompat dlg( parentWidget() , 0, true );
+  KMMsgPartDialogCompat dlg( tqparentWidget() , 0, true );
   KMMessagePart& msgPart = mNode->msgPart();
   dlg.setMsgPart( &msgPart );
   dlg.exec();
@@ -3229,12 +3229,12 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
   if ( !listjob.get() ) {
     const TQString msg = i18n( "Chiasmus backend does not offer the "
                               "\"x-obtain-keys\" function. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
   if ( listjob->exec() ) {
-    listjob->showErrorDialog( parentWidget(), i18n( "Chiasmus Backend Error" ) );
+    listjob->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3243,7 +3243,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     const TQString msg = i18n( "Unexpected return value from Chiasmus backend: "
                               "The \"x-obtain-keys\" function did not return a "
                               "string list. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3252,11 +3252,11 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     const TQString msg = i18n( "No keys have been found. Please check that a "
                               "valid key path has been set in the Chiasmus "
                               "configuration." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
-  ChiasmusKeySelector selectorDlg( parentWidget(), i18n( "Chiasmus Decryption Key Selection" ),
+  ChiasmusKeySelector selectorDlg( tqparentWidget(), i18n( "Chiasmus Decryption Key Selection" ),
                                    keys, GlobalSettings::chiasmusDecryptionKey(),
                                    GlobalSettings::chiasmusDecryptionOptions() );
   if ( selectorDlg.exec() != TQDialog::Accepted )
@@ -3270,7 +3270,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
   if ( !job ) {
     const TQString msg = i18n( "Chiasmus backend does not offer the "
                               "\"x-decrypt\" function. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3281,13 +3281,13 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
        !job->setProperty( "input", input ) ) {
     const TQString msg = i18n( "The \"x-decrypt\" function does not accept "
                               "the expected parameters. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
   setDeletesItself( true ); // the job below is async, we have to cleanup ourselves
   if ( job->start() ) {
-    job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) );
+    job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) );
     return;
   }
 
@@ -3313,7 +3313,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
   if ( err.isCanceled() )
     return;
   if ( err ) {
-    job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) );
+    job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) );
     return;
   }
 
@@ -3321,21 +3321,21 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
     const TQString msg = i18n( "Unexpected return value from Chiasmus backend: "
                               "The \"x-decrypt\" function did not return a "
                               "byte array. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
-  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, parentWidget() );
+  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, tqparentWidget() );
   if ( url.isEmpty() )
     return;
 
-  bool overwrite = KMail::Util::checkOverwrite( url, parentWidget() );
+  bool overwrite = KMail::Util::checkOverwrite( url, tqparentWidget() );
   if ( !overwrite )
     return;
 
   d.setDisabled( true ); // we got this far, don't delete yet
   KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
-  uploadJob->setWindow( parentWidget() );
+  uploadJob->setWindow( tqparentWidget() );
   connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)),
            this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) );
 }
@@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
   return OK;
@@ -3500,7 +3500,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify()
   KMail::EditorWatcher *watcher =
           new KMail::EditorWatcher( KURL( mTempFile.file()->name() ),
                                     part.typeStr() + "/" + part.subtypeStr(),
-                                    false, this, parentWidget() );
+                                    false, this, tqparentWidget() );
   connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) );
   if ( !watcher->start() )
     return Failed;
@@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 781a80873..5fbebb65c 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -98,7 +98,7 @@ protected:
   // Returns the single message retrieved
   KMMessage *retrievedMessage() const;
   // Returns the parent widget
-  TQWidget *parentWidget() const;
+  TQWidget *tqparentWidget() const;
 
   bool deletesItself() { return mDeletesItself; }
   /** Specify whether the subclass takes care of the deletion of the object.
@@ -627,20 +627,20 @@ private:
   TQString mEncoding;
 };
 
-class KDE_EXPORT KMSetStatusCommand : public KMCommand
+class KDE_EXPORT KMSeStatusCommand : public KMCommand
 {
   Q_OBJECT
 
 public:
   // Serial numbers
-  KMSetStatusCommand( KMMsgStatus status, const TQValueList &,
+  KMSeStatusCommand( KMMsgStatus status, const TQValueList &,
                       bool toggle=false );
 
 private:
   virtual Result execute();
 
   KMMsgStatus mStatus;
-  TQValueList mSerNums;
+  TQValueList mSerNums;
   TQValueList mIds;
   bool mToggle;
 };
@@ -671,7 +671,7 @@ public:
 
 private:
   virtual Result execute();
-  TQValueList serNumList;
+  TQValueList serNumList;
   KMFilter *mFilter;
 };
 
@@ -783,12 +783,12 @@ public:
 
 public slots:
   void slotImapFolderCompleted(KMFolderImap *folder, bool success);
-  void slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum);
+  void slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum);
   void slotMoveCanceled();
 
 protected:
   // Needed for KMDeleteCommand for "move to trash"
-  KMMoveCommand( Q_UINT32 sernum );
+  KMMoveCommand( TQ_UINT32 sernum );
   void setDestFolder( KMFolder* folder ) { mDestFolder = folder; }
   void addMsg( KMMsgBase *msg ) { mSerNumList.append( msg->getMsgSerNum() ); }
   TQValueVector mOpenedFolders;
@@ -798,10 +798,10 @@ private:
   void completeMove( Result result );
 
   KMFolder *mDestFolder;
-  TQValueList mSerNumList;
+  TQValueList mSerNumList;
   // List of serial numbers that have to be transferred to a host.
   // Ticked off as they come in via msgAdded signals.
-  TQValueList mLostBoys;
+  TQValueList mLostBoys;
   KPIM::ProgressItem *mProgressItem;
   bool mCompleteWithAddedMsg;
 };
@@ -813,7 +813,7 @@ class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
 public:
   KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList &msgList );
   KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg );
-  KMDeleteMsgCommand( Q_UINT32 sernum );
+  KMDeleteMsgCommand( TQ_UINT32 sernum );
 
 private:
   static KMFolder * findTrashFolder( KMFolder * srcFolder );
@@ -1054,7 +1054,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 
   protected:
     int mPartIndex;
-    Q_UINT32 mSernum;
+    TQ_UINT32 mSernum;
 
   private:
     Result execute();
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index a1ab32d8a..e6ec6f967 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -199,7 +199,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
   mHeadersToEditorSplitter->setChildrenCollapsible( false );
   mHeadersArea = new TQWidget( mHeadersToEditorSplitter );
-  mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
+  mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
   TQVBoxLayout *v = new TQVBoxLayout( mMainWidget );
   v->addWidget( mHeadersToEditorSplitter );
   mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea);
@@ -286,7 +286,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     connect( mRecipientsEditor,
              TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ),
              TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ) ) );
-    connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
+    connect( mRecipientsEditor, TQT_SIGNAL(tqsizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
 
     mRecipientsEditor->setFocus();
   }
@@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   TQHBoxLayout *hbox = new TQHBoxLayout( vbox );
   {
       mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mSignatureStateIndicator->setAlignment( Qt::AlignHCenter );
+      mSignatureStateIndicator->tqsetAlignment( Qt::AlignHCenter );
       hbox->addWidget( mSignatureStateIndicator );
 
       KConfigGroup reader( KMKernel::config(), "Reader" );
@@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
       mSignatureStateIndicator->setPalette( p );
 
       mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mEncryptionStateIndicator->setAlignment( Qt::AlignHCenter );
+      mEncryptionStateIndicator->tqsetAlignment( Qt::AlignHCenter );
       hbox->addWidget( mEncryptionStateIndicator );
       p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) );
       mEncryptionStateIndicator->setPalette( p );
@@ -965,13 +965,13 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
   w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label.
   w->adjustSize();
   w->show();
-  return QMAX( width, w->sizeHint().width() );
+  return QMAX( width, w->tqsizeHint().width() );
 }
 
 void KMComposeWin::rethinkFields(bool fromSlot)
 {
   //This sucks even more but again no ids. sorry (sven)
-  int mask, row, numRows;
+  int tqmask, row, numRows;
   long showHeaders;
 
   if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     showHeaders = mShowHeaders;
 
-  for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
-    if ((showHeaders&mask) != 0) mNumHeaders++;
+  for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
+    if ((showHeaders&tqmask) != 0) mNumHeaders++;
 
   numRows = mNumHeaders + 1;
 
@@ -1109,9 +1109,9 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     mAtmListView->hide();
   resize(this->size());
-  repaint();
+  tqrepaint();
 
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
   mGrid->activate();
   mHeadersArea->show();
 
@@ -1182,7 +1182,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow,
   if (aValue & aMask)
   {
     aLbl->adjustSize();
-    aLbl->resize((int)aLbl->sizeHint().width(),aLbl->sizeHint().height() + 6);
+    aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().height() + 6);
     aLbl->setMinimumSize(aLbl->size());
     aLbl->show();
     aLbl->setBuddy(aCbx);
@@ -1193,7 +1193,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow,
     mGrid->addWidget(aCbx, aRow, 1);
     if ( aChk ) {
       mGrid->addWidget(aChk, aRow, 2);
-      aChk->setFixedSize(aChk->sizeHint().width(), aLbl->height());
+      aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height());
       aChk->show();
     }
     aRow++;
@@ -1219,8 +1219,8 @@ void KMComposeWin::getTransportMenu()
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
   {
-    mActNowMenu->insertItem((*it).replace("&", "&&"), id);
-    mActLaterMenu->insertItem((*it).replace("&", "&&"), id);
+    mActNowMenu->insertItem((*it).tqreplace("&", "&&"), id);
+    mActLaterMenu->insertItem((*it).tqreplace("&", "&&"), id);
   }
 }
 
@@ -1337,9 +1337,9 @@ void KMComposeWin::setupActions(void)
   KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
 
   KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfindNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
+  KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection());
   KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
 
   mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
@@ -1685,7 +1685,7 @@ void KMComposeWin::setupEditor(void)
   connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
           this, TQT_SLOT( fontChanged( const TQFont & ) ) );
   connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
-          this, TQT_SLOT( alignmentChanged( int ) ) );
+          this, TQT_SLOT( tqalignmentChanged( int ) ) );
 
 }
 
@@ -1695,8 +1695,8 @@ static TQString cleanedUpHeaderString( const TQString & s )
 {
   // remove invalid characters from the header strings
   TQString res( s );
-  res.replace( '\r', "" );
-  res.replace( '\n', " " );
+  res.tqreplace( '\r', "" );
+  res.tqreplace( '\n', " " );
   return res.stripWhiteSpace();
 }
 
@@ -2277,29 +2277,29 @@ bool KMComposeWin::userForgotAttachment()
 
   if ( attachWordsList.isEmpty() ) {
     // default value (FIXME: this is duplicated in configuredialog.cpp)
-    attachWordsList << TQString::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
-  TQRegExp rx ( TQString::fromLatin1("\\b") +
+  TQRegExp rx ( TQString::tqfromLatin1("\\b") +
                attachWordsList.join("\\b|\\b") +
-               TQString::fromLatin1("\\b") );
+               TQString::tqfromLatin1("\\b") );
   rx.setCaseSensitive( false );
 
   bool gotMatch = false;
 
-  // check whether the subject contains one of the attachment key words
+  // check whether the subject tqcontains one of the attachment key words
   // unless the message is a reply or a forwarded message
   TQString subj = subject();
   gotMatch =    ( KMMessage::stripOffPrefixes( subj ) == subj )
              && ( rx.search( subj ) >= 0 );
 
   if ( !gotMatch ) {
-    // check whether the non-quoted text contains one of the attachment key
+    // check whether the non-quoted text tqcontains one of the attachment key
     // words
     TQRegExp quotationRx ("^([ \\t]*([|>:}#]|[A-Za-z]+>))+");
     for ( int i = 0; i < mEditor->numLines(); ++i ) {
@@ -3633,7 +3633,7 @@ void KMComposeWin::slotSearchAgain()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotReplace()
 {
-  mEditor->replace();
+  mEditor->tqreplace();
 }
 
 //-----------------------------------------------------------------------------
@@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data();
   if ( TQImageDrag::canDecode(mimeSource) ) {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   }
   else {
     bool ok;
@@ -3725,7 +3725,7 @@ TQString KMComposeWin::addQuotesToText(const TQString &inputText)
 {
     TQString answer = TQString( inputText );
     TQString indentStr = quotePrefixName();
-    answer.replace( '\n', '\n' + indentStr);
+    answer.tqreplace( '\n', '\n' + indentStr);
     answer.prepend( indentStr );
     answer += '\n';
     return KMMessage::smartQuote( answer, GlobalSettings::self()->lineWrapWidth() );
@@ -3743,7 +3743,7 @@ TQString KMComposeWin::removeQuotesFromText(const TQString &inputText)
     // now remove all remaining leading quotes
     quotePrefix = '\n' + quotePrefixName();
     rx = quotePrefix;
-    s.replace(rx, "\n");
+    s.tqreplace(rx, "\n");
 
     return s;
 }
@@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotUndo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if ( ::qt_cast(fw) )
@@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo()
 
 void KMComposeWin::slotRedo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast(fw))
@@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCut()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast(fw))
@@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCopy()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
 #ifdef KeyPress
@@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard()
 
 void KMComposeWin::paste( QClipboard::Mode mode )
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode );
   if ( mimeSource->provides("image/png") )  {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   } else if ( KURLDrag::canDecode( mimeSource ) ) {
         KURL::List urlList;
         if( KURLDrag::decode( mimeSource, urlList ) ) {
@@ -3872,7 +3872,7 @@ void KMComposeWin::paste( QClipboard::Mode mode )
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotMarkAll()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast(fw))
@@ -3918,7 +3918,7 @@ void KMComposeWin::slotUpdWinTitle(const TQString& text)
   // newlines tend to become boxes.
   if (text.isEmpty())
     setCaption("("+i18n("unnamed")+")");
-  else setCaption( s.replace( TQChar('\n'), ' ' ) );
+  else setCaption( s.tqreplace( TQChar('\n'), ' ' ) );
 }
 
 
@@ -4605,15 +4605,15 @@ void KMComposeWin::slotCleanSpace()
 
   // Squeeze tabs and spaces
   TQRegExp squeeze( "[\t ]+" );
-  s.replace( squeeze, TQChar( ' ' ) );
+  s.tqreplace( squeeze, TQChar( ' ' ) );
 
   // Remove trailing whitespace
   TQRegExp trailing( "\\s+$" );
-  s.replace( trailing, TQChar( '\n' ) );
+  s.tqreplace( trailing, TQChar( '\n' ) );
 
   // Single space lines
   TQRegExp singleSpace( "[\n]{2,}" );
-  s.replace( singleSpace, TQChar( '\n' ) );
+  s.tqreplace( singleSpace, TQChar( '\n' ) );
 
   // Restore the signature
   if ( restore )
@@ -4820,7 +4820,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // don't overwrite the BCC field under certain circomstances
   // NOT edited and preset BCC from the identity
   if( mEdtBcc && !mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
-    // BCC NOT empty AND contains a diff adress then the preset BCC
+    // BCC NOT empty AND tqcontains a diff adress then the preset BCC
     // of the new identity
     if( !mEdtBcc->text().isEmpty() && mEdtBcc->text() != ident.bcc() && !mEdtBcc->edited() ) {
       mEdtBcc->setText( ident.bcc() );
@@ -4829,7 +4829,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
       // of the identity, we assume that since the user typed it
       // they want to keep it
       if ( mEdtBcc->text() != ident.bcc() && !mEdtBcc->text().isEmpty() ) {
-        TQString temp_string( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() );
+        TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
         mEdtBcc->setText( temp_string );
       } else {
         // if the user typed the same address as the preset BCC
@@ -4843,7 +4843,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // allowing the user to keep all addresses
   if( mEdtBcc && mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
     if( !mEdtBcc->text().isEmpty() ) {
-      TQString temp_string ( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() );
+      TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
       mEdtBcc->setText( temp_string );
     } else {
       mEdtBcc->setText( ident.bcc() );
@@ -4935,7 +4935,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
     if ( pos >= 0 && !mOldSigText.isEmpty() ) {
       const int oldLength = mOldSigText.length();
       mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature()
-      edtText = edtText.replace( pos, oldLength, mOldSigText );
+      edtText = edtText.tqreplace( pos, oldLength, mOldSigText );
       mEditor->setText( edtText );
     } else {
       insertSignature( Append );
@@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig()
   KWin kwin;
   TQTabDialog qtd (this, "tabdialog", true);
   KSpellConfig mKSpellConfig (&qtd);
-  mKSpellConfig.layout()->setMargin( KDialog::marginHint() );
+  mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
 
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();
@@ -4996,7 +4996,7 @@ void KMComposeWin::slotSpellcheckConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotStatusMessage(const TQString &message)
+void KMComposeWin::sloStatusMessage(const TQString &message)
 {
     statusBar()->changeItem( message, 0 );
 }
@@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size )
 void KMComposeWin::slotAlignLeft()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignLeft );
+    mEditor->TQTextEdit::tqsetAlignment( AlignLeft );
 }
 
 void KMComposeWin::slotAlignCenter()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignHCenter );
+    mEditor->TQTextEdit::tqsetAlignment( AlignHCenter );
 }
 
 void KMComposeWin::slotAlignRight()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignRight );
+    mEditor->TQTextEdit::tqsetAlignment( AlignRight );
 }
 
 void KMComposeWin::slotTextBold()
@@ -5252,7 +5252,7 @@ void KMComposeWin::fontChanged( const TQFont &f )
   fontSizeAction->setFontSize( f.pointSize() );
 }
 
-void KMComposeWin::alignmentChanged( int a )
+void KMComposeWin::tqalignmentChanged( int a )
 {
     //toggleMarkup();
     alignLeftAction->setChecked( ( a == AlignAuto ) || ( a & AlignLeft ) );
@@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged()
 
 void KMComposeWin::setMaximumHeaderSize()
 {
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
 }
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index f38a8f682..30362e851 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -368,7 +368,7 @@ private slots:
   /**
    * XML-GUI stuff
    */
-  void slotStatusMessage(const TQString &message);
+  void sloStatusMessage(const TQString &message);
   void slotEditToolbars();
   void slotUpdateToolbars();
   void slotEditKeys();
@@ -502,7 +502,7 @@ private slots:
   void slotFormatReset();
   void slotTextColor();
   void fontChanged( const TQFont & );
-  void alignmentChanged( int );
+  void tqalignmentChanged( int );
 
 public: // kmkernel, attachmentlistview
   bool addAttach(const KURL url);
@@ -555,7 +555,7 @@ private:
                           const TQString &toolTip = TQString::null,
                           const TQString &whatsThis = TQString::null );
 
-  void rethinkHeaderLine( int value, int mask, int& row,
+  void rethinkHeaderLine( int value, int tqmask, int& row,
                           TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk );
 
   /**
@@ -671,7 +671,7 @@ private:
   /**
    * Decrypt an OpenPGP block or strip off the OpenPGP envelope of a text
    * block with a clear text signature. This is only done if the given
-   * string contains exactly one OpenPGP block.
+   * string tqcontains exactly one OpenPGP block.
    * This function is for example used to restore the unencrypted/unsigned
    * message text for editting.
    */
diff --git a/kmail/kmdict.cpp b/kmail/kmdict.cpp
index 0ad9367be..de4ed86f4 100644
--- a/kmail/kmdict.cpp
+++ b/kmail/kmdict.cpp
@@ -54,7 +54,7 @@ void KMDict::clear()
 
 //-----------------------------------------------------------------------------
 
-void KMDict::replace( long key, KMDictItem *item )
+void KMDict::tqreplace( long key, KMDictItem *item )
 {
   insert( key, item );
   removeFollowing( item, key );           // remove other items with same key
diff --git a/kmail/kmdict.h b/kmail/kmdict.h
index 520315ad2..374577c28 100644
--- a/kmail/kmdict.h
+++ b/kmail/kmdict.h
@@ -40,7 +40,7 @@ public:
   int size() { return mSize; }
   
   /** Inserts an item, replacing old ones with the same key. */
-  void replace(long key, KMDictItem *item);
+  void tqreplace(long key, KMDictItem *item);
  
   /** Inserts an item without replacing ones with the same key. */
   void insert(long key, KMDictItem *item);
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 6fdc3352c..46fd2a83b 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -112,7 +112,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                 && ( col >= int( bot ) ) ) {
 
 		// The cursor position might have changed unpredictably if there was selected
-		// text which got replaced by a new line, so we query it again:
+		// text which got tqreplaced by a new line, so we query it again:
 		getCursorPosition( &line, &col );
                 TQString newLine = text( line );
                 // remove leading white space from the new line and instead
@@ -122,7 +122,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                        && newLine[leadingWhiteSpaceCount].isSpace() ) {
                     ++leadingWhiteSpaceCount;
                 }
-                newLine = newLine.replace( 0, leadingWhiteSpaceCount,
+                newLine = newLine.tqreplace( 0, leadingWhiteSpaceCount,
                                            lineText.left( bot ) );
                 removeParagraph( line );
                 insertParagraph( newLine, line );
@@ -148,7 +148,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         TQBuffer serNumBuffer(serNums);
         serNumBuffer.open(IO_ReadOnly);
         TQDataStream serNumStream(&serNumBuffer);
-        Q_UINT32 serNum;
+        TQ_UINT32 serNum;
         KMFolder *folder = 0;
         int idx;
         TQPtrList messageList;
@@ -169,7 +169,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         command->start();
     }
     else if( e->provides("image/png") ) {
-        emit attachPNGImageData(e->encodedData("image/png"));
+        emit attachPNGImageData(e->tqencodedData("image/png"));
     }
     else if( KURLDrag::canDecode( e ) ) {
         KURL::List urlList;
@@ -383,7 +383,7 @@ KMSyntaxHighter::KMSyntaxHighter( TQTextEdit *textEdit,
 
 bool KMSyntaxHighter::isMisspelled( const TQString &word )
 {
-  if ( mIgnoredWords.contains( word ) ) {
+  if ( mIgnoredWords.tqcontains( word ) ) {
     return false;
   }
   else {
@@ -440,8 +440,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       (*mExtEditorTempFile->textStream()) << text();
 
       mExtEditorTempFile->close();
-      // replace %f in the system line
-      sysLine.replace( "%f", mExtEditorTempFile->name() );
+      // tqreplace %f in the system line
+      sysLine.tqreplace( "%f", mExtEditorTempFile->name() );
       mExtEditorProcess = new KProcess();
       mExtEditorProcess->setUseShell( true );
       sysLine += " ";
@@ -454,7 +454,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
               TQT_SLOT(slotExternalEditorDone(KProcess*)));
       if (!mExtEditorProcess->start())
       {
-        KMessageBox::error( topLevelWidget(),
+        KMessageBox::error( tqtopLevelWidget(),
                             i18n("Unable to start external editor.") );
         killExternalEditor();
       } else {
@@ -503,7 +503,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
       //Continue if this word was misspelled
-      if( !word.isEmpty() && mReplacements.contains( word ) )
+      if( !word.isEmpty() && mReplacements.tqcontains( word ) )
       {
         KPopupMenu p;
 
@@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) {
 
   insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1);
   setAutoUpdate(true);
-  repaint();
+  tqrepaint();
 }
 
 void KMEdit::slotExternalEditorDone( KProcess * proc ) {
@@ -627,7 +627,7 @@ void KMEdit::killExternalEditor() {
 bool KMEdit::checkExternalEditorFinished() {
   if ( !mExtEditorProcess )
     return true;
-  switch ( KMessageBox::warningYesNoCancel( topLevelWidget(),
+  switch ( KMessageBox::warningYesNoCancel( tqtopLevelWidget(),
            i18n("The external editor is still running.\n"
                 "Abort the external editor or leave it open?"),
            i18n("External Editor"),
@@ -870,7 +870,7 @@ void KMEdit::slotSpellResult(const TQString &s)
 void KMEdit::slotSpellDone()
 {
   kdDebug(5006)<<" void KMEdit::slotSpellDone()\n";
-  KSpell::spellStatus status = mKSpellForDialog->status();
+  KSpell::spelltqStatus status = mKSpellForDialog->status();
   delete mKSpellForDialog;
   mKSpellForDialog = 0;
 
@@ -880,7 +880,7 @@ void KMEdit::slotSpellDone()
   mComposer->sujectLineWidget()->deselect();
   if (status == KSpell::Error)
   {
-     KMessageBox::sorry( topLevelWidget(),
+     KMessageBox::sorry( tqtopLevelWidget(),
                          i18n("ISpell/Aspell could not be started. Please "
                               "make sure you have ISpell or Aspell properly "
                               "configured and in your PATH.") );
@@ -889,7 +889,7 @@ void KMEdit::slotSpellDone()
   else if (status == KSpell::Crashed)
   {
      spellcheck_stop();
-     KMessageBox::sorry( topLevelWidget(),
+     KMessageBox::sorry( tqtopLevelWidget(),
                          i18n("ISpell/Aspell seems to have crashed.") );
      emit spellcheck_done( KS_CANCEL );
   }
@@ -898,7 +898,7 @@ void KMEdit::slotSpellDone()
       if( mSpellLineEdit )
           spellcheck();
       else if( !mComposer->subjectTextWasSpellChecked() && status == KSpell::FinishedNoMisspellingsEncountered )
-          KMessageBox::information( topLevelWidget(),
+          KMessageBox::information( tqtopLevelWidget(),
                                     i18n("No misspellings encountered.") );
   }
 }
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 370d796cb..2316321f5 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -35,7 +35,7 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare
   hbl->addWidget( mLineEdit, 1 /*stretch*/ );
   mBtn = new TQPushButton( TQString::null ,this );
   mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtn->setFixedHeight( mLineEdit->sizeHint().height() );
+  mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() );
   TQToolTip::add( mBtn, i18n( "Open Address Book" ) );
   hbl->addWidget( mBtn );
 
@@ -136,7 +136,7 @@ void KMSoundTestWidget::playSound()
     if ( parameter.isEmpty() )
         return ;
     TQString play = parameter;
-    TQString file = TQString::fromLatin1("file:");
+    TQString file = TQString::tqfromLatin1("file:");
     if (parameter.startsWith(file))
         play = parameter.mid(file.length());
     KAudioPlayer::play(TQFile::encodeName(play));
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 28a64633d..1d36677d6 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -186,9 +186,9 @@ bool KMFilter::folderRemoved( KMFolder* aFolder, KMFolder* aNewFolder )
 
 void KMFilter::setApplyOnAccount( uint id, bool aApply )
 {
-  if (aApply && !mAccounts.contains( id )) {
+  if (aApply && !mAccounts.tqcontains( id )) {
     mAccounts.append( id );
-  } else if (!aApply && mAccounts.contains( id )) {
+  } else if (!aApply && mAccounts.tqcontains( id )) {
     mAccounts.remove( id );
   }
 }
@@ -203,7 +203,7 @@ bool KMFilter::applyOnAccount( uint id ) const
     return result;
   }
   if ( applicability() == Checked )
-    return mAccounts.contains( id );
+    return mAccounts.tqcontains( id );
 
   return false;
 }
@@ -236,9 +236,9 @@ void KMFilter::readConfig(KConfig* config)
       bApplyOnExplicit = true;
       mApplicability = ButImap;
     } else {
-      bApplyOnInbound = bool(sets.contains("check-mail"));
-      bApplyOnOutbound = bool(sets.contains("send-mail"));
-      bApplyOnExplicit = bool(sets.contains("manual-filtering"));
+      bApplyOnInbound = bool(sets.tqcontains("check-mail"));
+      bApplyOnOutbound = bool(sets.tqcontains("send-mail"));
+      bApplyOnExplicit = bool(sets.tqcontains("manual-filtering"));
       mApplicability = (AccountType)config->readNumEntry( "Applicability", ButImap );
     }
 
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 9b277d8e7..180c2746f 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -486,18 +486,18 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
     // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 )
     // returns "0 and 1 and %1", so we must call .arg as
     // many times as there are %n's, regardless of their multiplicity.
-    if ((*it) == -1) result.replace( "%-1", tempFileName );
+    if ((*it) == -1) result.tqreplace( "%-1", tempFileName );
     else result = result.arg( tempFileName );
   }
 
-  // And finally, replace the %{foo} with the content of the foo
+  // And finally, tqreplace the %{foo} with the content of the foo
   // header field:
   TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false );
   int idx = 0;
   while ( ( idx = header_rx.search( result, idx ) ) != -1 ) {
-    TQString replacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
-    result.replace( idx, header_rx.matchedLength(), replacement );
-    idx += replacement.length();
+    TQString tqreplacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
+    result.tqreplace( idx, header_rx.matchedLength(), tqreplacement );
+    idx += tqreplacement.length();
   }
 
   return result;
@@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const
 }
 
 //=============================================================================
-// KMFilterActionSetStatus - set status to
+// KMFilterActionSeStatus - set status to
 // Set the status of messages
 //=============================================================================
-class KMFilterActionSetStatus: public KMFilterActionWithStringList
+class KMFilterActionSeStatus: public KMFilterActionWithStringList
 {
 public:
-  KMFilterActionSetStatus();
+  KMFilterActionSeStatus();
   virtual ReturnCode process(KMMessage* msg) const;
   virtual bool requiresBody(KMMsgBase*) const;
 
@@ -778,16 +778,16 @@ static const KMMsgStatus stati[] =
 };
 static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus );
 
-KMFilterAction* KMFilterActionSetStatus::newAction()
+KMFilterAction* KMFilterActionSeStatus::newAction()
 {
-  return (new KMFilterActionSetStatus);
+  return (new KMFilterActionSeStatus);
 }
 
-KMFilterActionSetStatus::KMFilterActionSetStatus()
+KMFilterActionSeStatus::KMFilterActionSeStatus()
   : KMFilterActionWithStringList( "set status", i18n("Mark As") )
 {
   // if you change this list, also update
-  // KMFilterActionSetStatus::stati above
+  // KMFilterActionSeStatus::stati above
   mParameterList.append( "" );
   mParameterList.append( i18n("msg status","Important") );
   mParameterList.append( i18n("msg status","Read") );
@@ -804,22 +804,22 @@ KMFilterActionSetStatus::KMFilterActionSetStatus()
   mParameter = *mParameterList.at(0);
 }
 
-KMFilterAction::ReturnCode KMFilterActionSetStatus::process(KMMessage* msg) const
+KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return ErrorButGoOn;
 
   KMMsgStatus status = stati[idx-1] ;
-  msg->setStatus( status );
+  msg->seStatus( status );
   return GoOn;
 }
 
-bool KMFilterActionSetStatus::requiresBody(KMMsgBase*) const
+bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const
 {
   return false;
 }
 
-void KMFilterActionSetStatus::argsFromString( const TQString argsStr )
+void KMFilterActionSeStatus::argsFromString( const TQString argsStr )
 {
   if ( argsStr.length() == 1 ) {
     for ( int i = 0 ; i < StatiCount ; i++ )
@@ -831,7 +831,7 @@ void KMFilterActionSetStatus::argsFromString( const TQString argsStr )
   mParameter = *mParameterList.at(0);
 }
 
-const TQString KMFilterActionSetStatus::argsAsString() const
+const TQString KMFilterActionSeStatus::argsAsString() const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return TQString::null;
@@ -840,7 +840,7 @@ const TQString KMFilterActionSetStatus::argsAsString() const
   return KMMsgBase::statusToStr(status);
 }
 
-const TQString KMFilterActionSetStatus::displayString() const
+const TQString KMFilterActionSeStatus::displayString() const
 {
   // FIXME after string freeze:
   // return i18n("").arg( );
@@ -1064,7 +1064,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const
   cb->setInsertionPolicy( TQComboBox::AtBottom );
   hbl->addWidget( cb, 0 /* stretch */ );
   TQLabel *l = new TQLabel( i18n("With value:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
   TQLineEdit *le = new KLineEdit( w, "ledit" );
   hbl->addWidget( le, 1 );
@@ -1194,9 +1194,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg)
   if ( mParameter.isEmpty() || !mRegExp.isValid() )
     return ErrorButGoOn;
 
-  KRegExp3 rx = mRegExp; // KRegExp3::replace is not const.
+  KRegExp3 rx = mRegExp; // KRegExp3::tqreplace is not const.
 
-  TQString newValue = rx.replace( msg->headerField( mParameter.latin1() ),
+  TQString newValue = rx.tqreplace( msg->headerField( mParameter.latin1() ),
                                      mReplacementString );
 
   msg->setHeaderField( mParameter.latin1(), newValue );
@@ -1214,17 +1214,17 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) con
   hbl->addWidget( cb, 0 /* stretch */ );
 
   TQLabel *l = new TQLabel( i18n("Replace:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
 
   RegExpLineEdit *rele = new RegExpLineEdit( w, "search" );
   hbl->addWidget( rele, 1 );
 
   l = new TQLabel( i18n("With:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
 
-  TQLineEdit *le = new KLineEdit( w, "replace" );
+  TQLineEdit *le = new KLineEdit( w, "tqreplace" );
   hbl->addWidget( le, 1 );
 
   setParamWidgetValue( w );
@@ -1250,7 +1250,7 @@ void KMFilterActionRewriteHeader::setParamWidgetValue( TQWidget* paramWidget ) c
   Q_ASSERT( rele );
   rele->setText( mRegExp.pattern() );
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   le->setText( mReplacementString );
 }
@@ -1265,7 +1265,7 @@ void KMFilterActionRewriteHeader::applyParamWidgetValue( TQWidget* paramWidget )
   Q_ASSERT( rele );
   mRegExp.setPattern( rele->text() );
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   mReplacementString = le->text();
 }
@@ -1280,7 +1280,7 @@ void KMFilterActionRewriteHeader::clearParamWidget( TQWidget* paramWidget ) cons
   Q_ASSERT( rele );
   rele->clear();
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   le->clear();
 }
@@ -1898,7 +1898,7 @@ KMFilterAction::ReturnCode KMFilterActionExecSound::process(KMMessage*) const
   if ( mParameter.isEmpty() )
     return ErrorButGoOn;
   TQString play = mParameter;
-  TQString file = TQString::fromLatin1("file:");
+  TQString file = TQString::tqfromLatin1("file:");
   if (mParameter.startsWith(file))
     play = mParameter.mid(file.length());
   KAudioPlayer::play(TQFile::encodeName(play));
@@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void)
   insert( KMFilterActionMove::newAction );
   insert( KMFilterActionCopy::newAction );
   insert( KMFilterActionIdentity::newAction );
-  insert( KMFilterActionSetStatus::newAction );
+  insert( KMFilterActionSeStatus::newAction );
   insert( KMFilterActionFakeDisposition::newAction );
   insert( KMFilterActionTransport::newAction );
   insert( KMFilterActionReplyTo::newAction );
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index 35f7008e4..55aba2cf2 100644
--- a/kmail/kmfilteraction.h
+++ b/kmail/kmfilteraction.h
@@ -648,7 +648,7 @@ struct KMFilterActionDesc
   KMFilterActionNewFunc create;
 };
 
-/** Dictionary that contains a list of all registered filter actions
+/** Dictionary that tqcontains a list of all registered filter actions
     with their creation functions. They are hard-coded into the
     constructor. If you want to add a new KMFilterAction, make
     sure you add the details of it in init, too.
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 558031f05..c9e42d1c7 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -131,7 +131,7 @@ const char * KMPopFilterDlgHelpAnchor =  "popfilters-id" ;
 KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter )
   : KDialogBase( parent, name,  false  /* modality */,
 		 (popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/,
-		 Help|Ok|Apply|Cancel|User1|User2 /* button mask */,
+		 Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */,
 		 Ok /* default btn */,  false  /* separator */),
   bPopFilter(popFilter)
 {
@@ -234,7 +234,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
       mConfigureShortcut = new TQCheckBox( i18n("Add this filter to the Apply Filter menu"), adv_w );
       gl->addMultiCellWidget( mConfigureShortcut, 7, 7, 0, 1 );
       TQLabel *keyButtonLabel = new TQLabel( i18n( "Shortcut:" ), adv_w );
-      keyButtonLabel->setAlignment( AlignVCenter | AlignRight );
+      keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight );
       gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 );
       mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" );
       gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 );
@@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup geometry( KMKernel::config(), "Geometry");
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
-  if ( geometry.hasKey( configKey ) )
-    resize( geometry.readSizeEntry( configKey ) );
+  if ( tqgeometry.hasKey( configKey ) )
+    resize( tqgeometry.readSizeEntry( configKey ) );
   else
     adjustSize();
 
@@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
 /** Set action of popFilter */
@@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   mBtnTop = new KPushButton( TQString::null, hb );
   mBtnTop->setAutoRepeat( true );
   mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
-  mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
+  mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 );
   mBtnUp = new KPushButton( TQString::null, hb );
   mBtnUp->setAutoRepeat( true );
   mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
-  mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
+  mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 );
   mBtnDown = new KPushButton( TQString::null, hb );
   mBtnDown->setAutoRepeat( true );
   mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
-  mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
+  mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 );
   mBtnBot = new KPushButton( TQString::null, hb );
   mBtnBot->setAutoRepeat( true );
   mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
-  mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
+  mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 );
   TQToolTip::add( mBtnTop, i18n("Top") );
   TQToolTip::add( mBtnUp, i18n("Up") );
   TQToolTip::add( mBtnDown, i18n("Down") );
@@ -622,13 +622,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   hb->setSpacing(4);
   mBtnNew = new TQPushButton( TQString::null, hb );
   mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
-  mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 );
+  mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 );
   mBtnCopy = new TQPushButton( TQString::null, hb );
   mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
-  mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 );
+  mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 );
   mBtnDelete = new TQPushButton( TQString::null, hb );
   mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
-  mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
+  mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 );
   mBtnRename = new TQPushButton( i18n("Rename..."), hb );
   TQToolTip::add( mBtnNew, i18n("New") );
   TQToolTip::add( mBtnCopy, i18n("Copy") );
@@ -948,7 +948,7 @@ void KMFilterListBox::slotRename()
      i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)")
         .arg( filter->pattern()->name() ) /*label*/,
      filter->pattern()->name() /* initial value */,
-     &okPressed, topLevelWidget(), 0, validator
+     &okPressed, tqtopLevelWidget(), 0, validator
      );
   delete validator;
 
@@ -1140,13 +1140,13 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
 
   // don't show scroll bars.
   mComboBox->setSizeLimit( mComboBox->count() );
-  // layout management:
-  // o the combo box is not to be made larger than it's sizeHint(),
+  // tqlayout management:
+  // o the combo box is not to be made larger than it's tqsizeHint(),
   //   the parameter widget should grow instead.
   // o the whole widget takes all space horizontally, but is fixed vertically.
   mComboBox->adjustSize();
-  mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   updateGeometry();
 
   // redirect focus to the filter action combo box
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index 18da9b568..4b8d67a7d 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -216,7 +216,7 @@ private:
       that they are 'forced' to create parameter widgets for the
       widget stack and to clear them on setAction. */
   TQPtrList mActionList;
-  /** The combo box that contains the labels of all KMFilterActions.
+  /** The combo box that tqcontains the labels of all KMFilterActions.
       It's @p activated(int) signal is internally
       connected to the @p raiseWidget(int) slot of @p mWidgetStack. */
   TQComboBox      *mComboBox;
@@ -386,7 +386,7 @@ protected slots:
   void slotExportFilters();
 
 protected:
-  /** The widget that contains the ListBox showing the filters, and
+  /** The widget that tqcontains the ListBox showing the filters, and
       the controls to remove filters, add new ones and to change their
       order. */
   KMFilterListBox *mFilterList;
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index beb3e60a5..2d1e6c914 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -174,7 +174,7 @@ int KMFilterMgr::process( KMMessage * msg, const KMFilter * filter ) {
   return result;
 }
 
-int KMFilterMgr::process( Q_UINT32 serNum, const KMFilter *filter )
+int KMFilterMgr::process( TQ_UINT32 serNum, const KMFilter *filter )
 {
   bool stopIt = false;
   int result = 1;
@@ -284,7 +284,7 @@ int KMFilterMgr::process( KMMessage * msg, FilterSet set,
   return 1;
 }
 
-bool KMFilterMgr::isMatching( Q_UINT32 serNum, const KMFilter *filter )
+bool KMFilterMgr::isMatching( TQ_UINT32 serNum, const KMFilter *filter )
 {
   bool result = false;
   if ( FilterLog::instance()->isLogging() ) {
@@ -437,11 +437,11 @@ const TQString KMFilterMgr::createUniqueName( const TQString & name )
 
 //-----------------------------------------------------------------------------
 void KMFilterMgr::appendFilters( const TQValueList &filters,
-                                 bool replaceIfNameExists )
+                                 bool tqreplaceIfNameExists )
 {
   mDirtyBufferedFolderTarget = true;
   beginUpdate();
-  if ( replaceIfNameExists ) {
+  if ( tqreplaceIfNameExists ) {
     TQValueListConstIterator it1 = filters.constBegin();
     for ( ; it1 != filters.constEnd() ; ++it1 ) {
       TQValueListConstIterator it2 = mFilters.constBegin();
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 609238661..eabfe0935 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -89,7 +89,7 @@ public:
       write everything back into the configuration. The filter manager
       takes ownership of the filters in the list. */
   void appendFilters( const TQValueList &filters,
-                      bool replaceIfNameExists = false );
+                      bool tqreplaceIfNameExists = false );
 
   /** Replace the list of filters under control of the filter manager.
    * The manager takes ownershipt of the filters. */
@@ -123,7 +123,7 @@ public:
 
   /** For ad-hoc filters. Applies @p filter to message with @p serNum .
       Return codes are as with the above method. */
-  int process( Q_UINT32 serNum, const KMFilter * filter );
+  int process( TQ_UINT32 serNum, const KMFilter * filter );
 
   void cleanup();
   /** Increment the reference count for the filter manager.
@@ -182,7 +182,7 @@ signals:
 private:
   int processPop( KMMessage *msg ) const;
   /** Find out if a message matches the filter criteria */
-  bool isMatching( Q_UINT32 serNum, const KMFilter *filter );
+  bool isMatching( TQ_UINT32 serNum, const KMFilter *filter );
 
   TQGuardedPtr mEditDialog;
   TQValueVector mOpenFolders;
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 68fb52f04..3825d1ee9 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -87,15 +87,15 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   }
 
   if ( aParent ) {
-    connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-             aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-    connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ) );
-    connect( this, TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32, int ) ),
-             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32, int ) ) );
+    connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+             aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+    connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+    connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
+             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
     connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*,  int ) ),
              parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
-    connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ),
+    connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ),
              parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
   }
 
@@ -105,17 +105,17 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ),
            TQT_SIGNAL( expunged( KMFolder* ) ) );
   connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) );
-  connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ) );
+  connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
   connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ),
            TQT_SIGNAL( msgRemoved( int, TQString ) ) );
   connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ),
            TQT_SIGNAL( msgRemoved( KMFolder* ) ) );
   connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) );
-  connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32 , int ) ),
-           TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32 , int ) ) );
+  connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ),
+           TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) );
   connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
            TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
   connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ),
@@ -717,8 +717,8 @@ TQString KMFolder::idString() const
   TQString escapedName = name();
   /* Escape [ and ] as they are disallowed for kconfig sections and that is
      what the idString is primarily used for. */
-  escapedName.replace( "[", "%(" );
-  escapedName.replace( "]", "%)" );
+  escapedName.tqreplace( "[", "%(" );
+  escapedName.tqreplace( "]", "%)" );
   return relativePath + escapedName;
 }
 
@@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex )
   return mStorage->writeIndex( createEmptyIndex );
 }
 
-void KMFolder::setStatus( int idx, KMMsgStatus status, bool toggle )
+void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle )
 {
-  mStorage->setStatus( idx, status, toggle );
+  mStorage->seStatus( idx, status, toggle );
 }
 
-void KMFolder::setStatus( TQValueList& ids, KMMsgStatus status,
+void KMFolder::seStatus( TQValueList& ids, KMMsgStatus status,
                           bool toggle )
 {
-  mStorage->setStatus( ids, status, toggle);
+  mStorage->seStatus( ids, status, toggle);
 }
 
 void KMFolder::setIconPaths( const TQString &normalPath,
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 3ff1d67de..77979b98f 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -53,7 +53,7 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-typedef TQValueList SerNumList;
+typedef TQValueList SerNumList;
 
 /** Mail folder.
  * (description will be here).
@@ -272,7 +272,7 @@ public:
       contained by this folder */
   int countUnreadRecursive();
 
-  /** Called by KMMsgBase::setStatus when status of a message has changed
+  /** Called by KMMsgBase::seStatus when status of a message has changed
       required to keep the number unread messages variable current. */
   void msgStatusChanged( const KMMsgStatus oldStatus,
                          const KMMsgStatus newStatus,
@@ -337,7 +337,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns true if the folder contains deleted messages */
+  /** Returns true if the folder tqcontains deleted messages */
   bool needsCompacting() const;
   void setNeedsCompacting(bool f);
 
@@ -489,10 +489,10 @@ public:
   int writeIndex( bool createEmptyIndex = false );
 
   /** Set the status of the message at index @p idx to @p status. */
-  void setStatus(int idx, KMMsgStatus status, bool toggle=false);
+  void seStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  void setStatus(TQValueList& ids, KMMsgStatus status, bool toggle=false);
+  void seStatus(TQValueList& ids, KMMsgStatus status, bool toggle=false);
 
   /** Icon related methods */
   bool useCustomIcons() const { return mUseCustomIcons; }
@@ -541,7 +541,7 @@ public:
 
   /**
   * Returns true if the name is valid for a child of this folder.
-  * If the name contains invalid characters then false is returned and message will contain
+  * If the name tqcontains invalid characters then false is returned and message will contain
   * an explanation that can be presented to the user.
   */
   bool isValidName( const TQString &folderName, TQString &message );
@@ -573,7 +573,7 @@ signals:
   void shortcutChanged( KMFolder * );
 
   /** Emitted before a message is removed from the folder. */
-  void msgRemoved(KMFolder*, Q_UINT32 sernum);
+  void msgRemoved(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted after a message is removed from the folder. */
   void msgRemoved( int idx, TQString msgIdMD5 );
@@ -581,10 +581,10 @@ signals:
 
   /** Emitted when a message is added from the folder. */
   void msgAdded(int idx);
-  void msgAdded(KMFolder*, Q_UINT32 sernum);
+  void msgAdded(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32 sernum, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32 sernum, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int);
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index a1c71726b..61e155acb 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -49,7 +49,7 @@ using KMail::AccountManager;
 #include "kmglobal.h"
 #include "acljobs.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 
 using KMail::CachedImapJob;
@@ -549,7 +549,7 @@ int KMFolderCachedImap::addMsgInternal( KMMessage* msg, bool newMail,
       if ( imapPath() == "/INBOX/" )
         filter = true;
     } else {
-      if ( GlobalSettings::filterSourceFolders().contains( folder()->id() ) )
+      if ( GlobalSettings::filterSourceFolders().tqcontains( folder()->id() ) )
         filter = true;
     }
     if ( filter )
@@ -744,7 +744,7 @@ void KMFolderCachedImap::slotTroubleshoot()
     TQString s2 = i18n("&Refresh");
     if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) ==
         KMessageBox::Continue )
-      account()->invalidateIMAPFolders( this );
+      account()->tqinvalidateIMAPFolders( this );
   } else {
     // Rebuild index file
     switch ( rc ) {
@@ -1394,11 +1394,11 @@ void KMFolderCachedImap::buildSubFolderList()
     while( node ) {
       if( !node->isDir() ) {
         KMFolderCachedImap* storage = static_cast(static_cast(node)->storage());
-        const bool folderIsNew = mNewlyCreatedSubfolders.contains( TQGuardedPtr( storage ) );
+        const bool folderIsNew = mNewlyCreatedSubfolders.tqcontains( TQGuardedPtr( storage ) );
         // Only sync folders that have been accepted by the server
         if ( !storage->imapPath().isEmpty()
              // and that were not just deleted from it
-             && !foldersForDeletionOnServer.contains( storage->imapPath() ) ) {
+             && !foldersForDeletionOnServer.tqcontains( storage->imapPath() ) ) {
           if ( mRecurse || folderIsNew ) {
             mSubfoldersForSync << storage;
           }
@@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
 }
 
 // This is not perfect, what if the status didn't really change? Oh well ...
-void KMFolderCachedImap::setStatus( int idx, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setStatus( idx, status, toggle );
+  KMFolderMaildir::seStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::setStatus(TQValueList& ids, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::seStatus(TQValueList& ids, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setStatus(ids, status, toggle);
+  KMFolderMaildir::seStatus(ids, status, toggle);
   for (TQValueList::iterator it = ids.begin(); it != ids.end(); it++ ) {
     const KMMsgBase *msg = getMsgBase( *it );
     Q_ASSERT( msg );
@@ -1907,7 +1907,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
            kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should delete it" << endl;
 #endif
           // double check we deleted it since the last sync
-           if ( mDeletedUIDsSinceLastSync.contains(uid) ) {
+           if ( mDeletedUIDsSinceLastSync.tqcontains(uid) ) {
                if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & KMail::ACLJobs::Delete ) ) {
 #if MAIL_LOSS_DEBUGGING
                    kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
@@ -1941,8 +1941,8 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
         kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should download it" << endl;
 #endif
         // The message is new since the last sync, but we might have just uploaded it, in which case
-        // the uid map already contains it.
-        if ( !uidMap.contains( uid ) ) {
+        // the uid map already tqcontains it.
+        if ( !uidMap.tqcontains( uid ) ) {
           mMsgsForDownload << KMail::CachedImapJob::MsgForDownload(uid, flags, size);
           if( imapPath() == "/INBOX/" )
             mUidsForDownload << uid;
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->setStatus( str );
+     progressItem->seStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2620,7 +2620,7 @@ void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
     else
       str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus );
     if( progressItem )
-      progressItem->setStatus( str );
+      progressItem->seStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -2944,7 +2944,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
 
   bool cont = true;
   if ( job->error() ) {
-    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
+    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only tqcontains mail
     if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
@@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
       break;
 
     // create subfolder for this incident
-    TQDate today = TQDate::currentDate();
+    TQDate today = TQDate::tqcurrentDate();
     TQString baseName = folder()->label() + "-" + TQString::number( today.year() )
         + (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() )
         + (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 21abeabf9..61fcfcbac 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -283,8 +283,8 @@ public:
   void setACLList( const ACLList& arr );
 
   // Reimplemented so the mStatusChangedLocally bool can be set
-  virtual void setStatus( int id, KMMsgStatus status, bool toggle );
-  virtual void setStatus( TQValueList& ids, KMMsgStatus status, bool toggle );
+  virtual void seStatus( int id, KMMsgStatus status, bool toggle );
+  virtual void seStatus( TQValueList& ids, KMMsgStatus status, bool toggle );
 
   TQString annotationFolderType() const { return mAnnotationFolderType; }
 
@@ -588,7 +588,7 @@ private:
   bool mSharedSeenFlagsChanged;
 
  /**
-  * UIDs added by setStatus. Indicates that the client has changed
+  * UIDs added by seStatus. Indicates that the client has changed
   * the status of those mails. The mail flags for changed mails will be
   * uploaded to the server, overwriting the server's notion of the status
   * of the mails in this folder.
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 533173e5e..4e17ce235 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -185,7 +185,7 @@ void KMFolderDialog::slotOk()
 
   mDelayedSavingTabs = 0; // number of tabs which need delayed saving
   for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) {
-    FolderDiaTab::AcceptStatus s = mTabs[i]->accept();
+    FolderDiaTab::AccepStatus s = mTabs[i]->accept();
     if ( s == FolderDiaTab::Canceled ) {
       slotCancelAccept();
       return;
@@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder )
   mFolder = folder;
 }
 
-static void addLine( TQWidget *parent, TQVBoxLayout* layout )
+static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
 {
    TQFrame *line = new TQFrame( parent, "line" );
    line->setGeometry( TQRect( 80, 150, 250, 20 ) );
    line->setFrameShape( TQFrame::HLine );
    line->setFrameShadow( TQFrame::Sunken );
    line->setFrameShape( TQFrame::HLine );
-   layout->addWidget( line );
+   tqlayout->addWidget( line );
 }
 
 //----------------------------------------------------------------------------
@@ -331,7 +331,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
     mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
     if (!aName.isEmpty())
             mNameEdit->setText(aName);
-    mNameEdit->setMinimumSize(mNameEdit->sizeHint());
+    mNameEdit->setMinimumSize(mNameEdit->tqsizeHint());
     // prevent renaming of IMAP inbox
     if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) {
       TQString imapPath;
@@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
 
   addLine( this, topLayout );
 
-  // use grid layout for the following combobox settings
+  // use grid tqlayout for the following combobox settings
   TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() );
   gl->setColStretch( 1, 100 ); // make the second column use all available space
   int row = -1;
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 4db30ab12..31fb26d9b 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -82,12 +82,12 @@ public:
   /// @return whether save succeeded
   virtual bool save() = 0;
 
-  enum AcceptStatus { Accepted, Canceled, Delayed };
+  enum AccepStatus { Accepted, Canceled, Delayed };
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
   /// operation like a KIO job).
-  virtual AcceptStatus accept() {
+  virtual AccepStatus accept() {
     return save() ? Accepted : Canceled;
   }
 
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 1ecab637b..f3b80e3f1 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -258,7 +258,7 @@ bool KMFolderDir::reload(void)
           // For this to be a cached IMAP folder, it must be in the KMail dimap
           // subdir and must be have a uidcache file or be a maildir folder
           TQString maildir(fname + "/new");
-          TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").arg(fname);
+          TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").arg(fname);
           if ( dir.exists( imapcachefile) || dir.exists( maildir ) )
           {
              folder = new KMFolder( this, fname, KMFolderTypeCachedImap );
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index e5c7bd827..c924fa8a1 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -322,7 +322,7 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent )
 void KMFolderImap::addMsgQuiet(KMMessage* aMsg)
 {
   KMFolder *aFolder = aMsg->parent();
-  Q_UINT32 serNum = 0;
+  TQ_UINT32 serNum = 0;
   aMsg->setTransferInProgress( false );
   if (aFolder) {
     serNum = aMsg->getMsgSerNum();
@@ -787,7 +787,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
   }
 
   // see if we have a better parent
-  // if you have a prefix that contains a folder (e.g "INBOX.") the folders
+  // if you have a prefix that tqcontains a folder (e.g "INBOX.") the folders
   // need to be created underneath it
   if ( root && !subfolderNames.empty() )
   {
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
       // update progress
       account()->listDirProgressItem()->incCompletedItems();
       account()->listDirProgressItem()->updateProgress();
-      account()->listDirProgressItem()->setStatus( folder()->prettyURL() + i18n(" completed") );
+      account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") );
 
       f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
       f->setChildrenState( subfolderAttributes[i] );
@@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity()
     mMailCheckProgressItem->setProgress(0);
   }
   if ( account()->mailCheckProgressItem() ) {
-    account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
+    account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() );
   }
   ImapAccountBase::jobData jd( url.url() );
   KIO::SimpleJob *job = KIO::get(url, false, false);
@@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   if (startUid.isEmpty())
   {
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
+      mMailCheckProgressItem->seStatus( i18n("Retrieving message status") );
     url.setPath(imapPath() + ";SECTION=UID FLAGS");
     KIO::SimpleJob *job = KIO::listDir(url, false);
     KIO::Scheduler::assignJobToSlave(account()->slave(), job);
@@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   } else {
     mContentState = imapDownloadInProgress;
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
+      mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
     KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mMailCheckProgressItem->setCompletedItems( 0 );
     mMailCheckProgressItem->setTotalItems( jd.total );
     mMailCheckProgressItem->setProgress( 0 );
-    mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
+    mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
   }
 
   TQStringList sets;
@@ -1460,7 +1460,7 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
 
   const KMMsgStatus oldStatus = msg->status();
   if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
-    msg->setStatus( KMMsgStatusOld );
+    msg->seStatus( KMMsgStatusOld );
 
   // In case the message does not have the seen flag set, override our local
   // notion that it is read. Otherwise the count of unread messages and the
@@ -1468,10 +1468,10 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
   if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
     if (newMsg) {
       if ( (oldStatus & KMMsgStatusNew) == 0 )
-        msg->setStatus( KMMsgStatusNew );
+        msg->seStatus( KMMsgStatusNew );
     } else {
       if ( (oldStatus & KMMsgStatusUnread) == 0 )
-        msg->setStatus( KMMsgStatusUnread );
+        msg->seStatus( KMMsgStatusUnread );
     }
   }
 }
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         // Transfer the status, if it is cached.
         if ( md ) {
-          msg->setStatus( md->status() );
+          msg->seStatus( md->status() );
         } else if ( !account()->hasCapability("uidplus") ) {
           // see if we have cached the msgIdMD5 and get the status +
           // serial number from there
           TQString id = msg->msgIdMD5();
           if ( mMetaDataMap.find( id ) ) {
             md =  mMetaDataMap[id];
-            msg->setStatus( md->status() );
+            msg->seStatus( md->status() );
             if ( md->serNum() != 0 && serNum == 0 ) {
               msg->setMsgSerNum( md->serNum() );
             }
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList& msgList)
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::setStatus(int idx, KMMsgStatus status, bool toggle)
+void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   TQValueList ids; ids.append(idx);
-  setStatus(ids, status, toggle);
+  seStatus(ids, status, toggle);
 }
 
-void KMFolderImap::setStatus(TQValueList& _ids, KMMsgStatus status, bool toggle)
+void KMFolderImap::seStatus(TQValueList& _ids, KMMsgStatus status, bool toggle)
 {
-  FolderStorage::setStatus(_ids, status, toggle);
+  FolderStorage::seStatus(_ids, status, toggle);
   TQValueList ids;
   if ( mUploadAllFlags ) {
     kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -2345,18 +2345,18 @@ void KMFolderImap::search( const KMSearchPattern* pattern )
   if ( !pattern || pattern->isEmpty() )
   {
     // not much to do here
-    TQValueList serNums;
+    TQValueList serNums;
     emit searchResult( folder(), serNums, pattern, true );
     return;
   }
   SearchJob* job = new SearchJob( this, account(), pattern );
-  connect( job, TQT_SIGNAL( searchDone( TQValueList, const KMSearchPattern*, bool ) ),
-           this, TQT_SLOT( slotSearchDone( TQValueList, const KMSearchPattern*, bool ) ) );
+  connect( job, TQT_SIGNAL( searchDone( TQValueList, const KMSearchPattern*, bool ) ),
+           this, TQT_SLOT( slotSearchDone( TQValueList, const KMSearchPattern*, bool ) ) );
   job->start();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSearchDone( TQValueList serNums,
+void KMFolderImap::slotSearchDone( TQValueList serNums,
                                    const KMSearchPattern* pattern,
                                    bool complete )
 {
@@ -2364,7 +2364,7 @@ void KMFolderImap::slotSearchDone( TQValueList serNums,
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   if ( !pattern || pattern->isEmpty() )
   {
@@ -2373,13 +2373,13 @@ void KMFolderImap::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
     return;
   }
   SearchJob* job = new SearchJob( this, account(), pattern, serNum );
-  connect( job, TQT_SIGNAL( searchDone( Q_UINT32, const KMSearchPattern*, bool ) ),
-           this, TQT_SLOT( slotSearchDone( Q_UINT32, const KMSearchPattern*, bool ) ) );
+  connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ),
+           this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) );
   job->start();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSearchDone( Q_UINT32 serNum, const KMSearchPattern* pattern,
+void KMFolderImap::slotSearchDone( TQ_UINT32 serNum, const KMSearchPattern* pattern,
                                    bool matches )
 {
   emit searchDone( folder(), serNum, pattern, matches );
@@ -2411,7 +2411,7 @@ void KMFolderImap::saveMsgMetaData( KMMessage* msg, ulong uid )
     uid = msg->UID();
   }
   ulong serNum = msg->getMsgSerNum();
-  mUidMetaDataMap.replace( uid, new KMMsgMetaData(msg->status(), serNum) );
+  mUidMetaDataMap.tqreplace( uid, new KMMsgMetaData(msg->status(), serNum) );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 76a3db98d..2f85685b6 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -63,14 +63,14 @@ class KMMsgMetaData
 public:
   KMMsgMetaData(KMMsgStatus aStatus)
     :mStatus(aStatus), mSerNum(0) {}
-  KMMsgMetaData(KMMsgStatus aStatus, Q_UINT32 aSerNum)
+  KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum)
     :mStatus(aStatus), mSerNum(aSerNum) {}
   ~KMMsgMetaData() {};
   KMMsgStatus status() const { return mStatus; }
-  Q_UINT32 serNum() const { return mSerNum; }
+  TQ_UINT32 serNum() const { return mSerNum; }
 private:
   KMMsgStatus mStatus;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
 };
 
 
@@ -167,7 +167,7 @@ public:
    * Create a new subfolder
    * You may specify the root imap path or this folder will be used
    * If you set askUser to false and the server can only handle folders
-   * that contain messages _or_ folders the new folder is set to "contains messages"
+   * that contain messages _or_ folders the new folder is set to "tqcontains messages"
    * by default
    */
   void createFolder(const TQString &name,
@@ -183,12 +183,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void setStatus(int idx, KMMsgStatus status, bool toggle);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void setStatus(TQValueList& _ids, KMMsgStatus status, bool toggle);
+  virtual void seStatus(TQValueList& _ids, KMMsgStatus status, bool toggle);
 
   /** generates sets of uids */
   static TQStringList makeSets( TQValueList&, bool sort = true);
@@ -314,7 +314,7 @@ public:
     * is signaled with searchDone()
     */
   virtual void search( const KMSearchPattern* );
-  virtual void search( const KMSearchPattern*, Q_UINT32 serNum );
+  virtual void search( const KMSearchPattern*, TQ_UINT32 serNum );
 
   /** Returns true if this folder can be moved */
   virtual bool isMoveable() const;
@@ -395,14 +395,14 @@ public slots:
   /**
    * Called from the SearchJob when the folder is done or messages where found
    */
-  void slotSearchDone( TQValueList serNums,
+  void slotSearchDone( TQValueList serNums,
                        const KMSearchPattern* pattern,
                        bool complete );
 
   /**
    * Called from the SearchJob when the message was searched
    */
-  void slotSearchDone( Q_UINT32 serNum, const KMSearchPattern* pattern, bool matches );
+  void slotSearchDone( TQ_UINT32 serNum, const KMSearchPattern* pattern, bool matches );
 
   /**
    * Connected to ListJob::receivedFolders
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 95746ed18..a6b7f2ce3 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -151,10 +151,10 @@ int KMFolderIndex::writeIndex( bool createEmptyIndex )
   fprintf(tmpIndexStream, "# KMail-Index V%d\n", INDEX_VERSION);
 
   // Header
-  Q_UINT32 byteOrder = 0x12345678;
-  Q_UINT32 sizeOfLong = sizeof(long);
+  TQ_UINT32 byteOrder = 0x12345678;
+  TQ_UINT32 sizeOfLong = sizeof(long);
 
-  Q_UINT32 header_length = sizeof(byteOrder)+sizeof(sizeOfLong);
+  TQ_UINT32 header_length = sizeof(byteOrder)+sizeof(sizeOfLong);
   char pad_char = '\0';
   fwrite(&pad_char, sizeof(pad_char), 1, tmpIndexStream);
   fwrite(&header_length, sizeof(header_length), 1, tmpIndexStream);
@@ -220,7 +220,7 @@ bool KMFolderIndex::readIndex()
   if ( contentsType() != KMail::ContentsTypeMail ) {
     kdDebug(5006) << k_funcinfo << "Reading index for " << label() << endl;
   }
-  Q_INT32 len;
+  TQ_INT32 len;
   KMMsgInfo* mi;
 
   assert(mIndexStream != 0);
@@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex()
 #ifdef OBSOLETE
     else if (mi->isNew())
     {
-      mi->setStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       mi->setDirty(false);
     }
 #endif
@@ -377,10 +377,10 @@ bool KMFolderIndex::readIndexHeader(int *gv)
   }
   else {
       // Header
-      Q_UINT32 byteOrder = 0;
-      Q_UINT32 sizeOfLong = sizeof(long); // default
+      TQ_UINT32 byteOrder = 0;
+      TQ_UINT32 sizeOfLong = sizeof(long); // default
 
-      Q_UINT32 header_length = 0;
+      TQ_UINT32 header_length = 0;
       fseek(mIndexStream, sizeof(char), SEEK_CUR );
       fread(&header_length, sizeof(header_length), 1, mIndexStream);
       if (header_length > 0xFFFF)
@@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
         msg.fromDwString( msgString, false );
         msg.updateInvitationState();
         if ( msg.status() & KMMsgStatusHasInvitation ) {
-          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation );
         }
         if ( msg.status() & KMMsgStatusHasNoInvitation ) {
-          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
         }
         msgInfo->setFrom( msg.from() );
         msgInfo->setTo( msg.to() );
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 29039765d..2762d143d 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -112,7 +112,7 @@ protected:
     /** Inserts messages into the message dictionary by iterating over the
      * message list. The messages will get new serial numbers. This is only
      * used on newly appeared folders, where there is no .ids file yet, or
-     * when that has been invalidated. */
+     * when that has been tqinvalidated. */
   virtual void fillMessageDict();
 
   /** table of contents file */
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 09800a94d..2ec8326ed 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -291,7 +291,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
       continue;
 
     // first, make sure this isn't in the 'new' subdir
-    if ( entryList.contains( filename ) )
+    if ( entryList.tqcontains( filename ) )
       moveInternal(subdirNew + filename, subdirCur + filename, mi);
 
     // construct a valid filename.  if it's already valid, then
@@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
     // we can't have any New messages at this point
     if (mi->isNew())
     {
-      mi->setStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       setDirty( true );
     }
 #endif
@@ -385,7 +385,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     msgParent->getMsg( idx );
   }
 
-  aMsg->setStatusFields();
+  aMsg->seStatusFields();
   if (aMsg->headerField("Content-Type").isEmpty())  // This might be added by
     aMsg->removeHeaderField("Content-Type");        // the line above
 
@@ -404,7 +404,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
 
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -480,7 +480,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
   if (aMsg->getMsgSerNum() <= 0)
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // write index entry if desired
   if (mAutoCreateIndex)
@@ -893,13 +893,13 @@ int KMFolderMaildir::createIndexFromContents()
   correctUnreadMsgsCount();
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
-    KMessageBox::information(0, i18n("Your outbox contains messages which were "
+    KMessageBox::information(0, i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
   needsCompact = true;
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -1106,7 +1106,7 @@ void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus,
 }
 
 /*virtual*/
-Q_INT64 KMFolderMaildir::doFolderSize() const
+TQ_INT64 KMFolderMaildir::doFolderSize() const
 {
   if ( mCurrentlyCheckingFolderSize )
   {
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 12f24942c..d8be0139f 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -55,7 +55,7 @@ public:
   virtual void removeMsg(TQPtrList msgList, bool imapQuiet = FALSE)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
-  // Called by KMMsgBase::setStatus when status of a message has changed
+  // Called by KMMsgBase::seStatus 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,
@@ -106,7 +106,7 @@ public:
   virtual bool isReadOnly() const { return false; }
  
   /** reimp */
-  virtual Q_INT64 doFolderSize() const;
+  virtual TQ_INT64 doFolderSize() const;
 
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index c2e60a091..025a9d71d 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
@@ -682,7 +682,7 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->setStatus(status, xstatus);
+          mi->seStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
@@ -805,11 +805,11 @@ int KMFolderMbox::createIndexFromContents()
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
     KMessageBox::queuedMessageBox(0, KMessageBox::Information,
-                                  i18n("Your outbox contains messages which were "
+                                  i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -852,7 +852,7 @@ static size_t unescapeFrom( char* str, size_t strLen ) {
       *d++ = *s++;  // == '>'
       while ( s < e && *s == '>' )
         *d++ = *s++;
-      if ( qstrncmp( s, "From ", STRDIM("From ") ) == 0 )
+      if ( tqstrncmp( s, "From ", STRDIM("From ") ) == 0 )
         --d;
     }
     *d++ = *s++; // yes, s might be e here, but e is not the end :-)
@@ -887,7 +887,7 @@ TQByteArray KMFolderMbox::escapeFrom( const DwString & str ) {
     case '>':
       break;
     case 'F':
-      if ( onlyAnglesAfterLF && qstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
+      if ( onlyAnglesAfterLF && tqstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
         *d++ = '>';
       // fall through
     default:
@@ -979,7 +979,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     fileD0.close();  // If data is 0 we just create a zero length file.
 }
 */
-    aMsg->setStatusFields();
+    aMsg->seStatusFields();
 /*
 TQFile fileD1( "testdat_xx-kmfoldermbox-1" );
 if( fileD1.open( IO_WriteOnly ) ) {
@@ -998,7 +998,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   clearerr(mStream);
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -1085,7 +1085,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   if ( aMsg->getMsgSerNum() <= 0 )
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // change the length of the previous message to encompass white space added
   if ((idx > 0) && (growth > 0)) {
@@ -1175,7 +1175,7 @@ int KMFolderMbox::compact( unsigned int startIndex, int nbMessages, FILE* tmpfil
         mtext.resize(20);
       fread(mtext.data(), 20, 1, mStream);
       if(i <= 0) { //woops we've reached the top of the file, last try..
-        if ( mtext.contains( "from ", false ) ) {
+        if ( mtext.tqcontains( "from ", false ) ) {
           if (mtext.size() < (size_t)folder_offset)
               mtext.resize(folder_offset);
           if(fseek(mStream, chunk_offset, SEEK_SET) == -1 ||
@@ -1238,9 +1238,9 @@ int KMFolderMbox::compact( bool silent )
 
   // If this is the current folder, the changed signal will ultimately call
   // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
-  TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+  TQString statusMsg = BroadcasStatus::instance()->statusMsg();
   emit changed();
-  BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  BroadcasStatus::instance()->seStatusMsg( statusMsg );
   return rc;
 }
 
@@ -1276,10 +1276,10 @@ int KMFolderMbox::expungeContents()
 
 //-----------------------------------------------------------------------------
 /*virtual*/
-Q_INT64 KMFolderMbox::doFolderSize() const
+TQ_INT64 KMFolderMbox::doFolderSize() const
 {
   TQFileInfo info( location() );
-  return (Q_INT64)(info.size());
+  return (TQ_INT64)(info.size());
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 15159b98c..7c48324e9 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -112,7 +112,7 @@ public:
   virtual IndexStatus indexStatus();
 
   /**  reimp */
-  virtual Q_INT64 doFolderSize() const;
+  virtual TQ_INT64 doFolderSize() const;
 
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index d4ec786e0..587d85255 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -150,17 +150,17 @@ signals:
   /** Emitted, when a folder has been added. */
   void folderAdded(KMFolder*);
 
-  /** Emitted, when serial numbers for a folder have been invalidated. */
+  /** Emitted, when serial numbers for a folder have been tqinvalidated. */
   void folderInvalidated(KMFolder*);
 
   /** Emitted, when a message has been appended to a folder */
-  void msgAdded(KMFolder*, Q_UINT32);
+  void msgAdded(KMFolder*, TQ_UINT32);
 
   /** Emitted, when a message has been removed from a folder */
-  void msgRemoved(KMFolder*, Q_UINT32);
+  void msgRemoved(KMFolder*, TQ_UINT32);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int idx);
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index 3d0dbaddc..2eb197a3b 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -35,7 +35,7 @@ public:
   virtual ~KMFolderNode();
 
   /** Is it a directory where mail folders are stored or is it a folder that
-    contains mail ?
+    tqcontains mail ?
     Note that there are some kinds of mail folders like the type mh uses that
     are directories on disk but are handled as folders here. */
   virtual bool isDir(void) const;
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 522785d11..471d2f3e0 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch()
             folder->open("kmsearch");
             mOpenedFolders.append( folder );
             connect( folder->storage(),
-                TQT_SIGNAL( searchResult( KMFolder*, TQValueList, const KMSearchPattern*, bool ) ),
+                TQT_SIGNAL( searchResult( KMFolder*, TQValueList, const KMSearchPattern*, bool ) ),
                 this,
-                TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList, const KMSearchPattern*, bool ) ) );
+                TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList, const KMSearchPattern*, bool ) ) );
             folder->storage()->search( mSearchPattern );
         } else
             --mRemainingFolders;
@@ -274,7 +274,7 @@ void KMSearch::slotProcessNextBatch()
 }
 
 void KMSearch::slotSearchFolderResult( KMFolder* folder,
-                                       TQValueList serNums,
+                                       TQValueList serNums,
                                        const KMSearchPattern* pattern,
                                        bool complete )
 {
@@ -282,7 +282,7 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
       return;
     kdDebug(5006) << k_funcinfo << folder->label() << " found " << serNums.count() << endl;
     mLastFolder = folder->label();
-    TQValueListIterator it;
+    TQValueListIterator it;
     for ( it = serNums.begin(); it != serNums.end(); ++it )
     {
       emit found( *it );
@@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
     if ( complete )
     {
       disconnect( folder->storage(),
-          TQT_SIGNAL( searchResult( KMFolder*, TQValueList,
+          TQT_SIGNAL( searchResult( KMFolder*, TQValueList,
                                 const KMSearchPattern*, bool ) ),
           this,
-          TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList,
+          TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList,
                                         const KMSearchPattern*, bool ) ) );
       --mRemainingFolders;
       mSearchCount += folder->count();
@@ -325,12 +325,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
 
     //Hook up some slots for live updating of search folders
     //TODO: Optimize folderInvalidated, folderAdded, folderRemoved
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -340,12 +340,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
     connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
             this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
 
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -355,12 +355,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
             this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
 
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -399,8 +399,8 @@ void KMFolderSearch::setSearch(KMSearch *search)
         delete mSearch;
         mSearch = search; // take ownership
         if (mSearch) {
-            TQObject::connect(search, TQT_SIGNAL(found(Q_UINT32)),
-                    TQT_SLOT(addSerNum(Q_UINT32)));
+            TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)),
+                    TQT_SLOT(addSerNum(TQ_UINT32)));
             TQObject::connect(search, TQT_SIGNAL(finished(bool)),
                     TQT_SLOT(searchFinished(bool)));
         }
@@ -423,7 +423,7 @@ void KMFolderSearch::executeSearch()
     if (mSearch)
         mSearch->stop();
     setSearch(mSearch);
-    invalidateFolder();
+    tqinvalidateFolder();
 }
 
 const KMSearch* KMFolderSearch::search() const
@@ -438,7 +438,7 @@ void KMFolderSearch::searchFinished(bool success)
     close("foldersearch");
 }
 
-void KMFolderSearch::addSerNum(Q_UINT32 serNum)
+void KMFolderSearch::addSerNum(TQ_UINT32 serNum)
 {
     if (mInvalid) // A new search is scheduled don't bother doing anything
         return;
@@ -472,9 +472,9 @@ void KMFolderSearch::addSerNum(Q_UINT32 serNum)
     emitMsgAddedSignals(mSerNums.count()-1);
 }
 
-void KMFolderSearch::removeSerNum(Q_UINT32 serNum)
+void KMFolderSearch::removeSerNum(TQ_UINT32 serNum)
 {
-    TQValueVector::const_iterator it;
+    TQValueVector::const_iterator it;
     int i = 0;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it, ++i)
         if ((*it) == serNum) {
@@ -502,7 +502,7 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return)
 bool KMFolderSearch::readSearch()
 {
     mSearch = new KMSearch;
-    TQObject::connect(mSearch, TQT_SIGNAL(found(Q_UINT32)), TQT_SLOT(addSerNum(Q_UINT32)));
+    TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
     TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
     return mSearch->read(location());
 }
@@ -603,7 +603,7 @@ int KMFolderSearch::create()
     clearIndex();
     if (!mSearch) {
         mSearch = new KMSearch();
-        TQObject::connect(mSearch, TQT_SIGNAL(found(Q_UINT32)), TQT_SLOT(addSerNum(Q_UINT32)));
+        TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
         TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
     }
     mSearch->write(location());
@@ -645,7 +645,7 @@ const KMMsgBase* KMFolderSearch::getMsgBase(int idx) const
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     assert(folder && (folderIdx != -1));
@@ -656,7 +656,7 @@ KMMsgBase* KMFolderSearch::getMsgBase(int idx)
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     if (!folder || folderIdx == -1)
@@ -669,7 +669,7 @@ KMMessage* KMFolderSearch::getMsg(int idx)
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     assert(folder && (folderIdx != -1));
@@ -701,8 +701,8 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg )
 int KMFolderSearch::find(const KMMsgBase* msg) const
 {
     int pos = 0;
-    Q_UINT32 serNum = msg->getMsgSerNum();
-    TQValueVector::const_iterator it;
+    TQ_UINT32 serNum = msg->getMsgSerNum();
+    TQValueVector::const_iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
         if ((*it) == serNum)
             return pos;
@@ -757,19 +757,19 @@ int KMFolderSearch::writeIndex( bool )
         return -1;
     }
     fprintf(tmpIndexStream, IDS_SEARCH_HEADER, IDS_SEARCH_VERSION);
-    Q_UINT32 byteOrder = 0x12345678;
+    TQ_UINT32 byteOrder = 0x12345678;
     fwrite(&byteOrder, sizeof(byteOrder), 1, tmpIndexStream);
 
-    Q_UINT32 count = mSerNums.count();
+    TQ_UINT32 count = mSerNums.count();
     if (!fwrite(&count, sizeof(count), 1, tmpIndexStream)) {
         fclose(tmpIndexStream);
         truncate(TQFile::encodeName(filename), 0);
         return -1;
     }
 
-    TQValueVector::iterator it;
+    TQValueVector::iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
-        Q_UINT32 serNum = *it;
+        TQ_UINT32 serNum = *it;
         if (!fwrite(&serNum, sizeof(serNum), 1, tmpIndexStream))
             return -1;
     }
@@ -815,7 +815,7 @@ bool KMFolderSearch::readIndex()
         return false;
     }
     bool swapByteOrder;
-    Q_UINT32 byte_order;
+    TQ_UINT32 byte_order;
     if (!fread(&byte_order, sizeof(byte_order), 1, mIdsStream)) {
         fclose(mIdsStream);
         mIdsStream = 0;
@@ -823,7 +823,7 @@ bool KMFolderSearch::readIndex()
     }
     swapByteOrder = (byte_order == 0x78563412);
 
-    Q_UINT32 count;
+    TQ_UINT32 count;
     if (!fread(&count, sizeof(count), 1, mIdsStream)) {
         fclose(mIdsStream);
         mIdsStream = 0;
@@ -835,7 +835,7 @@ bool KMFolderSearch::readIndex()
     mUnreadMsgs = 0;
     mSerNums.reserve(count);
     for (unsigned int index = 0; index < count; index++) {
-        Q_UINT32 serNum;
+        TQ_UINT32 serNum;
         int folderIdx = -1;
         KMFolder *folder = 0;
         bool readOk = fread(&serNum, sizeof(serNum), 1, mIdsStream);
@@ -901,7 +901,7 @@ KMMsgBase* KMFolderSearch::takeIndexEntry(int idx)
 {
     assert(idx >= 0 && idx < (int)mSerNums.count());
     KMMsgBase *msgBase = getMsgBase(idx);
-    TQValueVector::iterator it = mSerNums.begin();
+    TQValueVector::iterator it = mSerNums.begin();
     mSerNums.erase(&it[idx]);
     return msgBase;
 }
@@ -932,7 +932,7 @@ void KMFolderSearch::truncateIndex()
     truncate(TQFile::encodeName(indexLocation()), IDS_SEARCH_HEADER_LEN);
 }
 
-void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
+void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum)
 {
     if (!search() && !readSearch())
         return;
@@ -954,14 +954,14 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
     KMFolderOpener openFolder(folder, "foldersearch");
 
     // if we are already checking this folder, refcount
-    if ( mFoldersCurrentlyBeingSearched.contains( folder ) ) {
+    if ( mFoldersCurrentlyBeingSearched.tqcontains( folder ) ) {
       unsigned int count = mFoldersCurrentlyBeingSearched[folder];
-      mFoldersCurrentlyBeingSearched.replace( folder, count+1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( folder, count+1 );
     } else {
       connect( folder->storage(),
-              TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool ) ),
+              TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
               this,
-              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                       const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.insert( folder, 1 );
     }
@@ -969,7 +969,7 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
 }
 
 void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
-                                               Q_UINT32 serNum,
+                                               TQ_UINT32 serNum,
                                                const KMSearchPattern* pattern,
                                                bool matches )
 {
@@ -978,24 +978,24 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
      << " matches?" << matches << endl;
     KMFolderOpener openFolder(folder, "foldersearch");
 
-    Q_ASSERT( mFoldersCurrentlyBeingSearched.contains( folder ) );
+    Q_ASSERT( mFoldersCurrentlyBeingSearched.tqcontains( folder ) );
 
     unsigned int count = mFoldersCurrentlyBeingSearched[folder];
     if ( count == 1 ) {
       disconnect( folder->storage(),
-                  TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32,
+                  TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32,
                                       const KMSearchPattern*, bool ) ),
                   this,
-                  TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+                  TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                                                   const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.remove( folder );
     } else {
-      mFoldersCurrentlyBeingSearched.replace( folder, count-1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( folder, count-1 );
     }
 
     if ( !matches ) {
-        TQValueVector::const_iterator it;
-        it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+        TQValueVector::const_iterator it;
+        it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
         if (it != mSerNums.end()) {
             removeSerNum( serNum );
         }
@@ -1006,15 +1006,15 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
 //        mSearch->stop();
 //        mExecuteSearchTimer->start( 0, true );
 //    } else {
-        TQValueVector::const_iterator it;
-        it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+        TQValueVector::const_iterator it;
+        it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
         if (it == mSerNums.end()) {
             addSerNum( serNum );
         }
 //    }
 }
 
-void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
+void KMFolderSearch::examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum)
 {
     if (!search() && !readSearch())
         return;
@@ -1032,7 +1032,7 @@ void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
     }
 }
 
-void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, Q_UINT32 serNum, int delta)
+void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, TQ_UINT32 serNum, int delta)
 {
     if (!search() && !readSearch())
         return;
@@ -1042,8 +1042,8 @@ void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, Q_UINT32 serNum, i
         open("foldersearch");
         mTempOpened = true;
     }
-    TQValueVector::const_iterator it;
-    it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+    TQValueVector::const_iterator it;
+    it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
     if (it != mSerNums.end()) {
         mUnreadMsgs += delta;
         emit numUnreadMsgsChanged( folder() );
@@ -1102,8 +1102,8 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
         mTempOpened = true;
     }
 
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(aFolder, idx);
-    TQValueVector::const_iterator it;
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(aFolder, idx);
+    TQValueVector::const_iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
         if ((*it) == serNum) {
             emit msgHeaderChanged(folder(), pos);
@@ -1115,14 +1115,14 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
     KMFolderOpener openAFolder(aFolder, "foldersearch");
 
     // if we are already checking this folder, refcount
-    if ( mFoldersCurrentlyBeingSearched.contains( aFolder ) ) {
+    if ( mFoldersCurrentlyBeingSearched.tqcontains( aFolder ) ) {
       unsigned int count = mFoldersCurrentlyBeingSearched[aFolder];
-      mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( aFolder, count+1 );
     } else {
       connect( aFolder->storage(),
-              TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool ) ),
+              TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
               this,
-              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                       const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.insert( aFolder, 1 );
     }
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index 180995dac..ced2af350 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -37,7 +37,7 @@
     numbers of all messages that currently match the search.
 **/
 
-typedef TQValueList SerNumList;
+typedef TQValueList SerNumList;
 class KMSearchPattern;
 class KMFolderImap;
 class KMFolderSearchJob;
@@ -78,12 +78,12 @@ public slots:
   void indexFinished();
 
 signals:
-  void found(Q_UINT32 serNum);
+  void found(TQ_UINT32 serNum);
   void finished(bool success);
 
 protected slots:
   void slotProcessNextBatch();
-  void slotSearchFolderResult( KMFolder*, TQValueList,
+  void slotSearchFolderResult( KMFolder*, TQValueList,
                                const KMSearchPattern*, bool );
 
 protected:
@@ -140,12 +140,12 @@ protected slots:
   // Called when the search is finished
   void searchFinished(bool success);
   // Look at a new message and if it matches search() add it to the cache
-  void examineAddedMessage(KMFolder *folder, Q_UINT32 serNum);
+  void examineAddedMessage(KMFolder *folder, TQ_UINT32 serNum);
   // Look at a removed message and remove it from the cache
-  void examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum);
+  void examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum);
   // Look at a message whose status has changed
-  void examineChangedMessage(KMFolder *folder, Q_UINT32 serNum, int delta);
-  // The serial numbers for a folder have been invalidated, deal with it
+  void examineChangedMessage(KMFolder *folder, TQ_UINT32 serNum, int delta);
+  // The serial numbers for a folder have been tqinvalidated, deal with it
   void examineInvalidatedFolder(KMFolder *folder);
   // A folder has been deleted, deal with it
   void examineRemovedFolder(KMFolder *folder);
@@ -155,16 +155,16 @@ protected slots:
 public slots:
   // Appends the serial number to the cached list of messages that match
   // the search for this folder
-  void addSerNum(Q_UINT32 serNum);
+  void addSerNum(TQ_UINT32 serNum);
   // Removes the serial number from the cached list of messages that match
   // the search for this folder
-  void removeSerNum(Q_UINT32 serNum);
+  void removeSerNum(TQ_UINT32 serNum);
 
   /** Incrementally update the index if possible else call writeIndex */
   virtual int updateIndex();
 
   // Examine the message
-  void slotSearchExamineMsgDone( KMFolder*, Q_UINT32 serNum,
+  void slotSearchExamineMsgDone( KMFolder*, TQ_UINT32 serNum,
                                  const KMSearchPattern*, bool );
 
 public:
@@ -183,7 +183,7 @@ public:
   virtual TQString indexLocation() const;
   virtual int writeIndex( bool createEmptyIndex = false );
   DwString getDwString(int idx);
-  Q_UINT32 serNum(int idx) { return mSerNums[idx]; }
+  TQ_UINT32 serNum(int idx) { return mSerNums[idx]; }
 
 protected:
   virtual FolderJob* doCreateJob(KMMessage *msg, FolderJob::JobType jt,
@@ -202,9 +202,9 @@ protected:
   virtual void truncateIndex();
 
 private:
-  TQValueVector mSerNums;
+  TQValueVector mSerNums;
   TQValueList > mFolders;
-  TQValueStack mUnexaminedMessages;
+  TQValueStack mUnexaminedMessages;
   FILE *mIdsStream;
   KMSearch *mSearch;
   bool mInvalid, mUnlinked;
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index d2e098b8d..115c638e6 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged()
   else
     setPixmap( 0, normalIcon( iconSize() ) );
   emit iconChanged( this );
-  repaint();
+  tqrepaint();
 }
 
 void KMFolderTreeItem::slotNameChanged()
 {
   setText( 0, mFolder->label() );
   emit nameChanged( this );
-  repaint();
+  tqrepaint();
 }
 
 void KMFolderTreeItem::slotNoContentChanged()
@@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void)
       setFont(KGlobalSettings::generalFont());
   }
 
-  // restore the layout
+  // restore the tqlayout
   restoreLayout(conf, "Geometry");
 }
 
@@ -510,7 +510,7 @@ void KMFolderTree::writeConfig()
       writeIsListViewItemOpen(fti);
   }
 
-  // save the current layout
+  // save the current tqlayout
   saveLayout(KMKernel::config(), "Geometry");
 }
 
@@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders)
 
   int top = contentsY();
   mLastItem = 0;
-  // invalidate selected drop item
+  // tqinvalidate selected drop item
   oldSelected = 0;
   // remember last
   KMFolder* last = currentFolder();
@@ -627,9 +627,9 @@ void KMFolderTree::reload(bool openFolders)
              this, TQT_SLOT(slotSyncStateChanged()) );
 
     // we want to be noticed of changes to update the unread/total columns
-    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
         this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
         this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
     //}
 
@@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
     } else {
       // hide local inbox if unused
       if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) {
-        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
+        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
         continue;
       }
 
@@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate()
         continue;
 
       if ( fti->needsRepaint() ) {
-        fti->repaint();
+        fti->tqrepaint();
         fti->setNeedsRepaint( false );
       }
     }
@@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder()
     autoopen_timer.stop();
     if ( dropItem && !dropItem->isOpen() ) {
         dropItem->setOpen( true );
-        dropItem->repaint();
+        dropItem->tqrepaint();
     }
 }
 
@@ -1467,7 +1467,7 @@ void KMFolderTree::contentsDragMoveEvent( TQDragMoveEvent *e )
         }
 
         if ( dragAccepted ) {
-            e->accept( itemRect(i) );
+            e->accept( tqitemRect(i) );
 
             switch ( e->action() ) {
                 case TQDropEvent::Copy:
@@ -1634,8 +1634,8 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
   else
           fldName = oldFldName;
 
-  fldName.replace("/", "");
-  fldName.replace(TQRegExp("^\\."), "");
+  fldName.tqreplace("/", "");
+  fldName.tqreplace(TQRegExp("^\\."), "");
 
   if (fldName.isEmpty())
           fldName = i18n("unnamed");
@@ -1648,7 +1648,7 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
 void KMFolderTree::slotUpdateCountsDelayed(KMFolder * folder)
 {
 //  kdDebug(5006) << "KMFolderTree::slotUpdateCountsDelayed()" << endl;
-  if ( !mFolderToUpdateCount.contains( folder->idString() ) )
+  if ( !mFolderToUpdateCount.tqcontains( folder->idString() ) )
   {
 //    kdDebug( 5006 )<< "adding " << folder->idString() << " to updateCountList " << endl;
     mFolderToUpdateCount.insert( folder->idString(),folder );
@@ -1897,7 +1897,7 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
       continue;
     }
     TQString label = fti->text( 0 );
-    label.replace( "&","&&" );
+    label.tqreplace( "&","&&" );
     if ( fti->firstChild() )
     {
       // new level
@@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList > source
     if ( source )
       sourceFolderName = source->label();
 
-    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) {
+    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
       KMessageBox::error( this, i18n("Cannot move or copy folder %1 here because a folder with the same name already exists.")
           .arg( sourceFolderName ) );
       setDragEnabled( true );
@@ -2118,7 +2118,7 @@ void KMFolderTree::cutFolder()
 void KMFolderTree::pasteFolder()
 {
   KMFolderTreeItem *item = static_cast( currentItem() );
-  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.contains( item->folder() ) ) {
+  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.tqcontains( item->folder() ) ) {
     moveOrCopyFolder( mCopySourceFolders, item->folder(), mCutFolder );
     if ( mCutFolder )
       mCopySourceFolders.clear();
@@ -2176,7 +2176,7 @@ void KMFolderTree::slotAddToFavorites()
 
 void KMFolderTree::slotUnhideLocalInbox()
 {
-  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
               this, TQT_SLOT(slotUnhideLocalInbox()) );
   reload();
 }
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index b7244c6c3..640da9507 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -165,7 +165,7 @@ public:
     MoveFolder
   };
 
-  /** Generate a popup menu that contains all folders that can have content */
+  /** Generate a popup menu that tqcontains all folders that can have content */
   void folderToPopupMenu( MenuAction action, TQObject *receiver, KMMenuToFolder *,
       TQPopupMenu *menu, TQListViewItem *start = 0 );
 
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bcfc06f3b..06fc89360 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -22,7 +22,7 @@ using KMail::ActionScheduler;
 #include "messagecopyhelper.h"
 using KMail::MessageCopyHelper;
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 using KPIM::ProgressItem;
@@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect )
                         rect.left() + contentsX(),
                         rect.top() + contentsY() );
   else
-    p->fillRect( rect, colorGroup().base() );
+    p->fillRect( rect, tqcolorGroup().base() );
 }
 
 bool KMHeaders::event(TQEvent *e)
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+                  BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+              BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
           this, TQT_SLOT(setFolderInfoStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@@ -831,7 +831,7 @@ void KMHeaders::msgChanged()
   const bool scrollbarAtBottom = verticalScrollBar() &&
                                  verticalScrollBar()->value() == verticalScrollBar()->maxValue();
   const HeaderItem * const oldFirstVisibleItem = dynamic_cast( itemAt( TQPoint( 0, 0 ) ) );
-  const int oldOffsetOfFirstVisibleItem = itemRect( oldFirstVisibleItem ).y();
+  const int oldOffsetOfFirstVisibleItem = tqitemRect( oldFirstVisibleItem ).y();
   const uint oldSerNumOfFirstVisibleItem = oldFirstVisibleItem ? oldFirstVisibleItem->msgSerNum() : 0;
 
   TQString msgIdMD5;
@@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id)
     }
 
     if (parent && mFolder->getMsgBase(parent->id())->isWatched())
-      mFolder->getMsgBase(id)->setStatus( KMMsgStatusWatched );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
     else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->setStatus( KMMsgStatusIgnored );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
     if (parent)
       hi = new HeaderItem( parent->item(), id );
     else
@@ -952,7 +952,7 @@ void KMHeaders::msgAdded(int id)
     mItems[id] = hi;
 
     if ( !msgId.isEmpty() )
-      mSortCacheItems.replace(msgId, sci);
+      mSortCacheItems.tqreplace(msgId, sci);
     /* Add to the list of potential parents for subject threading. But only if
      * we are top level. */
     if (mSubjThreading && parent) {
@@ -1163,11 +1163,11 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
       }
 
       if ((!parent || sci->isImperfectlyThreaded())
-                      && !mImperfectlyThreadedList.containsRef(item))
+                      && !mImperfectlyThreadedList.tqcontainsRef(item))
         mImperfectlyThreadedList.append(item);
 
       if (parent && !sci->isImperfectlyThreaded()
-          && mImperfectlyThreadedList.containsRef(item))
+          && mImperfectlyThreadedList.tqcontainsRef(item))
         mImperfectlyThreadedList.removeRef(item);
     }
   }
@@ -1214,7 +1214,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
   HeaderItem *item = mItems[msgId];
   if (item) {
     item->irefresh();
-    item->repaint();
+    item->tqrepaint();
   }
 }
 
@@ -1227,7 +1227,7 @@ void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle)
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
@@ -1268,7 +1268,7 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
         TQListViewItem *top = item;
         while ( top->parent() )
           top = top->parent();
-        if (!topOfThreads.contains(top)) {
+        if (!topOfThreads.tqcontains(top)) {
           topOfThreads.append(top);
         }
       }
@@ -1298,7 +1298,7 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
@@ -1372,9 +1372,9 @@ void KMHeaders::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
@@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfoStatus ()
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
     str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
-  BroadcastStatus::instance()->setStatusMsg(str);
+  BroadcasStatus::instance()->seStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-        KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
+        KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1501,7 +1501,7 @@ void KMHeaders::setMsgRead (int msgId)
     serNums.append( msgBase->getMsgSerNum() );
   }
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcastStatus::instance()->setStatusMsg("");
+  BroadcasStatus::instance()->seStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,11 +1620,11 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcastStatus::instance()->setStatusMsg(
+    BroadcasStatus::instance()->seStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
-     * messages involved and repaint.
+     * messages involved and tqrepaint.
      *
      * Note: This potentially resets too many items if there is more than one
      *       move going on. Oh well, I suppose no animals will be harmed.
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcastStatus::instance()->setStatusMsg(
+      BroadcasStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcastStatus::instance()->setStatusMsg(
+      BroadcasStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -1736,7 +1736,7 @@ void KMHeaders::setSelectedByIndex( TQValueList items, bool selected )
   }
 }
 
-void KMHeaders::clearSelectableAndAboutToBeDeleted( Q_UINT32 serNum )
+void KMHeaders::clearSelectableAndAboutToBeDeleted( TQ_UINT32 serNum )
 {
   // fugly, but I see no way around it
   for (TQListViewItemIterator it(this); it.current(); it++) {
@@ -1828,7 +1828,7 @@ void KMHeaders::selectNextMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->repaint();
+      lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
@@ -1866,7 +1866,7 @@ void KMHeaders::selectPrevMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->repaint();
+      lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
@@ -2135,10 +2135,10 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcastStatus::instance()->setStatusMsg("");
+  BroadcasStatus::instance()->seStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
-  mItems[idx]->repaint();
+  mItems[idx]->tqrepaint();
   emit selected( msg );
   setFolderInfoStatus();
 }
@@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread()
   for ( it.toFirst() ; it.current() ; ++it ) {
       TQListViewItem *lvi = *it;
       lvi->setSelected( true );
-      lvi->repaint();
+      lvi->tqrepaint();
   }
 }
 
@@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread )
   noRepaint = false;
   KListView::setSorting( mSortCol, !mSortDescending );
   if (!mFolder) {
-    repaint();
+    tqrepaint();
     return;
   }
   readSortOrder( set_selection, forceJumpToUnread );
@@ -2326,10 +2326,10 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     /* Explicitely set selection state. This is necessary because we want to
      * also select all children of closed threads when the parent is selected. */
 
-    // unless ctrl mask, set selected if it isn't already
+    // unless ctrl tqmask, set selected if it isn't already
     if ( !( e->state() & ControlButton ) && !wasSelected )
       setSelected( lvi, true );
-    // if ctrl mask, toggle selection
+    // if ctrl tqmask, toggle selection
     if ( e->state() & ControlButton )
       setSelected( lvi, !wasSelected );
 
@@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i)
 //-----------------------------------------------------------------------------
 void KMHeaders::slotRMB()
 {
-  if (!topLevelWidget()) return; // safe bet
+  if (!tqtopLevelWidget()) return; // safe bet
   mOwner->updateMessageActions();
 
   // check if the user clicked into a status column and only show the respective menues
@@ -2673,14 +2673,14 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid,
 
   fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream);
   fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream);
-  Q_INT32 len = key.length() * sizeof(TQChar);
+  TQ_INT32 len = key.length() * sizeof(TQChar);
   fwrite(&len, sizeof(len), 1, sortStream);
   if (len)
-    fwrite(key.unicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
+    fwrite(key.tqunicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
 
   if (update_discover) {
     //update the discovered change count
-      Q_INT32 discovered_count = 0;
+      TQ_INT32 discovered_count = 0;
       fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET);
       fread(&discovered_count, sizeof(discovered_count), 1, sortStream);
       discovered_count++;
@@ -2734,13 +2734,13 @@ bool KMHeaders::writeSortOrder()
     mSortInfo.column = mSortCol;
     fprintf(sortStream, KMAIL_SORT_HEADER, KMAIL_SORT_VERSION);
     //magic header information
-    Q_INT32 byteOrder = 0x12345678;
-    Q_INT32 column = mSortCol;
-    Q_INT32 ascending= !mSortDescending;
-    Q_INT32 threaded = isThreaded();
-    Q_INT32 appended=0;
-    Q_INT32 discovered_count = 0;
-    Q_INT32 sorted_count=0;
+    TQ_INT32 byteOrder = 0x12345678;
+    TQ_INT32 column = mSortCol;
+    TQ_INT32 ascending= !mSortDescending;
+    TQ_INT32 threaded = isThreaded();
+    TQ_INT32 appended=0;
+    TQ_INT32 discovered_count = 0;
+    TQ_INT32 sorted_count=0;
     fwrite(&byteOrder, sizeof(byteOrder), 1, sortStream);
     fwrite(&column, sizeof(column), 1, sortStream);
     fwrite(&ascending, sizeof(ascending), 1, sortStream);
@@ -2845,7 +2845,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
                       khi->key(mSortCol, !mSortDescending), false);
 
     //update the appended flag FIXME obsolete?
-    Q_INT32 appended = 1;
+    TQ_INT32 appended = 1;
     fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
     fwrite(&appended, sizeof(appended), 1, sortStream);
     fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
@@ -2950,7 +2950,7 @@ void KMHeaders::buildThreadingTree( TQMemArray sortCache )
         KMMsgBase *mi = mFolder->getMsgBase(x);
         TQString md5 = mi->msgIdMD5();
         if(!md5.isEmpty())
-            mSortCacheItems.replace(md5, sortCache[x]);
+            mSortCacheItems.tqreplace(md5, sortCache[x]);
     }
 }
 
@@ -3014,7 +3014,7 @@ SortCacheItem* KMHeaders::findParent(SortCacheItem *item)
         // if you keep your outgoing messages in an OUTBOX, for
         // example, try the list of references, because the second
         // to last will likely be in this folder. replyToAuxIdMD5
-        // contains the second to last one.
+        // tqcontains the second to last one.
         TQString  ref = msg->replyToAuxIdMD5();
         if (!ref.isEmpty())
             parent = mSortCacheItems[ref];
@@ -3065,8 +3065,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
     if (!mFolder->isOpened()) mFolder->open("kmheaders");
 
     //all cases
-    Q_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
-    Q_INT32 deleted_count = 0;
+    TQ_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
+    TQ_INT32 deleted_count = 0;
     bool unread_exists = false;
     bool jumpToUnread = (GlobalSettings::self()->actionEnterFolder() ==
                          GlobalSettings::EnumActionEnterFolder::SelectFirstUnreadNew) ||
@@ -3096,7 +3096,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         if (fscanf(sortStream, KMAIL_SORT_HEADER, &version) != 1)
           version = -1;
         if(version == KMAIL_SORT_VERSION) {
-          Q_INT32 byteOrder = 0;
+          TQ_INT32 byteOrder = 0;
           fread(&byteOrder, sizeof(byteOrder), 1, sortStream);
           if (byteOrder == 0x12345678)
           {
@@ -3321,8 +3321,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort
                   compare_SortCacheItem);
 
-        /* The sorted list now contains all sorted children of this item, while
-         * the (aptly named) unsorted array contains all as of yet unsorted
+        /* The sorted list now tqcontains all sorted children of this item, while
+         * the (aptly named) unsorted array tqcontains all as of yet unsorted
          * ones. It has just been qsorted, so it is in itself sorted. These two
          * sorted lists are now merged into one. */
         for(TQPtrListIterator it(*sorted);
@@ -3355,9 +3355,9 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 // If the parent is watched or ignored, propagate that to it's
                 // children
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusIgnored);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored);
                 khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key());
             } else {
                 khi = new HeaderItem(this, new_kci->id(), new_kci->key());
@@ -3515,7 +3515,7 @@ void KMHeaders::setCurrentItemBySerialNum( unsigned long serialNum )
 {
   // Linear search == slow. Don't overuse this method.
   // It's currently only used for finding the current item again
-  // after expiry deleted mails (so the index got invalidated).
+  // after expiry deleted mails (so the index got tqinvalidated).
   for (int i = 0; i < (int)mItems.size() - 1; ++i) {
     KMMsgBase *mMsgBase = mFolder->getMsgBase( i );
     if ( mMsgBase->getMsgSerNum() == serialNum ) {
@@ -3587,21 +3587,21 @@ void KMHeaders::updateActions()
     paste->setEnabled( true );
 }
 
-void KMHeaders::setCopiedMessages(const TQValueList< Q_UINT32 > & msgs, bool move)
+void KMHeaders::setCopiedMessages(const TQValueList< TQ_UINT32 > & msgs, bool move)
 {
   mCopiedMessages = msgs;
   mMoveMessages = move;
   updateActions();
 }
 
-bool KMHeaders::isMessageCut(Q_UINT32 serNum) const
+bool KMHeaders::isMessageCut(TQ_UINT32 serNum) const
 {
-  return mMoveMessages && mCopiedMessages.contains( serNum );
+  return mMoveMessages && mCopiedMessages.tqcontains( serNum );
 }
 
-TQValueList< Q_UINT32 > KMHeaders::selectedSernums()
+TQValueList< TQ_UINT32 > KMHeaders::selectedSernums()
 {
-  TQValueList list;
+  TQValueList list;
   for ( TQListViewItemIterator it(this); it.current(); it++ ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
       HeaderItem* item = static_cast( it.current() );
@@ -3614,9 +3614,9 @@ TQValueList< Q_UINT32 > KMHeaders::selectedSernums()
   return list;
 }
 
-TQValueList< Q_UINT32 > KMHeaders::selectedVisibleSernums()
+TQValueList< TQ_UINT32 > KMHeaders::selectedVisibleSernums()
 {
-  TQValueList list;
+  TQValueList list;
   TQListViewItemIterator it(this, TQListViewItemIterator::Selected|TQListViewItemIterator::Visible);
   while( it.current() ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 4055e3c3b..4eddbdf46 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -32,7 +32,7 @@ class TQIconSet;
 class TQDateTime;
 
 typedef TQPtrList KMMessageList;
-typedef TQValueList SerNumList;
+typedef TQValueList SerNumList;
 typedef TQMap KMMenuToFolder;
 enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 
@@ -102,7 +102,7 @@ public:
                                KMMessage* aMsg = 0);
 
   /** Resets toBeDeleted and selectable status of all selected items. */
-  virtual void clearSelectableAndAboutToBeDeleted(Q_UINT32 serNum);
+  virtual void clearSelectableAndAboutToBeDeleted(TQ_UINT32 serNum);
   /** Returns list of selected messages. Mark the corresponding
       header items to be deleted, if specified. */
   virtual KMMessageList* selectedMsgs(bool toBeDeleted = false);
@@ -111,12 +111,12 @@ public:
   TQValueList selectedItems();
 
   /** Returns the sernums of all selected items. */
-  TQValueList selectedSernums();
+  TQValueList selectedSernums();
 
   /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by
       eg. the quick search) selected items.
   */
-  TQValueList selectedVisibleSernums();
+  TQValueList selectedVisibleSernums();
 
   /** Returns index of message returned by last getMsg() call */
   int indexOfGetMsg (void) const { return getMsgIndex; }
@@ -198,13 +198,13 @@ public:
     @param msgs A list of serial numbers.
     @param move if true, the messages were cutted
   */
-  void setCopiedMessages( const TQValueList &msgs, bool move );
+  void setCopiedMessages( const TQValueList &msgs, bool move );
 
   /**
     Returns true if the message with the given serial number has been cut.
     @param serNum A message serial number.
   */
-  bool isMessageCut( Q_UINT32 serNum ) const;
+  bool isMessageCut( TQ_UINT32 serNum ) const;
 
   /** Write global config options. */
   virtual void writeConfig(void);
@@ -469,7 +469,7 @@ private:
   KPopupMenu* mPopup;
 
   // copied messages
-  TQValueList mCopiedMessages;
+  TQValueList mCopiedMessages;
   bool mMoveMessages;
 }; // class
 #endif
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index d0e706f90..b464913b6 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -11,7 +11,7 @@
 
 #include "globalsettings.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmstartup.h"
 #include "index.h"
 #include "kmmainwin.h"
@@ -814,7 +814,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
   int retval;
   bool readFolderMsgIds = false;
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     mAddMessageMsgIds.clear();
@@ -840,7 +840,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
     msg->fromString( messageText );
 
     if (readFolderMsgIds) {
-      if ( foldername.contains("/")) {
+      if ( foldername.tqcontains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
 
         if ( !MsgStatusFlags.isEmpty() ) {
           KMMsgStatus status = strToStatus(MsgStatusFlags);
-          if (status) msg->setStatus(status);
+          if (status) msg->seStatus(status);
         }
 
         int index;
@@ -1000,7 +1000,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
   bool createNewFolder = false;
 
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     createNewFolder = true;
@@ -1018,7 +1018,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
     msg->fromString( messageText );
 
     if (createNewFolder) {
-      if ( foldername.contains("/")) {
+      if ( foldername.tqcontains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
 
       if( !MsgStatusFlags.isEmpty() ) {
         KMMsgStatus status = strToStatus(MsgStatusFlags);
-        if (status) msg->setStatus(status);
+        if (status) msg->seStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1121,7 +1121,7 @@ void KMKernel::raise()
   kmail.call( "newInstance" );
 }
 
-bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ )
+bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ )
 {
   KMMainWidget *mainWidget = 0;
   if (KMainWindow::memberList) {
@@ -1170,7 +1170,7 @@ bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ )
   return false;
 }
 
-TQString KMKernel::getFrom( Q_UINT32 serialNumber )
+TQString KMKernel::getFrom( TQ_UINT32 serialNumber )
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -1195,7 +1195,7 @@ TQString KMKernel::debugScheduler()
   return res;
 }
 
-TQString KMKernel::debugSernum( Q_UINT32 serialNumber )
+TQString KMKernel::debugSernum( TQ_UINT32 serialNumber )
 {
   TQString res;
   if (serialNumber != 0) {
@@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
-  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
+  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 }
 
@@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online );
-  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
+  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 
   if ( kmkernel->msgSender()->sendImmediate() ) {
@@ -1597,7 +1597,7 @@ void KMKernel::init()
 
 bool KMKernel::isCodecAsciiCompatible( const TQTextCodec *codec )
 {
-  return !mNonAsciiCompatibleCodecs.contains( codec );
+  return !mNonAsciiCompatibleCodecs.tqcontains( codec );
 }
 
 void KMKernel::readConfig()
@@ -1880,7 +1880,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
                 "%1 now uses the %5 folder for "
                 "its messages.
      "
                 "%2 can move the contents of %6 into this folder for "
-                "you, though this may replace any existing files with "
+                "you, though this may tqreplace any existing files with "
                 "the same name in %7.
      "
                 "Would you like %3 to move the mail "
                 "files now?" )
@@ -1975,7 +1975,7 @@ void KMKernel::dumpDeadLetters()
       // yes, this is ugly and potentially dangerous, but the alternative is losing
       // currently composed messages...
       while ( win->isComposing() )
-        qApp->processEvents();
+        tqApp->processEvents();
     }
   }
 }
@@ -2046,7 +2046,7 @@ void KMKernel::slotResult(KIO::Job *job)
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to replace it?")
+        i18n("File %1 exists.\nDo you want to tqreplace it?")
         .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue)
         byteArrayToRemoteFile((*it).data, (*it).url, true);
@@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->topLevelWidgets();
+  TQWidgetList *l = kapp->tqtopLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
   while ( ( wid = it.current() ) != 0 ) {
     ++it;
-    TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" );
+    TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" );
     if (l2 && l2->first()) {
       KMMainWidget* kmmw = dynamic_cast( l2->first() );
       Q_ASSERT( kmmw );
@@ -2466,10 +2466,10 @@ Wallet *KMKernel::wallet() {
 
   // find an appropriate parent window for the wallet dialog
   WId window = 0;
-  if ( qApp->activeWindow() )
-    window = qApp->activeWindow()->winId();
+  if ( tqApp->activeWindow() )
+    window = tqApp->activeWindow()->winId();
   else if ( getKMMainWidget() )
-    window = getKMMainWidget()->topLevelWidget()->winId();
+    window = getKMMainWidget()->tqtopLevelWidget()->winId();
 
   delete mWallet;
   mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 455e42334..3eb19f651 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -28,7 +28,7 @@ namespace KWallet {
   class Wallet;
 }
 
-/** The KMail namespace contains classes used for KMail.
+/** The KMail namespace tqcontains classes used for KMail.
 * This is to keep them out of the way from all the other
 * un-namespaced classes in libs and the rest of PIM.
 */
@@ -202,10 +202,10 @@ public:
   DCOPRef getFolder( const TQString& vpath );
   void selectFolder( TQString folder );
   int timeOfLastMessageCountChange() const;
-  virtual bool showMail( Q_UINT32 serialNumber, TQString messageId );
-  virtual TQString getFrom( Q_UINT32 serialNumber );
+  virtual bool showMail( TQ_UINT32 serialNumber, TQString messageId );
+  virtual TQString getFrom( TQ_UINT32 serialNumber );
   virtual TQString debugScheduler();
-  virtual TQString debugSernum( Q_UINT32 serialNumber );
+  virtual TQString debugSernum( TQ_UINT32 serialNumber );
   int viewMessage( const KURL & messageFile );
 
   /**
@@ -262,7 +262,7 @@ public:
   void quit();
   /**
    * Returns true if the transfer was successful, otherwise false. In any case
-   * destinationDir contains the path to the current mail storage when the
+   * destinationDir tqcontains the path to the current mail storage when the
    * method returns.
    */
   bool transferMail( TQString & destinationDir );
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index dde827bec..0cd5aec55 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -108,7 +108,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
     KABC::Addressee::List list;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
 
-      // First, let's deal with mailto Urls. The path() part contains the
+      // First, let's deal with mailto Urls. The path() part tqcontains the
       // email-address.
       if ( (*it).protocol() == "mailto" ) {
         KABC::Addressee addressee;
@@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
       else {
         KABC::VCardConverter converter;
         TQString fileName;
-        if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
+        if ( KIO::NetAccess::download( (*it), fileName, tqparentWidget() ) ) {
           TQFile file( fileName );
           file.open( IO_ReadOnly );
           const TQByteArray data = file.readAll();
@@ -133,7 +133,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
         } else {
           TQString caption( i18n( "vCard Import Failed" ) );
           TQString text = i18n( "Unable to access %1." ).arg( (*it).url() );
-          KMessageBox::error( parentWidget(), text, caption );
+          KMessageBox::error( tqparentWidget(), text, caption );
         }
       }
       // Now, let the user choose which addressee to add.
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 27b04df0d..a3363e4fc 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -46,7 +46,7 @@
 #include "globalsettings.h"
 #include "kcursorsaver.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldermgr.h"
 #include "kmfolderdia.h"
 #include "accountmanager.h"
@@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
   mStartupDone = true;
 
 
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb );
   mVacationScriptIndicator->hide();
@@ -287,13 +287,13 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
   const KConfigGroup reader( KMKernel::config(), "Reader" );
 
-  mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
-  mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
-  mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below";
-  mThreadPref = geometry.readBoolEntry( "nestedMessages", false );
+  mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short";
+  mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide";
+  mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below";
+  mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false );
 
   mHtmlPref = reader.readBoolEntry( "htmlMail", false );
   mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false );
@@ -351,13 +351,13 @@ void KMMainWidget::readConfig(void)
     readPreConfig();
     mHeaders->refreshNestedState();
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow )
                     || ( oldFavoriteFolderView != mEnableFavoriteFolderView );
 
 
-    if( layoutChanged ) {
+    if( tqlayoutChanged ) {
       hide();
       // delete all panners
       delete mPanner1; // will always delete the others
@@ -389,11 +389,11 @@ void KMMainWidget::readConfig(void)
     widths << folderW << headerW;
     heights << headerH << readerH;
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow );
 
-    if (!mStartupDone || layoutChanged )
+    if (!mStartupDone || tqlayoutChanged )
     {
       /** unread / total columns
        * as we have some dependencies in this widget
@@ -482,11 +482,11 @@ void KMMainWidget::readConfig(void)
     // Update systray
     toggleSystemTray();
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow )
                     || ( oldFavoriteFolderView != mEnableFavoriteFolderView );
-    if ( layoutChanged ) {
+    if ( tqlayoutChanged ) {
       activatePanners();
     }
 
@@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void)
 {
   TQString s;
   KConfig *config = KMKernel::config();
-  KConfigGroup geometry( config, "Geometry" );
+  KConfigGroup tqgeometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -527,31 +527,31 @@ void KMMainWidget::writeConfig(void)
   if ( mFavoriteFolderView )
     mFavoriteFolderView->writeConfig();
 
-  geometry.writeEntry( "MainWin", this->geometry().size() );
+  tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() );
 
   const TQValueList widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes();
   const TQValueList heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes();
 
-  geometry.writeEntry( "FolderPaneWidth", widths[0] );
-  geometry.writeEntry( "HeaderPaneWidth", widths[1] );
+  tqgeometry.writeEntry( "FolderPaneWidth", widths[0] );
+  tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] );
 
   // Only save when the widget is shown (to avoid saving a wrong value)
   if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) {
-    geometry.writeEntry( "HeaderPaneHeight", heights[0] );
-    geometry.writeEntry( "ReaderPaneHeight", heights[1] );
+    tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] );
+    tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] );
   }
 
   // save the state of the unread/total-columns
-  geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
-  geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
-  geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
+  tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
+  tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
+  tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::createWidgets(void)
 {
-  // Create the splitters according to the layout settings
+  // Create the splitters according to the tqlayout settings
   TQWidget *headerParent = 0,
             *mimeParent = 0, *messageParent = 0;
 
@@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void)
   mTopLayout->add( mPanner1 );
 
   // BUG -sanders these accelerators stop working after switching
-  // between long/short folder layout
+  // between long/short folder tqlayout
   // Probably need to disconnect them first.
 
   // create list of messages
@@ -637,7 +637,7 @@ void KMMainWidget::createWidgets(void)
       mMsgActions->setMessageView( mMsgView );
     }
 
-    connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()),
+    connect(mMsgView, TQT_SIGNAL(tqreplaceMsgByUnencryptedVersion()),
         this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion()));
     connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
         this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
@@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
 
   if(kmkernel->xmlGuiInstance()) {
     KNotifyClient::Instance instance(kmkernel->xmlGuiInstance());
-    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
                           summary );
   }
   else
-    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
                           summary );
 
   if (mBeepOnNew) {
@@ -1028,7 +1028,7 @@ void KMMainWidget::slotShowNewFromTemplate()
     TQString subj = mb->subject();
     if ( subj.isEmpty() ) subj = i18n("No Subject");
     mTemplateMenu->popupMenu()->insertItem(
-      KStringHandler::rsqueeze( subj.replace( "&", "&&" ) ), idx );
+      KStringHandler::rsqueeze( subj.tqreplace( "&", "&&" ) ), idx );
   }
 }
 
@@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
   if (mMsgView) mMsgView->clearCache();
 
   if ( !isTrash )
-    BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash"));
+    BroadcasStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
 
   updateMessageActions();
 
@@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder()
     KCursorSaver busy(KBusyPtr::busy());
     mFolder->compact( KMFolder::CompactNow );
     // setCurrentItemByIndex will override the statusbar message, so save/restore it
-    TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+    TQString statusMsg = BroadcasStatus::instance()->statusMsg();
     mHeaders->setCurrentItemByIndex(idx);
-    BroadcastStatus::instance()->setStatusMsg( statusMsg );
+    BroadcasStatus::instance()->seStatusMsg( statusMsg );
   }
 }
 
@@ -1314,7 +1314,7 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
 	       "This will remove all changes that you have done "
 	       "locally to your IMAP folders."),
 	  i18n("Refresh IMAP Cache"), i18n("&Refresh") ) == KMessageBox::Continue )
-    kmkernel->acctMgr()->invalidateIMAPFolders();
+    kmkernel->acctMgr()->tqinvalidateIMAPFolders();
 }
 
 //-----------------------------------------------------------------------------
@@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckVacation()
 {
-  updateVactionScriptStatus( false );
+  updateVactionScripStatus( false );
   if ( !kmkernel->askToGoOnline() )
     return;
 
   Vacation *vac = new Vacation( this, true /* check only */ );
-  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(bool)) );
+  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
 }
 
 void KMMainWidget::slotEditVacation()
@@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation()
     return;
 
   mVacation = new Vacation( this );
-  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(bool)) );
+  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
   if ( mVacation->isUsable() ) {
     connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
   } else {
@@ -2468,7 +2468,7 @@ void KMMainWidget::getAccountMenu()
   TQStringList::Iterator it;
   int id = 0;
   for(it = actList.begin(); it != actList.end() ; ++it, id++)
-    mActMenu->insertItem((*it).replace("&", "&&"), id);
+    mActMenu->insertItem((*it).tqreplace("&", "&&"), id);
 }
 
 //-----------------------------------------------------------------------------
@@ -2481,7 +2481,7 @@ void KMMainWidget::getTransportMenu()
   TQStringList::Iterator it;
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
-    mSendMenu->insertItem((*it).replace("&", "&&"), id);
+    mSendMenu->insertItem((*it).tqreplace("&", "&&"), id);
 }
 
 //-----------------------------------------------------------------------------
@@ -2545,7 +2545,7 @@ void KMMainWidget::updateCustomTemplateMenus()
     KAction *action;
     switch ( t.type() ) {
     case CustomTemplates::TReply:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
@@ -2557,7 +2557,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyc;
       break;
     case CustomTemplates::TReplyAll:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
@@ -2569,7 +2569,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyallc;
       break;
     case CustomTemplates::TForward:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
@@ -2581,7 +2581,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++forwardc;
       break;
     case CustomTemplates::TUniversal:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
@@ -2591,7 +2591,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyc;
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
@@ -2601,7 +2601,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyAllActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyallc;
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
@@ -2659,7 +2659,7 @@ void KMMainWidget::setupActions()
 
   (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh",
 		      this, TQT_SLOT(slotInvalidateIMAPFolders()),
-		      actionCollection(), "file_invalidate_imap_cache" );
+		      actionCollection(), "file_tqinvalidate_imap_cache" );
 
   (void) new KAction( i18n("Empty All &Trash Folders"), 0,
 		      KMKernel::self(), TQT_SLOT(slotEmptyTrash()),
@@ -3608,7 +3608,7 @@ void KMMainWidget::removeDuplicates()
     if ( !id.isEmpty() ) {
       TQString subjMD5 = (*mFolder)[i]->strippedSubjectMD5();
       int other = -1;
-      if ( idMD5s.contains(id) )
+      if ( idMD5s.tqcontains(id) )
         other = idMD5s[id].first();
       else
         idMD5s[id].append( i );
@@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
                "Removed %n duplicate messages.", numDuplicates );
     else
       msg = i18n("No duplicate messages found.");
-  BroadcastStatus::instance()->setStatusMsg( msg );
+  BroadcasStatus::instance()->seStatusMsg( msg );
 }
 
 
@@ -3713,7 +3713,7 @@ void KMMainWidget::initializeFilterActions()
   for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) {
     if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
       filterName = TQString("Filter %1").arg((*it)->name());
-      normalizedName = filterName.replace(" ", "_");
+      normalizedName = filterName.tqreplace(" ", "_");
       if (action(normalizedName.utf8()))
         continue;
       filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this);
@@ -3803,7 +3803,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
 
   TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() );
   TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
-  TQString normalizedName = actionname.replace(" ", "_");
+  TQString normalizedName = actionname.tqreplace(" ", "_");
   KAction* action =
     new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
                 actionCollection(), normalizedName.local8Bit());
@@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch()
     assert( mSearchWin );
     KMSearchPattern pattern;
     pattern.append( KMSearchRule::createInstance( "", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) );
-    int status = mQuickSearchLine->currentStatus();
+    int status = mQuickSearchLine->currenStatus();
     if ( status != 0 ) {
         pattern.append( new KMSearchRuleStatus( status ) );
     }
     mSearchWin->setSearchPattern( pattern );
 }
 
-void KMMainWidget::updateVactionScriptStatus(bool active)
+void KMMainWidget::updateVactionScripStatus(bool active)
 {
   mVacationIndicatorActive = active;
   if ( active ) {
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 20e19a3c6..824f2aaab 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -178,7 +178,7 @@ public:
   void setupForwardingActionsList();
 
   KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; }
-  void updateVactionScriptStatus() { updateVactionScriptStatus( mVacationIndicatorActive ); }
+  void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); }
 
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
@@ -446,7 +446,7 @@ private:
 
 private slots:
   void slotRequestFullSearchFromQuickSearch();
-  void updateVactionScriptStatus( bool active );
+  void updateVactionScripStatus( bool active );
 
 private:
   // Message actions
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 994219b0f..503c9a06b 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *)
 
   applyMainWindowSettings(KMKernel::config(), "Main Window");
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
 
   connect(kmkernel, TQT_SIGNAL(configChanged()),
@@ -122,9 +122,9 @@ void KMMainWin::displayStatusMsg(const TQString& aText)
   // ### FIXME: We should disable richtext/HTML (to avoid possible denial of service attacks),
   // but this code would double the size of the satus bar if the user hovers
   // over an -style email address :-(
-//  text.replace("&", "&");
-//  text.replace("<", "<");
-//  text.replace(">", ">");
+//  text.tqreplace("&", "&");
+//  text.tqreplace("<", "<");
+//  text.tqreplace(">", ">");
 
   statusBar()->changeItem(text, mMessageStatusId);
 }
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 6819d68d9..3af9a252a 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -246,7 +246,7 @@ bool KMMessage::transferInProgress() const
 void KMMessage::setTransferInProgress(bool value, bool force)
 {
   MessageProperty::setTransferInProgress( getMsgSerNum(), value, force );
-  if ( !transferInProgress() && sPendingDeletes.contains( this ) ) {
+  if ( !transferInProgress() && sPendingDeletes.tqcontains( this ) ) {
     sPendingDeletes.remove( this );
     if ( parent() ) {
       int idx = parent()->find( this );
@@ -260,7 +260,7 @@ void KMMessage::setTransferInProgress(bool value, bool force)
 
 
 bool KMMessage::isUrgent() const {
-  return headerField( "Priority" ).contains( "urgent", false )
+  return headerField( "Priority" ).tqcontains( "urgent", false )
     || headerField( "X-Priority" ).startsWith( "2" );
 }
 
@@ -351,7 +351,7 @@ void KMMessage::removePrivateHeaderFields() {
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::setStatusFields()
+void KMMessage::seStatusFields()
 {
   char str[2] = { 0, 0 };
 
@@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const
   header.Assemble();
   if ( header.AsString().empty() )
     return TQString::null;
-  return TQString::fromLatin1( header.AsString().c_str() );
+  return TQString::tqfromLatin1( header.AsString().c_str() );
 }
 
 
@@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool setStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), setStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
 }
 
-void KMMessage::fromString( const TQCString & str, bool aSetStatus ) {
-  return fromDwString( KMail::Util::dwString( str ), aSetStatus );
+void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
+  return fromDwString( KMail::Util::dwString( str ), aSeStatus );
 }
 
-void KMMessage::fromDwString(const DwString& str, bool aSetStatus)
+void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
 {
   delete mMsg;
   mMsg = new DwMessage;
   mMsg->FromString( str );
   mMsg->Parse();
 
-  if (aSetStatus) {
-    setStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
+  if (aSeStatus) {
+    seStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
     setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
     setSignatureStateChar(  headerField("X-KMail-SignatureState").at(0) );
     setMDNSentState( static_cast( headerField("X-KMail-MDN-Sent").at(0).latin1() ) );
@@ -852,7 +852,7 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
 
   const TQString indentStr = formatString( aIndentStr );
 
-  content.replace( '\n', '\n' + indentStr );
+  content.tqreplace( '\n', '\n' + indentStr );
   content.prepend( indentStr );
   content += '\n';
 
@@ -916,7 +916,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
     // strip all my addresses from the list of recipients
     TQStringList recipients = KPIM::splitEmailAddrList( toStr );
     toStr = stripMyAddressesFromAddressList( recipients ).join(", ");
-    // ... unless the list contains only my addresses (reply to self)
+    // ... unless the list tqcontains only my addresses (reply to self)
     if ( toStr.isEmpty() && !recipients.isEmpty() )
       toStr = recipients[0];
 
@@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // setStatus(KMMsgStatusReplied);
+  // seStatus(KMMsgStatusReplied);
   msg->link(this, KMMsgStatusReplied);
 
   if ( parent() && parent()->putRepliesInSameFolder() )
@@ -1216,7 +1216,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList )
    {
      nextField = field->Next();
      if ( field->FieldNameStr().find( "ontent" ) == DwString::npos
-             && !whiteList.contains( TQString::fromLatin1( field->FieldNameStr().c_str() ) ) )
+             && !whiteList.tqcontains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) )
        header.RemoveField(field);
      field = nextField;
    }
@@ -1276,7 +1276,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */
     msg->initFromMessage( this );
     msg->removeHeaderField("Content-Type");
     msg->removeHeaderField("Content-Transfer-Encoding");
-    // Modify the ContentType directly (replaces setAutomaticFields(true))
+    // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
     DwHeaders & header = msg->mMsg->Headers();
     header.MimeVersion().FromString("1.0");
     DwMediaType & contentType = msg->dwContentType();
@@ -1328,32 +1328,32 @@ static const struct {
   const char * text;
 } mdnMessageBoxes[] = {
   { "mdnNormalAsk", true,
-    I18N_NOOP("This message contains a request to return a notification "
+    I18N_NOOP("This message tqcontains a request to return a notification "
 	      "about your reception of the message.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnUnknownOption", false,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message.\n"
-	      "It contains a processing instruction that is marked as "
+	      "It tqcontains a processing instruction that is marked as "
 	      "\"required\", but which is unknown to KMail.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"failed\" response.") },
   { "mdnMultipleAddressesInReceiptTo", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but it is requested to send the notification to more "
 	      "than one address.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathEmpty", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but there is no return-path set.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathNotInReceiptTo", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but the return-path address differs from the address "
 	      "the notification was requested to be sent to.\n"
@@ -1442,7 +1442,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   // an MDN with any disposition type other than "failed" in response
   // to the request.
   TQString notificationOptions = headerField("Disposition-Notification-Options");
-  if ( notificationOptions.contains( "required", false ) ) {
+  if ( notificationOptions.tqcontains( "required", false ) ) {
     // ### hacky; should parse...
     // There is a required option that we don't understand. We need to
     // ask the user what we should do:
@@ -1476,7 +1476,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   TQString returnPath = returnPathList.isEmpty() ? TQString::null
     : returnPathList.front().localPart + '@' + returnPathList.front().domain ;
   kdDebug(5006) << "clean return path: " << returnPath << endl;
-  if ( returnPath.isEmpty() || !receiptTo.contains( returnPath, false ) ) {
+  if ( returnPath.isEmpty() || !receiptTo.tqcontains( returnPath, false ) ) {
     if ( !allowGUI ) return 0; // don't setMDNSentState here!
     mode = requestAdviceOnMDN( returnPath.isEmpty() ?
 			       "mdnReturnPathEmpty" :
@@ -1523,7 +1523,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->initFromMessage( this );
   receipt->removeHeaderField("Content-Type");
   receipt->removeHeaderField("Content-Transfer-Encoding");
-  // Modify the ContentType directly (replaces setAutomaticFields(true))
+  // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
   DwHeaders & header = receipt->mMsg->Headers();
   header.MimeVersion().FromString("1.0");
   DwMediaType & contentType = receipt->dwContentType();
@@ -1533,7 +1533,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->mNeedsAssembly = true;
   receipt->setContentTypeParam( "report-type", "disposition-notification" );
 
-  TQString description = replaceHeadersInString( MDN::descriptionFor( d, m ) );
+  TQString description = tqreplaceHeadersInString( MDN::descriptionFor( d, m ) );
 
   // text/plain part:
   KMMessagePart firstMsgPart;
@@ -1605,7 +1605,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   return receipt;
 }
 
-TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
+TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const {
   TQString result = s;
   TQRegExp rx( "\\$\\{([a-z0-9-]+)\\}", false );
   Q_ASSERT( rx.isValid() );
@@ -1618,14 +1618,14 @@ TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
 
   int idx = 0;
   if( ( idx = rxDate.search( result, idx ) ) != -1  ) {
-    result.replace( idx, rxDate.matchedLength(), sDate );
+    result.tqreplace( idx, rxDate.matchedLength(), sDate );
   }
 
   idx = 0;
   while ( ( idx = rx.search( result, idx ) ) != -1 ) {
-    TQString replacement = headerField( rx.cap(1).latin1() );
-    result.replace( idx, rx.matchedLength(), replacement );
-    idx += replacement.length();
+    TQString tqreplacement = headerField( rx.cap(1).latin1() );
+    result.tqreplace( idx, rx.matchedLength(), tqreplacement );
+    idx += tqreplacement.length();
   }
   return result;
 }
@@ -2144,7 +2144,7 @@ TQString KMMessage::references() const
 TQString KMMessage::replyToAuxIdMD5() const
 {
   TQString result = references();
-  // references contains two items, use the first one
+  // references tqcontains two items, use the first one
   // (the second to last reference)
   const int rightAngle = result.find( '>' );
   if( rightAngle != -1 )
@@ -2666,7 +2666,7 @@ TQValueList KMMessage::determineAllowedCtes( const CharFreq& cf,
   }
 
   // In the following cases only QP and Base64 are allowed:
-  // - the buffer will be OpenPGP/MIME signed and it contains trailing
+  // - the buffer will be OpenPGP/MIME signed and it tqcontains trailing
   //   whitespace (cf. RFC 3156)
   // - a line starts with "From "
   if ( ( willBeSigned && cf.hasTrailingWhitespace() ) ||
@@ -2819,7 +2819,7 @@ int KMMessage::numBodyParts() const
       parts.append( part );
       part = part->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     count++;
     // go up in the tree until reaching a node with next
     // (or the last top-level node)
@@ -2871,7 +2871,7 @@ int KMMessage::partNumber( DwBodyPart * aDwBodyPart ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     if (curpart == aDwBodyPart)
       idx = curIdx;
     curIdx++;
@@ -2911,7 +2911,7 @@ DwBodyPart * KMMessage::dwBodyPart( int aIdx ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     if (curIdx==aIdx)
         part = curpart;
     curIdx++;
@@ -2949,7 +2949,7 @@ DwBodyPart * KMMessage::findDwBodyPart( int type, int subtype ) const
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart contains a leaf message part
+    // this is where curPart->msgPart tqcontains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -2998,7 +2998,7 @@ DwBodyPart * KMMessage::findDwBodyPart( const TQCString& type, const TQCString&
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart contains a leaf message part
+    // this is where curPart->msgPart tqcontains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -3198,7 +3198,7 @@ bool KMMessage::deleteBodyPart( int partIndex )
   dummyPart.setBodyEncodedBinary( TQByteArray() );
   TQCString cd = dummyPart.contentDisposition();
   if ( cd.find( "inline", 0, false ) == 0 ) {
-    cd.replace( 0, 10, "attachment" );
+    cd.tqreplace( 0, 10, "attachment" );
     dummyPart.setContentDisposition( cd );
   } else if ( cd.isEmpty() ) {
     dummyPart.setContentDisposition( "attachment" );
@@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart)
 //-----------------------------------------------------------------------------
 TQString KMMessage::generateMessageId( const TQString& addr )
 {
-  TQDateTime datetime = TQDateTime::currentDateTime();
+  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
   TQString msgIdStr;
 
   msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" );
@@ -3457,7 +3457,7 @@ TQCString KMMessage::html2source( const TQCString & src )
 TQString KMMessage::encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
                                                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
@@ -4015,7 +4015,7 @@ TQString KMMessage::guessEmailAddressFromLoginName( const TQString& loginName )
   if ( user.isValid() ) {
     TQString fullName = user.fullName();
     if ( fullName.find( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 )
-      address = '"' + fullName.replace( '\\', "\\" ).replace( '"', "\\" )
+      address = '"' + fullName.tqreplace( '\\', "\\" ).tqreplace( '"', "\\" )
 	      + "\" <" + address + '>';
     else
       address = fullName + " <" + address + '>';
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
 {
   if (mStatus == aStatus)
     return;
-  KMMsgBase::setStatus(aStatus, idx);
+  KMMsgBase::seStatus(aStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) const
+void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
 {
   *retMsgSerNum = 0;
-  *retStatus = KMMsgStatusUnknown;
+  *reStatus = KMMsgStatusUnknown;
 
   TQString message = headerField("X-KMail-Link-Message");
   TQString type = headerField("X-KMail-Link-Type");
@@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) cons
   if ( !message.isEmpty() && !type.isEmpty() ) {
     *retMsgSerNum = message.toULong();
     if ( type == "reply" )
-      *retStatus = KMMsgStatusReplied;
+      *reStatus = KMMsgStatusReplied;
     else if ( type == "forward" )
-      *retStatus = KMMsgStatusForwarded;
+      *reStatus = KMMsgStatusForwarded;
     else if ( type == "deleted" )
-      *retStatus = KMMsgStatusDeleted;
+      *reStatus = KMMsgStatusDeleted;
   }
 }
 
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      setStatus( KMMsgStatusHasInvitation );
+      seStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  setStatus( KMMsgStatusHasNoInvitation );
+  seStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    setStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
     return;
   }
 
@@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature &&
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) )
     {
-      setStatus( KMMsgStatusHasAttach );
+      seStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    setStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 958d017e2..a063ca1a8 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -131,7 +131,7 @@ public:
   */
   void setUnencryptedMsg( KMMessage* unencrypted );
 
-  /** Returns TRUE if the message contains an unencrypted copy of itself. */
+  /** Returns TRUE if the message tqcontains an unencrypted copy of itself. */
   bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; }
 
   /** Returns an unencrypted copy of this message or 0 if none exists. */
@@ -150,13 +150,13 @@ public:
   }
 
   /** Mark the message as deleted */
-  void del() { setStatus(KMMsgStatusDeleted); }
+  void del() { seStatus(KMMsgStatusDeleted); }
 
   /** Undelete the message. Same as touch */
-  void undel() { setStatus(KMMsgStatusOld); }
+  void undel() { seStatus(KMMsgStatusOld); }
 
   /** Touch the message - mark it as read */
-  void touch() { setStatus(KMMsgStatusOld); }
+  void touch() { seStatus(KMMsgStatusOld); }
 
   /** Create a new message that is a reply to this message, filling all
       required header fields with the proper values. The returned message
@@ -210,9 +210,9 @@ public:
   void sanitizeHeaders( const TQStringList& whiteList = TQStringList() );
 
   /** Parse the string and create this message from it. */
-  void fromDwString(const DwString& str, bool setStatus=false);
-  void fromString(const TQCString& str, bool setStatus=false);
-  void fromByteArray(const TQByteArray & ba, bool setStatus=false);
+  void fromDwString(const DwString& str, bool seStatus=false);
+  void fromString(const TQCString& str, bool seStatus=false);
+  void fromByteArray(const TQByteArray & ba, bool seStatus=false);
 
   /** Return the entire message contents in the DwString. This function
       is *fast* even for large message since it does *not* involve a
@@ -545,7 +545,7 @@ public:
    */
   void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 );
 
-  /** Returns the body part decoded to unicode.
+  /** Returns the body part decoded to tqunicode.
    **/
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
@@ -663,13 +663,13 @@ public:
 
   /**
    * Delete a body part with the specified part index.
-   * A dummy body part with the text "the attachment foo was deleted" will replace the old part.
+   * A dummy body part with the text "the attachment foo was deleted" will tqreplace the old part.
    */
   bool deleteBodyPart( int partIndex );
 
   /** Set "Status" and "X-Status" fields of the message from the
    * internal message status. */
-  void setStatusFields();
+  void seStatusFields();
 
   /** Generates the Message-Id. It uses either the Message-Id suffix
    * defined by the user or the given email address as suffix. The address
@@ -679,7 +679,7 @@ public:
 
   /** Convert '<' into "<" resp. '>' into ">" in order to
     * prevent their interpretation by KHTML.
-    * Does *not* use the Qt replace function but runs a very fast C code
+    * Does *not* use the Qt tqreplace function but runs a very fast C code
     * the same way as lf2crlf() does.
    */
   static TQCString html2source( const TQCString & src );
@@ -713,7 +713,7 @@ public:
                                  bool removeLineBreaks = false );
 
   /** Converts the email address(es) to (a) nice HTML mailto: anchor(s).
-   * If stripped is TRUE then the visible part of the anchor contains
+   * If stripped is TRUE then the visible part of the anchor tqcontains
    * only the name part and not the given emailAddr.
    */
   static TQString emailAddrAsAnchor(const TQString& emailAddr,
@@ -746,7 +746,7 @@ public:
   static TQString guessEmailAddressFromLoginName( const TQString& userName );
 
   /**
-   *  Given argument msg add quoting characters and relayout for max width maxLength
+   *  Given argument msg add quoting characters and retqlayout for max width maxLength
    *  @param msg the string which it to be quoted
    *  @param maxLineLength reformat text to be this amount of columns at maximum, adding
    *    linefeeds at word boundaries to make it fit.
@@ -760,7 +760,7 @@ public:
   static const TQStringList &preferredCharsets();
 
   /** Replaces every occurrence of "${foo}" in @p s with headerField("foo") */
-  TQString replaceHeadersInString( const TQString & s ) const;
+  TQString tqreplaceHeadersInString( const TQString & s ) const;
 
   /** Get the message charset.*/
   TQCString charset() const;
@@ -825,8 +825,8 @@ public:
   /** Status of the message. */
   KMMsgStatus status() const { return mStatus; }
   /** Set status and mark dirty. */
-  void setStatus(const KMMsgStatus status, int idx = -1);
-  void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); }
+  void seStatus(const KMMsgStatus status, int idx = -1);
+  void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
 
   /** Set encryption status of the message. */
   void setEncryptionState(const KMMsgEncryptionState, int idx = -1);
@@ -847,8 +847,8 @@ public:
   /** Links this message to @p aMsg, setting link type to @p aStatus. */
   void link(const KMMessage *aMsg, KMMsgStatus aStatus);
   /** Returns the information for the Nth link into @p retMsg
-   * and @p retStatus. */
-  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) const;
+   * and @p reStatus. */
+  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const;
 
   /** Convert wildcards into normal string */
   TQString formatString(const TQString&) const;
@@ -886,7 +886,7 @@ public:
   /** Returns message body with quoting header and indented by the
     given indentation string. This is suitable for including the message
     in another message of for replies, forwards. The header string is
-    a template where the following fields are replaced with the
+    a template where the following fields are tqreplaced with the
     corresponding values:
     
               %D: date of this message
@@ -969,7 +969,7 @@ private:
   KMMessage* mUnencryptedMsg;
   DwBodyPart* mLastUpdated;
   int mCursorPos;
-  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage replaced in the KMMsgList
+  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage tqreplaced in the KMMsgList
   static TQValueList sPendingDeletes;
 };
 
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index d7fb9541e..6e73051f7 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() {
   header()->setStretchEnabled( true, 0 );
   // rest of the columns:
   if ( KMKernel::config()->hasGroup( configGroup ) ) {
-    // there is a saved layout. use it...
+    // there is a saved tqlayout. use it...
     restoreLayout( KMKernel::config(), configGroup );
     // and disable Maximum mode:
     for ( int i = 1 ; i < 4 ; ++i )
@@ -214,9 +214,9 @@ void KMMimePartTree::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index e3d3fec15..71a1731ca 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -150,7 +150,7 @@ void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
 {
   mDirty = true;
   KMMsgStatus oldStatus = status();
@@ -267,40 +267,40 @@ void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
 
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setStatus(const char* aStatusStr, const char* aXStatusStr)
+void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr)
 {
   // first try to find status from "X-Status" field if given
   if (aXStatusStr) {
-    if (strchr(aXStatusStr, 'N')) setStatus(KMMsgStatusNew);
-    if (strchr(aXStatusStr, 'U')) setStatus(KMMsgStatusUnread);
-    if (strchr(aXStatusStr, 'O')) setStatus(KMMsgStatusOld);
-    if (strchr(aXStatusStr, 'R')) setStatus(KMMsgStatusRead);
-    if (strchr(aXStatusStr, 'D')) setStatus(KMMsgStatusDeleted);
-    if (strchr(aXStatusStr, 'A')) setStatus(KMMsgStatusReplied);
-    if (strchr(aXStatusStr, 'F')) setStatus(KMMsgStatusForwarded);
-    if (strchr(aXStatusStr, 'Q')) setStatus(KMMsgStatusQueued);
-    if (strchr(aXStatusStr, 'K')) setStatus(KMMsgStatusTodo);
-    if (strchr(aXStatusStr, 'S')) setStatus(KMMsgStatusSent);
-    if (strchr(aXStatusStr, 'G')) setStatus(KMMsgStatusFlag);
-    if (strchr(aXStatusStr, 'P')) setStatus(KMMsgStatusSpam);
-    if (strchr(aXStatusStr, 'H')) setStatus(KMMsgStatusHam);
-    if (strchr(aXStatusStr, 'T')) setStatus(KMMsgStatusHasAttach);
-    if (strchr(aXStatusStr, 'C')) setStatus(KMMsgStatusHasNoAttach);
+    if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew);
+    if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread);
+    if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld);
+    if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead);
+    if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted);
+    if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied);
+    if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded);
+    if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued);
+    if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo);
+    if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent);
+    if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag);
+    if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam);
+    if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam);
+    if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach);
+    if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach);
   }
 
   // Merge the contents of the "Status" field
   if (aStatusStr) {
     if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') ||
         (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) {
-      setStatus( KMMsgStatusOld );
-      setStatus( KMMsgStatusRead );
+      seStatus( KMMsgStatusOld );
+      seStatus( KMMsgStatusRead );
     }
     else if (aStatusStr[0] == 'R')
-      setStatus(KMMsgStatusRead);
+      seStatus(KMMsgStatusRead);
     else if (aStatusStr[0] == 'D')
-      setStatus(KMMsgStatusDeleted);
+      seStatus(KMMsgStatusDeleted);
     else
-      setStatus(KMMsgStatusNew);
+      seStatus(KMMsgStatusNew);
   }
 }
 
@@ -587,7 +587,7 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok)
   TQString result = _str;
   int len = result.length();
   for (int i = 0; i < len; i++)
-    if (result.at(i).unicode() >= 128) {
+    if (result.at(i).tqunicode() >= 128) {
       result.at(i) = '?';
       all_ok = false;
     }
@@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
   unsigned int nonAscii = 0;
   unsigned int strLength(_str.length());
   for (unsigned int i = 0; i < strLength; i++)
-    if (_str.at(i).unicode() >= 128) nonAscii++;
+    if (_str.at(i).tqunicode() >= 128) nonAscii++;
   bool useBase64 = (nonAscii * 6 > strLength);
 
   unsigned int start, stop, p, pos = 0, encLength;
@@ -815,7 +815,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
     {
       if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1))
         start = p + 1;
-      if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32)
+      if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32)
         break;
       p++;
     }
@@ -1037,7 +1037,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin
     TQStringList charsets = encodingList;
     if (!_encoding.isEmpty())
     {
-       TQString currentCharset = TQString::fromLatin1(_encoding);
+       TQString currentCharset = TQString::tqfromLatin1(_encoding);
        charsets.remove(currentCharset);
        charsets.prepend(currentCharset);
     }
@@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str)
 {
   uint len = str.length();
   str = TQDeepCopy(str);
-  TQChar *unicode = const_cast( str.unicode() );
+  TQChar *tqunicode = const_cast( str.tqunicode() );
   for (uint i = 0; i < len; i++)
-    unicode[i] = kmail_swap_16(unicode[i].unicode());
+    tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode());
 }
 
 //-----------------------------------------------------------------------------
@@ -1171,9 +1171,9 @@ retry:
   }
 
   MsgPartType type;
-  Q_UINT16 l;
+  TQ_UINT16 l;
   while(g_chunk_offset < mIndexLength) {
-    Q_UINT32 tmp;
+    TQ_UINT32 tmp;
     copy_from_stream(tmp);
     copy_from_stream(l);
     if (swapByteOrder)
@@ -1193,7 +1193,7 @@ retry:
     }
     if(type == t) {
         // This works because the TQString constructor does a memcpy.
-        // Otherwise we would need to be concerned about the alignment.
+        // Otherwise we would need to be concerned about the tqalignment.
 	if(l)
 	    ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2);
 	break;
@@ -1248,9 +1248,9 @@ retry:
   }
 
   MsgPartType type;
-  Q_UINT16 l;
+  TQ_UINT16 l;
   while (g_chunk_offset < mIndexLength) {
-    Q_UINT32 tmp;
+    TQ_UINT32 tmp;
     copy_from_stream(tmp);
     copy_from_stream(l);
     if (swapByteOrder)
@@ -1285,7 +1285,7 @@ retry:
       else if (sizeOfLong == 4)
       {
          // Long is stored as 4 bytes in index file, sizeof(long) = 8
-         Q_UINT32 ret_32;
+         TQ_UINT32 ret_32;
          copy_from_stream(ret_32);
          if (swapByteOrder)
             ret_32 = kmail_swap_32(ret_32);
@@ -1294,8 +1294,8 @@ retry:
       else if (sizeOfLong == 8)
       {
          // Long is stored as 8 bytes in index file, sizeof(long) = 4
-         Q_UINT32 ret_1;
-         Q_UINT32 ret_2;
+         TQ_UINT32 ret_1;
+         TQ_UINT32 ret_2;
          copy_from_stream(ret_1);
          copy_from_stream(ret_2);
          if (!swapByteOrder)
@@ -1347,8 +1347,8 @@ retry:
 	int len2 = (len > 256) ? 256 : len; \
 	if(csize < (length + (len2 + sizeof(short) + sizeof(MsgPartType)))) \
     	   ret = (uchar *)realloc(ret, csize += len2+sizeof(short)+sizeof(MsgPartType)); \
-        Q_UINT32 t = (Q_UINT32) type; memcpy(ret+length, &t, sizeof(t)); \
-        Q_UINT16 l = len2; memcpy(ret+length+sizeof(t), &l, sizeof(l)); \
+        TQ_UINT32 t = (TQ_UINT32) type; memcpy(ret+length, &t, sizeof(t)); \
+        TQ_UINT16 l = len2; memcpy(ret+length+sizeof(t), &l, sizeof(l)); \
         if (network_order) \
            memcpy_networkorder(ret+length+sizeof(t)+sizeof(l), x, len2); \
         else \
@@ -1371,23 +1371,23 @@ const uchar *KMMsgBase::asIndexString(int &length) const
 
   //these is at the beginning because it is queried quite often
   tmp_str = msgIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp = mLegacyStatus;
   STORE_DATA(MsgLegacyStatusPart, tmp);
 
   //these are completely arbitrary order
   tmp_str = fromStrip().stripWhiteSpace();
-  STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = subject().stripWhiteSpace();
-  STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = toStrip().stripWhiteSpace();
-  STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = replyToIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = xmark().stripWhiteSpace();
-  STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = fileName().stripWhiteSpace();
-  STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp = msgSize();
   STORE_DATA(MsgSizePart, tmp);
   tmp = folderOffset();
@@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   STORE_DATA(MsgMDNSentPart, tmp);
 
   tmp_str = replyToAuxIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
 
   tmp_str = strippedSubjectMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
 
   tmp = status();
   STORE_DATA(MsgStatusPart, tmp);
@@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   STORE_DATA(MsgUIDPart, tmp);
 
   tmp_str = from();
-  STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true );
+  STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true );
 
   tmp_str = to();
-  STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true );
+  STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true );
 
   return ret;
 }
@@ -1450,37 +1450,37 @@ void KMMsgBase::readConfig()
   sReplySubjPrefixes = composerGroup.readListEntry("reply-prefixes", ',');
   if (sReplySubjPrefixes.isEmpty())
     sReplySubjPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:";
-  sReplaceSubjPrefix = composerGroup.readBoolEntry("replace-reply-prefix", true);
+  sReplaceSubjPrefix = composerGroup.readBoolEntry("tqreplace-reply-prefix", true);
   sForwardSubjPrefixes = composerGroup.readListEntry("forward-prefixes", ',');
   if (sForwardSubjPrefixes.isEmpty())
     sForwardSubjPrefixes << "Fwd:" << "FW:";
-  sReplaceForwSubjPrefix = composerGroup.readBoolEntry("replace-forward-prefix", true);
+  sReplaceForwSubjPrefix = composerGroup.readBoolEntry("tqreplace-forward-prefix", true);
 }
 
 //-----------------------------------------------------------------------------
 // static
 TQString KMMsgBase::stripOffPrefixes( const TQString& str )
 {
-  return replacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
+  return tqreplacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
                           true, TQString::null ).stripWhiteSpace();
 }
 
 //-----------------------------------------------------------------------------
 // static
-TQString KMMsgBase::replacePrefixes( const TQString& str,
+TQString KMMsgBase::tqreplacePrefixes( const TQString& str,
                                     const TQStringList& prefixRegExps,
-                                    bool replace,
+                                    bool tqreplace,
                                     const TQString& newPrefix )
 {
   bool recognized = false;
   // construct a big regexp that
   // 1. is anchored to the beginning of str (sans whitespace)
   // 2. matches at least one of the part regexps in prefixRegExps
-  TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*")
+  TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*")
                       .arg( prefixRegExps.join(")|(?:") );
   TQRegExp rx( bigRegExp, false /*case insens.*/ );
   if ( !rx.isValid() ) {
-    kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \""
+    kdWarning(5006) << "KMMessage::tqreplacePrefixes(): bigRegExp = \""
                     << bigRegExp << "\"\n"
                     << "prefix regexp is invalid!" << endl;
     // try good ole Re/Fwd:
@@ -1489,8 +1489,8 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
     TQString tmp = str;
     if ( rx.search( tmp ) == 0 ) {
       recognized = true;
-      if ( replace )
-	return tmp.replace( 0, rx.matchedLength(), newPrefix + ' ' );
+      if ( tqreplace )
+	return tmp.tqreplace( 0, rx.matchedLength(), newPrefix + ' ' );
     }
   }
   if ( !recognized )
@@ -1508,10 +1508,10 @@ TQString KMMsgBase::cleanSubject() const
 
 //-----------------------------------------------------------------------------
 TQString KMMsgBase::cleanSubject( const TQStringList & prefixRegExps,
-                                 bool replace,
+                                 bool tqreplace,
                                  const TQString & newPrefix ) const
 {
-  return KMMsgBase::replacePrefixes( subject(), prefixRegExps, replace,
+  return KMMsgBase::tqreplacePrefixes( subject(), prefixRegExps, tqreplace,
                                      newPrefix );
 }
 
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 1137bb6e9..d5b7107f2 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -220,9 +220,9 @@ public:
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
    * specify the index of this message within the parent folder. */
-  virtual void setStatus(const KMMsgStatus status, int idx = -1);
+  virtual void seStatus(const KMMsgStatus status, int idx = -1);
   virtual void toggleStatus(const KMMsgStatus status, int idx = -1);
-  virtual void setStatus(const char* statusField, const char* xstatusField=0);
+  virtual void seStatus(const char* statusField, const char* xstatusField=0);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
@@ -403,18 +403,18 @@ public:
   /** Return if the message has at least one attachment */
   virtual KMMsgAttachmentState attachmentState() const;
 
-  /** Return if the message contains an invitation */
+  /** Return if the message tqcontains an invitation */
   virtual KMMsgInvitationState invitationState() const;
 
   /** Check for prefixes @p prefixRegExps in @p str. If none
       is found, @p newPrefix + ' ' is prepended to @p str and the
-      resulting string is returned. If @p replace is true, any
+      resulting string is returned. If @p tqreplace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      @p str is replaced by @p newPrefix.
+      @p str is tqreplaced by @p newPrefix.
   **/
-  static TQString replacePrefixes( const TQString& str,
+  static TQString tqreplacePrefixes( const TQString& str,
                                   const TQStringList& prefixRegExps,
-                                  bool replace,
+                                  bool tqreplace,
                                   const TQString& newPrefix );
 
   /** Returns @p str with all "forward" and "reply" prefixes stripped off.
@@ -423,11 +423,11 @@ public:
 
   /** Check for prefixes @p prefixRegExps in #subject(). If none
       is found, @p newPrefix + ' ' is prepended to the subject and the
-      resulting string is returned. If @p replace is true, any
+      resulting string is returned. If @p tqreplace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      #subject() is replaced by @p newPrefix
+      #subject() is tqreplaced by @p newPrefix
   **/
-  TQString cleanSubject(const TQStringList& prefixRegExps, bool replace,
+  TQString cleanSubject(const TQStringList& prefixRegExps, bool tqreplace,
 		       const TQString& newPrefix) const;
 
   /** Return this mails subject, with all "forward" and "reply"
@@ -459,7 +459,7 @@ public:
   enum MsgPartType
   {
     MsgNoPart = 0,
-    //unicode strings
+    //tqunicode strings
     MsgFromStripPart = 1,
     MsgSubjectPart = 2,
     MsgToStripPart = 3,
@@ -474,7 +474,7 @@ public:
     MsgFilePart = 11,
     MsgCryptoStatePart = 12,
     MsgMDNSentPart = 13,
-    //another two unicode strings
+    //another two tqunicode strings
     MsgReplyToAuxIdMD5Part = 14,
     MsgStrippedSubjectMD5Part = 15,
     // and another unsigned long
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index 8f9a9551c..07f5797d0 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -223,7 +223,7 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum,
     folder->setDirty( true ); // rewrite id file
   }
 
-  // Insert into the dict. Don't use dict->replace() as we _know_
+  // Insert into the dict. Don't use dict->tqreplace() as we _know_
   // there is no entry with the same msn, we just made sure.
   KMMsgDictEntry *entry = new KMMsgDictEntry(folder->folder(), index);
   dict->insert((long)msn, entry);
@@ -246,12 +246,12 @@ unsigned long KMMsgDict::insert(const KMMsgBase *msg, int index)
 
 //-----------------------------------------------------------------------------
 
-void KMMsgDict::replace(unsigned long msgSerNum,
+void KMMsgDict::tqreplace(unsigned long msgSerNum,
 		       const KMMsgBase *msg, int index)
 {
   KMFolderIndex* folder = static_cast( msg->storage() );
   if ( !folder ) {
-    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
+    kdDebug(5006) << "KMMsgDict::tqreplace: Cannot tqreplace the message serial "
       << "number, null pointer to storage. Requested serial: " << msgSerNum
       << endl;
     kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
@@ -411,14 +411,14 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   }
 
   bool swapByteOrder;
-  Q_UINT32 byte_order;
+  TQ_UINT32 byte_order;
   if (!fread(&byte_order, sizeof(byte_order), 1, fp)) {
     fclose(fp);
     return -1;
   }
   swapByteOrder = (byte_order == 0x78563412);
 
-  Q_UINT32 count;
+  TQ_UINT32 count;
   if (!fread(&count, sizeof(count), 1, fp)) {
     fclose(fp);
     return -1;
@@ -434,7 +434,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   fseek(fp, pos, SEEK_SET);   // back to previous position
 
   // the file must at least contain what we try to read below
-  if ( (fileSize - pos) < (long)(count * sizeof(Q_UINT32)) ) {
+  if ( (fileSize - pos) < (long)(count * sizeof(TQ_UINT32)) ) {
     fclose(fp);
     return -1;
   }
@@ -442,7 +442,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   KMMsgDictREntry *rentry = new KMMsgDictREntry(count);
 
   for (unsigned int index = 0; index < count; index++) {
-    Q_UINT32 msn;
+    TQ_UINT32 msn;
 
     bool readOk = fread(&msn, sizeof(msn), 1, fp);
     if (swapByteOrder)
@@ -468,7 +468,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
       Q_ASSERT( msn != 0 );
     }
 
-    // Insert into the dict. Don't use dict->replace() as we _know_
+    // Insert into the dict. Don't use dict->tqreplace() as we _know_
     // there is no entry with the same msn, we just made sure.
     KMMsgDictEntry *entry = new KMMsgDictEntry( storage.folder(), index);
     dict->insert((long)msn, entry);
@@ -506,7 +506,7 @@ KMMsgDictREntry *KMMsgDict::openFolderIds( const FolderStorage& storage, bool tr
       fscanf(fp, IDS_HEADER, &version);
       if (version == IDS_VERSION)
       {
-         Q_UINT32 byte_order = 0;
+         TQ_UINT32 byte_order = 0;
          fread(&byte_order, sizeof(byte_order), 1, fp);
          rentry->swapByteOrder = (byte_order == 0x78563412);
       }
@@ -530,7 +530,7 @@ KMMsgDictREntry *KMMsgDict::openFolderIds( const FolderStorage& storage, bool tr
          return 0;
       }
       fprintf(fp, IDS_HEADER, IDS_VERSION);
-      Q_UINT32 byteOrder = 0x12345678;
+      TQ_UINT32 byteOrder = 0x12345678;
       fwrite(&byteOrder, sizeof(byteOrder), 1, fp);
       rentry->swapByteOrder = false;
     }
@@ -552,7 +552,7 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
 
   fseek(fp, rentry->baseOffset, SEEK_SET);
   // kdDebug(5006) << "Dict writing for folder " << storage.label() << endl;
-  Q_UINT32 count = rentry->getRealSize();
+  TQ_UINT32 count = rentry->getRealSize();
   if (!fwrite(&count, sizeof(count), 1, fp)) {
     kdDebug(5006) << "Dict cannot write count with folder " << storage.label() << ": "
                   << strerror(errno) << " (" << errno << ")" << endl;
@@ -560,7 +560,7 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
   }
 
   for (unsigned int index = 0; index < count; index++) {
-    Q_UINT32 msn = rentry->getMsn(index);
+    TQ_UINT32 msn = rentry->getMsn(index);
     if (!fwrite(&msn, sizeof(msn), 1, fp))
       return -1;
     if ( msn == 0 ) {
@@ -605,7 +605,7 @@ int KMMsgDict::appendToFolderIds( FolderStorage& storage, int index)
 //  kdDebug(5006) << "Dict appending for folder " << storage.label() << endl;
 
   fseek(fp, rentry->baseOffset, SEEK_SET);
-  Q_UINT32 count;
+  TQ_UINT32 count;
   if (!fread(&count, sizeof(count), 1, fp)) {
     kdDebug(5006) << "Dict cannot read count for folder " << storage.label() << ": "
                   << strerror(errno) << " (" << errno << ")" << endl;
@@ -629,7 +629,7 @@ int KMMsgDict::appendToFolderIds( FolderStorage& storage, int index)
   if (ofs > 0)
     fseek(fp, ofs, SEEK_CUR);
 
-  Q_UINT32 msn = rentry->getMsn(index);
+  TQ_UINT32 msn = rentry->getMsn(index);
   if (rentry->swapByteOrder)
      msn = kmail_swap_32(msn);
   if (!fwrite(&msn, sizeof(msn), 1, fp)) {
diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h
index 60fabf6c8..a13165340 100644
--- a/kmail/kmmsgdict.h
+++ b/kmail/kmmsgdict.h
@@ -97,7 +97,7 @@ private:
   unsigned long insert(const KMMsgBase *msg, int index = -1);
 
   /** Set the serial number of @p msg to @p msgSerNum */
-  void replace(unsigned long msgSerNum,
+  void tqreplace(unsigned long msgSerNum,
                const KMMsgBase *msg, int index = -1);
 
   /** Removes a message. */
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index ece847a38..9a7b1ed88 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
 {
     if(aStatus == status())
         return;
-    KMMsgBase::setStatus(aStatus, idx); //base does more "stuff"
+    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index 8f557f25b..ce15e3127 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -91,7 +91,7 @@ public:
   void setMsgSizeServer(size_t sz);
   void setFolderOffset(off_t offs);
   void setFileName(const TQString& file);
-  virtual void setStatus(const KMMsgStatus status, int idx = -1);
+  virtual void seStatus(const KMMsgStatus status, int idx = -1);
   virtual void setDate(time_t aUnixTime);
   virtual void setSubject(const TQString&);
   virtual void setXMark(const TQString&);
@@ -107,7 +107,7 @@ public:
   virtual void setTo( const TQString &to );
 
   /** Grr.. c++! */
-  virtual void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); }
+  virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
   virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); }
 
   virtual bool dirty(void) const;
diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp
index 112236c03..a96d6aae2 100644
--- a/kmail/kmmsgpart.cpp
+++ b/kmail/kmmsgpart.cpp
@@ -406,7 +406,7 @@ TQCString KMMessagePart::bodyDecoded(void) const
   //kdWarning( result.length() != (unsigned int)len, 5006 )
   //  << "KMMessagePart::bodyDecoded(): body is binary but used as text!" << endl;
 
-  result = result.replace( "\r\n", "\n" ); // CRLF -> LF conversion
+  result = result.tqreplace( "\r\n", "\n" ); // CRLF -> LF conversion
 
   assert( mBodyDecodedSize < 0 || mBodyDecodedSize == len );
   if ( mBodyDecodedSize < 0 )
@@ -422,7 +422,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
   KMimeMagic::self()->setFollowLinks( true ); // is it necessary ?
 
   const TQByteArray body = ( aAutoDecode ) ? bodyDecodedBinary() : mBody ;
-  KMimeMagicResult * result = KMimeMagic::self()->findBufferType( body );
+  KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferType( body );
 
   TQString mimetype = result->mimeType();
   const int sep = mimetype.find('/');
@@ -445,7 +445,7 @@ TQString KMMessagePart::iconName( int size ) const
     if ( fileName.isEmpty() ) fileName = this->name();
     if ( !fileName.isEmpty() )
     {
-      fileName = KMimeType::findByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
+      fileName = KMimeType::tqfindByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
     }
   }
 
@@ -558,7 +558,7 @@ TQString KMMessagePart::fileName(void) const
 
   // Allow for multiple filname*0, filename*1, ... params (defined by RFC 2231)
   // in the Content-Disposision
-  if ( mContentDisposition.contains( "filename*", false ) ) {
+  if ( mContentDisposition.tqcontains( "filename*", false ) ) {
 
     // It's RFC 2231 encoded, so extract the file name with the 2231 method
     str = KMMsgBase::extractRFC2231HeaderField( mContentDisposition, "filename" );
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 000837c75..85906af5f 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -58,17 +58,17 @@ public:
    **/
   void setBodyFromUnicode( const TQString & str );
 
-  /** Returns the body part decoded to unicode.
+  /** Returns the body part decoded to tqunicode.
    **/
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-    contains the correct encoding. This routine is meant for binary data.
+    tqcontains the correct encoding. This routine is meant for binary data.
     No trailing 0 is appended. */
   TQByteArray bodyDecodedBinary(void) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-      contains the correct encoding. This routine is meant for text strings! */
+      tqcontains the correct encoding. This routine is meant for text strings! */
   TQCString bodyDecoded(void) const;
 
   /** Sets body, encoded in the best fitting
@@ -209,7 +209,7 @@ public:
   /** Sets the part number */
   void setPartSpecifier( const TQString & part ) { mPartSpecifier = part; }
 
-  /** If this part is complete (contains a body) */
+  /** If this part is complete (tqcontains a body) */
   bool isComplete() { return (!mBody.isNull()); }
 
   /** Returns the parent part */
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 4a897291f..e87fbd8ac 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   TQLabel      * label;
   TQString       msg;
 
-  setHelp( TQString::fromLatin1("attachments") );
+  setHelp( TQString::tqfromLatin1("attachments") );
 
   for ( int i = 0 ; i < numEncodingTypes ; ++i )
     mI18nizedEncodings << i18n( encodingTypes[i].displayName );
@@ -73,14 +73,14 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
   mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) );
   mMimeType->insertStringList( TQStringList()
-			       << TQString::fromLatin1("text/html")
-			       << TQString::fromLatin1("text/plain")
-			       << TQString::fromLatin1("image/gif")
-			       << TQString::fromLatin1("image/jpeg")
-			       << TQString::fromLatin1("image/png")
-			       << TQString::fromLatin1("application/octet-stream")
-			       << TQString::fromLatin1("application/x-gunzip")
-			       << TQString::fromLatin1("application/zip") );
+			       << TQString::tqfromLatin1("text/html")
+			       << TQString::tqfromLatin1("text/plain")
+			       << TQString::tqfromLatin1("image/gif")
+			       << TQString::tqfromLatin1("image/jpeg")
+			       << TQString::tqfromLatin1("image/png")
+			       << TQString::tqfromLatin1("application/octet-stream")
+			       << TQString::tqfromLatin1("application/x-gunzip")
+			       << TQString::tqfromLatin1("application/zip") );
   connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)),
 	   this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) );
   glay->addWidget( mMimeType, 0, 1 );
@@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) {
 
 void KMMsgPartDialog::setMimeType( const TQString & type,
 				   const TQString & subtype ) {
-  setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) );
+  setMimeType( TQString::tqfromLatin1("%1/%2").arg(type).arg(subtype) );
 }
 
 void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
@@ -396,7 +396,7 @@ void KMMsgPartDialogCompat::applyChanges()
     if ( name != TQString( encName ) )
       cDisp += "*=" + encName;
     else
-      cDisp += "=\"" + encName.replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"';
+      cDisp += "=\"" + encName.tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"';
     mMsgPart->setContentDisposition( cDisp );
   }
 
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 2654f52ca..3139aa32f 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -464,7 +464,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn)
 
 void KMPopFilterCnfrmDlg::slotUpdateMinimumSize()
 {
-  mainWidget()->setMinimumSize(mainWidget()->sizeHint());
+  mainWidget()->setMinimumSize(mainWidget()->tqsizeHint());
 }
 
 #include "kmpopfiltercnfrmdlg.moc"
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 2f5227cde..375234c09 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -363,7 +363,7 @@ void KMReaderMainWin::setupAccel()
   KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() );
   KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() );
   KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() );
-  KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
+  KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
   mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
                               i18n( "Move message to trashcan" ) ),
                               Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 21be5a44a..0fce722d3 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -161,7 +161,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData )
         return *this;
     TQByteArray::detach();
     uint len1 = size();
-    uint len2 = qstrlen( newData );
+    uint len2 = tqstrlen( newData );
     if ( !TQByteArray::resize( len1 + len2 ) )
         return *this;
     memcpy( data() + len1, newData, len2 );
@@ -281,14 +281,14 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node,
 kdDebug(5006) << "dataNode == curNode:  Save curNode without replacing it." << endl;
 
       // A) Store the headers of this part IF curNode is not the root node
-      //    AND we are not replacing a node that already *has* replaced
+      //    AND we are not replacing a node that already *has* tqreplaced
       //    the root node in previous recursion steps of this function...
       if( headers ) {
         if( dataNode->parentNode() && !weAreReplacingTheRootNode ) {
 kdDebug(5006) << "dataNode is NOT replacing the root node:  Store the headers." << endl;
           resultingData += headers->AsString().c_str();
         } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){
-kdDebug(5006) << "dataNode replace the root node:  Do NOT store the headers but change" << endl;
+kdDebug(5006) << "dataNode tqreplace the root node:  Do NOT store the headers but change" << endl;
 kdDebug(5006) << "                                 the Message's headers accordingly." << endl;
 kdDebug(5006) << "              old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl;
 kdDebug(5006) << "              new Content-Type = " << headers->ContentType(   ).AsString().c_str() << endl;
@@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl;
           resultingData += boundary;
           resultingData += "\n";
           // note: We are processing a harmless multipart that is *not*
-          //       to be replaced by one of it's children, therefor
+          //       to be tqreplaced by one of it's children, therefor
           //       we set their doStoreHeaders to true.
           objectTreeToDecryptedMsg( curNode,
                                     resultingData,
@@ -347,11 +347,11 @@ kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE
 kdDebug(5006) << "dataNode != curNode:  Replace curNode by dataNode." << endl;
       bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode();
       if( rootNodeReplaceFlag ) {
-kdDebug(5006) << "                      Root node will be replaced." << endl;
+kdDebug(5006) << "                      Root node will be tqreplaced." << endl;
       } else {
-kdDebug(5006) << "                      Root node will NOT be replaced." << endl;
+kdDebug(5006) << "                      Root node will NOT be tqreplaced." << endl;
       }
-      // store special data to replace the current part
+      // store special data to tqreplace the current part
       // (e.g. decrypted data or embedded RfC 822 data)
       objectTreeToDecryptedMsg( dataNode,
                                 resultingData,
@@ -1017,24 +1017,24 @@ void KMReaderWin::initHtmlWidget(void)
   connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
           TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
   connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
-          this, TQT_SLOT( contactStatusChanged( const TQString & ) ) );
+          this, TQT_SLOT( contacStatusChanged( const TQString & ) ) );
   connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
           this, TQT_SLOT( updateReaderWin() ) );
 }
 
-void KMReaderWin::contactStatusChanged( const TQString &uid)
+void KMReaderWin::contacStatusChanged( const TQString &uid)
 {
 //  kdDebug( 5006 ) << k_funcinfo << " got a presence change for " << uid << endl;
   // get the list of nodes for this contact from the htmlView
   DOM::NodeList presenceNodes = mViewer->htmlDocument()
-    .getElementsByName( DOM::DOMString( TQString::fromLatin1("presence-") + uid ) );
+    .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("presence-") + uid ) );
   for ( unsigned int i = 0; i < presenceNodes.length(); ++i ) {
     DOM::Node n =  presenceNodes.item( i );
     kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
     kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
     TQString newPresence = kmkernel->imProxy()->presenceString( uid );
     if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString::null )
-      newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
+      newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
   }
@@ -1423,7 +1423,7 @@ void KMReaderWin::updateReaderWin()
   {
     TQScrollView * scrollview = static_cast(mViewer->widget());
     scrollview->setContentsPos( 0,
-      qRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
+      tqRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
     mSavedRelativePosition = 0;
   }
 }
@@ -1653,7 +1653,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
 
   if( emitReplaceMsgByUnencryptedVersion ) {
     kdDebug(5006) << "KMReaderWin  -  invoce saving in decrypted form:" << endl;
-    emit replaceMsgByUnencryptedVersion();
+    emit tqreplaceMsgByUnencryptedVersion();
   } else {
     kdDebug(5006) << "KMReaderWin  -  finished parsing and displaying of message." << endl;
     showHideMimeTree( rootNodeCntType == DwMime::kTypeText &&
@@ -1805,7 +1805,7 @@ void KMReaderWin::slotTouchMessage()
 
   SerNumList serNums;
   serNums.append( message()->getMsgSerNum() );
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 
   // should we send an MDN?
@@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   }
 
   if ( aUrl.stripWhiteSpace().isEmpty() ) {
-    KPIM::BroadcastStatus::instance()->reset();
+    KPIM::BroadcasStatus::instance()->reset();
     mHoveredUrl = KURL();
     mLastClickImagePath = TQString();
     return;
@@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this );
 
   kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl;
-  KPIM::BroadcastStatus::instance()->setTransientStatusMsg( msg );
+  KPIM::BroadcasStatus::instance()->setTransienStatusMsg( msg );
 }
 
 
@@ -2000,9 +2000,9 @@ void KMReaderWin::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != mBox->lineWidth() )
@@ -2050,13 +2050,13 @@ void KMReaderWin::slotHandleAttachment( int choice )
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFind()
 {
-  mViewer->findText();
+  mViewer->tqfindText();
 }
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFindNext()
 {
-  mViewer->findTextNext();
+  mViewer->tqfindTextNext();
 }
 
 //-----------------------------------------------------------------------------
@@ -2190,8 +2190,8 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
     // A TQString cannot handle binary data. So if it's shorter than the
     // attachment, we assume the attachment is binary:
     if( str.length() < (unsigned) aMsgPart->decodedSize() ) {
-      str.prepend( i18n("[KMail: Attachment contains binary data. Trying to show first character.]",
-          "[KMail: Attachment contains binary data. Trying to show first %n characters.]",
+      str.prepend( i18n("[KMail: Attachment tqcontains binary data. Trying to show first character.]",
+          "[KMail: Attachment tqcontains binary data. Trying to show first %n characters.]",
           str.length()) + TQChar('\n') );
     }
     htmlWriter()->queue( TQStyleSheet::escape( str ) );
@@ -2267,16 +2267,16 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
   // determine the MIME type of the attachment
   KMimeType::Ptr mimetype;
   // prefer the value of the Content-Type header
-  mimetype = KMimeType::mimeType( TQString::fromLatin1( contentTypeStr ) );
+  mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
-    mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ );
+    mimetype = KMimeType::tqfindByPath( name, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::findByFileContent( name );
+    mimetype = KMimeType::tqfindByFileContent( name );
   }
 
   KService::Ptr offer =
@@ -2297,7 +2297,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
                        .arg( filenameText );
   const int choice = KMessageBox::questionYesNoCancel( this, text,
       i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
-      TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
+      TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
 
   if( choice == KMessageBox::Yes ) {		// Save
     mAtmUpdate = true;
@@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId
 void KMReaderWin::slotDeleteAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-       i18n("Deleting an attachment might invalidate any digital signature on this message."),
+       i18n("Deleting an attachment might tqinvalidate any digital signature on this message."),
        i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" )
      != KMessageBox::Continue ) {
     return;
@@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded()
 void KMReaderWin::slotEditAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-        i18n("Modifying an attachment might invalidate any digital signature on this message."),
+        i18n("Modifying an attachment might tqinvalidate any digital signature on this message."),
         i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" )
         != KMessageBox::Continue ) {
     return;
@@ -2828,7 +2828,7 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   DOM::Document doc = mViewer->htmlDocument();
 
   // The anchors for this are created in ObjectTreeParser::parseObjectTree()
-  mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).arg( node->nodeId() ) );
+  mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).arg( node->nodeId() ) );
 
   // Remove any old color markings which might be there
   const partNode *root = node->topLevelParent();
@@ -2889,7 +2889,7 @@ void KMReaderWin::injectAttachments()
     link += "
      ";
     html.prepend( link );
-    html.prepend( TQString::fromLatin1( "
      %1 
      " ).
+    html.prepend( TQString::tqfromLatin1( "
      %1 
      " ).
                   arg( i18n( "Attachments:" ) ) );
   } else {
     link += "
      msgPart().typeStr().lower() == "message" || node == mRootNode )
-        html += TQString::fromLatin1("
      ").arg( bgColor.name() ).arg( margin )
                                                          .arg( align ).arg( visibility );
       html += subHtml;
@@ -2941,11 +2941,11 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
     partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
     if ( info.displayInHeader ) {
       html += "
      ";
-      html += TQString::fromLatin1( "" ).arg( bgColor.name() );
+      html += TQString::tqfromLatin1( "" ).arg( bgColor.name() );
       TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
       TQString href = node->asHREF( "header" );
-      html += TQString::fromLatin1( "" );
+      html += TQString::tqfromLatin1( "" );
       html += " ";
       if ( headerStyle() == HeaderStyle::enterprise() ) {
         TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 32c7abdf6..27bc33b0e 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -323,7 +323,7 @@ public:
   /* show or hide the list that points to the attachments */
   void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; }
 
-  // This controls whether a Toltec invitation is shown in its raw form or as a replacement text.
+  // This controls whether a Toltec invitation is shown in its raw form or as a tqreplacement text.
   // This can be toggled with the "kmail:showRawToltecMail" link.
   bool showRawToltecMail() const { return mShowRawToltecMail; }
   void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
@@ -331,9 +331,9 @@ public:
   /* retrieve BodyPartMemento of id \a which for partNode \a node */
   KMail::Interface::BodyPartMemento * bodyPartMemento( const partNode * node, const TQCString & which ) const;
 
-  /* set/replace BodyPartMemento \a memento of id \a which for
+  /* set/tqreplace BodyPartMemento \a memento of id \a which for
      partNode \a node. If there was a BodyPartMemento registered
-     already, replaces (deletes) that one. */
+     already, tqreplaces (deletes) that one. */
   void setBodyPartMemento( const partNode * node, const TQCString & which, KMail::Interface::BodyPartMemento * memento );
 
   /// Scrolls to the given attachment and marks it with a yellow border
@@ -347,7 +347,7 @@ private:
 signals:
   /** Emitted after parsing of a message to have it stored
       in unencrypted state in it's folder. */
-  void replaceMsgByUnencryptedVersion();
+  void tqreplaceMsgByUnencryptedVersion();
 
   /** The user presses the right mouse button. 'url' may be 0. */
   void popupMenu(KMMessage &msg, const KURL &url, const TQPoint& mousePos);
@@ -369,7 +369,7 @@ public slots:
   /** Refresh the reader window */
   void updateReaderWin();
 
-  /** HTML Widget scrollbar and layout handling. */
+  /** HTML Widget scrollbar and tqlayout handling. */
   void slotScrollUp();
   void slotScrollDown();
   void slotScrollPrior();
@@ -420,7 +420,7 @@ public slots:
   void slotMessageArrived( KMMessage *msg );
   /** start IM Chat with addressee */
   void slotIMChat();
-  void contactStatusChanged( const TQString &uid);
+  void contacStatusChanged( const TQString &uid);
 
   void slotLevelQuote( int l );
   void slotTouchMessage();
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 3d97a2b31..dc2cc4a1c 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -33,7 +33,7 @@ using KMail::FilterLog;
 #include 
 
 static const char* funcConfigNames[] =
-  { "contains", "contains-not", "equals", "not-equal", "regexp",
+  { "tqcontains", "tqcontains-not", "equals", "not-equal", "regexp",
     "not-regexp", "greater", "less-or-equal", "less", "greater-or-equal",
     "is-in-addressbook", "is-not-in-addressbook" , "is-in-category", "is-not-in-category",
     "has-attachment", "has-no-attachment"};
@@ -294,11 +294,11 @@ bool KMSearchRuleString::matches( const DwString & aStr, KMMessage & msg,
     static const DwBoyerMoore to("\nTo: ");
     static const DwBoyerMoore cc("\nCc: ");
     static const DwBoyerMoore bcc("\nBcc: ");
-    //  "contains" "foo" is true if any of the fields contains
+    //  "tqcontains" "foo" is true if any of the fields tqcontains
     // "foo", while  "does not contain" "foo" is true if none
-    // of the fields contains "foo"
+    // of the fields tqcontains "foo"
     if ( ( function() & 1 ) == 0 ) {
-      // positive function, e.g. "contains"
+      // positive function, e.g. "tqcontains"
       rc = ( matches( aStr, msg, &to, 2 ) ||
              matches( aStr, msg, &cc, 2 ) ||
              matches( aStr, msg, &bcc, 3 ) );
@@ -357,7 +357,7 @@ bool KMSearchRuleString::matches( const KMMessage * msg ) const
     msgContents = msg->headerAsString();
     logContents = false;
   } else if ( field() == "" ) {
-    // (mmutz 2001-11-05) hack to fix " !contains foo" to
+    // (mmutz 2001-11-05) hack to fix " !tqcontains foo" to
     // meet user's expectations. See FAQ entry in KDE 2.2.2's KMail
     // handbook
     if ( function() == FuncEquals || function() == FuncNotEqual )
@@ -455,7 +455,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( !stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( !stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -468,7 +468,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -481,7 +481,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
     for( TQStringList::ConstIterator it = addressList.begin();
       it != addressList.end(); ++it ) {
-        KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+        KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
 
           for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
               if ( (*itAd).hasCategory(category) )
@@ -498,7 +498,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
       for( TQStringList::ConstIterator it = addressList.begin();
         it != addressList.end(); ++it ) {
-          KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+          KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
 
             for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
                 if ( (*itAd).hasCategory(category) )
@@ -550,7 +550,7 @@ bool KMSearchRuleNumerical::matches( const KMMessage * msg ) const
   } else if ( field() == "" ) {
     TQDateTime msgDateTime;
     msgDateTime.setTime_t( msg->date() );
-    numericalMsgContents = msgDateTime.daysTo( TQDateTime::currentDateTime() );
+    numericalMsgContents = msgDateTime.daysTo( TQDateTime::tqcurrentDateTime() );
     numericalValue = contents().toInt();
     msgContents.setNum( numericalMsgContents );
   }
@@ -775,7 +775,7 @@ bool KMSearchPattern::matches( const DwString & aStr, bool ignoreBody ) const
   }
 }
 
-bool KMSearchPattern::matches( Q_UINT32 serNum, bool ignoreBody ) const
+bool KMSearchPattern::matches( TQ_UINT32 serNum, bool ignoreBody ) const
 {
   if ( isEmpty() )
     return true;
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 45ffe6808..a79b6122a 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -90,7 +90,7 @@ public:
 
   /** Determine whether the rule is worth considering. It isn't if
       either the field is not set or the contents is empty.
-      KFilter should make sure that it's rule list contains
+      KFilter should make sure that it's rule list tqcontains
       only non-empty rules, as matches doesn't check this. */
   virtual bool isEmpty() const = 0;
 
@@ -299,7 +299,7 @@ public:
     under which it could be stored in the config file.
 
     As a TQPtrList with autoDelete enabled, it assumes that it is the
-    central repository for the rules it contains. So if you want to
+    central repository for the rules it tqcontains. So if you want to
     reuse a rule in another pattern, make a deep copy of that rule.
 
     @short An abstraction of a search over messages.
@@ -339,7 +339,7 @@ public:
   */
   bool matches( const KMMessage * msg, bool ignoreBody = false ) const;
   bool matches( const DwString & str, bool ignoreBody = false ) const;
-  bool matches( Q_UINT32 sernum, bool ignoreBody = false ) const;
+  bool matches( TQ_UINT32 sernum, bool ignoreBody = false ) const;
 
   /** Returns true if the pattern only depends the DwString that backs
       a message */
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 399bc0e15..5f7c96cbd 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -106,12 +106,12 @@ void KMSearchRuleWidget::initWidget()
   // initialize the function/value widget stack
   mFunctionStack = new TQWidgetStack( this, "mFunctionStack" );
   //Don't expand the widget in vertical direction
-  mFunctionStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mFunctionStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
 
   hlay->addWidget( mFunctionStack );
 
   mValueStack = new TQWidgetStack( this, "mValueStack" );
-  mValueStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mValueStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
   hlay->addWidget( mValueStack );
   hlay->setStretchFactor( mValueStack, 10 );
 
@@ -143,7 +143,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule )
   mRuleField->blockSignals( true );
 
   if ( i < 0 ) { // not found -> user defined field
-    mRuleField->changeItem( TQString::fromLatin1( aRule->field() ), 0 );
+    mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 );
     i = 0;
   } else { // found in the list of predefined fields
     mRuleField->changeItem( TQString::null, 0 );
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 7f7730daf..208bf5746 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -77,10 +77,10 @@ KMSender::~KMSender()
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::setStatusMsg(const TQString &msg)
+void KMSender::seStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->setStatus(msg);
+    mProgressItem->seStatus(msg);
 }
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
   KMFolder * const outbox = kmkernel->outboxFolder();
   const KMFolderOpener openOutbox( outbox, "outbox" );
 
-  aMsg->setStatus(KMMsgStatusQueued);
+  aMsg->seStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -178,7 +178,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
    * the mail is in a sane state before sending. The unGet makes the
    * attached unencrypted version of the mail (if there is one ) disappear.
    * though, so we need to make sure to keep it around and restore it
-   * afterwards. The real fix would be to replace the unGet with
+   * afterwards. The real fix would be to tqreplace the unGet with
    * whatever parsing is triggered by it, but I'm too chicken to do that,
    * in this branch.
    * Note that the unencrypted mail will be lost if the mail remains in
@@ -293,7 +293,7 @@ void KMSender::doSendMsg()
   {
     mCurrentMsg->setTransferInProgress( false );
     if( mCurrentMsg->hasUnencryptedMsg() ) {
-      kdDebug(5006) << "KMSender::doSendMsg() post-processing: replace mCurrentMsg body by unencryptedMsg data" << endl;
+      kdDebug(5006) << "KMSender::doSendMsg() post-processing: tqreplace mCurrentMsg body by unencryptedMsg data" << endl;
       // delete all current body parts
       mCurrentMsg->deleteBodyParts();
       // copy Content-[..] headers from unencrypted message to current one
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->setStatus(KMMsgStatusSent);
-    mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+    mCurrentMsg->seStatus(KMMsgStatusSent);
+    mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
     mCurrentMsg->updateAttachmentState();
     mCurrentMsg->updateInvitationState();
 
@@ -400,7 +400,7 @@ void KMSender::doSendMsg()
     default:
       break;
     }
-    setStatusByLink( mCurrentMsg );
+    seStatusByLink( mCurrentMsg );
     if (mCurrentMsg->parent() && !imapSentFolder) {
       // for speed optimization, this code assumes that mCurrentMsg is the
       // last one in it's parent folder; make sure that's really the case:
@@ -450,11 +450,11 @@ void KMSender::doSendMsg()
         sentFolder->close("sentFolder");
     if ( someSent ) {
       if ( mSentMessages == mTotalMessages ) {
-        setStatusMsg(i18n("%n queued message successfully sent.",
+        seStatusMsg(i18n("%n queued message successfully sent.",
                           "%n queued messages successfully sent.",
                           mSentMessages));
       } else {
-        setStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
+        seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
             .arg(mSentMessages).arg( mTotalMessages ));
       }
     }
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
 }
 
 bool KMSender::runPrecommand( const TQString & cmd ) {
-  setStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
+  seStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
   mPrecommand = new KMPrecommand( cmd );
   connect( mPrecommand, TQT_SIGNAL(finished(bool)),
            TQT_SLOT(slotPrecommandFinished(bool)) );
@@ -554,7 +554,7 @@ void KMSender::sendProcStarted(bool success)
     if (mSendProc)
        mSendProc->finish();
     else
-      setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
+      seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
     mSendProc = 0;
     mSendProcStarted = false;
     cleanup();
@@ -595,7 +595,7 @@ void KMSender::doSendMsgAux()
 
   // start sending the current message
 
-  setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
+  seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
 	       .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
 	       .arg(mCurrentMsg->subject()));
   TQStringList to, cc, bcc;
@@ -614,7 +614,7 @@ void KMSender::doSendMsgAux()
       mOutboxFolder->unGetMsg( mFailedMessages );
     mCurrentMsg = 0;
     cleanup();
-    setStatusMsg(i18n("Failed to send (some) queued messages."));
+    seStatusMsg(i18n("Failed to send (some) queued messages."));
     return;
   }
   // Do *not* add code here, after send(). It can happen that this method
@@ -699,7 +699,7 @@ void KMSender::slotIdle()
       .arg(errString)
       .arg(mMethodStr);
     if (!errString.isEmpty()) KMessageBox::error(0,msg);
-    setStatusMsg( i18n( "Sending aborted." ) );
+    seStatusMsg( i18n( "Sending aborted." ) );
   } else {
     if (!mSendProc->sendOk()) {
       if ( mCurrentMsg )
@@ -744,7 +744,7 @@ void KMSender::slotIdle()
           doSendMsg();
           return;
         } else {
-          setStatusMsg( i18n( "Sending aborted." ) );
+          seStatusMsg( i18n( "Sending aborted." ) );
         }
       }
     } else {
@@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::setStatusByLink(const KMMessage *aMsg)
+void KMSender::seStatusByLink(const KMMessage *aMsg)
 {
   int n = 0;
   while (1) {
@@ -867,7 +867,7 @@ void KMSender::setStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->setStatus(index, status);
+        folder->seStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
@@ -905,7 +905,7 @@ void KMSendProc::failed(const TQString &aMsg)
 //-----------------------------------------------------------------------------
 void KMSendProc::statusMsg(const TQString& aMsg)
 {
-  if (mSender) mSender->setStatusMsg(aMsg);
+  if (mSender) mSender->seStatusMsg(aMsg);
 }
 
 //=============================================================================
@@ -1019,7 +1019,7 @@ void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen)
 {
   assert(proc!=0);
   Q_UNUSED( proc );
-  mLastErrorMessage.replace(mLastErrorMessage.length(), buflen, buffer);
+  mLastErrorMessage.tqreplace(mLastErrorMessage.length(), buflen, buffer);
 }
 
 
@@ -1139,7 +1139,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
   if ( mMessageLength )
     // allow +5% for subsequent LF->CRLF and dotstuffing (an average
     // over 2G-lines gives an average line length of 42-43):
-    query += "&size=" + TQString::number( qRound( mMessageLength * 1.05 ) );
+    query += "&size=" + TQString::number( tqRound( mMessageLength * 1.05 ) );
 
   destination.setPath("/send");
   destination.setQuery( query );
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 9771e9924..600737fe4 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -104,10 +104,10 @@ public:
 
 private:
   /** sets a status msg and emits statusMsg() */
-  void setStatusMsg(const TQString&);
+  void seStatusMsg(const TQString&);
 
   /** sets replied/forwarded status in the linked message for @p aMsg. */
-  void setStatusByLink(const KMMessage *aMsg);
+  void seStatusByLink(const KMMessage *aMsg);
 
   /** Emit progress info - calculates a percent value based on the amount of bytes sent */
   void emitProgressInfo( int currentFileProgress );
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index f0a560e5c..9007fe1a5 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -200,8 +200,8 @@ void lockOrDie() {
                    "can cause the loss of mail. You should not start %1 "
                    "unless you are sure that it is not already running.")
               .arg( programName, programName );
-              // TQString::arg( st ) only replaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) replacess all occurrences
+              // TQString::arg( st ) only tqreplaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
       else
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 8dc4eee94..f10faabe6 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -67,7 +67,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
     mNewMessagePopupId(-1),
     mPopupMenu(0)
 {
-  setAlignment( AlignCenter );
+  tqsetAlignment( AlignCenter );
   kdDebug(5006) << "Initting systray" << endl;
 
   mLastUpdate = time( 0 );
@@ -81,7 +81,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
 
   KMMainWidget * mainWidget = kmkernel->getKMMainWidget();
   if ( mainWidget ) {
-    TQWidget * mainWin = mainWidget->topLevelWidget();
+    TQWidget * mainWin = mainWidget->tqtopLevelWidget();
     if ( mainWin ) {
       mDesktopOfMainWin = KWin::windowInfo( mainWin->winId(),
                                             NET::WMDesktop ).desktop();
@@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu()
     action->plug( mPopupMenu );
   mPopupMenu->insertSeparator();
 
-  KMainWindow *mainWin = ::qt_cast(kmkernel->getKMMainWidget()->topLevelWidget());
+  KMainWindow *mainWin = ::qt_cast(kmkernel->getKMMainWidget()->tqtopLevelWidget());
   mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
 }
 
@@ -385,7 +385,7 @@ bool KMSystemTray::mainWindowIsOnCurrentDesktop()
   if ( !mainWidget )
     return false;
 
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   if ( !mainWin )
     return false;
 
@@ -401,7 +401,7 @@ void KMSystemTray::showKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
@@ -429,7 +429,7 @@ void KMSystemTray::hideKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index a5bf6b9ce..dce1ccf07 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -291,7 +291,7 @@ KMTransportDialog::KMTransportDialog( const TQString & caption,
 {
   assert(transportInfo != 0);
 
-  if( transportInfo->type == TQString::fromLatin1("sendmail") )
+  if( transportInfo->type == TQString::tqfromLatin1("sendmail") )
   {
     makeSendmailPage();
   } else {
@@ -479,7 +479,7 @@ void KMTransportDialog::makeSmtpPage()
                        "a custom hostname when identifying itself "
                        "to the mail server."
                        "
      This is useful when your system's hostname "
-                       "may not be set correctly or to mask your "
+                       "may not be set correctly or to tqmask your "
                        "system's true hostname."));
 
   mSmtp.localHostnameLabel = new TQLabel( i18n("Hos&tname:"), page1 );
@@ -522,7 +522,7 @@ void KMTransportDialog::makeSmtpPage()
   mSmtp.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mSmtp.authGroup );
   mSmtp.authNTLM = new TQRadioButton( i18n("&NTLM"), mSmtp.authGroup );
   mSmtp.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mSmtp.authGroup );
-  if ( KProtocolInfo::capabilities("smtp").contains("SASL") == 0 ) {
+  if ( KProtocolInfo::capabilities("smtp").tqcontains("SASL") == 0 ) {
     mSmtp.authNTLM->hide();
     mSmtp.authGSSAPI->hide();
   }
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index 789d85ea7..adec13992 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -29,18 +29,18 @@ void KMail::KorgHelper::ensureRunning()
 {
   TQString error;
   TQCString dcopService;
-  int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+  int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
   if ( result == 0 ) {
     // OK, so korganizer (or kontact) is running. Now ensure the object we want is available
     // [that's not the case when kontact was already running, but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+    if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
         kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-        Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+        Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else
         kdWarning() << "Error loading " << dcopService << endl;
     }
diff --git a/kmail/kwindowpositioner.cpp b/kmail/kwindowpositioner.cpp
index fefbdde2c..4fb399479 100644
--- a/kmail/kwindowpositioner.cpp
+++ b/kmail/kwindowpositioner.cpp
@@ -29,7 +29,7 @@ KWindowPositioner::KWindowPositioner( TQWidget *master, TQWidget *slave,
   Mode mode )
   : TQObject( master ), mMaster( master ), mSlave( slave ), mMode( mode )
 {
-  master->topLevelWidget()->installEventFilter( this );
+  master->tqtopLevelWidget()->installEventFilter( this );
 }
 
 bool KWindowPositioner::eventFilter( TQObject *, TQEvent *e )
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index f51a04eec..07d118b22 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -118,7 +118,7 @@ void ListJob::execute()
         i18n("retrieving folders"),
         false,
         mAccount->useSSL() || mAccount->useTLS() );
-    mParentProgressItem->setStatus( escapedStatus );
+    mParentProgressItem->seStatus( escapedStatus );
   }
 
   // make the URL
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index 0816ba40a..a020fa57b 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to repaint
+    // give the dialog a chance to tqrepaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 8a9487b06..525faf3df 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
   TQLabel* label;
   mLastItem = 0;
 
-  TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(),
+  TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(),
                                             "topLayout" );
 
   TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this );
   mlGroup->setColumnLayout( 0,  Qt::Vertical );
-  TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() );
+  TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() );
   topLayout->addWidget( mlGroup );
   setMainWidget( mlGroup );
 
@@ -144,7 +144,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
                     TQT_SLOT(slotAddressChanged(int)) );
 
   load();
-  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 3bec71323..dc8e42f44 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -54,7 +54,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co
            this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
   vlay->addWidget( mListView );
 
-  resize( 2 * sizeHint().width(), sizeHint().height() );
+  resize( 2 * tqsizeHint().width(), tqsizeHint().height() );
 
   slotRefresh();
 }
@@ -322,7 +322,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
   mTextEdit->setWordWrap( TQTextEdit::NoWrap );
   mTextEdit->setFont( KGlobalSettings::fixedFont() );
   connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) );
-  resize( 3 * sizeHint() );
+  resize( 3 * tqsizeHint() );
 }
 
 KMail::SieveEditor::~SieveEditor() {}
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index cc5431954..c1f569925 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -124,13 +124,13 @@ void MessageActions::setCurrentMessage(KMMessage * msg)
   updateActions();
 }
 
-void MessageActions::setSelectedSernums(const TQValueList< Q_UINT32 > & sernums)
+void MessageActions::setSelectedSernums(const TQValueList< TQ_UINT32 > & sernums)
 {
   mSelectedSernums = sernums;
   updateActions();
 }
 
-void MessageActions::setSelectedVisibleSernums(const TQValueList< Q_UINT32 > & sernums)
+void MessageActions::setSelectedVisibleSernums(const TQValueList< TQ_UINT32 > & sernums)
 {
   mVisibleSernums = sernums;
   updateActions();
@@ -248,12 +248,12 @@ void MessageActions::slotSetMsgStatusTodo()
 
 void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle )
 {
-  TQValueList serNums = mVisibleSernums;
+  TQValueList serNums = mVisibleSernums;
   if ( serNums.isEmpty() && mCurrentMessage )
     serNums.append( mCurrentMessage->getMsgSerNum() );
   if ( serNums.empty() )
     return;
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 41279c552..fe040c2cf 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -44,8 +44,8 @@ class MessageActions : public QObject
     void setMessageView( KMReaderWin *msgView );
 
     void setCurrentMessage( KMMessage *msg );
-    void setSelectedSernums( const TQValueList &sernums );
-    void setSelectedVisibleSernums( const TQValueList &sernums );
+    void setSelectedSernums( const TQValueList &sernums );
+    void setSelectedVisibleSernums( const TQValueList &sernums );
 
     KActionMenu* replyMenu() const { return mReplyActionMenu; }
     KAction* replyListAction() const { return mReplyListAction; }
@@ -88,8 +88,8 @@ class MessageActions : public QObject
     TQWidget *mParent;
     KActionCollection *mActionCollection;
     KMMessage* mCurrentMessage;
-    TQValueList mSelectedSernums;
-    TQValueList mVisibleSernums;
+    TQValueList mSelectedSernums;
+    TQValueList mVisibleSernums;
     KMReaderWin *mMessageView;
 
     KActionMenu *mReplyActionMenu;
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 8b3f1c5c4..2ff7cd6a0 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -1000,7 +1000,7 @@ void MessageComposer::composeMessage()
 }
 
 //
-// These are replacements for StructuringInfo(Wrapper):
+// These are tqreplacements for StructuringInfo(Wrapper):
 //
 
 // check whether to use multipart/{signed,encrypted}
@@ -1137,7 +1137,7 @@ static inline GpgME::Context::SignatureMode signingMode( Kleo::CryptoMessageForm
 }
 
 //
-// END replacements for StructuringInfo(Wrapper)
+// END tqreplacements for StructuringInfo(Wrapper)
 //
 
 class EncryptMessageJob : public MessageComposerJob {
@@ -1600,7 +1600,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
       }
     }
 
-    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     mEncodedBody = KMail::Util::lf2crlf( mEncodedBody );
@@ -1700,7 +1700,7 @@ void MessageComposer::encryptMessage( KMMessage* msg,
     }
 
     // now do the encrypting:
-    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     innerContent = KMail::Util::lf2crlf( innerContent );
@@ -1792,7 +1792,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg,
       delete innerDwPart;
       innerDwPart = 0;
 
-      // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+      // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
       // according to RfC 2633, 3.1.1 Canonicalization
       //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
       encodedAttachment = KMail::Util::lf2crlf( encodedAttachment );
@@ -1928,7 +1928,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
     const TQCString boundaryCStr = KMime::multiPartBoundary();
     // add "boundary" parameter
     if ( makeMultiMime( format, signing ) )
-      mainHeader.replace( "%boundary", boundaryCStr );
+      mainHeader.tqreplace( "%boundary", boundaryCStr );
 
     if ( toplevelCT ) {
       if ( const char * str = toplevelContentDisposition( format, signing ) ) {
@@ -2092,7 +2092,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec()
 
   if( mCharset == "us-ascii" ) {
     cText = KMMsgBase::toUsAscii( text );
-    newText = TQString::fromLatin1( cText );
+    newText = TQString::tqfromLatin1( cText );
   } else if( codec == 0 ) {
     kdDebug(5006) << "Something is wrong and I can not get a codec." << endl;
     cText = text.local8Bit();
diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp
index e0a27fc35..4d9983308 100644
--- a/kmail/messagecopyhelper.cpp
+++ b/kmail/messagecopyhelper.cpp
@@ -26,7 +26,7 @@
 using namespace KMail;
 using namespace KPIM;
 
-MessageCopyHelper::MessageCopyHelper( const TQValueList< Q_UINT32 > & msgs,
+MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs,
                                       KMFolder * dest, bool move, TQObject * parent ) :
     TQObject( parent )
 {
@@ -37,13 +37,13 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< Q_UINT32 > & msgs,
   int index;
   TQPtrList list;
 
-  for ( TQValueList::ConstIterator it = msgs.constBegin(); it != msgs.constEnd(); ++it ) {
+  for ( TQValueList::ConstIterator it = msgs.constBegin(); it != msgs.constEnd(); ++it ) {
     KMMsgDict::instance()->getLocation( *it, &f, &index );
     if ( !f ) // not found
       continue;
     if ( f == dest )
       continue; // already there
-    if ( !mOpenFolders.contains( f ) ) {// not yet opened
+    if ( !mOpenFolders.tqcontains( f ) ) {// not yet opened
       f->open( "messagecopyhelper" );
       mOpenFolders.insert( f, 0 );
     }
@@ -79,17 +79,17 @@ void MessageCopyHelper::copyCompleted(KMCommand * cmd)
   deleteLater();
 }
 
-TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMailList(const KPIM::MailList & list)
+TQValueList< TQ_UINT32 > MessageCopyHelper::serNumListFromMailList(const KPIM::MailList & list)
 {
-  TQValueList rv;
+  TQValueList rv;
   for ( MailList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it )
     rv.append( (*it).serialNumber() );
   return rv;
 }
 
-TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMsgBase > list)
+TQValueList< TQ_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMsgBase > list)
 {
-  TQValueList rv;
+  TQValueList rv;
   KMMsgBase* msg = list.first();
   while( msg ) {
     rv.append( msg->getMsgSerNum() );
@@ -98,11 +98,11 @@ TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMs
   return rv;
 }
 
-bool MessageCopyHelper::inReadOnlyFolder(const TQValueList< Q_UINT32 > & sernums)
+bool MessageCopyHelper::inReadOnlyFolder(const TQValueList< TQ_UINT32 > & sernums)
 {
   KMFolder *f = 0;
   int index;
-  for ( TQValueList::ConstIterator it = sernums.begin(); it != sernums.end(); ++it ) {
+  for ( TQValueList::ConstIterator it = sernums.begin(); it != sernums.end(); ++it ) {
     KMMsgDict::instance()->getLocation( *it, &f, &index );
     if ( !f ) // not found
       continue;
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 22a718dc6..419382cf8 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -49,23 +49,23 @@ class MessageCopyHelper : public QObject
       @param move If set to true, messages will be moved instead of copied
       @param parent The parent object.
     */
-    MessageCopyHelper( const TQValueList &msgs, KMFolder *dest,
+    MessageCopyHelper( const TQValueList &msgs, KMFolder *dest,
                        bool move, TQObject *parent = 0 );
 
     /**
       Converts a MailList into a serial number list.
     */
-    static TQValueList serNumListFromMailList( const KPIM::MailList &list );
+    static TQValueList serNumListFromMailList( const KPIM::MailList &list );
 
     /**
       Converts a KMMsgsBase* list into a serial number list.
     */
-    static TQValueList serNumListFromMsgList( TQPtrList list );
+    static TQValueList serNumListFromMsgList( TQPtrList list );
 
     /**
       Checks of any of the given messages comes from a read-only source.
     */
-    static bool inReadOnlyFolder( const TQValueList &sernums );
+    static bool inReadOnlyFolder( const TQValueList &sernums );
 
   private slots:
     void copyCompleted( KMCommand *cmd );
diff --git a/kmail/messageproperty.cpp b/kmail/messageproperty.cpp
index b1e02161b..e9897cd64 100644
--- a/kmail/messageproperty.cpp
+++ b/kmail/messageproperty.cpp
@@ -35,21 +35,21 @@
 #include "messageproperty.h"
 using namespace KMail;
 
-TQMap > MessageProperty::sFolders;
-TQMap > MessageProperty::sHandlers;
-TQMap MessageProperty::sTransfers;
+TQMap > MessageProperty::sFolders;
+TQMap > MessageProperty::sHandlers;
+TQMap MessageProperty::sTransfers;
 TQMap MessageProperty::sSerialCache;
 
-bool MessageProperty::filtering( Q_UINT32 serNum )
+bool MessageProperty::filtering( TQ_UINT32 serNum )
 {
-  return sFolders.contains( serNum );
+  return sFolders.tqcontains( serNum );
 }
 
-void MessageProperty::setFiltering( Q_UINT32 serNum, bool filter )
+void MessageProperty::setFiltering( TQ_UINT32 serNum, bool filter )
 {
   assert(!filtering(serNum) || !filter);
   if (filter && !filtering(serNum))
-    sFolders.replace(serNum, TQGuardedPtr(0) );
+    sFolders.tqreplace(serNum, TQGuardedPtr(0) );
   else if (!filter)
     sFolders.remove(serNum);
 }
@@ -64,13 +64,13 @@ void MessageProperty::setFiltering( const KMMsgBase *msgBase, bool filter )
   setFiltering( msgBase->getMsgSerNum(), filter );
 }
 
-KMFolder* MessageProperty::filterFolder( Q_UINT32 serNum )
+KMFolder* MessageProperty::filterFolder( TQ_UINT32 serNum )
 {
-  TQMap >::const_iterator it = sFolders.find( serNum );
+  TQMap >::const_iterator it = sFolders.find( serNum );
   return it == sFolders.constEnd() ? 0 : (*it).operator->();
 }
 
-void MessageProperty::setFilterFolder( Q_UINT32 serNum, KMFolder* folder )
+void MessageProperty::setFilterFolder( TQ_UINT32 serNum, KMFolder* folder )
 {
   sFolders.insert(serNum, TQGuardedPtr(folder) );
 }
@@ -85,13 +85,13 @@ void MessageProperty::setFilterFolder( const KMMsgBase *msgBase, KMFolder* folde
   setFilterFolder( msgBase->getMsgSerNum(), folder );
 }
 
-ActionScheduler* MessageProperty::filterHandler( Q_UINT32 serNum )
+ActionScheduler* MessageProperty::filterHandler( TQ_UINT32 serNum )
 {
-  TQMap >::const_iterator it = sHandlers.find( serNum );
+  TQMap >::const_iterator it = sHandlers.find( serNum );
   return it == sHandlers.constEnd() ? 0 : (*it).operator->();
 }
 
-void MessageProperty::setFilterHandler( Q_UINT32 serNum, ActionScheduler* handler )
+void MessageProperty::setFilterHandler( TQ_UINT32 serNum, ActionScheduler* handler )
 {
   if (handler)
     sHandlers.insert( serNum, TQGuardedPtr(handler) );
@@ -109,16 +109,16 @@ void MessageProperty::setFilterHandler( const KMMsgBase *msgBase, ActionSchedule
   setFilterHandler( msgBase->getMsgSerNum(), handler );
 }
 
-bool MessageProperty::transferInProgress( Q_UINT32 serNum )
+bool MessageProperty::transferInProgress( TQ_UINT32 serNum )
 {
-  TQMap::const_iterator it = sTransfers.find( serNum );
+  TQMap::const_iterator it = sTransfers.find( serNum );
   return it == sTransfers.constEnd() ? false : *it;
 }
 
-void MessageProperty::setTransferInProgress( Q_UINT32 serNum, bool transfer, bool force )
+void MessageProperty::setTransferInProgress( TQ_UINT32 serNum, bool transfer, bool force )
 {
   int transferInProgress = 0;
-  TQMap::const_iterator it = sTransfers.find( serNum );
+  TQMap::const_iterator it = sTransfers.find( serNum );
   if (it != sTransfers.constEnd())
     transferInProgress = *it;
   if ( force && !transfer )
@@ -143,13 +143,13 @@ void MessageProperty::setTransferInProgress( const KMMsgBase *msgBase, bool tran
   setTransferInProgress( msgBase->getMsgSerNum(), transfer, force );
 }
 
-Q_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
+TQ_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
 {
   TQMap::const_iterator it = sSerialCache.find( msgBase );
   return it == sSerialCache.constEnd() ? 0 : *it;
 }
 
-void MessageProperty::setSerialCache( const KMMsgBase *msgBase, Q_UINT32 serNum )
+void MessageProperty::setSerialCache( const KMMsgBase *msgBase, TQ_UINT32 serNum )
 {
   if (serNum)
     sSerialCache.insert( msgBase, serNum );
@@ -159,7 +159,7 @@ void MessageProperty::setSerialCache( const KMMsgBase *msgBase, Q_UINT32 serNum
 
 void MessageProperty::forget( const KMMsgBase *msgBase )
 {
-  Q_UINT32 serNum = serialCache( msgBase );
+  TQ_UINT32 serNum = serialCache( msgBase );
   if (serNum) {
     Q_ASSERT( !transferInProgress( serNum ) );
     sTransfers.remove( serNum );
diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index 91168e6f3..0dd3f3b2d 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -60,20 +60,20 @@ class MessageProperty : public QObject
 
 public:
   /** If the message is being filtered  */
-  static bool filtering( Q_UINT32 );
-  static void setFiltering( Q_UINT32, bool filtering );
+  static bool filtering( TQ_UINT32 );
+  static void setFiltering( TQ_UINT32, bool filtering );
   static bool filtering( const KMMsgBase* );
   static void setFiltering( const KMMsgBase*, bool filtering );
   /** The folder this message is to be moved into once
       filtering is finished, or null if the message is not
       scheduled to be moved */
-  static KMFolder* filterFolder( Q_UINT32 );
-  static void setFilterFolder( Q_UINT32, KMFolder* folder );
+  static KMFolder* filterFolder( TQ_UINT32 );
+  static void setFilterFolder( TQ_UINT32, KMFolder* folder );
   static KMFolder* filterFolder( const KMMsgBase* );
   static void setFilterFolder( const KMMsgBase*, KMFolder* folder );
   /* Set the filterHandler for a message */
-  static ActionScheduler* filterHandler( Q_UINT32 );
-  static void setFilterHandler( Q_UINT32, ActionScheduler* filterHandler );
+  static ActionScheduler* filterHandler( TQ_UINT32 );
+  static void setFilterHandler( TQ_UINT32, ActionScheduler* filterHandler );
   static ActionScheduler* filterHandler( const KMMsgBase* );
   static void setFilterHandler( const KMMsgBase*, ActionScheduler* filterHandler );
 
@@ -81,16 +81,16 @@ public:
      KMMsgBase based instance representing a message.
      This property becomes invalid when the message is destructed or
      assigned a new value */
-  static void setSerialCache( const KMMsgBase*, Q_UINT32 );
-  static Q_UINT32 serialCache( const KMMsgBase* );
+  static void setSerialCache( const KMMsgBase*, TQ_UINT32 );
+  static TQ_UINT32 serialCache( const KMMsgBase* );
 
   /* Set the transferInProgress for a message
      This property becomes invalid when the message is destructed or
      assigned a new value */
   static void setTransferInProgress( const KMMsgBase*, bool, bool = false );
   static bool transferInProgress( const KMMsgBase* );
-  static void setTransferInProgress( Q_UINT32, bool, bool = false );
-  static bool transferInProgress( Q_UINT32 );
+  static void setTransferInProgress( TQ_UINT32, bool, bool = false );
+  static bool transferInProgress( TQ_UINT32 );
 
   /** Some properties, namely complete, transferInProgress, and
       serialCache must be forgotten when a message class instance is
@@ -99,13 +99,13 @@ public:
 
 private:
   // The folder a message is to be moved into once filtering is finished if any
-  static TQMap > sFolders;
+  static TQMap > sFolders;
 
   // The action scheduler currently processing a message if any
-  static TQMap > sHandlers;
+  static TQMap > sHandlers;
 
   // The transferInProgres state of a message if any.
-  static TQMap sTransfers;
+  static TQMap sTransfers;
 
   // The cached serial number of a message if any.
   static TQMap sSerialCache;
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 99051222e..acd5b3321 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -121,7 +121,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     mContentsHBox = new TQHBoxLayout( 0, 0, 6, "mContentsHBox");
 
     mContentsLabel = new TQLabel( privateLayoutWidget, "mContentsLabel" );
-    mContentsLabel->setText( i18n( "Folder &contains:" ) );
+    mContentsLabel->setText( i18n( "Folder &tqcontains:" ) );
     mContentsHBox->addWidget( mContentsLabel );
 
     mContentsComboBox = new TQComboBox( false, privateLayoutWidget, "mContentsComboBox" );
@@ -176,7 +176,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     }
   }
 
-  resize( TQSize(282, 108).expandedTo(minimumSizeHint()) );
+  resize( TQSize(282, 108).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
   slotFolderNameChanged( mNameLineEdit->text());
 }
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index d8b98f24d..132dc058e 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -272,7 +272,7 @@ namespace KMail {
       ProcessResult processResult;
 
       if ( mReader ) {
-        htmlWriter()->queue( TQString::fromLatin1("").arg( node->nodeId() ) );
+        htmlWriter()->queue( TQString::tqfromLatin1("").arg( node->nodeId() ) );
       }
 
       if ( const Interface::BodyPartFormatter * formatter
@@ -461,7 +461,7 @@ namespace KMail {
         dumpToFile( "dat_01_reader_signedtext_before_canonicalization",
                     cleartext.data(), cleartext.length() );
 
-        // replace simple LFs by CRLSs
+        // tqreplace simple LFs by CRLSs
         // according to RfC 2633, 3.1.1 Canonicalization
         //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
         cleartext = Util::lf2crlf( cleartext );
@@ -829,7 +829,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     if ( mReader )
       emit mReader->noDrag(); // in case pineentry pops up, don't let kmheaders start a drag afterwards
 
-    // Check whether the memento contains a result from last time:
+    // Check whether the memento tqcontains a result from last time:
     const DecryptVerifyBodyPartMemento * m
       = dynamic_cast( data.bodyPartMemento( "decryptverify" ) );
     if ( !m ) {
@@ -936,7 +936,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
 }
 
   //static
-  bool ObjectTreeParser::containsExternalReferences( const TQCString & str )
+  bool ObjectTreeParser::tqcontainsExternalReferences( const TQCString & str )
   {
     TQRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
     int httpPos = str.find( httpRegExp, 0 );
@@ -990,12 +990,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
         // ---Sven's strip  and  from end of attachment end-
         // Show the "external references" warning (with possibility to load
         // external references only if loading external references is disabled
-        // and the HTML code contains obvious external references). For
+        // and the HTML code tqcontains obvious external references). For
         // messages where the external references are obfuscated the user won't
         // have an easy way to load them but that shouldn't be a problem
-        // because only spam contains obfuscated external references.
+        // because only spam tqcontains obfuscated external references.
         if ( !mReader->htmlLoadExternal() &&
-             containsExternalReferences( cstr ) ) {
+             tqcontainsExternalReferences( cstr ) ) {
           htmlWriter()->queue( "
      \n" );
           htmlWriter()->queue( i18n("Note: This HTML message may contain external "
                                     "references to images etc. For security/privacy reasons "
@@ -1357,7 +1357,7 @@ namespace KMail {
     const Kleo::CryptoBackend::Protocol * useThisCryptProto = 0;
 
     /*
-      ATTENTION: This code is to be replaced by the new 'auto-detect' feature. --------------------------------------
+      ATTENTION: This code is to be tqreplaced by the new 'auto-detect' feature. --------------------------------------
     */
     partNode * data = child->findType( DwMime::kTypeApplication,
                                        DwMime::kSubtypeOctetStream, false, true );
@@ -1559,7 +1559,7 @@ namespace KMail {
         writeDeferredDecryptionBlock();
       } else {
         /*
-          ATTENTION: This code is to be replaced by the planned 'auto-detect' feature.
+          ATTENTION: This code is to be tqreplaced by the planned 'auto-detect' feature.
         */
         PartMetaData messagePart;
         setCryptoProtocol( Kleo::CryptoBackendFactory::instance()->openpgp() );
@@ -2795,7 +2795,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a
   bool goodSignature = false;
   Kpgp::Module* pgp = Kpgp::Module::getKpgp();
   assert(pgp != 0);
-  bool isPgpMessage = false; // true if the message contains at least one
+  bool isPgpMessage = false; // true if the message tqcontains at least one
                              // PGP MESSAGE or one PGP SIGNED MESSAGE block
   TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
   TQString headerStr = TQString("
      ").arg(dir);
@@ -3083,7 +3083,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
     {
       // don't write empty 
       blocks (they have zero height)
       // ignore ^M DOS linebreaks
-      if( !line.replace('\015', "").isEmpty() )
+      if( !line.tqreplace('\015', "").isEmpty() )
       {
          htmlStr +=TQString( "
      " ).arg( line.isRightToLeft() ? "rtl":"ltr" );
          htmlStr += LinkLocator::convertToHtml( line, convertFlags );
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index ad980edaf..5cfe1d0e7 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -151,7 +151,7 @@ namespace KMail {
       mIncludeSignatures = include;
     }
 
-    // Controls whether Toltec invitations are displayed in their raw form or as a replacement text,
+    // Controls whether Toltec invitations are displayed in their raw form or as a tqreplacement text,
     // which is used in processToltecMail().
     void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
     bool showRawToltecMail() const { return mShowRawToltecMail; }
@@ -171,7 +171,7 @@ namespace KMail {
     /** Parse beginning at a given node and recursively parsing
         the children of that node and it's next sibling. */
     //  Function is called internally by "parseMsg(KMMessage* msg)"
-    //  and it will be replaced once KMime is alive.
+    //  and it will be tqreplaced once KMime is alive.
     void parseObjectTree( partNode * node );
 
   private:
@@ -193,7 +193,7 @@ namespace KMail {
      *                            Setting this to false is useful for encapsulated messages, as we
      *                            do not want the text in those to appear in the editor
      */
-    //  Function will be replaced once KMime is alive.
+    //  Function will be tqreplaced once KMime is alive.
     void insertAndParseNewChildNode( partNode & node,
                                      const char * content,
                                      const char * cntDesc,
@@ -252,11 +252,11 @@ namespace KMail {
      */
     bool processToltecMail( partNode * node );
 
-    /** Checks whether @p str contains external references. To be precise,
-        we only check whether @p str contains 'xxx="http[s]:' where xxx is
+    /** Checks whether @p str tqcontains external references. To be precise,
+        we only check whether @p str tqcontains 'xxx="http[s]:' where xxx is
         not href. Obfuscated external references are ignored on purpose.
     */
-    static bool containsExternalReferences( const TQCString & str );
+    static bool tqcontainsExternalReferences( const TQCString & str );
 
   public:// (during refactoring)
 
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index a645b3989..947c76ae3 100644
--- a/kmail/objecttreeparser_p.cpp
+++ b/kmail/objecttreeparser_p.cpp
@@ -190,7 +190,7 @@ bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const
 TQStringList VerifyDetachedBodyPartMemento::keyListPattern() const
 {
   assert( canStartKeyListJob() );
-  return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyDetachedBodyPartMemento::saveResult( const VerificationResult & vr )
@@ -297,7 +297,7 @@ bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const
 TQStringList VerifyOpaqueBodyPartMemento::keyListPattern() const
 {
   assert( canStartKeyListJob() );
-  return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyOpaqueBodyPartMemento::saveResult( const VerificationResult & vr,
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index dbd5442ca..b75c54e42 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -50,7 +50,7 @@
 
 
   ===========================================================================
-  N O T E :   The partNode structure will most likely be replaced by KMime.
+  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
   It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
   ===========================================================================
 */
@@ -269,7 +269,7 @@ TQString partNode::contentTypeParameter( const char * name ) const {
     DwString this_attr = param->Attribute();
     this_attr.ConvertToLowerCase(); // what a braindead design!
     if ( this_attr == attr )
-      return TQString::fromLatin1( param->Value().data(), param->Value().size() );
+      return TQString::tqfromLatin1( param->Value().data(), param->Value().size() );
     // warning: misses rfc2231 handling!
   }
   return TQString::null;
@@ -516,7 +516,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
         cntSize = size;
     }
     // remove linebreak+whitespace from folded Content-Description
-    cntDesc.replace( TQRegExp("\\n\\s*"), " " );
+    cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " );
 
     if( parentItem )
       mMimePartTreeItem = new KMMimePartTreeItem( parentItem,
diff --git a/kmail/partNode.h b/kmail/partNode.h
index ddc76aa62..6459a0a68 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -60,7 +60,7 @@ class KMReaderWin;
 
 
  ===========================================================================
-  N O T E :   The partNode structure will most likely be replaced by KMime.
+  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
               It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
  ===========================================================================
 */
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 94dbf8a5e..7bb830bc0 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -27,7 +27,7 @@
 #include "popaccount.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 #include "kmfoldermgr.h"
 #include "kmfiltermgr.h"
@@ -514,13 +514,13 @@ void PopAccount::slotJobFinished() {
                                                      mUidForIdMap[hids.key()],
                                                      Later));//TODO
             //set Action if already known
-            if( mHeaderDeleteUids.contains( headersOnServer.current()->uid() ) ) {
+            if( mHeaderDeleteUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Delete);
             }
-            else if( mHeaderDownUids.contains( headersOnServer.current()->uid() ) ) {
+            else if( mHeaderDownUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Down);
             }
-            else if( mHeaderLaterUids.contains( headersOnServer.current()->uid() ) ) {
+            else if( mHeaderLaterUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Later);
             }
           }
@@ -625,7 +625,7 @@ void PopAccount::slotJobFinished() {
           headersOnServer.current()->action() == Later) {
         //remove entries from the lists when the mails should not be downloaded
         //(deleted or downloaded later)
-        if ( mMsgsPendingDownload.contains( headersOnServer.current()->id() ) ) {
+        if ( mMsgsPendingDownload.tqcontains( headersOnServer.current()->id() ) ) {
           mMsgsPendingDownload.remove( headersOnServer.current()->id() );
         }
         if (headersOnServer.current()->action() == Delete) {
@@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() {
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setStatus(
+        mMailCheckProgressItem->seStatus(
           i18n( "Fetched 1 message from %1. Deleting messages from server...",
                 "Fetched %n messages from %1. Deleting messages from server...",
                 numMsgs )
@@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() {
     } else {
       stage = Quit;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setStatus(
+        mMailCheckProgressItem->seStatus(
           i18n( "Fetched 1 message from %1. Terminating transmission...",
                 "Fetched %n messages from %1. Terminating transmission...",
                 numMsgs )
@@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() {
     }
     idsOfMsgsToDelete.clear();
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setStatus(
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
@@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
     if( mMailCheckProgressItem ) { // do this only once...
       bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
       // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
       // a race condition
@@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
           .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
           .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
       }
-      mMailCheckProgressItem->setStatus( msg );
+      mMailCheckProgressItem->seStatus( msg );
       mMailCheckProgressItem->setProgress(
         (numBytesToRead <= 100) ? 50  // We never know what the server tells us
         // This way of dividing is required for > 21MB of mail
@@ -990,7 +990,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
     *size = mMsgsPendingDownload[id];
     mSizeOfNextSeenMsgsDict.insert( uid, size );
     if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
-      if ( mMsgsPendingDownload.contains( id ) ) {
+      if ( mMsgsPendingDownload.tqcontains( id ) ) {
         mMsgsPendingDownload.remove( id );
       }
       else
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index a27e70f8c..31bd1ef58 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -109,7 +109,7 @@ class QuotaInfo {
 typedef TQValueVector QuotaInfoList;
 
 /**
- * This namespace contains functions that return jobs for quota operations.
+ * This namespace tqcontains functions that return jobs for quota operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index fe7b85ca9..9f33a5016 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -288,10 +288,10 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev )
 
 int RecipientLine::setComboWidth( int w )
 {
-  w = QMAX( w, mCombo->sizeHint().width() );
+  w = QMAX( w, mCombo->tqsizeHint().width() );
   mCombo->setFixedWidth( w );
   mCombo->updateGeometry();
-  parentWidget()->updateGeometry();
+  tqparentWidget()->updateGeometry();
   return w;
 }
 
@@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent )
 
   addLine();
   setResizePolicy( TQScrollView::Manual );
-  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
   viewport()->setPaletteBackgroundColor( paletteBackgroundColor() );
 }
@@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine()
 
   mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth );
 
-  mLineHeight = line->minimumSizeHint().height();
+  mLineHeight = line->tqminimumSizeHint().height();
 
   line->resize( viewport()->width(), mLineHeight );
 
@@ -536,8 +536,8 @@ void RecipientsView::resizeView()
 //    setFixedHeight( mLineHeight * mLines.count() );
   }
 
-  parentWidget()->layout()->activate();
-  emit sizeHintChanged();
+  tqparentWidget()->tqlayout()->activate();
+  emit tqsizeHintChanged();
   TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) );
 }
 
@@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev )
   ensureVisible( 0, mLines.count() * mLineHeight );
 }
 
-TQSize RecipientsView::sizeHint() const
+TQSize RecipientsView::tqsizeHint() const
 {
   return TQSize( 200, mLineHeight * mLines.count() );
 }
 
-TQSize RecipientsView::minimumSizeHint() const
+TQSize RecipientsView::tqminimumSizeHint() const
 {
   int height;
   uint numLines = 5;
@@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
 
   text.append( "" );
 
-  TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
+  TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
 
-  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry );
+  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry );
 }
 
 
@@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
   topLayout->addStretch( 1 );
 
   mTotalLabel = new TQLabel( this );
-  mTotalLabel->setAlignment( AlignCenter );
+  mTotalLabel->tqsetAlignment( AlignCenter );
   topLayout->addWidget( mTotalLabel );
   mTotalLabel->hide();
 
@@ -862,8 +862,8 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent )
   connect( mRecipientsView, TQT_SIGNAL( focusRight() ),
     mSideWidget, TQT_SLOT( setFocus() ) );
 
-  connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()),
-           TQT_SIGNAL(sizeHintChanged()) );
+  connect( mRecipientsView, TQT_SIGNAL(tqsizeHintChanged()),
+           TQT_SIGNAL(tqsizeHintChanged()) );
 }
 
 RecipientsEditor::~RecipientsEditor()
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index 6f5ffb8eb..e6b7718b0 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -173,8 +173,8 @@ class RecipientsView : public QScrollView
   public:
     RecipientsView( TQWidget *parent );
 
-    TQSize minimumSizeHint() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSizeHint() const;
+    TQSize tqsizeHint() const;
 
     RecipientLine *activeLine();
 
@@ -221,7 +221,7 @@ class RecipientsView : public QScrollView
     void focusDown();
     void focusRight();
     void completionModeChanged( KGlobalSettings::Completion );
-    void sizeHintChanged();
+    void tqsizeHintChanged();
 
   protected:
     void viewportResizeEvent( TQResizeEvent * );
@@ -352,7 +352,7 @@ class RecipientsEditor : public QWidget
     void focusUp();
     void focusDown();
     void completionModeChanged( KGlobalSettings::Completion );
-    void sizeHintChanged();
+    void tqsizeHintChanged();
 
   protected slots:
     void slotPickedRecipient( const Recipient & );
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 44df528c9..adbf4c4a0 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -54,7 +54,7 @@ Composer::Composer( TQWidget *parent )
   mRecipients = new RecipientsEditor( this );
   topLayout->addMultiCellWidget( mRecipients, 1, 1, 0, 1 );
 
-  kdDebug() << "SIZEHINT: " << mRecipients->sizeHint() << endl;
+  kdDebug() << "SIZEHINT: " << mRecipients->tqsizeHint() << endl;
 
 //  mRecipients->setFixedHeight( 10 );
   
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index c1d2b3aed..a45a76830 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -241,7 +241,7 @@ void RecipientsListToolTip::maybeTip( const TQPoint & pos )
   RecipientViewItem *i = static_cast( item );
 
   if( item ) {
-    r = mListView->itemRect( item );
+    r = mListView->tqitemRect( item );
     TQString tipText( i->recipientItem()->tooltip() );
     if ( !tipText.isEmpty() ) {
       tip( r, tipText );
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 74df3b13b..2d25a87b7 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -152,7 +152,7 @@ class RecipientsCollection
     TQString id() const;
 
   private:
-    // flag to indicate if this collection contains just references
+    // flag to indicate if this collection tqcontains just references
     // or should manage memory (de)allocation as well.
     bool mIsReferenceContainer;
     TQString mId;
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index bf8fe51ce..275e623b1 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -68,7 +68,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
 
   mBtnTo = new TQPushButton( TQString::null, hbox, "toBtn" );
   mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 );
+  mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 );
   TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") );
   TQWhatsThis::add( mBtnTo, i18n("This button opens a separate dialog "
                                  "where you can select recipients out "
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 81748c220..86e8df2d6 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -82,7 +82,7 @@ namespace KMail {
     if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
       mRegExpEditButton = new TQPushButton( i18n("Edit..."), this,
                                            "mRegExpEditButton" );
-      mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum,
+      mRegExpEditButton->tqsetSizePolicy( TQSizePolicy::Minimum,
                                         TQSizePolicy::Fixed );
       hlay->addWidget( mRegExpEditButton );
 
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 09966cf9d..0c220cf9d 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -138,7 +138,7 @@ void RenameJob::execute()
     ImapAccountBase* account = static_cast(mStorage)->account();
     // first rename it on the server
     mNewImapPath = mOldImapPath;
-    mNewImapPath = mNewImapPath.replace( mOldName, mNewName );
+    mNewImapPath = mNewImapPath.tqreplace( mOldName, mNewName );
     KURL src( account->getUrl() );
     src.setPath( mOldImapPath );
     KURL dst( account->getUrl() );
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 016b8a577..75940e4ca 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -159,7 +159,7 @@ namespace {
 
   private:
     KMSearchRule::Function currentFunction( const TQWidgetStack *functionStack ) const;
-    int currentStatusValue( const TQWidgetStack *valueStack ) const;
+    int currenStatusValue( const TQWidgetStack *valueStack ) const;
   };
 
   class NumericRuleWidgetHandler : public KMail::RuleWidgetHandler {
@@ -403,7 +403,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } TextFunctions[] = {
-    { KMSearchRule::FuncContains,           I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,           I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,        I18N_NOOP( "does not contain" )   },
     { KMSearchRule::FuncEquals,             I18N_NOOP( "equals" )            },
     { KMSearchRule::FuncNotEqual,           I18N_NOOP( "does not equal" )     },
@@ -499,7 +499,7 @@ namespace {
   TQString TextRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack,
                                                KMSearchRule::Function func ) const
   {
-    // here we gotta check the combobox which contains the categories
+    // here we gotta check the combobox which tqcontains the categories
     if ( func  == KMSearchRule::FuncIsInCategory ||
          func  == KMSearchRule::FuncIsNotInCategory ) {
       const TQComboBox *combo=
@@ -738,7 +738,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } MessageFunctions[] = {
-    { KMSearchRule::FuncContains,        I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,        I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,     I18N_NOOP( "does not contain" )  },
     { KMSearchRule::FuncRegExp,          I18N_NOOP( "matches regular expr." ) },
     { KMSearchRule::FuncNotRegExp,       I18N_NOOP( "does not match reg. expr." ) },
@@ -1095,7 +1095,7 @@ namespace {
 
   //---------------------------------------------------------------------------
 
-  int StatusRuleWidgetHandler::currentStatusValue( const TQWidgetStack *valueStack ) const
+  int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
   {
     const TQComboBox *statusCombo =
       dynamic_cast( QObject_child_const( valueStack,
@@ -1107,7 +1107,7 @@ namespace {
       return statusCombo->currentItem();
     }
     else
-      kdDebug(5006) << "StatusRuleWidgetHandler::currentStatusValue: "
+      kdDebug(5006) << "StatusRuleWidgetHandler::currenStatusValue: "
                        "statusRuleValueCombo not found." << endl;
     return -1;
   }
@@ -1121,9 +1121,9 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
-      return TQString::fromLatin1( KMail::StatusValues[ status ].text );
+      return TQString::tqfromLatin1( KMail::StatusValues[ status ].text );
     else
       return TQString::null;
   }
@@ -1137,7 +1137,7 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
       return i18n( KMail::StatusValues[ status ].text );
     else
@@ -1215,7 +1215,7 @@ namespace {
     const TQString value = rule->contents();
     int valueIndex = 0;
     for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex )
-      if ( value == TQString::fromLatin1(
+      if ( value == TQString::tqfromLatin1(
                KMail::StatusValues[ valueIndex ].text ) )
         break;
     TQComboBox *statusCombo =
diff --git a/kmail/scalix.cpp b/kmail/scalix.cpp
index 4910119d0..5db8a168d 100644
--- a/kmail/scalix.cpp
+++ b/kmail/scalix.cpp
@@ -60,7 +60,7 @@ KMFolder* Utils::findStandardResourceFolder( KMFolderDir* folderParentDir,
   typeMap.insert( KMail::ContentsTypeNote, "IPF.StickyNote" );
   typeMap.insert( KMail::ContentsTypeTask, "IPF.Task" );
 
-  if ( !typeMap.contains( contentsType ) )
+  if ( !typeMap.tqcontains( contentsType ) )
     return 0;
 
   for ( uint i = 0; i < attributes.count(); ++i ) {
diff --git a/kmail/scalix.h b/kmail/scalix.h
index ac07f504a..66f78e79b 100644
--- a/kmail/scalix.h
+++ b/kmail/scalix.h
@@ -19,9 +19,9 @@
  */
 
 /**
- * This file contains helper classes for Scalix groupware support.
+ * This file tqcontains helper classes for Scalix groupware support.
  * As the storage system of Scalix is quite similiar to Kolab we reuse some of
- * the exsiting code and replace other code by our own.
+ * the exsiting code and tqreplace other code by our own.
  *
  * Differences between Kolab and Scalix:
  *
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 89dde8214..50bf287d8 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -51,7 +51,7 @@ using KPIM::ProgressManager;
 namespace KMail {
 
 SearchJob::SearchJob( KMFolderImap* folder, ImapAccountBase* account,
-                      const KMSearchPattern* pattern, Q_UINT32 serNum )
+                      const KMSearchPattern* pattern, TQ_UINT32 serNum )
  : FolderJob( 0, tOther, (folder ? folder->folder() : 0) ),
    mFolder( folder ), mAccount( account ), mSearchPattern( pattern ),
    mSerNum( serNum ), mRemainingMsgs( 0 ), mProgress( 0 ),
@@ -186,7 +186,7 @@ void SearchJob::slotSearchData( KIO::Job* job, const TQString& data )
   if ( mLocalSearchPattern->isEmpty() && data.isEmpty() )
   {
     // no local search and the server found nothing
-    TQValueList serNums;
+    TQValueList serNums;
     emit searchDone( serNums, mSearchPattern, true );
   } else
   {
@@ -226,7 +226,7 @@ void SearchJob::slotSearchFolder()
 
   if ( mLocalSearchPattern->isEmpty() ) {
     // pure imap search - now get the serial number for the UIDs
-    TQValueList serNums;
+    TQValueList serNums;
     for ( TQStringList::Iterator it = mImapSearchHits.begin(); 
         it != mImapSearchHits.end(); ++it ) 
     {
@@ -257,7 +257,7 @@ void SearchJob::slotSearchFolder()
             i18n("Continue Search"), i18n("&Search"), 
             "continuedownloadingforsearch" ) != KMessageBox::Continue ) 
       {
-        TQValueList serNums;
+        TQValueList serNums;
         emit searchDone( serNums, mSearchPattern, true );
         return;
       }
@@ -306,7 +306,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       if ( mLocalSearchPattern->matches( msg ) &&
           ( mImapSearchHits.isEmpty() ||
            mImapSearchHits.find( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
-        Q_UINT32 serNum = msg->getMsgSerNum();
+        TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
       }
@@ -314,7 +314,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       // imap or local search have to match
       if ( mLocalSearchPattern->matches( msg ) ||
           mImapSearchHits.find( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
-        Q_UINT32 serNum = msg->getMsgSerNum();
+        TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
       }
@@ -352,7 +352,7 @@ void SearchJob::slotSearchResult( KIO::Job *job )
     if ( mSerNum == 0 )
     {
       // folder
-      TQValueList serNums;
+      TQValueList serNums;
       emit searchDone( serNums, mSearchPattern, true );
     } else {
       // message
@@ -434,7 +434,7 @@ void SearchJob::slotAbortSearch( KPIM::ProgressItem* item )
   if ( item )
     item->setComplete();
   mAccount->killAllJobs();
-  TQValueList serNums;
+  TQValueList serNums;
   emit searchDone( serNums, mSearchPattern, true );
 }
 
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index d48d96b6d..0fe6bdf88 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -62,7 +62,7 @@ public:
    * @param serNum if you specify the serNum only this is checked
    */
   SearchJob( KMFolderImap* folder, ImapAccountBase* account,
-             const KMSearchPattern* pattern, Q_UINT32 serNum = 0 );
+             const KMSearchPattern* pattern, TQ_UINT32 serNum = 0 );
 
   virtual ~SearchJob();
 
@@ -107,21 +107,21 @@ protected slots:
 
 signals:
   // emitted when a list of matching serial numbers was found
-  void searchDone( TQValueList, const KMSearchPattern*, bool complete );
+  void searchDone( TQValueList, const KMSearchPattern*, bool complete );
 
   // emitted when a single message (identified by the serial number) was checked
-  void searchDone( Q_UINT32, const KMSearchPattern*, bool matches );
+  void searchDone( TQ_UINT32, const KMSearchPattern*, bool matches );
 
 protected:
   KMFolderImap* mFolder;
   ImapAccountBase* mAccount;
   const KMSearchPattern* mSearchPattern;
   KMSearchPattern* mLocalSearchPattern;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
     // saves the results of the imap search
   TQStringList mImapSearchHits;
   // collects the serial numbers from imap and local search
-  TQValueList mSearchSerNums;
+  TQValueList mSearchSerNums;
   // the remaining messages that have to be downloaded for local search
   uint mRemainingMsgs;
   // progress item for local searches
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index b32dd96e0..2f4b3565d 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder)
 //-----------------------------------------------------------------------------
 void SearchWindow::slotSearch()
 {
-    mLastFocus = focusWidget();
+    mLastFocus = tqfocusWidget();
     mBtnSearch->setFocus();     // set focus so we don't miss key event
 
     mStopped = false;
@@ -509,12 +509,12 @@ void SearchWindow::slotSearch()
     mFolder->stopSearch();
     disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
             this, TQT_SLOT(slotAddMsg(int)));
-    disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(slotRemoveMsg(KMFolder*, Q_UINT32)));
+    disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     connect(mFolder, TQT_SIGNAL(msgAdded(int)),
             this, TQT_SLOT(slotAddMsg(int)));
-    connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(slotRemoveMsg(KMFolder*, Q_UINT32)));
+    connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     mSearchFolderEdt->setEnabled(false);
     KMSearch *search = new KMSearch();
     connect(search, TQT_SIGNAL(finished(bool)),
@@ -563,7 +563,7 @@ void SearchWindow::slotAddMsg(int idx)
     KMMessage *msg = mFolder->getMsg(idx);
     TQString from, fName;
     KMFolder *pFolder = msg->parent();
-    if (!mFolders.contains(pFolder)) {
+    if (!mFolders.tqcontains(pFolder)) {
         mFolders.append(pFolder);
         pFolder->open("searchwindow");
     }
@@ -584,7 +584,7 @@ void SearchWindow::slotAddMsg(int idx)
         mFolder->unGetMsg(idx);
 }
 
-void SearchWindow::slotRemoveMsg(KMFolder *, Q_UINT32 serNum)
+void SearchWindow::slotRemoveMsg(KMFolder *, TQ_UINT32 serNum)
 {
     if (!mFolder)
         return;
@@ -948,13 +948,13 @@ void SearchWindow::slotPrintMsg()
 
 void SearchWindow::slotCopyMsgs()
 {
-  TQValueList list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
+  TQValueList list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
   mKMMainWidget->headers()->setCopiedMessages( list, false );
 }
 
 void SearchWindow::slotCutMsgs()
 {
-  TQValueList list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
+  TQValueList list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
   mKMMainWidget->headers()->setCopiedMessages( list, true );
 }
 
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 836553ae8..c3c8cf854 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -139,7 +139,7 @@ protected slots:
   /** GUI cleanup after search */
   virtual void searchDone();
   virtual void slotAddMsg(int idx);
-  virtual void slotRemoveMsg(KMFolder *, Q_UINT32 serNum);
+  virtual void slotRemoveMsg(KMFolder *, TQ_UINT32 serNum);
   void enableGUI();
 
   void setEnabledSearchButton(bool);
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 0ce073d93..fa32dea6e 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -149,7 +149,7 @@ namespace KMail {
     // Convert mScript into UTF-8:
     data = mScript.utf8();
 
-    // "data" contains a trailing NUL, remove:
+    // "data" tqcontains a trailing NUL, remove:
     if ( data.size() > 0 && data[(int)data.size() - 1] == '\0' )
       data.resize( data.size() - 1 );
 
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 606d460de..c566da007 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -52,7 +52,7 @@ namespace KMail {
     TQVBoxLayout * vlay;
     TQVBoxLayout * page_vlay;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
 
     // "enable signatue" checkbox:
     mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this );
@@ -119,7 +119,7 @@ namespace KMail {
     hlay = new TQHBoxLayout( page_vlay ); // inherits spacing
     mFileRequester = new KURLRequester( page );
     TQWhatsThis::add(mFileRequester,
-        i18n("Use this requester to specify a text file that contains your "
+        i18n("Use this requester to specify a text file that tqcontains your "
              "signature. It will be read every time you create a new mail or "
              "append a new signature."));
     hlay->addWidget( new TQLabel( mFileRequester,
@@ -260,7 +260,7 @@ namespace KMail {
     // slotEnableEditButton should prevent this assert from being hit:
     assert( !url.isEmpty() );
 
-    (void)KRun::runURL( KURL( url ), TQString::fromLatin1("text/plain") );
+    (void)KRun::runURL( KURL( url ), TQString::tqfromLatin1("text/plain") );
   }
 
 } // namespace KMail
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 4be67e6e4..4d42f4d43 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -166,7 +166,7 @@ TQStringList SimpleStringListEditor::stringList() const {
   return result;
 }
 
-bool SimpleStringListEditor::containsString( const TQString & str ) {
+bool SimpleStringListEditor::tqcontainsString( const TQString & str ) {
   for ( TQListBoxItem * item = mListBox->firstItem() ;
 	item ; item = item->next() ) {
     if ( item->text() == str )
@@ -193,7 +193,7 @@ void SimpleStringListEditor::setButtonText( ButtonCode button,
   case Up:
   case Down:
     kdDebug(5006) << "SimpleStringListEditor: Cannot change text of "
-      "Up and Down buttons: they don't contains text!" << endl;
+      "Up and Down buttons: they don't tqcontains text!" << endl;
     return;
   default:
     if ( button & All )
@@ -216,7 +216,7 @@ void SimpleStringListEditor::slotAdd() {
 					    &ok, this );
   // let the user verify the string before adding
   emit aboutToAdd( newEntry );
-  if ( ok && !newEntry.isEmpty() && !containsString( newEntry )) {
+  if ( ok && !newEntry.isEmpty() && !tqcontainsString( newEntry )) {
       mListBox->insertItem( newEntry );
       emit changed();
   }
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index 115a9a05e..afa8593c3 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -91,7 +91,7 @@ protected slots:
   void slotSelectionChanged();
 
 protected:
-  bool containsString( const TQString & str );
+  bool tqcontainsString( const TQString & str );
   TQListBox      *mListBox;
   TQPushButton   *mAddButton;
   TQPushButton   *mRemoveButton;
diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui
index c1f2ca40e..d82d06a30 100644
--- a/kmail/smimeconfiguration.ui
+++ b/kmail/smimeconfiguration.ui
@@ -4,7 +4,7 @@
     
         SMimeConfiguration
     
-    
+    
         
             0
             0
@@ -54,7 +54,7 @@
                 
                 
                     
-                        layout4
+                        tqlayout4
                     
                     
                         
@@ -80,7 +80,7 @@
                 
                 
                     
-                        layout5
+                        tqlayout5
                     
                     
                         
@@ -109,7 +109,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     150
                                     20
@@ -202,7 +202,7 @@
                         
                         
                             
-                                layout5
+                                tqlayout5
                             
                             
                                 
@@ -253,7 +253,7 @@
                                 Ignore HTTP CRL distribution point of certificates
                             
                             
-                                When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.
+                                When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.
                             
                         
                     
@@ -307,12 +307,12 @@
                                 Ignore LDAP CRL distribution point of certificates
                             
                             
-                                When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.
+                                When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.
                             
                         
                         
                             
-                                layout5
+                                tqlayout5
                             
                             
                                 
@@ -351,7 +351,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
             
                 Expanding
             
-            
+            
                 
                     20
                     73
@@ -409,5 +409,5 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
         setDisabled(bool)
     
 
-
+
 
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 93478d13f..5e26319ff 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
     connect( snippetName, TQT_SIGNAL(returnPressed()),
              this, TQT_SLOT(slotReturnPressed()) );
 
-    layout3->addWidget( textLabel3, 7, 0 );
-    layout3->addWidget( keyButton, 7, 1 );
+    tqlayout3->addWidget( textLabel3, 7, 0 );
+    tqlayout3->addWidget( keyButton, 7, 1 );
 
     // tab order
     setTabOrder( snippetText, keyButton );
diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui
index a5a28a72a..0df0e226f 100644
--- a/kmail/snippetdlgbase.ui
+++ b/kmail/snippetdlgbase.ui
@@ -4,7 +4,7 @@
     
         SnippetDlgBase
     
-    
+    
         
             0
             0
@@ -21,7 +21,7 @@
         
         
             
-                layout5
+                tqlayout5
             
             
                 
@@ -37,7 +37,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             40
                             20
@@ -64,7 +64,7 @@
         
         
             
-                layout3
+                tqlayout3
             
             
                 
@@ -85,7 +85,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             80
@@ -110,7 +110,7 @@
                     
                         &Snippet:
                     
-                    
+                    
                         AlignTop
                     
                     
@@ -169,7 +169,7 @@
     btnAdd
     btnCancel
 
-
+
 
     kpushbutton.h
     kpushbutton.h
diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui
index 9c5461fe0..62ca4a483 100644
--- a/kmail/snippetsettingsbase.ui
+++ b/kmail/snippetsettingsbase.ui
@@ -4,7 +4,7 @@
     
         SnippetSettingsBase
     
-    
+    
         
             0
             0
@@ -56,7 +56,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     70
@@ -123,7 +123,7 @@
                 
                 
                     
-                        layout1
+                        tqlayout1
                     
                     
                         
@@ -144,7 +144,7 @@
                             
                                 leDelimiter
                             
-                            
+                            
                                 
                                     40
                                     32767
@@ -164,7 +164,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     40
                                     20
@@ -177,7 +177,7 @@
         
     
 
-
+
 
     klineedit.h
 
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 800a98e55..ef0e07930 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -146,7 +146,7 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name,
 {
     SnippetItem * item = new SnippetItem(parent, name, text);
     const TQString actionName = i18n("Snippet %1").arg(name);
-    const TQString normalizedName = TQString(actionName).replace(" ", "_");
+    const TQString normalizedName = TQString(actionName).tqreplace(" ", "_");
     if ( !mActionCollection->action(normalizedName.utf8() ) ) {
         KAction * action = new KAction( actionName, shortcut, item,
                                         TQT_SLOT( slotExecute() ), mActionCollection,
@@ -521,7 +521,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
 	if (!item)
 	  return;
 
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if (r.isValid() &&
         _SnippetConfig.useToolTips() )
@@ -562,7 +562,7 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int
 //  fn SnippetWidget::parseText(TQString text, TQString del)
 /*!
     This function is used to parse the given TQString for variables. If found the user will be prompted
-    for a replacement value. It returns the string text with all replacements made
+    for a tqreplacement value. It returns the string text with all tqreplacements made
  */
 TQString SnippetWidget::parseText(TQString text, TQString del)
 {
@@ -597,11 +597,11 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
           strNew = ""; //for inputmode "multi" just reset new valaue
         }
       } else {
-        strNew = del; //if double-delimiter -> replace by single character
+        strNew = del; //if double-delimiter -> tqreplace by single character
       }
 
       if (iInMeth == 0) {  //if input-method "single" is selected
-        str.replace(strName, strNew);
+        str.tqreplace(strName, strNew);
       }
 
       mapVar[strName] = strNew;
@@ -615,8 +615,8 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
     oh = rMulti.top();
     if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) {  //generate and show the dialog
       TQMap::Iterator it;
-      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the replacement
-        str.replace(it.key(), it.data());
+      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the tqreplacement
+        str.tqreplace(it.key(), it.data());
       }
     } else {
       return "";
@@ -637,7 +637,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
 
 //  fn SnippetWidget::showMultiVarDialog()
 /*!
-    This function constructs a dialog which contains a label and a linedit for every
+    This function constructs a dialog which tqcontains a label and a linedit for every
     variable that is stored in the given map except the double-delimiter entry
     It return true if everything was ok and false if the user hit cancel
  */
@@ -660,35 +660,35 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
-  labTop->setText(i18n("Enter the replacement values for these variables:"));
-  layoutTop->addWidget(labTop, 0, 0);
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  labTop->setText(i18n("Enter the tqreplacement values for these variables:"));
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   int i = 0;                                           //walk through the variable map and add
-  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main layout
+  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main tqlayout
     if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
       continue;
 
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
+    tqlayoutVar->addWidget( cb, i ,0, Qt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    layoutVar->addWidget( te, i, 1, Qt::AlignTop );
+    tqlayoutVar->addWidget( te, i, 1, Qt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapaddMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
   //connect the buttons to the TQDialog default slots
@@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMap 1) {
-    TQRect r = dlg.geometry();
+    TQRect r = dlg.tqgeometry();
     r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
     r.setWidth(iWidth);
     dlg.setGeometry(r);
@@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapgeometry().height();
-    iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
-    iWidth = dlg.geometry().width();
+    iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
+    iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
+    iWidth = dlg.tqgeometry().width();
   }
 
   //do some cleanup
@@ -764,10 +764,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMap * map, TQMap * mapSave)
 /*!
-    This function constructs a dialog which contains a label and a linedit for the given variable
+    This function constructs a dialog which tqcontains a label and a linedit for the given variable
     It return either the entered value or an empty string if the user hit cancel
  */
 TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap * mapSave, TQRect & dlgSize)
@@ -788,19 +788,19 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapaddWidget(labTop, 0, 0);
-  labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  labTop->setText(i18n("Enter the tqreplacement values for %1:").arg( var ));
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
@@ -808,8 +808,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapsetText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  layoutVar->addWidget( te, 0, 1, Qt::AlignTop);
-  layoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( te, 0, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -820,16 +820,16 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapaddMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   te->setFocus();
   // --END-- building a dynamic dialog
 
@@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMaptext();    //copy the entered values back the the given map
 
-    dlgSize = dlg.geometry();
+    dlgSize = dlg.tqgeometry();
   }
 
   //do some cleanup
@@ -858,10 +858,10 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap(item2->parent());
 
   TQCString dropped;
-  TQByteArray data = e->encodedData("text/plain");
+  TQByteArray data = e->tqencodedData("text/plain");
   if ( e->provides("text/plain") && data.size()>0 ) {
     //get the data from the event...
     TQString encData(data.data());
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 79dd258dd..cd7d09d39 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -39,7 +39,7 @@ class KActionCollection;
 /**
 This is the widget which gets added to the right TreeToolView.
 It inherits KListView and TQToolTip which is needed for showing the
-tooltips which contains the text of the snippet
+tooltips which tqcontains the text of the snippet
 @author Robert Gruber
 */
 class SnippetWidget : public KListView, public QToolTip
diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp
index 907c5e1fb..e3a2243c8 100644
--- a/kmail/stringutil.cpp
+++ b/kmail/stringutil.cpp
@@ -29,7 +29,7 @@ namespace StringUtil
 TQString encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 58d00b24a..bb9c5c6c9 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -414,7 +414,7 @@ void SubscriptionDialog::processItems()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to repaint
+    // give the dialog a chance to tqrepaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 79df85094..26355ac5b 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -693,7 +693,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "DATEEN" ) ) {
         kdDebug() << "Command: DATEEN" << endl;
         i += strlen( "DATEEN" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         KLocale locale( "C" );
         TQString str = locale.formatDate( date.date(), false );
         body.append( str );
@@ -701,28 +701,28 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "DATESHORT" ) ) {
         kdDebug() << "Command: DATESHORT" << endl;
         i += strlen( "DATESHORT" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatDate( date.date(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "DATE" ) ) {
         kdDebug() << "Command: DATE" << endl;
         i += strlen( "DATE" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatDate( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "DOW" ) ) {
         kdDebug() << "Command: DOW" << endl;
         i += strlen( "DOW" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIMELONGEN" ) ) {
         kdDebug() << "Command: TIMELONGEN" << endl;
         i += strlen( "TIMELONGEN" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         KLocale locale( "C");
         TQString str = locale.formatTime( date.time(), true );
         body.append( str );
@@ -730,14 +730,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "TIMELONG" ) ) {
         kdDebug() << "Command: TIMELONG" << endl;
         i += strlen( "TIMELONG" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIME" ) ) {
         kdDebug() << "Command: TIME" << endl;
         i += strlen( "TIME" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), false );
         body.append( str );
 
@@ -963,7 +963,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
 
           // Converting to a string here, since DwMediaType does not have a HasParameter() function
           TQString ctStr = ct.AsString().c_str();
-          if ( !ctStr.lower().contains( "name=" ) && !ctStr.lower().contains( "filename=" ) ) {
+          if ( !ctStr.lower().tqcontains( "name=" ) && !ctStr.lower().tqcontains( "filename=" ) ) {
             DwParameter *nameParameter = new DwParameter;
             nameParameter->SetAttribute( "name" );
             nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index 3cb53ac11..48bdbf578 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -32,11 +32,11 @@ class KProcess;
 /**
  * The TemplateParser transforms a message with a given template.
  *
- * A template contains text and commands, such as %QUOTE or %ODATE, which will be
- * replaced with the real values in process().
+ * A template tqcontains text and commands, such as %QUOTE or %ODATE, which will be
+ * tqreplaced with the real values in process().
  *
  * The message given in the constructor is the message that is being transformed.
- * The message text will be replaced by the processed text of the template, but other
+ * The message text will be tqreplaced by the processed text of the template, but other
  * properties, such as the attachments or the subject, are preserved.
  *
  * There are two different kind of commands: Those that work on the message that is
@@ -147,7 +147,7 @@ class TemplateParser : public TQObject
      *
      * In append mode, this will simply append the text to the body.
      *
-     * Otherwise, the content of the old message is deleted and replaced with @p body.
+     * Otherwise, the content of the old message is deleted and tqreplaced with @p body.
      * Attachments of the original message are also added back to the new message. 
      */
     void addProcessedBodyToMessage( const TQString &body );
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 8b4f37e8f..70dd926b6 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -47,8 +47,8 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na
   textEdit_reply_all->setFont( f );
   textEdit_forward->setFont( f );
 
-  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-  sizeHint();
+  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  tqsizeHint();
 
   connect( textEdit_new, TQT_SIGNAL( textChanged() ),
            this, TQT_SLOT( slotTextChanged( void ) ) );
diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui
index 20345e575..69c451b42 100644
--- a/kmail/templatesconfiguration_base.ui
+++ b/kmail/templatesconfiguration_base.ui
@@ -4,7 +4,7 @@
     
         TemplatesConfigurationBase
     
-    
+    
         
             0
             0
@@ -20,7 +20,7 @@
             3
         
     
-    
+    
         
             400
             300
@@ -45,7 +45,7 @@
                     3
                 
             
-            
+            
                 
                     0
                     0
@@ -86,7 +86,7 @@
                                 3
                             
                         
-                        
+                        
                             
                                 0
                                 0
@@ -258,7 +258,7 @@
         
         
             
-                layout5
+                tqlayout5
             
             
                 
@@ -284,7 +284,7 @@
                     
                         &Quote indicator:
                     
-                    
+                    
                         AlignVCenter|AlignRight
                     
                     
@@ -324,7 +324,7 @@
         89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002ee49444154388d7d93cd6b5c6514c67fe7bdef9d8f24d349c66412a203b1b4282d21140918824816418a0b454d75e1a28ab8c8dfe1c25d70e34e0812ea4644d13610c43a1121b5d84cab6943486227499d869ae6633e32f7de79ef71d58644f0593dabdf39cf7938a2aa4c4f4f9b300c0b954ae56ca55249876128aa2a9c90738eadadada0542afd954ea7cb636363a19d9f9f4755cff6f4a53e4d67ed78f7b37ebb8b05e3810818017d0a68f1dcc36463a7ea8a4b8bdb9fcccdcdddf6eaf5bae4f3f9f7bb7a773faee94fed81b983a6d6d9ab6eb2f5f73affec6de1a536c9e4d7497696c9f63cf237d66b85b5e570cf3977c7aeaeae9a42a130d03d506bdbaddda3d1805faec6dc5a68e2a208e30124187a39c9ebefa6c8f544f84949a9ea69e75cd60641c0e1e1a1b8b849142ac51f226ece1f32fc4a86f31732f86db076178ad70e20765cfae8142207009eaafac639270022c2fd15a1b470c8f81b59defed0637024c44596c269cb3b1fe4585c68f2c76f0e23064000639e5c5804caab2d8c24187ed5c3265adc5bf4b9f2f91e377eae73fe254b6fbfc7ea7283588f9a314756089b31ed5925dd61b87b2bc5d75fd4a91d843c7fa68d5caf23fb4c8246fdc9f01300e3412e9f60f7313c285b6edf0c696bf338f3620773df3de2ea15d8de0ce92f2448f8472bd8a700515e18146e5c3714afd5197f3343ae3b463ce1cbcf94efbf7a48b6cb303462595c3801505514280c182ebed5ce37333bec3f8e387721859f80da7e8c114714097b3be65804eb799e562a95e641358e4d47cb8cbc66c9f5f6f1eb8f55967eafa140bedfe7e27b7dac2c4588a7ec6cb7622004629b4c2629954a7fda6c6b3f5f08baac1f61bd2683c3867a358931865339c8e69a9c1b323cb87fc0fa72d81091351189646262426667677b620e2fabea25942e504144fef34d80735a752daeab9a6f7ddf5f9162b1c8e4e4a45f2e974f0541d0a3aa19c03f16f4b862a061adddc96432bba2aaccccccc8d4d494b7b1b1910c8220a1aae6ff00d6da56676767303a3a1afd0b29d2596f22d0b7b20000000049454e44ae426082
     
 
-
+
 
     kactivelabel.h
     templatesinsertcommand.h
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 45bd81fca..c2f794dd0 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -325,7 +325,7 @@ TemplatesInsertCommand::~TemplatesInsertCommand()
 
 void TemplatesInsertCommand::slotClicked()
 {
-  TQSize ps = mMenu->popupMenu()->sizeHint();
+  TQSize ps = mMenu->popupMenu()->tqsizeHint();
   mMenu->popup( mapToGlobal( TQPoint( 0, -(ps.height()) ) ) );
 }
 
diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp
index cdb24f6d8..e6b4b899b 100644
--- a/kmail/tests/messagedicttests.cpp
+++ b/kmail/tests/messagedicttests.cpp
@@ -65,12 +65,12 @@ void MessageDictTester::testKMDictClear()
 
 void MessageDictTester::testKMDictReplace()
 {
-  p("Check replace: ");
+  p("Check tqreplace: ");
   m_dict->init( 31 );
   KMDictItem *oldItem = new KMDictItem();
   KMDictItem *newItem = new KMDictItem();
   m_dict->insert( 12345, oldItem );
-  m_dict->replace( 12345, newItem );
+  m_dict->tqreplace( 12345, newItem );
   KMDictItem *found = m_dict->find( 12345 );
   CHECK( found, newItem );
 }
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index b152fdcf6..34a4f4692 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -39,8 +39,8 @@ KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
 static TQString makePrintable( const TQCString& str )
 {
   TQString a = str;
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 #endif
@@ -48,8 +48,8 @@ static TQString makePrintable( const TQCString& str )
 static TQString makePrintable( const DwString& str )
 {
   TQString a = KMail::Util::CString( str ); // ## we assume latin1
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 
diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp
index 22c141669..195758b87 100644
--- a/kmail/tests/utiltests.cpp
+++ b/kmail/tests/utiltests.cpp
@@ -30,8 +30,8 @@ void UtilTester::tearDown()
 static TQString makePrintable( const TQCString& str )
 {
   TQString a = str;
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 static TQString makePrintable( const TQByteArray& arr )
diff --git a/kmail/textsource.cpp b/kmail/textsource.cpp
index ab31dc422..6649565a9 100644
--- a/kmail/textsource.cpp
+++ b/kmail/textsource.cpp
@@ -44,7 +44,7 @@ KMTextSource::~KMTextSource() {
 }
 
 
-TQCString KMTextSource::text(Q_UINT32 serialNumber) const {
+TQCString KMTextSource::text(TQ_UINT32 serialNumber) const {
     TQCString rc;
     KMFolder *folder = 0;
     int idx;
diff --git a/kmail/textsource.h b/kmail/textsource.h
index 8251a09cc..e02509202 100644
--- a/kmail/textsource.h
+++ b/kmail/textsource.h
@@ -40,7 +40,7 @@ public:
     KMTextSource();
     ~KMTextSource();
 
-    TQCString text(Q_UINT32 serialNumber) const;
+    TQCString text(TQ_UINT32 serialNumber) const;
 };
 
 #endif
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 19aff3155..74afe85ba 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -73,7 +73,7 @@ void TreeBase::addChildFolder()
 
       const KMFolder *fld = folder();
       if ( fld ) {
-         mFolderTree->addChildFolder( (KMFolder *) fld, parentWidget() );
+         mFolderTree->addChildFolder( (KMFolder *) fld, tqparentWidget() );
 	reload( mLastMustBeReadWrite, mLastShowOutbox, mLastShowImapFolders );
 	setFolder( (KMFolder *) fld );
       }
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 8ab2a25fc..d788add0f 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -732,7 +732,7 @@ namespace {
     Q_UNUSED( window );
     Q_UNUSED( url );
     const TQString kmailImagePath = locate( "data", "kmail/pics/" );
-    if ( imagePath.contains( kmailImagePath ) ) {
+    if ( imagePath.tqcontains( kmailImagePath ) ) {
       // Do nothing, don't start a drag
       return true;
     }
@@ -745,7 +745,7 @@ namespace {
     Q_UNUSED( window );
     Q_UNUSED( url );
     const TQString kmailImagePath = locate( "data", "kmail/pics/" );
-    return imagePath.contains( kmailImagePath );
+    return imagePath.tqcontains( kmailImagePath );
   }
 }
 
diff --git a/kmail/util.cpp b/kmail/util.cpp
index 5d7173d2c..ca1b54b6e 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -60,7 +60,7 @@ size_t KMail::Util::crlf2lf( char* str, const size_t strLen )
         return strLen;
     }
 
-    // replace all occurrences of "\r\n" with "\n" (in place)
+    // tqreplace all occurrences of "\r\n" with "\n" (in place)
     char* target = const_cast( source ); // target points to '\r'
     ++source; // source points to '\n'
     for ( ; source < sourceEnd; ++source ) {
@@ -156,7 +156,7 @@ void KMail::Util::append( TQByteArray& that, const char* str )
     return; // nothing to append
   that.detach();
   uint len1 = that.size();
-  uint len2 = qstrlen(str);
+  uint len2 = tqstrlen(str);
   if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) )
     memcpy( that.data() + len1, str, len2 );
 }
@@ -173,7 +173,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str )
 // Code taken from TQCString::insert, but trailing nul removed
 void KMail::Util::insert( TQByteArray& that, uint index, const char* s )
 {
-  int len = qstrlen(s);
+  int len = tqstrlen(s);
   if ( len == 0 )
     return;
   uint olen = that.size();
diff --git a/kmail/util.h b/kmail/util.h
index d0e378219..341f65df9 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -54,7 +54,7 @@ class TQWidget;
 namespace KMail
 {
     /**
-     * The Util namespace contains a collection of helper functions use in
+     * The Util namespace tqcontains a collection of helper functions use in
      * various places.
      */
 namespace Util {
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 0b9222f48..e706243cf 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -212,7 +212,7 @@ namespace {
   static const GenericInformationExtractor::StateNode spamNodes[] = {
     { 0, GIE::CommandStart, "if",  1, 0, 0 },              // 0
     { 0,   GIE::TestStart, "header", 2, 0, 0 },            // 1
-    { 0,     GIE::TaggedArgument, "contains", 3, 0, 0 },   // 2
+    { 0,     GIE::TaggedArgument, "tqcontains", 3, 0, 0 },   // 2
 
     // accept both string and string-list:
     { 0,     GIE::StringArgument, "x-spam-flag", 9, 4, "x-spam-flag" },    // 3
@@ -259,16 +259,16 @@ namespace {
 
   // to understand this table, study the output of
   // libksieve/tests/parsertest
-  //   'if not address :domain :contains ["from"] ["mydomain.org"] { keep; stop; }'
+  //   'if not address :domain :tqcontains ["from"] ["mydomain.org"] { keep; stop; }'
   static const GenericInformationExtractor::StateNode domainNodes[] = {
     { 0, GIE::CommandStart, "if", 1, 0, 0 },       // 0
     { 0,   GIE::TestStart, "not", 2, 0, 0, },      // 1
     { 0,     GIE::TestStart, "address", 3, 0, 0 }, // 2
 
-    // :domain and :contains in arbitrary order:
+    // :domain and :tqcontains in arbitrary order:
     { 0,       GIE::TaggedArgument, "domain", 4, 5, 0 },     // 3
-    { 0,       GIE::TaggedArgument, "contains", 7, 0, 0 },   // 4
-    { 0,       GIE::TaggedArgument, "contains", 6, 0, 0 },   // 5
+    { 0,       GIE::TaggedArgument, "tqcontains", 7, 0, 0 },   // 4
+    { 0,       GIE::TaggedArgument, "tqcontains", 6, 0, 0 },   // 5
     { 0,       GIE::TaggedArgument, "domain", 7, 0, 0 },     // 6
 
     // accept both string and string-list:
@@ -448,9 +448,9 @@ namespace KMail {
 
   static inline TQString dotstuff( TQString s ) {
     if ( s.startsWith( "." ) )
-      return '.' + s.replace( "\n.", "\n.." );
+      return '.' + s.tqreplace( "\n.", "\n.." );
     else
-      return s.replace( "\n.", "\n.." );
+      return s.tqreplace( "\n.", "\n.." );
   }
 
   TQString Vacation::composeScript( const TQString & messageText,
@@ -464,26 +464,26 @@ namespace KMail {
       addressesArgument += ":addresses [ ";
       TQStringList sl;
       for ( AddrSpecList::const_iterator it = addrSpecs.begin() ; it != addrSpecs.end() ; ++it ) {
-	sl.push_back( '"' + (*it).asString().replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"' );
+	sl.push_back( '"' + (*it).asString().tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"' );
 	aliases.push_back( (*it).asString() );
       }
       addressesArgument += sl.join( ", " ) + " ] ";
     }
-    TQString script = TQString::fromLatin1("require \"vacation\";\n\n" );
+    TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" );
     if ( !sendForSpam )
-      script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
+      script += TQString::tqfromLatin1( "if header :tqcontains \"X-Spam-Flag\" \"YES\""
                                      " { keep; stop; }\n" ); // FIXME?
 
     if ( !domain.isEmpty() ) // FIXME
-      script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
+      script += TQString::tqfromLatin1( "if not address :domain :tqcontains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
 
     script += "vacation ";
     script += addressesArgument;
     if ( notificationInterval > 0 )
-      script += TQString::fromLatin1(":days %1 ").arg( notificationInterval );
-    script += TQString::fromLatin1("text:\n");
+      script += TQString::tqfromLatin1(":days %1 ").arg( notificationInterval );
+    script += TQString::tqfromLatin1("text:\n");
     script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
-    script += TQString::fromLatin1( "\n.\n;\n" );
+    script += TQString::tqfromLatin1( "\n.\n;\n" );
     return script;
   }
 
@@ -565,15 +565,15 @@ namespace KMail {
   TQString Vacation::defaultMessageText() {
     return i18n("I am out of office till %1.\n"
 		"\n"
-		"In urgent cases, please contact Mrs. \n"
+		"In urgent cases, please contact Mrs. \n"
 		"\n"
-		"email: \n"
+		"email: \n"
 		"phone: +49 711 1111 11\n"
 		"fax.:  +49 711 1111 12\n"
 		"\n"
 		"Yours sincerely,\n"
 		"-- \n")
-      .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
+      .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
   }
 
   int Vacation::defaultNotificationInterval() {
@@ -608,7 +608,7 @@ namespace KMail {
     mSieveJob = 0; // job deletes itself after returning from this slot!
 
     if ( !mCheckOnly && mUrl.protocol() == "sieve" && !job->sieveCapabilities().isEmpty() &&
-	 !job->sieveCapabilities().contains("vacation") ) {
+	 !job->sieveCapabilities().tqcontains("vacation") ) {
       KMessageBox::sorry( 0, i18n("Your server did not list \"vacation\" in "
 				  "its list of supported Sieve extensions;\n"
 				  "without it, KMail cannot install out-of-"
diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui
index 7ed3ec927..c2a4deb04 100644
--- a/kmail/warningconfiguration.ui
+++ b/kmail/warningconfiguration.ui
@@ -4,7 +4,7 @@
     
         WarningConfiguration
     
-    
+    
         
             0
             0
@@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security.
                     
                         For signing
                     
-                    
+                    
                         AlignCenter
                     
                 
@@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security.
                     
                         For encryption
                     
-                    
+                    
                         AlignCenter
                     
                 
@@ -329,7 +329,7 @@ The recommended SPHINX setting is 14 days.
                     
                         Expanding
                     
-                    
+                    
                         
                             40
                             20
@@ -348,7 +348,7 @@ The recommended SPHINX setting is 14 days.
             
                 Expanding
             
-            
+            
                 
                     20
                     90
@@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days.
         
         
             
-                layout1
+                tqlayout1
             
             
                 
@@ -373,7 +373,7 @@ The recommended SPHINX setting is 14 days.
                     
                         Expanding
                     
-                    
+                    
                         
                             40
                             20
@@ -404,5 +404,5 @@ The recommended SPHINX setting is 14 days.
     mWarnEncrRootCertExpiresSB
     enableAllWarningsPB
 
-
+
 
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index f88a3cd74..fee9b269f 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -84,7 +84,7 @@ namespace KMail {
     TQPushButton * mFromFileBtn;
     TQPushButton * mFromAddrbkBtn;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
     hlay = new TQHBoxLayout( vlay );
 
     // "enable X-Face" checkbox:
@@ -147,7 +147,7 @@ namespace KMail {
     mFromFileBtn = new TQPushButton( i18n("Select File..."), page );
     TQWhatsThis::add( mFromFileBtn,
                      i18n("Use this to select an image file to create the picture from. "
-                         "The image should be of high contrast and nearly quadratic shape. "
+                         "The image should be of high contrast and nearly quadratic tqshape. "
                          "A light background helps improve the result." ) );
     mFromFileBtn->setAutoDefault( false );
     page_vlay->addWidget( mFromFileBtn, 1 );
@@ -165,7 +165,7 @@ namespace KMail {
         "monochrome picture with every message. "
         "For example, this could be a picture of you or a glyph. "
         "It is shown in the recipient's mail client (if supported)." ), page );
-    label1->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
     page_vlay->addWidget( label1 );
 
     widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index a07a6f084..121171af6 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -128,14 +128,14 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con
         info->setCurrent(0);
         if( mboxName.length() > 20 ) {
             TQString tmp_info = mboxName;
-            tmp_info = tmp_info.replace( mailDir, ".." );
-            if (tmp_info.contains("subfolders/"))
+            tmp_info = tmp_info.tqreplace( mailDir, ".." );
+            if (tmp_info.tqcontains("subfolders/"))
                 tmp_info.remove("subfolders/");
             info->setFrom( tmp_info );
             tmp_from = tmp_info;
         } else
             info->setFrom(mboxName);
-        if(targetDir.contains("subfolders/")) {
+        if(targetDir.tqcontains("subfolders/")) {
             TQString tmp_info = targetDir;
             tmp_info.remove("subfolders/");
             info->setTo(tmp_info);
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index dd69ee7b5..959a4b468 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -164,13 +164,13 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
         info->setCurrent(0);
         if( mboxName.length() > 20 ) {
             TQString tmp_info = mboxName;
-            tmp_info = tmp_info.replace( mailDir, "../" );
-            if (tmp_info.contains(".sbd"))
+            tmp_info = tmp_info.tqreplace( mailDir, "../" );
+            if (tmp_info.tqcontains(".sbd"))
                 tmp_info.remove(".sbd");
             info->setFrom( tmp_info );
         } else
             info->setFrom(mboxName);
-        if(targetDir.contains(".sbd")) {
+        if(targetDir.tqcontains(".sbd")) {
             TQString tmp_info = targetDir;
             tmp_info.remove(".sbd");
             info->setTo(tmp_info);
@@ -206,12 +206,12 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
             TQString destFolder;
             TQString _targetDir = targetDir;
             if(!targetDir.isNull()) {
-                if(_targetDir.contains(".sbd"))
+                if(_targetDir.tqcontains(".sbd"))
                     _targetDir.remove(".sbd");
                 destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName;
             } else {
                 destFolder = "Evolution-Import/" + rootDir;
-                if(destFolder.contains(".sbd"))
+                if(destFolder.tqcontains(".sbd"))
                     destFolder.remove(".sbd");
             }
 
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index 76b376683..61f313391 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -98,7 +98,7 @@ void FilterMBox::import(FilterInfo *info)
 				// qDebug("x_status_flag: %s", x_status_flag.latin1() );		
 			}
 
-			// workaround to fix hang if a corrupted mbox contains some 
+			// workaround to fix hang if a corrupted mbox tqcontains some 
 			// binary data, for more see bug #106796
 			if (mbox.at() == filepos)
 			   mbox.at(mbox.size());
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index bde399b62..c60eced67 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -123,7 +123,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
     mailbox.setByteOrder(TQDataStream::LittleEndian);
 
     // Parse magic
-    Q_UINT32 sig_block1, sig_block2;
+    TQ_UINT32 sig_block1, sig_block2;
     mailbox >> sig_block1 >> sig_block2;
     if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) {
         folderName = "OE-Import/" + mailfileinfo.baseName(TRUE);
@@ -132,7 +132,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
         mbxImport(info, mailbox);
         return;
     } else {
-        Q_UINT32 sig_block3, sig_block4;
+        TQ_UINT32 sig_block3, sig_block4;
         mailbox >> sig_block3 >> sig_block4;
         if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) {
             if (sig_block2 == OE5_EMAIL_SIG_2) {
@@ -163,7 +163,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
 
 void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
 {
-    Q_UINT32 msgCount, lastMsgNum, fileSize;
+    TQ_UINT32 msgCount, lastMsgNum, fileSize;
 
     // Read the header
     ds >> msgCount >> lastMsgNum >> fileSize;
@@ -172,11 +172,11 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
     if (msgCount == 0)
         return; // Don't import empty mailbox
 
-    Q_UINT32 msgMagic;
+    TQ_UINT32 msgMagic;
     ds >> msgMagic; // Read first magic
 
     while (!ds.atEnd()) {
-        Q_UINT32 msgNumber, msgSize, msgTextSize;
+        TQ_UINT32 msgNumber, msgSize, msgTextSize;
         KTempFile tmp;
         tmp.dataStream()->setByteOrder(TQDataStream::LittleEndian);
 
@@ -211,7 +211,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
 void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds)
 {
     // Get item count & offset of index
-    Q_UINT32 itemCount, indexPtr;
+    TQ_UINT32 itemCount, indexPtr;
     ds.device()->at(0xc4);
     ds >> itemCount;
     ds.device()->at(0xe4);
@@ -231,9 +231,9 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 {
     
     if(info->shouldTerminate()) return;
-    Q_UINT32 self, unknown, nextIndexPtr, parent, indexCount;
-    Q_UINT8 unknown2, ptrCount;
-    Q_UINT16 unknown3;
+    TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount;
+    TQ_UINT8 unknown2, ptrCount;
+    TQ_UINT16 unknown3;
     int wasAt = ds.device()->at();
     ds.device()->at(filePos);
 
@@ -244,7 +244,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
     kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl;
     for (int count = 0; count < ptrCount; count++) {
         if(info->shouldTerminate()) return;
-        Q_UINT32 dataIndexPtr, anotherIndexPtr, anotherIndexCount; // _dbx_indexstruct
+        TQ_UINT32 dataIndexPtr, anotherIndexPtr, anotherIndexCount; // _dbx_indexstruct
         ds >> dataIndexPtr >> anotherIndexPtr >> anotherIndexCount;
 
         if (anotherIndexCount > 0) {
@@ -265,9 +265,9 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 
 void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos)
 {
-    Q_UINT32 curOffset, blockSize;
-    Q_UINT16 unknown;
-    Q_UINT8 count, unknown2;
+    TQ_UINT32 curOffset, blockSize;
+    TQ_UINT16 unknown;
+    TQ_UINT8 count, unknown2;
     int wasAt = ds.device()->at();
     
     TQString folderEntry[4];
@@ -279,8 +279,8 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
 
     for (int c = 0; c < count; c++) {
         if(info->shouldTerminate()) return;
-        Q_UINT8 type;  // _dbx_email_pointerstruct
-        Q_UINT32 value; // Actually 24 bit
+        TQ_UINT8 type;  // _dbx_email_pointerstruct
+        TQ_UINT32 value; // Actually 24 bit
 
         ds >> type >> value;
         value &= 0xffffff;
@@ -294,7 +294,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
             } else if( type == 0x04) {
                 int currentFilePos = ds.device()->at();
                 ds.device()->at(filePos + 12 + value + (count*4) );
-                Q_UINT32 newOFF;
+                TQ_UINT32 newOFF;
                 ds >> newOFF;
                 kdDebug() << "**** Offset of emaildata (0x04) " <<  newOFF << endl;
                 ds.device()->at(currentFilePos);
@@ -330,9 +330,9 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
 void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos)
 {
     if(info->shouldTerminate()) return;
-    Q_UINT32 self, nextAddressOffset, nextAddress=0;
-    Q_UINT16 blockSize;
-    Q_UINT8 intCount, unknown;
+    TQ_UINT32 self, nextAddressOffset, nextAddress=0;
+    TQ_UINT16 blockSize;
+    TQ_UINT8 intCount, unknown;
     KTempFile tmp;
     bool _break = false;
     int wasAt = ds.device()->at();
@@ -404,7 +404,7 @@ TQString FilterOE::getFolderName(TQString filename)
                 TQString _tmpFileName = tmp[1];
                 _tmpFileName = _tmpFileName.lower();
                 if(_tmpFileName == search) {
-                    folder.prepend( tmp[0] + TQString::fromLatin1("/") );
+                    folder.prepend( tmp[0] + TQString::tqfromLatin1("/") );
                     search = tmp[3];
                     foundFilename = true;
                 }
@@ -416,7 +416,7 @@ TQString FilterOE::getFolderName(TQString filename)
                         found = true;
                         break;
                     } else {
-                        folder.prepend( tmp[0] + TQString::fromLatin1("/") );
+                        folder.prepend( tmp[0] + TQString::tqfromLatin1("/") );
                         search = tmp[3];
                     }
                 }
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index 23617f912..126a6365a 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -81,13 +81,13 @@ void FilterPMail::import(FilterInfo *info)
     info->setOverall(100);
 }
 
-/** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */
-void FilterPMail::processFiles(const TQString& mask, void(FilterPMail::* workFunc)(const TQString&) )
+/** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */
+void FilterPMail::processFiles(const TQString& tqmask, void(FilterPMail::* workFunc)(const TQString&) )
 {
     if (inf->shouldTerminate()) return;
     
-    TQStringList files = dir.entryList(mask, TQDir::Files, TQDir::Name);
-    //kdDebug() << "Mask is " << mask << " count is " << files.count() << endl;
+    TQStringList files = dir.entryList(tqmask, TQDir::Files, TQDir::Name);
+    //kdDebug() << "Mask is " << tqmask << " count is " << files.count() << endl;
     for ( TQStringList::Iterator mailFile = files.begin(); mailFile != files.end(); ++mailFile ) {
         // Notify current file
         TQFileInfo mailfileinfo(*mailFile);
@@ -186,7 +186,7 @@ void FilterPMail::importMailFolder(const TQString& file)
                 f.at(f.at() - l + 1); 
             }
             
-            // no problem to loose the last line in file. This only contains a seperate char
+            // no problem to loose the last line in file. This only tqcontains a seperate char
             while ( ! f.atEnd() &&  (l = f.readLine(input.data(),MAX_LINE))) {
                     if (inf->shouldTerminate()){
                         tempfile.close();
@@ -228,8 +228,8 @@ void FilterPMail::importUnixMailFolder(const TQString& file)
     int n = 0, l = 0;
 
     /** Get the folder name */
-    s.replace( TQRegExp("mbx$"), "pmg");
-    s.replace( TQRegExp("MBX$"), "PMG");
+    s.tqreplace( TQRegExp("mbx$"), "pmg");
+    s.tqreplace( TQRegExp("MBX$"), "PMG");
     f.setName(s);
     if (! f.open( IO_ReadOnly ) ) {
         inf->alert( i18n("Unable to open %1, skipping").arg( s ) );
diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.hxx
index 664fdcc1b..d3ac1e60a 100644
--- a/kmailcvt/filter_pmail.hxx
+++ b/kmailcvt/filter_pmail.hxx
@@ -32,8 +32,8 @@ public:
     void import(FilterInfo *info);
 
 protected:
-    /** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */
-    void processFiles(const TQString& mask,  void(FilterPMail::* workFunc)(const TQString&) );
+    /** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */
+    void processFiles(const TQString& tqmask,  void(FilterPMail::* workFunc)(const TQString&) );
     /** this function imports one *.CNM message */
     void importNewMessage(const TQString& file);
     /** this function imports one mail folder file (*.PMM) */
@@ -53,7 +53,7 @@ private:
 
     /** Folder structure here has 5 entries. */
     typedef FolderStructureBase<5> FolderStructure;
-    /** List with the folder matrix, which contains following strings:
+    /** List with the folder matrix, which tqcontains following strings:
 	1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
 	2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)  
 	3. "ID:flag:filename" of folder/archiv   
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx
index 489083f04..63345f01b 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cxx
@@ -166,8 +166,8 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName)
 
 void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict &dict )
 {
-    /* Each sylpheed mail directory contains a .sylpheed_mark file which
-     * contains all the flags for each messages. The layout of this file
+    /* Each sylpheed mail directory tqcontains a .sylpheed_mark file which
+     * tqcontains all the flags for each messages. The tqlayout of this file
      * is documented in the source code of sylpheed: in procmsg.h for
      * the flag bits, and procmsg.c.
      *
@@ -179,7 +179,7 @@ void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDic
      * the first one with the message file name (which is a number), 
      * and the second one with the actual message flags */
 
-    Q_UINT32 in, flags;
+    TQ_UINT32 in, flags;
     TQFile file(path);
 
     if (!file.open(IO_ReadOnly)) 
@@ -196,7 +196,7 @@ void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDic
      * at a file created on another platform. I don't have any test 
      * marks/folders, so just ignoring this case */
     stream >> in;
-    if (in > (Q_UINT32) 0xffff) 
+    if (in > (TQ_UINT32) 0xffff) 
         return;
 
     while (!stream.atEnd()) {
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index de6e5c6b3..98d23cb66 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -169,7 +169,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
 	    if (tbb.atEnd())
  		break;
 
-            iFound = _tmp.contains(regexp);
+            iFound = _tmp.tqcontains(regexp);
             if(!iFound) {
                 iFound = _tmp.findRev("!");
                 if (iFound >= 0 && ((l-iFound) < 5) ) {
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index 6ada68098..c6f3cd098 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -165,13 +165,13 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
         info->setCurrent(0);
         if( mboxName.length() > 20 ) {
             TQString tmp_info = mboxName;
-            tmp_info = tmp_info.replace( mailDir, "../" );
-            if (tmp_info.contains(".sbd"))
+            tmp_info = tmp_info.tqreplace( mailDir, "../" );
+            if (tmp_info.tqcontains(".sbd"))
                 tmp_info.remove(".sbd");
             info->setFrom( tmp_info );
         } else
             info->setFrom(mboxName);
-        if(targetDir.contains(".sbd")) {
+        if(targetDir.tqcontains(".sbd")) {
             TQString tmp_info = targetDir;
             tmp_info.remove(".sbd");
             info->setTo(tmp_info);
@@ -207,12 +207,12 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
             TQString destFolder;
             TQString _targetDir = targetDir;
             if(!targetDir.isNull()) {
-                if(_targetDir.contains(".sbd"))
+                if(_targetDir.tqcontains(".sbd"))
                     _targetDir.remove(".sbd");
                 destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName;
             } else {
                 destFolder = "Thunderbird-Import/" + rootDir;
-                if(destFolder.contains(".sbd"))
+                if(destFolder.tqcontains(".sbd"))
                     destFolder.remove(".sbd");
             }
 
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 56e69d371..1028e69c7 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -47,9 +47,9 @@ FilterInfo::~FilterInfo()
 {
 }
 
-void FilterInfo::setStatusMsg( const TQString& status )
+void FilterInfo::seStatusMsg( const TQString& status )
 {
-  m_dlg->_textStatus->setText( status );
+  m_dlg->_texStatus->setText( status );
 }
 
 void FilterInfo::setFrom( const TQString& from )
diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx
index dc51f8c94..b680ab5e0 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.hxx
@@ -36,7 +36,7 @@ class FilterInfo
     FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg);
    ~FilterInfo();
 
-    void setStatusMsg( const TQString& status );
+    void seStatusMsg( const TQString& status );
     void setFrom( const TQString& from );
     void setTo( const TQString& to );
     void setCurrent( const TQString& current );
diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui
index 4a90be531..88366d6bb 100644
--- a/kmailcvt/kimportpagedlg.ui
+++ b/kmailcvt/kimportpagedlg.ui
@@ -4,7 +4,7 @@
     
         KImportPageDlg
     
-    
+    
         
             0
             0
@@ -28,7 +28,7 @@
                     0
                 
             
-            
+            
                 
                     170
                     430
@@ -60,7 +60,7 @@
             
                 Fixed
             
-            
+            
                 
                     10
                     10
@@ -69,7 +69,7 @@
         
         
             
-                layout16
+                tqlayout16
             
             
                 
@@ -77,7 +77,7 @@
                 
                 
                     
-                        layout90
+                        tqlayout90
                     
                     
                         
@@ -109,12 +109,12 @@
                         
                         
                             
-                                _textStatus
+                                _texStatus
                             
                             
                                 Importing in progress...
                             
-                            
+                            
                                 AlignTop
                             
                         
@@ -203,5 +203,5 @@
         
     
 
-
+
 
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index d56577f4d..9d5ddbb9b 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -73,10 +73,10 @@ void KMailCVT::next() {
       setFinishEnabled( currentPage(), false );
       // Start import
       FilterInfo *info = new FilterInfo(importpage, this, selfilterpage->removeDupMsg_checked());
-      info->setStatusMsg(i18n("Import in progress"));
+      info->seStatusMsg(i18n("Import in progress"));
       info->clear(); // Clear info from last time
       selectedFilter->import(info);
-      info->setStatusMsg(i18n("Import finished"));
+      info->seStatusMsg(i18n("Import finished"));
       // Cleanup
       delete info;
       // Enable finish & back buttons
diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui
index 3b483645c..80e2eafea 100644
--- a/kmailcvt/kselfilterpagedlg.ui
+++ b/kmailcvt/kselfilterpagedlg.ui
@@ -4,7 +4,7 @@
     
         KSelFilterPageDlg
     
-    
+    
         
             0
             0
@@ -28,7 +28,7 @@
                     0
                 
             
-            
+            
                 
                     170
                     430
@@ -60,7 +60,7 @@
             
                 Fixed
             
-            
+            
                 
                     10
                     10
@@ -69,7 +69,7 @@
         
         
             
-                layout19
+                tqlayout19
             
             
                 
@@ -96,7 +96,7 @@ This program will help you import your email from your previous email program in
                     
                         RichText
                     
-                    
+                    
                         WordBreak|AlignTop|AlignLeft
                     
                     
@@ -140,5 +140,5 @@ This program will help you import your email from your previous email program in
         
     
 
-
+
 
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 7061493ac..0b2889a62 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -403,7 +403,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   // evaluate timestamp (ignore timezone)
   TQDateTime datetime;
   if (entry.date.year<1998)
-	datetime = TQDateTime::currentDateTime();
+	datetime = TQDateTime::tqcurrentDateTime();
   else
 	datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), 
 			  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui
index 5b2893a3a..24b663f81 100644
--- a/kmobile/devices/gnokii/gnokiiconfigui.ui
+++ b/kmobile/devices/gnokii/gnokiiconfigui.ui
@@ -4,7 +4,7 @@
     
         GnokiiConfigUI
     
-    
+    
         
             0
             0
@@ -66,7 +66,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             20
@@ -140,7 +140,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             140
@@ -199,7 +199,7 @@
                                     0
                                 
                             
-                            
+                            
                                 
                                     41
                                     0
@@ -269,5 +269,5 @@
         reject()
     
 
-
+
 
diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp
index d32c11cb4..5cf5bed5e 100644
--- a/kmobile/kioslave/kio_mobile.cpp
+++ b/kmobile/kioslave/kio_mobile.cpp
@@ -536,7 +536,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result,
 
 
 /**
- * Test if the url contains a directory or a file.
+ * Test if the url tqcontains a directory or a file.
  */
 void KMobileProtocol::stat( const KURL &url )
 {
diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui
index 907e35b9b..f637ca9fe 100644
--- a/kmobile/kmobile_selectiondialog.ui
+++ b/kmobile/kmobile_selectiondialog.ui
@@ -4,7 +4,7 @@
     
         KMobile_SelectionDialog
     
-    
+    
         
             0
             0
@@ -21,7 +21,7 @@
         
         
             
-                layout3
+                tqlayout3
             
             
                 
@@ -86,7 +86,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             181
                             41
@@ -105,7 +105,7 @@
         
     
 
-
+
 
     kdialog.h
     kpushbutton.h
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index 63910fba1..05bcff554 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -126,7 +126,7 @@ TQStringList KMobileClient::deviceNames()
 {
   if (!isKMobileAvailable())
 	return TQStringList();
-  RETURN_TYPE( "deviceNames()", TQString::fromLatin1(""), TQStringList );
+  RETURN_TYPE( "deviceNames()", TQString::tqfromLatin1(""), TQStringList );
 }
 
 void KMobileClient::removeDevice( TQString deviceName )
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 8d1e69a0d..04bd10d2c 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -316,7 +316,7 @@ public:
 signals:
     /**
      * Call this from stat() to express details about an object, the
-     * UDSEntry customarily contains the atoms describing file name, size,
+     * UDSEntry customarily tqcontains the atoms describing file name, size,
      * mimetype, etc.
      * @param _entry The UDSEntry containing all of the object attributes.
      */
@@ -351,10 +351,10 @@ signals:
      * KIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
-     *    kdDebug() << TQString::fromLatin1("User: ")
+     *    kdDebug() << TQString::tqfromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::fromLatin1("Password: ")
-     *              << TQString::fromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::tqfromLatin1("Password: ")
+     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
      * }
      * 
      
      *
@@ -368,10 +368,10 @@ signals:
      * TQString errorMsg = "You entered an incorrect password.";
      * if ( openPassDlg( authInfo, errorMsg ) )
      * {
-     *    kdDebug() << TQString::fromLatin1("User: ")
+     *    kdDebug() << TQString::tqfromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::fromLatin1("Password: ")
-     *              << TQString::fromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::tqfromLatin1("Password: ")
+     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
      * }
      * 
    
      *
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index 0e4705c5b..3780c9801 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -39,7 +39,7 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser
 	setText(service->name());
 	m_deviceDesktopFile = service->desktopEntryName();
 	m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text());
-	m_deviceConfigFile = m_deviceConfigFile.replace(' ', "");
+	m_deviceConfigFile = m_deviceConfigFile.tqreplace(' ', "");
 	m_iconName = service->icon();
    };
 
diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp
index 6b5a02309..2bb907445 100644
--- a/kmobile/pref.cpp
+++ b/kmobile/pref.cpp
@@ -27,8 +27,8 @@ KMobilePreferences::KMobilePreferences()
 KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    layout->setAutoAdd(true);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    tqlayout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
@@ -36,8 +36,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
 KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    layout->setAutoAdd(true);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    tqlayout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
diff --git a/knode/Makefile.am b/knode/Makefile.am
index f17631453..57b6481e4 100644
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@@ -11,7 +11,7 @@ lib_LTLIBRARIES = libknodecommon.la
 
 kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
 libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
-libknodepart_la_LIBADD	= libknodecommon.la
+libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim
 
 SUBDIRS = pics filters
 
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 357a9c009..491d2c9b1 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -374,7 +374,7 @@ void ArticleWidget::displayArticle()
   mViewer->view()->ensureVisible( 0, 0 );
 
   if ( !mArticle->hasContent() ) {
-    displayErrorMessage( i18n("The article contains no data.") );
+    displayErrorMessage( i18n("The article tqcontains no data.") );
     return;
   }
 
@@ -410,12 +410,12 @@ void ArticleWidget::displayArticle()
   // signature, we show a nice header:
   TQPtrList pgpBlocks;
   TQStrList nonPgpBlocks;
-  bool containsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks );
+  bool tqcontainsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks );
 
   mViewer->write ( html );
   html = TQString();
 
-  if ( containsPGP ) {
+  if ( tqcontainsPGP ) {
     TQPtrListIterator pbit( pgpBlocks );
     TQStrListIterator npbit( nonPgpBlocks );
     TQTextCodec *codec;
@@ -490,7 +490,7 @@ void ArticleWidget::displayArticle()
       }
     }
     else {
-      if ( !containsPGP ) {
+      if ( !tqcontainsPGP ) {
         TQStringList lines;
         text->decodedText( lines, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() );
         displayBodyBlock( lines );
@@ -527,7 +527,7 @@ void ArticleWidget::displayErrorMessage( const TQString &msg )
   mViewer->write( "" );
   mViewer->write( i18n("An error occurred.") );
   mViewer->write( "

    " );
-  mViewer->write( errMsg.replace( "\n", "
    " ) );
+  mViewer->write( errMsg.tqreplace( "\n", "
    " ) );
   mViewer->write( "");
   mViewer->end();
 
@@ -610,7 +610,7 @@ void ArticleWidget::displayHeader()
       headerHtml += toHtmlString( KGlobal::locale()->formatDateTime(date->qdt(), false, true), None );
     } else if ( hb->is("Newsgroups") ) {
       TQString groups = hb->asUnicodeString();
-      groups.replace( ',', ", " );
+      groups.tqreplace( ',', ", " );
       headerHtml += toHtmlString( groups, ParseURL );
     } else
       headerHtml += toHtmlString( hb->asUnicodeString(), ParseURL );
@@ -635,7 +635,7 @@ void ArticleWidget::displayHeader()
   TQString xface = "";
   if ( !xfhead.isEmpty() ) {
     KPIM::KXFace xf;
-    xface = TQString::fromLatin1( "
    " )
+    xface = TQString::tqfromLatin1( "
    " )
       .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
   }
 
@@ -663,7 +663,7 @@ void ArticleWidget::displayHeader()
     html += TQString( "%1" ).arg( i18n("References:") );
 
     while ( i <= refCnt ) {
-      html += "     " + TQString::number( i ) + "";
+      html += " " + TQString::number( i ) + "";
       id = refs->next();
       id = id.mid( 1, id.length() - 2 );  // remove <>
       i++;
@@ -836,9 +836,9 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum )
   TQString label = ct->name();
   if ( label.isEmpty() )
     label = i18n("unnamed" );
-  // if label consists of only whitespace replace them by underscores
-  if ( (uint)label.contains( ' ' ) == label.length() )
-    label.replace( TQRegExp( " ", true, true ), "_" );
+  // if label consists of only whitespace tqreplace them by underscores
+  if ( (uint)label.tqcontains( ' ' ) == label.length() )
+    label.tqreplace( TQRegExp( " ", true, true ), "_" );
   label = toHtmlString( label, None );
 
   // attachment comment
@@ -915,7 +915,7 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt  )
   TQBuffer buffer( ba );
   buffer.open( IO_WriteOnly );
   image.save( &buffer, fmt );
-  return TQString::fromLatin1("data:image/%1;base64,%2")
+  return TQString::tqfromLatin1("data:image/%1;base64,%2")
     .arg( fmt, KCodecs::base64Encode( ba ) );
 }
 
@@ -964,7 +964,7 @@ void ArticleWidget::updateContents()
   else
     clear();
   // restore scrollbar position
-  mViewer->view()->setContentsPos( 0, qRound(  mViewer->view()->contentsHeight() * savedPosition ) );
+  mViewer->view()->setContentsPos( 0, tqRound(  mViewer->view()->contentsHeight() * savedPosition ) );
 }
 
 
@@ -1158,7 +1158,7 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen)
   int partNum = 0;
   if ( url.protocol() == "file" || url.protocol() == "part" ) {
     if ( url.protocol() == "file" ) {
-      if ( !mAttachementMap.contains( url.path() ) )
+      if ( !mAttachementMap.tqcontains( url.path() ) )
         return;
       partNum = mAttachementMap[url.path()];
     }
@@ -1167,7 +1167,7 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen)
     KMime::Content *c = mAttachments.at( partNum );
     if ( !c )
       return;
-    // TODO: replace with message box as done in KMail
+    // TODO: tqreplace with message box as done in KMail
     KNConfigManager *cfgMgr = knGlobals.configManager();
     if ( forceOpen || cfgMgr->readNewsViewer()->openAttachmentsOnClick() )
       knGlobals.articleManager()->openContent( c );
@@ -1240,7 +1240,7 @@ void ArticleWidget::slotSelectAll()
 
 void ArticleWidget::slotFind()
 {
-  mViewer->findText();
+  mViewer->tqfindText();
 }
 
 
@@ -1416,7 +1416,7 @@ void ArticleWidget::slotAddBookmark()
 {
   if ( mCurrentURL.isEmpty() )
     return;
-  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false );
   KBookmarkGroup group = bookManager->root();
   group.addBookmark( bookManager, mCurrentURL.url(), mCurrentURL );
@@ -1444,7 +1444,7 @@ void ArticleWidget::slotSaveAttachment()
     return;
   int partNum = 0;
   if ( mCurrentURL.protocol() == "file" ) {
-    if ( !mAttachementMap.contains( mCurrentURL.path() ) )
+    if ( !mAttachementMap.tqcontains( mCurrentURL.path() ) )
       return;
     partNum = mAttachementMap[mCurrentURL.path()];
   }
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index 2571642d0..2d44fdfc8 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -125,7 +125,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer {
     /// displays the given error message in the viewer
     void displayErrorMessage( const TQString &msg );
 
-    /// display the message header (should be replaced by KMail's HeaderStyle class)
+    /// display the message header (should be tqreplaced by KMail's HeaderStyle class)
     void displayHeader();
     /** displays the given text block, including quote and signature handling
      *  @param lines A list of lines to display.
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index ede75bb66..0c2e06220 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -64,7 +64,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) :
   setColumnAlignment( mPaintInfo.sizeCol, Qt::AlignRight );
   setColumnAlignment( mPaintInfo.scoreCol, Qt::AlignRight );
 
-  // due to our own column text squeezing we need to repaint on column resizing
+  // due to our own column text squeezing we need to tqrepaint on column resizing
   disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) );
   connect( header(), TQT_SIGNAL(sizeChange(int, int, int)),
            TQT_SLOT(slotSizeChanged(int, int, int)) );
@@ -146,7 +146,7 @@ void KNHeaderView::setActive( TQListViewItem *i )
 
   if ( mActiveItem ) {
     mActiveItem->setActive( false );
-    repaintItem( mActiveItem );
+    tqrepaintItem( mActiveItem );
     mActiveItem = 0;
   }
 
@@ -534,7 +534,7 @@ TQDragObject* KNHeaderView::dragObject()
 
 void KNHeaderView::slotSizeChanged( int section, int, int newSize )
 {
-  viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false);
+  viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false);
 }
 
 
@@ -601,14 +601,14 @@ void KNHeaderViewToolTip::maybeTip( const TQPoint &p )
   if ( !item->showToolTip( column ) )
     return;
 
-  const TQRect itemRect = listView->itemRect( item );
-  if ( !itemRect.isValid() )
+  const TQRect tqitemRect = listView->tqitemRect( item );
+  if ( !tqitemRect.isValid() )
     return;
   const TQRect headerRect = listView->header()->sectionRect( column );
   if ( !headerRect.isValid() )
     return;
 
-  tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ),
+  tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ),
        TQStyleSheet::escape( item->text( column ) ) );
 }
 
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 167a49c65..76466ddb1 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -223,7 +223,7 @@ void KNAccountManager::loadPasswordsAsync()
   if ( !mWallet && !mWalletOpenFailed ) {
     if ( knGlobals.top )
       mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-                                    knGlobals.topWidget->topLevelWidget()->winId(),
+                                    knGlobals.topWidget->tqtopLevelWidget()->winId(),
                                     Wallet::Asynchronous );
     else
       mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous );
@@ -263,7 +263,7 @@ KWallet::Wallet* KNAccountManager::wallet()
   delete mWallet;
   if ( knGlobals.top )
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-                                  knGlobals.topWidget->topLevelWidget()->winId() );
+                                  knGlobals.topWidget->tqtopLevelWidget()->winId() );
   else
     mWallet = Wallet::openWallet( Wallet::NetworkWallet() );
 
diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp
index fe475b1b3..437639d1e 100644
--- a/knode/knarticle.cpp
+++ b/knode/knarticle.cpp
@@ -209,7 +209,7 @@ void KNRemoteArticle::updateListItem()
 
   i_tem->setExpandable( (threadMode() && hasVisibleFollowUps()) );
 
-  i_tem->repaint(); //force repaint
+  i_tem->tqrepaint(); //force tqrepaint
 }
 
 
@@ -435,7 +435,7 @@ KNAttachment::KNAttachment(Content *c)
 KNAttachment::KNAttachment(KNLoadHelper *helper)
   : c_ontent(0), l_oadHelper(helper), f_ile(helper->getFile()), i_sAttached(false), h_asChanged(true)
 {
-  setMimeType((KMimeMagic::self()->findFileType(f_ile->name()))->mimeType());
+  setMimeType((KMimeMagic::self()->tqfindFileType(f_ile->name()))->mimeType());
   n_ame=helper->getURL().fileName();
 }
 
diff --git a/knode/knarticle.h b/knode/knarticle.h
index 798742e17..e36bfdfe5 100644
--- a/knode/knarticle.h
+++ b/knode/knarticle.h
@@ -35,7 +35,7 @@ class KNHdrViewItem;
 class KNArticleCollection;
 
 /** This class encapsulates a generic article. It provides all the
-    usual headers of a RFC822-message. Further more it contains an
+    usual headers of a RFC822-message. Further more it tqcontains an
     unique id and can store a pointer to a @ref TQListViewItem. It is
     used as a base class for all visible articles. */
 
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 410c2bf40..493e2e229 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -209,13 +209,13 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
   TQString attribution=knGlobals.configManager()->postNewsComposer()->intro();
   TQString name(a->from()->name());
   if (name.isEmpty())
-    name = TQString::fromLatin1(a->from()->email());
-  attribution.replace(TQRegExp("%NAME"),name);
-  attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email()));
-  attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
-  attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
-  attribution.replace(TQRegExp("%GROUP"),g->groupname());
-  attribution.replace(TQRegExp("%L"),"\n");
+    name = TQString::tqfromLatin1(a->from()->email());
+  attribution.tqreplace(TQRegExp("%NAME"),name);
+  attribution.tqreplace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email()));
+  attribution.tqreplace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
+  attribution.tqreplace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
+  attribution.tqreplace(TQRegExp("%GROUP"),g->groupname());
+  attribution.tqreplace(TQRegExp("%L"),"\n");
   attribution+="\n\n";
 
   TQString quoted=attribution;
@@ -279,7 +279,7 @@ void KNArticleFactory::createForward(KNArticle *a)
   bool incAtt = ( !knGlobals.configManager()->postNewsTechnical()->useExternalMailer() &&
                   ct->isMultipart() && ct->isSubtype("mixed") &&
                   KMessageBox::Yes == KMessageBox::questionYesNo(knGlobals.topWidget,
-                  i18n("This article contains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward"))
+                  i18n("This article tqcontains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward"))
                 );
 
   if (knGlobals.configManager()->postNewsTechnical()->useOwnCharset())
@@ -419,7 +419,7 @@ void KNArticleFactory::createCancel(KNArticle *a)
   art->lines()->setNumberOfLines(1);
 
   //body
-  art->fromUnicodeString(TQString::fromLatin1("cancel by original author\n"));
+  art->fromUnicodeString(TQString::tqfromLatin1("cancel by original author\n"));
 
   //assemble
   art->assemble();
@@ -875,9 +875,9 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T
       if(origPost) {
         TQString name(origPost->from()->name());
         if (name.isEmpty())
-          name = TQString::fromLatin1(origPost->from()->email());
-        value.replace(TQRegExp("%NAME"), name);
-        value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email()));
+          name = TQString::tqfromLatin1(origPost->from()->email());
+        value.tqreplace(TQRegExp("%NAME"), name);
+        value.tqreplace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email()));
       }
       else
         if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1)
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 60d0e0320..bb2f2338b 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -189,7 +189,7 @@ void KNArticleFilter::doFilter(KNGroup *g)
 
   if(!l_oaded) load();
 
-  subject.expand(g);  // replace placeholders
+  subject.expand(g);  // tqreplace placeholders
   from.expand(g);
   messageId.expand(g);
   references.expand(g);
@@ -287,7 +287,7 @@ void KNArticleFilter::doFilter(KNFolder *f)
 
   if(!l_oaded) load();
 
-  subject.expand(0);  // replace placeholders
+  subject.expand(0);  // tqreplace placeholders
   from.expand(0);
   messageId.expand(0);
   references.expand(0);
@@ -324,7 +324,7 @@ void KNArticleFilter::setTranslatedName(const TQString &s)
   bool retranslated = false;
   for (const char **c=defFil;(*c)!=0;c++)   // ok, try if it matches any of the standard filter names
     if (s==i18n("default filter name",*c)) {
-      n_ame = TQString::fromLatin1(*c);
+      n_ame = TQString::tqfromLatin1(*c);
       retranslated = true;
       break;
     }
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index 86bcd8df9..d1aec96a1 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -99,7 +99,7 @@ void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent)
     else
       s.append(' ');
   fName = s.simplifyWhiteSpace();
-  fName.replace(TQRegExp("[\\s]"),"_");
+  fName.tqreplace(TQRegExp("[\\s]"),"_");
 
   KNSaveHelper helper(fName,parent);
   TQFile *file = helper.getFile(i18n("Save Article"));
@@ -186,7 +186,7 @@ void KNArticleManager::showHdrs(bool clear)
     v_iew->clear();
 
   knGlobals.top->setCursorBusy(true);
-  knGlobals.setStatusMsg(i18n(" Creating list..."));
+  knGlobals.seStatusMsg(i18n(" Creating list..."));
   knGlobals.top->secureProcessEvents();
 
   if(g_roup) {
@@ -324,7 +324,7 @@ void KNArticleManager::showHdrs(bool clear)
     knGlobals.top->articleViewer()->setArticle( 0 );
   }
 
-  knGlobals.setStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString::null);
   updateStatusString();
   knGlobals.top->setCursorBusy(false);
 }
@@ -991,25 +991,25 @@ void KNArticleManager::updateStatusString()
     if (g_roup->status()==KNGroup::moderated)
       name += i18n(" (moderated)");
 
-    knGlobals.setStatusMsg(i18n(" %1: %2 new , %3 displayed")
+    knGlobals.seStatusMsg(i18n(" %1: %2 new , %3 displayed")
                         .arg(name).arg(g_roup->newCount()).arg(displCnt),SB_GROUP);
 
     if(f_ilter)
-      knGlobals.setStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER);
+      knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER);
     else
-      knGlobals.setStatusMsg(TQString::null, SB_FILTER);
+      knGlobals.seStatusMsg(TQString::null, SB_FILTER);
   }
   else if(f_older) {
     if(f_ilter)
       displCnt=f_ilter->count();
     else
       displCnt=f_older->count();
-    knGlobals.setStatusMsg(i18n(" %1: %2 displayed")
+    knGlobals.seStatusMsg(i18n(" %1: %2 displayed")
       .arg(f_older->name()).arg(displCnt), SB_GROUP);
-    knGlobals.setStatusMsg(TQString::null, SB_FILTER);
+    knGlobals.seStatusMsg(TQString::null, SB_FILTER);
   } else {
-    knGlobals.setStatusMsg(TQString::null, SB_GROUP);
-    knGlobals.setStatusMsg(TQString::null, SB_FILTER);
+    knGlobals.seStatusMsg(TQString::null, SB_GROUP);
+    knGlobals.seStatusMsg(TQString::null, SB_FILTER);
   }
 }
 
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 63542cad4..3bbb52377 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -93,7 +93,7 @@ void KNCollectionView::readConfig()
   KConfig *conf = knGlobals.config();
   conf->setGroup( "GroupView" );
 
-  // execute the listview layout stuff only once
+  // execute the listview tqlayout stuff only once
   static bool initDone = false;
   if (!initDone) {
     initDone = true;
diff --git a/knode/kncollectionviewitem.cpp b/knode/kncollectionviewitem.cpp
index 8fed1f968..35f2ae2cc 100644
--- a/knode/kncollectionviewitem.cpp
+++ b/knode/kncollectionviewitem.cpp
@@ -160,7 +160,7 @@ TQString KNCollectionViewItem::squeezeFolderName( const TQString &text,
       nextPos = t.find('.', curPos);
       if ( nextPos != -1 ) {
         temp = t[curPos];
-        t.replace( curPos, nextPos - curPos, temp );
+        t.tqreplace( curPos, nextPos - curPos, temp );
         curPos += 2;
       }
     }
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 53520e29d..533ad3568 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -236,9 +236,9 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
   KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
 
   KStdAction::find(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfindNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
+  KStdAction::tqreplace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
 
   //attach menu
   new KAction(i18n("Append &Signature"), 0 , this, TQT_SLOT(slotAppendSig()),
@@ -343,7 +343,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
 
   if (firstEdit) {   // now we place the cursor at the end of the quoted text / below the attribution line
     if (knGlobals.configManager()->postNewsComposer()->cursorOnTop()) {
-      int numLines = knGlobals.configManager()->postNewsComposer()->intro().contains("%L");
+      int numLines = knGlobals.configManager()->postNewsComposer()->intro().tqcontains("%L");
       v_iew->e_dit->setCursorPosition(numLines+1,0);
     }
     else
@@ -411,7 +411,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
     createGUI("kncomposerui.rc",  false);
     unplugActionList("spell_result" );
     m_listAction.clear();
-    if ( !lst.contains( selectWord ) )
+    if ( !lst.tqcontains( selectWord ) )
     {
         TQStringList::ConstIterator it = lst.begin();
         for ( ; it != lst.end() ; ++it )
@@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
 
 void KNComposer::slotUndo()
 {
-    TQWidget* fw = focusWidget();
+    TQWidget* fw = tqfocusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -443,7 +443,7 @@ void KNComposer::slotUndo()
 
 void KNComposer::slotRedo()
 {
-    TQWidget* fw = focusWidget();
+    TQWidget* fw = tqfocusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -454,7 +454,7 @@ void KNComposer::slotRedo()
 
 void KNComposer::slotCut()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -466,7 +466,7 @@ void KNComposer::slotCut()
 
 void KNComposer::slotCopy()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -480,7 +480,7 @@ void KNComposer::slotCopy()
 
 void KNComposer::slotPaste()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -492,7 +492,7 @@ void KNComposer::slotPaste()
 
 void KNComposer::slotSelectAll()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("TQLineEdit"))
@@ -534,7 +534,7 @@ void KNComposer::setMessageMode(MessageMode mode)
 
   if (m_ode == news_mail) {
     TQString s = v_iew->e_dit->textLine(0);
-    if (!s.contains(i18n("")))
+    if (!s.tqcontains(i18n("")))
       v_iew->e_dit->insertAt(i18n("\n\n"),0,0);
   } else {
     if (v_iew->e_dit->textLine(0)==i18n("")) {
@@ -658,7 +658,7 @@ bool KNComposer::hasValidData()
   }
 
   if (n_eeds8Bit && (c_harset.lower()=="us-ascii")) {
-    KMessageBox::sorry(this, i18n("Your message contains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
+    KMessageBox::sorry(this, i18n("Your message tqcontains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
     return false;
   }
 
@@ -682,7 +682,7 @@ bool KNComposer::hasValidData()
 
   if (longLine)
     if (!(KMessageBox::warningYesNo( this,
-          i18n("Your article contains lines longer than 80 characters.\n"
+          i18n("Your article tqcontains lines longer than 80 characters.\n"
 	       "Do you want to re-edit the article or send it anyway?"),
           TQString::null, i18n("&Send"),
 	  i18n("edit article","&Edit")) == KMessageBox::Yes))
@@ -957,7 +957,7 @@ void KNComposer::initData(const TQString &text)
 }
 
 
-// inserts at cursor position if clear is false, replaces content otherwise
+// inserts at cursor position if clear is false, tqreplaces content otherwise
 // puts the file content into a box if box==true
 // "file" is already open for reading
 void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitle)
@@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   ts.setCodec(codec);
 
   if (box)
-    temp = TQString::fromLatin1(",----[ %1 ]\n").arg(boxTitle);
+    temp = TQString::tqfromLatin1(",----[ %1 ]\n").arg(boxTitle);
 
   if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) {
     int wrapAt = v_iew->e_dit->wrapColumnOrWidth();
@@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   }
 
   if (box)
-    temp += TQString::fromLatin1("`----");
+    temp += TQString::tqfromLatin1("`----");
 
   if(clear)
     v_iew->e_dit->setText(temp);
@@ -1173,7 +1173,7 @@ void KNComposer::slotToggleDoMail()
 
     if (knGlobals.configManager()->postNewsTechnical()->useExternalMailer()) {
       TQString s = v_iew->e_dit->textLine(0);
-      if (!s.contains(i18n("")))
+      if (!s.tqcontains(i18n("")))
         v_iew->e_dit->insertAt(i18n("\n\n"),0,0);
       TQString tmp;
       TQStringList textLines = v_iew->e_dit->processedText();
@@ -1231,7 +1231,7 @@ void KNComposer::slotToggleWordWrap()
 
 void KNComposer::slotUndoRewrap()
 {
-  if (KMessageBox::warningContinueCancel( this, i18n("This will replace all text you have written.")) == KMessageBox::Continue) {
+  if (KMessageBox::warningContinueCancel( this, i18n("This will tqreplace all text you have written.")) == KMessageBox::Continue) {
     v_iew->e_dit->setText(u_nwraped);
     slotAppendSig();
   }
@@ -1293,8 +1293,8 @@ void KNComposer::slotExternalEditor()
   TQStringList command = TQStringList::split(' ',editorCommand);
   bool filenameAdded=false;
   for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) {
-    if ((*it).contains("%f")) {
-      (*it).replace(TQRegExp("%f"),e_ditorTempfile->name());
+    if ((*it).tqcontains("%f")) {
+      (*it).tqreplace(TQRegExp("%f"),e_ditorTempfile->name());
       filenameAdded=true;
     }
     (*e_xternalEditor) << (*it);
@@ -1422,10 +1422,10 @@ void KNComposer::slotNewToolbarConfig()
 
 void KNComposer::slotSubjectChanged(const TQString &t)
 {
-  // replace newlines
+  // tqreplace newlines
   TQString subject = t;
-  subject.replace( '\n', ' ' );
-  subject.replace( '\r', ' ' );
+  subject.tqreplace( '\n', ' ' );
+  subject.tqreplace( '\r', ' ' );
   if ( subject != t ) // setText() sets the cursor to the end
     v_iew->s_ubject->setText( subject );
   // update caption
@@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t)
   split.init(t.latin1(), ",");
   splitOk=split.first();
   while(splitOk) {
-    v_iew->f_up2->insertItem(TQString::fromLatin1(split.string()));
+    v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string()));
     splitOk=split.next();
   }
   v_iew->f_up2->insertItem("");
@@ -1643,7 +1643,7 @@ void KNComposer::slotSpellFinished()
 {
   a_ctExternalEditor->setEnabled(true);
   a_ctSpellCheck->setEnabled(true);
-  KSpell::spellStatus status=s_pellChecker->status();
+  KSpell::spelltqStatus status=s_pellChecker->status();
   delete s_pellChecker;
   s_pellChecker=0;
 
@@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *
   spell = 0L;
   installEventFilter(this);
   KCursor::setAutoHideCursor( this, true, true );
-  m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") );
+  m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") );
 }
 
 
@@ -2052,13 +2052,13 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
       //Continue if this word was misspelled
-      if( !word.isEmpty() && m_replacements.contains( word ) )
+      if( !word.isEmpty() && m_tqreplacements.tqcontains( word ) )
       {
         KPopupMenu p;
         p.insertTitle( i18n("Suggestions") );
 
         //Add the suggestions to the popup menu
-        TQStringList reps = m_replacements[word];
+        TQStringList reps = m_tqreplacements[word];
         if( reps.count() > 0 )
         {
           int listPos = 0;
@@ -2081,11 +2081,11 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
           int parIdx = 1, txtIdx = 1;
           getCursorPosition(&parIdx, &txtIdx);
           setSelection(para, firstSpace, para, lastSpace);
-          insert(m_replacements[word][id]);
+          insert(m_tqreplacements[word][id]);
           // Restore the cursor position; if the cursor was behind the
           // misspelled word then adjust the cursor position
           if ( para == parIdx && txtIdx >= lastSpace )
-            txtIdx += m_replacements[word][id].length() - word.length();
+            txtIdx += m_tqreplacements[word][id].length() - word.length();
           setCursorPosition(parIdx, txtIdx);
         }
         //Cancel original event
@@ -2099,7 +2099,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
 
 void KNComposer::Editor::slotAddSuggestion( const TQString &text, const TQStringList &lst, unsigned int )
 {
-  m_replacements[text] = lst;
+  m_tqreplacements[text] = lst;
 }
 
 // expand tabs to avoid the "tab-damage",
@@ -2137,12 +2137,12 @@ TQStringList KNComposer::Editor::processedText()
     }
   }
 
-  TQString replacement;
+  TQString tqreplacement;
   int tabPos;
   for (TQStringList::Iterator it = ret.begin(); it != ret.end(); ++it ) {
     while ((tabPos=(*it).find('\t'))!=-1) {
-      replacement.fill(TQChar(' '), 8-(tabPos%8));
-      (*it).replace(tabPos, 1, replacement);
+      tqreplacement.fill(TQChar(' '), 8-(tabPos%8));
+      (*it).tqreplace(tabPos, 1, tqreplacement);
     }
   }
 
@@ -2159,7 +2159,7 @@ void KNComposer::Editor::slotPasteAsQuotation()
         s[i] = ' ';
     }
     s.prepend("> ");
-    s.replace(TQRegExp("\n"),"\n> ");
+    s.tqreplace(TQRegExp("\n"),"\n> ");
     insert(s);
   }
 }
@@ -2177,7 +2177,7 @@ void KNComposer::Editor::slotSearchAgain()
 
 void KNComposer::Editor::slotReplace()
 {
-  replace();
+  tqreplace();
 }
 
 
@@ -2186,7 +2186,7 @@ void KNComposer::Editor::slotAddQuotes()
   if (hasMarkedText()) {
     TQString s = markedText();
     s.prepend("> ");
-    s.replace(TQRegExp("\n"),"\n> ");
+    s.tqreplace(TQRegExp("\n"),"\n> ");
     insert(s);
   } else {
     int l = currentLine();
@@ -2206,7 +2206,7 @@ void KNComposer::Editor::slotRemoveQuotes()
     TQString s = markedText();
     if (s.left(2) == "> ")
       s.remove(0,2);
-    s.replace(TQRegExp("\n> "),"\n");
+    s.tqreplace(TQRegExp("\n> "),"\n");
     insert(s);
   } else {
     int l = currentLine();
@@ -2227,13 +2227,13 @@ void KNComposer::Editor::slotAddBox()
     if (hasMarkedText()) {
     TQString s = markedText();
     s.prepend(",----[  ]\n");
-    s.replace(TQRegExp("\n"),"\n| ");
+    s.tqreplace(TQRegExp("\n"),"\n| ");
     s.append("\n`----");
     insert(s);
   } else {
     int l = currentLine();
     int c = currentColumn();
-    TQString s = TQString::fromLatin1(",----[  ]\n| %1\n`----").arg(textLine(l));
+    TQString s = TQString::tqfromLatin1(",----[  ]\n| %1\n`----").arg(textLine(l));
     insertLine(s,l);
     removeLine(l+3);
     setCursorPosition(l+1,c+2);
@@ -2244,10 +2244,10 @@ void KNComposer::Editor::slotAddBox()
 void KNComposer::Editor::slotRemoveBox()
 {
   if (hasMarkedText()) {
-    TQString s = TQString::fromLatin1("\n") + markedText() + TQString::fromLatin1("\n");
-    s.replace(TQRegExp("\n,----[^\n]*\n"),"\n");
-    s.replace(TQRegExp("\n| "),"\n");
-    s.replace(TQRegExp("\n`----[^\n]*\n"),"\n");
+    TQString s = TQString::tqfromLatin1("\n") + markedText() + TQString::tqfromLatin1("\n");
+    s.tqreplace(TQRegExp("\n,----[^\n]*\n"),"\n");
+    s.tqreplace(TQRegExp("\n| "),"\n");
+    s.tqreplace(TQRegExp("\n`----[^\n]*\n"),"\n");
     s.remove(0,1);
     s.truncate(s.length()-1);
     insert(s);
@@ -2297,7 +2297,7 @@ void KNComposer::Editor::slotRemoveBox()
     setCursorPosition(l,c-2);
 
     setAutoUpdate(true);
-    repaint(false);
+    tqrepaint(false);
   }
 }
 
@@ -2368,7 +2368,7 @@ void KNComposer::Editor::keyPressEvent ( TQKeyEvent *e)
                        && newLine[leadingWhiteSpaceCount].isSpace() ) {
                     ++leadingWhiteSpaceCount;
                 }
-                newLine = newLine.replace( 0, leadingWhiteSpaceCount,
+                newLine = newLine.tqreplace( 0, leadingWhiteSpaceCount,
                                            lineText.left( bot ) );
                 removeParagraph( line + 1 );
                 insertParagraph( newLine, line + 1 );
@@ -2423,7 +2423,7 @@ void KNComposer::Editor::slotSpellDone(const TQString &/*newtext*/)
 
 void KNComposer::Editor::slotSpellFinished()
 {
-  KSpell::spellStatus status=spell->status();
+  KSpell::spelltqStatus status=spell->status();
   delete spell;
   spell=0;
 
@@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ
     this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&)));
 
   //finish GUI
-  setFixedHeight(sizeHint().height());
+  setFixedHeight(tqsizeHint().height());
   KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250));
   setHelp("anc-knode-editor-advanced");
 }
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index b1c1c12ad..05d6de0ad 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -68,7 +68,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
     //set data from the given article
     void initData(const TQString &text);
 
-    // inserts at cursor position if clear is false, replaces content otherwise
+    // inserts at cursor position if clear is false, tqreplaces content otherwise
     // puts the file content into a box if box==true
     // "file" is already open for reading
     void insertFile(TQFile *file, bool clear=false, bool box=false, TQString boxTitle=TQString::null);
@@ -295,7 +295,7 @@ private:
     KNComposer *m_composer;
     KNComposer::ComposerView *m_composerView;
     KSpell *spell;
-    TQMap m_replacements;
+    TQMap m_tqreplacements;
     TQRegExp m_bound;
 };
 
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 85606d89d..cfeb8f006 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -149,7 +149,7 @@ TQString KNConfig::Identity::getSignature()
   else
     s_igContents = s_igText;
 
-  if (!s_igContents.isEmpty() && !s_igContents.contains("\n-- \n") && !(s_igContents.left(4) == "-- \n"))
+  if (!s_igContents.isEmpty() && !s_igContents.tqcontains("\n-- \n") && !(s_igContents.left(4) == "-- \n"))
     s_igContents.prepend("-- \n");
 
   return s_igContents;
@@ -942,11 +942,11 @@ void KNConfig::PostNewsTechnical::save()
   conf->setGroup("POSTNEWS");
 
   conf->writeEntry("ComposerCharsets", c_omposerCharsets);
-  conf->writeEntry("Charset", TQString::fromLatin1(c_harset));
+  conf->writeEntry("Charset", TQString::tqfromLatin1(c_harset));
   conf->writeEntry("8BitEncoding", a_llow8BitBody);
   conf->writeEntry("UseOwnCharset", u_seOwnCharset);
   conf->writeEntry("generateMId", g_enerateMID);
-  conf->writeEntry("MIdhost", TQString::fromLatin1(h_ostname));
+  conf->writeEntry("MIdhost", TQString::tqfromLatin1(h_ostname));
   conf->writeEntry("dontIncludeUA", d_ontIncludeUA);
   conf->writeEntry("useExternalMailer", u_seExternalMailer);
 
@@ -1100,7 +1100,7 @@ KNConfig::Cleanup::Cleanup( bool global ) :
   // default values for new accounts / groups
   d_oExpire( true ), r_emoveUnavailable( true ), p_reserveThr( true ),
   e_xpireInterval( 5 ), r_eadMaxAge( 10 ), u_nreadMaxAge( 15 ),
-  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() )
+  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::tqcurrentDate() )
 {
   if (mGlobal) {
     KConfig *conf = knGlobals.config();
@@ -1174,7 +1174,7 @@ bool KNConfig::Cleanup::expireToday()
   if (!d_oExpire)
     return false;
 
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   if (mLastExpDate == today)
     return false;
 
@@ -1184,7 +1184,7 @@ bool KNConfig::Cleanup::expireToday()
 
 void KNConfig::Cleanup::setLastExpireDate()
 {
-  mLastExpDate = TQDateTime::currentDateTime();
+  mLastExpDate = TQDateTime::tqcurrentDateTime();
 }
 
 
@@ -1193,7 +1193,7 @@ bool KNConfig::Cleanup::compactToday()
   if (!d_oCompact)
     return false;
 
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   if (mLastCompDate == today)
     return false;
 
@@ -1203,7 +1203,7 @@ bool KNConfig::Cleanup::compactToday()
 
 void KNConfig::Cleanup::setLastCompactDate()
 {
-  mLastCompDate = TQDateTime::currentDateTime();
+  mLastCompDate = TQDateTime::tqcurrentDateTime();
 }
 
 
diff --git a/knode/knconfig.h b/knode/knconfig.h
index e2aa682bf..6bca3ab1b 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -390,7 +390,7 @@ class KDE_EXPORT XHeader {
 
     TQCString name()   { return n_ame; }
     TQString value()   { return v_alue; }
-    TQString header()  { return (TQString::fromLatin1(("X-"+n_ame+": "))+v_alue); }
+    TQString header()  { return (TQString::tqfromLatin1(("X-"+n_ame+": "))+v_alue); }
 
   protected:
     TQCString n_ame;
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 91fba601e..d70ebfa43 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -213,7 +213,7 @@ void KNConfig::IdentityWidget::save()
   d_ata->s_igningKey = s_igningKey->keyIDs().first();
   d_ata->u_seSigFile=s_igFile->isChecked();
   d_ata->u_seSigGenerator=s_igGenerator->isChecked();
-  d_ata->s_igPath=c_ompletion->replacedPath(s_ig->text());
+  d_ata->s_igPath=c_ompletion->tqreplacedPath(s_ig->text());
   d_ata->s_igText=s_igEditor->text();
 
   if(d_ata->isGlobal())
@@ -242,7 +242,7 @@ void KNConfig::IdentityWidget::slotSignatureType(int type)
 
 void KNConfig::IdentityWidget::slotSignatureChoose()
 {
-  TQString tmp=KFileDialog::getOpenFileName(c_ompletion->replacedPath(s_ig->text()),TQString::null,this,i18n("Choose Signature"));
+  TQString tmp=KFileDialog::getOpenFileName(c_ompletion->tqreplacedPath(s_ig->text()),TQString::null,this,i18n("Choose Signature"));
   if(!tmp.isEmpty()) s_ig->setText(tmp);
   emit changed( true );
 }
@@ -250,7 +250,7 @@ void KNConfig::IdentityWidget::slotSignatureChoose()
 
 void KNConfig::IdentityWidget::slotSignatureEdit()
 {
-  TQString fileName = c_ompletion->replacedPath(s_ig->text()).stripWhiteSpace();
+  TQString fileName = c_ompletion->tqreplacedPath(s_ig->text()).stripWhiteSpace();
 
   if (fileName.isEmpty()) {
     KMessageBox::sorry(this, i18n("You must specify a filename."));
@@ -561,7 +561,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge
 
   connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) );
 
-  KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint());
+  KNHelper::restoreWindowSize("accNewsPropDLG", this, tqsizeHint());
 
   setHelp("anc-setting-the-news-account");
 }
@@ -896,7 +896,7 @@ void KNConfig::AppearanceWidget::defaults()
     colorItem->setColor(d_ata->defaultColor(i));
   }
   c_List->triggerUpdate(true);
-  c_List->repaint(true);
+  c_List->tqrepaint(true);
 
   // default fonts
   FontListItem *fontItem;
@@ -1548,8 +1548,8 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader
     v_alueCB[i]->setChecked(h->flag(i+4));
   }
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("accReadHdrPropDLG", this, tqsizeHint());
 
   connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&)));
 
@@ -2138,8 +2138,8 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c
     v_alue->setText(h.mid(pos, h.length()-pos));
   }
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("XHeaderDlg", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("XHeaderDlg", this, tqsizeHint());
 
   n_ame->setFocus();
 }
@@ -2157,7 +2157,7 @@ TQString KNConfig::XHeaderConfDialog::result()
 {
   TQString value = v_alue->text();
   // just in case someone pastes a newline
-  value.replace( '\n', ' ' );
+  value.tqreplace( '\n', ' ' );
   return TQString( "X-%1: %2" ).arg( n_ame->text() ).arg( value );
 }
 
@@ -2237,7 +2237,7 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T
   connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
   editorL->addWidget(btn,1,2);
 
-  editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2);
+  editorL->addMultiCellWidget(new TQLabel(i18n("%f will be tqreplaced with the filename to edit."), editorB),2,2,0,2);
 
   e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB);
   editorL->addMultiCellWidget(e_xternCB, 3,3,0,2);
@@ -2373,10 +2373,10 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
 
   mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this );
   mExpGroup->setColumnLayout(0, Qt::Vertical );
-  mExpGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mExpGroup->layout()->setMargin( KDialog::marginHint() );
+  mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mExpGroup->tqlayout()->setMargin( KDialog::marginHint() );
   top->addWidget( mExpGroup );
-  TQGridLayout *grid = new TQGridLayout( mExpGroup->layout(), 7, 2 );
+  TQGridLayout *grid = new TQGridLayout( mExpGroup->tqlayout(), 7, 2 );
 
   grid->setRowSpacing( 0, KDialog::spacingHint() );
 
@@ -2482,11 +2482,11 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
 
   TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this);
   foldersB->setColumnLayout(0, Qt::Vertical );
-  foldersB->layout()->setSpacing( KDialog::spacingHint() );
-  foldersB->layout()->setMargin( KDialog::marginHint() );
+  foldersB->tqlayout()->setSpacing( KDialog::spacingHint() );
+  foldersB->tqlayout()->setMargin( KDialog::marginHint() );
 
   topL->addWidget(foldersB);
-  TQGridLayout *foldersL=new TQGridLayout(foldersB->layout(), 3,2);
+  TQGridLayout *foldersL=new TQGridLayout(foldersB->tqlayout(), 3,2);
 
   foldersL->setRowSpacing( 0, KDialog::spacingHint() );
 
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 8fdb4890c..ce25167e3 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -96,7 +96,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1);
 
   w_2=new TQLabel(s_tack);
   w_2->setText(i18n("Converting, please wait..."));
-  w_2->setAlignment(AlignCenter);
+  w_2->tqsetAlignment(AlignCenter);
   s_tack->addWidget(w_2, 2);
 
   w_3=new TQWidget(s_tack);
diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp
index cf25d57ef..da8b1a2c3 100644
--- a/knode/kndisplayedheader.cpp
+++ b/knode/kndisplayedheader.cpp
@@ -107,7 +107,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s)
   bool retranslated = false;
   for (const char **c=predef;(*c)!=0;c++) {  // ok, first the standard header names
     if (s==i18n("collection of article headers",*c)) {
-      n_ame = TQString::fromLatin1(*c);
+      n_ame = TQString::tqfromLatin1(*c);
       retranslated = true;
       break;
     }
@@ -116,7 +116,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s)
   if (!retranslated) {
     for (const char **c=disp;(*c)!=0;c++)   // now our standard display names
       if (s==i18n("collection of article headers",*c)) {
-        n_ame = TQString::fromLatin1(*c);
+        n_ame = TQString::tqfromLatin1(*c);
         retranslated = true;
         break;
       }
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index e9ebf66e1..f0151766e 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -74,8 +74,8 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char
   fw->messageId->setFilter(f->messageId);
   fw->references->setFilter(f->references);
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("filterDLG", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("filterDLG", this, tqsizeHint());
 
   setHelp("anc-using-filters");
   connect( fname,  TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & )));
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index be57996f9..9ea8d7ac8 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -205,7 +205,7 @@ void KNFilterManager::addFilter(KNArticleFilter *f)
     for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it )
       activeFilters << (*it)->id();
     int newId = 1;
-    while ( activeFilters.contains( newId ) > 0 )
+    while ( activeFilters.tqcontains( newId ) > 0 )
       newId++;
     f->setId( newId );
   }
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 01855d5bd..81f4f01a6 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -193,7 +193,7 @@ bool KNFolder::loadHdrs()
   int pos1=0, pos2=0, cnt=0, byteCount;
 
   knGlobals.top->setCursorBusy(true);
-  knGlobals.setStatusMsg(i18n(" Loading folder..."));
+  knGlobals.seStatusMsg(i18n(" Loading folder..."));
   knGlobals.top->secureProcessEvents();
 
   while(!i_ndexFile.atEnd()) {
@@ -284,7 +284,7 @@ bool KNFolder::loadHdrs()
       clear();
       closeFiles();
 
-      knGlobals.setStatusMsg(TQString::null);
+      knGlobals.seStatusMsg(TQString::null);
       knGlobals.top->setCursorBusy(false);
       return false;
     }
@@ -297,7 +297,7 @@ bool KNFolder::loadHdrs()
   c_ount=cnt;
   updateListItem();
 
-  knGlobals.setStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString::null);
   knGlobals.top->setCursorBusy(false);
 
   return true;
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index 7e3465bff..e857f4bb2 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -294,7 +294,7 @@ void KNFolderManager::importFromMBox(KNFolder *f)
 
   if (file) {
     knGlobals.top->setCursorBusy(true);
-    knGlobals.setStatusMsg(i18n(" Importing articles..."));
+    knGlobals.seStatusMsg(i18n(" Importing articles..."));
     knGlobals.top->secureProcessEvents();
 
     if (!file->atEnd()) {                // search for the first article...
@@ -360,13 +360,13 @@ void KNFolderManager::importFromMBox(KNFolder *f)
       }
     }
 
-    knGlobals.setStatusMsg(i18n(" Storing articles..."));
+    knGlobals.seStatusMsg(i18n(" Storing articles..."));
     knGlobals.top->secureProcessEvents();
 
     if (!list.isEmpty())
       knGlobals.articleManager()->moveIntoFolder(list, f);
 
-    knGlobals.setStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString::null);
     knGlobals.top->setCursorBusy(false);
   }
 
@@ -391,7 +391,7 @@ void KNFolderManager::exportToMBox(KNFolder *f)
 
   if (file) {
     knGlobals.top->setCursorBusy(true);
-    knGlobals.setStatusMsg(i18n(" Exporting articles..."));
+    knGlobals.seStatusMsg(i18n(" Exporting articles..."));
     knGlobals.top->secureProcessEvents();
 
     TQTextStream ts(file);
@@ -415,7 +415,7 @@ void KNFolderManager::exportToMBox(KNFolder *f)
         knGlobals.top->secureProcessEvents();
     }
 
-    knGlobals.setStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString::null);
     knGlobals.top->setCursorBusy(false);
   }
 }
diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp
index eaf026e8d..7a6f0c222 100644
--- a/knode/knglobals.cpp
+++ b/knode/knglobals.cpp
@@ -134,8 +134,8 @@ KNMemoryManager* KNGlobals::memoryManager()
 }
 
 
-void KNGlobals::setStatusMsg(const TQString &text, int id)
+void KNGlobals::seStatusMsg(const TQString &text, int id)
 {
   if(top)
-    top->setStatusMsg(text, id);
+    top->seStatusMsg(text, id);
 }
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 605f956c6..72ffa1f07 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -75,8 +75,8 @@ class KDE_EXPORT KNGlobals {
     KNScoringManager      *scoringManager();
     KNMemoryManager       *memoryManager();
 
-    /** forwarded to top->setStatusMsg() if available */
-    void setStatusMsg(const TQString& text = TQString::null, int id = SB_MAIN);
+    /** forwarded to top->seStatusMsg() if available */
+    void seStatusMsg(const TQString& text = TQString::null, int id = SB_MAIN);
 
 private:
     KSharedConfig::Ptr c_onfig;
diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index e55bee10e..3584e7447 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -71,7 +71,7 @@ void KNGroup::updateListItem()
   if(!l_istItem) return;
   l_istItem->setTotalCount( c_ount );
   l_istItem->setUnreadCount( c_ount - r_eadCount - i_gnoreCount );
-  l_istItem->repaint();
+  l_istItem->tqrepaint();
 }
 
 
@@ -133,7 +133,7 @@ void KNGroup::saveInfo()
     info.writeEntry("dynDataFormat", d_ynDataFormat);
     info.writeEntry("name", n_ame);
     info.writeEntry("useCharset", u_seCharset);
-    info.writeEntry("defaultChSet", TQString::fromLatin1(d_efaultChSet));
+    info.writeEntry("defaultChSet", TQString::tqfromLatin1(d_efaultChSet));
     switch (s_tatus) {
       case unknown: info.writeEntry("status","unknown");
                     break;
@@ -492,7 +492,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
   }
 
   // now we build the threads
-  syncSearchIndex(); // recreate the msgId-index so it contains the appended headers
+  syncSearchIndex(); // recreate the msgId-index so it tqcontains the appended headers
   buildThreads(added_cnt, client);
   updateThreadInfo();
 
@@ -904,7 +904,7 @@ void KNGroup::scoreArticles(bool onlynew)
     kdDebug(5003) << "scoring " << newCount() << " articles" << endl;
     kdDebug(5003) << "(total " << length() << " article in group)" << endl;
     knGlobals.top->setCursorBusy(true);
-    knGlobals.setStatusMsg(i18n(" Scoring..."));
+    knGlobals.seStatusMsg(i18n(" Scoring..."));
 
     int defScore;
     KScoringManager *sm = knGlobals.scoringManager();
@@ -936,7 +936,7 @@ void KNGroup::scoreArticles(bool onlynew)
         incReadCount();
     }
 
-    knGlobals.setStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString::null);
     knGlobals.top->setCursorBusy(false);
 
     //kdDebug(5003) << KNScorableArticle::notifyC->collection() << endl;
@@ -951,7 +951,7 @@ void KNGroup::reorganize()
   kdDebug(5003) << "KNGroup::reorganize()" << endl;
 
   knGlobals.top->setCursorBusy(true);
-  knGlobals.setStatusMsg(i18n(" Reorganizing headers..."));
+  knGlobals.seStatusMsg(i18n(" Reorganizing headers..."));
 
   for(int idx=0; idxheaderView()->repaint();
-  knGlobals.setStatusMsg(TQString::null);
+  knGlobals.top->headerView()->tqrepaint();
+  knGlobals.seStatusMsg(TQString::null);
   knGlobals.top->setCursorBusy(false);
 }
 
diff --git a/knode/kngroup.h b/knode/kngroup.h
index fef5c6d62..76a9d0dd1 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -124,7 +124,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
     KNConfig::Identity* identity()const          { return i_dentity; }
     void setIdentity(KNConfig::Identity *i) { i_dentity=i; }
     Status status()const                         { return s_tatus; }
-    void setStatus(Status s)                { s_tatus=s; }
+    void seStatus(Status s)                { s_tatus=s; }
     void showProperties();
 
     // cleanup configuration
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index be91593a7..d8e3f8354 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -92,7 +92,7 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp
   connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
           this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
 
-  //layout
+  //tqlayout
   TQGridLayout *topL=new TQGridLayout(page,3,1,0,5);
   TQHBoxLayout *filterL=new TQHBoxLayout(10);
   TQVBoxLayout *arrL=new TQVBoxLayout(10);
@@ -316,7 +316,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
   bool notCheckNew = !newCB->isChecked();
   bool notCheckStr = (filtertxt.isEmpty());
 
-  bool isRegexp = filtertxt.contains(TQRegExp("[^a-z0-9\\-\\+.]"));
+  bool isRegexp = filtertxt.tqcontains(TQRegExp("[^a-z0-9\\-\\+.]"));
 
   bool doIncrementalUpdate = (!isRegexp && incrementalFilter && (filtertxt.left(lastFilter.length())==lastFilter));
 
@@ -411,7 +411,7 @@ KNGroupBrowser::CheckItem::CheckItem(TQListView *v, const KNGroupInfo &gi, KNGro
   TQString des(gi.description);
   if (gi.status == KNGroup::moderated) {
     setText(0,gi.name+" (m)");
-    if (!des.upper().contains(i18n("moderated").upper()))
+    if (!des.upper().tqcontains(i18n("moderated").upper()))
       des+=i18n(" (moderated)");
   }
   setText(1,des);
@@ -424,7 +424,7 @@ KNGroupBrowser::CheckItem::CheckItem(TQListViewItem *i, const KNGroupInfo &gi, K
   TQString des(gi.description);
   if (gi.status == KNGroup::moderated) {
     setText(0,gi.name+" (m)");
-    if (!des.upper().contains(i18n("moderated").upper()))
+    if (!des.upper().tqcontains(i18n("moderated").upper()))
       des+=i18n(" (moderated)");
   }
   setText(1,des);
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 64deea4f8..bff6dfd5b 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -300,7 +300,7 @@ void KNGroupDialog::slotUser2()
   topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1);
 
   KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate);
-  dateSel->setMinimumSize(dateSel->sizeHint());
+  dateSel->setMinimumSize(dateSel->tqsizeHint());
   topL->addWidget(dateSel, 3, 1, Qt::AlignLeft);
 
   connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool)));
@@ -314,7 +314,7 @@ void KNGroupDialog::slotUser2()
   if (dlg->exec()) {
     if (takeCustom->isChecked())
       lastDate = dateSel->date();
-    a_ccount->setLastNewFetch(TQDate::currentDate());
+    a_ccount->setLastNewFetch(TQDate::tqcurrentDate());
     leftLabel->setText(i18n("Checking for new groups..."));
     enableButton(User1,false);
     enableButton(User2,false);
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 429b93bc5..2bece3571 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -139,7 +139,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client)
         }
       }
 
-      if (subscribed.contains(name)) {
+      if (subscribed.tqcontains(name)) {
         subscribed.remove(name);    // group names are unique, we wont find it again anyway...
         sub = true;
       } else
@@ -435,7 +435,7 @@ void KNGroupManager::subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a)
   grp=new KNGroup(a);
   grp->setGroupname(gi->name);
   grp->setDescription(gi->description);
-  grp->setStatus(gi->status);
+  grp->seStatus(gi->status);
   grp->saveInfo();
   mGroupList.append( grp );
   emit groupAdded(grp);
@@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j)
               for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() )
                 if ( inf->name == (*it)->groupname() ) {
                   (*it)->setDescription( inf->description );
-                  (*it)->setStatus( inf->status );
+                  (*it)->seStatus( inf->status );
                   break;
                 }
             }
diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h
index f42407126..f93b57046 100644
--- a/knode/kngroupmanager.h
+++ b/knode/kngroupmanager.h
@@ -31,7 +31,7 @@ class KNCleanUp;
 //=================================================================================
 
 /** helper classes for the group selection dialog
-    contains info about a newsgroup (name, description) */
+    tqcontains info about a newsgroup (name, description) */
 
 class KNGroupInfo {
 
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index 3ad2fee7a..4983b428c 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -152,7 +152,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam
   cleanupLayout->addWidget( mCleanupWidget );
   cleanupLayout->addStretch( 1 );
 
-  KNHelper::restoreWindowSize("groupPropDLG", this, sizeHint());
+  KNHelper::restoreWindowSize("groupPropDLG", this, tqsizeHint());
 }
 
 
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index 2cb024011..199abce86 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -104,7 +104,7 @@ TQString KNGroupSelectDialog::selectedGroups()const
   }
 
   if (moderated && (count>=2))   // warn the user
-     KMessageBox::information(parentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."),
+     KMessageBox::information(tqparentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."),
                               TQString::null,"crosspostModeratedWarning");
 
   return ret;
diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp
index e547b11d9..c7f500a06 100644
--- a/knode/knhdrviewitem.cpp
+++ b/knode/knhdrviewitem.cpp
@@ -114,7 +114,7 @@ int KNHdrViewItem::compare( TQListViewItem *i, int col, bool ) const
 }
 
 
-void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
+void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
 {
   int xText = 0, xPM = 3, yPM = 0;
   TQColor base;
@@ -172,7 +172,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
     else
       mShowToolTip[column] = false;
 
-    p->drawText( xText, 0, width - xText - 5, height(), alignment | AlignVCenter,  t );
+    p->drawText( xText, 0, width - xText - 5, height(), tqalignment | AlignVCenter,  t );
     if (cntWidth) {
       TQFont orig = p->font();
       p->setFont( f2 );
@@ -183,7 +183,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
         pen.setColor( cg.link() );
       }
       p->setPen( pen );
-      p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), alignment | AlignVCenter,  t2 );
+      p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), tqalignment | AlignVCenter,  t2 );
     }
   }
 }
diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h
index 476c6d53c..163a45070 100644
--- a/knode/knhdrviewitem.h
+++ b/knode/knhdrviewitem.h
@@ -33,7 +33,7 @@ class KNHdrViewItem : public KListViewItem  {
 
     virtual int compare(TQListViewItem *i, int col, bool ascending) const;
 
-    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
+    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
     int width(const TQFontMetrics &fm, const TQListView *lv, int column);
 
     virtual TQString text( int col ) const;
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index 5d46c29d9..a0def5d1e 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -95,7 +95,7 @@ void KNJobData::cancel()
     mJob = 0;
   }
   if ( mProgressItem ) {
-    mProgressItem->setStatus( "Canceled" );
+    mProgressItem->seStatus( "Canceled" );
     mProgressItem->setComplete();
     mProgressItem = 0;
   }
@@ -140,7 +140,7 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent )
 void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg )
 {
   kdDebug(5003) << k_funcinfo << "Status: " << msg << endl;
-  setStatus( msg );
+  seStatus( msg );
 }
 
 
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index 35b54e934..14b1bca7e 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -114,7 +114,7 @@ class KNJobData : public QObject
     void createProgressItem();
 
     // safe forwards to the progress item
-    void setStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setStatus( msg ); }
+    void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); }
     void setProgress( unsigned int progress ) { if ( mProgressItem ) mProgressItem->setProgress( progress ); }
     void setComplete() { if ( mProgressItem ) { mProgressItem->setComplete(); mProgressItem = 0; } }
 
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 0697a919e..6686d3f01 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -34,7 +34,7 @@
 #include "broadcaststatus.h"
 #include "krsqueezedtextlabel.h"
 #include "recentaddresses.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 using KRecentAddress::RecentAddresses;
 
 //GUI
@@ -85,7 +85,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   //--------------------------------  ------------------------------------
   TQAccel *accel = new TQAccel( this );
-  initStatusBar();
+  iniStatusBar();
 
   //setup splitter behavior
   manager()->setSplitterHighResolution(true);
@@ -253,7 +253,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   c_olView->setFocus();
 
-  setStatusMsg();
+  seStatusMsg();
 
   if( firstStart() ) {  // open the config dialog on the first start
     show();              // the settings dialog must appear in front of the main window!
@@ -302,35 +302,35 @@ KNMainWidget::~KNMainWidget()
   delete a_rtDock;
 }
 
-void KNMainWidget::initStatusBar()
+void KNMainWidget::iniStatusBar()
 {
   //statusbar
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   s_tatusFilter = new KRSqueezedTextLabel( TQString::null, sb );
-  s_tatusFilter->setAlignment( AlignLeft | AlignVCenter );
+  s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter );
   s_tatusGroup = new KRSqueezedTextLabel( TQString::null, sb );
-  s_tatusGroup->setAlignment( AlignLeft | AlignVCenter );
+  s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter );
 }
 
 //================================== GUI =================================
 
-void KNMainWidget::setStatusMsg(const TQString& text, int id)
+void KNMainWidget::seStatusMsg(const TQString& text, int id)
 {
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KStatusBar *bar =  mainWin ? mainWin->statusBar() : 0;
   if ( !bar )
     return;
   bar->clear();
   if (text.isEmpty() && (id==SB_MAIN)) {
     if (knGlobals.netAccess()->currentMsg().isEmpty())
-      BroadcastStatus::instance()->setStatusMsg(i18n(" Ready"));
+      BroadcasStatus::instance()->seStatusMsg(i18n(" Ready"));
     else
-      BroadcastStatus::instance()->setStatusMsg(knGlobals.netAccess()->currentMsg());
+      BroadcasStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg());
   } else {
     switch(id) {
       case SB_MAIN:
-        BroadcastStatus::instance()->setStatusMsg(text); break;
+        BroadcasStatus::instance()->seStatusMsg(text); break;
       case SB_GROUP:
         s_tatusGroup->setText(text); break;
       case SB_FILTER:
@@ -340,9 +340,9 @@ void KNMainWidget::setStatusMsg(const TQString& text, int id)
 }
 
 
-void KNMainWidget::setStatusHelpMsg(const TQString& text)
+void KNMainWidget::seStatusHelpMsg(const TQString& text)
 {
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KStatusBar *bar =  mainWin ? mainWin->statusBar() : 0;
   if ( bar )
     bar->message(text, 2000);
@@ -375,7 +375,7 @@ void KNMainWidget::setCursorBusy(bool b)
 void KNMainWidget::blockUI(bool b)
 {
   b_lockui = b;
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KMenuBar *mbar =  mainWin ? mainWin->menuBar() : 0;
   if ( mbar )
     mbar->setEnabled(!b);
@@ -394,7 +394,7 @@ void KNMainWidget::blockUI(bool b)
 void KNMainWidget::disableAccels(bool b)
 {
   a_ccel->setEnabled(!b);
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KAccel *naccel = mainWin ? mainWin->accel() : 0;
   if ( naccel )
     naccel->setEnabled(!b);
@@ -409,7 +409,7 @@ void KNMainWidget::disableAccels(bool b)
 void KNMainWidget::secureProcessEvents()
 {
   b_lockui = true;
-  KMainWindow *mainWin = dynamic_cast(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast(tqtopLevelWidget());
   KMenuBar *mbar =  mainWin ? mainWin->menuBar() : 0;
   if ( mbar )
     mbar->setEnabled(false);
@@ -431,7 +431,7 @@ void KNMainWidget::secureProcessEvents()
 }
 
 
-TQSize KNMainWidget::sizeHint() const
+TQSize KNMainWidget::tqsizeHint() const
 {
   return TQSize(759,478);    // default optimized for 800x600
 }
@@ -484,7 +484,7 @@ void KNMainWidget::openURL(const KURL &url)
   }
 
   if (acc) {
-    bool isMID=(url.url().contains('@')==1);
+    bool isMID=(url.url().tqcontains('@')==1);
 
     if (!isMID) {
       TQString groupname=url.path(-1);
@@ -903,7 +903,7 @@ bool KNMainWidget::queryClose()
 
 void KNMainWidget::showEvent(TQShowEvent *)
 {
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
@@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b)
 }
 
 
-void KNMainWidget::slotCheckDockWidgetStatus()
+void KNMainWidget::slotCheckDockWidgeStatus()
 {
   a_ctToggleGroupView->setChecked(c_olDock->isVisible());
   a_ctToggleArticleViewer->setChecked(a_rtDock->isVisible());
@@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID()
 void KNMainWidget::slotToggleGroupView()
 {
   c_olDock->changeHideShowState();
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
@@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView()
       if ( !h_drDock->isDockBackPossible() ) {
           h_drDock->manualDock( a_rtDock, KDockWidget::DockTop );
           h_drDock->makeDockVisible();
-          slotCheckDockWidgetStatus();
+          slotCheckDockWidgeStatus();
           return;
       }
 
   h_drDock->changeHideShowState();
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
 void KNMainWidget::slotToggleArticleViewer()
 {
   a_rtDock->changeHideShowState();
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 void KNMainWidget::slotToggleQuickSearch()
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index 5a02790c7..4717e3337 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -72,8 +72,8 @@ public:
   void prepareShutdown();
 
   //GUI
-  void setStatusMsg(const TQString& = TQString::null, int id=SB_MAIN);
-  void setStatusHelpMsg(const TQString& text);
+  void seStatusMsg(const TQString& = TQString::null, int id=SB_MAIN);
+  void seStatusHelpMsg(const TQString& text);
   void updateCaption();
   void setCursorBusy(bool b=true);
   void blockUI(bool b=true);
@@ -82,7 +82,7 @@ public:
   void secureProcessEvents();
 
   /** useful default value */
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
   /** handle URL given as command-line argument */
   void openURL(const KURL &url);
@@ -163,7 +163,7 @@ protected:
   KXMLGUIFactory *factory() const;
 
   void initActions();
-  void initStatusBar();
+  void iniStatusBar();
 
   /** checks if run for the first time, sets some global defaults (email configuration) */
   bool firstStart();
@@ -229,7 +229,7 @@ protected slots:
   void slotNetworkActive(bool b);
 
   //dock widget slots
-  void slotCheckDockWidgetStatus();
+  void slotCheckDockWidgeStatus();
   void slotGroupDockHidden();
   void slotHeaderDockHidden();
   void slotArticleDockHidden();
diff --git a/knode/knmemorymanager.cpp b/knode/knmemorymanager.cpp
index 37a639287..365e9f8c9 100644
--- a/knode/knmemorymanager.cpp
+++ b/knode/knmemorymanager.cpp
@@ -162,7 +162,7 @@ void KNMemoryManager::checkMemoryUsageCollections()
     for ( TQValueList::Iterator it = tempList.begin(); it != tempList.end(); ) {
       if ( c_ollCacheSize <= maxSize )
         break;
-      // unloadHeaders() will remove the cache entry and thus invalidate the iterator!
+      // unloadHeaders() will remove the cache entry and thus tqinvalidate the iterator!
       c = (*it)->col;
       ++it;
 
@@ -191,7 +191,7 @@ void KNMemoryManager::checkMemoryUsageArticles()
     for ( TQValueList::Iterator it = mArtList.begin(); it != mArtList.end(); ) {
       if ( a_rtCacheSize <= maxSize )
         break;
-      // unloadArticle() will remove the cache entry and thus invalidate the iterator!
+      // unloadArticle() will remove the cache entry and thus tqinvalidate the iterator!
       KNArticle *art = (*it)->art;
       ++it;
       knGlobals.articleManager()->unloadArticle( art, false );   // *try* to unload
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 7fc6fd371..016a39ee6 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
   if ( !job->account()->readyForLogin() ) {
     mWalletQueue.append( job );
     knGlobals.accountManager()->loadPasswordsAsync();
-    job->setStatus( i18n( "Waiting for KWallet..." ) );
+    job->seStatus( i18n( "Waiting for KWallet..." ) );
     return;
   }
 
@@ -332,7 +332,7 @@ void KNNetAccess::threadDoneNntp()
   currentNntpJob = 0L;
 
   currMsg = TQString::null;
-  knGlobals.setStatusMsg();
+  knGlobals.seStatusMsg();
   tmp->setComplete();
 
   tmp->notifyConsumer();
@@ -359,7 +359,7 @@ void KNNetAccess::threadDoneSmtp()
   currentSmtpJob = 0L;
   if (!currentNntpJob) {
     currMsg = TQString::null;
-    knGlobals.setStatusMsg();
+    knGlobals.seStatusMsg();
   }
   tmp->setComplete();
 
@@ -398,53 +398,53 @@ void KNNetAccess::slotThreadSignal(int i)
       break;
       case KNProtocolClient::TSconnect:
         currMsg = i18n(" Connecting to server...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSloadGrouplist:
         currMsg = i18n(" Loading group list from disk...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSwriteGrouplist:
         currMsg = i18n(" Writing group list to disk...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadGrouplist:
         currMsg = i18n(" Downloading group list...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNewGroups:
         currMsg = i18n(" Looking for new groups...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadDesc:
         currMsg = i18n(" Downloading group descriptions...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNew:
         currMsg = i18n(" Downloading new headers...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSsortNew:
         currMsg = i18n(" Sorting...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadArticle:
         currMsg = i18n(" Downloading article...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSsendArticle:
         currMsg = i18n(" Sending article...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSjobStarted:
         currentNntpJob->setProgress(0);
@@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged()
 {
   TQValueList::ConstIterator it;
   for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) {
-    (*it)->setStatus( i18n("Waiting...") );
+    (*it)->seStatus( i18n("Waiting...") );
     if ( (*it)->type() == KNJobData::JTmail )
       smtpJobQueue.append( (*it) );
     else
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index ba1657c0c..1887baae5 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -75,7 +75,7 @@ void KNNntpAccountIntervalChecking::slotCheckNews()
 KNNntpAccount::KNNntpAccount()
   : KNCollection(0), KNServerInfo(), i_dentity(0), f_etchDescriptions(true), w_asOpen(false), i_ntervalChecking(false), c_heckInterval(10)
 {
-  l_astNewFetch = TQDate::currentDate();
+  l_astNewFetch = TQDate::tqcurrentDate();
   a_ccountIntervalChecking = new KNNntpAccountIntervalChecking(this);
   mCleanupConf = new KNConfig::Cleanup( false );
 }
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index 47942d6b3..dd4f28feb 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -115,7 +115,7 @@ void KNNntpClient::doFetchGroups()
 
       name = TQString::fromUtf8(line);
 
-      if (target->subscribed.contains(name)) {
+      if (target->subscribed.tqcontains(name)) {
         target->subscribed.remove(name);    // group names are unique, we wont find it again anyway...
         subscribed = true;
       } else
diff --git a/knode/knode.cpp b/knode/knode.cpp
index c2d7ee7f6..d3df5b748 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -55,7 +55,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
            TQT_SLOT( setCaption(const TQString&)) );
   setCentralWidget( m_mainWidget );
   setupStatusBar();
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
     this, TQT_SLOT(slotShowStatusMsg(const TQString& )) );
   createGUI( "knodeui.rc" );
   knGlobals.instance = 0;
@@ -109,7 +109,7 @@ void KNMainWindow::setupStatusBar()
   statusBar()->addWidget( mLittleProgress, 0 , true );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( TQString::null, statusBar() );
-  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
   statusBar()->addWidget( mStatusMsgLabel, 2 );
   statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2);
   statusBar()->addWidget(m_mainWidget->statusBarLabelGroup(), 3);
diff --git a/knode/knode.h b/knode/knode.h
index d628df1b6..2c350c622 100644
--- a/knode/knode.h
+++ b/knode/knode.h
@@ -46,7 +46,7 @@ class KNMainWindow : public KMainWindow
   Q_OBJECT
 
 public:
-  KNMainWindow( TQWidget* parentWidget=0 );
+  KNMainWindow( TQWidget* tqparentWidget=0 );
   ~KNMainWindow();
   void openURL( const KURL& );
   KNMainWidget *mainWidget() { return m_mainWidget; }
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 52b3e4dd6..3e54361ae 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -47,10 +47,10 @@
 typedef KParts::GenericFactory< KNodePart > KNodeFactory;
 K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory )
 
-KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
+KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName,
 		     TQObject *parent, const char *name, const TQStringList &)
   : KParts::ReadOnlyPart(parent, name),
-  mParentWidget( parentWidget )
+  mParentWidget( tqparentWidget )
 {
   kdDebug(5003) << "KNodePart()" << endl;
   kdDebug(5003) << "  InstanceName: " << kapp->instanceName() << endl;
@@ -67,7 +67,7 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
   knGlobals.instance = KNodeFactory::instance();
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget(parentWidget, widgetName);
+  TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
   canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
 
@@ -114,7 +114,7 @@ void KNodePart::guiActivateEvent(KParts::GUIActivateEvent *e)
 }
 
 
-TQWidget* KNodePart::parentWidget() const
+TQWidget* KNodePart::tqparentWidget() const
 {
   return mParentWidget;
 }
diff --git a/knode/knode_part.h b/knode/knode_part.h
index 67e1ae549..1e9a4904b 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -43,11 +43,11 @@ class KNodePart: public KParts::ReadOnlyPart
 {
     Q_OBJECT
   public:
-    KNodePart(TQWidget *parentWidget, const char *widgetName,
+    KNodePart(TQWidget *tqparentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
     virtual ~KNodePart();
 
-    TQWidget* parentWidget() const;
+    TQWidget* tqparentWidget() const;
 
     static KAboutData *createAboutData();
 
diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp
index ee14c794f..a0f018566 100644
--- a/knode/knrangefilter.cpp
+++ b/knode/knrangefilter.cpp
@@ -118,7 +118,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max
   op2->insertItem("<=");
 
   des=new TQLabel(value, this);
-  des->setAlignment(AlignCenter);
+  des->tqsetAlignment(AlignCenter);
 
   TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 );
 
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index f72afe472..4344cbbab 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -68,8 +68,8 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
   f_ilter->setLoaded(true);
   f_ilter->setSearchFilter(true);
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("searchDlg", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("searchDlg", this, tqsizeHint());
   fcw->setStartFocus();
 }
 
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index d314a7710..0a2598159 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -78,9 +78,9 @@ void KNServerInfo::readConf(KConfig *conf)
     readPassword();
 
   TQString encStr = conf->readEntry( "encryption", "None" );
-  if ( encStr.contains( "SSL", false ) )
+  if ( encStr.tqcontains( "SSL", false ) )
     mEncryption = SSL;
-  else if ( encStr.contains( "TLS", false ) )
+  else if ( encStr.tqcontains( "TLS", false ) )
     mEncryption = TLS;
   else
     mEncryption = None;
diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp
index 4f69f7eaf..3f866902b 100644
--- a/knode/knstringfilter.cpp
+++ b/knode/knstringfilter.cpp
@@ -57,7 +57,7 @@ bool KNStringFilter::doFilter(const TQString &s)
 
 
 
-// replace placeholders
+// tqreplace placeholders
 void KNStringFilter::expand(KNGroup *g)
 {
   KNConfig::Identity *id = (g) ? g->identity() : 0;
@@ -69,15 +69,15 @@ void KNStringFilter::expand(KNGroup *g)
   }
 
   expanded = data;
-  expanded.replace(TQRegExp("%MYNAME"), id->name());
-  expanded.replace(TQRegExp("%MYEMAIL"), id->email());
+  expanded.tqreplace(TQRegExp("%MYNAME"), id->name());
+  expanded.tqreplace(TQRegExp("%MYEMAIL"), id->email());
 }
 
 
 
 void KNStringFilter::load(KSimpleConfig *conf)
 {
-  con=conf->readBoolEntry("contains", true);
+  con=conf->readBoolEntry("tqcontains", true);
   data=conf->readEntry("Data");
   regExp=conf->readBoolEntry("regX", false);
 }
@@ -86,7 +86,7 @@ void KNStringFilter::load(KSimpleConfig *conf)
 
 void KNStringFilter::save(KSimpleConfig *conf)
 {
-  conf->writeEntry("contains", con);
+  conf->writeEntry("tqcontains", con);
   conf->writeEntry("Data", data);
   conf->writeEntry("regX", regExp);
 }
diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h
index ac33c1d65..5720c6a89 100644
--- a/knode/knstringfilter.h
+++ b/knode/knstringfilter.h
@@ -37,7 +37,7 @@ class KNStringFilter {
     ~KNStringFilter() {}
 
     KNStringFilter& operator=(const KNStringFilter &sf);
-    /** replace placeholders */
+    /** tqreplace placeholders */
     void expand(KNGroup *g);
           
     void load(KSimpleConfig *conf);
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index d75cf9bf7..d3f1d7b57 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -107,10 +107,10 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e)
 //====================================================================================
 
 
-KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
+KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
   : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false)
 {
-  connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
+  connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
 }
 
 
@@ -141,7 +141,7 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev)
   TQPainter paint;
 
   paint.begin(&drawBuffer);
-  paint.fillRect(drawBuffer.rect(), TQBrush(colorGroup().brush(TQColorGroup::Background)));
+  paint.fillRect(drawBuffer.rect(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)));
 
   paint.setPen(palette().active().highlight());
   paint.drawLine(1, 2, width(), 2);
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index bb01ba22a..d1a19e367 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -71,7 +71,7 @@ class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag
   Q_OBJECT
 
   public:
-    KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
+    KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
                             const char* name = 0);
     virtual ~KNDockWidgetHeaderDrag();
 
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index 9acad519c..f6565365e 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -4,7 +4,7 @@
     
         SmtpAccountWidgetBase
     
-    
+    
         
             0
             0
@@ -86,7 +86,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     40
@@ -223,7 +223,7 @@
     useExternalMailerToggled(bool)
     loginToggled(bool)
 
-
+
 
     kcmodule.h
     klineedit.h
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 67d4e3bac..1e7dcba9d 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
   if (url.isLocalFile()) {
     if (TQFileInfo(url.path()).exists() &&
         (KMessageBox::warningContinueCancel(knGlobals.topWidget,
-                                            i18n("A file named %1 already exists.
    Do you want to replace it?    ").arg(url.path()),
+                                            i18n("A file named %1 already exists.
    Do you want to tqreplace it?    ").arg(url.path()),
                                             dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) {
       return 0;
     }
@@ -274,7 +274,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt
   TQString s;
   for ( TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it ) {
     s = (*it);
-    s.replace(TQRegExp("&"),"");   // remove accelerators
+    s.tqreplace(TQRegExp("&"),"");   // remove accelerators
     list->insertItem(s);
   }
 
@@ -293,7 +293,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt
   return ret;
 }
 
-// **** window geometry managing *********************************************
+// **** window tqgeometry managing *********************************************
 
 void KNHelper::saveWindowSize(const TQString &name, const TQSize &s)
 {
@@ -427,7 +427,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
     thisLine = thisLine.stripWhiteSpace();
 
     if(!leftover.isEmpty()) {   // don't break paragraphs, tables and quote levels
-      if(thisLine.isEmpty() || (thisPrefix!=lastPrefix) || thisLine.contains("  ") || thisLine.contains('\t'))
+      if(thisLine.isEmpty() || (thisPrefix!=lastPrefix) || thisLine.tqcontains("  ") || thisLine.tqcontains('\t'))
         appendTextWPrefix(quoted, leftover, wrapAt, lastPrefix);
       else
         thisLine.prepend(leftover+" ");
diff --git a/knotes/Makefile.am b/knotes/Makefile.am
index 73f678a18..0f3eb458f 100644
--- a/knotes/Makefile.am
+++ b/knotes/Makefile.am
@@ -35,7 +35,7 @@ kde_module_LTLIBRARIES  = knotes_local.la
 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
 knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
 knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la libknotesprinting.la \
-                          $(top_builddir)/libkcal/libkcal.la -lkdeprint
+                          $(top_builddir)/libkcal/libkcal.la -lkdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources
 
 METASOURCES     = AUTO
 
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 9e644d7a6..d4ce67b50 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -202,17 +202,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     m_editor->setCornerWidget( new TQSizeGrip( this ) );
     uint width = m_editor->cornerWidget()->width();
     uint height = m_editor->cornerWidget()->height();
-    TQBitmap mask;
-    mask.resize( width, height );
-    mask.fill( color0 );
+    TQBitmap tqmask;
+    tqmask.resize( width, height );
+    tqmask.fill( color0 );
     TQPointArray array;
     array.setPoints( 3, 0, height, width, height, width, 0 );
     TQPainter p;
-    p.begin( &mask );
+    p.begin( &tqmask );
     p.setBrush( color1 );
     p.drawPolygon( array );
     p.end();
-    m_editor->cornerWidget()->setMask( mask );
+    m_editor->cornerWidget()->setMask( tqmask );
     m_editor->cornerWidget()->setBackgroundMode( PaletteBase );
 
     // the config file location
@@ -321,7 +321,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     // read configuration settings...
     slotApplyConfig();
 
-    // create the mask for the fold---to be done after slotApplyConfig(),
+    // create the tqmask for the fold---to be done after slotApplyConfig(),
     // which calls createFold()
     m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) );
 
@@ -774,7 +774,7 @@ void KNote::slotClose()
 
 void KNote::slotInsDate()
 {
-    m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) );
+    m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()) );
 }
 
 void KNote::slotSetAlarm()
@@ -861,7 +861,7 @@ void KNote::slotPrint()
     printer.setFont( m_config->font() );
     printer.setContext( m_editor->context() );
     printer.setStyleSheet( m_editor->styleSheet() );
-    printer.setColorGroup( colorGroup() );
+    printer.tqsetColorGroup( tqcolorGroup() );
     printer.printNote( TQString(), content );
 }
 
@@ -1035,9 +1035,9 @@ void KNote::updateLabelAlignment()
     // if the name is too long to fit, left-align it, otherwise center it (#59028)
     TQString labelText = m_label->text();
     if ( m_label->fontMetrics().boundingRect( labelText ).width() > m_label->width() )
-        m_label->setAlignment( AlignLeft );
+        m_label->tqsetAlignment( AlignLeft );
     else
-        m_label->setAlignment( AlignHCenter );
+        m_label->tqsetAlignment( AlignHCenter );
 }
 
 void KNote::updateFocus()
@@ -1100,7 +1100,7 @@ void KNote::updateMask()
     int h = height();
     TQRegion reg( 0, s_ppOffset, w, h - s_ppOffset );
 
-    const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->mask();
+    const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->tqmask();
     TQRegion pushpin_reg( *pushpin_bitmap );
     m_pushpin->setMask( pushpin_reg );
     pushpin_reg.translate( m_pushpin->x(), m_pushpin->y() );
@@ -1120,7 +1120,7 @@ void KNote::updateBackground( int y_offset )
 {
     if ( !s_ppOffset )
     {
-        m_editor->setPaper( TQBrush( colorGroup().background() ) );
+        m_editor->setPaper( TQBrush( tqcolorGroup().background() ) );
         return;
     }
 
@@ -1160,7 +1160,7 @@ void KNote::updateBackground( int y_offset )
 
 void KNote::updateLayout()
 {
-    const int headerHeight = m_label->sizeHint().height();
+    const int headerHeight = m_label->tqsizeHint().height();
     const int margin = m_editor->margin();
     bool closeLeft = false;
 
@@ -1240,9 +1240,9 @@ void KNote::drawFrame( TQPainter *p )
     TQRect r = frameRect();
     r.setTop( s_ppOffset );
     if ( s_ppOffset )
-        qDrawShadePanel( p, r, colorGroup(), false, lineWidth() );
+        qDrawShadePanel( p, r, tqcolorGroup(), false, lineWidth() );
     else
-        qDrawWinPanel( p, r, colorGroup(), false );
+        qDrawWinPanel( p, r, tqcolorGroup(), false );
 }
 
 void KNote::showEvent( TQShowEvent * )
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index b6cf49bc4..230ba4d44 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -34,7 +34,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na
     : TQPushButton( parent, name )
 {
     setFocusPolicy( NoFocus );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
     m_flat = true;
 
@@ -49,18 +49,18 @@ KNoteButton::~KNoteButton()
 void KNoteButton::enterEvent( TQEvent * )
 {
     m_flat = false;
-    repaint( false );
+    tqrepaint( false );
 }
 
 void KNoteButton::leaveEvent( TQEvent * )
 {
     m_flat = true;
-    repaint();
+    tqrepaint();
 }
 
-TQSize KNoteButton::sizeHint() const
+TQSize KNoteButton::tqsizeHint() const
 {
-    return TQSize( TQPushButton::sizeHint().height(), TQPushButton::sizeHint().height() );
+    return TQSize( TQPushButton::tqsizeHint().height(), TQPushButton::tqsizeHint().height() );
 }
 
 void KNoteButton::drawButton( TQPainter* p )
@@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p )
     if ( !m_flat )
         flags |= TQStyle::Style_MouseOver;
 
-    style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags );
+    style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), tqcolorGroup(), flags );
     drawButtonLabel( p );
 }
 
@@ -102,8 +102,8 @@ void KNoteButton::drawButtonLabel( TQPainter* p )
         // Shift button contents if pushed.
         if ( isOn() || isDown() )
         {
-            dx += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-            dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+            dx += style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+            dy += style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
         }
 
         p->drawPixmap( dx, dy, pix );
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 1825ce948..735fc1070 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -35,7 +35,7 @@ public:
     KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 );
     ~KNoteButton();
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 protected:
     virtual void enterEvent( TQEvent * );
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index a1238768b..a88337090 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption()
 TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
 {
     TQWidget *displayPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2,
                                            defaults ? marginHint() : 0, spacingHint() );
 
     TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" );
-    layout->addWidget( label_FgColor, 0, 0 );
+    tqlayout->addWidget( label_FgColor, 0, 0 );
 
     KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" );
     label_FgColor->setBuddy( kcfg_FgColor );
-    layout->addWidget( kcfg_FgColor, 0, 1 );
+    tqlayout->addWidget( kcfg_FgColor, 0, 1 );
 
     TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" );
-    layout->addWidget( label_BgColor, 1, 0 );
+    tqlayout->addWidget( label_BgColor, 1, 0 );
 
     KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" );
     label_BgColor->setBuddy( kcfg_BgColor );
-    layout->addWidget( kcfg_BgColor, 1, 1 );
+    tqlayout->addWidget( kcfg_BgColor, 1, 1 );
 
     TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"),
                                                    displayPage, "kcfg_ShowInTaskbar" );
@@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
     if ( defaults )
     {
         TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" );
-        layout->addWidget( label_Width, 2, 0 );
+        tqlayout->addWidget( label_Width, 2, 0 );
 
         KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" );
         label_Width->setBuddy( kcfg_Width );
         kcfg_Width->setRange( 50, 2000, 10, false );
-        layout->addWidget( kcfg_Width, 2, 1 );
+        tqlayout->addWidget( kcfg_Width, 2, 1 );
 
         TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" );
-        layout->addWidget( label_Height, 3, 0 );
+        tqlayout->addWidget( label_Height, 3, 0 );
 
         KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" );
         kcfg_Height->setRange( 50, 2000, 10, false );
         label_Height->setBuddy( kcfg_Height );
-        layout->addWidget( kcfg_Height, 3, 1 );
+        tqlayout->addWidget( kcfg_Height, 3, 1 );
 
-        layout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
+        tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
     }
     else
-        layout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
+        tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
 
     return displayPage;
 }
@@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
 TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults )
 {
     TQWidget *editorPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3,
+    TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3,
                                            defaults ? marginHint() : 0, spacingHint() );
 
     TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" );
-    layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
 
     KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" );
     kcfg_TabSize->setRange( 0, 40, 1, false );
     label_TabSize->setBuddy( kcfg_TabSize );
-    layout->addWidget( kcfg_TabSize, 0, 2 );
+    tqlayout->addWidget( kcfg_TabSize, 0, 2 );
 
     TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" );
-    layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
+    tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
 
     TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" );
-    layout->addWidget( kcfg_RichText, 1, 2 );
+    tqlayout->addWidget( kcfg_RichText, 1, 2 );
 
     TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" );
-    layout->addWidget( label_Font, 3, 0 );
+    tqlayout->addWidget( label_Font, 3, 0 );
 
     KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" );
-    kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-    layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
+    kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
 
     TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" );
-    layout->addWidget( label_TitleFont, 2, 0 );
+    tqlayout->addWidget( label_TitleFont, 2, 0 );
 
     KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" );
-    kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-    layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
+    kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
 
     return editorPage;
 }
@@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage()
 TQWidget *KNoteConfigDlg::makeActionsPage()
 {
     TQWidget *actionsPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
 
     TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" );
-    layout->addWidget( label_MailAction, 0, 0 );
+    tqlayout->addWidget( label_MailAction, 0, 0 );
 
     KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" );
     label_MailAction->setBuddy( kcfg_MailAction );
-    layout->addWidget( kcfg_MailAction, 0, 1 );
+    tqlayout->addWidget( kcfg_MailAction, 0, 1 );
 
     return actionsPage;
 }
@@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage()
 TQWidget *KNoteConfigDlg::makeNetworkPage()
 {
     TQWidget *networkPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
 
     TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage );
-    layout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
 
     new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" );
 
     TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage );
-    layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
+    tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
 
     TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" );
     KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" );
     label_SenderID->setBuddy( kcfg_SenderID );
 
     TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" );
-    layout->addWidget( label_Port, 2, 0 );
+    tqlayout->addWidget( label_Port, 2, 0 );
 
     KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" );
     kcfg_Port->setRange( 0, 65535, 1, false );
     label_Port->setBuddy( kcfg_Port );
-    layout->addWidget( kcfg_Port, 2, 1 );
+    tqlayout->addWidget( kcfg_Port, 2, 1 );
 
     return networkPage;
 }
@@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage()
 TQWidget *KNoteConfigDlg::makeStylePage()
 {
     TQWidget *stylePage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
 
     TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" );
-    layout->addWidget( label_Style, 0, 0 );
+    tqlayout->addWidget( label_Style, 0, 0 );
 
     TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" );
     TQStringList list;
     list << "Plain" << "Fancy";
     kcfg_Style->insertStringList( list );
     label_Style->setBuddy( kcfg_Style );
-    layout->addWidget( kcfg_Style, 0, 1 );
+    tqlayout->addWidget( kcfg_Style, 0, 1 );
 
     return stylePage;
 }
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 7b99254b0..d89cfd37e 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -149,7 +149,7 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
     connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )),
              this, TQT_SLOT(colorChanged( const TQColor & )) );
     connect( this, TQT_SIGNAL(currentAlignmentChanged( int )),
-             this, TQT_SLOT(alignmentChanged( int )) );
+             this, TQT_SLOT(tqalignmentChanged( int )) );
     connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )),
              this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
 }
@@ -219,7 +219,7 @@ void KNoteEdit::setTextFormat( TextFormat f )
         TQString t = text();
         KTextEdit::setTextFormat( f );
 
-        // if the note contains html/xml source try to display it, otherwise
+        // if the note tqcontains html/xml source try to display it, otherwise
         // get the modified text again and set it to preserve newlines
         if ( TQStyleSheet::mightBeRichText( t ) )
             setText( t );
@@ -298,25 +298,25 @@ void KNoteEdit::textColor()
 
 void KNoteEdit::textAlignLeft()
 {
-    setAlignment( AlignLeft );
+    tqsetAlignment( AlignLeft );
     m_textAlignLeft->setChecked( true );
 }
 
 void KNoteEdit::textAlignCenter()
 {
-    setAlignment( AlignCenter );
+    tqsetAlignment( AlignCenter );
     m_textAlignCenter->setChecked( true );
 }
 
 void KNoteEdit::textAlignRight()
 {
-    setAlignment( AlignRight );
+    tqsetAlignment( AlignRight );
     m_textAlignRight->setChecked( true );
 }
 
 void KNoteEdit::textAlignBlock()
 {
-    setAlignment( AlignJustify );
+    tqsetAlignment( AlignJustify );
     m_textAlignBlock->setChecked( true );
 }
 
@@ -409,7 +409,7 @@ void KNoteEdit::colorChanged( const TQColor &c )
     m_textColor->setIconSet( pix );
 }
 
-void KNoteEdit::alignmentChanged( int a )
+void KNoteEdit::tqalignmentChanged( int a )
 {
     // TODO: AlignAuto
     if ( ( a == AlignAuto ) || ( a & AlignLeft ) )
@@ -451,7 +451,7 @@ void KNoteEdit::autoIndent()
 
     // This routine returns the whitespace before the first non white space
     // character in string.
-    // It is assumed that string contains at least one non whitespace character
+    // It is assumed that string tqcontains at least one non whitespace character
     // ie \n \r \t \v \f and space
     TQString indentString;
 
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index 0e6a6e4b4..2e183bfc2 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -81,7 +81,7 @@ private slots:
 
     void fontChanged( const TQFont &f );
     void colorChanged( const TQColor &c );
-    void alignmentChanged( int a );
+    void tqalignmentChanged( int a );
     void verticalAlignmentChanged( VerticalAlignment a );
     void slotAllowTab();
 
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index c58031671..593ed8f72 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -46,14 +46,14 @@ TQFont KNotePrinter::font() const
     return m_font;
 }
 
-void KNotePrinter::setColorGroup( const TQColorGroup& colorGroup )
+void KNotePrinter::tqsetColorGroup( const TQColorGroup& tqcolorGroup )
 {
-    m_colorGroup = colorGroup;
+    m_tqcolorGroup = tqcolorGroup;
 }
 
-TQColorGroup KNotePrinter::colorGroup() const
+TQColorGroup KNotePrinter::tqcolorGroup() const
 {
-    return m_colorGroup;
+    return m_tqcolorGroup;
 }
 
 void KNotePrinter::setStyleSheet( TQStyleSheet* styleSheet )
@@ -93,7 +93,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter,
 
     for (;;)
     {
-        text.draw( &painter, body.left(), body.top(), view, m_colorGroup );
+        text.draw( &painter, body.left(), body.top(), view, m_tqcolorGroup );
         view.moveBy( 0, body.height() );
         painter.translate( 0, -body.height() );
 
diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h
index 632dd85a4..148a2ec45 100644
--- a/knotes/knoteprinter.h
+++ b/knotes/knoteprinter.h
@@ -27,8 +27,8 @@ public:
     void setFont( const TQFont& font );
     TQFont font() const;
 
-    void setColorGroup( const TQColorGroup& colorGroup );
-    TQColorGroup colorGroup() const;
+    void tqsetColorGroup( const TQColorGroup& tqcolorGroup );
+    TQColorGroup tqcolorGroup() const;
 
     void setStyleSheet( TQStyleSheet* styleSheet );
     TQStyleSheet* styleSheet() const;
@@ -43,7 +43,7 @@ private:
     void doPrint( KPrinter& printer, TQPainter& painter,
                   const TQString& content ) const;
 
-    TQColorGroup m_colorGroup;
+    TQColorGroup m_tqcolorGroup;
     TQFont m_font;
     TQStyleSheet* m_styleSheet;
     TQMimeSourceFactory* m_mimeSourceFactory;
diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp
index 616c83b7c..1f9e22e7b 100644
--- a/knotes/knotesalarm.cpp
+++ b/knotes/knotesalarm.cpp
@@ -59,7 +59,7 @@ void KNotesAlarm::checkAlarms()
     if ( !from.isValid() )
         from.setTime_t( 0 );
 
-    KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::currentDateTime() );
+    KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::tqcurrentDateTime() );
     TQValueList alarms = m_manager->alarms( from, KNotesGlobalConfig::self()->alarmsLastChecked() );
     if( alarms.isEmpty())
         return;
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 72b1ecce1..231afede7 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -138,7 +138,7 @@ KNotesApp::KNotesApp()
 
     // get the most recent XML UI file
     TQString xmlFileName = instance()->instanceName() + "ui.rc";
-    TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + xmlFileName;
+    TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + xmlFileName;
     TQStringList fileList = instance()->dirs()->findAllResources( "data", filter ) +
                            instance()->dirs()->findAllResources( "data", xmlFileName );
 
@@ -183,7 +183,7 @@ KNotesApp::KNotesApp()
     m_manager->load();
 
     // read the old config files, convert and add them
-    KCal::CalendarLocal calendar( TQString::fromLatin1( "UTC" ) );
+    KCal::CalendarLocal calendar( TQString::tqfromLatin1( "UTC" ) );
     if ( KNotesLegacy::convert( &calendar ) )
     {
         KCal::Journal::List notes = calendar.journals();
@@ -253,7 +253,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text )
     if ( !name.isEmpty() )
         journal->setSummary( name );
     else
-        journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+        journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
     // the body of the note
     journal->setDescription( text );
@@ -460,7 +460,7 @@ bool KNotesApp::isModified( const TQString& app, const TQString& id ) const
 
 void KNotesApp::mousePressEvent( TQMouseEvent* e )
 {
-    if ( !rect().contains( e->pos() ) )
+    if ( !rect().tqcontains( e->pos() ) )
         return;
 
     switch ( e->button() )
@@ -703,7 +703,7 @@ void KNotesApp::updateNoteActions()
 
     for ( TQDictIterator it( m_noteList ); it.current(); ++it )
     {
-        KAction *action = new KAction( it.current()->name().replace("&", "&&"),
+        KAction *action = new KAction( it.current()->name().tqreplace("&", "&&"),
                                        KShortcut(), this, TQT_SLOT(slotShowNote()),
                                        (TQObject *)0,
                                        it.current()->noteId().utf8() );
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 6dd80368f..c51330faa 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -156,7 +156,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     config.readConfig();
     config.setVersion( KNOTES_VERSION );
 
-    // get the geometry
+    // get the tqgeometry
     config.setWidth( props[3].toUInt() );
     config.setHeight( props[4].toUInt() );
 
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 0a261252b..259f9d361 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -61,7 +61,7 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s )
   : TQObject(),
     m_buffer( new TQByteArray() ), m_sock( s )
 {
-    TQString date = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false );
+    TQString date = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, false );
 
     // Add the remote IP or hostname and the date to the title, to help the
     // user guess who wrote it.
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 86246407b..a08be4d03 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -62,7 +62,7 @@ void KNotesNetworkSender::setSenderId( const TQString& sender )
 
 void KNotesNetworkSender::setNote( const TQString& title, const TQString& text )
 {
-    // TODO: support for unicode and rich text.
+    // TODO: support for tqunicode and rich text.
     // Mmmmmm... how to behave with such heterogeneous environment?
     // AFAIK, ATnotes does not allow UNICODE.
     m_title = title.ascii();
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 91e6d2d9f..81c33489e 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -45,7 +45,7 @@
 
 
 ResourceLocal::ResourceLocal( const KConfig *config )
-    : ResourceNotes( config ), mCalendar( TQString::fromLatin1( "UTC" ) )
+    : ResourceNotes( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) )
 {
     kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl;
     setType( "file" );
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 417f81a05..207730a14 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -32,15 +32,15 @@
 ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent,  const char *name )
     : KRES::ConfigWidget( parent, name )
 {
-    TQHBoxLayout *layout = new TQHBoxLayout( this );
+    TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
     TQLabel *label = new TQLabel( i18n( "Location:" ), this );
     mURL = new KURLRequester( this );
     KFile::Mode mode = static_cast( KFile::File |
                                                  KFile::LocalOnly );
     mURL->setMode( mode );
-    layout->addWidget( label );
-    layout->addWidget( mURL );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( mURL );
 }
 
 ResourceLocalConfig::~ResourceLocalConfig()
diff --git a/kode/automakefile.cpp b/kode/automakefile.cpp
index 468059ae3..2be52ae38 100644
--- a/kode/automakefile.cpp
+++ b/kode/automakefile.cpp
@@ -98,7 +98,7 @@ TQString AutoMakefile::text() const
       if ( t.type() != targetType ) continue;
 
       TQString name = t.name();
-      name.replace( '.', '_' );
+      name.tqreplace( '.', '_' );
       
       out += name + "_SOURCES = " + t.sources() + '\n';
       if ( !t.libAdd().isEmpty() )
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index e248a93a6..6542c2881 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -309,8 +309,8 @@ int codify( KCmdLineArgs *args )
     TQTextStream ts( &f );
     TQString line;
     while( !( line = ts.readLine() ).isNull() ) {
-      line.replace( "\\", "\\\\" ); 
-      line.replace( "\"", "\\\"" );
+      line.tqreplace( "\\", "\\\\" ); 
+      line.tqreplace( "\"", "\\\"" );
       line = "code += \"" + line;
       line.append( "\";" );
       std::cout << line.local8Bit() << std::endl;
@@ -372,7 +372,7 @@ int create( KCmdLineArgs *args )
     authorEmail = a.preferredEmail();
   } else {
     KABC::Addressee::List as =
-        KABC::StdAddressBook::self()->findByEmail( authorEmail );
+        KABC::StdAddressBook::self()->tqfindByEmail( authorEmail );
     if ( as.isEmpty() ) {
       kdDebug() << "Unable to find '" << authorEmail << "' in address book."
                 << endl;
@@ -384,7 +384,7 @@ int create( KCmdLineArgs *args )
       authorName = a.realName();
   }
   if ( !authorEmail.isEmpty() ) {
-    file.addCopyright( TQDate::currentDate().year(), authorName, authorEmail );
+    file.addCopyright( TQDate::tqcurrentDate().year(), authorName, authorEmail );
   }
 
   KODE::License l;
diff --git a/kode/kwsdl/compiler.cpp b/kode/kwsdl/compiler.cpp
index 9e4c86ab9..e3ccf4f8c 100644
--- a/kode/kwsdl/compiler.cpp
+++ b/kode/kwsdl/compiler.cpp
@@ -107,7 +107,7 @@ void Compiler::create()
   creator.setNameSpace( mNameSpace );
   creator.create( converter.classes() );
 
-  qApp->quit();
+  tqApp->quit();
 }
 
 #include "compiler.moc"
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 5d824afe3..3f97efe1d 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -32,7 +32,7 @@ static TQString escapeEnum( const TQString &str )
 {
   TQString enumStr = capitalize( str );
 
-  return enumStr.replace( "-", "_" );
+  return enumStr.tqreplace( "-", "_" );
 }
 
 Converter::Converter()
diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp
index 80f755817..1c43bd952 100644
--- a/kode/kwsdl/kung/complexbaseinputfield.cpp
+++ b/kode/kwsdl/kung/complexbaseinputfield.cpp
@@ -141,14 +141,14 @@ TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent )
 {
   TQGroupBox *inputWidget = new TQGroupBox( mName, parent );
   inputWidget->setColumnLayout( 0, Qt::Horizontal );
-  TQGridLayout *layout = new TQGridLayout( inputWidget->layout(), 2, 2, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 );
 
   InputField::List::Iterator it;
   int row = 0;
   for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) {
     TQLabel *label = new TQLabel( (*it)->name(), inputWidget );
-    layout->addWidget( label, row, 0 );
-    layout->addWidget( (*it)->createWidget( inputWidget ), row, 1 );
+    tqlayout->addWidget( label, row, 0 );
+    tqlayout->addWidget( (*it)->createWidget( inputWidget ), row, 1 );
   }
 
   return inputWidget;
diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp
index b38d46b14..8d5c329cc 100644
--- a/kode/kwsdl/kung/dateinputfield.cpp
+++ b/kode/kwsdl/kung/dateinputfield.cpp
@@ -25,7 +25,7 @@
 
 DateInputField::DateInputField( const TQString &name, const Schema::SimpleType *type )
   : SimpleInputField( name, type ),
-    mValue( TQDate::currentDate() )
+    mValue( TQDate::tqcurrentDate() )
 {
 }
 
diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp
index d337d19f3..9d2ecc239 100644
--- a/kode/kwsdl/kung/dispatcher.cpp
+++ b/kode/kwsdl/kung/dispatcher.cpp
@@ -85,7 +85,7 @@ void Dispatcher::nextMessage()
     mCurrentMessage = items.first();
 
   if ( mCurrentMessage.isEmpty() ) {
-    qApp->quit();
+    tqApp->quit();
     return;
   }
 
@@ -119,7 +119,7 @@ void Dispatcher::nextMessage()
       mTransport->query( doc.toString( 2 ) );
     }
   } else
-    qApp->quit();
+    tqApp->quit();
 }
 
 void Dispatcher::result( const TQString &xml )
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 6bc1d8240..7a5eeb713 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -91,19 +91,19 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS
   : TQWidget( parent ),
     mParentField( parentField ), mName( name ), mType( type )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
   mView = new TQListBox( this );
-  layout->addMultiCellWidget( mView, 0, 3, 0, 0 );
+  tqlayout->addMultiCellWidget( mView, 0, 3, 0, 0 );
 
   mAddButton = new TQPushButton( i18n( "Add" ), this );
-  layout->addWidget( mAddButton, 0, 1 );
+  tqlayout->addWidget( mAddButton, 0, 1 );
 
   mEditButton = new TQPushButton( i18n( "Edit..." ), this );
-  layout->addWidget( mEditButton, 1, 1 );
+  tqlayout->addWidget( mEditButton, 1, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
-  layout->addWidget( mRemoveButton, 2, 1 );
+  tqlayout->addWidget( mRemoveButton, 2, 1 );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
   connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp
index 956e54bfc..04f66ffa0 100644
--- a/kode/kwsdl/kung/pageinputfield.cpp
+++ b/kode/kwsdl/kung/pageinputfield.cpp
@@ -88,18 +88,18 @@ TQString PageInputField::data() const
 TQWidget *PageInputField::createWidget( TQWidget *parent )
 {
   TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" );
-  TQGridLayout *layout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 );
 
   InputField::List::Iterator it;
   int row = 0;
   for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) {
     TQLabel *label = new TQLabel( (*it)->name(), mInputWidget );
-    label->setAlignment( Qt::AlignTop );
-    layout->addWidget( label, row, 0 );
-    layout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 );
+    label->tqsetAlignment( Qt::AlignTop );
+    tqlayout->addWidget( label, row, 0 );
+    tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 );
   }
 
-  layout->setRowStretch( ++row, 1 );
+  tqlayout->setRowStretch( ++row, 1 );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/namemapper.cpp b/kode/kwsdl/namemapper.cpp
index 426498f5c..6d7ae6399 100644
--- a/kode/kwsdl/namemapper.cpp
+++ b/kode/kwsdl/namemapper.cpp
@@ -30,7 +30,7 @@ NameMapper::NameMapper()
 
 TQString NameMapper::escape( const TQString &name ) const
 {
-  if ( mKeyWords.contains( name ) )
+  if ( mKeyWords.tqcontains( name ) )
     return "_" + name;
   else
     return name;
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index 2a7448c4f..54fa0163e 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -60,7 +60,7 @@ bool FileProvider::get( const TQString &url, TQString &target )
 
   mBlocked = true;
   while ( mBlocked ) {
-    qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput );
+    tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput );
     usleep( 500 );
   }
 
diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp
index 7ec3804f8..ba62b0c33 100644
--- a/kode/kwsdl/schema/parser.cpp
+++ b/kode/kwsdl/schema/parser.cpp
@@ -200,7 +200,7 @@ void Parser::parseImport( const TQDomElement &element )
   TQString location = element.attribute( "schemaLocation" );
   if ( !location.isEmpty() ) {
     // don't import a schema twice
-    if ( mImportedSchemas.contains( location ) )
+    if ( mImportedSchemas.tqcontains( location ) )
       return;
     else
       mImportedSchemas.append( location );
diff --git a/kode/kwsdl/schema/simpletype.cpp b/kode/kwsdl/schema/simpletype.cpp
index d5dcf2fd9..50242808f 100644
--- a/kode/kwsdl/schema/simpletype.cpp
+++ b/kode/kwsdl/schema/simpletype.cpp
@@ -202,7 +202,7 @@ void SimpleType::setFacetValue( const TQString &value )
       mFacetValue.wsp = PRESERVE;
     else if ( value == "collapse" )
       mFacetValue.wsp = COLLAPSE;
-    else if ( value == "replace" )
+    else if ( value == "tqreplace" )
       mFacetValue.wsp = REPLACE;
     else {
       qDebug( "Invalid facet value for whitespace" );
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index 591265887..25e91edce 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -621,7 +621,7 @@ void Creator::createElementParserDom( KODE::Class &c, Element *e )
 
 void Creator::registerListTypedef( const TQString &type )
 {
-  if ( !mListTypedefs.contains( type ) ) mListTypedefs.append( type );
+  if ( !mListTypedefs.tqcontains( type ) ) mListTypedefs.append( type );
 }
 
 void Creator::createListTypedefs()
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index 71720d6b9..e2e529e22 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -143,7 +143,7 @@ int main( int argc, char **argv )
   for( it = start->elements.begin(); it != start->elements.end(); ++it ) {
     c.setExternalClassPrefix( c.upperFirst( (*it)->name ) );
     c.createFileParser( *it );
-    c.createFileWriter( *it, dtdFilename.replace( "rng", "dtd" ) );
+    c.createFileWriter( *it, dtdFilename.tqreplace( "rng", "dtd" ) );
   }
 
   c.createListTypedefs();
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 9b3f33b99..59392ca84 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -100,7 +100,7 @@ Element *Parser::parse( const TQDomElement &docElement )
       it = mDefinitionMap.find( d->name );
       if ( it != mDefinitionMap.end() ) definitions = *it;
       definitions.append( d );
-      mDefinitionMap.replace( d->name, definitions );
+      mDefinitionMap.tqreplace( d->name, definitions );
     } else if ( e1.tagName() == "start" ) {
       start = new Element;
       parseElement( e1, start, Pattern() );
diff --git a/kode/printer.cpp b/kode/printer.cpp
index 3adf32caf..5fa8907c4 100644
--- a/kode/printer.cpp
+++ b/kode/printer.cpp
@@ -326,7 +326,7 @@ void Printer::printHeader( const File &f )
 
   // Create include guard
   TQString className = f.filename();
-  className.replace( "-", "_" );
+  className.tqreplace( "-", "_" );
 
   TQString includeGuard;
   if ( !f.nameSpace().isEmpty() ) includeGuard += f.nameSpace().upper() + "_";
diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp
index e469a42c2..59cd7e916 100644
--- a/konsolekalendar/konsolekalendarepoch.cpp
+++ b/konsolekalendar/konsolekalendarepoch.cpp
@@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::QDateTime2epoch( TQDateTime dt )
   // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME.
 
   // Compute #seconds to subtract for local timezone difference from UTC.
-  int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t()
-             - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t();
+  int offset = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t()
+             - TQDateTime::tqcurrentDateTime( Qt::LocalTime ).toTime_t();
   return( dt.toTime_t() - offset );
 }
 
diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp
index f1d93b0ab..60441bd5e 100644
--- a/konsolekalendar/konsolekalendarexports.cpp
+++ b/konsolekalendar/konsolekalendarexports.cpp
@@ -174,21 +174,21 @@ bool KonsoleKalendarExports::exportAsTxtShort( TQTextStream *ts,
   *ts << "\t";
 
   // Print Event Summary
-  *ts << event->summary().replace( TQChar( '\n' ), TQChar( ' ' ) );
+  *ts << event->summary().tqreplace( TQChar( '\n' ), TQChar( ' ' ) );
 
   // Print Event Location
   if ( !event->location().isEmpty() ) {
     if ( !event->summary().isEmpty() ) {
       *ts << ", ";
     }
-    *ts << event->location().replace( TQChar( '\n' ), TQChar( ' ' ) );
+    *ts << event->location().tqreplace( TQChar( '\n' ), TQChar( ' ' ) );
   }
   *ts << endl;
 
   // Print Event Description
   if ( !event->description().isEmpty() ) {
     *ts << "\t\t\t"
-        << event->description().replace( TQChar( '\n' ), TQChar( ' ' ) )
+        << event->description().tqreplace( TQChar( '\n' ), TQChar( ' ' ) )
         << endl;
   }
 
@@ -204,7 +204,7 @@ TQString KonsoleKalendarExports::processField( TQString field, TQString dquote )
   //   2. Surrounds field with double quotes
 
   TQString double_dquote = dquote + dquote;
-  TQString retField = dquote + field.replace( dquote, double_dquote ) + dquote;
+  TQString retField = dquote + field.tqreplace( dquote, double_dquote ) + dquote;
   return retField;
 }
 
@@ -233,9 +233,9 @@ bool KonsoleKalendarExports::exportAsCSV( TQTextStream *ts,
         << delim << pF( "" );
   }
 
-  *ts << delim << pF( event->summary().replace( TQChar('\n'), TQChar(' ') ) )
-      << delim << pF( event->location().replace( TQChar('\n'), TQChar(' ') ) )
-      << delim << pF( event->description().replace( TQChar('\n'), TQChar(' ') ) )
+  *ts << delim << pF( event->summary().tqreplace( TQChar('\n'), TQChar(' ') ) )
+      << delim << pF( event->location().tqreplace( TQChar('\n'), TQChar(' ') ) )
+      << delim << pF( event->description().tqreplace( TQChar('\n'), TQChar(' ') ) )
       << delim << pF( event->uid() )
       << endl;
 
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 59b9a2f86..42f5dd992 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -204,11 +204,11 @@ int main( int argc, char *argv[] )
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
   // Default values for start date/time (today at 07:00)
-  TQDate startdate = TQDate::currentDate();
+  TQDate startdate = TQDate::tqcurrentDate();
   TQTime starttime( 7, 0 );
 
   // Default values for end date/time (today at 17:00)
-  TQDate enddate = TQDate::currentDate();
+  TQDate enddate = TQDate::tqcurrentDate();
   TQTime endtime( 17, 0 );
 
   // Default values for switches
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 6d048504b..e940a53c2 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name )
 {
   d = new Private;
   TQTimer* timer = new TQTimer( this );
-  mLastDate = TQDate::currentDate();
+  mLastDate = TQDate::tqcurrentDate();
   connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
   timer->start( 1000*60 );
 }
@@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj )
 
 void Core::checkNewDay()
 {
-  if ( mLastDate != TQDate::currentDate() )
-    emit dayChanged( TQDate::currentDate() );
+  if ( mLastDate != TQDate::tqcurrentDate() )
+    emit dayChanged( TQDate::tqcurrentDate() );
 
-  mLastDate = TQDate::currentDate();
+  mLastDate = TQDate::tqcurrentDate();
 }
 
 TQString Core::lastErrorMessage() const
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 2d75fb227..e84b3b8d7 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -79,7 +79,7 @@ class KDE_EXPORT Core : public KParts::MainWindow
     void dayChanged( const TQDate& );
 
   protected:
-    Core( TQWidget *parentWidget = 0, const char *name = 0 );
+    Core( TQWidget *tqparentWidget = 0, const char *name = 0 );
 
     TQString lastErrorMessage() const;
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 13f14c580..5a62beea4 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -114,7 +114,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     TQString executableName() const;
 
     /**
-      Set name of library which contains the KPart used by this plugin.
+      Set name of library which tqcontains the KPart used by this plugin.
     */
     void setPartLibraryName( const TQCString & );
 
@@ -196,7 +196,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       The clients name is taken from the name argument in the constructor.
       @note: The DCOPClient object will only be created when this method is
       called for the first time. Make sure that the part has been loaded
-      before calling this method, if it's the one that contains the DCOP
+      before calling this method, if it's the one that tqcontains the DCOP
       interface that other parts might use.
     */
     DCOPClient *dcopClient() const;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index da978d6e2..86902ca0d 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ
 
   TQLabel *label = new TQLabel( hbox );
   label->setPixmap( icon );
-  label->setFixedSize( label->sizeHint() );
-  label->setPaletteBackgroundColor( colorGroup().mid() );
+  label->setFixedSize( label->tqsizeHint() );
+  label->setPaletteBackgroundColor( tqcolorGroup().mid() );
   label->setAcceptDrops( true );
 
   label = new TQLabel( heading, hbox );
-  label->setAlignment( AlignLeft|AlignVCenter );
+  label->tqsetAlignment( AlignLeft|AlignVCenter );
   label->setIndent( KDialog::spacingHint() );
   label->setFont( boldFont );
-  label->setPaletteForegroundColor( colorGroup().light() );
-  label->setPaletteBackgroundColor( colorGroup().mid() );
+  label->setPaletteForegroundColor( tqcolorGroup().light() );
+  label->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  hbox->setPaletteBackgroundColor( colorGroup().mid() );
+  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
+  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
 
   return hbox;
 }
@@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
 
 void Summary::dropEvent( TQDropEvent *event )
 {
-  int alignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "summary.moc"
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 5bbfcf2b3..29a890190 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -73,7 +73,7 @@ class KDE_EXPORT Summary : public QWidget
 
   signals:
     void message( const TQString &message );
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void mousePressEvent( TQMouseEvent* );
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 656ffe4e9..e27254e33 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -75,7 +75,7 @@ void KCMKMailSummary::modified()
 
 void KCMKMailSummary::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   mFolderView = new KListView( this );
   mFolderView->setRootIsDecorated( true );
@@ -85,8 +85,8 @@ void KCMKMailSummary::initGUI()
 
   mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this );
 
-  layout->addWidget( mFolderView );
-  layout->addWidget( mFullPath );
+  tqlayout->addWidget( mFolderView );
+  tqlayout->addWidget( mFullPath );
 }
 
 void KCMKMailSummary::initFolders()
@@ -108,7 +108,7 @@ void KCMKMailSummary::initFolders()
       DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it );
       folderRef.call( "displayName()" ).get( displayName );
     }
-    if ( (*it).contains( '/' ) == 1 ) {
+    if ( (*it).tqcontains( '/' ) == 1 ) {
       if ( mFolderMap.find( *it ) == mFolderMap.end() )
         mFolderMap.insert( *it, new TQListViewItem( mFolderView,
                                                    displayName ) );
@@ -137,7 +137,7 @@ void KCMKMailSummary::loadFolders()
   TQMap::Iterator it;
   for ( it = mFolderMap.begin(); it != mFolderMap.end(); ++it ) {
     if ( TQCheckListItem *qli = dynamic_cast( it.data() ) ) {
-      if ( folders.contains( it.key() ) ) {
+      if ( folders.tqcontains( it.key() ) ) {
         qli->setOn( true );
         mFolderView->ensureItemVisible( it.data() );
       } else {
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 5a8797472..c2aff819d 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -83,7 +83,7 @@ bool KMailPlugin::canDecodeDrag( TQMimeSource *qms )
 void KMailPlugin::processDropEvent( TQDropEvent * de )
 {
   kdDebug() << k_funcinfo << endl;
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
   KABC::Addressee::List list;
 
   if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) {
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 43c1e2cb7..92023570c 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -117,7 +117,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
   TQStringList::ConstIterator it;
   DCOPRef kmail( "kmail", "KMailIface" );
   for ( it = folders.begin(); it != folders.end(); ++it ) {
-    if ( activeFolders.contains( *it ) ) {
+    if ( activeFolders.tqcontains( *it ) ) {
       DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it );
       const int numMsg = folderRef.call( "messages()" );
       const int numUnreadMsg = folderRef.call( "unreadMessages()" );
@@ -132,7 +132,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 
       KURLLabel *urlLabel = new KURLLabel( *it, folderPath, this );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( AlignLeft );
+      urlLabel->tqsetAlignment( AlignLeft );
       urlLabel->show();
       connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
                TQT_SLOT( selectFolder( const TQString& ) ) );
@@ -143,7 +143,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
         new TQLabel( TQString( i18n("%1: number of unread messages "
                                   "%2: total number of messages", "%1 / %2") )
                     .arg( numUnreadMsg ).arg( numMsg ), this );
-      label->setAlignment( AlignLeft );
+      label->tqsetAlignment( AlignLeft );
       label->show();
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
@@ -154,7 +154,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 
   if ( counter == 0 ) {
     TQLabel *label = new TQLabel( i18n( "No unread messages in your monitored folders" ), this );
-    label->setAlignment( AlignHCenter | AlignVCenter );
+    label->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 2 );
     label->show();
     mLabels.append( label );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index d4a5e8547..ef70e8f56 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -139,7 +139,7 @@ void KNotesPart::printSelectedNotes()
     //printer.setFont( m_config->font() );
     //printer.setContext( m_editor->context() );
     //printer.setStyleSheet( m_editor->styleSheet() );
-    printer.setColorGroup( colorGroup() );
+    printer.tqsetColorGroup( tqcolorGroup() );
     printer.printNote( , content );
 #endif
 }
@@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
   if ( !name.isEmpty() )
       journal->setSummary( name );
   else
-      journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+      journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
   // the body of the note
   journal->setDescription( text );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 0bf073f3a..2c96235f5 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -129,9 +129,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       actionCollection()->setWidget( this );
 
       TQWidget *page = plainPage();
-      TQVBoxLayout *layout = new TQVBoxLayout( page );
+      TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
-      TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() );
+      TQHBoxLayout *hbl = new TQHBoxLayout( tqlayout, marginHint() );
       TQLabel *label = new TQLabel( page);
       label->setText( i18n( "Name:" ) );
       hbl->addWidget( label,0 );
@@ -148,8 +148,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
 
       mTool = static_cast(factory.container( "note_tool", this ));
 
-      layout->addWidget( mTool );
-      layout->addWidget( mNoteEdit );
+      tqlayout->addWidget( mTool );
+      tqlayout->addWidget( mNoteEdit );
     }
 
     TQString text() const
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 1a94fdea3..0fe265524 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -59,9 +59,9 @@ KParts::ReadOnlyPart* KNotesPlugin::createPart()
   return new KNotesPart( this, "notes" );
 }
 
-Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new KNotesSummaryWidget( this, parentWidget );
+  return new KNotesSummaryWidget( this, tqparentWidget );
 }
 
 const KAboutData *KNotesPlugin::aboutData()
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index a94494581..65e6450df 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -37,7 +37,7 @@ class KNotesPlugin : public Kontact::Plugin
     KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~KNotesPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     int weight() const { return 600; }
 
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 64db3a336..3ba9a9ab3 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -52,8 +52,8 @@ KNoteTip::KNoteTip( KIconView *parent )
   mPreview->setHScrollBarMode( TQScrollView::AlwaysOff );
   mPreview->setVScrollBarMode( TQScrollView::AlwaysOff );
 
-  TQBoxLayout *layout = new TQVBoxLayout( this );
-  layout->addWidget( mPreview );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
+  tqlayout->addWidget( mPreview );
 
   setPalette( TQToolTip::palette() );
   setMargin( 1 );
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 012e6ae82..b714ff19e 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -58,7 +58,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
   mLayout = new TQGridLayout( mainLayout, 7, 3, 3 );
   mLayout->setRowStretch( 6, 1 );
 
-  mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
+  mCalendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
   KNotesResourceManager *manager = new KNotesResourceManager();
 
   TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
@@ -92,8 +92,8 @@ void KNotesSummaryWidget::updateView()
       // Fill Note Pixmap Field
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
       KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
       urlLabel->installEventFilter( this );
       urlLabel->setTextFormat(RichText);
-      urlLabel->setAlignment( urlLabel->alignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 1 );
       mLabels.append( urlLabel );
 
@@ -118,7 +118,7 @@ void KNotesSummaryWidget::updateView()
 
   } else {
       TQLabel *noNotes = new TQLabel( i18n( "No Notes Available" ), this );
-      noNotes->setAlignment( AlignHCenter | AlignVCenter );
+      noNotes->tqsetAlignment( AlignHCenter | AlignVCenter );
       mLayout->addWidget( noNotes, 0, 1 );
       mLabels.append( noNotes );
   }
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 2a4b6a3e1..ba431eb38 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -90,10 +90,10 @@ void KCMKOrgSummary::customDaysChanged( int value )
 
 void KCMKOrgSummary::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   mCalendarGroup = new TQButtonGroup( 0, Vertical, i18n( "Appointments" ), this );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(),
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup );
@@ -122,15 +122,15 @@ void KCMKOrgSummary::initGUI()
 
   hbox->addStretch( 1 );
 
-  layout->addWidget( mCalendarGroup );
+  tqlayout->addWidget( mCalendarGroup );
 
   mTodoGroup = new TQButtonGroup( 2, Horizontal, i18n( "To-dos" ), this );
   new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup );
   new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup );
 
-  layout->addWidget( mTodoGroup );
+  tqlayout->addWidget( mTodoGroup );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 }
 
 void KCMKOrgSummary::load()
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index cd590ec96..d740721c2 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -224,8 +224,8 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
 
       KTempFile tf;
       tf.setAutoDelete( true );
-      TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() );
-      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
+      TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() );
+      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
       tf.close();
       interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
                                     uri, tf.name(), TQStringList(), "message/rfc822" );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index cab7788f9..06a4694c4 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -97,9 +97,9 @@ void SummaryWidget::updateView()
   TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
 
   TQDate dt;
-  TQDate currentDate = TQDate::currentDate();
-  for ( dt=currentDate;
-        dt<=currentDate.addDays( days - 1 );
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  for ( dt=tqcurrentDate;
+        dt<=tqcurrentDate.addDays( days - 1 );
         dt=dt.addDays(1) ) {
 
     KCal::Event::List events = mCalendar->events( dt );
@@ -123,8 +123,8 @@ void SummaryWidget::updateView()
       int span=1; int dayof=1;
       if ( ev->isMultiDay() ) {
         TQDate d = ev->dtStart().date();
-        if ( d < currentDate ) {
-          d = currentDate;
+        if ( d < tqcurrentDate ) {
+          d = tqcurrentDate;
         }
         while ( d < ev->dtEnd().date() ) {
           if ( d < dt ) {
@@ -141,15 +141,15 @@ void SummaryWidget::updateView()
 
       // Fill Appointment Pixmap Field
       label = new TQLabel( this );
-      if ( ev->categories().contains( "Birthday" ) ) {
+      if ( ev->categories().tqcontains( "Birthday" ) ) {
         label->setPixmap( pmb );
-      } else if ( ev->categories().contains( "Anniversary" ) ) {
+      } else if ( ev->categories().tqcontains( "Anniversary" ) ) {
         label->setPixmap( pma );
       } else {
         label->setPixmap( pm );
       }
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -159,12 +159,12 @@ void SummaryWidget::updateView()
 
       // Modify event date for printing
       TQDate sD = TQDate( dt.year(), dt.month(), dt.day() );
-      if ( ( sD.month() == currentDate.month() ) &&
-           ( sD.day()   == currentDate.day() ) ) {
+      if ( ( sD.month() == tqcurrentDate.month() ) &&
+           ( sD.day()   == tqcurrentDate.day() ) ) {
         datestr = i18n( "Today" );
         makeBold = true;
-      } else if ( ( sD.month() == currentDate.addDays( 1 ).month() ) &&
-                  ( sD.day()   == currentDate.addDays( 1 ).day() ) ) {
+      } else if ( ( sD.month() == tqcurrentDate.addDays( 1 ).month() ) &&
+                  ( sD.day()   == tqcurrentDate.addDays( 1 ).day() ) ) {
         datestr = i18n( "Tomorrow" );
       } else {
         datestr = KGlobal::locale()->formatDate( sD );
@@ -179,7 +179,7 @@ void SummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       if ( makeBold ) {
         TQFont font = label->font();
         font.setBold( true );
@@ -198,7 +198,7 @@ void SummaryWidget::updateView()
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( urlLabel->alignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -228,7 +228,7 @@ void SummaryWidget::updateView()
                   .arg( KGlobal::locale()->formatTime( sST ) )
                   .arg( KGlobal::locale()->formatTime( sET ) );
         label = new TQLabel( datestr, this );
-        label->setAlignment( AlignLeft | AlignVCenter );
+        label->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
         mLabels.append( label );
       }
@@ -242,7 +242,7 @@ void SummaryWidget::updateView()
       i18n( "No appointments pending within the next day",
             "No appointments pending within the next %n days",
             days ), this, "nothing to see" );
-    noEvents->setAlignment( AlignHCenter | AlignVCenter );
+    noEvents->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noEvents, 0, 2 );
     mLabels.append( noEvents );
   }
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index bc76205c2..3b553ee0f 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -217,7 +217,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
       tf.setAutoDelete( true );
       TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" +
                     mail.messageId();
-      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
+      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
       tf.close();
       interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
                                    txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 953aa42cb..05e9ea55e 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -94,7 +94,7 @@ void TodoSummaryWidget::updateView()
   TQLabel *label = 0;
   int counter = 0;
 
-  TQDate currentDate = TQDate::currentDate();
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
   KCal::Todo::List todos = mCalendar->todos();
   if ( todos.count() > 0 ) {
     TQPixmap pm = loader.loadIcon( "todo", KIcon::Small );
@@ -111,27 +111,27 @@ void TodoSummaryWidget::updateView()
 
       // show uncomplete todos from the last days
       if ( todo->hasDueDate() && !todo->isCompleted() &&
-           todo->dtDue().date() < currentDate ) {
+           todo->dtDue().date() < tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "overdue" );
       }
 
       // show todos which started somewhere in the past and has to be finished in future
       if ( todo->hasStartDate() && todo->hasDueDate() &&
-           todo->dtStart().date() < currentDate &&
-           currentDate < todo->dtDue().date() ) {
+           todo->dtStart().date() < tqcurrentDate &&
+           tqcurrentDate < todo->dtDue().date() ) {
         accepted = true;
         stateText = i18n( "in progress" );
       }
 
       // all todos which start today
-      if ( todo->hasStartDate() && todo->dtStart().date() == currentDate ) {
+      if ( todo->hasStartDate() && todo->dtStart().date() == tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "starts today" );
       }
 
       // all todos which end today
-      if ( todo->hasDueDate() && todo->dtDue().date() == currentDate ) {
+      if ( todo->hasDueDate() && todo->dtDue().date() == tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "ends today" );
       }
@@ -141,13 +141,13 @@ void TodoSummaryWidget::updateView()
 
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
       label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this );
-      label->setAlignment( AlignHCenter | AlignVCenter );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetAlignment( AlignHCenter | AlignVCenter );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
 
@@ -168,14 +168,14 @@ void TodoSummaryWidget::updateView()
       connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQT_SLOT( popupMenu( const TQString& ) ) );
 
-      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
+      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, tqcurrentDate, true ) );
       if ( !tipText.isEmpty() ) {
         TQToolTip::add( urlLabel, tipText );
       }
 
       label = new TQLabel( stateText, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView()
 
   if ( counter == 0 ) {
     TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this );
-    noTodos->setAlignment( AlignHCenter | AlignVCenter );
+    noTodos->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noTodos, 0, 1 );
     mLabels.append( noTodos );
   }
@@ -214,7 +214,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid )
   IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
   if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
-    todo->setCompleted( TQDateTime::currentDateTime() );
+    todo->setCompleted( TQDateTime::tqcurrentDateTime() );
     changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this );
     changer->endChange( todo, 0, TQString() );
     delete oldTodo;
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 953c5f255..88e9d7886 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -43,9 +43,9 @@ KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStrin
 
 }
 
-Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
 
 const KAboutData *KPilotPlugin::aboutData()
diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h
index 5695d2605..b1a08cbef 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.h
+++ b/kontact/plugins/kpilot/kpilot_plugin.h
@@ -33,7 +33,7 @@ class KPilotPlugin : public Kontact::Plugin
     KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     KPilotPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     virtual bool showInSideBar() const { return false; }
 //    virtual TQStringList configModules() const;
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 779a55c19..ba11d9b57 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -98,10 +98,10 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   // Conduits:
   row++;
   mConduitsTextLabel = new TQLabel( i18n( "Conduits:" ), this );
-  mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs );
+  mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->setAlignment( mConduitsLabel->alignment() | Qt::WordBreak );
+  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | Qt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 13734a8ab..0b0a98a33 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
                  Ok, parent, 0, true, true )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
                                          spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Name:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new TQLineEdit( page );
   label->setBuddy( mTitle );
-  layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
 
   label = new TQLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mURL = new TQLineEdit( page );
   label->setBuddy( mURL );
-  layout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
 
   mTitle->setText( title );
   mURL->setText( url );
@@ -331,16 +331,16 @@ void KCMKontactKNT::modified()
 
 void KCMKontactKNT::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mAllNews = new KListView( this );
   mAllNews->addColumn( i18n( "All" ) );
   mAllNews->setRootIsDecorated( true );
   mAllNews->setFullWidth( true );
-  layout->addWidget( mAllNews, 0, 0 );
+  tqlayout->addWidget( mAllNews, 0, 0 );
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
 
   vbox->addStretch();
   mAddButton = new KPushButton( i18n( "Add" ), this );
@@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI()
   mSelectedNews = new KListView( this );
   mSelectedNews->addColumn( i18n( "Selected" ) );
   mSelectedNews->setFullWidth( true );
-  layout->addWidget( mSelectedNews, 0, 2 );
+  tqlayout->addWidget( mSelectedNews, 0, 2 );
 
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
-  TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
+  TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box );
@@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI()
   mDeleteButton->setEnabled( false );
   boxLayout->addWidget( mDeleteButton, 1, 2 );
 
-  layout->addMultiCellWidget( box, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 );
 }
 
 bool KCMKontactKNT::dcopActive() const
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index 66555d4fe..6f8e7fa48 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -58,257 +58,257 @@ class NewsSourceData
 static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
   // Arts ---------------
     NewsSourceData(
-    TQString::fromLatin1("Bureau 42"),
-    TQString::fromLatin1("http://www.bureau42.com/rdf/"),
-    TQString::fromLatin1("http://www.bureau42.com/favicon.ico"),
+    TQString::tqfromLatin1("Bureau 42"),
+    TQString::tqfromLatin1("http://www.bureau42.com/rdf/"),
+    TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"),
     NewsSourceData::Arts ),
     NewsSourceData(
-    TQString::fromLatin1("eFilmCritic"),
-    TQString::fromLatin1("http://efilmcritic.com/fo.rdf"),
-    TQString::fromLatin1("http://efilmcritic.com/favicon.ico"),
+    TQString::tqfromLatin1("eFilmCritic"),
+    TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"),
+    TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"),
     NewsSourceData::Arts ),
   // Business -----------
     NewsSourceData(
-    TQString::fromLatin1("Internet.com Business"),
-    TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
+    TQString::tqfromLatin1("Internet.com Business"),
+    TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
     TQString::null,
     NewsSourceData::Business ),
     NewsSourceData(
-    TQString::fromLatin1("TradeSims"),
-    TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"),
+    TQString::tqfromLatin1("TradeSims"),
+    TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
     TQString::null,
     NewsSourceData::Business ),
   // Computers ----------
     NewsSourceData(
-    TQString::fromLatin1("KDE Deutschland"),
-    TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
-    TQString::fromLatin1("http://www.kde.de/favicon.ico"),
+    TQString::tqfromLatin1("KDE Deutschland"),
+    TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
+    TQString::tqfromLatin1("http://www.kde.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("KDE France"),
-    TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"),
+    TQString::tqfromLatin1("KDE France"),
+    TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreeBSD Project News"),
-    TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"),
-    TQString::fromLatin1("http://www.freebsd.org/favicon.ico"),
+    TQString::tqfromLatin1("FreeBSD Project News"),
+    TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"),
+    TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("dot.kde.org"),
-    TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"),
-    TQString::fromLatin1("http://www.kde.org/favicon.ico"),
+    TQString::tqfromLatin1("dot.kde.org"),
+    TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"),
+    TQString::tqfromLatin1("http://www.kde.org/favicon.ico"),
     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("KDE-Look.org"),
-                    TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"),
-                    TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::tqfromLatin1("KDE-Look.org"),
+                    TQString::tqfromLatin1("http://www.kde.org/kde-look-content.rdf"),
+                    TQString::tqfromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("KDE-Apps.org"),
-                    TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
-                    TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::tqfromLatin1("KDE-Apps.org"),
+                    TQString::tqfromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
+                    TQString::tqfromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("DesktopLinux"),
-                    TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"),
-                    TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
+    NewsSourceData( TQString::tqfromLatin1("DesktopLinux"),
+                    TQString::tqfromLatin1("http://www.desktoplinux.com/backend/index.html"),
+                    TQString::tqfromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("DistroWatch"),
-                    TQString::fromLatin1("http://distrowatch.com/news/dw.xml"),
-                    TQString::fromLatin1("http://distrowatch.com/favicon.ico"),
+    NewsSourceData( TQString::tqfromLatin1("DistroWatch"),
+                    TQString::tqfromLatin1("http://distrowatch.com/news/dw.xml"),
+                    TQString::tqfromLatin1("http://distrowatch.com/favicon.ico"),
                     NewsSourceData::Computers ),
     /*URL changed*/
     NewsSourceData(
-    TQString::fromLatin1("GNOME News"),
-    TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"),
+    TQString::tqfromLatin1("GNOME News"),
+    TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot"),
-    TQString::fromLatin1("http://slashdot.org/slashdot.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot"),
+    TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Ask Slashdot"),
-    TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Ask Slashdot"),
+    TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Features"),
-    TQString::fromLatin1("http://slashdot.org/features.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Features"),
+    TQString::tqfromLatin1("http://slashdot.org/features.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Apache"),
-    TQString::fromLatin1("http://slashdot.org/apache.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Apache"),
+    TQString::tqfromLatin1("http://slashdot.org/apache.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Books"),
-    TQString::fromLatin1("http://slashdot.org/books.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Books"),
+    TQString::tqfromLatin1("http://slashdot.org/books.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Jabber News"),
-    TQString::fromLatin1("http://www.jabber.org/news/rss.xml"),
+    TQString::tqfromLatin1("Jabber News"),
+    TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Freshmeat"),
-    TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"),
-    TQString::fromLatin1("http://freshmeat.net/favicon.ico"),
+    TQString::tqfromLatin1("Freshmeat"),
+    TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"),
+    TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Linux Weekly News"),
-    TQString::fromLatin1("http://www.lwn.net/headlines/rss"),
-    TQString::fromLatin1("http://www.lwn.net/favicon.ico"),
+    TQString::tqfromLatin1("Linux Weekly News"),
+    TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"),
+    TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("heise online news"),
-    TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"),
-    TQString::fromLatin1("http://www.heise.de/favicon.ico"),
+    TQString::tqfromLatin1("heise online news"),
+    TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"),
+    TQString::tqfromLatin1("http://www.heise.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("RUS-CERT Ticker"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+    TQString::tqfromLatin1("RUS-CERT Ticker"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("RUS-CERT Elsewhere"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+    TQString::tqfromLatin1("RUS-CERT Elsewhere"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Kuro5hin"),
-    TQString::fromLatin1("http://kuro5hin.org/backend.rdf"),
-    TQString::fromLatin1("http://kuro5hin.org/favicon.ico"),
+    TQString::tqfromLatin1("Kuro5hin"),
+    TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"),
+    TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Prolinux"),
-    TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
-    TQString::fromLatin1("http://www.prolinux.de/favicon.ico"),
+    TQString::tqfromLatin1("Prolinux"),
+    TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
+    TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("LinuxSecurity.com"),
-    TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
-    TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"),
+    TQString::tqfromLatin1("LinuxSecurity.com"),
+    TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
+    TQString::tqfromLatin1("http://www.linuxsecurity.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Linux Game Tome"),
-    TQString::fromLatin1("http://happypenguin.org/html/news.rdf"),
+    TQString::tqfromLatin1("Linux Game Tome"),
+    TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Mozilla"),
-    TQString::fromLatin1("http://www.mozilla.org/news.rdf"),
-    TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+    TQString::tqfromLatin1("Mozilla"),
+    TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("MozillaZine"),
-    TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"),
-    TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+    TQString::tqfromLatin1("MozillaZine"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Daemon News"),
-    TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
+    TQString::tqfromLatin1("Daemon News"),
+    TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("use Perl;"),
-    TQString::fromLatin1("http://use.perl.org/useperl.rdf"),
+    TQString::tqfromLatin1("use Perl;"),
+    TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Root prompt"),
-    TQString::fromLatin1("http://www.rootprompt.org/rss/"),
-    TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"),
+    TQString::tqfromLatin1("Root prompt"),
+    TQString::tqfromLatin1("http://www.rootprompt.org/rss/"),
+    TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("SecurityFocus"),
-    TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
-    TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"),
+    TQString::tqfromLatin1("SecurityFocus"),
+    TQString::tqfromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
+    TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Arstechnica"),
-    TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
-    TQString::fromLatin1("http://arstechnica.com/favicon.ico"),
+    TQString::tqfromLatin1("Arstechnica"),
+    TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
+    TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
-    TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
-    TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+    TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("amiga-news.de - english Amiga news"),
-    TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
-    TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+    TQString::tqfromLatin1("amiga-news.de - english Amiga news"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreshPorts - the place for ports"),
-    TQString::fromLatin1("http://www.freshports.org/news.php3"),
-    TQString::fromLatin1("http://www.freshports.org/favicon.ico"),
+    TQString::tqfromLatin1("FreshPorts - the place for ports"),
+    TQString::tqfromLatin1("http://www.freshports.org/news.php3"),
+    TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("zez.org - about code "),
-    TQString::fromLatin1("http://zez.org/article/rssheadlines"),
+    TQString::tqfromLatin1("zez.org - about code "),
+    TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("BSDatwork.com"),
-    TQString::fromLatin1("http://BSDatwork.com/backend.php"),
-    TQString::fromLatin1("http://BSDatwork.com/favicon.ico"),
+    TQString::tqfromLatin1("BSDatwork.com"),
+    TQString::tqfromLatin1("http://BSDatwork.com/backend.php"),
+    TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreshSource - the place for source"),
-    TQString::fromLatin1("http://www.freshsource.org/news.php"),
-    TQString::fromLatin1("http://www.freshsource.org/favicon.ico"),
+    TQString::tqfromLatin1("FreshSource - the place for source"),
+    TQString::tqfromLatin1("http://www.freshsource.org/news.php"),
+    TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("The FreeBSD Diary"),
-    TQString::fromLatin1("http://www.freebsddiary.org/news.php"),
-    TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"),
+    TQString::tqfromLatin1("The FreeBSD Diary"),
+    TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"),
+    TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"),
     NewsSourceData::Computers ),
   // Miscellaneous ------
     NewsSourceData(
-    TQString::fromLatin1("tagesschau.de"),
-    TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"),
-    TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"),
+    TQString::tqfromLatin1("tagesschau.de"),
+    TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"),
+    TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1("CNN Top Stories"),
-    TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
-    TQString::fromLatin1("http://www.cnn.com/favicon.ico"),
+    TQString::tqfromLatin1("CNN Top Stories"),
+    TQString::tqfromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
+    TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"),
     NewsSourceData::Misc ),
     /*feed URL changed*/
     NewsSourceData(
-    TQString::fromLatin1("HotWired"),
-    TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
-    TQString::fromLatin1("http://www.hotwired.com/favicon.ico"),
+    TQString::tqfromLatin1("HotWired"),
+    TQString::tqfromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
+    TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1("The Register"),
-    TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"),
-    TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"),
+    TQString::tqfromLatin1("The Register"),
+    TQString::tqfromLatin1("http://www.theregister.co.uk/headlines.rss"),
+    TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1( "Christian Science Monitor" ),
-    TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
-    TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"),
+    TQString::tqfromLatin1( "Christian Science Monitor" ),
+    TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
+    TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"),
     NewsSourceData::Misc ),
   // Recreation
    // Society
     NewsSourceData(
-    TQString::fromLatin1("nippon.it"),
-    TQString::fromLatin1("http://www.nippon.it/backend.it.php"),
-    TQString::fromLatin1("http://www.nippon.it/favicon.ico"),
+    TQString::tqfromLatin1("nippon.it"),
+    TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"),
+    TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::fromLatin1( "gflash" ),
-    TQString::fromLatin1( "http://www.gflash.de/backend.php"),
-    TQString::fromLatin1( "http://www.gflash.de/favicon.ico"),
+    TQString::tqfromLatin1( "gflash" ),
+    TQString::tqfromLatin1( "http://www.gflash.de/backend.php"),
+    TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::fromLatin1( "Quintessenz" ),
-    TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
-    TQString::fromLatin1( "http://quintessenz.at/favicon.ico"),
+    TQString::tqfromLatin1( "Quintessenz" ),
+    TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
+    TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"),
     NewsSourceData::Society )
 };
 
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 4afb0350d..24f30a851 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -37,7 +37,7 @@ NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const
 	setInstance( NewsTickerPluginFactory::instance() );
 }
 
-Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* parentWidget )
+Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
diff --git a/kontact/plugins/newsticker/newsticker_plugin.h b/kontact/plugins/newsticker/newsticker_plugin.h
index b3c0b651d..e651e7dd7 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.h
+++ b/kontact/plugins/newsticker/newsticker_plugin.h
@@ -31,7 +31,7 @@ class NewsTickerPlugin : public Kontact::Plugin
     NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     NewsTickerPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget* parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget* tqparentWidget );
 
   protected:
     virtual KParts::ReadOnlyPart* createPart() { return 0L; }
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index b45f8c7bf..5283d84d8 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -140,8 +140,8 @@ void SummaryWidget::initDocuments()
     connectDCOPSignal( "rssservice", feedRef.obj(), "documentUpdated(DCOPRef)",
                        "documentUpdated(DCOPRef)", false );
 
-    if ( qApp )
-      qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
+    if ( tqApp )
+      tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
                                     TQEventLoop::ExcludeSocketNotifiers );
   }
 
@@ -168,8 +168,8 @@ void SummaryWidget::documentUpdated( DCOPRef feedRef )
     DCOPRef artRef = feedRef.call( "article(int)", i );
     TQString title, url;
 
-    if ( qApp )
-      qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
+    if ( tqApp )
+      tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
                                         TQEventLoop::ExcludeSocketNotifiers );
 
     artRef.call( "title()" ).get( title );
@@ -220,7 +220,7 @@ void SummaryWidget::updateView()
     KURLLabel *urlLabel = new KURLLabel( hbox );
     urlLabel->setURL( (*it).url );
     urlLabel->setPixmap( (*it).logo );
-    urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
+    urlLabel->setMaximumSize( urlLabel->tqminimumSizeHint() );
     mLabels.append( urlLabel );
 
     connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
@@ -231,13 +231,13 @@ void SummaryWidget::updateView()
     // header
     TQLabel *label = new TQLabel( hbox );
     label->setText( KCharsets::resolveEntities( (*it).title ) );
-    label->setAlignment( AlignLeft|AlignVCenter );
+    label->tqsetAlignment( AlignLeft|AlignVCenter );
     label->setFont( boldFont );
     label->setIndent( 6 );
-    label->setMaximumSize( label->minimumSizeHint() );
+    label->setMaximumSize( label->tqminimumSizeHint() );
     mLabels.append( label );
 
-    hbox->setMaximumWidth( hbox->minimumSizeHint().width() );
+    hbox->setMaximumWidth( hbox->tqminimumSizeHint().width() );
     hbox->show();
 
     // articles
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 326055855..183a2e122 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -85,10 +85,10 @@ void KCMSDSummary::customDaysChanged( int value )
 
 void KCMSDSummary::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
 
   mDaysGroup = new TQButtonGroup( 0, Vertical, i18n( "Special Dates Summary" ), this );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(),
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup );
@@ -117,7 +117,7 @@ void KCMSDSummary::initGUI()
 
   hbox->addStretch( 1 );
 
-  layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
 
   mCalendarGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Calendar" ), this );
 
@@ -132,10 +132,10 @@ void KCMSDSummary::initGUI()
   mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup );
   mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup );
 
-  layout->addWidget( mCalendarGroup, 1, 0 );
-  layout->addWidget( mContactGroup, 1, 1 );
+  tqlayout->addWidget( mCalendarGroup, 1, 0 );
+  tqlayout->addWidget( mContactGroup, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void KCMSDSummary::load()
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 2967e889c..bd1fa73bc 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -183,8 +183,8 @@ int SDSummaryWidget::span( KCal::Event *event )
   int span=1;
   if ( event->isMultiDay() && event->doesFloat() ) {
     TQDate d = event->dtStart().date();
-    if ( d < TQDate::currentDate() ) {
-      d = TQDate::currentDate();
+    if ( d < TQDate::tqcurrentDate() ) {
+      d = TQDate::tqcurrentDate();
     }
     while ( d < event->dtEnd().date() ) {
       span++;
@@ -199,8 +199,8 @@ int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date )
 {
   int dayof=1;
   TQDate d = event->dtStart().date();
-  if ( d < TQDate::currentDate() ) {
-    d = TQDate::currentDate();
+  if ( d < TQDate::tqcurrentDate() ) {
+    d = TQDate::tqcurrentDate();
   }
   while ( d < event->dtEnd().date() ) {
     if ( d < date ) {
@@ -228,7 +228,7 @@ void SDSummaryWidget::updateView()
   // No reason to show the date year
   TQString savefmt = KGlobal::locale()->dateFormat();
   KGlobal::locale()->setDateFormat( KGlobal::locale()->
-                                    dateFormat().replace( 'Y', ' ' ) );
+                                    dateFormat().tqreplace( 'Y', ' ' ) );
 
   // Search for Birthdays and Anniversaries in the Addressbook
   KABC::AddressBook::Iterator it;
@@ -269,9 +269,9 @@ void SDSummaryWidget::updateView()
   // Search for Birthdays, Anniversaries, Holidays, and Special Occasions
   // in the Calendar
   TQDate dt;
-  TQDate currentDate = TQDate::currentDate();
-  for ( dt=currentDate;
-        dt<=currentDate.addDays( mDaysAhead - 1 );
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  for ( dt=tqcurrentDate;
+        dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
         dt=dt.addDays(1) ) {
     KCal::Event::List events = mCalendar->events( dt,
                                                   KCal::EventSortStartDate,
@@ -358,8 +358,8 @@ void SDSummaryWidget::updateView()
   // Seach for Holidays
   if ( mShowHolidays ) {
     if ( initHolidays() ) {
-      for ( dt=currentDate;
-            dt<=currentDate.addDays( mDaysAhead - 1 );
+      for ( dt=tqcurrentDate;
+            dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
             dt=dt.addDays(1) ) {
         TQValueList holidays = mHolidays->getHolidays( dt );
         TQValueList::ConstIterator it = holidays.begin();
@@ -429,8 +429,8 @@ void SDSummaryWidget::updateView()
       } else {
         label->setPixmap( icon_img );
       }
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -438,7 +438,7 @@ void SDSummaryWidget::updateView()
       TQString datestr;
 
       //Muck with the year -- change to the year 'daysTo' days away
-      int year = currentDate.addDays( (*addrIt).daysTo ).year();
+      int year = tqcurrentDate.addDays( (*addrIt).daysTo ).year();
       TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() );
 
       if ( (*addrIt).daysTo == 0 ) {
@@ -457,7 +457,7 @@ void SDSummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
       if ( makeBold ) {
@@ -474,7 +474,7 @@ void SDSummaryWidget::updateView()
         label->setText( i18n( "in 1 day", "in %n days", (*addrIt).daysTo ) );
       }
 
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
 
@@ -492,7 +492,7 @@ void SDSummaryWidget::updateView()
       }
       label = new TQLabel( this );
       label->setText( what );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -530,7 +530,7 @@ void SDSummaryWidget::updateView()
         } else {
           label->setText( i18n( "one year", "%n years", (*addrIt).yearsOld  ) );
         }
-        label->setAlignment( AlignLeft | AlignVCenter );
+        label->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 5 );
         mLabels.append( label );
       }
@@ -542,7 +542,7 @@ void SDSummaryWidget::updateView()
         i18n( "No special dates within the next 1 day",
               "No special dates pending within the next %n days",
               mDaysAhead ), this, "nothing to see" );
-    label->setAlignment( AlignHCenter | AlignVCenter );
+    label->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 4 );
     mLabels.append( label );
   }
@@ -556,7 +556,7 @@ void SDSummaryWidget::updateView()
 void SDSummaryWidget::mailContact( const TQString &uid )
 {
   KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
-  TQString email = ab->findByUid( uid ).fullEmail();
+  TQString email = ab->tqfindByUid( uid ).fullEmail();
 
   kapp->invokeMailer( email, TQString::null );
 }
@@ -605,27 +605,27 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 
 void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years )
 {
-  TQDate currentDate;
+  TQDate tqcurrentDate;
   TQDate eventDate;
 
   if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) {
-    currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() );
-    if ( !TQDate::leapYear( TQDate::currentDate().year() ) )
+    tqcurrentDate = TQDate( date.year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
+    if ( !TQDate::leapYear( TQDate::tqcurrentDate().year() ) )
       eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;)
     else
       eventDate = TQDate( date.year(), date.month(), date.day() );
   } else {
-    currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() );
+    tqcurrentDate = TQDate( 0, TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
     eventDate = TQDate( 0, date.month(), date.day() );
   }
 
-  int offset = currentDate.daysTo( eventDate );
+  int offset = tqcurrentDate.daysTo( eventDate );
   if ( offset < 0 ) {
     days = 365 + offset;
-    years = TQDate::currentDate().year() + 1 - date.year();
+    years = TQDate::tqcurrentDate().year() + 1 - date.year();
   } else {
     days = offset;
-    years = TQDate::currentDate().year() - date.year();
+    years = TQDate::tqcurrentDate().year() - date.year();
   }
 }
 
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index c8a816c2f..70cfa5213 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -49,9 +49,9 @@ SpecialdatesPlugin::~SpecialdatesPlugin()
 {
 }
 
-Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SDSummaryWidget( this, parentWidget );
+  return new SDSummaryWidget( this, tqparentWidget );
 }
 
 const KAboutData *SpecialdatesPlugin::aboutData()
diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h
index 59fc8dbba..eb3a514ff 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.h
+++ b/kontact/plugins/specialdates/specialdates_plugin.h
@@ -39,7 +39,7 @@ class SpecialdatesPlugin : public Kontact::Plugin
 
     const KAboutData *aboutData();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
   protected:
     virtual KParts::ReadOnlyPart *createPart() { return false; }
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 341c37d80..5b6039827 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
 
 void DropWidget::dropEvent( TQDropEvent *event )
 {
-  int alignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
-  alignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
+  tqalignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index ade7b6c17..41c892eaf 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -32,7 +32,7 @@ class DropWidget : public QWidget
     DropWidget( TQWidget *parent, const char *name = 0 );
 
   signals:
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index f21a2bb35..22d27f47d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -93,15 +93,15 @@ PluginView::~PluginView()
 KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mPluginView = new PluginView( this );
-  layout->addWidget( mPluginView );
+  tqlayout->addWidget( mPluginView );
 
-  layout->setStretchFactor( mPluginView, 1 );
+  tqlayout->setStretchFactor( mPluginView, 1 );
 
   connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
            this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
@@ -119,7 +119,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
 void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 0b22f853b..e7c161ea1 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -58,7 +58,7 @@
 #include "summaryview_part.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 namespace Kontact
 {
@@ -80,7 +80,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
   connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
-  setDate( TQDate::currentDate() );
+  setDate( TQDate::tqcurrentDate() );
   connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
            TQT_SLOT( setDate( const TQDate& ) ) );
 
@@ -137,7 +137,7 @@ void SummaryViewPart::updateWidgets()
   const KPIM::Identity &id = idm.defaultIdentity();
 
   TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
-  mUsernameLabel->setText( TQString::fromLatin1( "%1" ).arg( currentUser ) );
+  mUsernameLabel->setText( TQString::tqfromLatin1( "%1" ).arg( currentUser ) );
 
   mSummaries.clear();
 
@@ -177,12 +177,12 @@ void SummaryViewPart::updateWidgets()
         mSummaries.insert( plugin->identifier(), summary );
 
         connect( summary, TQT_SIGNAL( message( const TQString& ) ),
-                 BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+                 BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
         connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
                  this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
-        if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
-             !mRightColumnSummaries.contains( plugin->identifier() ) ) {
+        if ( !mLeftColumnSummaries.tqcontains( plugin->identifier() ) &&
+             !mRightColumnSummaries.tqcontains( plugin->identifier() ) ) {
           mLeftColumnSummaries.append( plugin->identifier() );
         }
 
@@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets()
   TQFrame *vline = new TQFrame( mFrame );
   vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain );
 
-  TQHBoxLayout *layout = new TQHBoxLayout( mFrame );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame );
 
-  mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  layout->addWidget( vline );
-  mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint()  );
+  mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  tqlayout->addWidget( vline );
+  mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint()  );
 
 
   TQStringList::Iterator strIt;
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
   mRightColumn->addStretch();
 }
 
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
 {
   if ( target == widget )
     return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   if ( target == mFrame ) {
     int pos = 0;
 
-    if ( alignment & Qt::AlignTop )
+    if ( tqalignment & Qt::AlignTop )
       pos = 0;
 
-    if ( alignment & Qt::AlignLeft ) {
-      if ( alignment & Qt::AlignBottom )
+    if ( tqalignment & Qt::AlignLeft ) {
+      if ( tqalignment & Qt::AlignBottom )
         pos = mLeftColumnSummaries.count();
 
       mLeftColumn->insertWidget( pos, widget );
       mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
     } else {
-      if ( alignment & Qt::AlignBottom )
+      if ( tqalignment & Qt::AlignBottom )
         pos = mRightColumnSummaries.count();
 
       mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
 
   int targetPos = mLeftColumn->findWidget( target );
   if ( targetPos != -1 ) {
-    if ( alignment == Qt::AlignBottom )
+    if ( tqalignment == Qt::AlignBottom )
       targetPos++;
 
     mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   } else {
     targetPos = mRightColumn->findWidget( target );
 
-    if ( alignment == Qt::AlignBottom )
+    if ( tqalignment == Qt::AlignBottom )
       targetPos++;
 
     mRightColumn->insertWidget( targetPos, widget );
@@ -346,7 +346,7 @@ TQStringList SummaryViewPart::configModules() const
     TQStringList cm = it.data()->configModules();
     TQStringList::ConstIterator strIt;
     for ( strIt = cm.begin(); strIt != cm.end(); ++strIt )
-      if ( !(*strIt).isEmpty() && !modules.contains( *strIt ) )
+      if ( !(*strIt).isEmpty() && !modules.tqcontains( *strIt ) )
         modules.append( *strIt );
   }
 
@@ -374,7 +374,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mUsernameLabel = new TQLabel( mMainWidget );
   hbl->addWidget( mUsernameLabel );
   mDateLabel = new TQLabel( mMainWidget );
-  mDateLabel->setAlignment( AlignRight );
+  mDateLabel->tqsetAlignment( AlignRight );
   hbl->addWidget( mDateLabel );
 
   TQFrame *hline = new TQFrame( mMainWidget );
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 1e99f7369..38e68b153 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -75,7 +75,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
   protected slots:
     void slotConfigure();
     void updateWidgets();
-    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
 
   private:
     void initGUI( Kontact::Core *core );
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index c58f8f57b..b921d025a 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -41,7 +41,7 @@
 #include 
 
 
-TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
+TestPart::TestPart(TQObject *parent, const char *name) // ## tqparentWidget
   : KParts::ReadOnlyPart(parent, name)
 {
   setInstance( new KInstance("testpart") ); // ## memleak
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 8c1064094..abe117648 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
     DCOPObject( "WeatherSummaryWidget" ), mProc( 0 )
 {
   mLayout = new TQVBoxLayout( this, 3, 3 );
-  mLayout->setAlignment( Qt::AlignTop );
+  mLayout->tqsetAlignment( Qt::AlignTop );
 
   TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
@@ -106,16 +106,16 @@ void SummaryWidget::updateView()
     TQImage img;
     img = (*it).icon();
 
-    TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 );
-    mLayouts.append( layout );
+    TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 );
+    mLayouts.append( tqlayout );
 
     KURLLabel* urlLabel = new KURLLabel( this );
     urlLabel->installEventFilter( this );
     urlLabel->setURL( (*it).stationID() );
     urlLabel->setPixmap( img.smoothScale( 32, 32 ) );
-    urlLabel->setMaximumSize( urlLabel->sizeHint() );
-    urlLabel->setAlignment( AlignTop );
-    layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
+    urlLabel->setMaximumSize( urlLabel->tqsizeHint() );
+    urlLabel->tqsetAlignment( AlignTop );
+    tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
     mLabels.append( urlLabel );
     connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
               this, TQT_SLOT( showReport( const TQString& ) ) );
@@ -125,8 +125,8 @@ void SummaryWidget::updateView()
     TQFont font = label->font();
     font.setBold( true );
     label->setFont( font );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 0, 0, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
     mLabels.append( label );
 
     TQString labelText;
@@ -140,11 +140,11 @@ void SummaryWidget::updateView()
                          .arg( i18n( "Rel. Humidity" ) )
                          .arg( (*it).relativeHumidity() );
 
-    TQToolTip::add( label, labelText.replace( " ", " " ) );
+    TQToolTip::add( label, labelText.tqreplace( " ", " " ) );
 
     label = new TQLabel( cover, this );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 1, 1, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 );
     mLabels.append( label );
   }
 
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index a3ea74d1e..d42a24f61 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -37,9 +37,9 @@ WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStr
   setInstance( WeatherPluginFactory::instance() );
 }
 
-Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
 
 const KAboutData *WeatherPlugin::aboutData()
diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h
index 4ab019645..924eb0a32 100644
--- a/kontact/plugins/weather/weather_plugin.h
+++ b/kontact/plugins/weather/weather_plugin.h
@@ -31,7 +31,7 @@ class WeatherPlugin : public Kontact::Plugin
     WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     WeatherPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     const KAboutData *aboutData();
 
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 19e9d9ea7..e671ddeb1 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -93,10 +93,10 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
       text += "" + home + "
    ";
     }
 
-    text.replace( "\n", "
    " );
+    text.tqreplace( "\n", "
    " );
 
     KActiveLabel *label = new KActiveLabel( text, topFrame );
-    label->setAlignment( AlignTop );
+    label->tqsetAlignment( AlignTop );
     topLayout->addWidget( label );
 
 
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 4303175f6..b54454e14 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p )
 
     TQBrush brush;
     if ( isCurrent() || isSelected() || mPaintActive )
-      brush = box->colorGroup().brush( TQColorGroup::Highlight );
+      brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
     else
-      brush = box->colorGroup().highlight().light( 115 );
+      brush = box->tqcolorGroup().highlight().light( 115 );
     p->fillRect( 1, 0, w - 2, h - 1, brush );
     TQPen pen = p->pen();
     TQPen oldPen = pen;
-    pen.setColor( box->colorGroup().mid() );
+    pen.setColor( box->tqcolorGroup().mid() );
     p->setPen( pen );
 
     p->drawPoint( 1, 0 );
@@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p )
     p->drawPixmap( x, y, mPixmap );
   }
 
-  TQColor shadowColor = listBox()->colorGroup().background().dark(115);
+  TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115);
   if ( isCurrent() || isSelected() ) {
-    p->setPen( box->colorGroup().highlightedText() );
+    p->setPen( box->tqcolorGroup().highlightedText() );
   }
 
   if ( !text().isEmpty() && navigator()->showText() ) {
@@ -225,13 +225,13 @@ void EntryItem::paint( TQPainter *p )
     if ( plugin()->disabled() ) {
       p->setPen( box->palette().disabled().text( ) );
     } else if ( isCurrent() || isSelected() || mHasHover ) {
-      p->setPen( box->colorGroup().highlight().dark(115) );
+      p->setPen( box->tqcolorGroup().highlight().dark(115) );
       p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
           y + 1, text() );
-      p->setPen( box->colorGroup().highlightedText() );
+      p->setPen( box->tqcolorGroup().highlightedText() );
     }
     else
-      p->setPen( box->colorGroup().text() );
+      p->setPen( box->tqcolorGroup().text() );
 
     p->drawText( x, y, text() );
   }
@@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
 
 }
 
-TQSize Navigator::sizeHint() const
+TQSize Navigator::tqsizeHint() const
 {
   return TQSize( 100, 100 );
 }
@@ -344,7 +344,7 @@ void Navigator::updatePlugins( TQValueList plugins_ )
       minWidth = item->width( this );
   }
 
-  parentWidget()->setFixedWidth( minWidth );
+  tqparentWidget()->setFixedWidth( minWidth );
 }
 
 void Navigator::dragEnterEvent( TQDragEnterEvent *event )
@@ -491,7 +491,7 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos )
     if (width > maxWidth)
       maxWidth = width;
   }
-  parentWidget()->setFixedWidth( maxWidth );
+  tqparentWidget()->setFixedWidth( maxWidth );
 
   triggerUpdate( true );
 }
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 674980c01..a5aad36ac 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -101,12 +101,12 @@ class EntryItemToolTip : public QToolTip
       if ( !mListBox ) return;
       TQListBoxItem* item = mListBox->itemAt( p );
       if ( !item ) return;
-      const TQRect itemRect = mListBox->itemRect( item );
-      if ( !itemRect.isValid() ) return;
+      const TQRect tqitemRect = mListBox->tqitemRect( item );
+      if ( !tqitemRect.isValid() ) return;
 
       const EntryItem *entryItem = static_cast( item );
       TQString tipStr = entryItem->text();
-      tip( itemRect, tipStr );
+      tip( tqitemRect, tipStr );
     }
   private:
     TQListBox* mListBox;
@@ -125,7 +125,7 @@ class Navigator : public KListBox
 
     void updatePlugins( TQValueList plugins );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     void highlightItem( EntryItem* item );
 
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index c14669ff8..2162ffa0e 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -114,7 +114,7 @@ PluginSelection::~PluginSelection()
 void PluginSelection::readConfig()
 {
   const KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   int activeComponent = 0;
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index ee098180e..760ea846e 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -76,7 +76,7 @@ static void listPlugins()
 {
   KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
   KTrader::OfferList offers = KTrader::self()->query(
-    TQString::fromLatin1( "Kontact/Plugin" ),
+    TQString::tqfromLatin1( "Kontact/Plugin" ),
     TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr service = (*it);
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 247bb6654..ab6134669 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -124,7 +124,7 @@ void MainWindow::initGUI()
            TQT_SLOT( showAboutDialog() ) );
 
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
 
@@ -187,7 +187,7 @@ void MainWindow::initObject()
   // done initializing
   slotShowStatusMsg( TQString::null );
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( slotShowStatusMsg( const TQString&  ) ) );
 
   // launch commandline specified module if any
@@ -226,7 +226,7 @@ void MainWindow::activatePluginModule()
   if ( !mActiveModule.isEmpty() ) {
     PluginList::ConstIterator end = mPlugins.end();
     for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it )
-      if ( ( *it )->identifier().contains( mActiveModule ) ) {
+      if ( ( *it )->identifier().tqcontains( mActiveModule ) ) {
         selectPlugin( *it );
         return;
       }
@@ -244,7 +244,7 @@ void MainWindow::initWidgets()
   mSplitter = new TQSplitter( mTopWidget );
   mBox = new TQHBox( mTopWidget );
   mSidePane = new IconSidePane( this, mSplitter );
-  mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+  mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
                                          TQSizePolicy::Preferred ) );
   // donÄt occupy screen estate on load
   TQValueList sizes;
@@ -278,7 +278,7 @@ void MainWindow::initWidgets()
   mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() );
-  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
 
   statusBar()->addWidget( mStatusMsgLabel, 10 , false );
   statusBar()->addWidget( mLittleProgress, 0 , true );
@@ -802,15 +802,15 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *focusWidget = kapp->focusWidget();
-  if ( mCurrentPlugin && focusWidget ) {
+  TQWidget *tqfocusWidget = kapp->tqfocusWidget();
+  if ( mCurrentPlugin && tqfocusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = focusWidget->parentWidget();
+    TQWidget *parent = tqfocusWidget->tqparentWidget();
     while ( parent ) {
       if ( parent == mCurrentPlugin->part()->widget() )
-        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr( focusWidget ) );
+        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr( tqfocusWidget ) );
 
-      parent = parent->parentWidget();
+      parent = parent->tqparentWidget();
     }
   }
 
@@ -828,10 +828,10 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     mPartsStack->raiseWidget( view );
     view->show();
 
-    if ( mFocusWidgets.contains( plugin->identifier() ) ) {
-      focusWidget = mFocusWidgets[ plugin->identifier() ];
-      if ( focusWidget )
-        focusWidget->setFocus();
+    if ( mFocusWidgets.tqcontains( plugin->identifier() ) ) {
+      tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
+      if ( tqfocusWidget )
+        tqfocusWidget->setFocus();
     } else
       view->setFocus();
 
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index bb8d50957..804f65e31 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 void Kontact::ProfileManager::readConfig()
 {
     
-    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
+    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) );
 
     typedef TQMap ProfileMap;
     ProfileMap profiles;
@@ -199,7 +199,7 @@ void Kontact::ProfileManager::readConfig()
     
     for ( ProfileMap::ConstIterator it = globalProfiles.begin(), end = globalProfiles.end(); it != end; ++it )
     {
-        if ( !profiles.contains( it.key() ) )
+        if ( !profiles.tqcontains( it.key() ) )
             profiles[it.key()] = it.data();
     }
 
@@ -252,7 +252,7 @@ void Kontact::ProfileManager::saveToProfile( const TQString& id )
 bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool syncConfig )
 {
     const TQString id = profile.id();
-    if ( m_profiles.contains( id ) )
+    if ( m_profiles.tqcontains( id ) )
         return false;
     m_profiles[id] = profile;
     emit profileAdded( id );
@@ -266,7 +266,7 @@ bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool
 
 void Kontact::ProfileManager::loadProfile( const TQString& id )
 {
-    if ( !m_profiles.contains( id ) )
+    if ( !m_profiles.tqcontains( id ) )
         return;
     emit profileLoaded( id );
 }
@@ -278,7 +278,7 @@ void Kontact::ProfileManager::removeProfile( const Kontact::Profile& profile )
 
 void Kontact::ProfileManager::removeProfile( const TQString& id )
 {
-    if ( !m_profiles.contains( id ) )
+    if ( !m_profiles.tqcontains( id ) )
         return;
     Kontact::Profile profile = profileById( id );
     if ( profile.isLocal() ) {
@@ -292,7 +292,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
 
 Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDirectory( const TQString& id, const TQString& path )
 {
-    if ( !m_profiles.contains( id ) )
+    if ( !m_profiles.tqcontains( id ) )
         return SuccessfulExport;
 
     if ( !TQDir( path ).exists() )
@@ -332,7 +332,7 @@ TQString Kontact::ProfileManager::generateNewId() const
     while ( true )
     {
         const TQString newId = KApplication::randomString( 10 );
-        if ( !m_profiles.contains( newId ) )
+        if ( !m_profiles.tqcontains( newId ) )
             return newId;
     }
 }
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 6b434ab8a..c89d8b60e 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -29,7 +29,7 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libkdepim/libkdepim.
 kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h 	kogroupwareprefspage.h
 
 libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD  = libkorganizer.la
+libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libkdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
 libkorganizerpart_la_SOURCES = korganizer_part.cpp
 libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
 
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index b9df9e869..8b938986a 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -723,7 +723,7 @@ void ActionManager::file_open( const KURL &url )
   // is that URL already opened somewhere else? Activate that window
   KOrg::MainWindow *korg=ActionManager::findInstance( url );
   if ( ( 0 != korg )&&( korg != mMainWindow ) ) {
-    KWin::activateWindow( korg->topLevelWidget()->winId() );
+    KWin::activateWindow( korg->tqtopLevelWidget()->winId() );
     return;
   }
 
@@ -745,7 +745,7 @@ void ActionManager::file_icalimport()
   TQString progPath;
   KTempFile tmpfn;
 
-  TQString homeDir = TQDir::homeDirPath() + TQString::fromLatin1( "/.calendar" );
+  TQString homeDir = TQDir::homeDirPath() + TQString::tqfromLatin1( "/.calendar" );
 
   if ( !TQFile::exists( homeDir ) ) {
     KMessageBox::error( dialogParent(),
@@ -998,7 +998,7 @@ bool ActionManager::saveURL()
     if ( result != KMessageBox::Continue ) return false;
 
     TQString filename = mURL.fileName();
-    filename.replace( filename.length() - 4, 4, ".ics" );
+    filename.tqreplace( filename.length() - 4, 4, ".ics" );
     mURL.setFileName( filename );
     if ( mURL.isLocalFile() ) {
       mFile = mURL.path();
@@ -1043,9 +1043,9 @@ void ActionManager::exportHTML()
   settings.readConfig();
 
   TQDate qd1;
-  qd1 = TQDate::currentDate();
+  qd1 = TQDate::tqcurrentDate();
   TQDate qd2;
-  qd2 = TQDate::currentDate();
+  qd2 = TQDate::tqcurrentDate();
   if ( settings.monthView() )
     qd2.addMonths( 1 );
   else
@@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary,
         attData = file;
       } else {
         if ( KMessageBox::warningContinueCancel( 0,
-              i18n("Removing attachments from an email might invalidate its signature."),
+              i18n("Removing attachments from an email might tqinvalidate its signature."),
               i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" )
               != KMessageBox::Continue )
           return;
@@ -1916,7 +1916,7 @@ bool ActionManager::queryClose()
 
   if ( mCalendar && mCalendar->isModified() ) {
     int res = KMessageBox::questionYesNoCancel( dialogParent(),
-      i18n("The calendar contains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+      i18n("The calendar tqcontains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
     // Exit on yes and no, don't exit on cancel. If saving fails, ask for exiting.
     if ( res == KMessageBox::Yes ) {
       close = saveModifiedURL();
@@ -2011,7 +2011,7 @@ void ActionManager::importCalendar( const KURL &url )
   }
 
   PreviewDialog *dialog;
-  dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() );
+  dialog = new PreviewDialog( url, mMainWindow->tqtopLevelWidget() );
   connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ),
            TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
   connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ),
@@ -2104,10 +2104,10 @@ bool ActionManager::handleCommandLine()
     ret = false;
   } else if ( args->count() <= 0 ) {
     // No filenames given => all other args are meaningless, show main Window
-    mainWindow->topLevelWidget()->show();
+    mainWindow->tqtopLevelWidget()->show();
   } else if ( !args->isSet( "open" ) ) {
     // Import, merge, or ask => we need the resource calendar window anyway.
-    mainWindow->topLevelWidget()->show();
+    mainWindow->tqtopLevelWidget()->show();
 
     // Check for import, merge or ask
     if ( args->isSet( "import" ) ) {
@@ -2130,7 +2130,7 @@ bool ActionManager::handleCommandLine()
 
 TQWidget *ActionManager::dialogParent()
 {
-  return mCalendarView->topLevelWidget();
+  return mCalendarView->tqtopLevelWidget();
 }
 
 #include "actionmanager.moc"
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ba1bbe6e3..91b42b1e8 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
 #ifndef KORG_NOSPLITTER
-  // create the main layout frames.
+  // create the main tqlayout frames.
   mPanner = new TQSplitter( TQSplitter::Horizontal, this,
                            "CalendarView::Panner" );
   topLayout->addWidget( mPanner );
@@ -177,7 +177,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
 
   mDateNavigatorContainer = new KDateNavigator( leftFrame, true,
                                        "CalendarView::DateNavigator",
-                                       TQDate::currentDate() );
+                                       TQDate::tqcurrentDate() );
   mTodoList = new KOTodoView( CalendarNull::self(), leftFrame, "todolist" );
 
   mEventViewer = new KOEventViewer ( CalendarNull::self(), leftFrame, "EventViewer" );
@@ -185,7 +185,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQWidget *rightBox = new TQWidget( mainBox );
   TQBoxLayout *rightLayout = new TQVBoxLayout( rightBox );
 
-  mNavigatorBar = new NavigatorBar( TQDate::currentDate(), rightBox );
+  mNavigatorBar = new NavigatorBar( TQDate::tqcurrentDate(), rightBox );
   rightLayout->addWidget( mNavigatorBar );
 
   mRightFrame = new TQWidgetStack( rightBox );
@@ -195,7 +195,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
 
   if ( KOPrefs::instance()->mVerticalScreen ) {
     // mTodoList->setFixedHeight( 60 );
-    mTodoList->setFixedHeight( mDateNavigatorContainer->sizeHint().height() );
+    mTodoList->setFixedHeight( mDateNavigatorContainer->tqsizeHint().height() );
   }
 #endif
 
@@ -387,7 +387,7 @@ TQDate CalendarView::activeDate( bool fallbackToToday )
 
   // When all else fails, use the navigator start date, or today.
   if ( fallbackToToday ) {
-    return TQDate::currentDate();
+    return TQDate::tqcurrentDate();
   } else {
     return mDateNavigator->selectedDates().first();
   }
@@ -547,7 +547,7 @@ void CalendarView::readSettings()
 
   TQValueList sizes = config->readIntListEntry( "Separator1" );
   if ( sizes.count() != 2 ) {
-    sizes << mDateNavigatorContainer->minimumSizeHint().width();
+    sizes << mDateNavigatorContainer->tqminimumSizeHint().width();
     sizes << 300;
   }
   mPanner->setSizes( sizes );
@@ -779,14 +779,14 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
         TQString description = i18n( "To-do completed: %1 (%2)" ).arg(
           newIncidence->summary() ).arg( timeStr );
 
-        Journal::List journals = calendar()->journals( TQDate::currentDate() );
+        Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() );
         Journal *journal;
 
         if ( journals.isEmpty() ) {
           journal = new Journal();
-          journal->setDtStart( TQDateTime::currentDateTime() );
+          journal->setDtStart( TQDateTime::tqcurrentDateTime() );
 
-          TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() );
+          TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
           journal->setSummary( i18n("Journal of %1").arg( dateStr ) );
           journal->setDescription( description );
 
@@ -1137,7 +1137,7 @@ KOEventEditor *CalendarView::newEventEditor( ResourceCalendar *res, const TQStri
   // let the current view change the default start/end datetime
   bool allDay = allDayParam;
   TQDateTime startDt( startDtParam ), endDt( endDtParam );
-  // Adjust the start/end date times (i.e. replace invalid values by defaults,
+  // Adjust the start/end date times (i.e. tqreplace invalid values by defaults,
   // and let the view adjust the type.
   dateTimesForNewEvent( startDt, endDt, allDay );
 
@@ -1248,7 +1248,7 @@ void CalendarView::newTodo( ResourceCalendar *res, const TQString &subRes )
   todoEditor->setResource( res, subRes );
   if ( mViewManager->currentView()->isEventView() ) {
     dtDue.setDate( mDateNavigator->selectedDates().first() );
-    TQDateTime dtDummy = TQDateTime::currentDateTime();
+    TQDateTime dtDummy = TQDateTime::tqcurrentDateTime();
     mViewManager->currentView()->eventDurationHint( dtDue, dtDummy, allday );
     todoEditor->setDates( dtDue, allday );
   }
@@ -1669,7 +1669,7 @@ void CalendarView::schedule_forward( Incidence *incidence )
 
 void CalendarView::mailFreeBusy( int daysToPublish )
 {
-  TQDateTime start = TQDateTime::currentDateTime();
+  TQDateTime start = TQDateTime::tqcurrentDateTime();
   TQDateTime end = start.addDays(daysToPublish);
 
   FreeBusy *freebusy = new FreeBusy(mCalendar, start, end);
@@ -1865,7 +1865,7 @@ void CalendarView::eventUpdated(Incidence *)
 void CalendarView::adaptNavigationUnits()
 {
   if (mViewManager->currentView()->isEventView()) {
-    int days = mViewManager->currentView()->currentDateCount();
+    int days = mViewManager->currentView()->tqcurrentDateCount();
     if (days == 1) {
       emit changeNavStringPrev(i18n("&Previous Day"));
       emit changeNavStringNext(i18n("&Next Day"));
@@ -2797,7 +2797,7 @@ void CalendarView::getIncidenceHierarchy( Incidence *inc,
                                           Incidence::List &children )
 {
   // protecion against looping hierarchies
-  if ( inc && !children.contains( inc ) ) {
+  if ( inc && !children.tqcontains( inc ) ) {
     Incidence::List::ConstIterator it;
     Incidence::List immediateChildren = inc->relations();
     for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 5922e8f2d..6cdc3154a 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -260,7 +260,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     /**
       Add an incidence to the active calendar.
       @param ical A calendar in iCalendar format containing the incidence. The
-                  calendar must consist of a VCALENDAR component which contains
+                  calendar must consist of a VCALENDAR component which tqcontains
                   the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and
                   optionally a VTIMEZONE component. If there is more than one
                   incidence, only the first is added to KOrganizer's calendar.
@@ -371,7 +371,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
 
 
     /**
-      Check if clipboard contains vCalendar event. The signal pasteEnabled() is
+      Check if clipboard tqcontains vCalendar event. The signal pasteEnabled() is
       emitted as result.
     */
     void checkClipboard();
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index c0ce30eb6..0fdcb302e 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -59,14 +59,14 @@ void DateChecker::enableRollover( RolloverType r )
                  TQT_SLOT( possiblyPastMidnight() ) );
       }
       mUpdateTimer->start( 0, true );
-      mLastDayChecked = TQDate::currentDate();
+      mLastDayChecked = TQDate::tqcurrentDate();
   }
   mUpdateRollover = r;
 }
 
 void DateChecker::passedMidnight()
 {
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
 
   if ( today.month() != mLastDayChecked.month() ) {
      if ( mUpdateRollover == FollowMonth ) {
@@ -78,9 +78,9 @@ void DateChecker::passedMidnight()
 
 void DateChecker::possiblyPastMidnight()
 {
-  if ( mLastDayChecked != TQDate::currentDate() ) {
+  if ( mLastDayChecked != TQDate::tqcurrentDate() ) {
     passedMidnight();
-    mLastDayChecked = TQDate::currentDate();
+    mLastDayChecked = TQDate::tqcurrentDate();
   }
   // Set the timer to go off 1 second after midnight
   // or after 8 minutes, whichever comes first.
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index edc036ce4..e03e3c897 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -37,7 +37,7 @@ using namespace KCal;
 DateNavigator::DateNavigator( TQObject *parent, const char *name )
   : TQObject( parent, name )
 {
-  mSelectedDates.append( TQDate::currentDate() );
+  mSelectedDates.append( TQDate::tqcurrentDate() );
 }
 
 DateNavigator::~DateNavigator()
@@ -69,7 +69,7 @@ void DateNavigator::selectDate( const TQDate &date )
 
   if ( !d.isValid() ) {
     kdDebug(5850) << "DateNavigator::selectDates(TQDate): an invalid date was passed as a parameter!" << endl;
-    d = TQDate::currentDate();
+    d = TQDate::tqcurrentDate();
   }
 
   mSelectedDates.clear();
@@ -143,18 +143,18 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
   int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
 
-  TQDate currentDate = d.addDays( weekStart - dayOfWeek );
+  TQDate tqcurrentDate = d.addDays( weekStart - dayOfWeek );
 
   if ( weekStart != 1 && dayOfWeek < weekStart ) {
-    currentDate = currentDate.addDays( -7 );
+    tqcurrentDate = tqcurrentDate.addDays( -7 );
   }
 
   mSelectedDates.clear();
-  int mask = KOGlobals::self()->getWorkWeekMask();
+  int tqmask = KOGlobals::self()->getWorkWeekMask();
 
   for ( int i = 0; i < 7; ++i ) {
-    if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) {
-	mSelectedDates.append( currentDate.addDays(i) );
+    if( (1<< ((i + weekStart + 6) % 7)) & (tqmask) ) {
+	mSelectedDates.append( tqcurrentDate.addDays(i) );
     }
   }
 
@@ -163,7 +163,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
 void DateNavigator::selectToday()
 {
-  TQDate d = TQDate::currentDate();
+  TQDate d = TQDate::tqcurrentDate();
 
   int dateCount = mSelectedDates.count();
 
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index ac0892947..e1e3223ab 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -207,18 +207,18 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * )
 #if 0
   kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
   kdDebug(5850) << "  CURRENT SIZE: " << size() << endl;
-  kdDebug(5850) << "  MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
-  kdDebug(5850) << "  SIZEHINT: " << sizeHint() << endl;
-  kdDebug(5850) << "  MINIMUM SIZE: " << minimumSize() << endl;
+  kdDebug(5850) << "  MINIMUM SIZEHINT: " << tqminimumSizeHint() << endl;
+  kdDebug(5850) << "  SIZEHINT: " << tqsizeHint() << endl;
+  kdDebug(5850) << "  MINIMUM SIZE: " << tqminimumSize() << endl;
 #endif
   TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
 }
 
 void DateNavigatorContainer::resizeAllContents()
 {
-  TQSize minSize = mNavigatorView->minimumSizeHint();
+  TQSize minSize = mNavigatorView->tqminimumSizeHint();
 
-//  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
+//  kdDebug(5850) << "  NAVIGATORVIEW tqminimumSizeHint: " << minSize << endl;
 
   int margin = KDialog::spacingHint();
   int verticalCount = ( size().height() - margin*2 ) / minSize.height();
@@ -286,16 +286,16 @@ void DateNavigatorContainer::resizeAllContents()
   }
 }
 
-TQSize DateNavigatorContainer::minimumSizeHint() const
+TQSize DateNavigatorContainer::tqminimumSizeHint() const
 {
   int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->minimumSizeHint() + TQSize( margin, margin );
+  return mNavigatorView->tqminimumSizeHint() + TQSize( margin, margin );
 }
 
-TQSize DateNavigatorContainer::sizeHint() const
+TQSize DateNavigatorContainer::tqsizeHint() const
 {
   int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->sizeHint() + TQSize( margin, margin );
+  return mNavigatorView->tqsizeHint() + TQSize( margin, margin );
 }
 
 void DateNavigatorContainer::goNextMonth()
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index e30f19b42..b797427cf 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -41,8 +41,8 @@ class DateNavigatorContainer: public QFrame
     */
     void setCalendar( Calendar * );
 
-    TQSize minimumSizeHint() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSizeHint() const;
+    TQSize tqsizeHint() const;
     void setUpdateNeeded();
   public slots:
     /**
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index c4adbf820..1cd613e67 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -52,7 +52,7 @@ void EventArchiver::runOnce( Calendar* calendar, const TQDate& limitDate, TQWidg
 
 void EventArchiver::runAuto( Calendar* calendar, TQWidget* widget, bool withGUI )
 {
-  TQDate limitDate( TQDate::currentDate() );
+  TQDate limitDate( TQDate::tqcurrentDate() );
   int expiryTime = KOPrefs::instance()->mExpiryTime;
   switch (KOPrefs::instance()->mExpiryUnit) {
   case KOPrefs::UnitDays: // Days
@@ -190,7 +190,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
     uids << (*it)->uid();
   }
   for( it = allIncidences.begin(); it != allIncidences.end(); ++it ) {
-    if ( !uids.contains( (*it)->uid() ) ) {
+    if ( !uids.tqcontains( (*it)->uid() ) ) {
       archiveCalendar.deleteIncidence( *it );
     }
   }
@@ -247,7 +247,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate
   }
 
   // This QList is only to prevent infinit recursion
-  if ( checkedUids.contains( todo->uid() ) ) {
+  if ( checkedUids.tqcontains( todo->uid() ) ) {
     // Probably will never happen, calendar.cpp checks for this
     kdWarning() << "To-do hierarchy loop detected!";
     return false;
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index 9eb53dbf7..86f956793 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -4,7 +4,7 @@
     
         FilterEdit_base
     
-    
+    
         
             0
             0
@@ -50,7 +50,7 @@
                 
                 
                     
-                        layout3
+                        tqlayout3
                     
                     
                         
@@ -95,7 +95,7 @@
                 
                 
                     
-                        layout1
+                        tqlayout1
                     
                     
                         
@@ -111,7 +111,7 @@
                             
                                 Fixed
                             
-                            
+                            
                                 
                                     15
                                     20
@@ -165,7 +165,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     16
                                     21
@@ -220,7 +220,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     20
                                     110
@@ -312,7 +312,7 @@ Only to-dos which have least one attendee will be checked.  If you are not in th
 
     updateFilter()
 
-
+
 
     knuminput.h
     knuminput.h
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 65f945bad..187e1082e 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -80,7 +80,7 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url
   KIO::TransferJob *job = KIO::get( url, false, false );
   //pass the mainwindow to the job so any prompts are active
   KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
-  job->setWindow( korg->topLevelWidget() );
+  job->setWindow( korg->tqtopLevelWidget() );
 
   connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
            TQT_SLOT( slotResult( KIO::Job * ) ) );
@@ -140,7 +140,7 @@ void FreeBusyManager::setCalendar( KCal::Calendar *c )
 
 KCal::FreeBusy *FreeBusyManager::ownerFreeBusy()
 {
-  TQDateTime start = TQDateTime::currentDateTime();
+  TQDateTime start = TQDateTime::tqcurrentDateTime();
   TQDateTime end = start.addDays( KOPrefs::instance()->mFreeBusyPublishDays );
 
   FreeBusy *freebusy = new FreeBusy( mCalendar, start, end );
@@ -176,13 +176,13 @@ void FreeBusyManager::slotPerhapsUploadFB()
     // A timer is already running, so we don't need to do anything
     return;
 
-  int now = static_cast( TQDateTime::currentDateTime().toTime_t() );
+  int now = static_cast( TQDateTime::tqcurrentDateTime().toTime_t() );
   int eta = static_cast( mNextUploadTime.toTime_t() ) - now;
 
   if( !mUploadingFreeBusy ) {
     // Not currently uploading
     if( mNextUploadTime.isNull() ||
-        TQDateTime::currentDateTime() > mNextUploadTime ) {
+        TQDateTime::tqcurrentDateTime() > mNextUploadTime ) {
       // No uploading have been done in this session, or delay time is over
       publishFreeBusy();
       return;
@@ -256,8 +256,8 @@ void FreeBusyManager::publishFreeBusy()
 //   if (emailpos != -1) {
 //     const TQString emailName = defaultEmail.left( emailpos );
 //     const TQString emailHost = defaultEmail.mid( emailpos + 1 );
-//     targetURL = targetURL.url().replace("%25u", emailName, true);
-//     targetURL = targetURL.url().replace("%25d", emailHost, true);
+//     targetURL = targetURL.url().tqreplace("%25u", emailName, true);
+//     targetURL = targetURL.url().tqreplace("%25d", emailHost, true);
 //   }
   targetURL.setUser( KOPrefs::instance()->mFreeBusyPublishUser );
   targetURL.setPass( KOPrefs::instance()->mFreeBusyPublishPassword );
@@ -271,7 +271,7 @@ void FreeBusyManager::publishFreeBusy()
   }
 
   // Save the time of the next free/busy uploading
-  mNextUploadTime = TQDateTime::currentDateTime();
+  mNextUploadTime = TQDateTime::tqcurrentDateTime();
   if( KOPrefs::instance()->mFreeBusyPublishDelay > 0 )
     mNextUploadTime = mNextUploadTime.addSecs(
         KOPrefs::instance()->mFreeBusyPublishDelay * 60 );
@@ -280,7 +280,7 @@ void FreeBusyManager::publishFreeBusy()
 
   // We need to massage the list a bit so that Outlook understands
   // it.
-  messageText = messageText.replace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
+  messageText = messageText.tqreplace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
                                      "ORGANIZER:" );
 
   // Create a local temp file and save the message to it
@@ -318,7 +318,7 @@ void FreeBusyManager::publishFreeBusy()
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
     } else {
       // we use something else
-      targetURL = KOPrefs::instance()->mPublishAnyURL.replace( "%SERVER%",
+      targetURL = KOPrefs::instance()->mPublishAnyURL.tqreplace( "%SERVER%",
                                                                emailHost );
       targetURL.setUser( KOPrefs::instance()->mPublishUserName );
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
@@ -337,7 +337,7 @@ void FreeBusyManager::publishFreeBusy()
                                      false /*don't show progress info*/ );
     //pass the mainwindow to the job so any prompts are active
     KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
-    job->setWindow( korg->topLevelWidget() );
+    job->setWindow( korg->tqtopLevelWidget() );
 
     connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
              TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) );
@@ -438,7 +438,7 @@ void FreeBusyManager::cancelRetrieval()
   mRetrieveQueue.clear();
 }
 
-KURL replaceVariablesURL( const KURL &url, const TQString &email )
+KURL tqreplaceVariablesURL( const KURL &url, const TQString &email )
 {
   TQString emailName, emailHost;
   int emailpos = email.find( '@' );
@@ -448,9 +448,9 @@ KURL replaceVariablesURL( const KURL &url, const TQString &email )
   }
 
   TQString saveStr = url.path();
-  saveStr.replace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
-  saveStr.replace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
-  saveStr.replace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
+  saveStr.tqreplace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
+  saveStr.tqreplace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
+  saveStr.tqreplace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
 
   KURL retUrl( url );
   retUrl.setPath( saveStr );
@@ -468,7 +468,7 @@ bool fbExists( const KURL &url )
   TQByteArray data;
   if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) {
     TQString dataStr ( data );
-    if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) {
+    if ( dataStr.tqcontains( "BEGIN:VCALENDAR" ) ) {
       return true;
     }
   }
@@ -492,11 +492,11 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
       cachedURL.setUser( KOPrefs::instance()->mFreeBusyRetrieveUser );
       cachedURL.setPass( KOPrefs::instance()->mFreeBusyRetrievePassword );
     }
-    return replaceVariablesURL( cachedURL, email );
+    return tqreplaceVariablesURL( cachedURL, email );
   }
 
   // Try with the url configurated by preferred email in kaddressbook
-  KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email );
+  KABC::Addressee::List list= KABC::StdAddressBook::self( true )->tqfindByEmail( email );
   KABC::Addressee::List::Iterator it;
   TQString pref;
   for ( it = list.begin(); it != list.end(); ++it ) {
@@ -509,7 +509,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
       if ( !url.isEmpty() ) {
         kdDebug(5850) << "FreeBusyManager::freeBusyUrl():"
                       << "Taken url from preferred email:" << url << endl;
-        return replaceVariablesURL( KURL( url ), email );
+        return tqreplaceVariablesURL( KURL( url ), email );
       }
     }
   }
@@ -548,19 +548,19 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
     }
   }
 
-  if ( sourceURL.url().contains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
-    // do variable string replacements to the URL (MS Outlook style)
-    KURL fullpathURL = replaceVariablesURL( sourceURL, email );
+  if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
+    // do variable string tqreplacements to the URL (MS Outlook style)
+    KURL fullpathURL = tqreplaceVariablesURL( sourceURL, email );
 
     // This should work with anything thrown at it, not just Kolab
     // Notice that Kolab URLs are just entered as the base address, e.g. http://server.com/mykolab/
     // This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL!
     // In that case, just pass it on through with substitution for %u and %d
     // TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this
-    if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) {
+    if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) {
       // A generic URL, substitute %u and %d
-      fullpathURL = fullpathURL.url().replace("%25u", emailName, true);
-      fullpathURL = fullpathURL.url().replace("%25d", emailHost, true);
+      fullpathURL = fullpathURL.url().tqreplace("%25u", emailName, true);
+      fullpathURL = fullpathURL.url().tqreplace("%25d", emailHost, true);
     }
     else {
       // This is (probably) a Kolab URL!
@@ -584,7 +584,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
   for ( ext = extensions.constBegin(); ext != extensions.constEnd(); ++ext ) {
     // build a url for this extension
     sourceURL = KOPrefs::instance()->mFreeBusyRetrieveUrl;
-    KURL dirURL = replaceVariablesURL( sourceURL, email );
+    KURL dirURL = tqreplaceVariablesURL( sourceURL, email );
     if ( KOPrefs::instance()->mFreeBusyFullDomainRetrieval ) {
       dirURL.addPath( email + '.' + (*ext) );
     } else {
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index a6f4f6cec..4be671e4e 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -90,7 +90,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
     /**
       KOrganizer downloads somebody else's free/busy list
       The call is asynchronous, and upon download, the
-      receivers slot specified by member will be called.
+      tqreceivers slot specified by member will be called.
       The slot should be of type "member(const TQString&, KCal::FreeBusy*)"
 
       Return true if a download is initiated, and false otherwise
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp
index f0dcb7b12..1ffcc6282 100644
--- a/korganizer/incidencechanger.cpp
+++ b/korganizer/incidencechanger.cpp
@@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<
           if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated )
             notifyOrganizer = true;
           Attendee *newMe = new Attendee( *me );
-          newMe->setStatus( KCal::Attendee::Declined );
+          newMe->seStatus( KCal::Attendee::Declined );
           tmp->clearAttendees();
           tmp->addAttendee( newMe );
           break;
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 6d60a0a5f..920559daf 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -137,7 +137,7 @@ class KDE_EXPORT BaseView : public QWidget
     /**
       Return number of currently shown dates. A return value of 0 means no idea.
     */
-    virtual int currentDateCount() = 0;
+    virtual int tqcurrentDateCount() = 0;
 
     /** Return if this view is a view for displaying events. */
     virtual bool isEventView() { return false; }
diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h
index dcda1bee5..8c98dcd01 100644
--- a/korganizer/interfaces/korganizer/mainwindow.h
+++ b/korganizer/interfaces/korganizer/mainwindow.h
@@ -68,7 +68,7 @@ class MainWindow
     /**
       Return widget whcih represents this main window.
     */
-    virtual TQWidget *topLevelWidget() = 0;
+    virtual TQWidget *tqtopLevelWidget() = 0;
     /**
       Return ActionManager of this main window.
     */
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index 2ce21c13f..e75e9085d 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -39,7 +39,7 @@ class Part : public KParts::Part
     typedef TQPtrList List;
 
     Part( MainWindow *parent, const char *name )
-      : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {}
+      : KParts::Part( parent?(parent->tqtopLevelWidget()):0, name ), mMainWindow( parent ) {}
 
     virtual ~Part() {}
 
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index c107d6189..459b25d4c 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -74,7 +74,7 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) :
 
   mTitle = new JournalTitleLable( this );
   mTitle->setMargin(2);
-  mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  mTitle->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ),
            this, TQT_SLOT( emitNewJournal() ) );
 }
@@ -213,7 +213,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
   mDeleteButton = new TQToolButton( this, "deleteButton" );
   TQPixmap pix = KOGlobals::self()->smallIcon( "editdelete" );
   mDeleteButton->setPixmap( pix );
-  mDeleteButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mDeleteButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") );
   TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") );
   mLayout->addWidget( mDeleteButton, 0, 4 );
@@ -221,7 +221,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
 
   mEditButton = new TQToolButton( this, "editButton" );
   mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) );
-  mEditButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mEditButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mEditButton, i18n("Edit this journal entry") );
   TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") );
   mLayout->addWidget( mEditButton, 0, 5 );
@@ -230,7 +230,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
 #ifndef KORG_NOPRINTER
   mPrintButton = new TQToolButton( this, "printButton" );
   mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer1" ) );
-  mPrintButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrintButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrintButton, i18n("Print this journal entry") );
   TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") );
   mLayout->addWidget( mPrintButton, 0, 6 );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 6fe794592..b56c60159 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -67,7 +67,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
   for( i = 0; i < 7; i++ ) {
     mHeadings[i] = new TQLabel( this );
     mHeadings[i]->setFont( TQFont( generalFont, 10, TQFont::Bold ) );
-    mHeadings[i]->setAlignment( AlignCenter );
+    mHeadings[i]->tqsetAlignment( AlignCenter );
 
     topLayout->addWidget( mHeadings[i], 1, i + 1 );
   }
@@ -75,7 +75,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
   // Create the weeknumber labels
   for( i = 0; i < 6; i++ ) {
     mWeeknos[i] = new TQLabel( this );
-    mWeeknos[i]->setAlignment( AlignCenter );
+    mWeeknos[i]->tqsetAlignment( AlignCenter );
     mWeeknos[i]->setFont( TQFont( generalFont, 10 ) );
     mWeeknos[i]->installEventFilter( this );
 
@@ -121,8 +121,8 @@ void KDateNavigator::setBaseDate( const TQDate &date )
     dates.append( date );
     mNavigatorBar->selectDates( dates );
 
-    repaint();
-    mDayMatrix->repaint();
+    tqrepaint();
+    mDayMatrix->tqrepaint();
   }
 }
 
@@ -135,7 +135,7 @@ TQSizePolicy KDateNavigator::sizePolicy () const
 void KDateNavigator::updateToday()
 {
   mDayMatrix->recalculateToday();
-  mDayMatrix->repaint();
+  mDayMatrix->tqrepaint();
 }
 
 TQDate KDateNavigator::startDate() const
@@ -195,14 +195,14 @@ void KDateNavigator::updateDates()
     mWeeknos[i]->setText( weeknum );
   }
 
-// each updateDates is followed by an updateView -> repaint is issued there !
-//  mDayMatrix->repaint();
+// each updateDates is followed by an updateView -> tqrepaint is issued there !
+//  mDayMatrix->tqrepaint();
 }
 
 void KDateNavigator::updateDayMatrix()
 {
   mDayMatrix->updateView();
-  mDayMatrix->repaint();
+  mDayMatrix->tqrepaint();
 }
 
 void KDateNavigator::setUpdateNeeded()
@@ -228,7 +228,7 @@ void KDateNavigator::updateView()
 //   kdDebug(5850) << "KDateNavigator::updateView(), view " << this << endl;
 
   updateDayMatrix();
-  repaint();
+  tqrepaint();
 }
 
 void KDateNavigator::updateConfig()
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index bc456a786..a0aaddbca 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -73,7 +73,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
   minutes->start(0, true);
 
   mTimeBox = new TQLabel(this);
-  mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
+  mTimeBox->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom);
   TQPalette pal = mTimeBox->palette();
   pal.setColor(TQColorGroup::Foreground, Qt::red);
   mTimeBox->setPalette(pal);
@@ -92,13 +92,13 @@ MarcusBains::~MarcusBains()
 
 int MarcusBains::todayColumn()
 {
-  TQDate currentDate = TQDate::currentDate();
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
 
   DateList dateList = agenda->dateList();
   DateList::ConstIterator it;
   int col = 0;
   for(it = dateList.begin(); it != dateList.end(); ++it) {
-    if((*it) == currentDate)
+    if((*it) == tqcurrentDate)
       return KOGlobals::self()->reverseLayout() ?
              agenda->columns() - 1 - col : col;
     ++col;
@@ -296,7 +296,7 @@ void KOAgenda::init()
   setMinimumSize( 30, int( mGridSpacingY + 1 ) );
 //  setMaximumHeight(mGridSpacingY * mRows + 5);
 
-  // Disable horizontal scrollbar. This is a hack. The geometry should be
+  // Disable horizontal scrollbar. This is a hack. The tqgeometry should be
   // controlled in a way that the contents horizontally always fits. Then it is
   // not necessary to turn off the scrollbar.
   setHScrollBarMode( AlwaysOff );
@@ -1276,7 +1276,7 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth )
 //  kdDebug(5850) << "KOAgenda::placeAgendaItem(): " << item->incidence()->summary()
 //            << " subCellWidth: " << subCellWidth << endl;
 
-  // "left" upper corner, no subcells yet, RTL layouts have right/left switched, widths are negative then
+  // "left" upper corner, no subcells yet, RTL tqlayouts have right/left switched, widths are negative then
   TQPoint pt = gridToContents( TQPoint( item->cellXLeft(), item->cellYTop() ) );
   // right lower corner
   TQPoint pt1 = gridToContents( TQPoint( item->cellXLeft() + item->cellWidth(),
@@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth )
     xpos = pt.x() + int( subCellPos );
     ypos = pt.y();
   }
-  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout
+  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout
     xpos += width;
     width = -width;
   }
-  if ( height<0 ) { // BTT (bottom-to-top) layout ?!?
+  if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!?
     ypos += height;
     height = -height;
   }
@@ -1393,7 +1393,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch)
     if ( pt2.x() >= pt1.x() /*&& pt2.y() >= pt1.y()*/) {
       int gxStart = contentsToGrid( pt1 ).x();
       int gxEnd = contentsToGrid( pt2 ).x();
-      // correct start/end for rtl layouts
+      // correct start/end for rtl tqlayouts
       if ( gxStart > gxEnd ) {
         int tmp = gxStart;
         gxStart = gxEnd;
@@ -1419,7 +1419,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch)
             }
           }
         } else {
-          // last entry in holiday mask denotes the previous day not visible (needed for overnight shifts)
+          // last entry in holiday tqmask denotes the previous day not visible (needed for overnight shifts)
           if ( gxStart < int(mHolidayMask->count()-1) && !mHolidayMask->at(gxStart)) {
             dbp.fillRect( xStart, pt1.y(), xWidth, pt2.y() - pt1.y() + 1,
                           KOPrefs::instance()->mWorkingHoursColor );
@@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem )
 
   agendaItem->hide();
   addChild( agendaItem );
-  if ( !mItems.containsRef( agendaItem ) ) {
+  if ( !mItems.tqcontainsRef( agendaItem ) ) {
     mItems.append( agendaItem );
   }
   placeSubCells( agendaItem );
@@ -2038,9 +2038,9 @@ void KOAgenda::setDateList(const DateList &selectedDates)
     marcus_bains();
 }
 
-void KOAgenda::setHolidayMask(TQMemArray *mask)
+void KOAgenda::setHolidayMask(TQMemArray *tqmask)
 {
-  mHolidayMask = mask;
+  mHolidayMask = tqmask;
 
 }
 
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index de1f4ef87..21eea0e11 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -737,16 +737,16 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   if ( !mIncidence )return;
 
   TQRect visRect = visibleRect();
-  // when scrolling horizontally in the side-by-side view, the repainted area is clipped
+  // when scrolling horizontally in the side-by-side view, the tqrepainted area is clipped
   // to the newly visible area, which is a problem since the content changes when visRect
-  // changes, so repaint the full item in that case
+  // changes, so tqrepaint the full item in that case
   if ( ev->rect() != visRect && visRect.isValid() && ev->rect().isValid() ) {
-    repaint( visRect );
+    tqrepaint( visRect );
     return;
   }
 
   TQPainter p( this );
-  const int ft = 2; // frame thickness for layout, see paintFrame()
+  const int ft = 2; // frame thickness for tqlayout, see paintFrame()
   const int margin = 1 + ft; // frame + space between frame and content
 
   // General idea is to always show the icons (even in the all-day events).
@@ -769,7 +769,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
     if ( static_cast(mIncidence)->isOverdue() )
       bgColor = KOPrefs::instance()->todoOverdueColor();
     else if ( static_cast(mIncidence)->dtDue().date() ==
-              TQDateTime::currentDateTime().date() )
+              TQDateTime::tqcurrentDateTime().date() )
       bgColor = KOPrefs::instance()->todoDueTodayColor();
   }
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c60546f7b..8cc7c5616 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l
   : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel),
     mLongText(longlabel), mExtensiveText(extensivelabel)
 {
-  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   if (mExtensiveText.isEmpty()) mExtensiveText = mLongText;
   squeezeTextToLabel();
 }
@@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * )
   squeezeTextToLabel();
 }
 
-TQSize KOAlternateLabel::minimumSizeHint() const
+TQSize KOAlternateLabel::tqminimumSizeHint() const
 {
-  TQSize sh = TQLabel::minimumSizeHint();
+  TQSize sh = TQLabel::tqminimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
@@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   mPendingChanges( true ),
   mAreDatesInitialized( false )
 {
-  mSelectedDates.append(TQDate::currentDate());
+  mSelectedDates.append(TQDate::tqcurrentDate());
 
   mLayoutDayLabels = 0;
   mDayLabelsFrame = 0;
@@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   if ( KOPrefs::instance()->compactDialogs() ) {
     mExpandButton = new TQPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( mNotExpandedPixmap );
-    mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+    mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                   TQSizePolicy::Fixed ) );
     connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
   } else {
     TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
-    label->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+    label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
   }
 
   mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame );
@@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( )
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 
   updateView();
 }
@@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( )
 
     mTimeLabels->updateConfig();
     mTimeLabels->positionChanged();
-    mTimeLabels->repaint();
+    mTimeLabels->tqrepaint();
 
     updateView();
   }
@@ -635,8 +635,8 @@ void KOAgendaView::createDayLabels( bool force )
                                                       longstr, veryLongStr, mDayLabels);
     dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway
     dayLabel->setMinimumWidth(1);
-    dayLabel->setAlignment(TQLabel::AlignHCenter);
-    if (date == TQDate::currentDate()) {
+    dayLabel->tqsetAlignment(TQLabel::AlignHCenter);
+    if (date == TQDate::tqcurrentDate()) {
       TQFont font = dayLabel->font();
       font.setBold(true);
       dayLabel->setFont(font);
@@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force )
       // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
       KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString::null, mDayLabels );
       label->setMinimumWidth(1);
-      label->setAlignment(AlignCenter);
+      label->tqsetAlignment(AlignCenter);
       dayLayout->addWidget(label);
     }
 
@@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force )
         // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
         KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString::null, mDayLabels );
         label->setMinimumWidth(1);
-        label->setAlignment(AlignCenter);
+        label->tqsetAlignment(AlignCenter);
         dayLayout->addWidget(label);
       }
     }
@@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint()
   return 0;
 }
 
-int KOAgendaView::currentDateCount()
+int KOAgendaView::tqcurrentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -793,7 +793,7 @@ void KOAgendaView::updateConfig()
   mTimeLabels->positionChanged();
 
   // for some reason, this needs to be called explicitly
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 
   updateTimeBarWidth();
 
@@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode )
   }
 
   // HACK: Update the view if the all-day agenda has been modified.
-  // Do this because there are some layout problems in the
+  // Do this because there are some tqlayout problems in the
   // all-day agenda that are not easily solved, but clearing
   // and redrawing works ok.
   if ( incidence->doesFloat() ) {
@@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda()
 
 void KOAgendaView::displayIncidence( Incidence *incidence )
 {
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   DateTimeList::iterator t;
 
   // FIXME: use a visitor here
@@ -1523,7 +1523,7 @@ void KOAgendaView::clearView()
 
 CalPrinterBase::PrintType KOAgendaView::printType()
 {
-  if ( currentDateCount() == 1 ) return CalPrinterBase::Day;
+  if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day;
   else return CalPrinterBase::Week;
 }
 
@@ -1639,7 +1639,7 @@ void KOAgendaView::setHolidayMasks()
   }
 
   // Store the information about the day before the visible area (needed for
-  // overnight working hours) in the last bit of the mask:
+  // overnight working hours) in the last bit of the tqmask:
   bool showDay = !KOGlobals::self()->isWorkDay( mSelectedDates[ 0 ].addDays( -1 ) );
   mHolidayMask[ mSelectedDates.count() ] = showDay;
 
@@ -1754,8 +1754,8 @@ bool KOAgendaView::filterByResource( Incidence *incidence )
     if ( resourceCalendar()->subresourceType( subRes ) == "todo" ) {
       TQString calmatch = "/.INBOX.directory/Calendar";
       TQString i18nmatch = "/.INBOX.directory/" + i18n( "Calendar" );
-      if ( subResourceCalendar().contains( calmatch ) ||
-           subResourceCalendar().contains( i18nmatch ) ) {
+      if ( subResourceCalendar().tqcontains( calmatch ) ||
+           subResourceCalendar().tqcontains( i18nmatch ) ) {
         return true;
       }
     }
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index a31581a01..c44c25081 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -80,7 +80,7 @@ class KOAlternateLabel : public QLabel
                       TQWidget *parent = 0, const char *name = 0 );
     ~KOAlternateLabel();
 
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     enum TextType { Short = 0, Long = 1, Extensive = 2 };
     TextType largestFittingTextType() const;
@@ -118,7 +118,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
 
     /** returns the currently selected events */
     virtual Incidence::List selectedIncidences();
@@ -218,7 +218,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     void createDayLabels( bool force );
 
     /**
-      Set the masks on the agenda widgets indicating, which days are holidays.
+      Set the tqmasks on the agenda widgets indicating, which days are holidays.
     */
     void setHolidayMasks();
 
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index 3fa1f28d8..ff5338419 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -132,7 +132,7 @@ void KOrganizerApp::processCalendar( const KURL &url )
     bool hasDocument = !url.isEmpty();
     korg = new KOrganizer( "KOrganizer MainWindow" );
     korg->init( hasDocument );
-    korg->topLevelWidget()->show();
+    korg->tqtopLevelWidget()->show();
 
     kdDebug(5850) << "KOrganizerApp::processCalendar(): '" << url.url()
                   << "'" << endl;
@@ -145,12 +145,12 @@ void KOrganizerApp::processCalendar( const KURL &url )
       korg->view()->updateView();
     }
   } else {
-    korg->topLevelWidget()->show();
+    korg->tqtopLevelWidget()->show();
   }
 
   // Handle window activation
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-  KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() );
+  KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() );
 #endif
 }
 
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 8766a3338..548e6acb1 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) :
 {
 }
 
-void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout)
+void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
 {
   mOrganizerHBox = new TQHBox( parent );
-  layout->addWidget( mOrganizerHBox );
+  tqlayout->addWidget( mOrganizerHBox );
   // If creating a new event, then the user is the organizer -> show the
   // identity combo
   // readEvent will delete it and set another label text instead, if the user
@@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * lay
   mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 );
 }
 
-void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
+void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
 {
   TQGridLayout *topLayout = new TQGridLayout();
-  layout->addLayout( topLayout );
+  tqlayout->addLayout( topLayout );
 
   TQString whatsThis = i18n("Edits the name of the attendee selected in the list "
                            "above, or adds a new attendee if there are no attendees"
@@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee()
   a->setUid( mUid );
   a->setEmail( email );
   a->setRole( Attendee::Role( mRoleCombo->currentItem() ) );
-  a->setStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
+  a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
   a->setRSVP( mRsvpButton->isChecked() );
 
   updateCurrentItem();
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index e75d994e5..42728a978 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -67,8 +67,8 @@ class KOAttendeeEditor : public QWidget
     void updateAttendeeSummary( int count );
 
   protected:
-    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout );
-    void initEditWidgets( TQWidget *parent, TQBoxLayout *layout );
+    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
+    void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
 
     /** Reads values from a KABC::Addressee and inserts a new Attendee
      * item into the listview with those items. Used when adding attendees
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index b9d404e70..d4829559a 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -236,7 +236,7 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg )
 
 KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
 {
-  TQWidget *topLevel = wdg->topLevelWidget();
+  TQWidget *topLevel = wdg->tqtopLevelWidget();
   TQMap::ConstIterator it = mXMLGUIClients.find( topLevel );
   if ( it != mXMLGUIClients.end() )
     return it.data();
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 065e44e7c..93fb8740f 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -214,9 +214,9 @@ void KODayMatrix::recalculateToday()
     mDayLabels[ i ] = TQString::number( KOGlobals::self()->calendarSystem()->day( mDays[i] ));
 
     // if today is in the currently displayed month, hilight today
-    if ( mDays[ i ].year() == TQDate::currentDate().year() &&
-         mDays[ i ].month() == TQDate::currentDate().month() &&
-         mDays[ i ].day() == TQDate::currentDate().day() ) {
+    if ( mDays[ i ].year() == TQDate::tqcurrentDate().year() &&
+         mDays[ i ].month() == TQDate::tqcurrentDate().month() &&
+         mDays[ i ].day() == TQDate::tqcurrentDate().day() ) {
       mToday = i;
     }
   }
@@ -386,15 +386,15 @@ void KODayMatrix::mouseReleaseEvent( TQMouseEvent *e )
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
-      repaint();
+      tqrepaint();
     }
   } else {
     mSelStart = mSelInit;
 
-    //repaint only if selection has changed
+    //tqrepaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
-      repaint();
+      tqrepaint();
     }
   }
 
@@ -415,15 +415,15 @@ void KODayMatrix::mouseMoveEvent( TQMouseEvent *e )
     mSelEnd = mSelInit;
     if ( tmp != mSelStart ) {
       mSelStart = tmp;
-      repaint();
+      tqrepaint();
     }
   } else {
     mSelStart = mSelInit;
 
-    //repaint only if selection has changed
+    //tqrepaint only if selection has changed
     if ( tmp != mSelEnd ) {
       mSelEnd = tmp;
-      repaint();
+      tqrepaint();
     }
   }
 }
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index b8354f799..3752d52f6 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -91,7 +91,7 @@ class DynamicTip : public QToolTip
  *  o no support for Ctrl+click to create groups of dates
  *    (This has not really been supported in the predecessor. It was not very intuitive nor was it
  *     user friendly.)
- *    This feature has been replaced with dragging a selection on the matrix. The matrix will
+ *    This feature has been tqreplaced with dragging a selection on the matrix. The matrix will
  *    automatically choose the appropriate selection (e.g. you are not any longer able to select
  *    two distinct groups of date selections as in the old class)
  *  o now that you can select more then a week it can happen that not all selected days are
@@ -131,7 +131,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 
     /** updates the day matrix to start with the given date. Does all the necessary
      *  checks for holidays or events on a day and stores them for display later on.
-     *  Does NOT update the view visually. Call repaint() for this.
+     *  Does NOT update the view visually. Call tqrepaint() for this.
      *
      *  @param actdate recalculates the day matrix to show NUMDAYS starting from this
      *                 date.
@@ -161,7 +161,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 
     /** sets the actual to be displayed selection in the day matrix starting from
      *  start and ending with end. Theview must be manually updated by calling
-     *  repaint. (?)
+     *  tqrepaint. (?)
      */
     void setSelectedDaysFrom( const TQDate &start, const TQDate &end );
 
@@ -312,7 +312,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
     int       mTodayMarginWidth;
 
     /** stores actual size of each day in the widget so that I don't need to ask this data
-     *  on every repaint.
+     *  on every tqrepaint.
      */
     TQRect     mDaySize;
 
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index 1da104404..d7ccd6651 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -4,7 +4,7 @@
     
         KOEditorAlarms_base
     
-    
+    
         
             0
             0
@@ -35,7 +35,7 @@
                 
                 
                     
-                        layout3
+                        tqlayout3
                     
                     
                         
@@ -109,7 +109,7 @@
                 
                 
                     
-                        layout8
+                        tqlayout8
                     
                     
                         
@@ -298,7 +298,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     21
                                     41
@@ -400,7 +400,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         61
@@ -468,7 +468,7 @@
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         16
@@ -530,7 +530,7 @@
         
         
             
-                layout7
+                tqlayout7
             
             
                 
@@ -570,7 +570,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             20
                             60
@@ -662,7 +662,7 @@
 
     addresseelineedit.h
 
-
+
 
     kurlrequester.h
     klineedit.h
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 99d775e69..19a75a992 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -151,7 +151,7 @@ class AttachmentListItem : public KIconViewItem
         if ( mAttachment->isUri() ) {
           mimeType = KMimeType::findByURL( mAttachment->uri() );
         } else {
-          mimeType = KMimeType::findByContent( mAttachment->decodedData() );
+          mimeType = KMimeType::tqfindByContent( mAttachment->decodedData() );
         }
         mAttachment->setMimeType( mimeType->name() );
       }
@@ -232,7 +232,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
   } else {
     uint size = item->attachment()->size();
     grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 );
-    grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ).
+    grid->addWidget( new TQLabel( TQString::tqfromLatin1( "%1 (%2)" ).
                                  arg( KIO::convertSize( size ) ).
                                  arg( KGlobal::locale()->formatNumber(
                                         size, 0 ) ), topFrame ), 4, 2 );
@@ -330,7 +330,7 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
 
 KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment )
 {
-  if ( mTempFiles.contains( attachment ) ) {
+  if ( mTempFiles.tqcontains( attachment ) ) {
     return mTempFiles[attachment];
   }
   TQStringList patterns = KMimeType::mimeType( attachment->mimeType() )->patterns();
@@ -625,7 +625,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
         addUriAttachment( (*it).url(), TQString::null, label, true );
       }
     } else { // we take anything
-      addDataAttachment( source->encodedData( source->format() ),
+      addDataAttachment( source->tqencodedData( source->format() ),
                          source->format(),
                          KMimeType::mimeType( source->format() )->name() );
     }
@@ -833,7 +833,7 @@ void KOEditorAttachments::addDataAttachment( const TQByteArray &data,
   item->setData( data );
   item->setLabel( nlabel );
   if ( mimeType.isEmpty() ) {
-    item->setMimeType( KMimeType::findByContent( data )->name() );
+    item->setMimeType( KMimeType::tqfindByContent( data )->name() );
   } else {
     item->setMimeType( mimeType );
   }
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index a882363da..ee57a3d43 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status)
     AttendeeListItem *item = static_cast( it.current() );
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->data()->email() == *it2 ) {
-        item->data()->setStatus( status );
+        item->data()->seStatus( status );
         item->updateItem();
       }
     }
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index c56ff033f..af8b0f5c5 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -202,7 +202,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
       // No free/busy information
       //debug only start
       //   int ii ;
-      //       TQDateTime cur = TQDateTime::currentDateTime();
+      //       TQDateTime cur = TQDateTime::tqcurrentDateTime();
       //       for( ii = 0; ii < 10 ;++ii ) {
       //           KDGanttViewTaskItem* newSubItem = new KDGanttViewTaskItem( this );
       //           cur = cur.addSecs( 7200 );
@@ -310,16 +310,16 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
   mGanttView->setShowHeaderPopupMenu( false, false, false, false, false, false );
   // Initially, show 15 days back and forth
   // set start to even hours, i.e. to 12:AM 0 Min 0 Sec
-  TQDateTime horizonStart = TQDateTime( TQDateTime::currentDateTime()
+  TQDateTime horizonStart = TQDateTime( TQDateTime::tqcurrentDateTime()
                            .addDays( -15 ).date() );
-  TQDateTime horizonEnd = TQDateTime::currentDateTime().addDays( 15 );
+  TQDateTime horizonEnd = TQDateTime::tqcurrentDateTime().addDays( 15 );
   mGanttView->setHorizonStart( horizonStart );
   mGanttView->setHorizonEnd( horizonEnd );
   mGanttView->setCalendarMode( true );
   //mGanttView->setDisplaySubitemsAsGroup( true );
   mGanttView->setShowLegendButton( false );
   // Initially, center to current date
-  mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() );
+  mGanttView->centerTimelineAfterShow( TQDateTime::tqcurrentDateTime() );
   if ( KGlobal::locale()->use12Clock() )
     mGanttView->setHourFormat( KDGanttView::Hour_12 );
   else
@@ -580,10 +580,10 @@ bool KOEditorFreeBusy::findFreeSlot( TQDateTime &dtFrom, TQDateTime &dtTo )
 
   // Make sure that we never suggest a date in the past, even if the
   // user originally scheduled the meeting to be in the past.
-  if( tryFrom < TQDateTime::currentDateTime() ) {
+  if( tryFrom < TQDateTime::tqcurrentDateTime() ) {
     // The slot to look for is at least partially in the past.
     int secs = tryFrom.secsTo( tryTo );
-    tryFrom = TQDateTime::currentDateTime();
+    tryFrom = TQDateTime::tqcurrentDateTime();
     tryTo = tryFrom.addSecs( secs );
   }
 
@@ -852,8 +852,8 @@ void KOEditorFreeBusy::clearSelection() const
   KDGanttViewItem *item = mGanttView->selectedItem();
   if ( item )
     mGanttView->setSelected( item, false );
-  mGanttView->repaint();
-  item->repaint();
+  mGanttView->tqrepaint();
+  item->tqrepaint();
 }
 
 void KOEditorFreeBusy::setSelected( int index )
@@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status)
   {
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->attendee()->email() == *it2 ) {
-        item->attendee()->setStatus( status );
+        item->attendee()->seStatus( status );
         item->updateItem();
       }
     }
@@ -912,7 +912,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
   popup.setItemChecked( currentAttendee()->status(), true );
   int status = popup.exec( TQCursor::pos() );
   if ( status >= 0 ) {
-    currentAttendee()->setStatus( (Attendee::PartStat)status );
+    currentAttendee()->seStatus( (Attendee::PartStat)status );
     updateCurrentItem();
     updateAttendeeInput();
   }
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 0411c2f8e..3466e4125 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -104,36 +104,36 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
 
   TQFrame *timeBoxFrame = new TQFrame(timeGroupBox);
 
-  TQGridLayout *layoutTimeBox = new TQGridLayout( timeBoxFrame );
-  layoutTimeBox->setSpacing(topLayout->spacing());
-  layoutTimeBox->setColStretch( 3, 1 );
+  TQGridLayout *tqlayoutTimeBox = new TQGridLayout( timeBoxFrame );
+  tqlayoutTimeBox->setSpacing(topLayout->spacing());
+  tqlayoutTimeBox->setColStretch( 3, 1 );
 
   mStartDateLabel = new TQLabel(i18n("&Start:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateLabel,0,0);
+  tqlayoutTimeBox->addWidget(mStartDateLabel,0,0);
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateEdit,0,1);
+  tqlayoutTimeBox->addWidget(mStartDateEdit,0,1);
   mStartDateLabel->setBuddy( mStartDateEdit );
 
   mStartTimeEdit = new KTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
+  tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2);
 
   mEndDateLabel = new TQLabel(i18n("&End:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mEndDateLabel,1,0);
+  tqlayoutTimeBox->addWidget(mEndDateLabel,1,0);
 
   mEndDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mEndDateEdit,1,1);
+  tqlayoutTimeBox->addWidget(mEndDateEdit,1,1);
   mEndDateLabel->setBuddy( mEndDateEdit );
 
   mEndTimeEdit = new KTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mEndTimeEdit,1,2);
+  tqlayoutTimeBox->addWidget(mEndTimeEdit,1,2);
 
   mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame);
-  layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
+  tqlayoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
   connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool)));
 
   mDurationLabel = new TQLabel( timeBoxFrame );
-  layoutTimeBox->addWidget( mDurationLabel, 1, 3 );
+  tqlayoutTimeBox->addWidget( mDurationLabel, 1, 3 );
 
   // time widgets are checked if they contain a valid time
   connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
@@ -148,9 +148,9 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
           this, TQT_SLOT(endDateChanged(const TQDate&)));
 
   TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 2, 0 );
+  tqlayoutTimeBox->addWidget( label, 2, 0 );
   TQBoxLayout *recLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 );
   mRecEditButton = new TQPushButton( timeBoxFrame );
   mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
   recLayout->addWidget( mRecEditButton );
@@ -160,18 +160,18 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
   recLayout->addStretch( 1 );
 
   label = new TQLabel( i18n("Reminder:"), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 3, 0 );
+  tqlayoutTimeBox->addWidget( label, 3, 0 );
   TQBoxLayout *alarmLineLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 );
   initAlarm( timeBoxFrame, alarmLineLayout );
   alarmLineLayout->addStretch( 1 );
 
   TQBoxLayout *secLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( secLayout, 0, 4 );
+  tqlayoutTimeBox->addLayout( secLayout, 0, 4 );
   initSecrecy( timeBoxFrame, secLayout );
 
   TQBoxLayout *classLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( classLayout, 1, 4 );
+  tqlayoutTimeBox->addLayout( classLayout, 1, 4 );
   initClass( timeBoxFrame, classLayout );
 }
 
@@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
   freeTimeLabel->setBuddy( mFreeTimeCombo );
 }
 
-void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout)
+void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout)
 {
-  TQBoxLayout *topLayout = new TQHBoxLayout( layout );
+  TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout );
   mInvitationBar = new TQFrame( parent );
   mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
   topLayout->addWidget( mInvitationBar );
 
   TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar );
-  barLayout->setSpacing( layout->spacing() );
+  barLayout->setSpacing( tqlayout->spacing() );
   TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar );
   barLayout->addWidget( label );
   barLayout->addStretch( 1 );
@@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput()
   if (!mStartDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid start date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
   if (!mEndDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid end date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 57ffba8df..7e7916d6e 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -48,7 +48,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral
 
     void initTime(TQWidget *,TQBoxLayout *);
     void initClass(TQWidget *,TQBoxLayout *);
-    void initInvitationBar( TQWidget* parent, TQBoxLayout *layout );
+    void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout );
 
     void finishSetup();
 
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 0a4e5ec36..c53babbe7 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput()
   if (!mDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index d659e8e95..13ba5192d 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -105,59 +105,59 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
                    i18n("Sets options for due and start dates and times "
                         "for this to-do.") );
 
-  TQGridLayout *layoutTimeBox = new TQGridLayout(timeBoxFrame,1,1);
-  layoutTimeBox->setSpacing(topLayout->spacing());
+  TQGridLayout *tqlayoutTimeBox = new TQGridLayout(timeBoxFrame,1,1);
+  tqlayoutTimeBox->setSpacing(topLayout->spacing());
 
 
   TQString whatsThis = i18n("Sets the start date for this to-do");
   mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame);
   TQWhatsThis::add( mStartCheck, whatsThis );
-  layoutTimeBox->addWidget(mStartCheck,0,0);
+  tqlayoutTimeBox->addWidget(mStartCheck,0,0);
   connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool)));
   connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified()));
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
   TQWhatsThis::add( mStartDateEdit, whatsThis );
-  layoutTimeBox->addWidget(mStartDateEdit,0,1);
+  tqlayoutTimeBox->addWidget(mStartDateEdit,0,1);
   connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified()));
 
   mStartTimeEdit = new KTimeEdit(timeBoxFrame);
   TQWhatsThis::add( mStartTimeEdit,
                    i18n("Sets the start time for this to-do.") );
-  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
+  tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2);
   connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified()));
 
   whatsThis = i18n("Sets the due date for this to-do.");
   mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame);
   TQWhatsThis::add( mDueCheck, whatsThis );
-  layoutTimeBox->addWidget(mDueCheck,1,0);
+  tqlayoutTimeBox->addWidget(mDueCheck,1,0);
   connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool)));
   connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool)));
   connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
 
   mDueDateEdit = new KDateEdit(timeBoxFrame);
   TQWhatsThis::add( mDueDateEdit, whatsThis );
-  layoutTimeBox->addWidget(mDueDateEdit,1,1);
+  tqlayoutTimeBox->addWidget(mDueDateEdit,1,1);
   connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged()));
 
   mDueTimeEdit = new KTimeEdit(timeBoxFrame);
   TQWhatsThis::add( mDueTimeEdit,
                    i18n("Sets the due time for this to-do.") );
-  layoutTimeBox->addWidget(mDueTimeEdit,1,2);
+  tqlayoutTimeBox->addWidget(mDueTimeEdit,1,2);
   connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged()));
 
   mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame);
   TQWhatsThis::add( mTimeButton,
                    i18n("Sets whether or not this to-do's start and due dates "
                         "have times associated with them.") );
-  layoutTimeBox->addWidget( mTimeButton, 0, 3 );
+  tqlayoutTimeBox->addWidget( mTimeButton, 0, 3 );
   connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool)));
   connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
 
   TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 3, 0 );
+  tqlayoutTimeBox->addWidget( label, 3, 0 );
   TQBoxLayout *recLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 );
   mRecEditButton = new TQPushButton( timeBoxFrame );
   mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
   recLayout->addWidget( mRecEditButton );
@@ -167,17 +167,17 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
   recLayout->addStretch( 1 );
 
   label = new TQLabel( i18n("Reminder:"), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 4, 0 );
+  tqlayoutTimeBox->addWidget( label, 4, 0 );
   TQBoxLayout *alarmLineLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 );
   initAlarm( timeBoxFrame, alarmLineLayout );
   alarmLineLayout->addStretch( 1 );
 
-  // some more layouting
-  layoutTimeBox->setColStretch( 3, 1 );
+  // some more tqlayouting
+  tqlayoutTimeBox->setColStretch( 3, 1 );
 
   TQBoxLayout *secLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( secLayout, 0, 4 );
+  tqlayoutTimeBox->addLayout( secLayout, 0, 4 );
   initSecrecy( timeBoxFrame, secLayout );
 }
 
@@ -252,7 +252,7 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout)
   priorityLabel->setBuddy( mPriorityCombo );
 }
 
-void KOEditorGeneralTodo::initStatus(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout);
 
@@ -284,12 +284,12 @@ void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay )
     mDueTimeEdit->setTime( due.time() );
   } else {
     // Make it due tomorrow.
-    mDueDateEdit->setDate( TQDate::currentDate().addDays(1) );
+    mDueDateEdit->setDate( TQDate::tqcurrentDate().addDays(1) );
     mDueTimeEdit->setTime( TQTime::currentTime() );
   }
 
-  if ( !due.isValid() || (TQDateTime::currentDateTime() < due) ) {
-    mStartDateEdit->setDate( TQDate::currentDate() );
+  if ( !due.isValid() || (TQDateTime::tqcurrentDateTime() < due) ) {
+    mStartDateEdit->setDate( TQDate::tqcurrentDate() );
     mStartTimeEdit->setTime( TQTime::currentTime() );
   } else {
     mStartDateEdit->setDate( due.date().addDays( -1 ) );
@@ -322,7 +322,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mDueDateEdit->setEnabled(false);
     mDueTimeEdit->setEnabled(false);
-    mDueDateEdit->setDate(TQDate::currentDate());
+    mDueDateEdit->setDate(TQDate::tqcurrentDate());
     mDueTimeEdit->setTime(TQTime::currentTime());
     mDueCheck->setChecked(false);
   }
@@ -339,7 +339,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mStartDateEdit->setEnabled(false);
     mStartTimeEdit->setEnabled(false);
-    mStartDateEdit->setDate(TQDate::currentDate());
+    mStartDateEdit->setDate(TQDate::tqcurrentDate());
     mStartTimeEdit->setTime(TQTime::currentTime());
     mStartCheck->setChecked(false);
   }
@@ -545,7 +545,7 @@ void KOEditorGeneralTodo::completedChanged( int index )
 {
   if ( index == 10 ) {
     mCompletedToggle->setChecked( true );
-    mCompletedDateTime = TQDateTime::currentDateTime();
+    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
   } else {
     mCompletedToggle->setChecked( false );
   }
@@ -556,7 +556,7 @@ void KOEditorGeneralTodo::completedChanged()
 {
   if ( mCompletedToggle->isChecked() ) {
     mCompletedCombo->setCurrentItem( 10 );
-    mCompletedDateTime = TQDateTime::currentDateTime();
+    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
   } else {
     mCompletedCombo->setCurrentItem( 0 );
   }
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 2d07cecac..438ff9c28 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -47,7 +47,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral
     virtual ~KOEditorGeneralTodo();
 
     void initTime(TQWidget *, TQBoxLayout *);
-    void initStatus(TQWidget *, TQBoxLayout *);
+    void iniStatus(TQWidget *, TQBoxLayout *);
     void initCompletion(TQWidget *, TQBoxLayout *);
     void initPriority(TQWidget *, TQBoxLayout *);
 
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 564c39534..46038834e 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name
   return combo;
 }
 
-TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
+TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
     TQString everyText, TQString unitText )
 {
-  TQBoxLayout *freqLayout = new TQHBoxLayout( layout );
+  TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout );
 
   TQString whatsThis = i18n("Sets how often this event or to-do should recur.");
   TQLabel *preLabel = new TQLabel( everyText, parent );
@@ -590,7 +590,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
   TQWhatsThis::add( mExceptionDateEdit,
        i18n("A date that should be considered an exception "
       "to the recurrence rules for this event or to-do.") );
-  mExceptionDateEdit->setDate( TQDate::currentDate() );
+  mExceptionDateEdit->setDate( TQDate::tqcurrentDate() );
   boxLayout->addWidget( mExceptionDateEdit, 0, 0 );
 
   TQPushButton *addExceptionButton = new TQPushButton(
@@ -991,12 +991,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
   }
 
 //  TQFrame *timeFrame = new TQFrame( mTimeGroupBox );
-//  TQBoxLayout *layoutTimeFrame = new TQHBoxLayout( timeFrame );
-//  layoutTimeFrame->setSpacing( KDialog::spacingHint() );
+//  TQBoxLayout *tqlayoutTimeFrame = new TQHBoxLayout( timeFrame );
+//  tqlayoutTimeFrame->setSpacing( KDialog::spacingHint() );
 
   mDateTimeLabel = new TQLabel( mTimeGroupBox );
 //  mDateTimeLabel = new TQLabel( timeFrame );
-//  layoutTimeFrame->addWidget( mDateTimeLabel );
+//  tqlayoutTimeFrame->addWidget( mDateTimeLabel );
 
   Qt::Orientation orientation;
   if ( KOPrefs::instance()->mCompactDialogs ) orientation = Horizontal;
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 05074cdd9..831ba62ba 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -61,7 +61,7 @@ class RecurBase : public QWidget
     static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 );
-    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
+    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
     TQString everyText, TQString unitText );
 
   private:
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 8a8340fc0..69cb9c76f 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -230,7 +230,7 @@ void KOEventEditor::setDates( const TQDateTime &from, const TQDateTime &to, bool
 
 void KOEventEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.contains("\n") ) {
+  if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
     int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
@@ -242,7 +242,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti
 
 void KOEventEditor::loadDefaults()
 {
-  TQDateTime from( TQDate::currentDate(), KOPrefs::instance()->mStartTime.time() );
+  TQDateTime from( TQDate::tqcurrentDate(), KOPrefs::instance()->mStartTime.time() );
   int addSecs = ( KOPrefs::instance()->mDefaultDuration.time().hour()*3600 ) +
                 ( KOPrefs::instance()->mDefaultDuration.time().minute()*60 );
   TQDateTime to( from.addSecs( addSecs ) );
diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h
index dbcec875f..3d65bb0ac 100644
--- a/korganizer/koeventeditor.h
+++ b/korganizer/koeventeditor.h
@@ -67,7 +67,7 @@ class KOEventEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary contains multiple lines, the summary will be used as description
+      summary tqcontains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 83534d6aa..3937c3871 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -105,7 +105,7 @@ void KOEventViewer::writeSettings( KConfig * config )
 
 void KOEventViewer::setSource( const TQString &n )
 {
-  UriHandler::process( parentWidget(), n );
+  UriHandler::process( tqparentWidget(), n );
 }
 
 bool KOEventViewer::appendIncidence( Incidence *incidence, const TQDate &date )
@@ -177,10 +177,10 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e )
 
   switch( menu->exec( TQCursor::pos(), 0 ) ) {
   case 0: // open
-    AttachmentHandler::view( parentWidget(), name, uid );
+    AttachmentHandler::view( tqparentWidget(), name, uid );
     break;
   case 1: // save as
-    AttachmentHandler::saveAs( parentWidget(), name, uid );
+    AttachmentHandler::saveAs( tqparentWidget(), name, uid );
     break;
   default:
     break;
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index dd55bd374..814ea178e 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -158,9 +158,9 @@ TQStringList KOGlobals::holiday( const TQDate &date )
 
 bool KOGlobals::isWorkDay( const TQDate &date )
 {
-  int mask( ~( KOPrefs::instance()->mWorkWeekMask ) );
+  int tqmask( ~( KOPrefs::instance()->mWorkWeekMask ) );
 
-  bool nonWorkDay = ( mask & ( 1 << ( date.dayOfWeek() - 1 ) ) );
+  bool nonWorkDay = ( tqmask & ( 1 << ( date.dayOfWeek() - 1 ) ) );
   if ( KOPrefs::instance()->mExcludeHolidays && mHolidays ) {
     TQValueList list = mHolidays->getHolidays( date );
     TQValueList::ConstIterator it = list.begin();
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 7b799eeda..c4e3a607c 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -191,13 +191,13 @@ void KOGroupware::incomingDirChanged( const TQString& path )
     for ( it = attendees.begin(); it != attendees.end(); ++it ) {
       if( (*it)->email() == receiver ) {
         if ( action.startsWith( "accepted" ) )
-          (*it)->setStatus( KCal::Attendee::Accepted );
+          (*it)->seStatus( KCal::Attendee::Accepted );
         else if ( action.startsWith( "tentative" ) )
-          (*it)->setStatus( KCal::Attendee::Tentative );
+          (*it)->seStatus( KCal::Attendee::Tentative );
         else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) )
-          (*it)->setStatus( KCal::Attendee::Tentative );
+          (*it)->seStatus( KCal::Attendee::Tentative );
         else if ( action.startsWith( "delegated" ) )
-          (*it)->setStatus( KCal::Attendee::Delegated );
+          (*it)->seStatus( KCal::Attendee::Delegated );
         break;
       }
     }
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index a4e558fbf..71d392d67 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -4,7 +4,7 @@
     
         KOGroupwarePrefsPage
     
-    
+    
         
             0
             0
@@ -41,7 +41,7 @@
                         
                             By publishing Free/Busy information, you allow others to take your calendar into account when inviting you for a meeting. Only the times you have already busy are published, not why they are busy. For Kolab2 Server leave this disabled (the information is generated on the server).
                         
-                        
+                        
                             WordBreak|AlignVCenter
                         
                     
@@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                     
                     
                         
-                            layout8
+                            tqlayout8
                         
                         
                             
@@ -153,7 +153,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                                 
                                     Expanding
                                 
-                                
+                                
                                     
                                         20
                                         20
@@ -226,7 +226,7 @@ For security reasons, it is not recommended to store your password in the config
                                 
                                     publishUser
                                 
-                                
+                                
                                     
                                         120
                                         0
@@ -292,7 +292,7 @@ Ask the server administrator for this information.
                         
                             Expanding
                         
-                        
+                        
                             
                                 21
                                 50
@@ -319,7 +319,7 @@ Ask the server administrator for this information.
                         
                             By retrieving Free/Busy information that others have published, you can take their calendar into account when inviting them to a meeting.
                         
-                        
+                        
                             WordBreak|AlignVCenter
                         
                     
@@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"
                             
                             
                                 
-                                    layout13
+                                    tqlayout13
                                 
                                 
                                     
@@ -508,7 +508,7 @@ For security reasons, it is not recommended to store your password in the config
                         
                             Expanding
                         
-                        
+                        
                             
                                 20
                                 160
@@ -627,5 +627,5 @@ For security reasons, it is not recommended to store your password in the config
     slotChanged()
 
 KDE_EXPORT
-
+
 
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 240497e19..9a917699e 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -316,7 +316,7 @@ void KOIncidenceEditor::createEmbeddedURLPages( Incidence *i )
   if ( !mAttachedDesignerFields.isEmpty() ) {
     for ( TQPtrList::Iterator it = mAttachedDesignerFields.begin();
           it != mAttachedDesignerFields.end(); ++it ) {
-      if ( mDesignerFieldForWidget.contains( *it ) ) {
+      if ( mDesignerFieldForWidget.tqcontains( *it ) ) {
         mDesignerFields.remove( mDesignerFieldForWidget[ *it ] );
       }
     }
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index 91f22afdd..a2ac6055a 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -78,7 +78,7 @@ class KOIncidenceEditor : public KDialogBase
       This should be called when editing only one occurrence of a recurring incidence,
       before showing the editor.
 
-      It gives the editor a pointer to the original incidence, which contains all occurrences
+      It gives the editor a pointer to the original incidence, which tqcontains all occurrences
       and a pointer to the original incidence already dissociated from the event (mEvent).
 
       If the user presses ok/apply the changes made to the incAfterDissociation are commited
diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp
index 2b2a80f29..c01b5487a 100644
--- a/korganizer/koincidencetooltip.cpp
+++ b/korganizer/koincidencetooltip.cpp
@@ -56,7 +56,7 @@ void KOIncidenceToolTip::add( KOAgendaItem *item, Calendar *calendar,
 void KOIncidenceToolTip::maybeTip(const TQPoint & pos)
 {
   Q_UNUSED( pos );
-  KOAgendaItem *item = dynamic_cast( parentWidget() );
+  KOAgendaItem *item = dynamic_cast( tqparentWidget() );
   if ( !item )
     return;
   if ( !mText )
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index b53e071ee..c7566cae7 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -118,7 +118,7 @@ void KOJournalEditor::newJournal()
 
 void KOJournalEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.contains("\n") ) {
+  if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
     int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
@@ -132,7 +132,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip
 
 void KOJournalEditor::loadDefaults()
 {
-  setDate( TQDate::currentDate() );
+  setDate( TQDate::tqcurrentDate() );
 }
 
 bool KOJournalEditor::processInput()
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index 291940cf0..731682e9d 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -64,7 +64,7 @@ class KOJournalEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary contains multiple lines, the summary will be used as description
+      summary tqcontains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 74a0f17cd..4a5513d98 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -64,7 +64,7 @@ KOJournalView::~KOJournalView()
 void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
 {
   JournalDateEntry *entry = 0;
-  if ( mEntries.contains( dt ) ) {
+  if ( mEntries.tqcontains( dt ) ) {
     entry = mEntries[dt];
   } else {
     entry = new JournalDateEntry( calendar(), mVBox );
@@ -97,7 +97,7 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
   }
 }
 
-int KOJournalView::currentDateCount()
+int KOJournalView::tqcurrentDateCount()
 {
   return mEntries.size();
 }
@@ -211,7 +211,7 @@ void KOJournalView::setIncidenceChanger( IncidenceChangerBase *changer )
 void KOJournalView::newJournal()
 {
   emit newJournalSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
-                         TQDate::currentDate() );
+                         TQDate::tqcurrentDate() );
 }
 
 #include "kojournalview.moc"
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index fbc38efb1..a22c4d8aa 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -46,7 +46,7 @@ class KOJournalView : public KOrg::BaseView
                    const char *name = 0);
     ~KOJournalView();
 
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences();
     DateList selectedIncidenceDates() { return DateList(); }
     void appendJournal( Journal*journal, const TQDate &dt);
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 59b7f17e1..35474f899 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -72,7 +72,7 @@ void KOListViewToolTip::maybeTip( const TQPoint &pos )
 
   if ( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r = eventlist->itemRect( it );
+    r = eventlist->tqitemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->data() ) );
     if ( !tipText.isEmpty() ) {
@@ -220,8 +220,8 @@ KOListView::KOListView( Calendar *calendar,
 
   mListView->addColumn( i18n("Categories") );
 
-  TQBoxLayout *layoutTop = new TQVBoxLayout( this );
-  layoutTop->addWidget( mListView );
+  TQBoxLayout *tqlayoutTop = new TQVBoxLayout( this );
+  tqlayoutTop->addWidget( mListView );
 
   mPopupMenu = eventPopup();
 /*
@@ -248,7 +248,7 @@ KOListView::KOListView( Calendar *calendar,
 
   new KOListViewToolTip( mListView->viewport(), calendar, mListView );
 
-  mSelectedDates.append( TQDate::currentDate() );
+  mSelectedDates.append( TQDate::tqcurrentDate() );
 }
 
 KOListView::~KOListView()
@@ -261,7 +261,7 @@ int KOListView::maxDatesHint()
   return 0;
 }
 
-int KOListView::currentDateCount()
+int KOListView::tqcurrentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -299,7 +299,7 @@ void KOListView::showDates( bool show )
     mListView->setColumnWidth( 1, oldColWidth1 );
     mListView->setColumnWidth( 3, oldColWidth3 );
   }
-  mListView->repaint();
+  mListView->tqrepaint();
 }
 
 void KOListView::showDates()
@@ -499,9 +499,9 @@ void KOListView::clear()
   mDateList.clear();
 }
 
-TQSize KOListView::sizeHint() const
+TQSize KOListView::tqsizeHint() const
 {
-  const TQSize s = KOEventView::sizeHint();
-  return TQSize( s.width() + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
+  const TQSize s = KOEventView::tqsizeHint();
+  return TQSize( s.width() + style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
                 s.height() );
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 5a5c40d8f..e29a5e39f 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -76,7 +76,7 @@ class KOListView : public KOEventView
     ~KOListView();
 
     virtual int maxDatesHint();
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences();
     virtual DateList selectedIncidenceDates();
 
@@ -89,7 +89,7 @@ class KOListView : public KOEventView
     void writeSettings(KConfig *config);
 
     void clear();
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
   public slots:
     virtual void updateView();
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 1b3215c09..8b65d1d18 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -188,18 +188,18 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
   if (KOPrefs::instance()->mMailClient == KOPrefs::MailClientSendmail) {
     bool needHeaders = true;
 
-    TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
-        TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
-    if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
+    TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
+        TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
+    if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
     else {
-      command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
+      command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
       if (command.isNull()) return false; // give up
 
-      command.append(TQString::fromLatin1(" -s "));
+      command.append(TQString::tqfromLatin1(" -s "));
       command.append(KProcess::quote(subject));
 
       if (bcc) {
-        command.append(TQString::fromLatin1(" -b "));
+        command.append(TQString::tqfromLatin1(" -b "));
         command.append(KProcess::quote(from));
       }
 
@@ -224,14 +224,14 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
     TQString textComplete;
     if (needHeaders)
     {
-      textComplete += TQString::fromLatin1("From: ") + from + '\n';
-      textComplete += TQString::fromLatin1("To: ") + to + '\n';
+      textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
+      textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
       if ( !cc.isEmpty() ) {
-        textComplete += TQString::fromLatin1("Cc: " ) + cc + '\n';
+        textComplete += TQString::tqfromLatin1("Cc: " ) + cc + '\n';
       }
-      if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
-      textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
-      textComplete += TQString::fromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n';
+      if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
+      textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
+      textComplete += TQString::tqfromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n';
     }
     textComplete += '\n'; // end of headers
     textComplete += body;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 264525418..930e6c8d3 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -78,7 +78,7 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos )
 
   if( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r=eventlist->itemRect( it );
+    r=eventlist->tqitemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->incidence(), mDate ) );
     if ( !tipText.isEmpty() ) {
@@ -249,7 +249,7 @@ void MonthViewItem::paint( TQPainter *p )
   if ( mIncidence && mTodo ) {
     if ( static_cast( mIncidence )->isOverdue() ) {
       bgColor = KOPrefs::instance()->todoOverdueColor();
-    } else if ( static_cast( mIncidence )->dtDue().date() == TQDate::currentDate() ) {
+    } else if ( static_cast( mIncidence )->dtDue().date() == TQDate::tqcurrentDate() ) {
       bgColor = KOPrefs::instance()->todoDueTodayColor();
     }
   }
@@ -392,7 +392,7 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
   mLabel = new TQLabel( this );
   mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Plain );
   mLabel->setLineWidth( 1 );
-  mLabel->setAlignment( AlignCenter );
+  mLabel->tqsetAlignment( AlignCenter );
 
   mItemList = new KNoScrollListBox( this );
   mItemList->setMinimumSize( 10, 10 );
@@ -455,7 +455,7 @@ TQDate MonthViewCell::date() const
 void MonthViewCell::setFrameWidth()
 {
   // show current day with a thicker frame
-  if ( mDate == TQDate::currentDate() ) {
+  if ( mDate == TQDate::tqcurrentDate() ) {
     mItemList->setLineWidth( 3 );
   } else if ( !isSelected ) {
     mItemList->setLineWidth( 1 );
@@ -500,7 +500,7 @@ void MonthViewCell::updateCell()
 {
   setFrameWidth();
 
-  if ( mDate == TQDate::currentDate() ) {
+  if ( mDate == TQDate::tqcurrentDate() ) {
     setPalette( mTodayPalette );
 
     TQPalette pal = mItemList->palette();
@@ -763,7 +763,7 @@ void MonthViewCell::select()
     enableScrollBars( true );
 
   // don't mess up the cell when it represents today
-  if( mDate != TQDate::currentDate() ) {
+  if( mDate != TQDate::tqcurrentDate() ) {
     mItemList->setFrameStyle( TQFrame::Sunken | TQFrame::Panel );
     mItemList->setLineWidth( 3 );
   }
@@ -832,14 +832,14 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
   // month name on top
   mLabel = new TQLabel( this );
   mLabel->setFont( mfont );
-  mLabel->setAlignment( AlignCenter );
+  mLabel->tqsetAlignment( AlignCenter );
   mLabel->setLineWidth( 0 );
   mLabel->setFrameStyle( TQFrame::Plain );
 
   dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek );
 
   // create the day of the week labels (Sun, Mon, etc) and add them to
-  // the layout.
+  // the tqlayout.
   mDayLabels.resize( mDaysPerWeek );
   int i;
   for( i = 0; i < mDaysPerWeek; i++ ) {
@@ -847,7 +847,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
     label->setFont( bfont );
     label->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
     label->setLineWidth( 1 );
-    label->setAlignment( AlignCenter );
+    label->tqsetAlignment( AlignCenter );
 
     mDayLabels.insert( i, label );
 
@@ -890,7 +890,7 @@ int KOMonthView::maxDatesHint()
   return mNumCells;
 }
 
-int KOMonthView::currentDateCount()
+int KOMonthView::tqcurrentDateCount()
 {
   return mNumCells;
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index dafce597f..f503a29d5 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -251,7 +251,7 @@ class KOMonthView: public KOEventView
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
 
     /** Returns the currently selected events */
     virtual Incidence::List selectedIncidences();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 535fe1045..a5b44cce0 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -262,7 +262,7 @@ void KOPrefs::usrWriteConfig()
 
 void KOPrefs::setCategoryColor( const TQString &cat, const TQColor & color)
 {
-  mCategoryColors.replace( cat, new TQColor( color ) );
+  mCategoryColors.tqreplace( cat, new TQColor( color ) );
 }
 
 TQColor *KOPrefs::categoryColor( const TQString &cat )
@@ -285,7 +285,7 @@ void KOPrefs::setResourceColor ( const TQString &cal, const TQColor &color )
 {
   // kdDebug(5850)<<"KOPrefs::setResourceColor: " << cal << " color: "<<
   // color.name()<mReminderTime = mReminderTimeSpin->value();
       KOPrefs::instance()->mReminderTimeUnits = mReminderUnitsCombo->currentItem();
 
-      int mask = 0;
+      int tqmask = 0;
       for ( int i = 0; i < 7; ++i ) {
-        if (mWorkDays[i]->isChecked()) mask = mask | (1<isChecked()) tqmask = tqmask | (1<mWorkWeekMask = mask;
+      KOPrefs::instance()->mWorkWeekMask = tqmask;
       KOPrefs::instance()->writeConfig();
     }
 
@@ -774,7 +774,7 @@ void KOPrefsDialogColors::updateCategories()
 
 void KOPrefsDialogColors::setCategoryColor()
 {
-  mCategoryDict.replace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color()));
+  mCategoryDict.tqreplace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color()));
   slotWidChanged();
 }
 
@@ -823,7 +823,7 @@ void KOPrefsDialogColors::setResourceColor()
 {
   kdDebug( 5850) << "KOPrefsDialogColors::setResorceColor()" << endl;
 
-  mResourceDict.replace( mResourceIdentifier[mResourceCombo->currentItem()],
+  mResourceDict.tqreplace( mResourceIdentifier[mResourceCombo->currentItem()],
     new TQColor( mResourceButton->color() ) );
   slotWidChanged();
 }
@@ -1108,11 +1108,11 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
   topLayout->addWidget( mListView );
 
   mDescription = new TQLabel( topFrame );
-  mDescription->setAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter );
+  mDescription->tqsetAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter );
   mDescription->setFrameShape( TQLabel::Panel );
   mDescription->setFrameShadow( TQLabel::Sunken );
   mDescription->setMinimumSize( TQSize( 0, 55 ) );
-  mDescription->setSizePolicy(
+  mDescription->tqsetSizePolicy(
          TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0,
                       0, 0, mDescription->sizePolicy().hasHeightForWidth() ) );
   topLayout->addWidget( mDescription );
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 839d463a9..6b12f76c2 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -192,7 +192,7 @@ static TQString cleanSummary( const TQString &summary )
 {
   uint maxLen = 45;
   TQString retStr = summary;
-  retStr.replace( '\n', ' ' );
+  retStr.tqreplace( '\n', ' ' );
   if ( retStr.length() > maxLen ) {
     maxLen -= etc.length();
     retStr = retStr.left( maxLen );
@@ -402,7 +402,7 @@ void AlarmDialog::suspend()
     if ( item->isSelected() && item->isVisible() ) {
       item->setVisible( false );
       item->setSelected( false );
-      item->mRemindAt = TQDateTime::currentDateTime().addSecs( unit * mSuspendSpin->value() );
+      item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() );
       item->mNotified = false;
       selitem = item;
     }
@@ -435,8 +435,8 @@ void AlarmDialog::setTimer()
   int nextReminderAt = -1;
   for ( TQListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) {
     AlarmListItem * item = static_cast( it.current() );
-    if ( item->mRemindAt > TQDateTime::currentDateTime() ) {
-      int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt );
+    if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) {
+      int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt );
       nextReminderAt = nextReminderAt <= 0 ? secs : QMIN( nextReminderAt, secs );
     }
   }
@@ -532,7 +532,7 @@ void AlarmDialog::wakeUp()
       continue;
     }
 
-    if ( item->mRemindAt <= TQDateTime::currentDateTime() ) {
+    if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) {
       if ( !item->isVisible() ) {
         item->setVisible( true );
         item->setSelected( false );
@@ -650,7 +650,7 @@ bool AlarmDialog::ensureKorganizerRunning() const
   TQString error;
   TQCString dcopService;
 
-  int result = KDCOPServiceStarter::self()->findServiceFor(
+  int result = KDCOPServiceStarter::self()->tqfindServiceFor(
     "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
 
   if ( result == 0 ) {
@@ -659,12 +659,12 @@ bool AlarmDialog::ensureKorganizerRunning() const
     // but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject(
+    if ( !kapp->dcopClient()->tqfindObject(
            dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
-        Q_ASSERT( kapp->dcopClient()->findObject(
+        Q_ASSERT( kapp->dcopClient()->tqfindObject(
                     dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else {
         kdWarning() << "Error loading " << dcopService << endl;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index bef9b1bda..90360dc6a 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -91,7 +91,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
     connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) );
   }
 #else //FIXME: remove for KDE 4.0
-    quit->disconnect( TQT_SIGNAL( activated() ), qApp,
+    quit->disconnect( TQT_SIGNAL( activated() ), tqApp,
                       TQT_SLOT( closeAllWindows() ) );
   }
   connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) );
@@ -192,7 +192,7 @@ void AlarmDockWindow::slotQuit()
            "(note that you will not get reminders whilst the daemon is not running)?"),
       i18n("Close KOrganizer Reminder Daemon"),
       i18n("Start"), i18n("Do Not Start"),
-      TQString::fromLatin1("AskForStartAtLogin")
+      TQString::tqfromLatin1("AskForStartAtLogin")
       );
 
   bool autostart = true;
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index ec19ce9aa..7ed25518a 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms()
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
 
   TQDateTime from = mLastChecked.addSecs( 1 );
-  mLastChecked = TQDateTime::currentDateTime();
+  mLastChecked = TQDateTime::tqcurrentDateTime();
 
   kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl;
 
@@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug()
 
 TQStringList KOAlarmClient::dumpAlarms()
 {
-  TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(),
+  TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(),
                                TQTime( 0, 0 ) );
   TQDateTime end = start.addDays( 1 ).addSecs( -1 );
 
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 5a3ba5a18..7cf090e29 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
 
   Event *e1 = new Event;
   e1->setSummary( "This is a summary." );
-  TQDateTime now = TQDateTime::currentDateTime();
+  TQDateTime now = TQDateTime::tqcurrentDateTime();
   e1->setDtStart( now );
   e1->setDtEnd( now.addDays( 1 ) );
   Alarm *a = e1->newAlarm();
@@ -97,19 +97,19 @@ int main(int argc,char **argv)
 
   AlarmDialog dlg( mCalendar, 0 );
   app.setMainWidget( &dlg );
-  dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ),
+  dlg.addIncidence( e2, TQDateTime::tqcurrentDateTime().addSecs( 60 ),
                     TQString() );
-  dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ),
+  dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ),
+  dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ),
                     TQString( "Fred and Barney get cloned" ) );
-  dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ),
+  dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ),
                     TQString() );
-  dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ),
+  dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ),
                     TQString() );
-  dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ),
+  dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ),
+  dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ),
                     TQString() );
   dlg.show();
   dlg.eventNotification();
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index d088becba..d5246b875 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -50,7 +50,7 @@ namespace KCal { class CalendarResources; }
 
 using namespace KCal;
 
-// Workaround for moc workaround for visual c++ 6.0 sucking
+// Workaround for tqmoc workaround for visual c++ 6.0 sucking
 typedef KOrg::MainWindow KOrgMainWindow;
 typedef KParts::MainWindow KPartsMainWindow;
 
@@ -93,7 +93,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 
     virtual KXMLGUIFactory *mainGuiFactory() { return factory(); }
     virtual KXMLGUIClient *mainGuiClient() { return this; }
-    virtual TQWidget *topLevelWidget() { return this; }
+    virtual TQWidget *tqtopLevelWidget() { return this; }
 
     virtual bool isCurrentlyActivePart();
 
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 65511bd18..cc6252d57 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -66,10 +66,10 @@
 typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory )
 
-KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
+KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName,
                                 TQObject *parent, const char *name,
                                 const TQStringList & ) :
-  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() )
+  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() )
 {
   KGlobal::locale()->insertCatalogue( "libkcal" );
   KGlobal::locale()->insertCatalogue( "libkdepim" );
@@ -80,7 +80,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
   TQString pname( name );
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget( parentWidget, widgetName );
+  TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
   canvas->setFocusPolicy( TQWidget::ClickFocus );
   setWidget( canvas );
   mView = new CalendarView( canvas );
@@ -155,9 +155,9 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & )
   }
 }
 
-TQWidget *KOrganizerPart::topLevelWidget()
+TQWidget *KOrganizerPart::tqtopLevelWidget()
 {
-  return mView->topLevelWidget();
+  return mView->tqtopLevelWidget();
 }
 
 ActionManager *KOrganizerPart::actionManager()
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index ad6a45081..1aececaf4 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -58,7 +58,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
 {
     Q_OBJECT
   public:
-    KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
+    KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName,
                     TQObject *parent, const char *name, const TQStringList & );
     virtual ~KOrganizerPart();
 
@@ -78,7 +78,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
 
     virtual KXMLGUIFactory *mainGuiFactory() { return factory(); }
     virtual KXMLGUIClient *mainGuiClient() { return this; }
-    virtual TQWidget *topLevelWidget();
+    virtual TQWidget *tqtopLevelWidget();
     virtual ActionManager *actionManager();
     virtual KActionCollection *getActionCollection() const { return actionCollection(); }
     virtual void showStatusMessage( const TQString &message );
diff --git a/korganizer/korganizeriface.h b/korganizer/korganizeriface.h
index 88ab61d50..225f0f2d3 100644
--- a/korganizer/korganizeriface.h
+++ b/korganizer/korganizeriface.h
@@ -48,7 +48,7 @@ class KOrganizerIface : virtual public DCOPObject
     /**
       Add an incidence to the active calendar.
       @param iCal A calendar in iCalendar format containing the incidence. The
-                  calendar must consist of a VCALENDAR component which contains
+                  calendar must consist of a VCALENDAR component which tqcontains
                   the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and
                   optionally a VTIMEZONE component. If there is more than one
                   incidence, only the first is added to KOrganizer's calendar.
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index 1eb1084de..ea987ccf5 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -94,7 +94,7 @@ KCal::DateList KOTimelineView::selectedIncidenceDates()
 }
 
 /*virtual*/
-int KOTimelineView::currentDateCount()
+int KOTimelineView::tqcurrentDateCount()
 {
     return 0;
 }
@@ -293,7 +293,7 @@ void KOTimelineView::insertIncidence(KCal::Incidence * incidence)
   for ( TQDate day = mStartDate; day <= mEndDate; day = day.addDays( 1 ) ) {
     Event::List events = calendar()->events( day, EventSortStartDate, SortDirectionAscending );
     for ( Event::List::ConstIterator it = events.constBegin(); it != events.constEnd(); ++it ) {
-      if ( events.contains( event ) )
+      if ( events.tqcontains( event ) )
         insertIncidence( *it, day );
     }
   }
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 81e1eef40..72ba90840 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -51,7 +51,7 @@ class KOTimelineView : public KOEventView
 
     virtual KCal::ListBase selectedIncidences();
     virtual KCal::DateList selectedIncidenceDates();
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual void showDates(const TQDate&, const TQDate&);
     virtual void showIncidences(const KCal::ListBase&, const TQDate &date);
     virtual void updateView();
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 9d273b3a0..180ff1394 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral()
 
     mGeneral->initHeader( topFrame, topLayout );
     mGeneral->initTime(topFrame,topLayout);
-    mGeneral->initStatus(topFrame,topLayout);
+    mGeneral->iniStatus(topFrame,topLayout);
     mGeneral->initDescription(topFrame,topLayout);
     mGeneral->initAttachments(topFrame,topLayout);
     connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
@@ -172,7 +172,7 @@ void KOTodoEditor::newTodo()
 
 void KOTodoEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.contains("\n") ) {
+  if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
     int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
@@ -185,7 +185,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio
 void KOTodoEditor::loadDefaults()
 {
   kdDebug(5850) << k_funcinfo << endl;
-  setDates( TQDateTime::currentDateTime().addDays( 7 ), true, 0 );
+  setDates( TQDateTime::tqcurrentDateTime().addDays( 7 ), true, 0 );
   mGeneral->toggleAlarm( KOPrefs::instance()->defaultTodoReminders() );
 }
 
@@ -271,7 +271,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv
   if ( mTodo ) {
     mRecurrence->setDefaults( mTodo->dtStart(), due, false );
   } else {
-    mRecurrence->setDefaults( TQDateTime::currentDateTime(), due, false );
+    mRecurrence->setDefaults( TQDateTime::tqcurrentDateTime(), due, false );
   }
 }
 
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index 5ab3e36dd..f743c11cf 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -55,7 +55,7 @@ class KOTodoEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary contains multiple lines, the summary will be used as description
+      summary tqcontains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5951d8bc4..333e2fbf5 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -84,7 +84,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos)
   {
 
     /* Calculate the rectangle. */
-    r=todolist->itemRect(i);
+    r=todolist->tqitemRect(i);
     headerPos = todolist->header()->sectionPos(col)-todolist->contentsX();
     r.setLeft( (headerPos < 0 ? 0 : headerPos) );
     r.setRight(headerPos + todolist->header()->sectionSize(col));
@@ -563,7 +563,7 @@ void KOTodoView::updateView()
   mTodoMap.clear();
   Todo::List::ConstIterator it;
   for( it = todoList.begin(); it != todoList.end(); ++it ) {
-    if ( !mTodoMap.contains( *it ) ) {
+    if ( !mTodoMap.tqcontains( *it ) ) {
       insertTodoItem( *it );
     }
   }
@@ -635,7 +635,7 @@ void KOTodoView::removeTodoItems()
   KOTodoViewItem *item;
   for ( item = mItemsToDelete.first(); item; item = mItemsToDelete.next() ) {
     Todo *todo = item->todo();
-    if ( todo && mTodoMap.contains( todo ) ) {
+    if ( todo && mTodoMap.tqcontains( todo ) ) {
       mTodoMap.remove( todo );
     }
     delete item;
@@ -656,7 +656,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem )
 
 void KOTodoView::updateConfig()
 {
-  mTodoListView->repaintContents();
+  mTodoListView->tqrepaintContents();
 }
 
 Incidence::List KOTodoView::selectedIncidences()
@@ -691,7 +691,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
   Todo *todo = static_cast(incidence);
   if ( todo ) {
     KOTodoViewItem *todoItem = 0;
-    if ( mTodoMap.contains( todo ) ) {
+    if ( mTodoMap.tqcontains( todo ) ) {
       todoItem = mTodoMap[todo];
     }
     switch ( action ) {
@@ -705,7 +705,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
             // correctly update changes in relations
             Todo*parent = dynamic_cast( todo->relatedTo() );
             KOTodoViewItem*parentItem = 0;
-            if ( parent && mTodoMap.contains(parent) ) {
+            if ( parent && mTodoMap.tqcontains(parent) ) {
               parentItem = mTodoMap[ parent ];
             }
             if ( todoItem->parent() != parentItem ) {
@@ -797,7 +797,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column )
       if ( mActiveItem->todo()->hasDueDate () ) {
         mMovePopupMenu->datePicker()->setDate( date );
       } else {
-        mMovePopupMenu->datePicker()->setDate( TQDate::currentDate() );
+        mMovePopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() );
       }
       switch ( column ) {
         case ePriorityColumn:
@@ -815,7 +815,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column )
           break;
         default:
           mCopyPopupMenu->datePicker()->setDate( date );
-          mCopyPopupMenu->datePicker()->setDate( TQDate::currentDate() );
+          mCopyPopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() );
           mItemPopupMenu->setItemEnabled( ePopupUnSubTodo,
                                           mActiveItem->todo()->relatedTo() );
           mItemPopupMenu->setItemEnabled( ePopupUnAllSubTodo,
@@ -832,7 +832,7 @@ void KOTodoView::newTodo()
 {
   kdDebug() << k_funcinfo << endl;
   emit newTodoSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
-                      TQDate::currentDate().addDays(7) );
+                      TQDate::tqcurrentDate().addDays(7) );
 }
 
 void KOTodoView::newSubTodo()
@@ -917,7 +917,7 @@ void KOTodoView::setNewPercentage( KOTodoViewItem *item, int percentage )
       myChild = myChild->nextSibling();
     }*/
     if ( percentage == 100 ) {
-      todo->setCompleted( TQDateTime::currentDateTime() );
+      todo->setCompleted( TQDateTime::tqcurrentDateTime() );
       // If the todo does recur, it doesn't get set as completed. However, the
       // item is still checked. Uncheck it again.
       if ( !todo->isCompleted() ) {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index bc7302d34..1d53a3827 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -124,7 +124,7 @@ class KOTodoView : public KOrg::BaseView
     DateList selectedIncidenceDates() { return DateList(); }
 
     /** Return number of shown dates. TodoView does not show dates, */
-    int currentDateCount() { return 0; }
+    int tqcurrentDateCount() { return 0; }
 
     CalPrinterBase::PrintType printType();
 
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index f5b0adced..bb03fe32c 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -243,7 +243,7 @@ bool KOTodoViewItem::isAlternate()
 #endif
 }
 
-void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
 {
   TQColorGroup _cg = cg;
   // If no todo is set, just don't paint anything...
@@ -252,12 +252,12 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
   if (isAlternate())
         _cg.setColor(TQColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   if (mTodo->hasDueDate()) {
-    if (mTodo->dtDue().date()==TQDate::currentDate() &&
+    if (mTodo->dtDue().date()==TQDate::tqcurrentDate() &&
         !mTodo->isCompleted()) {
       _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoDueTodayColor);
       _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoDueTodayColor));
     }
-    if (mTodo->dtDue().date() < TQDate::currentDate() &&
+    if (mTodo->dtDue().date() < TQDate::tqcurrentDate() &&
         !mTodo->isCompleted()) {
       _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoOverdueColor);
       _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoOverdueColor));
@@ -278,6 +278,6 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
         KGlobalSettings::highlightColor() );
     p->restore();
   } else {
-    TQCheckListItem::paintCell(p, _cg, column, width, alignment);
+    TQCheckListItem::paintCell(p, _cg, column, width, tqalignment);
   }
 }
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index 80b3b9617..5388d6da0 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -66,7 +66,7 @@ class KOTodoViewItem : public QCheckListItem
     bool isAlternate();
     int compare( TQListViewItem *i, int col, bool ascending ) const;
     virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment);
+      int column, int width, int tqalignment);
 
   protected:
 #if QT_VERSION >= 300
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 1906a07ee..06ae07418 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -451,7 +451,7 @@ void KOViewManager::showNextXView()
 {
   mAgendaMode = AGENDA_NEXTX;
   showAgendaView();
-  mMainView->dateNavigator()->selectDates( TQDate::currentDate(),
+  mMainView->dateNavigator()->selectDates( TQDate::tqcurrentDate(),
                                            KOPrefs::instance()->mNextXDays );
 }
 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 884b70b22..1ec28ed2f 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -65,9 +65,9 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
   : KOrg::BaseView(calendar, parent, name)
 {
 //  TQLabel *dateLabel =
-//      new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this);
+//      new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this);
 //  dateLabel->setMargin(2);
-//  dateLabel->setAlignment(AlignCenter);
+//  dateLabel->tqsetAlignment(AlignCenter);
 
   mView = new WhatsNextTextBrowser(this);
   connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &)));
@@ -81,7 +81,7 @@ KOWhatsNextView::~KOWhatsNextView()
 {
 }
 
-int KOWhatsNextView::currentDateCount()
+int KOWhatsNextView::tqcurrentDateCount()
 {
   return mStartDate.daysTo( mEndDate );
 }
@@ -183,7 +183,7 @@ void KOWhatsNextView::updateView()
 
   TQStringList myEmails( KOPrefs::instance()->allEmails() );
   int replies = 0;
-  events = calendar()->events( TQDate::currentDate(), TQDate(2975,12,6) );
+  events = calendar()->events( TQDate::tqcurrentDate(), TQDate(2975,12,6) );
   Event::List::ConstIterator it2;
   for( it2 = events.begin(); it2 != events.end(); ++it2 ) {
     Event *ev = *it2;
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 69c6a62eb..211984ed9 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -55,7 +55,7 @@ class KOWhatsNextView : public KOrg::BaseView
                     const char *name = 0);
     ~KOWhatsNextView();
 
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences() { return Incidence::List(); }
     DateList selectedIncidenceDates() { return DateList(); }
 
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index 0c0ddb966..a5fe92b40 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -122,7 +122,7 @@ TQPtrList MailScheduler::retrieveTransactions()
         TQTextStream t( &f );
         t.setEncoding( TQTextStream::Latin1 );
         TQString messageString = t.read();
-        messageString.replace( TQRegExp( "\n[ \t]"), "" );
+        messageString.tqreplace( TQRegExp( "\n[ \t]"), "" );
         messageString = TQString::fromUtf8( messageString.latin1() );
         ScheduleMessage *mess = mFormat->parseScheduleMessage( mCalendar,
                                                                messageString );
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index a6aa51665..7d77a3da7 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -60,7 +60,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
   mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
-  label->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+  label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
   TQVBox *sideBox = new TQVBox( mLeftSplitter );
   EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->changeColumns( 0 );
@@ -265,7 +265,7 @@ void MultiAgendaView::setupViews()
 
   int minWidth = 0;
   for ( TQValueList::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
-    minWidth = QMAX( minWidth, (*it)->minimumSizeHint().width() );
+    minWidth = QMAX( minWidth, (*it)->tqminimumSizeHint().width() );
   for ( TQValueList::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
     (*it)->setMinimumWidth( minWidth );
 }
@@ -292,10 +292,10 @@ DateList MultiAgendaView::selectedIncidenceDates()
   return list;
 }
 
-int MultiAgendaView::currentDateCount()
+int MultiAgendaView::tqcurrentDateCount()
 {
   FOREACH_VIEW( agendaView )
-    return agendaView->currentDateCount();
+    return agendaView->tqcurrentDateCount();
   return 0;
 }
 
@@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev)
 void MultiAgendaView::resizeScrollView(const TQSize & size)
 {
   const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width();
-  int width = QMAX( mTopBox->sizeHint().width(), widgetWidth );
+  int width = QMAX( mTopBox->tqsizeHint().width(), widgetWidth );
   int height = size.height();
   if ( width > widgetWidth ) {
     const int sbHeight = mScrollView->horizontalScrollBar()->height();
@@ -536,7 +536,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 }
 
 // KDE4: not needed, use existing TQSplitter signals instead
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index ebdfc9005..8fec0b7c3 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -50,7 +50,7 @@ class MultiAgendaView : public AgendaView
     void deSelectAgendaView() { mSelectedAgendaView = 0; }
     Incidence::List selectedIncidences();
     DateList selectedIncidenceDates();
-    int currentDateCount();
+    int tqcurrentDateCount();
     int maxDatesHint();
 
     bool eventDurationHint(TQDateTime &startDt, TQDateTime &endDt, bool &allDay);
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f663af815..836c251fa 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -71,43 +71,43 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
   pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" );
   mPrevYear = new TQPushButton( this );
   mPrevYear->setPixmap( pix );
-  mPrevYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevYear, i18n( "Previous year" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow");
   mPrevMonth = new TQPushButton( this );
   mPrevMonth->setPixmap( pix );
-  mPrevMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevMonth, i18n( "Previous month" ) );
 
   // Create forward navigation buttons
   pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow");
   mNextMonth = new TQPushButton( this );
   mNextMonth->setPixmap( pix );
-  mNextMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextMonth, i18n( "Next month" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow");
   mNextYear = new TQPushButton( this );
   mNextYear->setPixmap( pix );
-  mNextYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextYear, i18n( "Next year" ) );
 
   // Create month name button
   mMonth = new ActiveLabel( this );
   mMonth->setFont( tfont );
-  mMonth->setAlignment( AlignCenter );
-  mMonth->setMinimumHeight( mPrevYear->sizeHint().height() );
+  mMonth->tqsetAlignment( AlignCenter );
+  mMonth->setMinimumHeight( mPrevYear->tqsizeHint().height() );
   TQToolTip::add( mMonth, i18n( "Select a month" ) );
 
   // Create year button
   mYear = new ActiveLabel( this );
   mYear->setFont( tfont );
-  mYear->setAlignment( AlignCenter );
-  mYear->setMinimumHeight( mPrevYear->sizeHint().height() );
+  mYear->tqsetAlignment( AlignCenter );
+  mYear->setMinimumHeight( mPrevYear->tqsizeHint().height() );
   TQToolTip::add( mYear, i18n( "Select a year" ) );
 
-  // set up control frame layout
+  // set up control frame tqlayout
   TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this );
   ctrlLayout->addWidget( mPrevYear );
   ctrlLayout->addWidget( mPrevMonth );
diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am
index 8081a5645..9924bf459 100644
--- a/korganizer/plugins/datenums/Makefile.am
+++ b/korganizer/plugins/datenums/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_datenums.la
 
 libkorg_datenums_la_SOURCES = configdialog.cpp datenums.cpp
 libkorg_datenums_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_KDEUI)
+libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 
 noinst_HEADERS = datenums.h
 
diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am
index 39290aadd..ab3eb1777 100644
--- a/korganizer/plugins/exchange/Makefile.am
+++ b/korganizer/plugins/exchange/Makefile.am
@@ -15,7 +15,8 @@ libkorg_exchange_la_SOURCES =  exchange.cpp exchangedialog.cpp exchangeconfig.cp
 libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
 libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \
 			     $(top_builddir)/libkpimexchange/libkpimexchange.la \
-			     $(LIB_KDEUI) $(LIB_KPARTS)
+			     $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
+			     $(top_builddir)/libkcal/libkcal.la
 
 noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h
 
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 3d3719ed4..8455d61bb 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
 
   mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" );
   mClient = new KPIM::ExchangeClient( mAccount );
-  mClient->setWindow( parent->topLevelWidget() );
+  mClient->setWindow( parent->tqtopLevelWidget() );
 
   setXMLFile("plugins/exchangeui.rc");
 
@@ -219,9 +219,9 @@ void Exchange::showError( int error, const TQString& moreInfo /* = TQString::nul
 
   if ( error !=  KPIM::ExchangeClient::ResultOK ) {
     if ( moreInfo.isNull() )
-      KMessageBox::error( mainWindow()->topLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
+      KMessageBox::error( mainWindow()->tqtopLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
     else
-      KMessageBox::detailedError( mainWindow()->topLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
+      KMessageBox::detailedError( mainWindow()->tqtopLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
   }
 }
 
diff --git a/korganizer/plugins/hebrew/Makefile.am b/korganizer/plugins/hebrew/Makefile.am
index 4f48cc58b..3326ba1f6 100644
--- a/korganizer/plugins/hebrew/Makefile.am
+++ b/korganizer/plugins/hebrew/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libkorg_hebrew.la
 
 libkorg_hebrew_la_SOURCES = hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp
 libkorg_hebrew_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_hebrew_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI)
+libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 
 noinst_HEADERS = hebrew.h configdialog.h parsha.h converter.h holiday.h
 
diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am
index 6238b1f18..626ecf17a 100644
--- a/korganizer/plugins/printing/journal/Makefile.am
+++ b/korganizer/plugins/printing/journal/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la
 
 libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui  journalprint.cpp
 libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_journalprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libkdepim/ -lkdepim
 
 noinst_HEADERS = 
 
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index bee91a368..1e41fdb84 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintJournal_Base
     
-    
+    
         
             0
             0
@@ -65,7 +65,7 @@
                 
                 
                     
-                        layout2
+                        tqlayout2
                     
                     
                         
@@ -81,7 +81,7 @@
                             
                                 Fixed
                             
-                            
+                            
                                 
                                     15
                                     20
@@ -136,7 +136,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     324
                                     21
@@ -157,7 +157,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     201
@@ -193,7 +193,7 @@
     mFromDate
     mToDate
 
-
+
 
     kdateedit.h
     kdateedit.h
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index cea873e6a..22c6d5771 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintList_Base
     
-    
+    
         
             0
             0
@@ -40,7 +40,7 @@
                 
                 
                     
-                        layout2
+                        tqlayout2
                     
                     
                         
@@ -56,7 +56,7 @@
                             
                                 Fixed
                             
-                            
+                            
                                 
                                     15
                                     20
@@ -111,7 +111,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     324
                                     21
@@ -169,7 +169,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     40
@@ -182,5 +182,5 @@
     mFromDate
     mToDate
 
-
+
 
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index c93e48ed6..c855976a3 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintWhatsNext_Base
     
-    
+    
         
             0
             0
@@ -40,7 +40,7 @@
                 
                 
                     
-                        layout2
+                        tqlayout2
                     
                     
                         
@@ -56,7 +56,7 @@
                             
                                 Fixed
                             
-                            
+                            
                                 
                                     15
                                     20
@@ -111,7 +111,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     324
                                     21
@@ -132,7 +132,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     201
@@ -168,7 +168,7 @@
     mFromDate
     mToDate
 
-
+
 
     kdateedit.h
     kdateedit.h
diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am
index f51e29e61..5d6913578 100644
--- a/korganizer/plugins/printing/year/Makefile.am
+++ b/korganizer/plugins/printing/year/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_yearlyprint.la
 
 libkorg_yearlyprint_la_SOURCES =calprintyearconfig_base.ui  yearprint.cpp
 libkorg_yearlyprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_yearlyprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
 
 noinst_HEADERS = 
 
diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
index 43d906d6c..38b7822b2 100644
--- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui
+++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintYear_Base
     
-    
+    
         
             0
             0
@@ -84,7 +84,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             120
                             21
@@ -106,7 +106,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             131
                             21
@@ -187,7 +187,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     40
@@ -196,5 +196,5 @@
         
     
 
-
+
 
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 6c45ff424..d5abb1f42 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -107,8 +107,8 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
 void KOProjectView::createMainTask()
 {
   mMainTask = new KGanttItem(0,i18n("main task"),
-                         TQDateTime::currentDateTime(),
-                         TQDateTime::currentDateTime());
+                         TQDateTime::tqcurrentDateTime(),
+                         TQDateTime::tqcurrentDateTime());
   mMainTask->setMode(KGanttItem::Rubberband);
   mMainTask->setStyle(KGanttItem::DrawBorder | KGanttItem::DrawText |
                       KGanttItem::DrawHandle);
@@ -154,8 +154,8 @@ void KOProjectView::updateView()
 
 #if 0
   KGanttItem* t1 = new KGanttItem(mGantt->getMainTask(), "task 1, no subtasks",
-                             TQDateTime::currentDateTime().addDays(10),
-                             TQDateTime::currentDateTime().addDays(20) );
+                             TQDateTime::tqcurrentDateTime().addDays(10),
+                             TQDateTime::tqcurrentDateTime().addDays(20) );
 
   KGanttItem* t2 = new KGanttItem(mGantt->getMainTask(), "task 2, subtasks, no rubberband",
                              TQDateTime(TQDate(2000,10,1)),
@@ -188,7 +188,7 @@ void KOProjectView::updateView()
   mTodoMap.clear();
   Todo::List::ConstIterator it;
   for( it = todoList.begin(); it != todoList.end(); ++it ) {
-    if ( !mTodoMap.contains( *it ) ) {
+    if ( !mTodoMap.tqcontains( *it ) ) {
       insertTodoItem( *it );
     }
   }
@@ -224,14 +224,14 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
   if (todo->hasStartDate() && !todo->hasDueDate()) {
     // start date but no due date
     startDt = todo->dtStart();
-    endDt = TQDateTime::currentDateTime();
+    endDt = TQDateTime::tqcurrentDateTime();
   } else if (!todo->hasStartDate() && todo->hasDueDate()) {
     // due date but no start date
     startDt = todo->dtDue();
     endDt = todo->dtDue();
   } else if (!todo->hasStartDate() || !todo->hasDueDate()) {
-    startDt = TQDateTime::currentDateTime();
-    endDt = TQDateTime::currentDateTime();
+    startDt = TQDateTime::tqcurrentDateTime();
+    endDt = TQDateTime::tqcurrentDateTime();
   } else {
     startDt = todo->dtStart();
     endDt = todo->dtDue();
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index aa856621a..39062179e 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -74,7 +74,7 @@ class KOProjectView : public KOrg::BaseView
     DateList selectedDates();
 
     /** Return number of shown dates. */
-    int currentDateCount() { return 0; }
+    int tqcurrentDateCount() { return 0; }
 
     void readSettings();
     void writeSettings(KConfig *);
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index eec3ab461..01fc0cb40 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -79,7 +79,7 @@ int KOTimeSpanView::maxDatesHint()
   return 0;
 }
 
-int KOTimeSpanView::currentDateCount()
+int KOTimeSpanView::tqcurrentDateCount()
 {
   return 0;
 }
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index d115b630b..49e54ab64 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -38,7 +38,7 @@ class KOTimeSpanView : public KOEventView
     ~KOTimeSpanView();
 
     virtual int maxDatesHint();
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences();
     DateList selectedDates() { return DateList(); }
 
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index 8abfaa1c4..bb1bfc0be 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintDay_Base
     
-    
+    
         
             0
             0
@@ -56,7 +56,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             121
                             21
@@ -73,7 +73,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             121
                             21
@@ -228,7 +228,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     201
@@ -249,7 +249,7 @@
 
     kdateedit.h
 
-
+
 
     libkdepim/kdateedit.h
     libkdepim/kdateedit.h
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index 8c2539e85..b62c7adda 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -52,7 +52,7 @@
 static TQString cleanString( const TQString &instr )
 {
   TQString ret = instr;
-  return ret.replace( '\n', ' ' );
+  return ret.tqreplace( '\n', ' ' );
 }
 
 /**************************************************************
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 0ab61fdac..0517dec00 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
 
   mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
   // use the minimal width possible = max width of the radio buttons, not extensible
-/*  mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
+/*  mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
     (TQSizePolicy::SizeType)5, 0, 0,
       mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/
 
@@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
     TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup );
     radioButton->setEnabled( p->enabled() );
     mTypeGroup->insert( radioButton, mapit.key() );
-//     radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 );
+//     radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 );
   }
 
-  setMinimumSize( minimumSizeHint() );
-  resize( minimumSizeHint() );
+  setMinimumSize( tqminimumSizeHint() );
+  resize( tqminimumSizeHint() );
 }
 
 CalPrintDialog::~CalPrintDialog()
@@ -255,7 +255,7 @@ void CalPrintDialog::setOrientation( CalPrinter::ePrintOrientation orientation )
 KOrg::PrintPlugin *CalPrintDialog::selectedPlugin()
 {
   int id = mTypeGroup->selectedId();
-  if ( mPluginIDs.contains( id ) ) {
+  if ( mPluginIDs.tqcontains( id ) ) {
     return mPluginIDs[id];
   } else {
     return 0;
diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui
index 5a85fb714..ef238b528 100644
--- a/korganizer/printing/calprintincidenceconfig_base.ui
+++ b/korganizer/printing/calprintincidenceconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintIncidence_Base
     
-    
+    
         
             0
             0
@@ -90,7 +90,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     201
@@ -99,5 +99,5 @@
         
     
 
-
+
 
diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui
index 001729582..6fd311ea4 100644
--- a/korganizer/printing/calprintmonthconfig_base.ui
+++ b/korganizer/printing/calprintmonthconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintMonth_Base
     
-    
+    
         
             0
             0
@@ -31,7 +31,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     20
@@ -131,7 +131,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             17
                             21
@@ -200,7 +200,7 @@
 
     kdateedit.h
 
-
+
 
     kcombobox.h
     knuminput.h
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index e16e72c6b..c0e61b922 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -46,7 +46,7 @@ inline int round(const double x)
 static TQString cleanStr( const TQString &instr )
 {
   TQString ret = instr;
-  return ret.replace( '\n', ' ' );
+  return ret.tqreplace( '\n', ' ' );
 }
 
 /******************************************************************
@@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase()
 TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
 {
   TQFrame *wdg = new TQFrame( w );
-  TQVBoxLayout *layout = new TQVBoxLayout( wdg );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg );
 
   TQLabel *title = new TQLabel( description(), wdg );
   TQFont titleFont( title->font() );
@@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
   titleFont.setBold( true );
   title->setFont( titleFont );
 
-  layout->addWidget( title );
-  layout->addWidget( new TQLabel( info(), wdg ) );
-  layout->addSpacing( 20 );
-  layout->addWidget( new TQLabel( i18n("This printing style does not "
+  tqlayout->addWidget( title );
+  tqlayout->addWidget( new TQLabel( info(), wdg ) );
+  tqlayout->addSpacing( 20 );
+  tqlayout->addWidget( new TQLabel( i18n("This printing style does not "
                                       "have any configuration options."),
                                  wdg ) );
-  layout->addStretch();
+  tqlayout->addStretch();
   return wdg;
 }
 
@@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig()
   if ( mConfig ) {
     KConfigGroupSaver saver( mConfig, description() );
     mConfig->sync();
-    TQDateTime currDate( TQDate::currentDate() );
+    TQDateTime currDate( TQDate::tqcurrentDate() );
     mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date();
     mToDate = mConfig->readDateTimeEntry( "ToDate" ).date();
     mUseColors = mConfig->readBoolEntry( "UseColors", true );
@@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
   TQFont oldfont( p.font() );
   p.setFont( TQFont( "sans-serif", 6 ) );
   TQFontMetrics fm( p.font() );
-  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
+  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false );
   p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
               i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
   p.setFont( oldfont );
@@ -1602,7 +1602,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     // The problem is that relations() does not apply filters, so
     // we need to compare manually with the complete filtered list!
     Todo* subtodo = dynamic_cast( *it );
-    if (subtodo && todoList.contains( subtodo ) ) {
+    if (subtodo && todoList.tqcontains( subtodo ) ) {
       drawTodo( count, subtodo, p, connectSubTodos, strikeoutCompleted,
                 desc, posPriority, posSummary, posDueDt, posPercentComplete,
                 level+1, x, y, width, pageHeight, todoList, &startpt );
@@ -1619,7 +1619,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     // The problem is that relations() does not apply filters, so
     // we need to compare manually with the complete filtered list!
     Todo* subtodo = dynamic_cast( *it );
-    if ( subtodo && todoList.contains( subtodo ) ) {
+    if ( subtodo && todoList.tqcontains( subtodo ) ) {
       t.append( subtodo );
     }
   }
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index b845b379e..16a1cc2f8 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -259,7 +259,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       It prints the given text and optionally one or two small
       month views, as specified by the two TQDate. The printed
       text can also contain a line feed.
-      If month2 is invalid, only the month that contains month1
+      If month2 is invalid, only the month that tqcontains month1
       is printed.
       E.g. the filofax week view draws just the current month,
       while the month view draws the previous and the next month.
@@ -419,7 +419,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       On the left side the time scale is printed (using drawTimeLine), then each
       day gets one column (printed using drawAgendaDayBox),
       and the events are displayed as boxes (like in korganizer's day/week view).
-      The first cell of each column contains the all-day events (using
+      The first cell of each column tqcontains the all-day events (using
       drawAllDayBox with expandable=false).
       The given time range cannot be expanded to include all events.
       \param p TQPainter of the printout
@@ -435,7 +435,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
 
     /**
       Draw the month table of the month containing the date qd. Each day gets one
-      box (using drawDayBox) that contains a list of all events on that day. They are arranged
+      box (using drawDayBox) that tqcontains a list of all events on that day. They are arranged
       in a matrix, with the first column being the first day of the
       week (so it might display some days of the previous and the next month).
       Above the matrix there is a bar showing the weekdays (drawn using drawDaysOfWeek).
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index 53fd3bfba..ea2dcff20 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintTodoConfig_Base
     
-    
+    
         
             0
             0
@@ -86,7 +86,7 @@
                 
                 
                     
-                        layout2
+                        tqlayout2
                     
                     
                         
@@ -102,7 +102,7 @@
                             
                                 Fixed
                             
-                            
+                            
                                 
                                     16
                                     20
@@ -191,7 +191,7 @@
                             
                                 Expanding
                             
-                            
+                            
                                 
                                     16
                                     21
@@ -275,7 +275,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     16
@@ -341,7 +341,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             121
                             20
@@ -358,7 +358,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             121
                             20
@@ -447,7 +447,7 @@
 
     kdateedit.h
 
-
+
 
     libkdepim/kdateedit.h
     libkdepim/kdateedit.h
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui
index a14013cee..32ea6fb4a 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@@ -6,7 +6,7 @@
     
         CalPrintWeek_Base
     
-    
+    
         
             0
             0
@@ -34,7 +34,7 @@
             
                 Expanding
             
-            
+            
                 
                     21
                     27
@@ -62,7 +62,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             16
                             21
@@ -118,7 +118,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             110
                             20
@@ -246,7 +246,7 @@
                         Print as &timetable view
                     
                     
-                        This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>.
+                        This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check <i>Use Colors</i>.
                     
                 
                 
@@ -257,7 +257,7 @@
                         Print as split week view
                     
                     
-                        This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.
+                        This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.
                     
                 
             
@@ -292,7 +292,7 @@
 
     kdateedit.h
 
-
+
 
     libkdepim/kdateedit.h
     libkdepim/kdateedit.h
diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui
index e6574be6b..7e7a5ff1f 100644
--- a/korganizer/publishdialog_base.ui
+++ b/korganizer/publishdialog_base.ui
@@ -4,7 +4,7 @@
     
         PublishDialog_base
     
-    
+    
         
             0
             0
@@ -112,7 +112,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     241
@@ -129,5 +129,5 @@
     mRemove
     mSelectAddressee
 
-
+
 
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 150aa0143..0f2d0e13f 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -83,7 +83,7 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString
 static TQString labelFromIdentifier( ResourceCalendar *resource, const TQString &identifier )
 {
   TQString subResLabel;
-  if ( identifier.contains( "/.INBOX.directory/" ) ) { // my subresource
+  if ( identifier.tqcontains( "/.INBOX.directory/" ) ) { // my subresource
     TQString subResName = identifier;
     subResName.remove( TQRegExp( "^.*/\\.INBOX\\.directory/" ) );
     subResLabel = labelFromSubResName( resource, subResName );
@@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std )
 {
   if ( mIsStandardResource != std ) {
     mIsStandardResource = std;
-    repaint();
+    tqrepaint();
   }
 }
 
 void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment)
+      int column, int width, int tqalignment)
 {
   TQFont oldFont = p->font();
   TQFont newFont = oldFont;
   newFont.setBold( mIsStandardResource && !mIsSubresource );
   p->setFont( newFont );
-  TQCheckListItem::paintCell( p, cg, column, width, alignment );
+  TQCheckListItem::paintCell( p, cg, column, width, tqalignment );
   p->setFont( oldFont );
 /*  TQColorGroup _cg = cg;
   if(!mResource) return;
@@ -595,7 +595,7 @@ void ResourceView::editResource()
   if ( item->isSubresource() ) {
     if ( resource->type() == "imap" || resource->type() == "scalix" ) {
       TQString identifier = item->resourceIdentifier();
-      if ( !identifier.contains( "/.INBOX.directory/" ) ) {
+      if ( !identifier.tqcontains( "/.INBOX.directory/" ) ) {
         KMessageBox::sorry(
           this,
           i18n( "Cannot rename someone else's calendar folder." ) );
@@ -708,7 +708,7 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint
 
     if ( item->isSubresource() &&
          ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) {
-      if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) {
+      if ( item->resourceIdentifier().tqcontains( "/.INBOX.directory/" ) ) {
         menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) );
       }
     } else {
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index ee4060272..304ab8c6f 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -69,7 +69,7 @@ class ResourceItem : public QCheckListItem
     void update();
 
     virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment);
+      int column, int width, int tqalignment);
 
     void setResourceColor(TQColor& color);
     TQColor &resourceColor() {return mResourceColor;}
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 2cc4bb442..b8b6ea1ea 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   mCalendar = calendar;
 
   TQFrame *topFrame = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint());
 
   // Search expression
   TQHBoxLayout *subLayout = new TQHBoxLayout();
-  layout->addLayout(subLayout);
+  tqlayout->addLayout(subLayout);
 
   searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default
   searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame );
@@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
 
   TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame );
-  layout->addWidget( itemsGroup );
+  tqlayout->addWidget( itemsGroup );
   mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup );
   mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup );
   mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup );
@@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Date range
   TQGroupBox *rangeGroup = new TQGroupBox( 1, Horizontal, i18n( "Date Range" ),
                                         topFrame );
-  layout->addWidget( rangeGroup );
+  tqlayout->addWidget( rangeGroup );
 
   TQWidget *rangeWidget = new TQWidget( rangeGroup );
   TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() );
@@ -89,7 +89,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   mEndDate = new KDateEdit( rangeWidget );
   rangeLayout->addWidget( new TQLabel( mEndDate, i18n("&To:"), rangeWidget ) );
-  mEndDate->setDate( TQDate::currentDate().addDays( 365 ) );
+  mEndDate->setDate( TQDate::tqcurrentDate().addDays( 365 ) );
   rangeLayout->addWidget( mEndDate );
 
   mInclusiveCheck = new TQCheckBox( i18n("E&vents have to be completely included"),
@@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   // Subjects to search
   TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame );
-  layout->addWidget(subjectGroup);
+  tqlayout->addWidget(subjectGroup);
 
   mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup );
   mSummaryCheck->setChecked( true );
@@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Results list view
   listView = new KOListView( mCalendar, topFrame );
   listView->showDates();
-  layout->addWidget( listView );
+  tqlayout->addWidget( listView );
 
   if ( KOPrefs::instance()->mCompactDialogs ) {
     KOGlobals::fitDialogToScreen( this, true );
diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui
index 093ff3c5a..606db9ec7 100644
--- a/korganizer/template_management_dialog_base.ui
+++ b/korganizer/template_management_dialog_base.ui
@@ -4,7 +4,7 @@
     
         TemplateManagementDialog_base
     
-    
+    
         
             0
             0
@@ -75,7 +75,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     51
@@ -86,7 +86,7 @@
 
 
 
-
+
 
     klistbox.h
 
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index fbc4c5125..9216108f6 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -56,7 +56,7 @@ Q_OBJECT
     /* Emitted whenever the user wants to add teh current incidence as a template
     with the given name. */
     void saveTemplate( const TQString& templateName );
-    /* Emitted when the dialog changed the list of templates. Calling code can the replace
+    /* Emitted when the dialog changed the list of templates. Calling code can the tqreplace
        the list that was handed in with the one this signal transports. */
     void templatesChanged( const TQStringList& templates );
     
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 81b53c1f6..53bc34588 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -197,7 +197,7 @@ void TimeLabels::updateConfig()
   sFont.setPointSize(  sFont.pointSize()/2 );
   TQFontMetrics fmS(   sFont );
   mMiniWidth += fmS.width(  test ) + frameWidth()*2+4 ;
-  // update geometry restrictions based on new settings
+  // update tqgeometry restrictions based on new settings
   setFixedWidth(  mMiniWidth );
 
   // update HourSize
@@ -237,14 +237,14 @@ void TimeLabels::setAgenda( KOAgenda* agenda )
 }
 
 
-/** This is called in response to repaint() */
+/** This is called in response to tqrepaint() */
 void TimeLabels::paintEvent(TQPaintEvent*)
 {
 //  kdDebug(5850) << "paintevent..." << endl;
   // this is another hack!
 //  TQPainter painter(this);
   //TQString c
-  repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
+  tqrepaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
 #include "timelabels.moc"
diff --git a/korn/account_input.cpp b/korn/account_input.cpp
index d75848052..feafbe86d 100644
--- a/korn/account_input.cpp
+++ b/korn/account_input.cpp
@@ -136,7 +136,7 @@ TQString ComboInput::value() const
 
 void ComboInput::setValue( const TQString& value )
 {
-	if( _list->contains( value ) )
+	if( _list->tqcontains( value ) )
 		_right->setCurrentItem( _list->keys().findIndex( value ) );
 	else
 		_right->setCurrentItem( -1 );
diff --git a/korn/account_input.h b/korn/account_input.h
index 548db498b..43e680477 100644
--- a/korn/account_input.h
+++ b/korn/account_input.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 #include 
 
 /**
- * This classe contains methods to use in the creation of the protocol configuration box.
+ * This classe tqcontains methods to use in the creation of the protocol configuration box.
  * The subclasses of this classes define the methods.
  */
 class AccountInput
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 4dec01904..c4976f232 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 {
 	KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" );
 		
-	TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
+	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
 			.arg( total ), "", TQPixmap(), 0 );
-	TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" );
+	TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" );
 	
-	TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" );
+	TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" );
 	TQFont font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
-	title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" );
+	title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" );
 	font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
 	if( date )
 	{
-		title = new TQLabel( i18n("Date"), mainglayout, "date_label" );
+		title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" );
 		font = title->font();
 		font.setBold( true );
 		title->setFont( font );
@@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 	
 	for( KornMailSubject* subject = list->first(); subject; subject = list->next() )
 	{
-		new TQLabel( subject->getSender(), mainglayout, "from-value" );
-		new TQLabel( subject->getSubject(), mainglayout, "subject-value" );
+		new TQLabel( subject->getSender(), maingtqlayout, "from-value" );
+		new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" );
 		if( date )
 		{
 			TQDateTime tijd;
 			tijd.setTime_t( subject->getDate() );
-			new TQLabel( tijd.toString(), mainglayout, "date-value" );
+			new TQLabel( tijd.toString(), maingtqlayout, "date-value" );
 		}
 	}
 	
 	popup->setAutoDelete( true ); //Now, now care for deleting these pointers.
 	
-	popup->setView( mainvlayout );
+	popup->setView( mainvtqlayout );
 	
 	popup->show(); //Display it
 }
@@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
 		if( _fonts[ index ] )
 			label->setFont( *_fonts[ index ] );
 		label->setPaletteForegroundColor( *_fgColour[ index ] );
-		label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+		label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
 		label->setText( TQString::number( count ) );
 	}
 	
@@ -358,7 +358,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 		for( int yy = 0; yy < numberImage.width(); ++yy )
 		{
 			//Set colour and alpha channel
-			rgbline[ yy ] = qRgba( fgColour.red(), fgColour.green(), fgColour.blue(), qRed( rgbline[ yy ] ) ); 
+			rgbline[ yy ] = tqRgba( fgColour.red(), fgColour.green(), fgColour.blue(), tqRed( rgbline[ yy ] ) ); 
 		}
 	}
 
@@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 
 void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim )
 {
-	label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+	label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
 	label->setMovie( TQMovie( anim ) );
 	label->show();
 }
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index 86a4efc93..06c02993b 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -68,7 +68,7 @@ public:
 	/**
 	 * This function reads the config. It stores the readed values in the class.
 	 * It also sets the DCOPObject-name.
-	 * @param config The KConfigGroup-object which contains the configuration of this box.
+	 * @param config The KConfigGroup-object which tqcontains the configuration of this box.
 	 * @param index The index of the box used in the config-file
 	 */
 	virtual void readConfig( KConfig* config, const int index );
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 407a6ff06..7eb8d2a06 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -74,7 +74,7 @@ bool DCOPDrop::readConfigGroup( const KConfigGroup &cfg )
 
 bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Protocol * )
 {
-	if( !map.contains( "dcopname" ) )
+	if( !map.tqcontains( "dcopname" ) )
 		//The mapping MUST contain dcopname.
 		kdDebug() << "mapping is niet compleet" << endl;
 
@@ -125,7 +125,7 @@ bool DCOPDrop::deleteMails( TQPtrList * ids, bool * )
 	for( const KornMailId *it = ids->first(); it; it = ids->next() )
 	{
 		const KornIntId* id = dynamic_cast< const KornIntId* >( it );
-		if( _msgList->contains( id->getId() ) )
+		if( _msgList->tqcontains( id->getId() ) )
 			_msgList->erase( id->getId() );
 	}
 	
@@ -162,7 +162,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
 	mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) );
 	mailsubject->setHeader( message, true );
 	mailsubject->setSize( message.length() );
-	mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() );
+	mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() );
 	
 	_msgList->insert( id->getId(), mailsubject );
 	
@@ -173,7 +173,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
 
 bool DCOPDrop::removeMessage( int id )
 {
-	if( ! _msgList->contains( id ) )
+	if( ! _msgList->tqcontains( id ) )
 		return false;
 	
 	delete (*_msgList)[ id ];
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index 124d197e6..c14953f02 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -93,7 +93,7 @@ public:
 	/**
 	 * This function reeds the config which are shipped which the group.
 	 *
-	 * @param config The configuration group which contains the info for this account.
+	 * @param config The configuration group which tqcontains the info for this account.
 	 * @return The same value as KMailDrop::readConfigGroup( config ) returns.
 	 */
 	virtual bool readConfigGroup( const KConfigGroup& config );
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index ae6689f80..13cce3af1 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -57,7 +57,7 @@ public:
 	 * This functions reads the config. It used the parent
 	 * version for the main things, but it is possible to
 	 * add some configurations over here.
-	 * @param config The KConfig-instance which contains the settings of this tray-item.
+	 * @param config The KConfig-instance which tqcontains the settings of this tray-item.
 	 * @param index The index of the box in the configuration file
 	 */
 	virtual void readConfig( KConfig* config, const int index );
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index caedb4597..735f5de6d 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -65,18 +65,18 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
+	if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
-	if( metadata->contains( "tls" ) )
+	if( metadata->tqcontains( "tls" ) )
 		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
-	if( metadata->contains( "auth" ) )
+	if( metadata->tqcontains( "auth" ) )
 		map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) );
 }
 
 void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQString metadata;
-	if( map->contains( "encryption" ) )
+	if( map->tqcontains( "encryption" ) )
 	{
 		if( *map->find( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
@@ -88,7 +88,7 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 		map->erase( "encryption" );
 	}
 
-	if( map->contains( "auth" ) )
+	if( map->tqcontains( "auth" ) )
 	{
 		if( !metadata.isEmpty() )
 			metadata += ",";
diff --git a/korn/imap_proto.h b/korn/imap_proto.h
index 97fb209ad..451742eb7 100644
--- a/korn/imap_proto.h
+++ b/korn/imap_proto.h
@@ -134,7 +134,7 @@ public:
 	 * This function edits writeEntry. It merge things back to a metadata-key and adds this
 	 * key to the configuration.
 	 *
-	 * @param map The mapping which contains the information to be written to a configuarion file.
+	 * @param map The mapping which tqcontains the information to be written to a configuarion file.
 	 *	the contents of this mapping can change in this function.
 	 */
         virtual void writeEntries( TQMap< TQString, TQString >* map ) const;
diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp
index 08ca732bd..9f2751815 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/kconf_update/korn-3-4-config_change.cpp
@@ -188,7 +188,7 @@ int main( int, char**  )
 		}
 		else if( currentGroup1.isNull() || !isKey )
 			continue;
-		if( mapping1.contains( key_value.cap( 1 ) ) )
+		if( mapping1.tqcontains( key_value.cap( 1 ) ) )
 		{
 			out << currentGroup1 << endl;
 			out << mapping1[ key_value.cap( 1 ) ] << "=" << key_value.cap( 2 ) << endl;
@@ -198,7 +198,7 @@ int main( int, char**  )
 				out << "name=" << key_value.cap( 2 ) << endl;
 			}
 		}
-		else if( mapping2.contains( key_value.cap( 1 ) ) )
+		else if( mapping2.tqcontains( key_value.cap( 1 ) ) )
 		{
 			to_printed.insert( key_value.cap( 1 ), key_value.cap( 2 ) );
 		}
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 8015595c0..6fdacdcd6 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -180,11 +180,11 @@ void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int
 	_ssl = ssl;
 	
 	//Checking for authentication-settings.
-	//if( _metadata->contains("auth") )
+	//if( _metadata->tqcontains("auth") )
 	//{
 	//	auth = (*_metadata)["auth"];
 	//	*_metadata = metadata;
-	//	if( ! _metadata->contains("auth") )
+	//	if( ! _metadata->tqcontains("auth") )
 	//		(*_metadata)["auth"] = auth;
 	//} else
 	*_metadata = metadata;
@@ -201,7 +201,7 @@ void KKioDrop::setUser(const TQString & user, const TQString & password,
 	_kurl->setPath( mailbox );
 	if( ! auth.isEmpty() && auth != "Plain" )
 		(*_metadata)["auth"] = auth;
-	else if( _metadata->contains( "auth" ) )
+	else if( _metadata->tqcontains( "auth" ) )
 		_metadata->erase( "auth" );
 
 	_valid = _kurl->isValid();
@@ -241,7 +241,7 @@ TQString KKioDrop::mailbox() const
 }
 TQString KKioDrop::auth() const
 {
-	return ( _metadata->contains("auth")?(*_metadata)["auth"]:"" );
+	return ( _metadata->tqcontains("auth")?(*_metadata)["auth"]:"" );
 }
 
 void KKioDrop::recheck()
@@ -337,8 +337,8 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 {
 	TQString val, val2;
 
-	if( !map.contains( "server" ) || !map.contains( "port" ) || !map.contains( "ssl" ) || !map.contains( "username" ) ||
-	    !map.contains( "mailbox" ) || !map.contains( "password" ) || !map.contains( "metadata" ) || !map.contains( "name" ) )
+	if( !map.tqcontains( "server" ) || !map.tqcontains( "port" ) || !map.tqcontains( "ssl" ) || !map.tqcontains( "username" ) ||
+	    !map.tqcontains( "mailbox" ) || !map.tqcontains( "password" ) || !map.tqcontains( "metadata" ) || !map.tqcontains( "name" ) )
 	{
 		kdWarning() << "Bug: map niet compleet" << endl;
 		return false;
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index d97fa1e92..71da3080b 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -259,7 +259,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 	for ( it1 = list.begin() ; it1 != list.end() ; it1++ )
 	{
 		/*
-		 * The list contains multiple objects. Each object could be a file.
+		 * The list tqcontains multiple objects. Each object could be a file.
 		 * Settings about it are saved in this scope until it is added to the list.
 		 */
 		isFile=false;
@@ -292,7 +292,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 		if( ! fileinfo.name.isNull() && isFile )
 		{
 			_new_mailurls->append( fileinfo );
-			if( ! old_list.contains( fileinfo.name ) && _kio->passivePopup() )
+			if( ! old_list.tqcontains( fileinfo.name ) && _kio->passivePopup() )
 				showPassive( fileinfo.name );
 		}
 	}
diff --git a/korn/kio_count.h b/korn/kio_count.h
index d8df7dc0e..a881d4101 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -25,7 +25,7 @@
 
 #include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template)
 
-#include  //FIXME: without this, moc-compiler fails.
+#include  //FIXME: without this, tqmoc-compiler fails.
 
 class KIO_Protocol;
 class KIO_Single_Subject;
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index 8434fe44b..5177a2f3c 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -63,7 +63,7 @@ void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQMap< TQString, TQString> *metadata = new TQMap< TQString, TQString >;
 
-	if( map->contains( "metadata" ) )
+	if( map->tqcontains( "metadata" ) )
 	{
 		TQStringList list = TQStringList::split( ",", *map->find( "metadata" ) );
 		TQStringList::Iterator it;
diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui
index 18b068291..15afffef5 100644
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@@ -4,7 +4,7 @@
     
         KornAccountCfg
     
-    
+    
         
             0
             0
@@ -31,7 +31,7 @@
                     
                         lbProtocol
                     
-                    
+                    
                         
                             11
                             41
@@ -50,7 +50,7 @@
                     
                         cbProtocol
                     
-                    
+                    
                         
                             223
                             41
@@ -73,7 +73,7 @@
                     
                     
                         
-                            layout35
+                            tqlayout35
                         
                         
                             
@@ -137,7 +137,7 @@
                             
                             
                                 
-                                    layout33
+                                    tqlayout33
                                 
                                 
                                     
@@ -237,7 +237,7 @@
 
     slotProtocolChanged( const QString& )
 
-
+
 
     kurlrequester.h
     klineedit.h
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 4a8af84e9..5b7706e1d 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
 	_urlfields( 0 ),
 	_boxnr( 0 ),
 	_accountnr( 0 ),
-	_vlayout( 0 ),
+	_vtqlayout( 0 ),
 	_protocolLayout( 0 ),
 	_groupBoxes( 0 ),
 	_accountinput( new TQPtrList< AccountInput >() )
@@ -80,7 +80,7 @@ void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQSt
 	(*entries)[ "password" ] = KOrnPassword::readKOrnPassword( boxnr, accountnr, *config );
 	
 	for( input = _accountinput->first(); input; input = _accountinput->next() )
-		if( entries->contains( input->configName() ) )
+		if( entries->tqcontains( input->configName() ) )
 			input->setValue( *(entries->find( input->configName() ) ) );
 	
 	this->edInterval->setText( _config->readEntry( "interval", "300" ) );
@@ -115,7 +115,7 @@ void KornAccountCfgImpl::writeConfig()
 
 	protocol->writeEntries( map );
 
-	if( map->contains( "password" ) )
+	if( map->tqcontains( "password" ) )
 	{
 		KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->find( "password" ) );
 		map->erase( "password" );
@@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	_accountinput->clear();
 	delete _groupBoxes;
 	delete _protocolLayout;
-	delete _vlayout;
-	_vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
-	_vlayout->setSpacing( 10 );
-	_vlayout->setMargin( 10 );
+	delete _vtqlayout;
+	_vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
+	_vtqlayout->setSpacing( 10 );
+	_vtqlayout->setMargin( 10 );
 
-	_protocolLayout = new TQHBoxLayout( _vlayout );
+	_protocolLayout = new TQHBoxLayout( _vtqlayout );
 	_protocolLayout->addWidget( this->lbProtocol );
 	_protocolLayout->addWidget( this->cbProtocol );
 
@@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it )
 	{
 		_groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) );
-		_vlayout->addWidget( _groupBoxes->at( counter ) );
+		_vtqlayout->addWidget( _groupBoxes->at( counter ) );
 		++counter;
 	}
 	delete groupBoxes;
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 27464f8b1..9be27bc6f 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -59,7 +59,7 @@ private:
 	int _urlfields;
 	int _boxnr, _accountnr;
 		
-	TQVBoxLayout *_vlayout;
+	TQVBoxLayout *_vtqlayout;
 	TQHBoxLayout *_protocolLayout;
 	TQPtrVector< TQWidget > *_groupBoxes;
 	
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 4b61ee06f..3f69aabf5 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -4,7 +4,7 @@
     
         KornBoxCfg
     
-    
+    
         
             0
             0
@@ -33,7 +33,7 @@
                     
                     
                         
-                            layout32
+                            tqlayout32
                         
                         
                             
@@ -69,7 +69,7 @@
                     
                     
                         
-                            layout34
+                            tqlayout34
                         
                         
                             
@@ -124,7 +124,7 @@
                     
                     
                         
-                            layout33
+                            tqlayout33
                         
                         
                             
@@ -161,13 +161,13 @@
                         
                             Normal
                         
-                        
+                        
                             AlignCenter
                         
                     
                     
                         
-                            layout36
+                            tqlayout36
                         
                         
                             
@@ -201,7 +201,7 @@
                         
                             New Mail
                         
-                        
+                        
                             AlignCenter
                         
                     
@@ -215,7 +215,7 @@
                     
                     
                         
-                            layout31
+                            tqlayout31
                         
                         
                             
@@ -251,7 +251,7 @@
                     
                     
                         
-                            layout35
+                            tqlayout35
                         
                         
                             
@@ -288,7 +288,7 @@
                         
                             Expanding
                         
-                        
+                        
                             
                                 41
                                 160
@@ -297,7 +297,7 @@
                     
                     
                         
-                            layout29
+                            tqlayout29
                         
                         
                             
@@ -326,7 +326,7 @@
                     
                     
                         
-                            layout28
+                            tqlayout28
                         
                         
                             
@@ -371,7 +371,7 @@
                     
                     
                         
-                            layout28_2
+                            tqlayout28_2
                         
                         
                             
@@ -400,7 +400,7 @@
                     
                     
                         
-                            layout29_2
+                            tqlayout29_2
                         
                         
                             
@@ -442,7 +442,7 @@
                     
                     
                         
-                            layout31
+                            tqlayout31
                         
                         
                             
@@ -455,13 +455,13 @@
                                 
                                     Left
                                 
-                                
+                                
                                     AlignCenter
                                 
                             
                             
                                 
-                                    layout52_7
+                                    tqlayout52_7
                                 
                                 
                                     
@@ -477,7 +477,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -502,7 +502,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -518,13 +518,13 @@
                                 
                                     Right
                                 
-                                
+                                
                                     AlignCenter
                                 
                             
                             
                                 
-                                    layout52
+                                    tqlayout52
                                 
                                 
                                     
@@ -540,7 +540,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -565,7 +565,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -576,7 +576,7 @@
                             
                             
                                 
-                                    layout52_4
+                                    tqlayout52_4
                                 
                                 
                                     
@@ -592,7 +592,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -617,7 +617,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -628,7 +628,7 @@
                             
                             
                                 
-                                    layout52_9
+                                    tqlayout52_9
                                 
                                 
                                     
@@ -644,7 +644,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -669,7 +669,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -680,7 +680,7 @@
                             
                             
                                 
-                                    layout52
+                                    tqlayout52
                                 
                                 
                                     
@@ -696,7 +696,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -721,7 +721,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -745,13 +745,13 @@
                                 
                                     Mousebutton
                                 
-                                
+                                
                                     AlignCenter
                                 
                             
                             
                                 
-                                    layout52_9
+                                    tqlayout52_9
                                 
                                 
                                     
@@ -767,7 +767,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -792,7 +792,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -803,7 +803,7 @@
                             
                             
                                 
-                                    layout52_5
+                                    tqlayout52_5
                                 
                                 
                                     
@@ -819,7 +819,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -844,7 +844,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -860,13 +860,13 @@
                                 
                                     Middle
                                 
-                                
+                                
                                     AlignCenter
                                 
                             
                             
                                 
-                                    layout52_5
+                                    tqlayout52_5
                                 
                                 
                                     
@@ -882,7 +882,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -907,7 +907,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -926,7 +926,7 @@
                             
                             
                                 
-                                    layout52_8
+                                    tqlayout52_8
                                 
                                 
                                     
@@ -942,7 +942,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -967,7 +967,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -986,7 +986,7 @@
                             
                             
                                 
-                                    layout52_7
+                                    tqlayout52_7
                                 
                                 
                                     
@@ -1002,7 +1002,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -1027,7 +1027,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -1046,7 +1046,7 @@
                             
                             
                                 
-                                    layout52_5
+                                    tqlayout52_5
                                 
                                 
                                     
@@ -1062,7 +1062,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -1087,7 +1087,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -1098,7 +1098,7 @@
                             
                             
                                 
-                                    layout52_3
+                                    tqlayout52_3
                                 
                                 
                                     
@@ -1114,7 +1114,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -1139,7 +1139,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -1150,7 +1150,7 @@
                             
                             
                                 
-                                    layout52_6
+                                    tqlayout52_6
                                 
                                 
                                     
@@ -1166,7 +1166,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -1191,7 +1191,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -1202,7 +1202,7 @@
                             
                             
                                 
-                                    layout52_7
+                                    tqlayout52_7
                                 
                                 
                                     
@@ -1218,7 +1218,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -1243,7 +1243,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -1262,7 +1262,7 @@
                             
                             
                                 
-                                    layout52_9
+                                    tqlayout52_9
                                 
                                 
                                     
@@ -1278,7 +1278,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 20
@@ -1303,7 +1303,7 @@
                                         
                                             Expanding
                                         
-                                        
+                                        
                                             
                                                 21
                                                 21
@@ -1316,7 +1316,7 @@
                     
                     
                         
-                            layout31_3
+                            tqlayout31_3
                         
                         
                             
@@ -1356,7 +1356,7 @@
                             
                             
                                 
-                                    layout33
+                                    tqlayout33
                                 
                                 
                                     
@@ -1677,7 +1677,7 @@
     slotNormalAnimToggled( bool )
     slotNewAnimToggled( bool )
 
-
+
 
     kcolorbutton.h
     kcolorbutton.h
diff --git a/korn/korncfg.ui b/korn/korncfg.ui
index 46a812a56..b1b553073 100644
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@@ -4,7 +4,7 @@
     
         KornCfgWidget
     
-    
+    
         
             0
             0
@@ -172,5 +172,5 @@
     slotSetDefaults( const QString&, const int, KConfig* )
     slotEditBox()
 
-
+
 
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index ae49765cf..df4264643 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -198,10 +198,10 @@ void KornCfgImpl::readConfig()
 {
 	_config->setGroup( "korn" );
 	
-	TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper();
-	if( layout == TQChar( 'H' ) )
+	TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper();
+	if( tqlayout == TQChar( 'H' ) )
 		rbHorizontal->setChecked( true );
-	else if( layout == TQChar( 'V' ) )
+	else if( tqlayout == TQChar( 'V' ) )
 		rbVertical->setChecked( true );
 	else
 		rbDocked->setChecked( true );
@@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig()
 	_config->setGroup( "korn" );
 	
 	if( rbHorizontal->isChecked() )
-		_config->writeEntry( "layout", "Horizontal" );
+		_config->writeEntry( "tqlayout", "Horizontal" );
 	if( rbVertical->isChecked() )
-		_config->writeEntry( "layout", "Vertical" );
+		_config->writeEntry( "tqlayout", "Vertical" );
 	if( rbDocked->isChecked() )
-		_config->writeEntry( "layout", "Docked" );
+		_config->writeEntry( "tqlayout", "Docked" );
 
 	//Default is 'false' here, because if no option is set, KWallet isn't used.
 	if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() )
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 4fccd0754..553cac421 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -95,12 +95,12 @@ void KornShell::readConfig()
 	static bool shownConfig = false;
 	
 	_config->setGroup( "korn" );
-	TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper();
+	TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper();
 	KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
 	
-	if( layout == 'H' )
+	if( tqlayout == 'H' )
 		_box = new HVContainer( Qt::Horizontal, this, "horizontal container" );
-	else if( layout == 'V' )
+	else if( tqlayout == 'V' )
 		_box = new HVContainer( Qt::Vertical, this, "vertical container" );
 	else
 		_box = new DockedContainer( this, "docked container" );
@@ -135,14 +135,14 @@ void KornShell::slotDialogClosed()
 	_configDialog->deleteLater(); _configDialog = 0;
 
 	//At this time, just delete all widgets and make a new one.
-	//Maybe, this should replaces later by a better variant.
+	//Maybe, this should tqreplaces later by a better variant.
 	slotApply();
 }
 
 void KornShell::slotApply()
 {
 	//At this time, just delete all widgets and make a new one.
-	//Maybe, this should replaces later by a better variant.
+	//Maybe, this should tqreplaces later by a better variant.
 	
 	delete _box; _box = 0;
 
diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h
index 2ce5e9dbb..0023cfdc0 100644
--- a/korn/maildir_proto.h
+++ b/korn/maildir_proto.h
@@ -47,7 +47,7 @@ public:
 	virtual TQString serverName() const { return i18n( "Path:" ); }
 
 	virtual void recheckKURL( KURL &kurl, KIO::MetaData & )
-	                               { kurl.setPath( kurl.host() + "/." + kurl.path().replace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
+	                               { kurl.setPath( kurl.host() + "/." + kurl.path().tqreplace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
 	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) { }
 	virtual void deleteMailKURL( KURL &, KIO::MetaData & )  { }
 	virtual void readMailKURL( KURL &, KIO::MetaData & )    { }
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index 086796c8a..3424e19e4 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -43,12 +43,12 @@ void KornMailDlg::showFullMessage()
 	// this should show it even if the mailbox does not support progress bars
 	_progress->setTotalSteps(1000);
 	_progress->setProgress(1);
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	// connect the mailbox with the progress dialog in case it supports progress bars
 	connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int)));
 	connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int)));
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	// connect the mailbox's cancel button
 	connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled()));
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 4052c8c3b..b15ec973a 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -358,7 +358,7 @@ signals:
     
     /**
      * The next signal is emitted when a passive popup could be displayed.
-     * As argument, there is a KornSubject, which contains a subject and
+     * As argument, there is a KornSubject, which tqcontains a subject and
      * some more info that could be used with the popup.
      */
     void showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& realname );
diff --git a/korn/mailsubject.h b/korn/mailsubject.h
index 75f0571f0..3e85b69e2 100644
--- a/korn/mailsubject.h
+++ b/korn/mailsubject.h
@@ -47,7 +47,7 @@ public:
 	KornMailSubject(const KornMailSubject & src);
 
 	/**
-	 * replaces the contents of this by the contents of another
+	 * tqreplaces the contents of this by the contents of another
 	 * KornMailSubject instance.  All data of the source
 	 * KornMailSubject instance are cloned.
 	 * @param src KornMailSubject to copy from
@@ -92,7 +92,7 @@ public:
 	/**
 	 * Set the mails header and (if possible) body.
 	 * @param header the mails header with or without body (see fullMessage parameter).
-	 * @param fullMessage true, if header contains the message body as well, false otherwise.
+	 * @param fullMessage true, if header tqcontains the message body as well, false otherwise.
 	 */
 	void setHeader(const TQString & header, bool fullMessage) {_header = header; _fullMessage = fullMessage;}
 
@@ -103,8 +103,8 @@ public:
 	const TQString & getHeader() const {return _header;}
 
 	/**
-	 * Return true, if the header contains the header and the full message.
-	 * Return false if the header just contains the header.
+	 * Return true, if the header tqcontains the header and the full message.
+	 * Return false if the header just tqcontains the header.
 	 * @return see above.
 	 */
 	bool isHeaderFullMessage() const {return _fullMessage;}
diff --git a/korn/password.cpp b/korn/password.cpp
index 764b90f98..f0ae5d8f3 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc )
 {
 	TQString result;
 	for (uint i = 0; i < enc.length(); i++)
-		result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode());
+		result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode());
 
 	return result;
 }
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index b42a63ec2..6f9046144 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -64,18 +64,18 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
+	if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
-	if( metadata->contains( "tls" ) )
+	if( metadata->tqcontains( "tls" ) )
 		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
-	if( metadata->contains( "auth" ) )
+	if( metadata->tqcontains( "auth" ) )
 		map->insert( "auth", TQString( "auth=APOP" ) );
 }
 
 void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQString metadata;
-	if( map->contains( "encryption" ) )
+	if( map->tqcontains( "encryption" ) )
 	{
 		if( *map->find( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
@@ -87,7 +87,7 @@ void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 		map->erase( "encryption" );
 	}
 
-	if( map->contains( "auth" ) )
+	if( map->tqcontains( "auth" ) )
 	{
 		if( !metadata.isEmpty() && ! (*map->find( "auth" )).isEmpty() )
 			metadata += ",";
diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h
index c828e595f..feaed812b 100644
--- a/korn/pop3_proto.h
+++ b/korn/pop3_proto.h
@@ -44,8 +44,8 @@ public:
 
 	virtual TQStringList authList() const { return TQStringList::split( '|', "Plain|APOP", false ); }
 	
-	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
-	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
+	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/headers/" ) ); }
+	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/remove/" ) ); }
 	virtual bool commitDelete () const { return true; }
 	virtual void deleteCommitKURL(KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "commit" ); }
 
diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui
index 6e6b53fad..d21ecee24 100644
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@@ -4,7 +4,7 @@
     
         DoubleProgressDialog
     
-    
+    
         
             0
             0
@@ -39,7 +39,7 @@
         
         
             
-                layout1
+                tqlayout1
             
             
                 
@@ -55,7 +55,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             41
                             20
@@ -80,7 +80,7 @@
                     
                         Expanding
                     
-                    
+                    
                         
                             41
                             31
@@ -116,5 +116,5 @@
     setProgress( int number )
     cancelbutton()
 
-
+
 
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index f16d3a913..b001f776a 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -60,8 +60,8 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_loadSubjectsCanceled = false;
 	setModal( true );
 
-	// The dialog contains a list view and several buttons.
-	// Two box layouts hol dthem.
+	// The dialog tqcontains a list view and several buttons.
+	// Two box tqlayouts hol dthem.
 	TQWidget * page = new TQWidget( this );
 	setMainWidget(page);
 	invertSelButton = new KPushButton(i18n("&Invert Selection"), page);
@@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_list->addColumn(i18n("Date"));
 	_list->addColumn(i18n("Size (Bytes)"));
 
-	// column 3 contains a number (change alignment)
+	// column 3 tqcontains a number (change tqalignment)
 	_list->setColumnAlignment(3, Qt::AlignRight);
 	_list->setItemMargin(3);
 
diff --git a/korn/systemtray.h b/korn/systemtray.h
index 2387ea7c2..83daaeb3d 100644
--- a/korn/systemtray.h
+++ b/korn/systemtray.h
@@ -47,7 +47,7 @@ protected:
 	/**
 	 * Reimplementation because in the reimplementation of KSystray it popup's of restores.
 	 * In this implemention, the action depends on the settings.
-	 * @param me An object which contains the mousebutton which is pressed.
+	 * @param me An object which tqcontains the mousebutton which is pressed.
 	 */
 	virtual void mousePressEvent( TQMouseEvent* me );
 	
diff --git a/kpilot/.emacs-dirvars b/kpilot/.emacs-dirvars
deleted file mode 100644
index beac4cb1f..000000000
--- a/kpilot/.emacs-dirvars
+++ /dev/null
@@ -1,7 +0,0 @@
-;; -*- emacs-lisp -*-
-;;
-;; This file is processed by the dirvars emacs package.  Each variable
-;; setting below is performed when this dirvars file is loaded.
-;;
-indent-tabs-mode: t
-tab-width: 4
diff --git a/kpilot/AUTHORS b/kpilot/AUTHORS
deleted file mode 100644
index 6d1d418d2..000000000
--- a/kpilot/AUTHORS
+++ /dev/null
@@ -1,29 +0,0 @@
-KPilot was written by Dan Pilone.  It is currently under
-active development by a worldwide group of contributors.
-Adriaan de Groot and Reinhold Kainhofe are currently the maintainers.
-
-
-o Jason 'vanRijn' Kasper is prime motivator in 2006.
-o The vcal and todo conduit were originally written by Preston Brown.
-o The popclient conduit was written by Michael Kropfberger.
-o The null conduit and KNotes conduit were written by Adriaan de Groot.
-o The XML GUI stuff was written by Martin Junius.
-o Philipp Hullmann fixed many bugs in the todo conduit.
-o David Bishop converted most of the UI to Qt Designer .ui.
-o Reinhold Kainhofer fixed and extended the VCal conduits when it was 
-  really needed.
-o The addressbook conduit was rewritten by R. Kainhofer to use libkabc 
-o The time conduit, the MAL conduit (AvantGo) and the PalmDOC conduit 
-  were also written by R. Kainhofer
-o Aaron J. Seigo, Jorg Habenicht, and others contributed too.
-o David Mott contributed useful extra features.
-
-For more information, see the About box or:
-http://www.kpilot.org/
-
--- Dan Pilone 5/30/99
--- Adriaan de Groot April 14th 2001
--- Adriaan de Groot January 20th 2002
--- Reinhold Kainhofer, April 5th 2003
--- Adriaan de Groot, March 4th 2004
--- Adriaan de Groot, November 18th 2006
diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt
deleted file mode 100644
index aae086ce5..000000000
--- a/kpilot/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-project(kpilot)
-
-if(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-	include(${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-else(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-	message(FATAL_ERROR "CMakeOptions.txt not found! Run configure first.")
-endif(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-
-# Search our own cmake modules path first
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
-
-# Need 2.4.3 for its KDE3 support
-# Need 2.4.4 for its fixed KDE3 support
-cmake_minimum_required(VERSION 2.4.4)
-
-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
-# Disallow in-source build
-STRING(COMPARE EQUAL "${kpilot_SOURCE_DIR}" "${kpilot_BINARY_DIR}" insource)
-if(insource)
-	MESSAGE(FATAL_ERROR 
-		"KPilot requires an out of source build. Please create a separate build
-directory and run 'cmake path_to_kpilot [options]' there."
-	)
-endif(insource)
-
-find_package(Qt3 REQUIRED) # find and setup Qt3 for this project
-find_package(KDE3 REQUIRED) # find and setup KDE3 for this project
-find_package(Pilotlink REQUIRED)
-find_package(Mal) # see if mal is available, but it's not required
-
-add_definitions(
-	${QT_DEFINITIONS}
-	${KDE3_DEFINITIONS}
-	-DQT_THREAD_SUPPORT
-)
-
-STRING(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "debug" builddebug)
-if (NOT builddebug)
-	add_definitions(-DNDEBUG)
-endif(NOT builddebug)
-
-
-# Get the kde3 dir. This is a bit tricky, i'm not sure how well
-# this works on other systems.
-STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR})
-
-# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $KDEDIR
-if(NOT CMAKE_INSTALL_PREFIX)
-	set(CMAKE_INSTALL_PREFIX ${KDE3_DIR})
-endif(NOT CMAKE_INSTALL_PREFIX)
-set(KDE3_KCFG_DIR ${CMAKE_INSTALL_PREFIX}/share/config.kcfg)
-set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes)
-set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services)
-set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde)
-set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3)
-
-# tell cmake where to search for libraries:
-link_directories(${KDE3_LIB_DIR})
-
-# tell cmake where to search for Qt/KDE headers:
-include_directories(${PILOTLINK_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
-
-# include custom macros
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/modules/KPilotCustom.cmake)
-
-# tell cmake to process CMakeLists.txt in that subdirectory
-add_subdirectory(lib)
-add_subdirectory(kpilot)
-add_subdirectory(conduits)
-
-
-STRING(COMPARE EQUAL "${ENABLE_TESTS}" "YES" buildtests)
-if (buildtests)
-	MESSAGE(STATUS "BUILD: Test suite enabled.")
-	enable_testing()
-	add_subdirectory(tests)
-else (buildtests)
-	MESSAGE(STATUS "BUILD: Test suite disabled.")
-endif(buildtests)
-
-if (builddebug)
-	MESSAGE(STATUS "BUILD: Debug build selected.")
-else(builddebug)
-	MESSAGE(STATUS "BUILD: Normal build selected.")
-endif(builddebug)
-
-MESSAGE(STATUS "BUILD: Install prefix set to ${CMAKE_INSTALL_PREFIX} .")
-
diff --git a/kpilot/COPYING b/kpilot/COPYING
deleted file mode 100644
index 7c3158817..000000000
--- a/kpilot/COPYING
+++ /dev/null
@@ -1,355 +0,0 @@
-[KPilot is licensed under the terms of this GNU GENERAL PUBLIC LICENSE, 
-except for the following parts which are licenced under the GNU LESSER
-GENERAL PUBLIC LICENSE:
-
-* The contents of the lib/ directory under this directory (ie. kpilot/lib/),
-to allow plugins with non-GPL yet LGPL-compatible licenses to be written.
-
-* The NULL conduit in conduits/null/, so that it can serve as a development
-example even for non-GPL conduits.
-
-* The malconduit in conduits/malconduit/ is licensed under the GPL with the
-  additional specific permission for the code to be linked to libmal, 
-	which is released under the Mozilla Public License (MPL).
-  This is necessary because the libmal license is not GPL-compatible.
-]
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C) 19yy  
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  , 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/kpilot/ChangeLog b/kpilot/ChangeLog
deleted file mode 100644
index 01da1b8d9..000000000
--- a/kpilot/ChangeLog
+++ /dev/null
@@ -1,4220 +0,0 @@
-** KPILOT CHANGELOG **
-======================
-
-TODO: Figure out why archived records are bad.
-	[23:07]  Now i'm hunting why new entries on the palm are dropped and
-	               deletes from the palm as well.
-	[23:44]  [ade]: Hm, I delete a task on the palm, sync, and the
-	               record->isDeleted() is false, on sync, but it is modified and
-	               updated on the pc, although that does not change anything.
-
-TODO: store map of pilot-id <-> uid elsewhere (not in the .vcf file)
-TODO: don't make ActionQueue auto-delete the actions in it.
-TODO: provide template-based, interpreted databases much like the
-      AppInfo classes now have.
-TODO: give the knotes conduit a decent test mode.
-TODO: only re-write a local database if it is changed.
-
-2007-12-30  Jason 'vanRijn' Kasper
-* Fixing bug reported by Pablo Yepes on kdepim-users mailing list. We did
-  severe goofiness with middle names... The Palm can't handle them, so we
-  blindly tacked firstname + " " + lastname and stuck it into the Palm's
-  firstname field. The problem is that whenever a copy from palm->pc is
-  done, the kludged first name is transferred to kabc ("firstname middle").
-  And, it's compounded by every change in either direction. It's an ugly
-  hack and I've removed it. The only way to work around it would be to add
-  an additional check for !firstname.endsWith(abEntry.additionalName()),
-  but that's even sillier. Stop the insanity!
-
-2007-12-17  Jason 'vanRijn' Kasper
-* Woot! Fixing major breakage for funky usb devices.  pulled back some
-  removed code from KDE 3.5.6's kpilot for usb workaround code and fit it
-  into the new threaded model.  This fixes syncing for me on my Palm Treo
-  700p.
-* Reformatting and cleaning up kpilotdevicelink.cc.
-* New Private.h to hold the bits of kpilotdevicelink.cc that should not be
-  exposed via kpilotdevicelink.h.  Also, DeviceCommThread extends QObject
-  and QThread, so we need to have automoc run on it.
-* Switching from using QCustomEvent to using QEvent for device tickle
-  thread to match what is done in kpilotdevicelink.  
-
-2007-04-15  Jason 'vanRijn' Kasper
-* merging all development and bug fixes from kdepim-3.5.5+ branch into
-  stable branches/KDE/3.5 in preparation for KDE 3.5.7
-* cmake cleanups
-* namespacing and cleanups in sysinfoconduit
-* lots of debugging cleanups.  remove #ifdef DEBUG from much of the code.
-* cleanups in memofile conduit.  now try to use new (OS5) database
-  (MemosDB-PMem) if it's found, otherwise fall back to the legacy one
-  (MemoDB)
-* as a first step to combatting the "kpilot ate my future" e-mails (read:
-  data loss), we now use a CUDCounter (Create/Update/Delete). step 1 is to
-  track these and report on them to the user in their sync log.  step 2 is
-  to catch ill behavior and prompt the user as to whether or not to allow
-  kpilot to make the large amount of changes.  step 3 is to allow the user
-  to configure the count or percentage of changes that kpilot can make
-  without his/her confirmation.  step 1 is done. we'll approach steps 2 and
-  3 post kde 3.5.7.
-* new strings related to the above
-* bug fixing in popconduit... making sure we always have a sent date
-* Bertjan has the start of knotes cleanup going on
-* bug fixing in vcalconduit... long-time bug that existed in libkcal that
-  caused every calendar resource save to mark every calendar event as
-  modified.  now kpilot won't have to sync every record every time.
-* bug fixing kabc resource problems in abbrowser conduit.  although it's
-  not documented in kabc, it looks like we should be removing a local
-  resource from the address book before we delete it.
-* bringing mal conduit back alive again.  none of our small band of merry
-  men use it, though, so it may or may not actually do what it's supposed
-  to.
-* fixing bug where we were saving conduit databases to DBBackup instead of
-  conduits/ directory.
-* changing KPilotDeviceLink to use a separate thread, dedicated to doing
-  device communication.  this is much better design as a start, but fixes
-  the problems kpilot was having (and widely talked about) where kpilot
-  would hang and crash if our user was using "usb:" or "net:any" devices
-  because of how these new "device"s operated (allowed immediate opening,
-  even though there is no physical device connected, and then hung
-  indefinitely until the real device connected).
-* bringing in design documents (jpegs) for memofile conduit from 2004-12-12
-  (they're not installed, but are valuable for documentation and insight)
-* icon naming error bug fix 122582
-
-
-2006-10-24  Jason 'vanRijn' Kasper
-* Getting rid of FastSync.  The only difference between it and HotSync was
-  that HotSync did a Backup and FastSync did not.  Having a third
-  permutation because of not having a way to set it in the Backup settings
-  seems wrong.  Also, if one of them is to go, I think that HotSync is much
-  more recognizable and widely used than FastSync.  
-* Allowing finer-grained control around when database backups are done.
-  This is so that users can choose when they want a backup to be done.
-  The problem I need to solve for myself is that since I'm now syncing
-  between 2 PCs, I need a full sync to be done whenever I switch.  But I
-  do not EVER want an automatic backup to be done.  Currently, this is not
-  possible.  Fixing it.  =:)  This will also allow for schedule backups to
-  be done, which is also of interest to me.
-
-2006-01-30  Adriaan de Groot
-* Updated pilot-link to today's CVS, with one change - use of pl_socklen_t
-  in inet.c changed back to socklen_t.
-* Added --loop to kpilotTest to repeatedly run the same action. Only
-  works for --list right now.
-
-2006-01-23  Adriaan de Groot
-* Gosh, where to begin. KPilot moved SVN repositories, changed build
-  systems, had the guts of the device link class refactored, bumped the
-  plugin API version again, and tons more. The commit logs are probably
-  the most useful source of information about what's changed.
-
-2005-08-18  Adriaan de Groot
-* Found out that the PilotAppCategory constructor that takes
-  a PilotRecord * was passing subsequent parameters in the wrong
-  order, which caused Jason's problem below.
-* Renamed soem icons and fixed up the icon loading code so that
-  the "sidebar" icons in KPilot can now be themed as well.
-
-2005-08-18  Jason 'vanRijn' Kasper
-* Started fixing bug #103581.  Got side-tracked by my discovery that when
-  we change ToDos on the palm, we sync them to the PC and then promptly
-  delete them from the Palm--not very nice of us.  I'll try to get the rest
-  working tomorrow, but the end result will be that if our user changes a
-  ToDo category and there is only one category in korganizer for that ToDo,
-  we will change the category for the KCal event.  If there is already more
-  than one category that korganizer knows about, then we'll continue to
-  append the Palm's category to the one in korganizer.
-
-2005-08-17  Adriaan de Groot
-* Promote the new Pilot*Info (template) classes which simplify loading
-  AppInfo structures from a database. Deprecate some AddressEntry
-  constructors to do so, and add one that takes a PilotAddressInfo
-  instead. In kpilot/, replace a bunch of error-prone buffer-handling
-  calls by the use of these template classes.
-* Use PilotAddressInfo also in the abbrowser conduit. This removes a
-  bunch of tricky encoding handling from the conduit and puts it in
-  the base Info class, where it belongs.
-
-2005-08-16  Jason 'vanRijn' Kasper
-* Fixed annoyance in vcalconduit (korganizer calendar/todo conduit) that
-  caused it to not clean up duplicates/things that should be deleted from
-  the Palm on a copy PC to Handheld sync.
-* Fixed some majorly ugly bugs in the addressbook conduit that caused
-  duplicate addressbook records to be generated and not deleted once
-  created.
-
-2005-08-15  Adriaan de Groot
-* Added lots of null-pointer checks so that it may become possible to
-  run conduits without a device link soon. This would be good for testing.
-* Noticed that the factory code needs refactoring into templates.
-  Did so, and ported the abbrowser factory to it. Basically, this
-  removes a lot of cut-and-paste from the whole thing. Same for the
-  timeconduit.
-
-2005-06-05  Adriaan de Groot
-* I learned to make Chinese dumplings yesterday. That's a much better use
-  of a saturday afternoon than bug hunting, don't you think?
-* Put lots of effort into the dox for PilotDateEntry, normalized a lot
-  of things, gave things slightly more sensible names. This is work towards
-  implementing the DatabaseInterpreter for appointments, so you can treat
-  the data on the Pilot as a sequence of (libkcal) Events instead of as
-  binary blobs.
-* Patch from Dylan G applied that replaces 15s and 16s in the code with a
-  defined constant (there already was one, just not used consistently).
-  Did some more rationalizing, finally removed the CATEGORY_COUNT define
-  which was just a duplicate.
-
-2005-05-27  Adriaan de Groot
-* Start of the PIM meeting! Way!
-* Committed some critical data-loss fixes yesterday. Too late for the KDE 3.4.1 release.
-  Argh. I think it would have been better not to touch BRANCH at all and leave it
-  at the same buggy state as in KDE 3.4.0
-* Fairly large-scale deprecation of functions in lib/, finally factored out the
-  shared attributes/category/id stuff from records and AppCategory objects.
-
-2005-05-26  Jason 'vanRijn' Kasper
-* Fixing nasty little bug (#106324) causing data loss in memofile conduit
-* isFirstSync() is true for both copyHHtoPC and copyPCtoHH.  memofile
-  conduit only wants to do copyHHtoPC if we're either told to, or we don't
-  have any local memos in the filesystem
-
-2005-05-22  Adriaan de Groot
-* Gratuitously update the version number, call this one "kind" (Dutch for
-  "child", or otherwise short for "kind of liable to eat your data").
-  This sort-of makes me wish we'd just left BRANCH totally unchanged
-  since the last release. KDE 3.4.1 tomorrow.
-
-2005-05-20  Adriaan de Groot
-* Split PISOCK_LIB into PISOCK_LIB and PISOCK_LDFLAGS. This makes it possible
-  to slip the include and library dir for pilot-link right in front, which in
-  turn makes it possible to build against development pilot-link versions even
-  if there are installed copies in standard locations as well.
-* Extended the AppInfo template class with a pack function as well, so that
-  reading and writing AppInfo blocks can be delegated there.
-* Ported the ToDo conduit to use the PilotToDoInfo template instantiation.
-
-2005-05-16  Adriaan de Groot
-* Added yet another constructor to the local databases, this time hopefully
-  one that doesn't have a horribly convoluted semantics -- it just opens
-  a file (or not).
-* Added more tests for lib. These will always fail unless you have a copy
-  of Aesop's fables in /tmp .
-
-2005-05-13  Adriaan de Groot
-* Friday the 13th! I merged HEAD to BRANCH and am now working in
-  BRANCH (branches/KDE/3.4/kdepim/kpilot) to do bugfixes. New features
-  and strings go in HEAD, and we'll forward-port bugfixes at some
-  point. The cutover is revision 413061.
-
-2005-05-11  Adriaan de Groot
-* Wasted much time trying to get generic FreeBSD USB support for non-
-  Visors working in pilot-link-0.12 before I found out that ColdSync
-  doesn't support that either.
-* Removed non-working calendar conduits (calendarbaseconduit/ and
-  calendarconduits/) from the conduits dir; restore them w/ SVN
-  commits near 412528. These were recordconduit-based conduits
-  by Reinhold, but I broke the RecordConduit in the meantime.
-
-2005-05-07  Adriaan de Groot
-* After tweaking pilot-link 0.12-pre3 so that KPilot will with it (has to do
-  with API consistency) the AppInfo template class works again, and i've
-  extended it a little to make setting and getting category names nicer.
-* Applied the new template to the memofile conduit.
-
-2005-04-22  Adriaan de Groot
-* Fixed (I hope) bug in notepad conduit related to having zero records in the
-  database.
-* Added some more dox.
-
-2005-04-20  Adriaan de Groot
-* Finally added a general test() function to sync actions to mirror the
-  exec() call. By default, this calls exec() and logs a warning. Removed it
-  again because it won't work -- SyncAction doesn't _have_ a SyncMode set.
-* Started doing a little bit of test code in the KNotes conduit.
-
-2005-04-18  Adriaan de Groot
-* Being on vacation doesn't mean I'm not on the job. Doxied a lot, did some cleanup.
-* Renamed PilotLocalDatabase::writeID() and changed its signature, since it
-  was kind of stupid. Doxied it, too.
-
-2005-04-12  Adriaan de Groot
-* For a lark, and for David, re-added some KDE 3.2 compatibility code.
-* Template madness! An easy way to create the right appinfo's from any database.
-
-2005-04-11  Adriaan de Groot
-* Bumped KPilot version.
-* Added a test program for some parts of the library. Woo! A first!
-  Finally something resembling actual software engineering in KPilot.
-* Cleaned up headers that weren't including all required (system) headers.
-* Moved all the conduits to the new SyncMode.
-
-2005-04-10  Adriaan de Groot
-* Some useful patches from Philip T. to the vcal conduit committed.
-* Made the sync mode a full-fledged class and ported lib/ and kpilot/
-  to use it. Disabled all the conduits for the time being. Bumped the
-  conduit API because of this. This might cause some serious breakage
-  for the time being.
-
-2005-04-09  Adriaan de Groot
-* Geez, can we switch to Subversion yet?
-* Committed the weird-ass record conduit template changes. This makes the
-  RecordConduit a fully templated "container". You plug in 5 other classes
-  to get a working implementation. This is similar to what the record
-  conduit already. The main difference is that it is easier to re-use
-  the things you plug into the recordconduit template. I have a KNotes
-  partial implementation that wraps KCal::Calendar, so that is immediately
-  reuseable for the other 4-button ones.
-* Ripped out test mode from KPilotTest and elsewhere, since it wasn't working
-  at all. I think the "mode" setting for conduits needs a lot more structure.
-  Just having an enum doesn't cut it (what about doing a test-mode local
-  PC to HH sync? Such a sync could be used to produce .pdb files from Kontact
-  data, which is just what the doctor ordered sometimes).
-
-2005-03-22  Adriaan de Groot
-* Long drought in doing any KPilot work or updating the ChangeLog.
-* Meddled in lib/ some to add modifiedIDList() and sanitize some types.
-* Prepared to make fFirstSync private, though it has getters and setters
-  so that doesn't really do much for OO'ness.
-* Wrote a template class for doing syncs generically, to replace the
-  RecordConduit. This one I understand, at least. It's not done yet though,
-  by a long shot, though I have classes to plug in to it for KNotes.
-
-
-
-2005-01-30  Adriaan de Groot
-* Fixed one nasty random crash thanks to vanRijn, probably fixed
-  the KNotes HHtoPC problem, tagged 4.4.7, released it. This
-  is the last version to support KDE 3.2 at all, since KDE PIM
-  moved to KDE 3.3 ages ago and KDE 3.4 is at the door.
-
-2005-01-12  Adriaan de Groot
-* Made KNotes conduit work when KNotes is embedded in kontact, too.
-* One branch of the check-username code wasn't setting the username properly.
-* More debugging niftiness, major NO_CAST cleanup.
-* Fixed sysinfo conduit, which didn't read its config file.
-
-
-2005-01-11  Adriaan de Groot
-* Added a workaround for buggy Zire USB behavior. It works most of the time.
-* Fixed memory leak when reading AppInfo.
-* Updated website with some more OS-specific information. As always, I am
-  in dire need of workable explanations for OS (usually Linux-distro)
-  specific quirks.
-* Worked on debugging output a little, normalized more output.
-* Verified that copy PC to HH works on Addressbook, ToDo, Calendar.
-
-
-2005-01-05  Adriaan de Groot
-* Pilot-link 0.12, when it comes out, is source incompatible with 0.11,
-  but KPilot is already ported to it.
-* Fixed up silly conflict resolution question in the datebook, but
-  really it needs the field-by-field resolution that the addressbook has.
-* In KPilotDeviceLink, move around check for unconfigured device to
-  notice earlier, before doing any work. Minor coding style fixes.
-* Revamped debugging (again) so it's now much more 7 * 191; the call trace
-  is pretty readable now.
-
-2004-12-27  Adriaan de Groot
-* Quitting and having the daemon go with you works now.
-
-2004-12-07  Adriaan de Groot
-* Tried to make conduit descriptions more consistent. Remember: "handheld",
-  not "Pilot". Removed ugly const_cast. Added depth indication to the
-  call trace -- this is a pretty big change, it makes the output from
-  kpilot with --debug 1 more tree-ish, so it's easier to see what is being
-  called from where.
-
-2004-12-06  Adriaan de Groot
-* Imported memofile from vanRijn.
-
-2004-11-30  Adriaan de Groot
-* Having a second child .. puts a dent in development time.
-* Make the daemon's next-sync match the one in KPilot, added tooltips
-  and whatsthis. Make the daemon tell KPilot what the next sync is,
-  so that changes from the tray menu are visible. This removes some strings.
-
-2004-11-29  Adriaan de Groot
-* Waiting for second child .. puts a dent in development time too.
-* Ported KPilot to pilot-link 0.12 (unreleased) which adds support
-  for newer devices and saves memory in the process.
-* Data-loss on restore bug fixed by Will Stephenson.
-
-2004-11-23  Adriaan de Groot
-* Squashed several silly bugs in wizard and startup code.
-
-2004-11-17  Adriaan de Groot
-* Hiatus in KPilot due to working upstream on pilot-link.
-* Patches from Olivier, merci.
-
-2004-10-11  Adriaan de Groot
-* Made an actual CVS tag for KPilot, kpilot_4_4_6. Uploaded new 4.4.6
-  tarballs. Updated the site. Posted more developer's notes.
-* Added initial encoding-selection boxes to the doc conduit, to indicate
-  that the input text files are not UTF-8 but something else.
-* Started revamping PilotLocalDatabase so we can get rid of the must-
-  sync-to-delete-new-(memo|address|whatever) in the internal viewers.
-* All the bugs in the database really need a "can you check this again"?
-  added. Till Adam has been messing with recent code and is reporting
-  new crashes and bugs.
-
-
-2004-10-07  Adriaan de Groot
-* Started adding encoding support to PalmDOC conduit dialogs. Not
-  sure how to proceed there.
-* Closed some more bugs, generally confused about some of the bugs
-  remaining in the database -- I need cooperation from the folks
-  reporting the bugs.
-* Went on a str*cpy() hunt to avoid bad copies; converted most to
-  strlcpy(). Not the ones in the docconduit, though, since there,
-  the strncpy()s go to a data structure that doesn't necessarily
-  expect NUL termination (note to self: need to check that _extracting_
-  data from the structure doesn't rely on NUL).
-
-2004-10-05  Adriaan de Groot
-* I wonder if the codec() stuff shouldn't move from the PilotAppCategory
-  to the device link -- after all, it's the _device_ that knows what
-  the encoding is (who knows, maybe future versions of Pilots will be
-  able to tell th desktop this).
-* Added a localBackup action, so we can make ~ backup files of all the
-  database files before doing a sync, just in case.
-* Merged lots of bugs.
-* Found out that KPilot uses title instead of prefix for the honorific
-  titles in the addressbook - this means KPilot and KAddressbook got
-  out of sync. Fixed.
-* New questionYesNoCancel() didn't return correct button codes.
-* Checked all the codec stuff, added some in relevant places but can't
-  spot any addressbook fields that are not synced.
-
-2004-10-04  Adriaan de Groot
-* Bail if the Pilot disconnects, but only between conduits. Conduits
-  themselves should still check for disconnect.
-* Bug maintainence turned up a useful patch for category support
-  in the calendar.
-
-2004-10-01  Adriaan de Groot
-* Merged nice patch from Adrian S for HotPlug.
-* Moved tickle stuff into a separate thread, so that it doesn't
-  require a Qt event loop to keep the Pilot awake.
-* Added tickles in the right (?) places in the abbrowser - around
-  the loading part.
-* Discovered that UserCheck used KMessageBox::question*() instead of
-  a version with timeouts. Fixed that by adding a qYNCancel() to
-  InteractiveSync, and updated both qYN*() methods there to use
-  KDE 3.3 KMessageBox support.
-* Merged InteractiveAction with SyncAction, cleaning up the inheritance
-  tree and making it possible to conduits to use the question* methods.
-
-2004-09-26  Adriaan de Groot
-* Put up new tarballs on kpilot.org.
-* Patched up the KNotes conduit a little - notes listed as modified
-  but unknown to the Pilot are now added as new.
-* Bumped version to 4.4.5. Polished the splash a little.
-* Fixed 71122, finally. There wasn't any code at all in the conduit
-  for deleting memos.
-
-
-2004-09-22  Adriaan de Groot
-* Added some cheap RTTI to PilotDatabase, so you can call
-  dbType() to find out if it's really a local or a serial DB.
-* Stared at the doc conduit for a long time. Did whitespace first.
-
-2004-09-18  Adriaan de Groot & Reinhold Kainhofer
-* Deprecated a bunch of poorly-named functions in lib/, and
-  moved everything to the new names. Finally, no more getCat(),
-  but just category().
-* Detect special case of bad resource headers in file installer.
-* Rearranged sync enum just a little. Moved eTest out of the way,
-  since it's not really a valid value to pass to the demon and made
-  0 the value to indicate "default, whatever is stored in the
-  config file".
-* Fixed up sync-type not honored, clarified next-sync menu (I
-  think so, didn't ask -usability about it though).
-
-
-2004-08-16  Adriaan de Groot
-* Was away at a summer school for two weeks. Got no KPilot stuff
-  done except an off-by-one bug in the memo stuff.
-* Split the CopyHHtoPC code out in the knotes conduit,
-  ready for QThreading (maybe).
-
-2004-07-27  Adriaan de Groot
-* MAL conduit proxy password not loaded properly. Reported by
-  Olivier D.
-* Clean out ancient cruft in fileInstaller.{h,cc}. Run file installer
-  twice, to allow conduits to create files to install. Determine
-  list of files at ::exec() time, not at object creation time.
-* Added some docs to the conduit configure.in.in.
-* Give PERL conduit more information to work with.
-
-2004-07-19  Adriaan de Groot
-* In kontact, if the daemon gets started it shouldn't complain loudly
-  about messed-up configurations.
-
-2004-07-14  Adriaan de Groot
-* Joyeux quatorze juillet! Spent most of the past week totally ignoring
-  KPilot, working on personal websites, KDE-FreeBSD, and porting
-  k3b to FreeBSD (breaking it on Linux only briefly).
-
-2004-06-29  Reinhold Kainhofer
-* Fix the bug that todos that were marked finished on the handheld
-  lost that state when synced to the PC.
-* A few layout adjustments for the perl/python conduits (QTextEdit
-  instead of QLineEdit)
-
-
-2004-06-29  Joern Ahrens
-* Corrected the behavior of the configuration dialog, when the
-  screensaver option is changed.
-* Moved the tickle code from InteractiveAction to SyncAction.
-  Now it can be used in ConduitAction subclasses as well.
-* Ahh, got Adriaans m100, now I'm able to test without destroying
-  my data on the palm. Thanks Adriaan !
-
-2004-06-27  Joern Ahrens
-* Filled the notepad conduit with life. The notepads are saved as png
-  files in a configurable directory.
-
-2004-06-21  Adriaan de Groot
-* Disable editor buttons when 'internal editors' is disabled (Carlos)
-  and fix up the tooltips when they are disabled. Also update some
-  copyright lines. Work on the docs.
-
-2004-06-16  Adriaan de Groot
-* Disposed of foolish file installer bug. Updated tarballs on website
-  before fixing it, so now we're stuck :) Looked at 71122 again,
-  testing with my m500.
-* Corrected finaly layout problems in some conduit config pages.
-
-2004-06-10  Adriaan de Groot
-* Much delay in getting back to work on KPilot, even after a new mobo
-  arrived for my primary devel system. Useful patches were received
-  in the meantime, and commited by Joern. Olivier D. has started
-  improving the MAL conduit, wrt. proxy and password support.
-
-2004-06-02  Joern Ahrens
-* Improved the wizards whatsthis text, thanks to David Bishop
-
-2004-05-30  Adriaan de Groot
-* Handle first-time startups more gracefully by just running configure or
-  the config wizard. Better reporting of non-running daemon. Fix some
-  copyright headers. Add icons to next-sync menu in daemon.
-
-2004-05-28  Adriaan de Groot
-* Make the tarballs available on the site; still no resolution for
-  memo bug, or timezone bug. Change strings in the applications to
-  point ot the new kpilot.org.
-
-2004-05-20  Adriaan de Groot
-* Tested new tarballs for 4.4.3, and they seem ok. Put their md5s up on the
-  website. Note that the memos-not-deleted-on-palm bug still exists, as
-  do 60 others by last count.
-
-2004-05-16  Adriaan de Groot
-* Put up the new KPilot.org website.
-* Updated docs about net: syncing, thanks to Miles Sabin.
-* Patch from Joern probably closes 4 bugs at once.
-
-2004-05-11  Reinhold Kainhofer
-* Deprecated the JPilotProxy and expenses conduits, moved to nonbeta.
-
-2004-05-07  Adriaan de Groot
-* PilotDatabase was a QObject. I wonder why, it didn't have signals or slots.
-* PilotDatabase creation and destruction is now tracked (counted, at least,
-  so you can see if there's a leak there).
-
-2004-04-30  Adriaan de Groot
-* Vrolijke koninginnedag!
-* Finally updated the site some.
-* Removed deprecated files, started using KDevelop, fixed random stuff.
-
-2004-04-28  Adriaan de Groot
-* [kpilotConfigDialog] Added UI for screenlockSecure option. Docs, too.
-* [kpilot] Changed hotSync button to one with a little dropdown
-  menu, thanks to Joern. [kpilotConfig] String fix for outdated config.
-  [probeDialog] Fixed up comments. [hotSync] Normalized debugging output.
-  [pilotDaemon] Fixed backwards logic.
-
-2004-04-26  Adriaan de Groot
-* [kpilot.kcfg] Added [a68k] as default skip in the database list.
-* [pilotDaemon] Use standard names for sync actions. Queue sorry
-  when sync type is bad.
-* [hotSync] Change signature of backup action, lose the confusing
-  int mode parameter.
-* [syncStack] Took out the mode stuff, replaced with SyncAction::SyncMode.
-  This simplified a lot of things, actually.  Removed extra changed-PC check
-  in ConduitProxy, on the assumption this is already checked elsewhere.
-
-2004-04-21  Adriaan de Groot
-* [hotSync] Made skip-database work properly, with wildcard support
-  and proper checking again, so you can now backup your Pilot and
-  specify that FATFS and *a68k can be skipped. Even did docs for it.
-* [syncAction] Added function to return standard names for the
-  (enum) sync actions.
-
-2004-04-19  Adriaan de Groot
-* Cleaned up header comments, copyrights, body comments, indentation,
-  brace style, and unused code in all kinds of files. Normalized use of
-  magic constant 0xffff in PilotRecord::APP_BUFFER_SIZE. Removed
-  some * in char *buffer[] where char buffer[] was meant, reducing KPilot's
-  stack memory usage there by a factor of 4 or more.
-* Patch from Joern Ahrens to close another Bugzilla bug.
-
-2004-04-18  Reinhold Kainhofer
-* Finish the autodetection of the handheld for the wizard. You *CAN* pi_bind
-  to multiple devices, so I just create a bunch of device links and wait for
-  connected signals... This also means we can get rid of page one of the wizard.
-  There is one problem left: If /dev/pilot or so is a symlink to a real device,
-  a connection on /dev/pilot and the actual device will be detected, and kpilot
-  will lock up. I guess I'll have to keep a (static) QStringList of real devices
-  we are bound to in KPilotDeviceLink and disallow binding to the same real
-  device again.
-
-2004-04-18  Adriaan de Groot
-* Default debug_level to 0, so it doesn't print the call trace, but just the
-  (sometimes) useful debug output; use --debug 1 to print the call trace.
-* [pilotDaemon] Add more useful warning output when conversation with screen-
-  saver fails. Add human-friendly way to request a specific sync type.
-  Factor out a whole lot in the startHotSync() to clear up the actual logic.
-* Massive damage inflicted to factor out the one set of sync-enums and
-  use them everywhere, while cleaning up the setup-sync logic too.
-  Remove leading 'e' from enum type names (not the elements).
-
-2004-04-16  Adriaan de Groot
-* Fixed double dialog when cancelling a change in the selection in the config
-  dialog. Took patch from Joern to fix resize problem in abbrowser resolution
-  dialog. Minor constructor mod in pilotMemo.h, and a much more nasty problem
-  in pilotMemo.cc, which seems to use a wrong memo length. Added some
-  docs. Removed a warning in addressWidget.cc.
-* [conduitConfigWizard] Can't assign copyright except in writing, and even then
-  in the EU you can't renounce your copyright. Added a "None" sync setting,
-  for the use-case described on 4-11.
-
-2004-04-11  Adriaan de Groot
-* Testing, testing, 1, 2, 3. Let's look at a use case: someone who doesn't want
-  to sync his or her palm with KDE apps, but does want a convenient application
-  to install files and keep a backup of their palm. How can they use KPilot?
-  Well, uncheck all the conduits except install files, set the daemon to auto-start,
-  and do nothing more than drop the pilot inthe cradle occasionally and hit the
-  HotSync button. Use kpilot's viewers to check the state of the backup.
-* [conduitConfigDialog] Use the CE macro for general config pages. Tighten typing
-  on handleGeneralPages. Add names to the viewers tabs. Make unsaved-changes
-  message make sense.
-
-2004-04-11  Reinhold Kainhofer
-* Fix the codec handling to use KGlobal::charsets.
-* Implemented the startListening and stopListening methods of the daemon.
-* Fixed the config dialog so that just showing a conduit's config widget
-  doesn't trigger the modified signal.
-* Some cleanup in the daemon
-
-2004-04-10  Reinhold Kainhofer
-* Split kpilot's configuration into several files, one for each conduit.
-  Also wrote a kconf_update script so the old settings are preserved.
-  We still need to sort out the remaining settings written to kpilotrc.
-* Corrected all path variables in the .kcfg files from type String to Path
-* The configuration wizard now also sets the conduits' settings to sensitive
-  defaults for the chosen application (kde pim, kontact, evolution)
-
-2004-04-10  Adriaan de Groot
-* Move about in config dialog to sensible spot. Follow suggestions by Carlos
-  to simplify the config dialog a bit. Default general setup to open, even
-  if the message says it it for esoteric stuff.
-
-2004-04-09  Adriaan de Groot
-* Work on docs. Accept patch from Joern for broken config in abbrowser
-  conduit. Receive docs patches from Carlos.
-
-2004-04-05  Adriaan de Groot
-* Work on the Kontact plugin for KPilot, make daemon's installedConduits
-  DCOP call return human-readable names instead of internal stuff.
-
-2004-04-04  Adriaan de Groot
-* Split out the general settings pages so that no tab widgets are
-  needed. Joern's title patch for those pages made the tabs weird
-  anyway, and now things are consistent, at least. We could move
-  the backup page to "Actions", if we want.
-
-2004-04-01  Adriaan de Groot
-* Happy birthday to Mira, who has now managed to watch a whole
-  year of KPilot development, and has learned to sit up and say
-  "aya!" appreciatively when Daddy fixes a bug. Or something.
-
-2004-03-28  Adriaan de Groot
-* Added a "reset daemon" button. Added whatsthis help to toolbar.
-* Added a "suppress confirm" option to the notes conduit, partly
-  for 71122.
-* Suppressed some more warnings. Fixed little buglets. Put off
-  testing 71122 as long as possible.
-
-2004-03-26  Adriaan de Groot
-* Another day, another fix from Joern.
-* Backported the fix for backup settings being ignored from Sebastian V.
-  (Actually, just used his original patch, which didn't use kcfgXT.
-* Prevent sync when screen locked, as a security measure.
-* Still haven't tested 69595 or 71122. Ugh.
-
-2004-03-24  Adriaan de Groot
-* 71122 has been top of the list for over a week - not getting around to
-  it at all. Fixes elsewhere; working on getting a Linux machine up and
-  running to be able to run POSE with a null-modem pseudo-device.
-* Another patch from Joern; arr, it's a learning experience!
-* Removed logging weirdness in the fileinstall action.
-
-2004-03-19  Adriaan de Groot
-* Discovered that the daemon's DCOP interface disappears after one
-  HotSync. Man, that's weird. Removed QString(CSL1()) constructs -
-  CSL1() returns a QString already. Using DCOPClient::attach() in
-  the pop conduit is a really bad idea!
-* Picked bug 72251 to work on tonight. Closed another one related to
-  settings not propagating properly as well.
-* Minor cleanup in the log on the pilot, get conduits to start on new lines.
-  Use correct name for icon. Handle FastSync correctly, don't queue all
-  the extra checks for it based on the sync settings (or do we want to
-  deprecate fastsync as a fNextSyncMode entirely?). At end of sync
-  reset next sync to normal.
-
-2004-03-17  Reinhold Kainhofer
-* Implemented a first version of the config wizard. The code to autodetect
-  the device is not yet finished, though.
-* Extended the daemon DCOP interface to stop listening and start listening
-  on the configured device (needed e.g. if some other application wants to
-  bind to that device for some time, like the autodetect dialog needs to).
-  Here, also the code for really (de-)attaching to the device is not there
-  yet, just the interface to the functions.
-
-2004-03-17  Adriaan de Groot
-* Ripped out all the dead and broken and useless code in the mail
-  conduit, fixed up the code that was left, reduced the size of the
-  setup dialog, and ended up with something that actually works again.
-  Fixed bugs  60579 and 77948.
-* Yet another patch from Joern, added him to credits, too.
-
-2004-03-15  Adriaan de Groot
-* Patches from David Mott and Joern Ahrens today. Excellent!
-* Worked on the docs and website some.
-
-2004-03-14  Reinhold Kainhofer
-* Make sure the config is really read in in the vcal conduit's setup dlg.
-* also the conduit version number of the vcal conduit needs to be really
-  written to the cfg file to make sure categories are really synced. So far,
-  the version number was not written to the config, which resulted in a full
-  sync every time!
-
-2004-03-13  Adriaan de Groot
-* Stared at the screen for a while trying to think of how to test syncing
-  with my spare m100 without breaking my existing stuff from my m500.
-  And I realize that it means I need a second monitor and to run X dual-head.
-* Some minor rearrangements in the config dialog again.
-* Added configuration widget to perl conduit.
-
-2004-03-12  Adriaan de Groot
-* Received patches from Joern Ahrens and Sebastian Voitzsch for
-  various issues. Thanks guys! It's contributions like this that
-  really inspire me to keep working on KPilot. Reinhold and I can't
-  do everything by ourselves.
-* There will be tarballs of KPilot 4.4.2 soon; this will make it
-  possible to get the bugfixes from Joern and Sebastian - and others -
-  on your system now without waiting for another KDE release.
-
-2004-03-08  Reinhold Kainhofer
-* Ported all conduits' setup dialog to the new style and remove all old code
-* First steps for the config wizard.
-* Updated the malconduit to work with libmal 0.4, too (using configure
-  checks, as the code is source-incompatible)
-* Moved the kpilot config page to the correct place in the kontact
-  setup dlg hierarchy
-* Fixed a crash in the old-style conduits' setup code (widget was removed
-  in favor of some other, but code still tried to access it)
-
-2004-03-08  Adriaan de Groot
-* Wow, lots of activity by Reinhold. I hope he updates the ChangeLog
-  sometime as well.
-* Revert the variable timeout, just do a straight 5 second wait, that
-  should just fix it, and save us a lot of trouble too. Anyway, who
-  wants to sync again within 5 seconds of the previous one finishing?
-  It's just as well that the value wasn't saved anywhere anyway.
-
-2004-03-05  Adriaan de Groot
-* Spent most of the day putting together new tarballs, so I can push
-  KPilot improvements out the door again when needed.
-
-2004-03-02  Adriaan de Groot
-* Add a variable timeout after the sync, specially for some T3 users.
-  Thanks to Alec Mitchell for pointing that out and providing an initial patch.
-
-2004-02-25  Adriaan de Groot
-* In the KNotes conduit: Coding style fixes. Cleanup doubled strings.
-  Improved status reporting. Probably dealt with the memo viewer issue.
-* Imported another patch from David Mott, for drag-n-drop file install.
-* Added a config option and UI for running conduits during a backup.
-  Default to not, in order to fix bug 7xxxx.
-
-
-2004-02-21  Adriaan de Groot
-* At FOSDEM, not much hacking was done, but it was fun and boozy.
-
-2004-02-03  Adriaan de Groot
-* I see lots of spelling fixes have been introduced in HEAD. Thanks, TLs.
-* Plans for a photo conduit (Zire71) and a NotePad conduit are forming.
-  pilot-link has the relevant code already, it just needs to be fit
-  into KPilot's form.
-* Worked on the KNotes conduit some more. Remember to update the
-  local database copy, and non-CopyHHtoPC code needs work.
-
-2004-01-31  Adriaan de Groot
-* Finished up the KNotes conduit, I think. The copy to PC part was
-  a little over-enthusiastic.
-
-2004-01-25  Adriaan de Groot
-* Fixed up copyright notices here and there. Dan is listed as copyright
-  holder in lots of files he's never worked on; since copyright cannot
-  be assigned except in writing, I'm going to have to take responsibility
-  for my parts.
-* Fixed up conduit modes in kpilotTest.
-* Removed compile warnings in the vcal conduit.
-* Moved 72342 to top of list, since now I got HHtoPC copy
-  working in kpilotTest I can actually _see_ the bug. It seems to be in
-  PilotMemo.
-
-2004-01-20  Adriaan de Groot
-* Added experimental A-A-P build system.
-* Cleanups in conduit config, added stub buttons for wizards.
-
-2004-01-16  Adriaan de Groot
-* De-tabified ChangeLog again.
-* Updated version. Hope that \374 makes sense (it's a ü).
-* Added explanation for "Actions" page in config. Ditto for "Conduits".
-  Prevent user from collapsing the tree.
-* Fixup layout for popmail conduit when including it in the config dialog.
-* Experimental stab at separating the config into separate bits in the
-  new KCM config dialog.
-
-2004-01-02 - 2004-01-11  Reinhold Kainhofer
-* This was work done in osnabrueck_branch, at the 2004 kdepim meeting
-  and the week afterwards. This issue is one of the feature targets
-  for the kdepim 3.3 release in Q1 2004.
-* Moved the general setup dialog from a separate dialog to a page of
-  the conduit config dlg. Combined the kpilot setup and conduit config
-  dialog to one dialog.
-* Implemented the kontact plugin for KPilot (showing status information)
-* Added three DCOP functions to the daemon for querying status information
-* Hotsync log is written out to a file (~/.kde/share/apps/kpilot/lastsync.log)
-* Converted all conduits to KConfig XT (mail und kroupware still missing)
-* Converted the config dialog to a KCM module
-* KPilot plugin for contact: shows status in summary and makes config available
-* kpilotDaemon sends a DCOP signal when its settings/state are changed
-* New DCOP functions in the daemon to query its state and settings
-* the kontact plugin also detects if the daemon is quit
-* Use a QSplitter in the config dialog instead of the QHBox layout
-* implemented the kconf_update scripts to move groupless entries to the
-  [General] group
-* Still missing:
-    o) KConfig sync between the three processes working on the
-       kpilot config: kpilot, kpilotDaemon and possibly kontact
-       with the kpilot plugin
-    o) Wizard to setup kpilot correctly for kontact (the defaults
-       should suffice, just in case someone played around and
-       messed them up)
-
-
-2004-01-02 - 2004-01-04 Adriaan de Groot
-* This was work done in osnabrueck_branch, at the 2004 kdepim meeting.
-* Fixed the TODO_I18N -> they're all i18n() now.
-* Discovered ttypatch, which is da bong. Thanks to Dan Clemmensen
-  for writing it, and Bernhard Reiter for showing it to me. All of
-  a sudden, POSE actually looks usable.
-
-2004-01-02  Adriaan de Groot
-* Non-functional commits all over; split off osnabrueck_branch.
-* Naming changes in todo conduit.
-* Fix sync race in knotes conduit.
-
-2003-12-29  Adriaan de Groot
-* Reenabled the popmail conduit, but in severely limited form.
-
-2003-12-28  Adriaan de Groot
-* Committed the knotes stuff, since it does do HH->PC properly. OTOH,
-  I don't think the mode code is right in that conduit either.
-* Stared at various bugs that I can't reproduce.
-* Looked into #69987, changed some names in the todo conduit.
-* Changed the parts of the changelog to real changelog format
-  (dates must be yyyy-mm-dd, with leading zeroes if needed).
-
-2003-12-23  Adriaan de Groot
-* Added recent hardware reports. If you reported something and I've
-  forgotten it, please send me a gentle reminder.
-* Added IrDA howto from Stuart, who failed to provide an email
-  address that I can respond to.
-* I think I got the KNotes conduit working again, but it needs some
-  testing so that change hasn't been committed yet.
-
-2003-12-12  Adriaan de Groot
-* Reduce warnings in vcalconduit.
-
-2003-12-10  Adriaan de Groot
-* Fix for #66321 - fill in a default value for the vcal file.
-
-2003-12-05  Adriaan de Groot
-* Het heerlijk avondje is gekomen. Damn right it is.
-
-2003-12-02  Adriaan de Groot
-* Removed #if 0'ed code; moved some deprecated code to #if 0; removed
-  use of deprecated stuff. Fixed up includes.
-
-2003-11-23  Adriaan de Groot
-* Minor string fixups that don't affect TL.
-
-2003-11-22  Reinhold Kainhofer
-* Fixed the broken conduit config dialog (wasn't able to show config
-  widgets of more than one conduit. If you configured one conduit, and
-  switched to another, its config widget couldn't be added to the stack).
-* Configure conduits dialog now has an apply button.
-
-2003-10-21  Adriaan de Groot
-* Updated the website some with lots of new hardware. Thanks to
-  everyone who reported new stuff.
-
-2003-10-10  Adriaan de Groot
-* Sure, we let the ChangeLog slide, but didn't do much, I don't
-  think, over the summer. Main point is that AAP can pretty much
-  build KPilot now, suck to be auto* and make.
-
-2003-07-30  Reinhold Kainhofer
-* The addressbook conduit now uses a different algorithm to find
-  the type of address on the PC to sync with.
-  First, if there is a preferred address (no matter if home, work
-  or whatever), this one is synced to the handheld. If no preferred
-  address exists, either home or work (depending on the setting in
-  the conduit config dialog) is used for the sync. If that doesn't
-  exist, either, the other one (work/home) is tried. If that also
-  doesn't exist, and the address is copied to the PC, its type is
-  set to preferred+the setting from the config dialog.
-  This fixes both bugs #50560 (conduit should sync with preferred
-  address) as well as bug #60659 (conduit should use the existing
-  address from the PC, even if the type is not the one chosen in
-  the config dialog).  (also backported to BRANCH)
-* Allow two addressbook entries with the same name and organization,
-  but different phones, addresses etc. Actually, it allows entries
-  which are equal up to at least one entry. This fixes bug #59569.
-* Fixed bug #60691 where events recurring monthly on a given weekday
-  were shifted by one day. (also backported to BRANCH)
-* Also, when initializing a LocalCalendar, you are not supposed
-  to give a time zone...
-* Also, fixed infinite loop glitch by Cornelius.
-* If the user chose to sync to an iCalendar file instead of the
-  standard (resource) calendar, and he gave an empty or invalid
-  file name, an error message is now written out to inform him/her
-  about the problem.
-  I don't want to ask him for a file name, because one of the
-  guidelines of conduit development is that a sync should be able
-  to run without user intervention.
-  this should probably also be backported, but it introduces two
-  new i18n strings, so it is not possible. Thus the bug will remain
-  in 3.1 branch.
-* Fixed the toolbar configuration.
-
-2003-07-27  Reinhold Kainhofer
-* The internal editor action now displays the contents of the conflicting
-  records and lets the user decide which one overrides (Fixes bug #61103).
-* For this I added a function getTextRepresentation(bool richText) to
-  PilotAppCategory, PilotAddress, PilotMemo, PilotDateEnty and PilotTodoEnty,
-  which returns the contents of the record as a string that can be displayed
-  to the user. Moved that code from the internal viewers to the classes.
-* If there is no nice-text representation, I now use KHE::KHexEdit to
-  show the raw contents, so the user gets an idea of the conflicting records.
-
-
-2003-07-26  Adriaan de Groot
-* Time flies when you're having fun and mucking with other
-  bits of KDE. Worked on meinproc, build fixes, dependencies, etc.
-
-2003-07-26  Reinhold Kainhofer
-* Changed a few accelerators (duplicates reported by Dr.Klash)
-* Also show items marked as deleted in the GenericDB viewer.
-* All conduits now have their own copy of the handheld's database
-  in $KDEHOME/share/apps/kpilot/conduits/UserName/*.pdb. This was
-  needed so that backup runs don't break the conduit's algorithm to
-  detect changed records on the PC. So far, we compared each entry
-  to the corresponding entry in the backup database. It that changed,
-  basically we are screwed.
-  For this new feature I extended the constructur of PilotLocalDatabase
-  to take an additional boolean parameter useConduitDBs. If that is set,
-  the db will be opened in ..../conduits/Username/
-* Do not return "Unfiled" or "Nicht abgelegt" as category label
-  if no category is set. Instead return an empty string.
-* Added isArchived() and makeArchived() methods to PilotAppCategory
-  to set the dlpRecArchived flag.
-* Changed the way how the DBBackup/username/ and conduits/username/
-  directories are created (now I'm using KStandardDirs::makeDir and
-  KStandardDirs::exists).
-* FirstSync now also means PC->HH or HH->PC directions (which is clear
-  intuitively, as with these direction, nothing that's on the other
-  side should matter at all).
-* Added eDelete to the sync actions in the SyncAction class
-
-
-2003-07-15 to 2003-7-26  Reinhold Kainhofer
-Complete rewrite of the addressbook conduit (for the, umhh, third(?) time).
-* NEW FEATURE: custom fields can now also be synced with
-  birth date, URL, ICQ, etc. (bug #50871)
-* Conflict resolution shows the whole conflicting item
-  and all conflicting fields (so far, every conflicting
-  field was shown on its own, bug #59222). The conflict
-  resolution is done completely independent from the addressee
-  object and might so be reused later in other conduits as well.
-* Separated the mechanism to detect changes from the mechanism
-  to sync/merge addressees. This makes the whole thing a lot
-  easier to understand and maintain, and there are far less
-  cases you have to consider.
-* the conduit now obeys the global conflict resolution (ask,
-  PC overrides, HH overrides, last sync overrides, duplicate)
-  and sync direction (fast, full, only PC->HH, only HH->PC)
-  settings. Bug #59220.
-* The "only HH->PC" and "only PC->HH" sync directions first
-  copy all existing entries to the receiving end, and only then
-  remove all other entries from there. This avoids data loss if
-  the connection breaks while such a special sync is running.
-* Added a crash handler to clean up the addressbook if the
-  conduit crashes.
-
-2003-07-11  Reinhold Kainhofer
-* Records in the PilotLocalDatabase with ID 0 (i.e. new records
-  added by KPilot's internal editors) will always be treated as
-  modified records and found by readNextModifiedRecord, even if
-  they don't have the dirty flag set. This ensures that all new
-  records from KPilot will be added to the handheld
-* Finished the internal todo editor:
-  Entries can be maked completed and edited directly in the check
-  list view.
-  Moved the editor dialog to a designer ui file instead of a
-  manually created layout
-* Finished the sync action that copies the changes done in the
-  internal editors of KPilot to the handheld. So, finally, the
-  internal viewers/editors of KPilot are working again, unlike
-  the last few years, where they were in a terribly broken state.
-
-2003-06-01 to 2003-7-10  Reinhold Kainhofer
-* I was busy with a lot of stuff from KPilot, none of which is actually
-  in a state where I can commit it. In particular, I'm working on
-   -) Custom field sync of the addressbook conduit
-   -) Make the conflict resolution of the abook conduit more
-      intuitive (ask just once for each conflicting address)
-   -) Finish up the todo editor
-   -) Make the generic DB viewer an editor (more or less finished,
-      but the KHexEdit widget is not yet publically available, so
-      I can't commit that part either)
-   -) Implement the InternalEditorAction which syncs the changes
-      done in the internal editors/viewers to the handheld
-
-
-KPilot Developer's notes for July 9th
-=====================================
-
-2003-7-9  Adriaan de Groot
-* Ditched spurious code in KNotes conduit config. Updated copyrights,
-  still assigned to Dan. Updated the notes interface stubs.
-
-2003-7-7  Adriaan de Groot
-* Added a conduit description to PalmDOC. Well, fixed the "Conduit"
-  vs. "Comment" typo in the .desktop file.
-
-2003-7-6  Adriaan de Groot
-* Made the bugreport and question and help links in the about pages
-  clickable through KActiveLabel. Made the credits text scrollable
-  with a QTextEdit.
-* Weird redraw bugs reappear in the conduit config dialog, fixed again.
-* Added sorryVersionOutdated() to KPilotConfig to notify user that
-  the configs are old, and telling what's changed. Used in kpilot and
-  the daemon. Includes cleanup. Use getDebugLevel() properly.
-
-2003-7-5  Adriaan de Groot
-* Upped the config version number to 440.
-* Worked on the docs (really!), so the HEAD docs now reflect _some_ of
-  the reality of KPilot 4.4.0. Noted lots of inconsistencies.
-  Put in lots of TODO's, and the whole thing needs going over.
-* Using the trademark HotSync in the GUI might not be a good idea.
-  Removed where I could, added a trademark reference in the about pages.
-
-2003-7-5  Adriaan de Groot
-* Renamed all conduit plugins from libconduit (and variants) to
-  conduit_, so that they're easier to identify in $KDEDIR/lib/kde3.
-  Of course, this doesn't work right. Feh.
-* Removed listCat again.
-* Implemented a notion of "internal conduit", so that we can move
-  the "install files" and "kroupware" stuff to the conduit config
-  dialog and out of the general stuff, where it looks weird.
-
-2003-7-4  Adriaan de Groot
-* Removed the words "KPilot", "KDE" and "Conduit" from all the conduit names.
-* Removed double logging in NULL conduit, added message for explicit fail.
-  Use the generic config dialog implementation. I see now that the NULL
-  conduit isn't built or installed anymore. Fixed its .desktop comment.
-* Disabled the expenses and popmail conduit from compiling.
-* Made new-style config for the vcal conduit. Made new-style config for the
-  todo conduit. Stripped out lots of extra #includes. Stripped out extra
-  Q_OBJECT macros. Reduced space in widget some. Fixed void return 0;
-  Fixed improper AboutData in todo conduit.
-* New-style for abbrowser. Minor == vs = mixup.
-* Shrunk margin for kpilot config dialog. Use the available charsets from
-  KDE instead of our own list. Added a quit-after-sync option.
-
-
-
-2003-6-29  Adriaan de Groot
-* Added some code validation support to plugin.h
-* Messed about with popmail's config. What was the firewall stuff for?
-  Created new-style configs, didn't complete the load/save code, and
-  then sortof gave up because is there really any point to doing this
-  conduit without switching to the SMTP ioslave? And using identities
-  then?
-
-2003-6-26  Adriaan de Groot
-* Removed stupid comment in popmail/Makefile.am
-
-2003-6-25  Adriaan de Groot
-* Be consistent about naming the sysinfo conduit "System Information"
-  in user-visible strings.
-* Remove "conduit" from the name of the Palm DOC conduit, and add a
-  new-style config panel to it. Made it resize properly.
-* Note that ConduitConfigBase::load() and its overrides should set
-  fModified to false.
-
-2003-6-22  Adriaan de Groot
-* Turn off NO_CAST_ASCII when doing DEBUG_CERR, because ostream is
-  lacking an operator << for QString. (Nicer is probably to add
-  such an operator, but hey.)
-* Removed uselessly virtual conduitName() function from conduit classes.
-  No-one was overriding it anyway.
-* The vcal and abbrowser conduits shouldn't be compiled if you're building
-  KPilot HEAD on older systems.
-
-2003-6-21  Adriaan de Groot
-* Fixed up the layout of the sysinfo conduit.
-* Documented ConduitConfigBase::isModified() and made it virtual.
-* Fixed up the sysinfo conduit and saving modified entries.
-* Moved the --debug argument to all apps individually.
-
-2003-6-20  Adriaan de Groot
-* Updated the hardware lists on the website.
-* Updated some "What's This?" texts.
-* Removed evil static QStrings in kpilotConfigDialog.cc.
-* Discovered that the "start at login" functionality has been broken forever.
-* Added a workaround for KTimeWidget not present in KDE 3.1.x.
-
-2003-6-20  Reinhold Kainhofer
-* Implemented the dialog to change the database flags and the dates (DBInfo
-  struct) in the internal generic DB viewer. PilotLocalDatabase got a new
-  method setDBInfo for this.
-* Implemented creating, editing and deleting records in the generic DB editor.
-* Added the CHexViewWidget from khexedit to the kpilot/kpilot/ directory.
-  There are still several open issues with it (i.e. how do I set the data
-  at all???)
-
-2003-6-19  Reinhold Kainhofer
-* Implemented the list of records in the generic DB viewer. To be
-  able to sort the records by their index, I had to write my own
-  compare method of the QListViewItem, which compares the numerical
-  representation of the column entries. For large DBs (>300 records)
-  this is way too slow (QString::toULong for each comparison, increasing
-  with n*n), so I had to implement some caching. Now even large databases
-  are sorted very fast.
-
-2003-6-16  Reinhold Kainhofer
-* First layout of the internal calendar viewer/editor. The KDatePicker
-  poses a big problem to me as it swallows all toolbar buttons.
-* Implemented a InternalEditorAction to sync changes done to the databases
-  in the internal viewers. Every PilotComponent that changes a database
-  needs to mark it as dirty (e.g. markDBDirt("AddressDB")) so the
-  Action knows which databases need to be considered.
-
-2003-6-15  Reinhold Kainhofer
-* Implemented a first layout of the generic database viewer. To view
-  the records, I'd need a hex editor, which is not available in KDE, yet.
-  I tried using the widget that khexedit uses, but somehow I can't get
-  it to work :-((
-
-KPilot Developer's notes for June 15th, 2003
-============================================
-
-2003-6-15  Adriaan de Groot
-* Yay, father's day. Which includes me. Mira drew me a wonderful card.
-* Fixed some TL problems in debug output, and added documentation.
-
-2003-6-14  Adriaan de Groot
-* Fixed the conduit config dialog's repaint and behavior problems by
-  ditching the .ui file and implementing it by hand again. I'll look
-  into a switch back to .ui later.
-
-2003-6-12  Reinhold Kainhofer
-* Tracked down why the handheld crashes with Invalid UniqueID error
-  message (bugs #59313 and #51216). RecordIDs are supposed to be 3
-  bytes, and the handheld will crash if they are longer. For some
-  reason, several entries in the calendar or the addressbook were
-  assigned longer Record IDs, so I added a check for invalid values
-  before sending them to the handheld. This fixes the symptoms (i.e.
-  these crashes won't appear in the future again, and new valid ids
-  will be assigned), but there is still another bug that assigned
-  the wrong values in the first place...
-
-2003-6-9   Reinhold Kainhofer
-* Fixed crash from bug #59315. I used the value of a char as a char*,
-  in the code for extension cards in the sysinfo conduit. pilot-link
-  doesn't detect my Clie's memory stick as extension card so this code
-  was never executed on my machine, and I didn't detect the bug myself.
-
-2003-6-1   Reinhold Kainhofer
-* Fixed several (possible  and really occurring) null pointer crashes
-* Submited most of the items in our TODO list as bugs or wishes on
-  bugs.kde.org
-
-2003-5-31  Reinhold Kainhofer
-* Restructured the setup dialog of KPilot. Several per-conduit
-  settings were moved to global settings. The conduits now have
-  isFullSync(), isFirstSync(), getSyncDirection(), and
-  getConflictResolution() members for these settings. I think I fixed
-  all conduits to use these new settings and didn't miss anything.
-* The Backup works again (fast sync doesn't do a backup, hot sync
-  does conduits and a fast backup, full sync does a full backup where
-  the modified flags are ignored). Also added a fast backup where
-  only modified records are retrieved.
-
-
-2003-6-1  Adriaan de Groot
-* pilotComponent.cc Another fix for 52138 - I'd missed the category
-  drop-down box.
-* Woo. After months of wrestling, I actually managed to run KPilotTest
-  and list the contents of my m500. Sometimes, there is something
-  to be said for Linux and a working USB stack. This means I have
-  limited testing hardware available again.
-* Minor fixups to make HEAD compile with 3.1.x again.
-
-2003-5-31  Adriaan de Groot
-* Updated my build environment to HEAD. This will leave some people
-  in the dust, for sure, since 4.4.0 will thus have an address conduit
-  that requires HEAD, not 3.1.x. Perhaps we can ship two tarballs,
-  but that's going to start to be messy again.
-* Talked to lioux about conduits and categories on IRC. It seems
-  that PC->Palm syncs usually respect categories and such, but Palm->PC
-  doesn't, among other little tidbits. He'll file bug reports.
-
-
-KPilot Developer's notes for May 30th, 2003
-===========================================
-
-2003-5-30  Adriaan de Groot
-* Spent this week at conferences (Mira at 8 weeks was the
-  youngest attendee of the EEF School on Formal Methods,
-  though I doubt she'll remember how to do protocol
-  verification in PVS).
-
-2003-5-19  Reinhold Kainhofer
-* This weekend I wrote this new conduit for KPilot, called
-  sysinfoconduit. It writes all important Palm system information
-  to a text or html file. For an example, see
-  http://reinhold.kainhofer.com/Linux/KPilot/KPilotSysInfo.html.
-  The output is completely customizable via templates. Currently,
-  txt and html templates are available, but the user can provide
-  his/her own template in the conduit configuration dialog. The
-  current html template uses css for the markup, and passes the
-  w3c html validator without warnings.
-  Hopefully, the debug output section will help us kpilot developers
-  track down problems easier (the users can send us the output of
-  this conduit, and we can let it write out all important stuff we
-  need/want to see).
-
-2003-5-11  Adriaan de Groot
-* kpilotDCOP.h Changed enum values so that you can distinguish
-  between call failed and normal operation.
-* conduitConfigDialog.cc When closing config dialog, release last
-  selected conduit.
-
-2003-5-9  Adriaan de Groot
-* Fixed up some config issues in the NULL conduit.
-* Added conduitName() to conduit config things and their actions,
-  to provide a user-readable name for the conduit.
-
-2003-5-5  Adriaan de Groot
-* plugin.{h,cc} Added a maybeSave() function for the new conduit config
-  style. Removed some unused variables.
-* conduitConfigDialog.{h,cc} Using maybeSave() to save or cancel selection
-  changes.
-
-2003-5-3  Adriaan de Groot
-* Spent lots of time panicing my system and causing fatal exceptions
-  on my Pilot by playing with pilot-link 0.11.7 and FreeBSD's USB
-  stack.
-* kpilotlink.cc Suppress printing the "accidentally in acceptDevice"
-  more than once. Try to escape from the infinite socketnotifier loop.
-
-
-2003-5-2  Adriaan de Groot
-* Aiming for bi-weekly notes this month again.
-* Looks like I reverted the PRETTY_FUNCTION printing.
-* I'm working from an everything-HEAD-except vcal and abbrowser
-  checkout, because the new resources framework breaks everything.
-* Next KPilot tarballs will be 4.4.0 (HEAD) release.
-
-KPilot Developer's notes for April 30th, 2003
-=============================================
-
-2003-4-25  Adriaan de Groot
-* Updated resizing action in the conduit config dialog.
-* Added a ConduitConfigBase to the knotes conduit.
-* Changed a bunch of Name[] entries for the time conduit. We
-  need shorter names; most of them are horribly redundant.
-* Noticed that the conduit checklist items don't always get
-  painted right. Added a workaround.
-
-2003-4-24  Adriaan de Groot
-* More work on the conduit configuration stuff.
-* Make FUNCTIONSETUP print PRETTY_FUNCTION instead of just FUNCTION.
-* Added a ConduitConfigBase object to the time conduit.
-
-2003-4-22  Reinhold Kainhofer
-* Cleanup of several cout and other debug messages
-* In the addressbook and todo conduits, after the sync the AppInfoBlock
-  is written back to the databases so that adding categories to the
-  database finally works.
-
-2003-4-21  Adriaan de Groot
-* Changed the description for the KPilot NULL conduit to just "NULL",
-  since both "KPilot" and "conduit" are redundant in this context.
-* Messed around a little with the types of plugin code, created a
-  class ConduitConfigBase which is supposed to supplant the current
-  config widget stuff.
-
-2003-4-21  Reinhold Kainhofer
-* Implemented different ways to convert the bookmarks in the doc
-  conduit when doing Handheld->PC sync.
-* Some tab order fixes in several conduit setup dialogs.
-* Improved the question when the handheld and the KPilot user
-  names don't match.
-
-2003-4-20  Adriaan de Groot
-* Added the sources for a generic DB viewer and a datebook viewer.
-  These don't show up anywhere yet though. The datebook viewer has
-  no functionality yet.
-* kpilot.cc Minor change to detect non-functioning daemon better.
-* Restored the tooltip code to the conduit config dialog. Removed
-  the "description" column again.
-* uiDialog.{h,cc} Moved the addAboutPage() code to a static function so
-  that it can be reused elsewhere.
-* plugin.{h,cc} Added a new base class ConduitConfigBase for deriving
-  the configuration widgets for conduits from. This will make them
-  more generically pluggable.
-
-2003-4-19  Reinhold Kainhofer
-* Fixed the categories sync in both the addressbook and the todo conduits.
-
-2003-4-18  Adriaan de Groot
-* Laurent Montel did some compile fixes for restrictive (NO_ASCII_ ...)
-  compile environments. And I fixed them to match the coding guide.
-* Make file installer emit a [] message like the conduits do, to
-  give the "No files to install" message context. Tell the user how
-  many files will be installed.
-* Tell the user if the daemon can't be started. Tell the user what
-  charset is selected.
-
-
-2003-4-17  Adriaan de Groot
-* Finished moving the conduit config to checklist items. Worked out
-  a sensible compromise with the command buttons. The conduit
-  descriptions (comment lines in the .desktop files) need work.
-
-2003-4-16  Reinhold Kainhofer
-* Tried to add a logMessagePart slot which would append some words
-  to the last line of the sync log (but would not start a new paragraph,
-  and more text could be added to the last paragraph). Realized that this
-  is not possible in a QTextEdit with LogText, and using RichText is too
-  buggy to be useful. However, I found a way to get rid of the pseudo-
-  progressbar in the libmal output, so this is not an issue any longer.
-
-2003-4-16  Adriaan de Groot
-* Moved conduit config to a list of QCheckListItems, finally.
-  This was easier than I thought. Took a bit of time to polish,
-  though. This change introduces a new class ConduitConfigWidget
-  which could be placed in a tab elsewhere if needed.
-
-2003-4-15  Reinhold Kainhofer
-* Finally fixed the configure.in.in check for libmal in the malconduit
-* calendar conduit had wrong RadioButton IDs, so the Resource and LocalCalendar
-  settings were messed upt
-
-2003-4-14  Adriaan de Groot
-* Made some reasonable mock-ups, see my kpilot page, mulled over the
-  non-editing by the viewers. I'm now working in HEAD only.
-* kpilot.{h,cc} Fixed up backwards compatibility.
-
-2003-4-12  Adriaan de Groot
-* Mucking about with KPilot's UI again. Trying to remove dialogs
-  and to make the viewers just viewers.
-
-2003-4-1  Adriaan de Groot
-* My daughter, Mira Annelie Engel, was born this evening and is a
-  bouncing healthy girl. But she's going to put a crimp in KPilot
-  development, that's for sure.
-
-KPilot Developer's notes for March 26th, 2003
-=============================================
-
-2003-3-26  Adriaan de Groot
-* pilotLocalDatabase.cc [BOTH] Qt 3.0 compatibility.
-* More merging: lib/ just spacing fixes.
-* kpilot/ In HEAD, muck about with the toggle actions that were removed
-  from kpilot.cc. This stuff is supposed to build in all KDE 3.x.
-* I've been thinking about _where_ to hack next. HEAD is evolving
-  further under Reinhold's influence, and I feel pretty much stymied
-  in BRANCH because I can't touch strings and the like. However, I'm
-  still running KDE 3.1 and dedicated to KDE 3.0 compatibility as well.
-  Since the things I want to change are in lib/ and kpilot/ and affect
-  strings, I'm going to pick up those from HEAD, but stick to BRANCH
-  conduits for the next while. Then I can catch up with HEAD in the
-  conduits one by one. So initial KPilot 4.4.x tarballs will be from
-  a mix of CVS branches. We might consider doing the conduit releases
-  separately from KPilot itself - more 3rd party-ish - since the conduits
-  change far more drastically than KPilot itself.
-
-  Initial plans for 4.4.0: disable editing in the viewers ; move the
-  configuration things into the JanusWidget, and out of separate dialogs.
-
-2003-3-24  Reinhold Kainhofer
-* Adapted the layout of the addressbook conduit's setup dialog to
-  resemble the one from the calendar/todo conduit
-* Addressbook conduit: Implemented the option to sync with an
-  arbitrary vcard file instead of only the standard addressbook.
-  This actually involved quite a lot of dealing with resources,
-  factories etc., so I'm still looking for an easier way to
-  obtain the addressbook from a single local vcard file.
-
-2003-3-23  Reinhold Kainhofer
-* Lot of work on the docconduit. Finished the KPalmDOC application.
-  It converts text files to .pdb files that can be viewed as ebooks
-  on the handheld. The user can either convert single text files
-  to or from PalmDOC .pdb files, or choose a directory, where all
-  *.txt or *.pdb files will be converted to another directory.
-  I created some icons by just putting the text mime-type icon
-  behind the kpilot icon, so the icons don't look too well. All artists
-  are welcome to improve them.
-* Tried to implement a configure option for libmal, and use autoconf's
-  built-in functionality to detect libmal. Doesn't work yet, so I
-  haven't committed it yet.
-
-2003-3-23  Adriaan de Groot
-* More merging .. conduits today:
-* null/ There's a single string change, "Failure" -> "failure".
-* expense/ knotes/ Nothing changed - except the Makefile.am,
-  which breaks things in HEAD.
-* malconduit/ "" -> QString() for QString cleanness. Some authors
-  should have been credits. There's still a spelling fix string
-  change in HEAD. Lots of spacing updates.
-
-2003-3-21  Adriaan de Groot
-* Heh, noone ever noticed the "Edit Toolbars" menu item called the
-  "Edit Keyboard Shortcuts" dialog.
-
-2003-3-20  Adriaan de Groot
-* Merging between BRANCH and HEAD.
-* options.h [BRANCH] Upped the version number again.
-* lib/ [BOTH] Merged documentation, fixed minor bug in plugin.cc in HEAD.
-* kpilot/ [BOTH] Merged stuff.
-* pilotDaemon.{h,cc} [HEAD] The daemon has extra DCOP features and kroupware.
-* kpilot.h [HEAD] Extra in-use code and Ben's removal of toolbars
-  (supported by standards in KDE 3.2 - this needs backporting and
-  #ifdeffing).
-* conduitConfigDialog.cc [HEAD] Has all the setup stuff for the checkbox
-  list conversion (a GJJ) but #if 0'ed out.
-* kpilotConfig{Dialog,}.{h,cc} [HEAD] Adds a GUI for the pilot encoding.
-* kpilotDCOP.h [HEAD] Extra configure methods from David.
-* listCat.h [BOTH] One-up the spelling mafia.
-
-2003-3-17  Adriaan de Groot
-* [fileInstallWidget.cc] Applied file-installer multiselect patch
-  from Ulrik Mikaelsson.
-* [pilotDaemon.cc] Applied DCOP interface additions from David Mott.
-
-2003-3-15  Adriaan de Groot
-* The popmail conduit runs in backup mode during syncs. So do all the
-  other conduits. What's going on? Thanks to Tobia Baier for spotting this.
-  Worse still, the bug comes from the difference between & and &&. Fixed.
-* syncStack.cc [BOTH] Fixed --backup bug.
-* David Mott is back with more patches, but he's got competition from
-  Ulrik Mikaelsson, who's also doing GJJs.
-
-KPilot Developer's notes for March 12th, 2003
-=============================================
-
-2003-3-12  Adriaan de Groot
-* Lots of administrivia changes, like the FSF address.
-* Really ought to merge the copyright changes into BRANCH, since they're
-  still being released with weird copyright assignments.
-* vcal conduit in local-test mode will write out an .ics.
-
-2003-3-4  Adriaan de Groot
-* Welcome back to David Mott, author of several patches already and
-  ready to dive into the code again for GJJs. Happy distraction, dude.
-* [vcal-conduitbase.cc] Checked against wrong KDE_VERSION. [BRANCH]
-* Various merging from BRANCH to HEAD. Layout fixups here and there.
-* Test mode in the vcal conduit by default uses local databases from
-  /tmp.
-
-2003-3-3  Adriaan de Groot
-* pilotDatabase.h [BRANCH] Merged additional parameters to findDatabase
-  from HEAD. Merged every other change in lib/ from BRANCH to HEAD.
-* pilotRecord.{h,cc} [BRANCH] Added instrumentation for alloc/delete count.
-
-2003-3-2  Adriaan de Groot
-* Continued instrumentation of the vcal conduit.
-
-2003-3-2 Reinhold Kainhofer
-* the DOC conduit now also finds the correct sync direction
-  if the user only wants PC->PDA or only PDA->PC sync.
-  Also, if a text was deleted on one side, it is also deleted
-  on the other end
-* The resolution dialog of the DOC conduit now uses a QScrollView
-  instead of a QTable for the list of conflicting texts
-* In the DOC conduit, regular expressions as bookmark names work
-  now. E.g. a bookmark search string of "return (\S+);" and a
-  bookmark name of "RetVal: $1" or "RetVal: \1" replaces all $i or
-  \i by the i-th subexpression of the match.
-* DOC databases are now also kept locally if the user set this option
-  (installDatabases has the addidtional argument not to delete
-  the files)
-* The calendar and todo conduits now use the standard calendar by
-  default. The user can also specify a single  file to sync with
-  instead of the whole calendar.
-* The calendar and todo conduits use identical setup dialogs, so
-  there is no reason for code duplication. Removed the setup dialog
-  of the todo conduit and derived it from the calendar conduit setup
-  dialog.
-* Updated the copyright lines in the source files as well as
-  in the about tabs of kpilot and the conduits.
-* Since we have the calendar resource framework, the calendarr conduit
-  can run even while korganizer has the calendar open without causing
-  calendar corruption. So I removed the check for running korganizer
-  and alarm daemon
-
-
-2003-2-28  Adriaan de Groot
-* Discovered that the changes from 2003-1-31 to syncAction.{h,cc}
-  had disappeared in some of my periodic CVS screwups. Re-did them.
-* vcal-conduitbase.{h,cc} [BRANCH] Added more instruments for
-  running test mode.
-
-2003-2-27  Adriaan de Groot
-* Merged Reinhold's print-conduit-id patch from HEAD.
-* Continued updating the documentation. Ripped out the revision
-  history, Lauri says I'm the only developer in the history of
-  KDE to actually maintain it in the docs.
-* Updated version to 4.3.9 now that 4.3.8 is out.
-* Started work on a real test mode for the vcal conduit.
-* syncStack.cc [BRANCH] Set conduit action name to the conduit's name.
-
-KPilot Developer's notes for February 26th, 2003
-================================================
-
-2003-2-26  Adriaan de Groot
-* Finally solved KDE 3.0 build issues, incorporated minor fixes, updated
-  build scripts and RELEASED KPILOT 4.3.8. Get it from the website,
-  possibly in a few hours after it updates or from my personal
-  backup copy (replace pilone by adridg in the URL).
-
-KPilot Developer's notes for February 14th, 2003
-================================================
-
-2003-2-14  Adriaan de Groot
-* Happy Valentine's Day, eh. Remember guys, today your girlfriend
-  _is_ more important than hacking. Which reminds me ..
-
-2003-2-13  Adriaan de Groot
-* kpilotLink.{h,cc} [BRANCH] Added a messagesType flag to distinguish
-  error messages from normal once-only messages in shouldPrint().
-  Print out device name before opening in open().
-
-2003-2-12  Adriaan de Groot
-* Applied David Mott's DCOP patches to HEAD. Also applied his RMB
-  patches to HEAD. This takes care of some GJJs.
-* memoWidget.cc [BOTH] Replaced the label "Memos:" beside the
-  category combobox by "Category:" which is also used by the
-  address widget. Kept the old string around for safekeeping.
-* Dealing with non-latin1 Pilots again, now in Russian. And it
-  _seems_ to work. I think last week's changes were sufficiently
-  general. Added in the rest of the Pilot languages as well,
-  from the JPilot source.
-
-2003-2-10  Adriaan de Groot
-* popmail-conduit.cc [HEAD] Did some actual TODO_I18N work,
-  removed printfs from the message construction in the conduit.
-  Added a GJJ for it.
-* pilotDaemon.cc has lots of Kroupware additions in HEAD and
-  also changes "unix" -> "KDE" in the about box.
-* conduitConfigDialog.cc has lots of new code for changing the
-  conduit list to a list of checkboxes.
-* kpilotConfigDialog_base has been edited in HEAD for new Kroupware
-  options. Same with kpilotConfigDialog.cc, kpilotConfig.{h,cc}.
-* conduitSetup.cc may be deprecated, but there was a minor difference
-  between files. HEAD <- BRANCH (ie. HEAD gets BRANCH version).
-* hotSync.cc variable names changed, BRANCH <- HEAD.
-* interactiveSync.cc typos and latin1() fixes. BRANCH <-> HEAD.
-* logWidgetDCOP.h still had Log: tag in it,. removed [HEAD,BRANCH]
-* abbrowser conduit has new custom field code. Did BRANCH <- HEAD
-  for the includes, though, just to normalize 'em. But, to quote
-  TMBG, "Who keeps moving my #includes?" The only unmerged stuff
-  that _could_ be merged is minor code beautification in
-  @@ -1496,22 +1563,26 @@
-* Should re-add a Pilot*Database constructor that takes a const char *
-  for those places that already have a dbName.
-* vcalconduit has startOffset() support for alarms.
-
-
-2003-2-9  Adriaan de Groot (merge status)
-* Merging. I hate merging. We _definitely_ need a better process for
-  this, like merging every fix into HEAD as soon as it's done. That
-  would save a lot of effort, I think. And I'm going to check out
-  KPilot with -kk for merging efforts from now on. Here's the list
-  of features I found in HEAD that are not in BRANCH:
-  - KPilotDeviceLink::installFiles() extra arguments.
-  - KPilotDeviceLink::findDatabase() extra arguments.
-  - PilotDatabase::createDatabase() and deleteDatabase() added.
-  - Pilot*Database::readNextModifiedRec() extra arguments.
-  - Pilot*Database::deleteRecord() added.
-  - PilotLocalDatabase::PilotLocalDatabase extra arguments.
-  - FileInstallWidget lots of changes. FileInstaller as well. [MERGED]
-* Managed to revert, prevert, and advert syncStack.{h,cc} all in
-  one go. I think I have it back to normal now.
-
-KPilot Developer's notes for February 7th, 2003
-===============================================
-
-* KPilot 4.3.7 is released. Tarballs on the website tonight.
-* Need to backport the changes from 2002-11-10 to BRANCH.
-* Grep for and destroy latin1() calls in code. These are now in
-  the code to keep KPilot working under QT_NO_ASCII_CAST conditions,
-  but should all be replaced by the proper functions instead - either
-  QFile::encodeName() or by updating other functions to take QStrings
-  instead of const char *, and using the Pilot codec where appropriate.
-* Reinhold's on vacation for a little while.
-
-2003-2-7  Adriaan de Groot
-* Updated the website some.
-* options.h [BRANCH] Version number now 4.3.7.
-
-2003-2-6  Adriaan de Groot
-* Did a big chunk of merging from BRANCH to HEAD. Discovered two
-  things that didn't work well:
-  - Changes in the abbrowser conduit wrt. getCustomField()
-  - Memo widget optimizations
-  I hope I got them right. I'm going back to work in BRANCH.
-* Constant strings in the source are now (almost all) marked
-  with CSL1() for Constant String Latin 1. This reduces the
-  number of hits for [lL]atin1. The macro uses a syntactic trick
-  to make sure it's only applied to constant strings.
-
-
-2003-2-5  Adriaan de Groot
-* Almost everywhere [BRANCH] Search and destroyed latin1().
-* options.h [BRANCH] Handle  properly. Um, sort of.
-  The dag-blabbed file is obsolete in KDE 3.2, required in 3.1, and
-  incomplete in 3.0. Ignore it instead. Ignore all the fancy Q*
-  operator <
-  to the kpilotrc file in the top part (ie. after DeviceName).
-
-2003-2-1  Adriaan de Groot
-* Some time spent tracking down double activations of slowShowMemo().
-* memoWidget.{h,cc} [BRANCH] Removed double initialization. Removed
-  heavy-handed initialize() call after memo deletion. Found potential
-  data-loss bug with deleting memos after unselecting one. Decided that
-  extended select in this case is just _evil_. I can't decide which
-  memo to show after deselections, and there's several other problems
-  as well related to slotUpdateButtons(). Reverted the multiple-select.
-* options.h [BRANCH] Added the TODO_I18N macro to BRANCH as well,
-  where it's more important.
-* kpilotlink.cc [BRANCH] Reordered ReadSysInfo and ReadUserInfo to
-  copy JPilot's setup, maybe that will help with password issues.
-* kpilot.cc [BRANCH] Cleaned up deprecated headers.
-* conduitConfigDialog.cc [BRANCH] Preparing to repair the clumsy
-  conduit selection and activation
-
-
-KPilot Developer's notes for January 30th, 2003
-===============================================
-
-* Ugh. Looked at jpilot source. Now I remember why doing C often
-  seemed a little unproductive. But it does give some very useful
-  information: We need a combo box to choose the Pilot's encoding.
-  We can use the list from JPilot. Next, we need to make _all_ the
-  QString::fromLatin1() and QString::latin1() -- also all the
-  implicit ones -- that refer to pilot records use the right codec.
-  This will require some possibly major work on the database classes.
-* The logging is still lousy for many conduits. I ran the
-  notes and address conduits, and the log was less than enlightening.
-* We need to sync _all_ databases, not just the conduited ones.
-* Encoding and decoding non-latin1 Pilots is a priority.
-
-2003-2-1  Adriaan de Groot
-* memoWidget.{h,cc} [BRANCH] Applied patch from David Mott for the GJJ
-  "Lose QMLE". Good job! ... Ugh, and it breaks on KDE 3.0. Hacked.
-* pilotDatabase.h [BRANCH] Missing #include fixed. How this ever compiled
-  is a mystery to me.
-* pilotRecord.{h,cc} [BRANCH] Inlined trivial functions.
-* pilotRecord.{h,cc} pilotAppCategory.h [BRANCH] Start of codec support.
-* Put together some scripts to do more automated building and testing
-  in KDE 3.1 and 3.0 environments. This makes tarball delivery a _lot_
-  easier.
-
-
-2003-1-31  Adriaan de Groot
-* Let's do the time-warp again!
-* syncAction.{h,cc} [HEAD] Added a delayDone() function for use from
-  exec() to avoid possible stack growth as follows:
-  conduitExec()
-    exec()
-      syncDone()
-        SyncStack::conduitDone()
-          delete syncAction   // The one whose exec() we're still in!
-          conduitExec()       // Another conduit!
-            ...
-    return true;
-  I'm not sure I trust all the pointers to still be OK when this happens.
-  Using delayDone() makes sure that exec() and conduitExec() return
-  first and we get back to the main event loop.
-* syncStack.{h,cc} [HEAD] Using a stack instead of a queue has some
-  comp-sci chique, but little practical value. Break up the API
-  to make it more easy to use elsewhere and practical to insert
-  extra items (like Kroupware) into the sync order.
-
-2003-1-30  Adriaan de Groot
-* Removing local8bit() calls in the code. They're not wanted.
-* Marked conduitSetup.{h,cc} as deprecated and removed from build.
-* Looked into bug #52138 again, and I just can't see it. My Pilot
-  syncs fine with KAddressbook and KNotes, both ways, with names
-  and memos with any latin1 character. [Update: aha! The bug is
-  about Japanese language Sony Clie's. So it turns out there are
-  Pilots that don't use latin1 at all. I'll take a look at how
-  jpilot deals with them.]
-* I'd like to change the About box tag-line for KPilot to:
-        KPilot - HotSync software for KDE
-  for a variety of consistency reasons. This can only happen
-  in HEAD, though.
-* Reversed some confusing accidental commits by me in the
-  debugging department for the daemon.
-
-
-2003-1-26  Adriaan de Groot
-* Ugh. Still sick with the flu. Hacking just a little, though.
-  The Kroupware stuff in HEAD needs to be moved. Ugh, it's ugly.
-  It needs to become a conduit of its own, but it's hard to tell
-  just what it's doing.
-
-2003-1-24  Adriaan de Groot
-* Received a patch from David Mott that removes lots of the Log:
-  tags from the KPilot source (mostly in kpilot/). Finished the
-  job too, committed.
-
-2003-1-20  Adriaan de Groot
-* For the next little while, I'll be working in _BRANCH fixing
-  bugs as best I can. These will end up in KDE 3.1.x releases.
-  Reinhold will be working in HEAD, adding neat features.
-  BRANCH will be merged to HEAD regularly so that no bug-fixes
-  are lost in HEAD.
-* Reduced debugging output clutter in PilotAddress by changing
-  to FUNCTIONSETUPL(). Assigned Levels are: 4=PilotAddress.
-
-
-2003-1-18  Reinhold Kainhofer
-* Removed several Log: ... tags from the conduits I maintain
-* started implementing the custom fields sync of the addressbook conduit.
-  I still have problems converting a string to a QDate using a custom format
-* Cleanup of includes in my conduits.
-* Some more work on the DOCConduit. There are still several open issues, but
-  the basic functionality works just fine!
-
-
-KPilot Developer's notes for January 17th, 2003
-===============================================
-
-2003-1-15  Adriaan de Groot
-* Back to BSD. Committed lots of header file changes. Did some fixing
-  for strlcpy() in 3_0_BRANCH for folks with KDE < 3.0.5a.
-
-2003-1-11  Adriaan de Groot
-* Weirdly, I can list the databases on the pilot just fine with kpilotTest,
-  but at the end of the sync the pilot complains about the password.
-* Similarly, using the daemon I can back up the pilot just fine (pilot-link
-  0.11.3, all this) and at the end the pilot complains. The data is backed
-  up just fine, though.
-* Wow, USB connections are _fast_.
-* Weirdness comes in threes: after a while the debug output stops printing.
-  Even when it's sent to cerr directly. Hmm .. has something to do with
-  printing NULL QStrings.
-* [hotSync.cc] Every "Backing up:" message was logged twice.
-* [logWidget.cc] Added more version information. Discovered that
-  QTextView is obsolete. Fixed log tailing problem. #ifdeffed it to
-  Qt 3.1 and later.
-
-2003-1-10  Adriaan de Groot
-* [kpilot/interactivesync.cc] Some strlcpy problems when compiling HEAD
-  (or BRANCH) KPilot on a KDE 3.0 system. Since we don't maintain branches,
-  backwards compatibility in HEAD is essential. Added #if KDE_VERSION < 310.
-* [lib/kpilotlink.cc] Might have found the source of the KPilot-hangs-with-USB
-  problems. There's a note in the QSocketNotifier docs saying not to disable
-  read-notifiers.  I did anyway, and it never caused problems before.
-  Added some workaround crud.
-* I'm currently building kdelibs and base and pim on a Linux box, something
-  I haven't done in over a year. This will allow me access to a USB stack
-  that can actually handle the m500, so I can do some more testing.
-  Primary platform remains FreeBSD, though, for all-the-other-KDE-problems-
-  on-nonlinux.
-* Made a round of removing , since it's already in options.h.
-  Needed a "using namespace std;" in options to get stuff to work.
-
-2003-1-9  Adriaan de Groot
-* Made new tarballs of the build system (for 3.0 and 3.1) and
-  the sources.
-* Decision: I'm going to do bugfixes in _BRANCH. Reinhold can do
-  bugfixes and new conduits in HEAD, and I'll merge from BRANCH to
-  HEAD fairly regularly. I think that's the best balance between
-  getting stuff out the door and sticking to the KDE release schedule.
-* Decision: Remove all the Log: tags from the source files.
-  The Id: tags stay in, for debugging output.
-
-2003-1-1  Adriaan de Groot
-* Ho ho ho. Happy new year.
-
-KPilot Developer's notes for December 30th, 2002
-================================================
-
-2002-12-30  Reinhold Kainhofer
-* Some more work on the docconduit. I'm currently restructuring again,
-  so right now it doesn't work at all, but should be finished really
-  soon now.
-* Add a method PilotDatabase::deleteDatabase() to delete the database.
-* Add a warning to the vcal conduit's setup dialog to clear any
-  misconception about conflict resolution. Also changed "Pilot" to
-  "handheld" at several places.
-
-2002-12-15  Reinhold Kainhofer
-* Added a parameter "bool useDefaultPath=false" to
-  PilotLocalDatabase::PilotLocalDatabase to prevent resetting
-  the dbPathName to the default path (kpilot/DBBackup/UserName)
-
-2002-12-13  Reinhold Kainhofer
-* Initial import of the docconduit, which syncs text files on
-  the desktop with PalmDOC databases (kind of e-book format for
-  the palm) on the handheld for use with AportisDoc, TealReader,
-  QED, etc.
-* VCalConduit: yearly recurrence now works correctly (had wrong
-  yearly recurrence type rYearlyDay instead of rYearlyMonth)
-* Addressbook conduit: _equal also compares the categories to
-  check if an item was changed
-* Added the new methods createDatabase(..) and deleteRecord(..)
-  to the PilotDatabase classes. createDatabase creates a new
-  database with given type and creator, and deleteRecord deletes
-  either a single record or all records in the whole database
-* PilotDatabse::readNextModifiedRec has a new optional argument
-  of type int* which receives the index of the returned record.
-* PilotDatabase::findDatabase has optional arguments
-  int index=0, long type=0, long creator=0
-
-
-
-KPilot Developer's notes for november 10th, 2002
-================================================
-
-2002-11-10  Adriaan de Groot
-* Is kate acting up? I would have sworn I did some ChangeLog
-  editing last night. Anyway:
-* Expanded the DCOP interface so the daemon can signal KPilot
-  when the HotSync is done. This causes postHotSync things to
-  be called and unfreezes the FileInstaller.
-* Adjusted the progress bar during installing files.
-* Daemon->Quit now still waits til lthe end of the sync.
-* Display some form of progress during a restore. Reduce verbosity a little.
-
-2002-11-08  Adriaan de Groot
-* Clear the file installer list after a HotSync. Disable dropping files
-  on the installer during a Sync.
-* When installing files, the "done" message was printed at the
-  beginning of the last file to be installed. Fixed.
-
-2002-11-07  Adriaan de Groot
-* only call slotTextChanged() in the MemoWidget
-  when switching memos, and only if the memo is changed.
-  This saves rewriting the database every time you hit a
-  key in the memo edit box.
-
-2002-11-06  Adriaan de Groot
-* Fix the KNotes conduit's name.
-
-2002-11-05  Adriaan de Groot
-* Patched up the website again a bit.
-* Mucking about in libkcal to make it useful for KPilot.
-* Lots of includes changed in the vcalconduit to reflect that.
-
-2002-11-02  Adriaan de Groot
-* Regarding the "Hidden config feature", it's in the group for the
-  popmail conduit, called "outboxFolder". Set it to the i18n'ed name
-  of KMail's outbox. Damn KMail's DCOP interface / config. This
-  should make it possible to send mail with KMail again.
-* Finally got a separate build tree of KPilot working. Can distribute
-  sources again, now, assuming SLAC can suffer the bandwidth penalty.
-* Most of libkcal's header files aren't installed. Why? Is it really intended
-  to be totally internal to the kdepim module in KDE's CVS?
-
-2002-10-31  Adriaan de Groot
-* Happy Hallowe'en, eh.
-
-2002-10-27  Adriaan de Groot
-* Don't you hate code / feature freezes? It always stops KPilot development
-  in it's tracks, if only because fixing the bug related to KMail's outbox
-  requires a new string. Bitch bitch, moan moan.
-* Added new TODO_I18N macro to flag I18N todos. The popmail
-  conduit is a big candidate for fixups.
-* Thought of a new starter project: moving the popmail conduit config
-  dialog to Qt Designer. Another one would be to fixup the capitalization
-  of popmail in that conduit.
-* Added extra undocumented configuration option to the popmail
-  conduit in an effort to save KMail sending capability.
-
-
-KPilot Developer's notes for september 19th, 2002
-=================================================
-
-
-2002-09-13  Reinhold Kainhofer
-* Finally, the addressbook conduit is in a shape where I can release
-  it with beta 2. There are still some issues (e.g. duplication as
-  conflict resolution is messed up on the next sync. Also, entries
-  with newlines in an address field are always determined as changed,
-  so the fast sync is not so fast with them.), but they can be targeted
-  later on.
-
-2002-09-10  Adriaan de Groot
-* Problems related to immediate "Exiting on Cancel" traced back to
-  having two pilot-link versions installed; compile against one
-  and link against the other.
-
-2002-09-02  Adriaan de Groot
-* Added finer-grained pilot-link version checking in configure.in.in.
-  Removed all support for ancient pilot-link versions.
-
-2002-08-30  Adriaan de Groot
-* Much mucking about with dlp_ functions in an attempt to discover why
-  syncing wasn't discovering _any_ of my databases. Also handling
-  dlp_ReadUserInfo failures, indicating possible password use. Weird.
-
-2002-08-28  Adriaan de Groot
-* Mess around a bit with Chris' crashes and the exiting-on-cancel one.
-* PilotDaemon not passing on correct signals and slots to KPilot.
-  This should finally enable some progress-meter changing.
-* Ditched the check of dlp_OpenConduit when the device is opened
-  initially, it's returning -18 after the user name is read correctly.
-  The USB support under FBSD is still very patchy, though, since
-  it thinks I have just one database.
-
-2002-08-24  Adriaan de Groot
-* Add a "Fail Now" mode to the NULL conduit to help debugging.
-
-2002-08-24  Adriaan de Groot
-* (syncAction.cc) Whoops, forgot to implement the timeout feature
-  in interactive questionYesNo.
-* One more go through all the sources removing warnings.
-
-2002-08-23  Adriaan de Groot
-* (addressWidget.cc) Added more debugging output in response to bug #45977.
-  Gosh, it's even a FreeBSD user. This basically means that the database
-  can't be opened, and I have no idea why.
-* (kpilotlink.cc) Added more debugging output in KPilotLink::acceptDevice()
-  to deal with problems from Chris Cowell and Beat Straehl.
-* (kpilotlink.cc) (Perhaps) check pilot-link version more gracefully.
-* (pilotUser.h) bzero() new KPilotUser data structures, just in case.
-* (interactiveSync.cc) Fix compile warnings.
-* (knotes-action.cc) Fix bug that causes the KNotes conduit to hang
-  when KNotes isn't running.
-* (everything dependent on SyncAction) Changed the type of exec() to virtual
-  bool, and removed it from the slots. Added a new slot execConduit() which
-  calls exec(). This makes you return a value from exec(), and false is intended
-  to indicate "processing never started due to errors" and will cause execConduit()
-  to generate a generic error message and emit the syncDone(this) signal, which
-  is otherwise easily forgotten when just doing return;
-
-
-KPilot Developer's notes for august 15th, 2002
-==============================================
-
-2002-08-15  Reinhold Kainhofer
-* Implemented categories in the todo conduit
-* Fixed the bug which prevented error messages from
-  being included in the hotsync log (the signals from
-  fDeviceLink were not connected!)
-* Included the malconduit in the CVS tree (but disabled
-  its compilation for now), wrote several
-  emails asking for permission to either relicense libmal
-  to use MPL 1.1, or to include special permission into
-  KPilot's COPYING to permit linking to libmal.
-
-
-KPilot Developer's notes for july 31th, 2002
-===========================================
-
-2002-07-31  Reinhold Kainhofer
-* Added a time conduit which syncs the time from the pc to the palm
-* Also wrote an AvantGo conduit, but didn't add it to the cvs tree yet
-  because it uses libmal, which is MPL (and thus GPL-incompatible).
-  We have yet to figure out a way to make them compatible...
-
-KPilot Developer's notes for july 17th, 2002
-===========================================
-
-2002-07-17  Reinhold Kainhofer
-* A first almost-working version of the address conduit. Chances are,
-  some data will be lost, but most parts work. "Duplicate entries"
-  conflict resolution setting does not yet work.
-
-
-KPilot Developer's notes for july 4th, 2002
-===========================================
-
-2002-07-04  Reinhold Kainhofer
-* Added a function KPilotDeviceLink::tickle() which prevents a timeout
-  on the palm side if it is called with a timer (e.g. when a dialog is open)
-* Some more work on the addressbook conduit, which seems to be trickier
-  than I had thought initially.
-
-
-KPilot Developer's notes for june 24th, 2002
-============================================
-
-Moving on past 3.0.2 and trying to sort things out.
-
-2002-06-24  Adriaan de Groot
-* The config file the daemon allocates is read-only. This is inconvenient
-  when conduits want to save data in the config file. Backed that out,
-  am now worried about what happens when you leave the KPilot UI running
-  during a sync, since both applications have a RW copy of the config file.
-
-2002-06-24  Reinhold Kainhofer
-  Still fighting with the addressbook conduit. The Palm -> PC way already
-  seems to work. Haven't committed anything yet to prevent breaking
-  compilation of the kdepim module with a conduit which won't work yet anyway.
-
-
-KPilot Developer's notes for june 16th, 2002
-============================================
-
-2002-06-16 Reinhold Kainhofer
-* backported many fixes in the vcal conduits to the BRANCH for the 3.0.2
-  release.
-* For the addressbook conduit I implemented a method
-  QValueList PilotDatabase::idList()
-  which returns a list of all record ids in the database
-* KPilotDeviceLink::openDatabases now fetches the database from the palm
-  if no backup copy exists on the PC.
-
-KPilot Developer's notes for june 9th, 2002
-===========================================
-
-Not sure just what Reinhold has been up to recently, but
-I know I've been sitting in the sun and relaxing. Mostly.
-
-H==HEAD, B==Branch in the bracketed notes after the patch description.
-
-2002-06-10  Adriaan de Groot
-* Using version 4.3.3 in BRANCH for the 3.0.2 release, and
-  4.3.4 in HEAD for later.
-
-2002-06-08  Adriaan de Groot
-* Conduits, conduits, conduits and documentation, documentation, documentation.
-  That's what we need. Sigh.
-
-2002-06-07  Adriaan de Groot
-* Patched VCalConduitBase::cleanup() to be careful about
-  calling functions on objects that may not be allocated. [H,B]
-* Patched VCalConduitBase to use variables from ConduitBase. [H]
-* Added tooltip for daemon. Gosh, that's ugly. Should put a
-  nicer message in there. [H]
-
-KPilot Developer's notes for may 25th 2002
-==========================================
-
-2002-05-23  Adriaan de Groot
-* KNotes syncing now really seems to work both ways.
-* Time to deal with a lot of little administrative files.
-* Fixed tooltips in config dialog.
-* KPilotTest now resets after a sync as well.
-* Added hooks in LogWidget to allow extra buttons.
-
-2002-05-21  Adriaan de Groot
-* Renamed PilotDatabase::cleanUpDatabase() to cleanup(), this
-  affected the Serial and Local reimplementations and also the
-  abbrowser conduit, which is the only conduit to do the right
-  thing and cleanup the database after a sync.
-* Added missing close and delete on the databases for plugins.
-
-2002-05-19  Adriaan de Groot
-* Time to take a good hard look at the conduits individually.
-  We'll start with the notes conduit, since it only does one-
-  way syncing. I suspect this will chime in some more testing
-  instrumentation in the base classes for conduits, too.
-* Changed lots of bitconstants to hex, for clarity.
-* Added a FlagLocal to plugin.h with the intent that you can
-  then try to sync two _local_ databases -- so you don't even
-  need a Pilot for testing.
-* The KNotes conduit now tries to do something sensible with
-  getting notes back to the Pilot, but fails.
-
-KPilot Developer's notes for may 18th 2002
-==========================================
-
-2002-05-18  Adriaan de Groot
-* Bunch of compile fixes. What happened?
-
-2002-05-15  Adriaan de Groot
-* Updated the version number.
-* Removed the device type combobox, since it's not needed.
-* Updated the what's this text for the speed combobox.
-* Removed the "alpha" warning from the log widget.
-
-
-KPilot Developer's notes for april 28st 2002
-============================================
-
-Hopefully we'll have merged the HEAD version of the vcal conduit --
-by Reinhold K. -- with branch so that it actually works.
-
-
-
-KPilot Developer's notes for april 21st 2002
-============================================
-
-A week when I should have been working on KPilot, and I've been
-working on the build system instead. Reinhold K. has hinted that
-he's making tremendous progress on the vcal conduit, which is a good thing.
-
-2002-04-20  Adriaan de Groot
-* Closed a few bugs that I could verify are resolved. Other conduit-
-  related bugs remain open even if I suspect they're done, since I
-  haven't actually physically tested them.
-
-2002-04-16  Adriaan de Groot
-* Finally committed all of David B's patches and things. [HEAD]
-* More modification of configure.in.in and the Makefile.am's to
-  make pilot-link more easily found (I hope). [BRANCH]
-
-2002-04-15  Adriaan de Groot
-* Cosmetic fix: center splash image under KDE3 as well.
-* Fixed misleading debug statement when KPilot starts the daemon.
-
-KPilot Developer's notes for mid-april 2002
-===========================================
-
-2002-04-13  Adriaan de Groot
-* Received a patch from Carlo Perassi for handling cases where there
-  is no user name set in the Pilot.
-* Worked on configure changes to detect pilot-link automatically and
-  properly. [BRANCH]
-
-2002-04-09  Adriaan de Groot
-* Did some minor debugging in setting flags for the conduits.
-
-2002-04-07  Adriaan de Groot
-* There are now two real branches of development for KPilot. KDE_3_0_BRANCH
-  gets bugfixes to the existing code, while HEAD gets new features. I imagine
-  I'll merge BRANCH back to HEAD sometime when I feel that the main bugs
-  are out (like next week, I hope). I'll be showing where patches go until
-  we merge again.
-* Added a message (no i18n) showing KPilot and pilot-link versions.
-* Still need a workaround for dlp_addSyncLogEntry() for pilot-link 0.10.1
-  [BRANCH - should go in HEAD as well]
-* Fixed Makefile.am bug in popmailconduit. [BRANCH]
-- --test mode wasn't working with kpilotTest (when running conduits) [BRANCH]
-
-2002-04-06  Adriaan de Groot
-* Applied patch to avoid crash with undefined symbol. I forget who sent
-  it in, though. Thanks to you, anonymous! Wrote a script to catch this
-  kind of situation in the future.
-
-
-
-KPilot Developer's notes for sometime in march 2002
-===================================================
-
-2002-03-09  Adriaan de Groot
-* Sanitized syncStack so that nextAction isn't so ambiguous.
-* Fixed missing default (--list) in kpilotTest.
-* Some neatness fixes in pilotDaemon.cc and pilotDaemonDCOP.h.
-* Test syncs shouldn't run conduits or install files. Fixed in pilotDaemon.
-* The daemon leaked 2 FD's on every sync, which is bad. Added some extra
-  ::close() calls, which fixes this (under p-l 0.9.5 and 0.10.1).
-* Mucked about with USB devices some more, but it looks like the m500
-  is going to be unusable under FBSD for some time. This isn't bad, since
-  I can then concentrate on getting things working with the serial PalmV.
-* It might be a good idea to start using the daemon to do just device tests
-  instead of kpilotTest -- though it doens't make a big difference.
-
-2002-03-08  Adriaan de Groot
-* Fiddled around w/ getting a broadband connection, for whatever
-  reason. I guess effortless connectivity is the goal. Fiddled with
-  my new m500 USB and discovered that pilot-link 0.10.1pre works
-  perfectly with it under Linux (well, pilot-xfer -l works). Under
-  FreeBSD, though, it seems that there's nothing available for this
-  kind of device. Hmph. So now I need to spend some time to figure
-  out how to get KDE up and running on my somewhat deprecated Linux
-  install. Serve the source by NFS?
-
-2002-03-07  Adriaan de Groot
-* Finally picked up where I left off, adding yet another message to
-  the startup log window (again, I think this is temporary). The versions
-  of relevant items now appear there.
-* Messed around with crashes while deleting CleanupActions.
-
-2002-03-06  David Bishop
-* Lots of work on exporting memos in XML format. It looks like the
-  whole memo viewer widget is going to be reworked, slightly.
-* Finished off the kdDebug() repairs someone else started.
-
-KPilot Developer's notes for february 11th 2002
-===============================================
-
-2002-02-06  Adriaan de Groot
-* kpilot/listItems.cc lib/pilotRecord.cc
-  - Removed some FUNCTIONSETUPs, since they were really clogging debugging
-    output and not adding anything interesting. Changes some other
-    debug output as well.
-* kpilot/addressWidget.cc
-  - I *think* I squashed a memory leak, caused by createTitle which
-    was still returning char * instead of QString. Moved to QString anyway.
-
-2002-02-03  Adriaan de Groot
-* kpilot/Icons/kpilot-hotsync.png
-  - Whipped up a new icon for HotSyncing. This makes all the icons in
-    the Janus view the same size.
-
-KPilot Developer's notes for february 2nd 2002
-==============================================
-
-2002-01-26  Adriaan de Groot
-* Wherever
-  - Invented an icon for the address viewer.
-  - Doubleclick on conduit in active column configures it.
-  - Fixed some compile problems under KDE3.
-  - Messed around with the vcal conduit.
-  - Configuring conduits resets the daemon.
-  - You can't reset the daemon during a sync; replaced fQuitAfterSync.
-
-I'm starting to think the logWidget belongs with the *daemon*
-(and should be showable from the daemon's context menu), not
-from KPilot (which should be just a viewer). Opinions?
-
-2002-01-27  Adriaan de Groot
-* Wherever
-  - Got rid of the remaining dlp_ functions in code outside
-    of kpilotlink.cc and pilotSerialDatabase.cc. This leaves the pi_ stuff.
-
-Development of KPilot is now done on a 80x25 serial terminal running at
-38400 baud. I have no idea what kind of effect this will have, but it means
-I can sit on the couch and do devel work :)
-
-2002-02-02  Adriaan de Groot
-* lib/kpilotlink.{h,cc}
-  - Continue moving pilot-link related things (pi_*) into the KPilotLink
-    class, so that Dag might have an easier time of it.
-* lib/options.cc
-  - Removed some messy #ifdef DEBUG stuff, with debugging enabled
-    call tracing is now default on.
-* kpilot/logWidget.cc
-  - Added some text stating that KPilot is really alpha. No-one will read
-    this, of course, and it will only piss off the translators.
-
-KPilot Developer's notes for january 25th 2002
-==============================================
-
-Found my Pilot again, made tea, thought about Dag's and Neil's comments
-on ColdSync (I still believe that ColdSync has the drawback that it's not
-meant to be a library you can build on, it resembles the pilot-xfer tools
-much more than anything else). Grepped for dlp_ in the sources. They seem
-fairly isolated, which is good -- maybe we *can* move to some other Pilot
-access method.
-
-Looked at some old sources. *uuuuugly*. PilotRecord, PilotAppCategory,
-PilotTodoEntry, etc. could use a good dose of sanity.
-
-2002-01-21  Adriaan de Groot
-* conduits/vcalconduit/*
-  - Some serious rewriting going on.
-* kpilot/hotSync.cc
-  - Removed old KPilotLink code
-  - Moved calls from dlp_OpenConduit to KPilotDeviceLink::openConduit()
-* lib/syncAction.h lib/kpilotlink.{h,cc}
-  - Added openConduit to abstract the underlying lib interface more.
-* kpilot/logWidget.cc
-  - suppress empty log lines.
-* lib/pilotLocalDatabase.{h,cc}
-  - Added a hook for UserCheck to set the default search path for
-    databases opened by name only.
-
-It's time to say hi, welcome, and thanks to a couple of new people on
-the KPilot / kde-pim team. There's Chris Abiad, who has already made his
-presence felt on the mailing list. Thanks for fielding questions for
-me, Chris, and stalling on the question of when the next release is.
-Chris will also be maintaining the website. Next up is Stephanie Bryant,
-a writer of technical documentation. She'll be helping me document the
-various files in kpilot/lib so that they actually form an understandable
-and usable API for third-party conduit-writers. Philipp Hullmann, you
-should be overjoyed to hear this :) Once she's practiced on KPilot, Steph
-will be leaving us for kdelibs, where weird and wonderful things await ...
-
-2002-01-25  Adriaan de Groot
-* *.ui
-  - Danimo was wondering why we use ToolTips everywhere instead of WhatsThis.
-    My answer was "because we knew about QToolTip before QWhatsThis." Anyway,
-    switching over to the correct form of on-line help is a simple search-
-    and-replace thing. So that has happened. David, can you keep that in
-    mind as well?
-* kpilot/pilotDaemon.{h,cc} kpilot/Icons/
-  - Minor changes to get the daemon's icons to display properly.
-  - Woo.. the busysync icon is *ugly*. Partly fixed, and I hope Kristof
-    can do something about it sometime. Really we need the icon in 4 rotated
-    states (well, maybe 2) to indicate activity during the sync.
-  - Of course the daemon was exiting after each sync .. I forgot to initialize
-    fQuitAfterSync (which isn't used, BTW, except if you use DCOP to call
-    quitNow()) to false.
-* kpilot/kpilot.cc
-  - Forgot to inform daemon of changing settings.
-* kpilot/syncStack.cc
-  - All conduits now put *something* in the Sync log.
-
-
-KPilot Developer's notes for january 20th 2002
-==============================================
-
-It's been a slightly sleepy time. Some rocky backporting has occurred,
-though, as KDE3-isms sneak into the codebase and break my compiles at
-home. At work, though, I've switched to KDE3 and it's really nice.
-Now if only I could release a version of KPilot that works before KDE3
-comes out and makes all this compatibility effort moot ...
-
-2002-01-15  Adriaan de Groot
-* conduits/vcalconduit/*
-  - Class Recurrence is the KDE3 name of class KORecurrence. Where the
-    libkcal API has changed, added #ifdefs to use the right one, and
-    #define Recurrence KORecurrence when compiling under KDE2.
-2002-01-16  David Bishop
-* *.ui
-  - Added 's to all tooltips, neatness fixes.
-2002-01-16  Adriaan de Groot
-* lib/options.{h,cc}
-  - Added support for both ostream and kdbgstream << QSize to avoid
-    plugin crashes when the plugin is compiled with different DEBUG_CERR
-    settings from libkpilot.
-2002-01-19  Adriaan de Groot
-* Documentation
-  - Added a warning "Docs out of date" to the docs, adapted all the top-level
-    README &c. files to reflect the current situation.
-2002-01-20  Adriaan de Groot
-* lib/pilotLocalDatabase.{h,cc}
-  - Added new constructor that doesn't take a path, but just uses the
-    application-instance database directory.
-* lib/plugin.{h,cc}
-  - Added isRunning() to PluginUtility, since several conduits need to
-    know if the application they are syncing is already running or not.
-* conduits/knotes/knotes-action.{h,cc}
-  - Replaced knotesRunning by call to isRunning();
-* conduits/vcalconduit/*
-  - Started a real re-write of the vcal conduit (what??!)
-* TODO
-  - Updated the TODO list with some concrete stuff.
-
-KPilot Developer's notes for december 31st 2001
-===============================================
-
-Time to go out with a bang, eh.
-
-Fixing the VCal conduits so they actually do a sync was a fair bit of
-work, partly because it was so weirdly crufty, partly because of the
-peculiar separation of the todo from the vcal conduit.
-
-
-2001-12-28  Adriaan de Groot
-* conduits/vcalconduit/vcalBase.{h,cc}
-* conduits/vcalconduit/vcal-conduit.{h,cc}
-* conduits/vcalconduit/todo-conduit.{h,cc}
-  - Well, it compiles now.
-* lib/plugin.{h,cc}
-  - Added isBackup() so that conduits can now also do their own
-    backups. Note that conduits aren't called (yet) during a backup
-    action.
-* conduits/popmail/*
-  - Why the heck does this (still) use FILE *?
-  - It compiles and there is a sync action.
-
-Next up is checking out kpilotTest and making sure that it does sensible
-things, like closing the device handle, allowing multiple syncs, and
-running file install correctly. After that, testing testing testing.
-
-2001-12-28  Adriaan de Groot
-* kpilot/main-test.cc
-  - Added one-letter cmd-line-options, sanity checking.
-  - Switched to SyncStack integrated syncing (see below).
-* kpilot/main-config.cc
-  - Removed unused new-style option.
-* kpilot/syncStack.{h,cc}
-  - New files encapsulating sync sequence knowledge.
-
-2001-12-29  Adriaan de Groot
-* kpilot/pilotDaemon.{h,cc}
-  - Switched to SyncStack.
-* lib/kpilotlink.cc
-  - Work around an off-by-one bug in pilot-link versions < 0.9.6.
-* kpilot/interactiveSync.cc
-  - Added support for don't ask again in the check-user questions.
-    This changes the API of questionYesNo, but only inserts a
-    (defaulted) parameter, so "regular" calls of this should be
-    unaffected.
-
-The GUI isn't updated at all (?) during a backup action. Hmph. Well, only
-between databases, but that's not much. The backup appears to work, which
-is a good thing. Gonna hafta try the restore action soon ;)
-
-2001-12-29  Adriaan de Groot
-* conduits/null/null-*.{h,cc}
-  - Fixed some configuration load / restore / use bugs.
-    Moved configuration keys to the factory.
-* kpilot/syncStack.{h,cc}
-  - The conduit proxy action also needs to proxy the messages from the conduit.
-    I never knew connect(p,SIGNAL(),q,SIGNAL()) worked! Wow.
-* kpilot/logWidget.{h,cc}
-  - Added missing slot for logProgress.
-
-Aieee! I'm becoming a kate user, vi is suffering from abandonment on my
-devel box. This is troubling -- using the software you write. Heck, next
-thing you know, I'll be using KPilot to sync my Pilot. Ewwwww.
-
-
-2001-12-29  Adriaan de Groot
-* kpilot/conduitConfigDialog.{h,cc}
-  - Removed old Exec= style conduits entirely. They're warned for now.
-* conduits/abbrowserconduit/*
-  - See conduit run. See DrKonqui. Whee! Oh, and this *one* conduit has
-    a name of the form bla_conduit, while all others are bla-conduit. Yay.
-    See pointer get used before initialization. Cool! It crashes elsewhere.
-    Isn't delayed loading great? __rs__FR11QDataStreamRt5QDict1Z12ContactEntry
-    And ... that was fucking amazing. Greg, you da man.
-
-    OK, so that one also runs to completion, at least the first time. It looks
-    like FirstTime isn't being turned off like it should, so I'll do that by
-    hand. OK, changes get copied from the Pilot to KAddressbook ok, but the
-    conduit seems to read *all* records from the Pilot, not just the modified
-    ones. That's bad for the batteries. Oh well, I'm just so happy it works
-    that I'll move on to the next conduit and deal with bugs tomorrow.
-* conduits/expense/*
-  - Seems to work fine.
-* conduits/knotes/*
-  - Undefined symbols ... man, I (semi) hate libtool libraries.
-    See, I just left some essential code *out* here, and thus libtool
-    thinks it'll be resolved later. Ha!
-
-    OK, it at least copies new KNotes to the Pilot. That's enough for now.
-* conduits/popmail/*
-  - Um, does this actually *do* anything? OK, config fixes, dcop fixes ...
-    and voila, a message shows up in the outbox of KMail. So let's call
-    sending via KMail a success and have a cup of tea.
-* conduits/vcalconduit/*
-  - Now things get hairy / exciting. Let's start with the ToDo conduit:
-
-    kpilotTest: WARNING: [void ConduitProxy::exec()] : Can't create SyncAction.
-
-    Very wise. Of course, the code to create a conduit is not in the
-    factory. Brilliant! Nothing a little cut-n-paste can't cure, and
-    configure, and .. DrKonqui. Did some indenting, my brain hurts from
-    trying to (a) understand this (b) fix all the memory leaks. Rewrite?
-  - VCalConduit: it doesn't crash, but it's probably going to read all
-    the things from my Pilot and install them in KOrganizer with a date
-    of 0000/00/00 (from looking at the debug messages as they fly by).
-    And .. whump, KOrganizer now can't read the .ics file anymore.
-
-*Every* sync, KPilot tells me that the name in the pilot is different
-from the name in KPilot. Gotta fix that.
-
-2001-12-30  Aaron J Seigo
-* kpilot/logWidget.cc
-* kpilot/kpilot.cc
-  - Paint the KPilot version number in the splash screen.
-
-2001-12-30  Adriaan de Groot
-* conduits/vcalconduit/vcal-conduit.cc
-* conduits/vcalconduit/vcalBase.cc
-  - Removed some __FUNCTION__ things, added #ifdef DEBUG to debug code.
-    In some other files, too.
-  - The code in vcalBase.cc is in heavy need of an invocation of indent.
-    It's horrible and ugly in other ways, too, but this is a start.
-
-2001-12-31  Adriaan de Groot
-
-Some general polishing of ToolTips &c.
-
-* kpilot/*
-  - Added Kristof's icon for the file installer. It's still a preliminary
-    version, though.
-  - TODO: after reconfiguring the username, re-initialize all components
-    in kpilot, to get the new databases.
-  - Switched the ToolTips in the address viewer to use 
-  - TODO: ditch the toolbar; perhaps add the select-kind-of-sync
-    functionality to the logWidget.
-
-KPilot Developer's notes for december 27th 2001
-===============================================
-
-So I never posted the previous notes. And besides Maarten's little comment
-on the odd jobs, no response either --- but then again, it was Xmas and
-maybe people had more important things to do. I know I had enough dinners
-that I can fast & hack for the rest of the week.
-
-Things fixed now:
-
-* conduits/vcalconduit/
-  - All the configuration dialogs now look ok, after a little fiddling
-  about with the .ui files, and the configuration is saved as well.
-  A sync is out of the question right now.
-
-Yet another odd job: someone (David?) needs to check all the ToolTips
-in the .ui files for the conduits with Qt *2*'s designer. And we need
-to check that all the configurations are in fact saved properly. Testers?
-
-KPilot Developer's notes for december 23rd 2001
-===============================================
-
-HoHoHo. Let's look back in the ChangeLog to see where we were one year ago.
-Struggling with the vcal conduit (it's *still* wonky); missing the 2.1
-release deadine (was it that long ago?); cleaning up code.
-
-In these complex modern final days, (to quote Pogo), what's up?
-
-2001-12-18  Adriaan de Groot
-* conduits/expense/*
-* conduits/null/*
-  - These two conduits now have a full configure dialog that's sized
-  correctly (afaict without messing around with font settings), that
-  saves the settings, and have a working sync action. Whee!
-
-2001-12-20  Adriaan de Groot
-* conduits/abbrowser/*
-  - This conduit now has a working config dialog and does a sync, although
-  I haven't really looked at the sync code itself to check for bugs.
-* conduits/knotes/*
-  - Ditto; it configures and syncs, although the sync is rather sparse.
-  I discovered that const char * const is a useful type, though. It saves
-  an accessor function for KConfig entry keys.
-
-The bad conduits:
-
-* conduits/popmail/*
-  - Still no .ui file and not many tooltips, but you *can* configure
-  this conduit. No sync though.
-* conduits/todoconduit/
-  - This one is seriously deprecated and I'll try to remove it soon.
-* conduits/vcalconduit/*
-  - It's got a .ui file which is used badly and which is missing layouts.
-  Not a hint of saving configurations though.
-
-OPEN JOBS:
-
-Are you bored? Is your love life lackluster? Do you want to MAKE MONEY FAST?
-Do you want to FIND OUT WHAT MICROSOFT DOESNT WANT YOU to KNOW? ... um ...
-back to reality: If you'd like to help out with KPilot but don't really know
-where to start, and would like to get a little acquainted with the code,
-the coding style, and some of the conventions used in KPilot, read on!
-If you have grep and a text editor, read on!
-
-The code, and particularly the debugging code, has gone though a number
-of phases. For a while, there was that --debug 1023 stuff. I've decided
-that that's actually kinda cumbersome for a GUI program, and debugging
-has switched back to an all-or-nothing kinda thing. So some things need
-to be changed all over the source code, and that's just the kind of
-exploratory job for someone with grep and vi. In particular:
-
-* kdDebug() everywhere needs to change into DEBUGCONDUIT, DEBUGKPILOT,
-  or one of the other DEBUG* macros defined in kpilot/lib/options.h.
-  This will send the debugging output to the sensible debug area.
-  Which one you choose depends on where the file lives -- choose wisely.
-
-* DEBUG* calls everywhere need to be surrounded by #ifdef DEBUG #endif.
-  This is because some compilers don't optimize away unused strings,
-  leading to big bulky (well, sorta) executables. Adding the #ifdefs
-  makes sure that there's nothing at all left over from the debugging code
-  when debugging is turned off.
-
-* __FUNCTION__ needs to be replaced by k_funcinfo. The popmail conduit is
-  bad for that one, at the very least.
-
-* if (debug_level) and its cousin if (debug_level & SOMETHING) need to be
-  removed, along with the set of brackets they introduce. The debugging
-  statement (usually just a kdDebug() << whatever << endl;) needs to be
-  out-dented one tabstop, to line it up properly.
-
-These are, in one sense, rotten little jobs. But they'll take you to all
-the corners of the KPilot code, show you some ugly (and some not-so-ugly)
-code, and give you a feel for "the lay of the land." After that, fixing
-all the remaining off-by-one bugs in the vcal conduit should be a breeze.
-
-KPilot Developer's notes for december 16th 2001
-===============================================
-
-Worked on some conduits for danimo, who has UI updates. So more conduits
-compile now, but I haven't tested them. However, they do get installed
-if you do make install, and they may eat your Pilot, you Buick, or New York
-when run. USE EXTREME CAUTION.
-
-I think the NULL conduit is safe, though :)
-
-Abbrowser Conduit: it compiles, and it has but a setup dialog and a
-sync part which has not been tested at all.
-
-* Makefile.am
-  - Fixed up includes, removed old PISOCK_INCLUDE.
-* abbrowser-conduit.cc
-  - Changed kdDebug() to DEBUGCONDUIT, applied indent style, #ifdef DEBUGs
-  - Replaced static QString objects by const char * (KConfig keys)
-  - Removed old files
-  - Assume FirstTime is always *true*, this is at least partly broken,
-    but it makes the conduit compile at least.
-
-The other conduits all compile and have config dialogs but don't do anything.
-
-And in other news, little bugfixes and other neat stuff sometimes shows up
-in my mailbox. Martin Junius is a long-time contributor, and he's volunteered
-(again) to make new KPilot rpms for RH 7.2 once the system is stable again.
-
-* kpilot/addressWidget.cc
-  setupWidget() - Martin Junius found a display bug and sent a patch.
-* conduits/vcalconduit/vcal-conduit.cc
-  setRepetition() - Philipp Hullmann noticed that the Pilot's week starts
-  on day 0 = sunday, and in KDE day 0 = monday.
-
-KPilot Developer's notes for december 2nd 2001
-===============================================
-
-More work on the expense conduit. In conduits/expense:
-
-* setupDialog.h
-  - Added an #include  to make header self-contained.
-* setupDialog.cc
-  - Disabled MySQL button, since there's no code to make it work.
-  - Disabled "logRotate" stuff, since I can't remember what was
-    wanted there and there's no code for it.
-* expense.cc
-  - Reordered #includes, removed extra #ifdeffing. Removed extra #includes.
-  - Split up actions into CSV, MySQL and Postgres specific parts.
-  - Made the other-db methods also write CSV files if needed.
-  - Support both overwrite and append modes for CSV.
-  - TODO: create the mysql code.
-  - TODO: patch possible security hole in echo passwd |
-  - TODO: spawn fewer processes for psql.
-  - TODO? use klocale's date formatting, not US-specific code.
-* expense.h
-  - Changes reflecting the above, and
-  - Documenting what's going on.
-
-In other news:
-
-* conduits/knotes/knotes-action.cc
-  listNotes() - Removed spurious #ifdef DEBUG. Test mode should always work.
-
-And oh, wow, thanks to messing around with the logWidget for KPilot,
-KPilotTest now also has a funky splash screen :)
-
-* kpilot/main-test.cc
-  main() - connect signals from the test action to the log widget.
-
-KPilot Developer's notes for november 25th 2001
-===============================================
-
-More work on the Expense conduit.
-
-In other news:
-
-* kpilot/logWidget.{h,cc}
-  Nifty feature for the sync log: clear the log. Save the log. ToolTips.
-
-
-KPilot Developer's notes for november 18th 2001
-===============================================
-
-Kudos to Marko Hollomon for spotting a pointer error in the KPilot daemon
-and fixing it. The patch changes pilotDaemon.{h,cc}.
-
-Thanks too to Palle Girgensohn, who made an icon for the internal memo-
-viewer and the KNotes conduit. This looks really neat in the new IconView
-mode of the main KJanusWidget.
-
-Shuffling the DCOP interfaces and cleaning up the UI, by [ade]:
-
-* logWidget.{h,cc}
-  Made the splash more like a splash, removed some ugliness, moved the
-  progress bar into the SyncLog widget.
-* kpilotDCOP.h
-  Removed the spurious filesChanged() call -- use KDirWatcher instead.
-* kpilot.{h,cc}
-  Removed the inheritance from kpilotDCOP.h, moved the DCOP interface to
-  LogWidget. Removed the status bar, since it's all in the LogWidget anyway.
-* pilotDaemon.cc
-  Renamed KPilotDCOP interface, removed filesChanged DCOP signal.
-* Makefile.am
-  Now logWidget requires kpilotDCOP, so moved that.
-
-Now that conduits are .so's, the conduitConfigDialog needs to have some
-strings changed to reflect that they're not executed anymore [ade].
-
-* conduitConfigDialog.{h,cc}
-  Added a warnNoLibrary function, moved warnings to Qt richtext.
-
-The FileInstallerWidget has some lousy strings with \n, and it needs
-a KDirWatcher [ade].
-
-* fileInstallWidget.{h,cc}
-  Changed the i18n strings to remove \n's. The Watcher remains a TODO.
-
-Attacked the expense conduit, finally. Maybe *this* one won't run aground on
-things like fundamental API changes in the stuff it syncs against.
-
-* Makefile.am
-  Removed spurious LIBPISOCK_PATH, moved files around a little.
-* setupDialog.{h,cc}
-  Ported to UIDialog classes, layout fixups. This is the one conduit that
-  still uses hard-coded layouts. It's possible, see? This isn't really the
-  way to go, I'd much rather have David B. make dialogs with Qt designer.
-  Added a break; in ExpenseDBPage::slotPolicyChanged() to avoid warnings.
-
-KPilot Developer's notes for november 11th 2001
-===============================================
-
-Much messing-about with hardware, OSsen and the like has delayed many
-things. I've discovered that the configure.in.in and Makefile.am for
-KPilot were really badly broken under anything non-Linux.
-
-* configure.in.in
-  Possibly fixed all kinds of shell-script breakage (under Solaris)
-  and not-finding pilot-link under FreeBSD. You will have to pass in
-  the --with-extra-libs and --with-extra-includes flags; configure now
-  looks there correctly.
-* All the Makefile.am's
-  Removed the extra spurious $(LIBPISOCK_PATH) which was breaking
-  things under FreeBSD.
-* lib/uiDialog.{h,cc}
-  Added a virtual bool function validate() so that when Okaying a
-  dialog, you can check first for valid settings. The default implementation
-  is return true;
-* kpilot/kpilotConfigDialog.{h,cc}
-  Added validate(), check that string for Pilot device doesn't overflow
-  the buffer for it. Also enforce the length restriction for the device
-  name. This is all conditioned on pilot-link < 1.0.0.
-* kpilot/kpilot.{h,cc}
-  Use a KJanusWidget instead of a QWidgetStack and deprecate the View
-  menu to make it clearer which views / actions / things KPilot actually
-  *has*. Moved the Spash Screen to the log widget, and made it a real splash.
-
-
-KPilot Developer's notes for october 28th 2001
-==============================================
-
-So fun to have distributions release broken versions of an application.
-It sometimes makes me wish I didn't have to commit stuff to CVS at all
-until the application is totally right according to me (which is then
-sure to run into trouble with the KDE release schedule).
-
-Another fun thing is wrestling with broken hardware. But it's finally fixed
-now. So I hope the pace picks up again now. I've been working on the
-abbrowser conduti sporadically, so we now have at least three conduits
-partially ported to the new setup.
-
-KPilot Developer's notes for october 21st 2001
-==============================================
-
-2001-10-21  Adriaan de Groot
-
-Since to do the popmail conduit I first need to learn about IOSlaves
-and the KNotes conduit is hard, I spent some time playing with the
-abbrowser / KAddressbook conduit.
-
-* conduits/abbrowser/*
-  () Removed all the old files for the setup dialog, now using David Bishop's
-     .ui files with some polish from me (like putting his name in the "Author"
-     field in the .ui file).
-  () Fixed up the Makefile.am to make the library and the test apps.
-  () Added a factory function.
-  () Removed all the palettes from the deconflict dialog. This takes 150k out
-     of the .ui file. Next challenge is to make it respect the KDE system
-     settings.
-
-2001-10-20  Adriaan de Groot
-
-Worse is when your AGP bus turns out to be broken instead.
-
-* conduits/knotes/knotes-action.{h,cc}
-  () Added method resetIndexes which should be called at the end of every phase
-  of the sync, basically to reset the counter and list iterator to the
-  beginning of the list of KNotes.
-  () Added method modifyNoteOnPilot which does the modified-notes-to Pilot
-  work. It isn't very robust yet, since it doesn't handle weird cases
-  (modified yet unknown on Pilot, for example) at all.
-
-2001-10-19  Adriaan de Groot
-
-Dern. Having your video card break and being thrown back to a 4MB SiS card
-fit only for a firewall with no monitor is *no* fun. Where's a 24-hour
-computer store when you need one? Not only that, but I realise I'm
-going to have to put some serious thought into the KNotes conduit and
-how it is supposed to sync. So since that's hard, I'm going to look at
-the Mail conduit instead, since the functionality there is pretty much
-complete.
-
-2001-10-18  Adriaan de Groot
-
-* kpilot/Icons/
-  () Incorporated most of Kristof Borrey's fantastic new icons for KPilot.
-* conduits/knotes/
-  () Removed old files setupDialog.{h,cc}
-* conduits/knotes/knotes-action.{h,cc}
-  () Added new function getConfigInfo that reads the config file for
-     the lists of Ids (matching KNote ids to memo ids).
-
-2001-10-16  Adriaan de Groot
-
-* lib/options.h
-  Upped the version number to 4.2.9b just because.
-* kpilot/kpilot.cc
-  Changed some credits around, copyright notice, etc.
-* kpilot/Makefile.am kpilot/Makefile-standalone
-  Fixed some breakage caused by all the moving around of files. You may
-  need to make clean ; make in KPilot some time to get things back to normal.
-
-KPilot Developer's notes for october 16th 2001
-==============================================
-
-2001-10-16  Adriaan de Groot
-
-Well, the b-day party got in the way of actually releasing something,
-and there's quite a lot of polish still to apply -- ie. the KNotes conduit
-still does nothing more than install new notes to the Pilot. So I'm going
-to start keeping the TODO list more up to date, including assignments for
-various people, and keeping the ChangeLog more up-to-date according to
-the ChangeLog standard, instead of these long rambling stories.
-
-2001-10-14  Adriaan de Groot
-
-Whee! It's KDE's birthday today. What a fitting day to finally release
-a version of KPilot that actually works, has useful features, and
-doesn't gum up your Pilot hopelessly.
-
-2001-10-10  Adriaan de Groot
-
-* Actually add new KNotes to the memo pad. This means conduit syncing is
-  actually coming closer. Works from kpilotTest.
-* Renamed --test --list in kpilotTest, added option --notest to force a
-  conduit to *really* run (may be hazardous!) from the tester.
-* Moved many things into lib/ -- whatever is shared between KPilot and
-  conduits, basically.
-* Wow! There's stuff in PilotAddress I'd never noticed before that deserves
-  to be moved to a superclass -- like setCategory. Kudos to Greg.
-* Updated the TODO list.
-* Added a nicer credits section in the about page of dialogs.
-
-2001-10-09  Adriaan de Groot
-
-* nothing! Fixed old compile issues on KDE 2.2 iob Solaris.
-
-2001-10-08  Adriaan de Groot
-
-* Added lots of things in lib/ to enforce some kind of uniformity on
-  conduits and factories. Utility functions, too.
-* Added an app-icon for the KNotes conduit. It's ugly as all get-out.
-* Added a test-conduits and a list-conduits mode to kpilotTest.
-* Went back and tested all the stuff we already had, since this
-  re-architecting carries risks. This showed that not everything had
-  gone right: I'd lost track of the pilot socket somewhere. Hmph.
-  Two rounds of re-writing headers, all the parameters finally end
-  up in the right place.
-* The knotes conduit now lists new knotes but doesn't install them.
-
-KPilot Developer's notes for october 7th 2001
-=============================================
-
-Ah, post-KDE3-alpha1. And that when KPilot remains completely 2.1 and 2.2
-compatible. A new release of KPilot for 2.2 is imminent, say oct. 14th or so.
-KDE 2.2.2 was just released, but contains no changes to KPilot at all --
-all the bugfixes were not of the kind that would fit in the 2.2.2 plan.
-
-2001-10-07  Adriaan de Groot
-
-Hmm. Missed a few days. What I remember:
-
-* Implemented the Null- and KNotes-conduits setup dialogs in plugin
-  libraries using David's UI files. That was fun and easy to do.
-* Make the new-style conduit configurator handle plugin libraries.
-  This was less fun, but it works. I haven't had any feedback on
-  which of the two config dialogs is easier to use, but right now
-  I'm leaning towards the new-style one (two columns + some buttons,
-  just like it was *long* ago.) D'nD would be nice though.
-* The new-style thingy doesn't handle saving which conduits are enabled.
-* Made a new subdir lib/, since the plugins need to share some code
-  with KPilot and you need a .so to make it link properly.
-* Wrestled with sensible layout of the about page.
-
-2001-10-01  Adriaan de Groot
-
-* Picked up David's new UI file for the conduit configuration dialog
-  and gave that a whirl. The results can be found in kpilotConfig,
-  use --help to find out which options to use.
-
-KPilot Developer's notes for september 30th 2001
-================================================
-
-2001-09-30  Adriaan de Groot
-
-Last minute sneak-it-in-for-the-alpha things. More code and layout cleanup,
-although the big commit changing to tabs & the KPilot style was yesterday.
-Fixed some minor display bugs, made preHotSync more useful, normalized
-some strings. The kpilot/Icons/ directory now contains only those icons
-actually needed and used, and they're all in PNG format. Saves lots of space,
-in the sense that the KPilot binary is 300k smaller now than it was, due to
-dumping XPMs.
-
-I added a private-d-ptr to kpilot.h, but haven't moved all the data
-members there. For an app it doesn't matter so much, but this will reduce
-the amount of recompiling and who knows what the plugin API will look like
-eventually.
-
-The conduit configuration is different -- again -- and easier to understand.
-
-2001-09-27  Adriaan de Groot
-* Added FUNCTIONSETUP everywhere.
-* Replaced email addresses with kde-pim@kde.org or groot@kde.org.
-* Removed qDebug everywhere.
-
-2001-09-26  Adriaan de Groot
-
-* Surrounded much debugging output with #ifdef DEBUG.
-* Replaced remaining calls to kdDebug() by macros with debug areas.
-* Applied indent everywhere.
-* Added some () where needed to resolve ambiguity.
-
-2001-09-25  Adriaan de Groot
-
-Wrestled with crashes (cerr << i ; debugstatement ; cerr << i ; gave
-two different values for i) caused by mixing debug conde and non-debug
-code. Discovered that qglobal.h defines DEBUG unless NO_DEBUG is
-set. Hmph. Also found that gcc does a poor job in optimizing away
-debugging statements with NDEBUG defined. Therefore, debugging statements
-will be once again surrounded by #ifdefs. The plan is that I'll get all
-the code formatting and this kind of silly issues out of the way in the
-next few days and then start to deal with the next problem, namely the
-existing conduits.
-
-2001-09-24  Adriaan de Groot
-* kpilot/uiDialog.{h,cc}
-* kpilot/kpilotConfigDialog.cc
-* kpilot/kpilotConfigDialog_base.ui
-  Minor changes to get the dialog to size correctly when other fonts / other
-  settings are used. This solves David's complaint about ugly dialogs.
-* kpilot/hotSync.{h,cc}
-  () Removed lots of commented out code from previous incarnations.
-  () Added a cleanup action.
-  () Removed a heap-corruption bug caused by using QStringList & and
-  then deleting what it points to in FileInstallAction.
-  () Removed deadlock when last file to install couldn't be read.
-  () Moved RestoreAction to interactiveSync.{h,cc}, since I feel it
-  needs to ask "Are you sure?" at the very least.
-* kpilot/interactiveSync.{h,cc}
-  New files with support for, and some types of, interactive syncing.
-  Used for asking the user questions during a sync, for example confirm
-  dialogs. This means we can now update user settings &c, since we needed
-  some interaction for that. Moved RestoreAction to here.
-* kpilot/kpilotlink.{h,cc}
-  Made exec() pure virtual for SyncActions, since that makes more sense
-  than having an empty default action.
-* kpilot/Makefile.am
-  Added interactiveSync.cc to the list of sources.
-* kpilot/pilotUser.h
-  Squashed a buffer overflow. Squashed several buffer overflows. Yowk!
-  This code has been around since 1996?
-* kpilot/main-test.h
-  Added some extra code to make the sync cleaner; handled the move of
-  RestoreAction.
-
-KPilot Developer's notes for september 23rd 2001
-================================================
-
-My current development platform is RH 7.1 with KDE 2.1.1 -- even so I'm
-committing things into HEAD.  I'm sure this will explode sometime and
-I'll be forced to upgrade to KDE 2.2 or worse, but for now, that's the
-platform I'm aiming for.
-
-I'd like to take a moment to thank David Bishop, for sending me .ui files,
-for causing noise on the mailing lists, and for being a pleasure to work
-with. Together we've wrestled with Qt designer, uic, and replacing the
-KPilot dialogs with something sensible made with designer.
-
-* kpilot/options.h
-* kpilot/kpilotConfig.{h,cc}
-* kpilot/kpilot.cc kpilot/kpilotDaemon.cc kpilot/main-*.cc
-  Factored out the --debug flags from each individual app, now in
-  options.cc. This means each file with a main() was modified too.
-  I must say it was a real bitch figuring out exactly which sequence of
-  calls were needed for KCmdLineArgs::addCmdLineOptions(), and then
-  finding out that ParsedArgs() also needed help.
-* kpilot/kpilotDaemon.cc
-  Sneaking in the QStack<> stuff just under the wire was a bad idea.
-  Fixed an uninitialized pointer bug.
-* kpilot/hotSync.cc
-  Fixed missing syncDone() signal in FileInstallAction; added some
-  logProgress() calls, extra debugging.
-* kpilot/kpilot.cc
-  Added KillDaemonOnExit logic to KPilotInstaller.
-
-2001-09-23  Adriaan de Groot
-* kpilot/uiDialog.{h,cc}
-* kpilot/kpilotConfigDialog.{h,cc}
-* kpilot/kpilotConfigDialog_base.ui
-  New files -- the .ui file is from David Bishop -- re-implementing the
-  configuration dialog using modern technology. uiDialog.{h,cc} are
-  abstract base classes, suitable for reuse. kpilotConfigDialog.{h,cc}
-  contains the behavior of the dialog, and the .ui file the UI.
-* kpilot/kpilotConfig.{h,cc}
-  Switched around #ifdef and #ifndef. This disabled setting debug levels
-  in code with debugging on. Duh. Getting it right then showed all kinds
-  of bugs in the other code. Added some documentation explaining possible
-  crashes due to missing KApplication instance.
-  FINALLY did something sensible about code duplication -- added get and
-  set methods to a subclass of KConfig for all KPilot settings.
-* kpilot/kpilotOptions.{h,cc}
-  Is deprecated and removed. Say hello to the new world of .ui files.
-* kpilot/kpilot.{h,cc}
-* kpilot/memoWidget.cc
-* kpilot/addressWidget.cc
-* kpilot/conduitSetup.cc
-  Lots of little changes to reflect the KPilotConfig changes. Mostly
-  removing calls to setGroup() and readEntry(), which are now safely
-  encapsulated.
-* kpilot/pilotDaemon.{h,cc}
-* kpilot/pilotDaemonDCOP.h
-  Removed cruft, adapted to KPilotConfigSettings, and adapted to SyncActions.
-  Changed silly startHotSync(int) DCOP method to requestSync(int).
-
-
-2001-09-21  Adriaan de Groot
-* kpilot/hotSync.{h,cc}
-  Added an InstallFilesAction class, to run during a HotSync.
-
-2001-09-20  Adriaan de Groot
-* kpilot/kpilotlink.{h,cc}
-* kpilot/main-test.{h,cc}
-  All these files changed because of yet another re-architecting. Now we
-  have HotSyncActions, which have direct access to the PilotDeviceLink,
-  and which do "something". The test action just lists the databases
-  present on the device. This has been tested with USB and with serial
-  devices.
-* kpilot/hotSync.{h,cc}
-  Changed again to split the actions away from the device link (really,
-  how I ever decided on that is a mystery to me now).
-* kpilot/Makefile-standalone
-  A Makefile that can be tweaked, that does not use autoconf, and is
-  useful for making standalone tarballs.
-
-2001-09-17  Adriaan de Groot
-* kpilot/Makefile-kpilotConfig
-  () New file for building a standalone config program.
-* kpilot/main-config.{h,cc}
-  () New .h file, new classes for implementing some behavior. The behavior
-  is very minimal right now, but as an illustration for David (hey, now
-  he needs to learn C++ coding) it's fine.
-* TODO
-  () Thought of lots of new things to do.
-
-KPilot Developer's notes for september 16th 2001
-================================================
-
-KPilot now compiles completely again, at least on a KDE 2.1.1 platform.
-I'll check w/ KDE 2.2 as soon as I get that working here, and then we'll
-take another look at Qt3 -- I saw Cornelius has already put some changes in.
-
-2001-09-15  Adriaan de Groot
-* TODO
-  () Added a TODO file. I didn't copy all the TODO's from the ChangeLog
-  into it, though, since many make no sense right now.
-
-2001-09-13  Adriaan de Groot
-* kpilot/kpilotlink.{h,cc}
-  () Changed fTransientDevice into fDeviceType since we have lots of
-  variants to deal with.
-  () Added functions installFiles() and installFile() to handle
-  the installation (!) of files to the Pilot.
-* kpilot/pilotDaemon.cc
-  () Finally dealt with all the changed classes and methods of the
-  device link.
-  (slotEndHotSync) No need to tell the link to end the Sync, since
-  it's the one that's telling *us*.
-
-2001-09-08  Adriaan de Groot
-* kpilot/options.h
-  () I've installed RH 7.1 and gone back to KDE 2.1.1. Whee. They've
-  somehow utterly broken kdDebug() and kdWarning(). Added compile flag
-  DEBUG_CERR to make all the debugging info go to cerr instead.
-* kpilot/kpilot.cc
-  () Startup notification was added to startService...() in 2.2, so now
-  there's an #ifdef handling that case.
-
-2001-09-07  Adriaan de Groot
-* kpilot/pilotComponent.h
-  () Fixed up #ifdefs for new style
-* kpilot/kpilotlink.h
-  () Make many data members private with protected access functions.
-  (statusString) Made into a virtual function.
-
-2001-09-06  Adriaan de Groot
-
-* kpilot/Makefile.am
-  () Forgot to add logWidget.cc to kpilot_SOURCES
-* kpilot/kpilotOptions.cc
-  () Added more tooltips, switched most to  rich text.
-  () Changed default value for SyncFiles to true.
-* kpilot/kpilotlink.{h,cc}
-  () Added new state CreatedSocket and member fRetries
-  (open) Allow for retries on pi_bind(), since it may fail on
-  USB style devices.
-  () Added ASSERT() and member fDeviceLink to enforce singleton=ness.
-* kpilot/main-test.{h,cc}
-  () Added ASSERT() to enforce singleton-ness.
-* kpilot/hotSync.{h,cc}
-  () New files, containing most of the old HotSync code from
-  kpilotlink.{h,cc}, now using the new KPilotDeviceLink base class.
-
-KPilot Developer's notes for september 5th 2001
-===============================================
-
-It's tough keeping this ChangeLog up-to-date, since I'm doing
-lots of work but not committing much to CVS. But I'll try to
-keep things documented nonetheless.
-
-
-2001-09-05  Adriaan de Groot
-
-A new application, kpilotTest, has been added. It does a very basic
-test of the pilot-link library and some device handling for KPilot.
-It is *not* installed by default, since it's pretty much useless for
-normal use, but useful to get some feedback about whether the
-new architecture works as expected.
-
-A new widget, LogWidget (logWidget.{h,cc}) is now included for, yup,
-logging stuff. It's used to long things during a sync.
-
-pilotListener is no longer built or needed.
-
-A new application, kpilotConfig, has been added. It is not installed
-by default. It just calls up a config dialog for KPilot, much like
-kpilot --config does. It's useful mostly because it exercises a clear
-subset of the code.
-
-I've tooltipified (?) the whole hardware setup dialog. I think it really
-needs more work, since the distribution of options is really unclear.
-And why are exactly *these* things grouped together? The "Address" tab
-really should go.
-
-The compilation of everything besides kpilotTest and kpilotConfig
-is now seriously broken (tm).
-
-KPilot Developer's notes for september 3rd 2001
-===============================================
-
-Hoo doggies. This is a *big* set of changes. I finally sat down
-to do some of the serious rework that KPilot has been needing for
-a long time. In essence:
-
-* Use DCOP for as much communication as possible, and
-* Support USB devices and other transient device nodes.
-
-Basically PilotDaemon and KPilotLink have been completely rewritten.
-
-What more is there to say? Almost every file has changed, even the
-coding guidelines have been relaxed (I'm not going to put #ifdefs
-around #include anymore, not since it turns out that the gnu cpp
-handles this situation efficiently anyway).
-
-Comments and documentation in most files have been vastly improved.
-
-
-KPilot Developer's notes for august 27th 2001
-=============================================
-
-Hm. Long time no notes. Which is not to say that nothing happened,
-since while I was away at a conference in Finland I dropped in at
-Marko G's place (see patches listed way down below) and we had a great
-time talking about KPilot, hacking, etc. I forget what I patched
-there, though.
-
-2001-08-27  Adriaan de Groot
-* kpilot/addressWidget.*
-  Fixed up Martin's patch to make it comply with the KPilot coding
-  style, added some more docs, did a bunch of re-layouting. I read
-  somewhere that there is a direct correlation between shoddy indenting
-  style and bug density.
-* kpilot/pilotDaemon.h
-  Added a missing class declaration for KServerSocket.
-* kpilot/kpilot.{h,cc}
-  Removed all remaining KPilotLink cruft. KPilot now communicates with
-  the daemon through DCOP only.
-
-Still very much on the TODO list:
-- actually make the daemon quit when that's relevant
-- ditch pilotListener (backport from kitchensync)
-
-KPilot Developer's notes for august 2nd 2001
-============================================
-
-Vacation good. Bugs bad. Received a wonderful patch in the mail from
-Martin Junius, which proves once again that he's really dedicated to
-making KPilot look good and work well. Martin's patch "pushes the envelope"
-udirng the freeze, so it may not get in into KDE 2.2.
-
-2001-08-01  Adriaan de Groot
-
-* kpilot/pilotDaemon.cc
-  (PilotSystemTray) Fix for bug #29764 -- I'd forgotten to initialize some
-  pointers in the constuctor again.
-* conduits/abbrowser/abbrowser-conduit.cc
-  (main) Workaround for bug #28104 allowing abbrowser to start from the conduit.
-* conduits/abbrowser/Makefile.am
-  Minuscule change enabling --enable-final builds here.
-
-2001-07-23  Martin Junius  
-
-* kpilot/addressEditor.cc (MakeField, MakeFieldL): removed i18n(),
-  now done in initLayout().
-  (initLayout): use i18n() for label strings passed to
-  MakeField. This is IMHO a cleaner approach than using I18N_NOOP()
-  as before.
-  (phoneLabelText): new function, get text for phone label,
-  basically fAppInfo->phoneLabels[] featuring some sanity checking.
-  (fillFields): use phoneLabelText().
-  (initLayout): dito.
-  (initLayout): argument addressInfo removed, no longer needed.
-
-2001-07-21  Martin Junius  
-
-* kpilot/addressEditor.cc (initLayout): use m_phoneLabel[] for
-  display phone labels because this change from entry to entry and
-  cannot be set to fixed texts.
-  (fillFields): update phone labels for editor dialog.
-  (initLayout): reworked and hopefully ;-) improved spacing.
-
-* kpilot/addressWidget.cc (setupWidget): replaced QMultiLineEdit
-  with QTextView for address info widget.
-  (slotShowAddress): function totally rewritten to use QTextView
-  and the Qt pseudo-XHTML code for formatted display of the
-  address entry. The sequence and formatting is more or less what
-  my Palm IIIxe does.
-
-KPilot Developer's notes for june 15th 2001
-===========================================
-
-The 2.2b1 tarballs are packaged real soon now. Whee!
-This marks the release of KPilot 4.2.3 (KDE 2.2, third
-subpackage release (alpha1, alpha2, beta1)). This version
-scheme makes it much easier to keep track of what was
-released when.
-
-Many bugs were fixed after Cornelius sent a message
-asking about the KPilot code; the abbrowser conduit
-has been renamed the KAddressBook conduit (it's still in
-conduits/abbrowser), some little stuff in the vcal conduit
-was fixed, much dead code was removed from KPilot and
-some code was simplified.
-
-Cornelius' mail also somehow pushed me into reading the
-KDE-PIM server suggestions. I'm sure you've noticed how
-much mail *that* has caused.
-
-KPilot Developer's notes for june 5th 2001
-==========================================
-
-[ade]: Well, I'm back from my conference -- which was pretty neat -- and lo!
-In my mailbox are many patches to be applied. Thanks guys. This keeps
-KPilot moving forward even when all of the "regular" developers are
-doing silly things (like moving).
-
-2001-06-05  Palle Girgensohn
-
-* */Makefile.am
-  I had to tweak some Makefiles to get kpilot working on FreeBSD.
-  KPilot must include LIBPISOCK_PATH in its INCLUDES setup.
-  [Newer CVS versions already did, but I would like to note my
-  appreciation for sent-in patches that aid in portability -- ade]
-
-2001-06-02  Philipp Hullmann
-
-* conduits/vcalconduit/*.{h,cc}
-  This is a new version of my large todoconduit/vcalconduit patch,
-  hopefully more suitable for human consumption than the previous one. It
-  mostly splits the large sync functions into smaller pieces, simplifies the
-  code for recurring events a lot, and moves some more code to vcalBase.
-
-* kpilot/pilot*Entry.cc
-  ... and one more patch to PilotDateEntry and PilotTodoEntry: replace
-  notes of length 0 with empty ones.
-
-2001-05-23  Philipp Hullmann
-
-* kpilot/pilot{Date,Todo}Entry.{h,cc}
-  Many fixes realted to accidental freeing of unallocated memory
-  and some pointer ugliness. Fixes rare crashes on machines where
-  malloc() doesn't zero the memory.
-
-2001-05-25  Adriaan de Groot
-
-* *.cc, options.h
-  Simplified the debugging code, no more #ifdef DEBUG if (debug_level &)
-  stuff, just straightforward DEBUGXXX statements which get optimized
-  aay for free when debugging is turned off.
-
-
-KPilot Developer's notes for may 14th 2001
-==========================================
-
-Not a lot of movement on the coding front for me [ade]; I
-did remember mothers' day though. Changes relevant to KPilot:
-
-* abbrowser has moved into kdebase, so the abbrowser conduit will
-  now be available to everyone, not just those that also compile
-  all of kdepim.
-
-2001-05-08  Marko Gronroos
-
-* conduits/popmail/*
-  Totally revamped the mail conduits with a new, well designed
-  setup. This solves most of the smtp and sendmail problems
-  we've been having.
-
-
-KPilot Developer's notes for may 7th 2001
-=========================================
-
-It's been great to receive patches from all over the place in the
-past two weeks. What has been fixed is listed below; I have the nasty
-feeling that one set of patches has slipped through the cracks. If
-you've sent me a patch in the past two weeks and don't find yourself
-listed here, please let me know.
-
-2001-04-27  Adriaan de Groot 
-
-* I actually worked on the docs. Stephan Kulow's meinproc
-  HTMLizer was wonderfully useful here. The docs aren't
-  completely up-to-date yet, but they're moving.
-
-2001-04-28  Martin Junius  
-
-* kpilot/kpilot.cc
-  (initMenu): use KToggleAction and setExclusiveGroup for view menu.
-  (addComponentPage): same here for the other components.
-  (initMenu): setChecked for view_kpilot action.
-
-2001-05-07  Philipp Hullmann
-
-* conduits/vcalconduit/todo-conduit.cc
-  (): fixed missing due-date bugs
-
-
-
-
-
-KPilot Developer's notes for april 26th 2001
-============================================
-
-Ahh, spring is in the air; the time when a young man's mind turns
-to nights of C++ hacking. This has been a great few weeks for open-
-source collaboration. I've had useful and helpful mail from Philipp
-Hullmann, Martin Junius, and Marko Gronoos (maybe more -- if i've
-forgotten you please complain privately) with patches, hints, and
-offers of help. Thanks guys!
-
-* Fixed the non-initialization of the conduitCombo pointer by
-  removing it completely. (Thanks Martin!) At compile-time you can
-  choose between XML and traditional UI style. [19-4]
-* Greg's abbrowser conduit is (almost) ready for the prime-time! [23-4]
-* Fixed bug where absent executables could hang the conduit
-  setup dialog. [23-4]
-* Fixed small UI bug where toggling toolbar didn't resize the contents
-  of the main KPilot window. [23-4]
-* Removed unnecessary connection to (serial) pilot database when
-  conduits are started in --info or --setup mode. [23-4]
-* Discovered many i18n bugs in the sendmail conduit. Ouch. Some fixed. [23-4]
-* In a flash, implemented sending-via-KMail in the sendmail conduit.
-  This is utterly untested and possibly hazardous. I'd appreciate it
-  if some people used a test account for KMail and tried it out.
-  I will too, soon. [23-4]
-* Looked for the right place to force KPilot conduits to use the KPilot
-  .po file. The TLs are now OK. Thanks to Marko for prodding me to sort
-  this bug out (conduit in Finnish is "siirtokanava"). [24-4]
-* Added QToolTips and buddies to the NULL conduit setup. [24-4]
-* Fixed a bug in the KMail sending if you use a different outbox
-  from "outbox". [26-4]
-* Made KPilotLink::addSyncLogEntry marginally more useful -- this
-  is to work towards a read log window. As a side effect (which
-  obscures what I've done a little) I've reformatted kpilotlink.h
-  according to the coding style guide, and added docs. [26-4]
-
-Todo:
-
-* Found out why the vcal and todo conduits are so slow -- they
-  really do read in the whole Pilot database through the serial
-  line *twice* each sync. This needs fixing. [19-4]
-* Add QToolTips to the remaining conduits. [24-4]
-* Add "buddies" to relevant entry fields (usually QLineEdits). [24-4]
-* Remove all the UI stuff from KPilotLink and put it somewhere sensible. [26-4]
-* Split KPilotLink into the client and server ends. [26-4]
-
-The following list is stuff from the ChangeLog that was once on
-the Todo list; I'm repeating it here because it was time we went
-through it again to see how things stand. I've added comments in
-[ ] after each.
-
-* Split KPilotLink into its separate functionalities: config management,
-  local database management, and link from daemon to conduits. [partly
-  done, but kpilotlink still serves both ends of a client-server link]
-* Make KPilot and KPilotDaemon communicate only through DCOP. [bad idea -
-  causes extra overhead, and the kpilotlink protocol is pretty good]
-* Add an extra message concerning NULL user on hotsync.
-* Make the progress bar show something during a conduit sync.
-* Should just use the KPilotLink::config object to store all kinds
-  of user settings instead of copying them from the config file to
-  local variables, since this is just asking for inconsistency.
-  [dunno -- as long as KPilot is the app for configuring what the
-  daemon does, we just have to get KPilot to tell the daemon to re-
-  read the config file when something changes.]
-* Clean up more of the butt-ugly parts of the code base [less of this now!]
-* KPilot is an i18n nightmare [less of this now!]
-* The password dialog in the popmail conduit is probably a very bad idea
-  I think kdesud should come into play here. [not looked into]
-* The messages need validation - Pilot vs pilot, HotSync vs whatever
-* Actually *doing* a fast sync for Heiko
-* More and better information in the progress bar
-* KPilot should display the sync log as well, just like the Pilot
-  does. This is useful for reporting the result of a sync to the
-  user (who then doesn't need to look at the Pilot)
-* I noticed Thomas Zander has submitted an official wishlist item:
-  DateBk3 (the new date book format in PalmOS3.5) support. I think
-  I'll get back to him on that when Mirko pans out with the free
-  hardware goodies from Palm :)
-
-KPilot Developer's notes for april 19th 2001
-============================================
-
-* Martin Junius has contributed an XML GUI framework for KPilot, so
-  it now finally uses the "modern" way of doing GUIs. This *does*
-  mean it's time for yet-another set of screenshots for the docs
-  and yet-another set of menus for users to get used to. [14-4]
-* Disposed of reported bug: bad category selection. [15-4]
-* Moved the todo-conduit into the vcalconduit directory. This makes
-  building much simpler. [15-4]
-* Fixed up more #include shenanigans for --enable-final. (Don't
-  forget the #ifndef conventions from HOWTO-CODE.txt!) KPilot now
-  builds without warnings with --enable-final --disable-debug. [15-4]
-
-Things to do:
-
-* Fixup the documentation.
-* Add QToolTips to the conduits setups, KPilot's setup, and the conduit setup.
-  This is already partially done, but someone else needs to finish this off.
-* Make KPilot installation and run easier -- JPilot seems to work out-of-the
-  box on systems where KPilot doesn't.
-* Look into bugs #23385 (crash in VCalConduit), #20318 (munged 8-bit chars)
-  and #24291 (doubled appointments).
-
-KPilot Developer's notes for april 8th 2001
-===========================================
-
-It seems like only yesterday that KDE 2.1.1 was out, and we're already
-in KDE 2.2b1. Thoreau said "Simplify, Simplify". Anyway, this week's
-feature creep:
-
-* Bugfix for infinite loop when changing categories. [1-4]
-* Some xpms could profitably be removed, since we use pngs now. [1-4]
-* I normalized some more header-file #ifdef / #defines. [1-4]
-* Incorporated patches from Aaron Seigo. [1-4]
-* The todo conduit didn't compile due to changes in vcalBase. [1-4]
-* The vcal conduit's test mode has been expanded. [1-4]
-* KPilot's version number has been upped (again) to 4.2.1 for the
-  KDE 2.2a1 release; I hope we can up the revision number with every
-  release of KDE 2.2 move on to KPilot 4.3 with KDE 2.3. [9-4]
-* Messed around with some of the icons and images. [9-4]
-
-
-KPilot Developer's notes for march 24th 2001
-============================================
-
-KDE 2.1.1! With bugfixes and translation fixes! So only some of the
-bugfixes listed under march 10th have made it into there. On the
-western front though, we have:
-
-* Chris Molnar has started work on DB integration for the expense conduit,
-  so that you can actually do something useful with it. The CSV export seems
-  to be done, too. Thanks Chris!
-* Greg Stern has pretty much finished the abbrowser conduit (which a *lot*
-  of people have wanted for a long time). It hasn't been committed yet, but
-  will be soon.
-* The memo viewer has been very slightly beautified.
-* Some work for bugs #22112 and #21908, fixing deficiencies in the todo-
-  conduit and in selecting categories under other locales. This isn't
-  done yet, though -- some attempts have been checking into CVS for testing.
-
-
-KPilot Developer's notes for march 10th 2001
-============================================
-
-This weeks "cleanup" action is to normalize the #ifdef thingies in
-the header files so that they follow some kind of plan. And then reduce
-the number of #includes actually included by adding #ifdefs areound most
-of them, to prevent redundant #includes. This is a pain, but some say
-it's worth it in compile time. (See Documentation/HOWTO-CODE.txt for info).
-
-* Removed yet another silly struct tm issue. [4-3]
-* Added FileInstaller to KPilotDaemon. [4-3]
-* Added DCOP to KPilot. Files dropped on daemon show up in KPilot. [4-3]
-* Added a #define KPILOT_VERSION to unify all the version strings. [5-3]
-* Added Documentation/HOWTO-CODE.txt for the source code conventions. [5-3]
-* Fixed a bunch of Solaris compile issues. [5-3]
-* Factored out a bunch of generic vcal code from the vcal conduit into
-  a new base class VCalBaseConduit; the todo conduit also inherits from
-  there. [10-3]
-* Yet another stab at the "latin1 chars munged in KOrganizer" bug. [10-3]
-
-The double-sync problem still exists though, which is bad. I suspect that
-some extra bytes are left waiting in the serial port queue after slotEndSync
-but I haven't got that sorted out yet.
-
-The web-site has been updated, finally, which means you can finally check
-for new releases and info there again:
-
-	http://www.slac.com/~pilone/kpilot_home/
-
-And, I've started to use KDevelop 1.4 for maintaining KPilot. I'm still
-making the transition from vi / make / 4 konsole windows, but so far I've
-been mostly pleased by the effect it has.
-
-Bugs that are still open in the bug database: (Dan? you bored?)
-
-* Todo conduit doesn't take due dates into account
-* Double sync
-* Address edit window doesn't follow addressDB custom fields & layout
-
-Things to think about:
-
-* Usability. I've swept all the menu items into one "File" menu that
-  contains two configure wrenches, 4 actions, and a quit button. I'm
-  wondering whether this is the right way to go or whether separate
-  "file", "sync" and "conduit" menu items would be better.
-
-
-
-KPilot Developer's notes for march 4th 2001
-===========================================
-
-So after "the big cleanup" I've continued doing cleanup code in smaller
-chunks with more commits, mostly for reasons of bug-tracking. Dates in []
-indicate when the fix or change was committed.
-
-* Removed a really stupid crash from KPilotConfig::fixed().		[23-2]
-* The internal conduits' names weren't reported properly anymore. This
-  is a binary and source incompatible change. 				[23-2]
-* Extra debugging while starting the listener process. 			[26-2]
-* Changed exit(-1) to exit(3) in the daemon. 				[26-2]
-* Use Qt layout classes in fileInstallWidget. 				[26-2]
-* Removed some null-conduit comments from the KNotes conduit.		[26-2]
-* Removed some #include  for Solaris. Cleaned up other
-  includes as well, just a little.					[26-2]
-* Started a change to KActions.						[ 1-3]
-* Added a new FileInstaller for use in the daemon and the widget.	[ 1-3]
-  It's currently only used by the widget.
-* Added listItems.{h,cc} in response to bug #21392; changed address
-  and memo widgets to use them.						[ 4-3]
-
-KPilot Developer's notes for february 19th 2001
-===============================================
-
-Yay! KDE 2.1 is out. Which means we can commit all kinds of changes
-to KPilot again, not just well-thought-out bugfixes. That means that
-we can get to work on cleaning up the code base again.
-
-* Split all the config-file stuff out of KPilotLink into a new class
-  KPilotConfig. Fixed all the resulting include dependencies.
-* The function fixed() in KPilotInstaller obviously belongs to KPilotConfig.
-* The {address,memo,fileInstall} widgets all had unnecessary dependencies
-  on KPilotInstaller. Removed. KPilotInstaller now adds the widgets it
-  creates itself.
-* Removed as many dependencies on kpilot.h and kpilotlink.h as possible.
-* Removed a bunch of char[] buffer stupidities from pilotLocalDatabase &c.
-* Removed the database open and close functions from kpilotlink.
-
-All the sensible fixes, like those listed under feb. 4th, will come later.
-
-KPilot Developer's notes for february 4th 2001
-==============================================
-
-Nick Papadonis spent hours tracking down the vcal conduit crash and
-we found at least one bug in kpilotlink. It's been removed and I
-hope this quashes all the vcal crashes. Other than that there's simply
-not much we *can* do with the message and feature freeze and all.
-This is why the todo-immediately-after-freeze list exists:
-
-* Split KPilotLink into its separate functionalities: config management,
-  local database management, and link from daemon to conduits.
-* Make KPilot and KPilotDaemon communicate only through DCOP.
-* Add an extra message concerning NULL user on hotsync.
-* Sort out all the icon issues.
-* Make the progress bar show something during a conduit sync.
-
-
-
-KPilot Developer's notes for january 6th 2001
-=============================================
-
-Happy Millennium. I ([ade]) am off on a two-week vacation to
-Calgary, so no KPilot news from me till (almost) february.
-
-There have been several troublesome bugreports this week,
-ranging from "all the conduits crash" to "daemon dies on
-hotsync." That don't make me happy at all.
-
-
-Done this week:
-
-* Built POSE, the Palm Emulator, so this may help in testing
-  stuff for the OS versions that I don't actually have.
-  POSE is a real $#*%^ to build, but I can now actually use my
-  PalmV on-screen (with a PalmIII skin, which is kinda weird).
-* Replaced the addressEditor widget with something less stone-age.
-* Added a nifty feature so that you can edit one address in two
-  windows and they keep semi-in-sync. abbrowser doesn't have this
-  (which means abbrowser has a bug :( ).
-* #&$%#$ conduitApp doesn't turn the GUI on by default, so recent
-  vcal crashes can be blamed on trying to create a KMessageBox without
-  a GUI :( Changed the default values.
-* Tried fixing some ugly icons. I'm no artist though.
-* Teeny-tiny layout change in Address page of setup dialog.
-* If you try to add records to the address book before you've done
-  a HotSync / Backup KPilot has an empty AddressDB and doesn't deal
-  with the address very well. Added a sorry() there.
-* Added a doTest() to vcal-conduit.
-* More cleanups in the debugging code. There's still a weird mix of
-  code controlled by --debug and kdebugdialog style stuff. Functions
-  kdWarning() and kdError() should be given __FUNCTION__ as their
-  << argument, while kdDebug() should get fname as first argument.
-  This will make all the debugs optimize away painlessly while keeping
-  the warnings and error messages. Since messages may change status some
-  time there's now a #define TEST_DEBUG that makes fname a weird object
-  that can only be passed to kndbgstreams. So sensible combinations are:
-  	production:	NDEBUG defined, DEBUG undefined, TEST_DEBUG undefined
-  	test nodebug:	NDEBUG defined, DEBUG undefined, TEST_DEBUG defined
-  	testing:	NDEBUG undefined, DEBUG defined, TEST_DEBUG defined
-* Actually KPilotLink::doFullBackup wasn't all that bad. Still, all the
-  code needs going-over for i18n yuckiness. doFullRestore() was worse;
-  also fixed up directory yuckiness.
-	  Note to self: text for user is i18n()ed, kdDebug() &c. is in
-	  english ('cause Dan or I have to read it :) )
-* Finished integrating Heiko's patches. I believe that both HotSync and
-  FastSync now do what the ought to do.
-* Started adding a DCOP interface to the daemon.
-
-
-Other stuff:
-
-* It's a HotSync and a Pilot. I'll change strings in the source as
-  I come across them. As for conjugations: I HotSynced, it HotSyncs.
-
-Todo:
-
-* Should just use the KPilotLink::config object to store all kinds
-  of user settings instead of copying them from the config file to
-  local variables, since this is just asking for inconsistency.
-* Close bug 16457.html in some way.
-* More vcal work
-* Clean up more of the butt-ugly parts of the code base (less of this now!)
-* Tell the KOrganizer docs people about KPilot
-* KPilot is an i18n nightmare
-  - The const char *s in the pilot databases can be addressed most
-    easily, I think.
-  - get rid of most of the strcpy, strcat, etc. But not all!
-    We're stuck with pilot-link, after all.
-* The password dialog in the popmail conduit is probably a very bad idea
-  I think kdesud should come into play here. Anyway, a KMail conduit would
-  be much cooler and safer. Sigh.
-
-
-Things-to-be-considered:
-
-* Splitting kpilotlink up into its various functionalities
-
-
-KPilot Developer's notes for december 30th 2000
-===============================================
-
-Ho ho ho. Merry Christmas. Happy new year. Last week started out
-with Thomas Zander reporting that he *still* has the totally bizzarre
-and inexplicable crash in KPilot that he's had ever since KPilot was
-ported to KDE2 (+).  That pretty much colors this week's work. The rest
-of the week was used for the KNotes conduit. After a pleasant exchange
-of ideas with Wynn Wilkes (of KNotes) we got a DCOP interface working and
-this make the KNotes conduit more useful. Talked to Greg about the
-kab conduit and he's enthusiastic about the possibilities there,
-we hope to have a framework in CVS soon.
-
-Done:
-
-* Claimed some debug areas (5510,5511,5512).
-* KNotes rereads the notes dir after a sync, so new notes (which
-  have come from Pilot memos) appear there.
-* KNotes conduit --test now displays all the notes (on screen) that
-  knotes shares with the pilot. This is a test (!) of the DCOP stuff,
-  mostly.
-* KNotes conduit now has a checksum function (md5) to reduce the
-  number of notes that has to be copied between KNotes and the
-  Pilot.
-* Applied Dag Nygren's vcal patches so that repeating events now
-  show up in KOrganizer properly.
-* Fixed the button-enabling in the address app
-* Added more debugging output for Thomas.
-* Added more debugging output for Nick.
-
-Todo:
-
-* More vcal work
-* Clean up more of the butt-ugly parts of the code base
-* Tell the KOrganizer docs people about KPilot
-* KPilot is an i18n nightmare
-  - The const char *s in the pilot databases can be addressed most
-    easily, I think.
-  - KPilotLink::doFullBackup should cause i18n people to run away
-  - get rid of most of the strcpy, strcat, etc. But not all!
-    We're stuck with pilot-link, after all.
-* The messages need validation - Pilot vs pilot, HotSync vs whatever
-* The password dialog in the popmail conduit is probably a very bad idea
-
-+ Thomas' crash produces the following (partial) backtrace:
-
-#4  0x408960b7 in read_png_image () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#5  0x40838dd9 in QImageIO::read () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#6  0x40836cf1 in QImage::load () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#7  0x408305b2 in QImage::QImage () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#8  0x40483fcf in KIconLoader::loadIcon () from /usr/kde2/lib/libkdecore.so.3
-#9  0x805a166 in KPilotInstaller::initIcons ()
-
-  which is weird since the only possible png image being read is the
-  quit icon, which is standard in KDE2. Maybe some weird combo of options?
-
-KPilot Developer's notes for december 18th 2000
-===============================================
-
-It looks like kdepim and KPilot aren't going to make the 2.1 release.
-Darn. This does give us more time to deal with docs and bugfixes.
-Every time I get something done though I find I've discovered two
-new things to do :(. I hope Lukas will help out with a lot of the
-i18n stuff though.
-
-Done:
-
-* Moved all the (english) docs to the correct place.
-* More doc fixes: use &kpilot; and &pilot; properly, added screen shots for
-  various conduit setups. The docs still aren't complete but they're a
-  darn sight better than they were.
-* Modal dialogs need exec() instead of show()
-* Changes in kdelibs caused some dialogs to hang in slotCancel()
-* Changes in includes means we have to include kdebug.h ourselves
-* Get rid of cerr and use kdDebug or kdWarning or kdError as appropriate.
-  There are still a very few cerrs left in places where we can't rely on
-  kdDebug().
-* Added #ifdef DEBUG to the debug sections of code. So KPilot now compiles
-  without debugging stuff. I realise now that I should have stuck to the
-  KDE kdDebug() guidelines, but, um, I didn't know they existed when the
-  port from KDE1 to KDE2 started. Darn.
-
-ToDo:
-
-* More vcal work
-* Clean up more of the butt-ugly parts of the code base
-* Detect memo-too-large in knotes conduit
-* Try to reduce number of updates in knotes conduit
-* Figure out a nice DCOP interface with Wynn (KNotes)
-* Finally take a look at kab or whatever for the address book conduit.
-  Should probably talk to Greg about this one too.
-* Tell the KOrganizer docs people about KPilot
-* Fix the button-enabling in the address app
-* KPilot is an i18n nightmare
-  - The const char *s in the pilot databases can be addressed most
-    easily, I think.
-  - KPilotLink::doFullBackup should cause i18n people to run away
-  - get rid of most of the strcpy, strcat, etc. But not all!
-    We're stuck with pilot-link, after all.
-* The messages need validation - Pilot vs pilot, HotSync vs whatever
-* The password dialog in the popmail conduit is probably a very bad idea
-
-
-KPilot Developer's notes for december 10th 2000
-===============================================
-
-Lots of internal stuff going on:
-
-* The sense of the debugging flags was the wrong way around,
-  so using --debug 4 gave you all the UI debugging messages
-  as opposed to just the major and minor ones. This is what
-  you get from suggesting debug 1023 all the time.
-* BaseConduit had some weird debugging output -- not controlled
-  by --debug -- so patched that up. And there was ugliness in the
-  icon loading function. This changes the interface to BaseConduit
-  slightly, 3rd party conduit authors beware.
-* Finally fixed up the Makefile.ams for the standard conduits so
-  that they run properly (without setting LD_LIBRARY_PATH).
-
-Visible changes:
-
-* Fixed up the documentation, the screenshots, the descriptions of the
-  conduits, etc. etc. It's still not complete but at least it matches
-  what happens when you run KPilot.
-
-Still on the todo-list:
-
-* Really fix the vcal conduit. I've patched some things up and once
-  again I hope it works, but since I can't reproduce the error I'm
-  a little stuck here.
-
-Still on the wish-list:
-
-* Actually *doing* a fast sync for Heiko
-* More and better information in the progress bar
-* The PilotMemo class is butt-ugly and filled with weird C-string
-  manipulations.
-* KPilot should display the sync log as well, just like the Pilot
-  does. This is useful for reporting the result of a sync to the
-  user (who then doesn't need to look at the Pilot)
-* I noticed Thomas Zander has submitted an official wishlist item:
-  DateBk3 (the new date book format in PalmOS3.5) support. I think
-  I'll get back to him on that when Mirko pans out with the free
-  hardware goodies from Palm :)
-
-
-KPilot Developer's notes for december 2nd 2000
-===============================================
-
-Almost Sinterklaas, so I'd like to wish all the KPilot users in
-.nl a Happy Sinterklaas en Weg met de Kerstman.
-
-UI Changes:
-
-* Added Heiko's Fast-Sync icon .. but it's ugly and hard to
-  distinguish from the regular icon. This needs fixing by an artist.
-* Added an ugly restore icon as well.
-* Added an undocumented config-file option. You can now add the
-  following line to kpilotrc in the null group if you really want to:
-
-	ToolbarIcons=list
-
-  where list is a comma-separated list of icons to appear on the
-  KPilot toolbar. You can choose from HotSync,FastSync,Backup and
-  Restore. The standard setting is:
-
-	ToolbarIcons=HotSync,Backup
-
-  That's not a lot but it should keep Heiko happy for a while and
-  it reminds us that we should move towards a more modern method
-  of setting up the UI -- or not?
-* Tried to fix some UI weirdneses like:
-	- Delete Memo button enabled when no memo selected
-  but QListBox has the nasty habit of always having *something*
-  selected, even if you can't see what it is.
-
-  Now I know that the internal conduits -- memoWidget and addressWidget
-  will probably die out soon when we have a real working kab2 conduit
-  as well as a KNotes conduit, but till then it's nice to have something
-  that at least obeys basic UI design rules.
-* The following bugs in QListBox and QListView made me ditch the old
-  two column layout with movement buttons for something else. Let me
-  know which one you prefer.
-	- There is some *bizzarre* behavior in the handling of
-	  conduits being selected: select the top item in
-	  the left column, the top item in the right column
-	  (um, so install a conduit first) and then the top
-	  item in the left column again.
-  The new layout allows you to drag conduits from one state (available)
-  to another (active). Click on a conduit to set it up -- you may have
-  to doubleclick depending on you KDE settings.
-
-
-Internal Changes:
-
-* Conduits that crash no longer hang KPilot and the entire sync.
-* Made a lot of static const int members of various classes
-  enum values instead, and added a function write() to CStatusMessages
-  for a clean way to write status messages to the link.
-* Replaced several if else if ... constructions with switch()
-* Added a sensibleTitle() and shortTitle() to PilotMemo for use
-  by the KNotes conduit (and maybe others)
-
-Documentation:
-
-* Spent a little time on the (english) documentation and brought a few
-  parts of it back up-to-date. It needs up-to-date URL's, probably we
-  should move the mailing list to kde-pim@kde.org, and we need new
-  screenshots.
-
-Wishlist:
-
-* More and better information in the progress bar
-* The PilotMemo class is butt-ugly and filled with weird C-string
-  manipulations.
-* KPilot should display the sync log as well, just like the Pilot
-  does. This is useful for reporting the result of a sync to the
-  user (who then doesn't need to look at the Pilot)
-
-KPilot Developer's notes for november 25th 2000
-===============================================
-
-Spent most of the week at a conference, but managed to get
-the KNotes conduit almost fully functional. New memos (KNotes)
-are copied to the desktop (Pilot). Memos changed on the pilot
-are changed on the desktop. However, not all deleted memos are
-deleted on the other side, nor are modified memos copied
-from the desktop to the Pilot.
-
-I don't know what the desired action for KPilot is in the
-cases of deleted memos. Any suggestions? There's now a config
-option in the KNotes conduit setup, but maybe that should be
-subsumed by the global Local Overrides Pilot setting. Anyway,
-if a memo is deleted on the Pilot the corresponding KNote is
-deleted as well.
-
-If KNotes is running and the KNotes conduit makes changes,
-these aren't picked up by KNotes. There are also some
-obvious race conditions caused by the conduit writing KNotes
-config files. This basically means that we need to talk to
-the KNotes maintainer to resolve these coordination problems.
-
-As for the code, I wrote this:
-	class KNotesOptions : public setupDialog { Q_OBJECT
-	protected: static const QString KNotesGroup; };
-[with better layout, of course] But there's a static QString
-there, and I read somewhere that Static Objects Are Evil (tm).
-I could use a const char * there, since it's just the name of
-a group in the config file, but what's the consensus on things
-like this?
-
-I did handle some more of Heiko's patches. From last week's list:
-	- Some phone number magic I don't understand yet
-	- Some changes in the address import function
-	- getShowPhone() -- don't understand that yet either
-	- Fix bad repeat-n-times handling in vcal-conduit
-This leaves just the Fast Sync capability still unimplemented.
-
-Given the release schedule that has been discussed recently
-(and we really do want to have KPilot in KDE 2.1, so as to add
-a nifty feature to the desktop as a whole) I think feature creep
-should be abandoned for the time being and we should try to
-fix as many bugs in what we have before the release (around the
-middle of december, IIRC). This means testing, lots of it. So
-people, take the plunge, give it a try, compile the latest kdepim
-CVS stuff with KPilot in it and then complain when your Pilot
-catches fire, OK? O yeah .. when you *do* give it a try, make
-sure you do something like:
-
-	$ export LD_LIBRARY_PATH=$QTDIR/lib:
-	$ kpilot --debug 1023
-
-To make sure none of the conduits crashes with library loading
-problems and with all the debugging messages turned on.
-
-
-KPilot Developer's notes for november 19th 2000
-===============================================
-
-Fixes:
-
-* Added most of Heiko's patches to the vcal-conduit
-* Added convention to conduits --info handling: return "" for
-  no databases. Handled in conduitSetup as well.
-* Made some minor changes to the info page presented in dialogs
-  (generally the setup dialog of a conduit) so that it gracefully
-  handles weird settings and handles its own resizing properly.
-* Added some const-qualifiers to various char *s
-* Add a "kill daemon on exit" feature -- there was already some code
-  for this, but not complete.
-* Changed all the boolean config entries to booleans as opposed to
-  0-or-1 ints.
-* Removed all the "const char * id defined but not used" warnings
-* Added some extra robustness in PilotDaemon::setupConnections
-* Made the daemon obey the "show in system tray" setting -- this was
-  broken during the first port to KDE2
-* Handle reconfiguration through the settings dialog properly --
-  at least KPilot picks up the changes to "Kill Daemon on Exit"
-* (re)Added --test option to conduits, though not all of them
-  will support actual tests.
-* KNotes conduit is now functional in the sense that notes you write
-  on your desktop are in fact copied to the Pilot.
-
-Some general comments:
-
-* Suggestion: call the desktop files for conduits
-	conduit-pilot-appname.desktop
-  and the conduit executables themselves
-  	conduit-pilot-Appname
-  This at least gives conduits some consistent naming scheme and
-  the addition of -pilot leaves some namespace for conduits for
-  other PDA's.
-
-  Well, actually this naming scheme isn't much good. But we *do*
-  need to think about how to handle sync-programs for various
-  PDA's in a nice fashion -- I can imagine having a Nokia phone,
-  a Psion and a Pilot and wanting to sync them all.
-
-Still on the todo-list:
-
-* Fix bad repeat-n-times handling in vcal-conduit
-* Dealing with the rest of Heiko's patches
-	- Some phone number magic I don't understand yet
-	- Some changes in the address import function
-	- Fast-sync capability (this is different from SyncLast)
-	- getShowPhone() -- don't understand that yet either
-* More and better information in the progress bar
-* The PilotMemo class is butt-ugly and filled with weird C-string
-  manipulations.
-
-
-KPilot Developer's notes for november 14th 2000
-===============================================
-
-Lots of things have changed in the class hierarchy.
-
-* Jorg's bug in the memo-import function was handled OK in addressWidget,
-  but it seemed clumsy to deal with the same problem in two different
-  places. Moved findSelectedCategory() to PilotComponent. Added some
-  other convenience functions there for the category combo box.
-
-* The getConfig() change was very poorly done, sorry about that.
-  Added some (semi-) bizarre debugging functions into options.{h,cc}
-  that are #ifdeffed out.
-
-* Ditched all the #ifdef KDE2 stuff and dropped the KDE1 backport.
-
-* Added a .desktop file for the NULL conduit (with some translations
-  of my own)
-
-* Added Qt2 layout code to the address and memo widgets so that they
-  become easier to i18n() (ie. they display properly when the string
-  lengths change).
-
-* Adopted some of Heiko's patches:
-	- New feature ForceFirst causes every conduit to behave
-	  as if FirstTime=true every time (this is off by default,
-	  which matches previous behavior)
-	- New feature SyncLastPC causes a slow sync if the Pilot
-	  is synced with a different PC than the last time it
-	  was synced (this is on by default, matching old behavior)
-	- "fixed" font in address and memo editor replaced by the
-	  user's system preference
-	- In some cases the title (first name+last name or something
-	  similar) in an address was empty. This now gives the title
-	  [unknown]
-	- Similar for memos
-
-Let's sum up the current wishlist:
-
-* KNotes conduit
-* Dealing with the rest of Heiko's patches
-	- Proper multi-day appointments in the vcal conduit
-	- Some phone number magic I don't understand yet
-	- Some changes in the address import function
-	- Fast-sync capability (this is different from SyncLast)
-	- getShowPhone() -- don't understand that yet either
-  These patches are quite useful but it takes a lot of work to
-  unsnarl them, which is why they're taking so long.
-
-
-
-Developer's notes for november 9th 2000
-=======================================
-
-What's new? Lots of little bugs found by code review, some new (trivial?)
-features. KPilot 4 is in Mandrake cooker so it receives a little more
-attention now than before.
-
-* Jorg Habenicht found a bug in the memo-import function. It causes
-  array-bounds overruns. The same bug was present in many other parts
-  of the memo widget. I think I got them all.
-
-* Added some robustness checking in the daemon to cover weird cases
-  like running conduits by hand.
-
-* Added better handling of the "first time" dialog in the vcal conduit.
-
-* The NULL-conduit now has an extra configuration field "Databases" which
-  you can attach it to. This allows you to do a bogus conduit sync with
-  a database (almost equivalent to putting it in the "backup only" entry
-  of the global KPilot settings, except you run the external conduit.
-
-* Made KPilotLink::getConfig return a reference instead of a pointer, to
-  avoid new()ing and delete()ing the config data structure all the time.
-  I hope this increases consistency as well. This has caused lots of
-  little type changes throughout the conduit system, so third-party
-  conduit authors beware :) -- all the changes cause compile failures though.
-
-* Jorg brought in a patch so that KPilot uses the pilot-link environment
-  variables to set initial values.
-
-
-Some wishlist-style items:
-
-* The memo and address internal conduits are (a) ugly and (b) impossible
-  to i18n properly, because they have hard-coded sizes. Need to spend some
-  time cleaning that up.
-
-* Really, it's time to write a conduit that syncs with KNotes. It's
-  not that hard, but KNotes has some silly bugs that need fixing first :(
-
-* A patch to introduce a notion of "fast sync" has been produced for
-  KPilot 3.2.1 -- we're now looking into how to integrate that into
-  the KPilot 4.x series. The idea is you only run a sync on the databases
-  you have a conduit for.
-
-Developer's notes for october 29th 2000
-=======================================
-
-* Thomas Zander pointed out that KPilot doesn't write a config file
-  the first time it is run, leading it to *still* believe it's the
-  first time it's run the next time. Fixed.
-
-* In PilotDaemon::setupConnections() things have been reorganized so that
-  a failure on opening the Pilot device will not allow KPilot to start.
-
-* Added an undocumented Debug= entry to conduit's configuration, to
-  ease debugging. Conduits will have to read this themselves.
-
-* Added a "Run KPilot" menu item to the daemon.
-
-And there's some really strange behavior that I've noticed: when I run
-the setup for an external conduit -- which is a separate process --
-KPilot always "jumps in front" of that conduits setup dialog when I
-give KPilot the focus. This is very irritating.
-
-Bugs noted still remaining:
-
-* Much weirdness in conduit startup (mode must be set before running
-  the conduit's constructor, but mode wasn't set till after) has been
-  looked at but not repaired.
-
-* The vcal-conduit had trouble running a sync the first time (you really
-  should do a backup instead). We're working on this one.
-
-
-
-Developer's notes for october 26th 2000
-=======================================
-
-OK, I admit it:
-
-	code,commit,announce,test
-
-is the *wrong* way to do things. I made some mistakes in the code that
-looks up conduits in the .desktop files, so conduits *still* won't run
-with this morning's commits. This has been fixed now, and the conduits
-run. Of course, vcalconduit just SIGSEGV'ed on me, so ...
-
-This brings me to a couple of wishlist items for KPilot:
-
-* A "Cancel" button. I just clicked on Backup when I was aiming for
-  HotSync, and there's nothing I can do about it.
-
-* A timeout when running conduits so that badly behaved conduits don't
-  hang up the KPilot system.
-
-Some other minor issues have been fixed as well:
-
-* Boatloads of compiler warnings in the included .xpm files
-* Some i18n stuff
-
-And new questions raised for people who know the code (I'm thinking
-Preston or Cornelius may be able to explain):
-
-* vcal-conduit.cc line 522, what's the purpose of voStatus there?
-
-
-
-Developer's notes for october 23rd 2000
-=======================================
-
-It's been a week where I couldn't bring myself to tackle
-really big problems, like an address-book conduit for
-kab or pine. So I sat back and polished things, wandered
-through the code finding little bugs (if I was an OpenBSD
-kinda guy I'd call it a proactive code audit). This has
-led to:
-
-A whole slew of minor fixes:
-
-* Updated Help menu in main menu bar
-* Removed superfluous about tab in kpilot setup dialog
-* Fixed config-doesn't-change bug
-* Disable autostart-daemon option if .desktop file unavailable
-* Added quit icon into file menu
-* Added hotsync and backup icons into file menu
-* Cleaned up include files in conduitSetup.h
-* Cleaned up dialog code in conduitSetup.cc for KDE2 compliance
-* Fixed conduits-not-running-during-sync bug in kpilotlink.cc
-* Fixed a minor Qt2 incompatibility in messageDialog.cc
-* Fixed some i18n issues in kpilotlink.cc
-* Replaced sprintf stuff with QString operations in kpilotlink.cc
-* Added hot-sync to file menu for consistency (it's in the toolbar)
-* Added logic in showTitlePage in kpilot.cc to reduce flicker
-
-Some remaining issues:
-
-* The icon for "About KPilot" in the help menu is the wrong one
-* We still need pretty icons for various things (like external conduits)
-
-Some questions:
-
-* Is there a memory leak with the config file in kpilotOptions.cc?
-* Do we really want to be new() and delete()ing the config file so
-  often? Perhaps getConfig() should do some caching.
-* Should we add icons for the other menu items?
-* Is there an entry iterator in KConfig so that you can iterate over
-  entries in a certain group (and possibly delete them?)
-
-Some philosophical stuff:
-
-* Maybe it's time to ditch the internal conduits altogether and work
-  on external conduits for kab and knotes? Although that would still
-  leave the file installer. Maybe a splash of the kpilot logo and then
-  an icon view of what has been dropped into the file installer?
-
-
-
-As far as I can tell KPilot 4 now has the same functionality and bugs
-as KPilot 3.2.1 did (with some polishing). So you still have to be
-careful with KOrganizer. But I think the framework is sufficiently
-OK to make it worthwhile to really write some conduits for various
-KDE 2 apps. Like a kab conduit and a knotes conduit.
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps b/kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps
deleted file mode 100644
index 1559b365e..000000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps
+++ /dev/null
@@ -1,500 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%BoundingBox: 88 4 608 264
-%%HiResBoundingBox: 88 4 608 264
-%.........................................
-%%Creator: GNU Ghostscript 705 (epswrite)
-%%CreationDate: 2003/01/12 00:28:24
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%EndComments
-%%BeginProlog
-% This copyright applies to everything between here and the %%EndProlog:
-% Copyright (C) 2002 artofcode LLC, Benicia, CA.  All rights reserved.
-%%BeginResource: procset GS_epswrite_2_0_1001
-/GS_epswrite_2_0_1001 80 dict dup begin
-/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch
-4 index eq and{ pop pop pop}{ PageSize dup  1
-5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec}
-{ pop/setpagedevice where
-{ pop 1 dict dup /PageSize PageSize put setpagedevice}
-{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat
-setpage}if}ifelse}ifelse}ifelse} bind def
-/!{bind def}bind def/#{load def}!/N/counttomark #
-/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}!
-/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}!
-/w/setlinewidth #/J/setlinecap #
-/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat #
-/m/moveto #/l/lineto #/c/rcurveto #
-/p{N 2 idiv{N -2 roll rlineto}repeat}!
-/P{N 0 gt{N -2 roll moveto p}if}!
-/h{p closepath}!/H{P closepath}!
-/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}!
-/re{4 -2 roll m exch dup lx exch ly neg lx h}!
-/^{3 index neg 3 index neg}!
-/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}!
-/q/gsave #/Q/grestore #/rf{re fill}!
-/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}!
-/|={pop exch 4 1 roll 3 array astore cvx exch 1 index def exec}!
-/|{exch string readstring |=}!
-/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}!
-/@/currentfile #/${+ @ |}!
-/B{{2 copy string{readstring pop}aload pop 4 array astore cvx
-3 1 roll}repeat pop pop true}!
-/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}!
-/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}!
-/Ic{exch Ix false 3 colorimage}!
-/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>>
-/CCITTFaxDecode filter}!/FX{<e>HM_jXp?V&3fCu2HmZ[P:9D@;0n%C7OH<:+%0E&IhlJB9uI=8N=~>
-,
-2932 2437 58 68 /1O
-$C
-,fPr)6kD=D_K6eZFQe8qk_91a60SU<2lEJ.TCeWPT""Y_s')E$s8W-!s8,Fgs0_gkC\qgqBj4l>
-D/Fs1_V"uN=K>K)=A[L$TYX7*+9~>
-,
-2999 2440 15 87 /6H
-$X
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=]'zzzzz#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=~>
-,
-3026 2437 56 90 /1S
-$C
-+U+!Y`"6m?4sG5I:JXbS1\9Z](skRsH?>aL-`p^glX+u
-,
-3122 2444 48 46 /6L
-$C
-.LMgJhd;Ndc+8!;-[M\kHGaj,dSSd3.F;?%K6ek00^s[H&IK@TKH)2kmLBP>*"pp2^m;gQ/VcsQ
-Xm&4(osJPPfN;QN7t9.Jg40~>
-,
-3180 2440 6H ,
-3207 2440 55 65 /1W
-$C
-3"UXos8W-!s8W-!s8W-!s8W-!s8W,rs8N&qm=*X`9-OiapgJLR$$JMaCUMmTY/5uKUhE:~>
-,
-3274 2440 6H ,
-3292 2437 35 83 /6P
-$C
-.Ktq8KaY&rJp]/"s8W-!s8W-!s8W-!s8W-!oAQ,;q:$els8W-!qu~>
-,
-3326 2419 74 6 /2A
-$C
-/dI=7J,~>
-,
-3401 2440 15 87 /6T
-$X
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=~>
-,
-3427 2440 6H ,
-3454 2437 60 90 /2E
-$C
--3]Y7`"6tk+S\7pqL(Q"6o!"!6nlUlD[H'mS(%*'qYPU9qpYTFpJ:hhs8W,m^Xr>Ns%@iIf%7(Q
-g?gFJYeoHDi6MUV`Hpop\8/=Y@;s*GTm6V;s8W-!s8RT~>
-,
-3521 2440 88 65 /6X
-$C
-3"Vkk8VI-Ds8W-!s8W-!s8W-!s8W-!s8W-!s8W-!s8W-!s8VNes1@Z"^=-<#dn=DX(dY;m*#Kf+
-]nlq5=)%Q>g2"(I%0jENKb.Yp$:)QW"b6~>
-,
-3621 2437 61 68 /2I
-$C
-,6]P%3WfA5KFL6W64HlBiMq2H`5IGP,H*PoK3Ae`U`[=CrVQWls*oLp&&[`UA2[Mp)/%V,SCn>p
-nAc%M,6L\4L1H,FaX@Qb_u'Hn'E@h,XhSYYXf`LF#&"-L[;+2K$n,OMJsBbP~>
-,
-3687 2440 6T ,
-3714 2437 54 68 /7B
-$C
-.`IMM6kFTL]~>
-,
-3774 2437 1O ,
-3841 2440 1W ,
-3907 2437 1S ,
-3974 2437 55 66 /2M
-$C
--,l=(Ld9o'Ag2PI%o6LsNd;k!ha*86FJ!l/Vr.N(rVuots8W-!s8W-!s8W-!s8W-!s82~>
-,
-4041 2440 6H ,
-4059 2437 6P ,
-3480 2362.79 0 -215.33 S
-2418.78 1716.79 2122.43 430.664 re
-S
-2864 1970 12 87 /7F
-$X
-J+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sW
-J+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sW
-J+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+*~>
-,
-2889 1970 1W ,
-2956 1967 52 68 /2Q
-$C
--,NABU'M_]E1I5/SN7pcD]t"F&8t?82m6$E-ia2]eL4NNJVK".$7$I"b&D$G$5/"++K-"VU';""
-%FrN2"G'sg93V7W$31$@IquEnXr(@ca/i;.>)'+,@6oL,@3>~>
-,
-3008 1967 6P ,
-3050 1967 2I ,
-3116 1970 1W ,
-3183 1967 7B ,
-3243 1967 59 68 /7J
-$C
-,fGl)Se,j,cu=W8:7VsBcA4(p#WG$RkrtT4qJZ"u=5LZHqYbp7$O4AtrujfqrVuQJlKc4Ydb
-,
-3340 1967 1O ,
-3399 1970 36 87 /2U
-$C
-2$EsZs8W-!s8W-!s8W-!s8W-!s8V9"2uiJG:]LIprr*q"c>2k9iPE;~>
-,
-3473 1970 76 87 /7N
-$C
-4qs<8p!W0lV:,B:V>cfSYHF4!>qVK?>qbi]?g2[D?eS^WIaZqSp6O.a['l:dCQPEkEf~>
-,
-3553 1970 61 87 /2Y
-$C
-4pN20r.Q^%s8W-!s8W-!s8W-!s8W-!s8W-!s8W-!s8W,g~>
-,
-3620 1970 6H ,
-3646 1967 2E ,
-3721 1970 58 87 /0C
-$C
--D>qhs8W-!s8W-!s8W-!s,]1cs8W*B6GNR#s8W-!s8W+\=Z-6Z^]~>
-,
-3786 1967 2I ,
-3853 1967 7B ,
-3905 1967 6P ,
-3947 1967 1O ,
-4013 1970 36 65 /3C
-$C
-3"u>ls8W-!s8W-!s8W-!huA1UHf"LZ#7nZE6U@mT^AIB5*(,>c~>
-,
-4053 1944 54 89 /0G
-$C
-4=h%+4lQA.mRRJ8mr.*4qnE%'HLK>^TCi/]pI$G.Id6e.eb/Y%lMK2`pTLXd>M%`@Vu:O0qVIk#
-I6Y=Aol^.XlMgJ,rTgN]X8~>
-,
-2856 1829 2Q ,
-2916 1829 2M ,
-2983 1829 2E ,
-3050 1829 7B ,
-3110 1832 6T ,
-3136 1829 2I ,
-3203 1829 2Q ,
-3263 1829 2Q ,
-2065.03 1393.82 1414.97 322.97 1414.97 -322.97 S
-1003.81 855.516 2122.43 538.304 re
-S
-1349 1235 7F ,
-1374 1235 1W ,
-1441 1232 2Q ,
-1493 1232 6P ,
-1534 1232 2I ,
-1601 1235 1W ,
-1667 1232 7B ,
-1727 1232 7J ,
-1825 1232 1O ,
-1884 1235 2U ,
-1957 1232 78 91 /3G
-$C
-,/If')o3*1/dOF&cu>N\:(s?/-Lr&?F9iq>DLr>GI5aaih']%FIrq=TTAI0UIt#(XjNojOYQ+Y&
-s8UjRrSRR8YdaB"^Ugkg[[-f+]!f4CfLj%c$kfdPQ8iX0WsTc"'JQ2r8<@M8~>
-,
-2044 1232 1O ,
-2111 1235 1W ,
-2177 1232 1S ,
-2244 1232 2M ,
-2311 1235 6H ,
-2330 1232 6P ,
-2371 1232 71 91 /0K
-$C
-,@P,M.$.ic#TOuG#78b!l-TY>d/j?[#TKFhiAX@#h(MLNJ*ZKurI=kDNg4BPYcp_+6"HWDjA6a?
-BH#f\Pl[p0"'uO85c>A@)JTigUBhSGb7m>PPX/+s'a:^;f@M
-,
-2451 1232 7J ,
-2510 1232 6P ,
-2551 1232 2M ,
-2618 1209 60 91 /3K
-$C
-2A?,js8W-!s8V7ZGsF%!"6_o^kWYV7VhkQ>Jg#k&K6hH3VY'_'^9>8bht6sK\psb[s8W,tDSQ1_
-rH7#LFk:>EG*^`oA3n*>GVd1.Z!FNaCTt
-,
-1341 1091 2Q ,
-1401 1091 2M ,
-1467 1091 2E ,
-1534 1091 7B ,
-1594 1094 6T ,
-1621 1091 2I ,
-1687 1091 2Q ,
-1747 1091 2Q ,
-0.2 i
-1870.92 1075.76 m
--16.8 11.16 -18.92 31.44 -18.92 50.04 c
-0 17.64 4.23 35.4 18.68 46.56 c
--1.32 2.04 p
--3.12 -2.28 -6.36 -4.44 -9.36 -6.96 c
--12.48 -10.2 -18 -25.68 -18 -41.52 c
-0 -24.12 6.84 -39.24 27.48 -52.32 c
-h
-f*
-1877 1087 86 95 @C
-,
-44QZ?V^2?WOW\P3&29Uc1nb,<+OYomJqU+#"Vap'6?&k74Tl^sPG"7.3_@aq8:uu!Jo=W]C@t@o
-K\pR@dsQR,DdS"Fo`+sWFT;C@s8W-!CA%W,C\u^hpT:XdV>FtDDO106D/H+c-&/kF~>
-1978 1094 69 87 /0Q
-$C
--D9%R<*'<[LPNS%mib9u!s1G@_gT8t^AYeE^\7]bhu!H2J,fQ9s8W-!s8W-!l$ra5?XNh??%:<&
-9
-,
-2057 1094 6H ,
-2083 1091 2I ,
-2150 1094 6T ,
-2177 1091 1O ,
-2243 1068 56 91 /3Q
-$C
--,Cq4DZh%&FQ!I"SIf2t":md&kr5NhFJ$:N^Z0P;64]30NY$R\lmJ^/K_s.$3Tq%`2B[Y$V"En7
-H_p17]mmf#?iU0+s8W,.rkEgVhWoWmp8tHtC;U=2*sN+X>?b<9=CGWlL(Q$WOFk7~>
-,
-2341 1091 7B ,
-2401 1094 55 87 /0U
-$C
-3"UXos8W-!s8W-!s8W-!s8W-!s8W,rs8N&qm=+q:9+>jWj<3C,!?I6/g?j'q>VNZA\Yr7fs8W-!
-s8W,W~>
-,
-2467 1094 6H ,
-2494 1094 6T ,
-2521 1091 1S ,
-2616 1125.92 m
-0 15.96 -5.54 31.2 -18.48 41.52 c
--3 2.52 -6.24 4.68 -9.36 6.96 c
--1.32 -2.04 p
-14.64 -11.16 19.16 -28.92 19.16 -46.56 c
-0 -18.72 -2.41 -38.76 -19.4 -50.04 c
-1.44 -2.16 p
-20.64 13.08 27.96 28.2 27.96 52.32 c
-h
-f*
-2649 1094 2U ,
-2690 1091 1O ,
-2757 1094 3C ,
-1341 950 7B ,
-1401 950 1O ,
-1467 953 1W ,
-1534 950 1S ,
-1601 950 2M ,
-1667 953 6H ,
-1686 950 6P ,
-1758 950 7B ,
-1818 950 1O ,
-1885 953 1W ,
-1943 953 2U ,
-1985 953 6H ,
-2011 927 3Q ,
-2078 950 2M ,
-2145 953 3C ,
-2185 950 2I ,
-2244 950 6P ,
-2285 953 6H ,
-2312 950 1O ,
-2378 953 1W ,
-1 i
-2065.03 855.52 0 -215.33 S
-1357.57 101.88 1414.97 538.304 re
-S
-1718 478 7J ,
-1776 481 61 63 /3U
-$C
-4rfOcF_r_\f%jP'Xh(s->BOd8[d)RPD:Q"r];oXOG?-3i[=)5mWVU`83dCumX4"SgVknNS:J0p/
-Ss@j>2bU2tDO4Drh(GhoYQ~>
-,
-1844 478 7J ,
-1911 478 7B ,
-0.2 i
-2001.92 462.76 m
--16.8 11.16 -18.92 31.44 -18.92 50.04 c
-0 17.64 4.23 35.4 18.68 46.56 c
--1.32 2.04 p
--3.12 -2.28 -6.36 -4.44 -9.36 -6.96 c
--12.48 -10.2 -18 -25.68 -18 -41.52 c
-0 -24.12 6.84 -39.24 27.48 -52.32 c
-h
-f*
-2038 512.92 m
-0 15.96 -5.54 31.2 -18.48 41.52 c
--3 2.52 -6.24 4.68 -9.36 6.96 c
--1.32 -2.04 p
-14.64 -11.16 19.16 -28.92 19.16 -46.56 c
-0 -18.72 -2.41 -38.76 -19.4 -50.04 c
-1.44 -2.16 p
-20.64 13.08 27.96 28.2 27.96 52.32 c
-h
-f*
-2080 478 2Q ,
-2140 481 0U ,
-2206 478 1O ,
-2265 481 90 63 /0Y
-$C
-.KYlDpXO]kT@_nIrBJokOU%dj64a+nX4+7ZJ,d*k:;?Q'Id
-rTjHiYIF3!rEcnshuA2Vl9;BN^KiM\s1MK@qgJ<@rr'V~>
-,
-2360 478 2Q ,
-1710 339 6P ,
-1751 342 0U ,
-1818 339 7J ,
-1916 339 7B ,
-1976 339 1O ,
-2043 342 1W ,
-2102 342 2U ,
-2143 342 6H ,
-2170 316 3Q ,
-1718 199 1S ,
-1784 202 6H ,
-1811 199 2I ,
-1878 202 6T ,
-1904 199 1O ,
-1971 176 3Q ,
-1 i
-3833.76 855.516 2122.43 538.304 re
-S
-4226 1231 7F ,
-4252 1231 1W ,
-4318 1228 2Q ,
-4370 1228 6P ,
-4412 1228 2I ,
-4478 1231 1W ,
-4545 1228 7B ,
-4605 1228 7J ,
-4703 1228 1O ,
-4761 1231 2U ,
-4835 1228 3G ,
-4922 1228 1O ,
-4989 1231 1W ,
-5055 1228 1S ,
-5122 1228 2M ,
-5189 1231 6H ,
-5207 1228 6P ,
-5241 1231 83 87 /3Y
-$C
-4rgSXFh7OZp%rOjp=IjnYH.P-='aGFYHQ\f<^3Y`?g>^2*gZ^#9)nUMs6V?:g/n;k0CH!Xh-GNA
-])QnqrOV=lFk:bcY3Q!L?eYM2p:L~>
-,
-5329 1228 7B ,
-5381 1228 6P ,
-5422 1231 6H ,
-5449 1228 1O ,
-5515 1231 1W ,
-4218 1090 2Q ,
-4278 1090 2M ,
-4345 1090 2E ,
-4412 1090 7B ,
-4472 1093 6T ,
-4498 1090 2I ,
-4565 1090 2Q ,
-4625 1090 2Q ,
-4708 1090 6P ,
-4750 1090 1O ,
-4849 1090 1S ,
-4916 1090 1O ,
-5007 1090 6P ,
-5048 1093 0U ,
-5115 1090 7J ,
-5213 1090 2I ,
-5280 1090 7B ,
-5332 1090 6P ,
-5373 1090 2M ,
-5440 1090 2I ,
-5507 1093 6T ,
-4218 953 2Q ,
-4278 930 0G ,
-4338 956 1W ,
-4405 953 7B ,
-4465 956 3C ,
-4505 953 1O ,
-4572 956 1W ,
-4638 956 6H ,
-4665 956 52 63 /1C
-$C
-,D)Qfr.c\
-,
-4725 953 2I ,
-4784 953 6P ,
-4825 956 6H ,
-4852 953 1O ,
-4918 956 1W ,
-4894.97 855.52 0 -215.33 S
-4187.46 101.88 1414.97 538.304 re
-S
-4488 407 7J ,
-4547 410 3U ,
-4615 407 7J ,
-4682 407 7B ,
-0.2 i
-4772.92 391.76 m
--16.8 11.16 -18.92 31.44 -18.92 50.04 c
-0 17.64 4.23 35.4 18.68 46.56 c
--1.32 2.04 p
--3.12 -2.28 -6.36 -4.44 -9.36 -6.96 c
--12.48 -10.2 -18 -25.68 -18 -41.52 c
-0 -24.12 6.84 -39.24 27.48 -52.32 c
-h
-f*
-4809 441.92 m
-0 15.96 -5.54 31.2 -18.48 41.52 c
--3 2.52 -6.24 4.68 -9.36 6.96 c
--1.32 -2.04 p
-14.64 -11.16 19.16 -28.92 19.16 -46.56 c
-0 -18.72 -2.41 -38.76 -19.4 -50.04 c
-1.44 -2.16 p
-20.64 13.08 27.96 28.2 27.96 52.32 c
-h
-f*
-4850 407 1S ,
-4917 407 1O ,
-4984 407 7J ,
-5050 407 2Q ,
-5134 407 6P ,
-5175 410 0U ,
-5242 407 7J ,
-4488 269 2Q ,
-4548 246 0G ,
-4608 272 1W ,
-4675 269 7B ,
-cleartomark end end pagesave restore showpage
-%%PageTrailer
-%%Trailer
-%%Pages: 1
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/Makefile b/kpilot/Documentation/ConduitProgrammingTutorial/Makefile
deleted file mode 100644
index 1dd8b068b..000000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile for the conduit programming tutorial
-
-# This will probably go horribly wrong because all of the
-# files have been reduced to just the sources, and so
-# pdflatex can't read the required embedded pdf / eps
-# pictures that should be created from the png's.
-
-
-all : index.dvi index.pdf
-
-
-
-# latex index && pdflatex index && latex2html -local_icons index && latex2rtf index && dvips index 
-#
-# We'll need to create the required pdf files in pictures/ as well.
-
-
-ConduitStructures.pdf : ConduitStructure.eps
-	epstopdf ConduitStructure.eps
-
-index.dvi : index.tex
-	latex index
-
-index.pdf : ConduitStructures.pdf index.tex index.dvi
-	pdflatex index
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/index.tex b/kpilot/Documentation/ConduitProgrammingTutorial/index.tex
deleted file mode 100644
index aed082efc..000000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/index.tex
+++ /dev/null
@@ -1,1708 +0,0 @@
-\documentclass[10pt,a4paper]{article}
-%\usepackage{hyperlatex}
-\usepackage{graphicx}
-\usepackage{listings}
-\usepackage{geometry}
-\usepackage{html}
-\usepackage{verbatim}
-
-\geometry{left=2.5cm, right=2.5cm, bottom=2cm, top=2cm}
-%\htmltitle{KPilot Conduits programming tutorial}
-%\htmladdress{\xlink{Reinhold Kainhofer}{mailto:reinhold@kainhofer.com}, 
-%\htmladdnormallink{http://reinhold.kainhofer.com}{http://reinhold.kainhofer.com/} \today}
-%\htmlattributes{BODY}{BGCOLOR=#ffffee text=#000000 link=#0000FF vlink=#000099 alink=#000099}
-
-
-%\setcounter{htmldepth}{2}
-%\setcounter{secnumdepth}{4}
-
-\title{KPilot conduit programming tutorial}
-\author{\htmladdnormallink{Reinhold Kainhofer}{mailto:reinhold@kainhofer.com}, with help of 
-\htmladdnormallink{A. de Groot}{mailto:groot@kde.org} and \htmladdnormallink{Dan Pilone}{mailto:pilone@slac.com}}
-\date{\today}
-
-%\W \newcommand{\texttrademark}{}
-\newcommand{\code}[1]{{\small\texttt{#1}}}
-\newcommand{\file}[1]{{\small\texttt{#1}}}
-\newcommand{\class}[1]{{\small\em\texttt{#1}}}
-
-\newcommand{\codesize}[0]{\scriptsize}
-
-\begin{document}
-
-\maketitle
-
-
-%\htmlmenu{3} 
-
-\tableofcontents 
-
-
-
-\section{Introduction and General}
-
-\subsection{Introduction}
-    One of the greatest assets of the handheld computers is their ability to
-interconnect with other applications.  KPilot supports this capability
-through conduits.  A conduit is a small separate program that talks to
-KPilot during the hot sync.  The conduit translates between the Palm
-Pilot and the application you're syncing with.
-
-For KPilot to be a really usable synchronization application, it depends
-on third-party developers to enlarge the conduit gallery to other applications. In particular, I want to encourage developers of Palm applications to provide not only a Windows\texttrademark conduit, but at the same time put some effort in providing also a conduit for Linux and other platforms.
-This is also the reason why I'm writing this tutorial: 
-To encourage third-party developers to write conduits for KPilot. 
-
-I will show the process at several examples: \\
-First, the general framework (library, factory etc.) for a conduit is presented 
-in section \ref{FactorySection}, then in section \ref{SetupSection}. 
-I will describe how you can write a configuration dialog for your conduit. These 
-two sections will use the malconduit (AvantGo conduit) as an example. 
-The synchronization part (the conduit class) will be described in the next few 
-sections. Section \ref{SectionSimpleConduit} will show a very simple 
-synchronization at the example of the AvantGo conduit, where we will use the 
-functions of an external library which will do the synchronization for us. 
-In section \ref{SectionDatabasesConduit} I will show a synchronization process 
-where one file on disk corresponds to one database on the palm, and where no conflict 
-resolution and no record comparison needs to be done, because we have to copy the 
-whole database either from or to the handheld. The particular example there will be the docconduit which 
-synchronizes text files on the harddisk with PalmDOC documents for AportisDoc, TealDoc, MobiPocket Reader, Gutenpalm etc. 
-on the Palm.
-Finally, I wanted to show an example of a record-based conduit, but then decided it 
-would be too extensive to replicate all the complex sync and conflict resolution code.
-Instead I refer to the addressbook conduit, which you should be able to understand 
-quite well after studying the other conduits explained in the previous chapters of this How-To.
-Using KDE's KitchenSync general synchronization framework for syncing will be the topic of section 
-\ref{SectionKitchenSync}, where I give some argument why we do not yet switch to kitchensync yet.
-
-\subsection{Further information and links}
-
-There are loads of information about the PalmOS\texttrademark Database format 
-out there:
-\begin{itemize}
-\item Palm's official Developer Knowledge Base document: \htmladdnormallink{http://oasis.palm.com/dev/kb/faq/FileFormat/PDB+PRCFormat.cfm}{http://oasis.palm.com/dev/kb/faq/FileFormat/PDB+PRCFormat.cfm}
-\item PilotRecord Databse format: \htmladdnormallink{http://www.pda-parade.com/prog/palm/doc/pdb.html}{http://www.pda-parade.com/prog/palm/doc/pdb.html}
-\item EBNF representation of the database format: \htmladdnormallink{http://obermuhlner.com/public/Projects/Palm/PDBC/Documentation/pdbc\_file.html}{http://obermuhlner.com/public/Projects/Palm/PDBC/Documentation/pdbc\_file.html}
-\item A list of several Palm databse formats: \htmladdnormallink{http://myfileformats.com/search.php?name=Palm}{http://myfileformats.com/search.php?name=Palm}
-\end{itemize}
-
-\subsection{Legal}
-You can skip this chapter if you are familiar with HOWTOs,
-or just hate to read all this assembly-unrelated crap.
-
-\subsubsection{Legal Blurb}
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU \htmladdnormallink{Free Documentation
-License}{http://www.gnu.org/copyleft/fdl.html}  Version 1.1;
-with no Invariant Sections, with no Front-Cover Texts, and no Back-Cover texts.
-A copy of the license is included in the \htmladdnormallink{Free Documentation
-License}{http://www.gnu.org/copyleft/fdl.html} appendix.
-
-
-The most recent official version of this document is available from
-\htmladdnormallink{my homepage}{http://reinhold.kainhofer.com/Linux/KPilot/ConduitTutorial}.
-If you are reading a few-months-old copy,
-consider checking the above URLs for a new version.
-
-
-
-\section{The general conduit framework}\label{FactorySection}
-
-\subsection{How conduits work in general}
-    KPilot is divided into three major components: the GUI, the
-syncing daemon, and the conduits.  When the GUI is started it attempts
-to make a connection to the syncing daemon.  If it can't it starts the
-daemon then makes the socket connection.  When the user hits the
-hot-sync button on the cradle the daemon checks to see if the GUI is
-connected.  If it is, the daemon notifies the GUI that a hot-sync has
-started.  The daemon then steps through all activated conduits and lets them
-do their sync. When the conduit is started it
-makes a connection back to the daemon and asks the daemon to read and
-write entries into the database.  When the conduit finishes it exits
-and the daemon continues on to the next conduit.  Once all the
-conduits have run the daemon alerts the GUI that it has
-finished and goes back to waiting for a sync to start. Note that the backup 
-of the Handheld is also done by a conduit, which is not visible to the user, though.
-
-
-    The basic conduit implements three important features:
-info/setup, backup, and normal hot-sync.  If the user clicks the setup 
-button in KPilot's conduit menu the conduit is started and requested
-to show a settings dialog.  If the conduit doesn't have any settings
-to adjust then it should simply display an about dialog.  When the
-dialog is closed the conduit will exit.  Next, if the user requested
-KPilot back up the pilot the conduit will be given the opportunity to
-grab everything off the pilot.  This is useful if this is the first
-time the conduit is being used.  For example if the user had never
-synced before this would be a good time to copy the data into the
-calendar, money database, etc.  Lastly, the conduit is requested to
-hot-sync whenever KPilot is hot-syncing with the pilot. 
-
-
-
-\subsection{A conduit is a KDE shared library}
-
-From your system's point of view, a conduit is a shared library which is loaded 
-on demand by KPilot. This means that as long as you don't do a sync, the conduit will not 
-be in memory. Once a hotsync is initiated, kpilotDaemon (the process running in 
-the background that does the actual sync) loads the conduit, let's say its name 
-is "malconduit" and it is installed as /opt/kde3/lib/kde3/libmalconduit.so. It 
-then calls the function \code{init\_libmalconduit} (the name after init\_ is the 
-filename of the library), which needs to return a pointer to an instance 
-of a \class{KLibFactory} subclass. 
-
-{\small\begin{verbatim}
-extern "C" {
-
-void *init_libmalconduit() {
-    return new MALConduitFactory;
-}
-
-};
-\end{verbatim}
-}
-
-Whenever the conduit needs to do some action 
-(show the configure dialog or do a sync), the \code{createObject(...)} method 
-of this instance is called with the appropriate values to specify the action. It either returns an instance 
-of a \class{ConduitConfig} subclass to show the configuration dialog, or an 
-instance of an \class{ConduitAction} subclass which will later do the actual sync 
-with the handheld. Figure \ref{ConduitStructure} shows this as a diagram:
-
-\begin{figure}
-\begin{center}
-\includegraphics[width=13cm]{ConduitStructure}
-\caption{The general structure of a conduit}\label{ConduitStructure}
-\end{center}
-\end{figure}
-
-
-\subsection{Makefile.am and KDE build process}
-
-Before we delve into programming details, let us look a bit at the compilation framework.
-
-If you develop your conduit inside the \file{kdepim/kpilot/conduits} directory of KDE's 
-CVS tree, all you need to do is to provide a Makefile.am in your conduit directory 
-(e.g. \file{kdepim/kpilot/conduits/malconduit}), and add the name of your 
-directory (\file{malconduit} in this example) to the variable \code{SUBDIRS} 
-in \file{kdepim/kpilot/conduits/Makefile.am}:
-{\small
-\begin{verbatim}
-SUBDIRS = knotes expense null vcalconduit \
-          popmail timeconduit malconduit
-\end{verbatim}
-}
-\vspace{1em}
-
-The \file{Makefile.am} in your conduit's directory will look similar to the following one 
-(taken from the malconduit). Since this is a tutorial on KPilot conduits, and not 
-on automake/conf, make and Makefiles, I will not explain it in detail. However, 
-it should be easy to adapt it to your conduit's needs:
-
-{\footnotesize
-\begin{verbatim}
-### Makefile for the AvantGo conduit
-###
-### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) \
-  -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = mal_conduit.desktop
-
-kde_module_LTLIBRARIES = libmalconduit.la
-
-libmalconduit_la_SOURCES = \
-        mal-factory.cc \
-        mal-setup.cc \
-        mal-conduit.cc \
-        mal-setup_dialog.ui
-libmalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
-libmalconduit_la_LIBADD = -lkpilot $(MAL_LIB)
-\end{verbatim}
-}
-
-Here is a short table of the variables used in \file{Makefile.am}:
-
-\begin{tabular}{ll}
-\code{service\_DATA} & name of the desktop file of your conduit \\
-        &(tells KDE which library it needs to load)\\
-\code{kde\_module\_LTLIBRARIES} & tell make which libraries to compile\\
-\code{libraryname\_SOURCES} & a list of all source files to be compiled into \\
-        &libraryname (where a . is replaced by a \_)\\
-\code{libraryname\_LDFLAGS} & linker flags when linking your conduit \\
-\code{libraryname\_LIBADD} & additional libraries the conduit links to \\
-        &(-lkpilot is the KPilot base library and\\
-        & needs to be linked to every conduit)
-\end{tabular}
-
-\vspace{0.5em}
-
-Both \code{MAL\_INCLUDE} and \code{MAL\_LIB} are special variables 
-pointing to the headers and the library of libmal, and are set by 
-\file{configure.in.in} (see below).
-
-\vspace{1em}
-
-If you have special library requirements (e.g. the malconduit needs libmal to work), 
-you need to add special configure checks to the autoconf file \file{kdepim/kpilot/conduits/configure.in.in} (for an 
-example, you should look at the checks the malconduit added to the file in CVS) 
-and include the directory only if the appropriate libraries and header files are installed. 
-One way to achieve this is to add the following line after your configure checks, which set 
-the variable \code{HAVE\_MAL} to \code{1}. This automake command in 
-\file{configure.in.in} defines "\code{include\_malconduit}" for use 
-in Makefile.am, if \code{HAVE\_MAL==1}:
-{\small\begin{verbatim}
-AM_CONDITIONAL(include_malconduit, test "$HAVE_MAL" = "1")
-\end{verbatim}
-}
-
-You can then use "\code{include\_malconduit}" in the KPilot conduit 
-directory's makefile \file{kdepim/kpilot/conduits/Makefile.am}:
-{\footnotesize
-\begin{verbatim}
-MALSUBDIR=
-if include_malconduit
-    MALSUBDIR = malconduit
-endif
-
-SUBDIRS = knotes expense null vcalconduit popmail timeconduit $(MALSUBDIR)
-\end{verbatim}
-}
-
-\subsection{The conduit factory}
-
-In KDE's dynamic library system, the library factory plays a crucial rule. The \code{init\_libraryname()} function 
-always returns a pointer to a \class{KLibFactory} instance. Whenever a program needs a special action by 
-the conduit, it calls the \code{createObject} of the \class{KLibFactory} to get an appropriate object.
-Furthermore, the conduit factory initializes the about dialog of the conduit. 
-
-The factories of all conduits are very similar, so you best just copy the .h and .cc file of an existing conduit 
-for your conduit. All you need to do is to change the copyright notices for the about dialog, and 
-change the class names of the \class{ConduitAction} and \class{ConduitSetup} to your own class names. Also, 
-the factory is a good place to define the strings for the config settings' entries to the config file.
-If you define them like:
-{\footnotesize\begin{verbatim}
-class MALConduitFactory : public KLibFactory
-{
-...
-public:
-    static const char *configSetting1() {return fConfigSetting1;};
-private:
-    static const char *fConfigSetting1;
-} ;
-\end{verbatim}
-}
-and in the .cc file
-{\small\begin{verbatim}
-const char*MALConduitFactory::fConfigSetting1="NameOfSetting";
-\end{verbatim}
-}
-you can use them as \code{MALConduitFactory::configSetting1()} in 
-both the configuration dialog and the sync routine without running the risk of misspelling
-them.
-
-Everything else in the factory can stay as it is.
-
-Here is an example of the malsync's factory:
-\begin{htmlonly}
-  \htmladdnormallink{Source code of mal-factory.h}{mal-factory.h}
-  \htmladdnormallink{Source code of mal-factory.cc}{mal-factory.cc}
-\end{htmlonly}
-
-
-\begin{latexonly}
-\subsubsection{mal-factory.h}
-{\scriptsize
- \verbatiminput{mal-factory.h}
-}
-\subsubsection{mal-factory.cc}
-{\scriptsize
- \verbatiminput{mal-factory.cc}
-}
-\end{latexonly}
-
-\subsection{Debugging conduits}
-
-Debugging KPilot conduits is not an easy task, as one cannot use a debugger 
-(because conduits are shared libraries and kpilotDaemon forks itself 
-in the background when it is started).
-
-So printing debug output is the only way to get any information about what 
-the conduit is doing. If you don't configure kdepim it with \code{--no-debug}, or don't add 
-\code{--NDEBUG} in Makefile.am, then you can easily print out debug messages
-using the \code{DEBUGCONDUIT} stream. However, at the beginning of each 
-function where you want to use it, you need to add the macro \code{FUNCTIONSETUP;}, 
-which prints out a debug message with the current function name. Additionally, 
-it sets several variables like \code{fname} which holds the name of the current function.
-
- As an example, the following code
-{\footnotesize\begin{verbatim}
-void YourConduit::somefunction() {
-    FUNCTIONSETUP;
-    int i=5;
-#ifdef DEBUG
-    DEBUGCONDUIT<tabWidget);
-    addAboutPage(false,MALConduitFactory::about());
-
-    fConfigWidget->tabWidget->adjustSize();
-    fConfigWidget->resize(fConfigWidget->tabWidget->size());
-}
-\end{verbatim}
-}
-
-The first two lines create an instance of our dialog template and add it 
-as the tab widget to the dialog. Since we will have to set and read the 
-values of the controls in that tab widget, we need to store a pointer to 
-the instance in the variable \code{fConfigWidget} which is of the same type 
-(\code{MALWidget}) we assigned to our dialog template in QT Designer. The 
-third line of code adds the about page (which is created by the factory, 
-see last section) to the tab widget, while the last two line just adjust 
-the size of the dialog box and are not always needed.
-
-As mentioned above, we only need to implement \code{MALWidgetSetup::readSettings()} 
-and \code{MALWidgetSetup::commitChanges()}. The \class{ConduitConfig} class 
-already stores an instance named fConfig to KPilot's configuration facility. 
-We only have to set the correct configuration group name (I suggest, you 
-store the name of the configuration group for you conduit in a \code{static 
-char*} variable of the conduit factory class), and then we can use the methods
-\begin{itemize}
-\item \code{fConfig->readNumEntry("entryname", \em{defaultNumericValue})}
-\item \code{fConfig->readEntry("entryname", \em{defaultstring})}
-\item \code{fConfig->readBoolEntry("entryname", \em{defaultBoolValue})}
-\end{itemize}
-to retrieve the settings from the configuration file. We then use the methods of the QT and KDE widgets to assign the text or value to the controls:
-
-{\footnotesize\begin{verbatim}
-/* virtual */ void MALWidgetSetup::readSettings()
-{
-    FUNCTIONSETUP;
-
-    if (!fConfig) return;
-    KConfigGroupSaver s(fConfig,MALConduitFactory::group());
-    
-    fConfigWidget->syncTime->setButton(fConfig->readNumEntry(MALConduitFactory::syncTime(), 0));
-    
-    // Proxy settings
-    fConfigWidget->proxyType->setButton(
-        fConfig->readNumEntry(MALConduitFactory::proxyType(), 0));
-    fConfigWidget->proxyServerName->setEditText(
-        fConfig->readEntry(MALConduitFactory::proxyServer(), ""));
-    int proxyPortNr=fConfig->readNumEntry(MALConduitFactory::proxyPort(), 0);
-    if (proxyPortNr>0 && proxyPortNr<65536) 
-    {
-        fConfigWidget->proxyCustomPortCheck->setChecked(true);
-        fConfigWidget->proxyCustomPort->setEnabled(true);
-        fConfigWidget->proxyCustomPort->setValue(proxyPortNr);
-    }
-    fConfigWidget->proxyUserName->setText(fConfig->readEntry(
-        MALConduitFactory::proxyUser(), ""));
-    fConfigWidget->proxyPassword->setText(fConfig->readEntry(
-        MALConduitFactory::proxyPassword(), ""));
-}
-\end{verbatim}
-}
-
-In this example, we don't store to the configuration file if a custom proxy port should be used. Instead, we just store a port number, and if the port number is 0 this means to use the default port. In this case, the custom port CheckBox needs to stay unchecked, and the port NumEntry control will stay disabled as it is in the dialog template. In all other cases, however, the custom port CheckBox should be checked, and the port NumEntry control will be enabled and filled with the correct custom port.
-
-
-The KPilot user can then change all the settings in the dialogbox without any intervention from KPilot, so we don't need to write any code for that. Only the \code{commitChanges()} method remains to be done, which does the opposite of the readSettings() method. It reads the values of the controls and stores them to the configuration file. The \class{KConfig} class (the \code{fConfig} variable, resp.) has only one method \code{KConfig::writeEntry("entryname", valueOfWhateverType)} to write a value to the configuration file. However, this method has several overloaded implementations so that you can write numeric, string, boolean, date and many more variable types with the same syntax. First, we need to set the correct configuration group again, and then we just read each of the settings and write it out immediately using the \code{writeEntry} method:
-
-{\footnotesize\begin{verbatim}
-/* virtual */ void MALWidgetSetup::commitChanges()
-{
-    FUNCTIONSETUP;
-
-    if (!fConfig) return;
-    KConfigGroupSaver s(fConfig,MALConduitFactory::group());
-    
-    fConfig->writeEntry(MALConduitFactory::syncTime(),
-        fConfigWidget->syncTime->id(fConfigWidget->syncTime->selected()));
-    
-    // Proxy settings
-    fConfig->writeEntry(MALConduitFactory::proxyType(),
-        fConfigWidget->proxyType->id(fConfigWidget->proxyType->selected()));
-    fConfig->writeEntry(MALConduitFactory::proxyServer(), 
-        fConfigWidget->proxyServerName->currentText() );
-
-    if (fConfigWidget->proxyCustomPortCheck->isChecked() ) 
-    {
-        fConfig->writeEntry(MALConduitFactory::proxyPort(), 
-            fConfigWidget->proxyCustomPort->value());
-    }
-    else 
-    {
-        fConfig->writeEntry(MALConduitFactory::proxyPort(), 0);
-    }
-    fConfig->writeEntry(MALConduitFactory::proxyUser(), 
-        fConfigWidget->proxyUserName->text() );
-    fConfig->writeEntry(MALConduitFactory::proxyPassword(), 
-        fConfigWidget->proxyPassword->text() );
-}
-\end{verbatim}
-}
-
-This was all that is needed to implement the configuration for your conduit. Simple, isn't it?
-
-
-
-\section{How the conduits work}
-
-    First a little background on pilot databases would be useful.
-Each database on the pilot is divided into multiple records.  Each
-record is a specific entry into the database.  For example, one
-address in the Address Book corresponds to one record in AddressDB.
-Each record has a unique id assigned by the pilot when the record is
-created, and an index number in the database.  The index numbers get
-reused, for example if you delete the second record from the database
-then create a new one it will fill in the empty slot and become index
-number two.  However, it will have a unique ID number.  (The moral of
-this story is only use index numbers when you need to iterate through
-the whole Database, otherwise use the unique record id.)
-
-    When a new record is created by the user on the local side, it 
-is inserted into the backed up copy of the databases but given a
-unique ID of 0.  When the syncing occurs this record is installed on
-the pilot and the pilot will return with the new unique id for it.
-This same process happens with a conduit.  If two records have the
-same unique id they will overwrite each other.
-
-    Lastly, the conduit is requested to
-hot-sync whenever KPilot is hot-syncing with the pilot.  During this
-time the conduit asks KPilot if there are any modified records on the
-pilot and should back them up into the program the conduit syncs
-with.   Then, the conduit checks to see if there are any locally
-modified records and asks KPilot to put those on the pilot.  Once
-finished, it exits gracefully by a 
-{\small\begin{verbatim}
-emit syncDone();
-\end{verbatim}
-}
-and KPilot will continue with the next conduit.
-
-In the next few sections I will present the most important classes KPilot provides to the conduit programmers, and after that I will show several examples of different conduits.
-
-
-\subsection{The \class{SyncAction} base class for conduits}
-
-All conduits are subclasses of \class{SyncAction}, which provides the following methods. The \code{exec} method is a pure virtual function and needs to be implemented by each conduit:
-
-\begin{itemize}
-\item
-    \code{virtual bool exec()=0} ... This function starts the actual processing done
-     by the conduit. It should return false if the
-     processing cannot be initiated, f.ex. because 
-     some parameters were not set or a needed library
-     is missing. This will be reported to the user.
-     It should return true if processing is started
-     normally. If processing starts normally, it is
-     the {\bf conduit's} responsibility to eventually
-     \code{emit syncDone();} if processing does not start
-     normally (ie. \code{exec()} returns false) then the
-     environment will deal with \code{syncDone()}.
-
-\item
-    \code{void addSyncLogEntry(const QString \&e,bool suppress=false)} ... Write a log entry to the pilot. Causes signal \code{logEntry(const char *)} to be emitted.
-\item
-    \code{int pilotSocket()}\qquad ... returns the pilot socket (needed if you use your own functions to talk to the handheld. This is not recommended, but necessary in some cases)
-\item
-    \code{int openConduit()}\qquad ... Notify the handheld which conduit is running now.
-\end{itemize}
-
-In addition to these functions the class also has some signals you can emit to display log messages and to indicate that the conduit has finished and KPilot should go on with the next conduit:\
-
-\begin{itemize}
-\item \code{void syncDone(SyncAction *)} ... tell KPilot that the conduit has finished. Every conduit that returns true in its \code{exec()} method needs to emit this signal, otherwise KPilot will wait forever for the conduit to return.
-
-\item \code{void logMessage(const QString \&)} ... Adds a message to KPilot's log, but not to the handheld's log.
-\item \code{void logError(const QString \&)} ... Adds an error message to KPilot's log
-\item \code{void logProgress(const QString \&,int)} ... Adds a log message and sets the progress bar to the given percentage.
-\end{itemize}
-
-
-If your conduit will have to ask the user some question, the handheld needs to be tickled to prevent a timeout while the message box or dialog window is shown. The \class{InteractiveAction} class (which is a subclass of \class{SyncAction}) can be used as a base class for your conduit in this case. Call \code{startTickle()} some time before showing a dialog to the user (we're assuming a local event loop here) so that while the dialog is up and the user is thinking, the pilot stays awake. Afterwards, call \code{stopTickle()}. The parameter to \code{startTickle} indicates the timeout, in seconds, before signal timeout is emitted. You can connect to that signal, to take down the user interface part if the user isn't reacting.
-In addition to \class{SyncAction}'s methods it adds the following methods:
-
-\begin{itemize}
-\item\code{void tickle()} ... Tickles the handheld to reset the timeout counter.
-\item \code{void startTickle(unsigned count=0)} ... start a timer to tickle 
-the handheld in regular intervals
-\item \code{void stopTickle()} ... stop the timer
-
-\item\code{int questionYesNo(const QString \&question ,
-        const QString \&caption = QString::null,
-        const QString \&key = QString::null,
-        unsigned timeout = 20000)} ... Ask a yes-no question of the user. 
-        This has a timeout so that you don't wait forever for inattentive users. 
-        It's much like \code{KMessageBox::questionYesNo()}, but with this extra 
-        timeout-on-no-answer feature. Returns a \code{KDialogBase::ButtonCode} 
-        value - Yes,No or Cancel on timeout. If there is a key set and the user 
-        indicates not to ask again, the selected answer (Yes or No) is 
-        remembered for future reference.
-\end{itemize}
-
-
-For conduits that sync one specific database (e.g. "AddressDB" or "TodoDB"), 
-there is the class \class{ConduitAction}, which is a child class of 
-\class{SyncAction}, and adds the following methods and members:
-
-\begin{itemize}
-\item\code{PilotDatabase *fDatabase,*fLocalDatabase;} ... Pointers to the 
-database on the handheld and the backup database on the harddisk. These are 
-set by openDatabases.
-\item\code{bool openDatabases(const char *dbName, bool*retrieved=0L)} ... 
-opens the database named \code{dbName} on the handheld and the backup database 
-on the harddisk (in the directory \file{\$KDEHOME/share/apps/kpilot/DBBackup/PalmUserName/}). 
-If the backup database does not exist, the current database from the palm is 
-fetched, and \code{*retrieved} is set to \code{true}.
-\end{itemize} 
-
-
-\subsection{The \class{KPilotDeviceLink} class for communicating with the handheld}
-For the communication with the handheld KPilot has a class 
-\class{KPilotDeviceLink}, and the ConduitAction class always stores an 
-instance of \class{KPilotDeviceLink} pointing to the current connection 
-in a variable called \code{fHandle}. The following list shows all members 
-of this class that you might need in your conduit:
-
-\begin{itemize}
-\item
-    \code{int getNextDatabase(int index,struct DBInfo *)}\qquad ... Returns 
-    the database at position index and stores its information to the DBInfo 
-     variable, which can then be used in other functions.
-\item
-    \code{int findDatabase(char*name, struct DBInfo*)}\qquad ... Finds a 
-    database with a given name like "AddressDB" and stores its information 
-    to the \code{DBInfo} variable, which can then be used in other functions.
-
-\item
-    \code{bool retrieveDatabase(const QString \&path, struct DBInfo *db)}
-    \qquad ... Retrieve the database indicated by \code{DBInfo *db} into 
-    the local file path.
-
-
-\item
-    \code{bool installFile(const QString \&, bool deleteFile=true)}\qquad ... Installs the .prc 
-    or .pdb database from the PC to the handheld. Returns true on success.
-    If deleteFile is set true or left out, the local file is deleted after successful installation.
-\item
-    \code{int installFiles(const QStringList \&, bool deleteFiles=true)}\qquad ... Installs 
-    several .prc or .pdb databases from the PC to the handheld. Returns 
-    the number of successfully installed databases. If deleteFiles is set true 
-    or left out, the local files are deleted after successful installation.
-
-
-
-\item
-    \code{static KPilotDeviceLink *link()}\qquad ... returns the current 
-    connection (only one can be open at the same time)
-
-\item
-    \code{void tickle()}\qquad ... Tickle the palm to reset the timeout. 
-    This is needed if you need to do a lengthy calculation or display a 
-    dialogbox where the user might not respond immediately.
-
-\item
-    \code{KPilotUser *getPilotUser()}\qquad ... Returns the user 
-    information as set on the handheld.
-
-
-\item
-    \code{QDateTime getTime()}\qquad ... Get the time from the handheld 
-    device into a \class{QDateTime}
-\item
-    \code{bool setTime(const time\_t \&pctime)}\qquad ... Set the time 
-    on the handheld to the give \code{time\_t} (\class{QDateTime} didn't 
-    work for me, so I implemented it with \code{time\_t})
-
-
-\item
-    \code{unsigned long ROMversion()}\qquad ... Get the version number 
-    from the handheld
-\item
-    \code{unsigned long majorVersion()}\qquad ... Get the major PalmOS 
-    version number (e.g. 3 for PalmOS 3.0 and 3.5, 4 for PalmOS 4.x etc.)
-
-\end{itemize}
-
-If you want to modify a database on the handheld, you can work with a 
-PilotDatabase instance (see next subsection), which does all the 
-communication for you.
-
-
-
-\subsection{The \class{PilotDatabase} classes for working with databases}
-KPilot's class library knows two types of databases: local databases from 
-a .pdb file on your PC's harddisk, and serial databases on a PalmOS device 
-connected through a serial or USB cable. To work with a database, you just 
-create an instance of either a \class{PilotLocalDatabase} or a 
-\class{PilotSerialDatabase}, both of which are derived from 
-\class{PilotDatabase}. This base class has the following important members:
-
-\begin{itemize}
-\item\code{virtual int recordCount()} ... returns the number of records 
-in the database
-\item\code{virtual QValueList idList()} ... Returns a list 
-of all record ids in the database.
-\item\code{virtual PilotRecord* readRecordById(recordid\_t id)} ... Reads 
-a record from database by id.
-\item\code{virtual PilotRecord* readRecordByIndex(int index)} ... Reads a 
-record from database.
-\item\code{virtual PilotRecord* readNextRecInCategory(int category)} ... 
-Reads the next record from database in category 'category'
-\item\code{virtual PilotRecord* readNextModifiedRec()} ... Reads the next 
-record from database that has the dirty flag set.
-\item\code{virtual recordid\_t writeRecord(PilotRecord* newRecord)} ... Writes 
-a new record to database (if 'id' == 0 for a serial database, one will be 
-assigned to newRecord)
-\item\code{virtual int resetSyncFlags()} ... Resets all records in the 
-database to not dirty.
-\item\code{virtual int resetDBIndex()} ... Resets next record index to beginning
-\item\code{virtual int cleanup()} ... Purges all Archived/Deleted records 
-from Palm Pilot database
-\item\code{bool isOpen()} ... Returns false if the database could not be 
-opened, e.g. no connection to the handheld or file could not be created.
-\item\code{virtual QString dbPathName()} ... Returns some sensible human-readable 
-identifier for the database. Serial databases get Pilot:, local databases 
-return the full path.
-\item\code{virtual int readAppBlock(unsigned char* buffer, int maxLen)} ... 
-Reads the application block info, returns size.
-\item\code{virtual int writeAppBlock(unsigned char* buffer, int len)} ... 
-Writes the application block info.
-\end{itemize}
-
-
-The constructors of \class{PilotLocalDatabase} and \class{PilotSerialDatabase} are:
-\begin{itemize}
-\item\code{PilotSerialDatabase(int linksocket, const char* dbName)} ... linksocket
-\item\code{PilotLocalDatabase( const QString\& path, const QString\& name)}
-\item\code{PilotLocalDatabase(const QString \&name)} ... open database by name only
-(no explicit path). The path \file{\$KDEHOME/share/apps/kpilot/DBBackup/PalmUserName/} 
-is set by KPilot automatically.
-\end{itemize}
-
-
-
-\subsection{The \class{PilotRecord} classes for working with records}
-
-Each database consists of several database records, so we also need a 
-class \class{PilotRecord} to work with records. A PilotRecord is just 
-a long string of binary data, without any meaning so far. You will 
-have to implement your own classes that take the data from the record 
-and turn it into usable values (use the database format specification 
-for the database you are working with). The class \class{PilotAppCategory} 
-can be used as base class for this, and the \code{pack()} method packs 
-the human-readable variable values into one whole binary string that 
-is then sent to the handheld as the data of the record. Usually you 
-don't create an instance of \class{PilotRecord} yourself, but either 
-get a \code{PilotRecord*} from one of the methods of the \class{PilotDatabase} 
-class, or you pack your own subclass of \class{PilotAppCategory} (e.g. 
-PilotTodoEntry, PilotAddress, PilotDateEntry) with a call to \code{pack()}.
-
-The \class{PilotRecord} class has the following important methods:
-
-\begin{itemize}
-\item\code{char* getData()} ... gets the binary data directly from the 
-database. You need to "unpack" the data yourself.
-\item\code{void setData(const char* data, int len)} ... sets the packed 
-binary data of the record.
-\item\code{int   getLen()} ... Returns the length of the record data.
-\item\code{int   getAttrib(} ... Returns the attributes of the record 
-(e.g. modified, archived, deleted, secret etc.). For possible values 
-see the pilot-link header files.
-\item\code{void  setAttrib(int attrib)} ... Sets the record attributes.
-
-\item\code{int   getCat()} ... Returns the category of the record (0-15). 
-The names of the categories are stored in the database's header.
-\item\code{void  setCat(int cat)} ... Sets the category of the record. 
-\code{cat} needs to be in the range 0-15.
-
-\item\code{unsigned long getID()} ... Returns the unique record ID.
-\item\code{void setID(unsigned long id)} ... Sets the record ID. If you 
-already have a record with that ID, it will be overwritten!
-
-\item\code{bool isDeleted()} ... Self-explaining
-\item\code{bool isSecret()} ... Self-explaining
-\item\code{bool isArchived()} ... Self-explaining
-\item\code{void makeDeleted()} ... Self-explaining
-\item\code{void makeSecret()} ... Self-explaining
-\end{itemize}
-
-
-
-
-\section{A very simple conduit: malconduit}\label{SectionSimpleConduit}
-
-To have a working conduit, we still have to implement the synchronization 
-itself. For the AvantGo conduit there already exists a library named 
-"libmal" which does all the synchronization for us. In the section on 
-autoconf and automake I already described the configure commands to check 
-for the library and to link to the library on runtime (the \code{-lmal} 
-flag stored in the variable \code{\$(MAL\_LIB)} ).
-
-When using the libmal library, all we have to do is to make some proxy settings, and then call the function \texttt{malsync( pilotSocket(), pInfo);}, which will do the actual sync for us:
-{\footnotesize
-\begin{verbatim}
-void MALConduit::readConfig() {
-  FUNCTIONSETUP;
-  QDateTime dt;
-  KConfigGroupSaver g(fConfig, MALConduitFactory::group());
-  fLastSync = fConfig->readDateTimeEntry(MALConduitFactory::lastSync(), &dt);
-  DEBUGCONDUIT<<"Last sync was "<readNumEntry(MALConduitFactory::syncTime(), 0);
-  
-  // Proxy settings
-  eProxyType=fConfig->readNumEntry(MALConduitFactory::proxyType(), 0);
-  fProxyServer=fConfig->readEntry(MALConduitFactory::proxyServer(), "");
-
-  fProxyPort=fConfig->readNumEntry(MALConduitFactory::proxyPort(), 0);
-  fProxyUser=fConfig->readEntry(MALConduitFactory::proxyUser(), "");
-  fProxyPassword=fConfig->readEntry(MALConduitFactory::proxyPassword(), "");
-}
-
-
-
-void MALConduit::saveConfig() {
-  FUNCTIONSETUP;
-  KConfigGroupSaver g(fConfig, MALConduitFactory::group());
-  fConfig->writeEntry(MALConduitFactory::lastSync(), QDateTime::currentDateTime());
-}
-
-
-
-bool MALConduit::skip() {
-  QDateTime now=QDateTime::currentDateTime();
-  if (!fLastSync.isValid() || !now.isValid()) return false;
-
-  switch (eSyncTime) {
-    case eEveryHour:
-        if ( (fLastSync.secsTo(now)<=3600) && (fLastSync.time().hour()==now.time().hour()) ) return true;
-        else return false;
-    case eEveryDay:
-        if ( fLastSync.date() == now.date() ) return true;
-        else return false;
-    case eEveryWeek:
-        if ( (fLastSync.daysTo(now)<=7)  && ( fLastSync.date().dayOfWeek()<=now.date().dayOfWeek()) ) return true;
-        else return false;
-    case eEveryMonth:
-        if ( (fLastSync.daysTo(now)<=31) && (fLastSync.date().month()==now.date().month()) ) return true;
-        else return false;
-    case eEverySync:
-    default:
-        return false;
-  }
-  return false;
-}
-
-
-
-/* virtual */ bool MALConduit::exec() {
-  FUNCTIONSETUP;
-
-  if (!fConfig) {
-    kdWarning() << k_funcinfo << ": No config file was set!" << endl;
-    return false;
-  }
-
-  readConfig();
-  
-  if (skip())  {
-    emit logMessage(i18n("Skipping MAL sync, because last synchronization was not long enough ago."));
-    emit syncDone(this);
-    return true;
-  }
-  
-  // Set all proxy settings
-  switch (eProxyType) {
-    case eProxyHTTP:
-        if (fProxyServer.isEmpty()) break;
-        setHttpProxy(fProxyServer.latin1());
-        if (fProxyPort>0 && fProxyPort<65536) setHttpProxyPort( fProxyPort );
-        else setHttpProxyPort(80);
-      
-        if (!fProxyUser.isEmpty()) {
-          setProxyUsername( fProxyUser.latin1() );
-          if (!fProxyPassword.isEmpty()) setProxyPassword( fProxyPassword.latin1() );
-        }
-        break;
-    case eProxySOCKS:
-        setSocksProxy( fProxyServer.latin1() );
-        if (fProxyPort>0 && fProxyPort<65536) setSocksProxyPort( fProxyPort );
-        else setSocksProxyPort(1080);
-        break; 
-    default:
-        break;
-  }
-
-
-  // Now initiate the sync.
-  PalmSyncInfo* pInfo=syncInfoNew();
-  if (!pInfo) {
-    kdWarning() << k_funcinfo << ": Could not allocate SyncInfo!" << endl;
-    emit logError(i18n("MAL synchronization failed (no SyncInfo)."));
-    return false;
-  }
-  malsync( pilotSocket(), pInfo);
-  syncInfoFree(pInfo);
-
-  saveConfig();
-  emit syncDone(this);
-  return true;
-}
-
-\end{verbatim}
-}
-
-When you use an external library to do the sync, the external functions need a reference to the current connection to the handheld. In the pilot-link library, which is the base for all of KPilot's communication with the handheld, this is implemented via an integer identifier, which can be obtained by the function \texttt{pilotSocket()} of the SyncAction class.
-
-The libmal also needs some internal data structed "PalmSyncInfo", which is obtained by its own syncInfoNew() function, but this part is libmal-specific.
-
-Another issue is how to propagate log messages from the external library to KPilot's log window. SyncAction provides slots logError, logMessage and logProgress to put messages into KPilot's sync log. All you have to do is to call
-\begin{verbatim}
-emit logMessage(i18n("My own log message"));
-\end{verbatim}
-
-The problem with these slots is that they are Qt-specific, while most libraries are written in C, and expect a hook function that will be called whenever a message needs to be written out. Unfortunately you cannot pass a member of your SyncAction-derived class, either, so the way out is to store a pointer to the current conduit instance (only one will be active at any time, anyway) in a static variable, and call the member method from this pointer:
-
-{\footnotesize
-\begin{verbatim}
-// static pointer to the current conduit instance
-static MALConduit *conduitInstance=0L;
-
-// The hook function which will be called by the library
-int malconduit_logf(const char *format, ...) {
-  FUNCTIONSETUP;
-  va_list val;
-  int rval;
-  va_start(val, format);
-#define WRITE_MAX_BUF  4096
-  char msg[WRITE_MAX_BUF];
-  msg[0]='\0';
-  rval=vsnprintf(&msg[0], sizeof(msg), format, val);
-  va_end(val);
-  if (rval == -1) {
-    msg[WRITE_MAX_BUF-1] = '\0';
-    rval=WRITE_MAX_BUF-1;
-  }
-  if (conduitInstance) {
-    conduitInstance->printLogMessage(msg);
-  } else {
-    // write out to stderr
-    kdWarning()<findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0) {
-    // no more databases available, so check for PC->Palm sync
-    QTimer::singleShot(0, this, SLOT(syncNextDOC()));
-    return;
-  }
-  dbnr=dbinfo.index+1;
-  DEBUGCONDUIT<<"Next Palm database to sync: "<Palm sync
-    QTimer::singleShot(0, this, SLOT(resolve()));
-    return;
-  }
-  
-  // Walk through all files in the pdb directory and check if it has already been synced.
-  // if docnames isn't initialized, get a list of all *.pdb files in fPDBDir
-  if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
-    docnames=QDir(fPDBDir, "*.pdb").entryList() ;
-    dociterator=docnames.begin();
-  }
-  if (dociterator==docnames.end()) {
-    // no more databases available, so start the conflict resolution and then the actual sync proces
-    docnames.clear();
-    QTimer::singleShot(0, this, SLOT(resolve()));
-    return;
-  }
-
-  QString fn=(*dociterator);
-
-  QDir dr(fPDBDir);
-  QFileInfo fl(dr, fn );
-  QString pdbfilename=fl.absFilePath();
-  dociterator++;
-  
-  //  Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced)
-  // If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced.
-  QString dbname=fl.baseName(TRUE).left(30);
-  if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) {
-    if (fHandle->installFiles(pdbfilename )) {
-      DBInfo dbinfo;
-      // Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
-      // first fill everything with 0, so we won't have a buffer overflow.
-      memset(&dbinfo.name[0], 0, 33);
-      strncpy(&dbinfo.name[0], dbname, 30);
-
-      docSyncInfo syncInfo(dbinfo.name, constructDOCFileName(dbname), pdbfilename, eSyncNone);
-      syncInfo.dbinfo=dbinfo;
-      needsSync(syncInfo);
-      fSyncInfoList.append(syncInfo);
-      fDBNames.append(dbinfo.name);
-    } else {
-      DEBUGCONDUIT<<"Could not install database "<hasConflicts);
-  if (show) {
-    if (!dlg || !dlg->exec() ) {
-      KPILOT_DELETE(dlg)
-      emit logMessage(i18n("Sync aborted by user."));
-      QTimer::singleShot(0, this, SLOT(cleanup()));
-      return;
-    }
-  }
-  KPILOT_DELETE(dlg)
-  
-
-  // fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file
-  fDBNames.clear();
-  fSyncInfoListIterator=fSyncInfoList.begin();
-  QTimer::singleShot(0,this, SLOT(syncDatabases()));
-  return;
-}
-\end{verbatim}
-}
-
-
-Finally, the actual sync of the databases is done again with \code{QTimer::singleShot}s in the slot \code{syncDatabases()}. Each entry in the list is processed in one pass of \code{syncDatabases}, and then \code{syncDatabases} is again called using a \code{QTimer::singleShot}, until all databases have been synced.
-
-{\footnotesize
-\begin{verbatim}
-void DOCConduit::syncDatabases() {
-  FUNCTIONSETUP;
-  if (fSyncInfoListIterator==fSyncInfoList.end()) {
-    QTimer::singleShot(0, this, SLOT(cleanup()));
-    return;
-  }
-  
-  docSyncInfo sinfo=(*fSyncInfoListIterator);
-  fSyncInfoListIterator++;
-  
-  switch (sinfo.direction) {
-    case eSyncConflict:
-      DEBUGCONDUIT<<"Entry "<deleteDatabase() !=0 ) {
-          kdWarning()<deleteDatabase() !=0 ) {
-        kdWarning()<isOpen() ) ) {
-    DEBUGCONDUIT<<"Database "<createDatabase(dbcreator(), dbtype()) ) {
-      DEBUGCONDUIT<<"Failed"<isOpen()) {
-    DOCConverter docconverter;
-    connect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &)));
-    connect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &)));
-
-    docconverter.setDOCpath(fDOCDir, sinfo.docfilename);
-    docconverter.setPDB(database);
-    docconverter.setBookmarkTypes(fBookmarks);
-    docconverter.setCompress(fCompress);
-
-    switch (sinfo.direction) {
-      case eSyncPDAToPC:
-        res = docconverter.convertPDBtoDOC();
-        break;
-      case eSyncPCToPDA:
-        res = docconverter.convertDOCtoPDB();
-        break;
-      default:
-        break;
-    }
-    
-    // Now calculate the md5 checksum of the PC text and write it to the config file
-    {
-      KConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
-      KMD5 docmd5;
-      QFile docfile(docconverter.docFilename());
-      if (docfile.open(IO_ReadOnly)) {
-        docmd5.update(docfile);
-        QString thisDigest(docmd5.hexDigest().data());
-        fConfig->writeEntry(docconverter.docFilename(), thisDigest);
-        fConfig->sync();
-        DEBUGCONDUIT<<"MD5 Checksum of the text "<writeEntry(DOCConduitFactory::fDOCList, fDBNames);
-  fConfig->sync();
-
-  emit syncDone(this);
-}
-\end{verbatim}
-}
-
-
-
-The worst part about the conduit is to find out which side has been changed (and how), and what needs to be done about this. The function \code{needsSync} does exactly this. If the database was not included in the last sync, it is new, so it will be synced from the side where it was added. 
-
-First, we find out, how each of the two sides have changed.
-If the database was already included, check if it was changed using the function \code{textChanged} to compare the md5 checksum of the current text on disk with the checksum of the last sync (stored in kpilot's config). The handheld side is a bit trickier: A PalmDOC on the handheld contains of a header record, several text records, and finally several bookmark records. Each of these records can have the dirty flag set, so we first get the number of text records from the header record. Then we search for the index of the first changed record (i.e. dirty flag set) after the header record. If no text record (but a bookmark record) was changed, a config setting determines if the PalmDOC should still be considered as changed.
-
-Finally, from the status of the two sides, determine the sync direction:
-
-{\footnotesize
-\begin{verbatim}
-bool DOCConduit::needsSync(docSyncInfo &sinfo)
-{
-  FUNCTIONSETUP;
-  sinfo.direction = eSyncNone;
-  
-  PilotDatabase*docdb=openDOCDatabase(sinfo.dbinfo.name);
-  if (!fDBListSynced.contains(sinfo.handheldDB)) {
-    // the database wasn't included on last sync, so it has to be new.
-    DEBUGCONDUIT<<"Database "<isOpen()) sinfo.fPalmStatus=eStatNew;
-    else sinfo.fPalmStatus=eStatDoesntExist;
-    KPILOT_DELETE(docdb);
-    
-    if (sinfo.fPCStatus==eStatNew && sinfo.fPalmStatus==eStatNew) {
-      sinfo.direction=eSyncConflict;
-      return true;
-    };
-    if (sinfo.fPCStatus==eStatNew) {
-      sinfo.direction=eSyncPCToPDA;
-      return true;
-    }
-    if (sinfo.fPalmStatus==eStatNew) {
-      sinfo.direction=eSyncPCToPDA;
-      return true;
-    }
-    return true;
-  }
-  
-  // Text was included in the last sync, so if one side doesn't exist, it was deleted and needs to be deleted from the other side, too
-  if (!QFile::exists(sinfo.docfilename)) sinfo.fPCStatus=eStatDeleted;
-  else if(textChanged(sinfo.docfilename)) {
-    sinfo.fPCStatus=eStatChanged;
-    DEBUGCONDUIT<<"PC side has changed!"<isOpen()) sinfo.fPalmStatus=eStatDeleted;
-  else {
-    PilotRecord *firstRec = docdb->readRecordByIndex(0);
-    PilotDOCHead docHeader(firstRec);
-    KPILOT_DELETE(firstRec);
-
-    int storyRecs = docHeader.numRecords;
-
-    // determine the index of the next modified record (does it lie beyond the actual text records?)
-    int modRecInd=-1;
-    PilotRecord*modRec=docdb->readNextModifiedRec(&modRecInd);
-    DEBUGCONDUIT<<"Index of first changed record: "<readNextModifiedRec(&modRecInd);
-      DEBUGCONDUIT<<"Reread Index of first changed records: "<= 0) {
-//      sinfo.fPalmStatus=eStatBookmarksChanged;
-      DEBUGCONDUIT<<"Handheld side has changed!"< Delete it."<  (Opie)
-To: Reinhold Kainhofer 
-Date: 05.10.2002 00:01
-
-
-On Wednesday 18 September 2002 19:57, Reinhold Kainhofer wrote:
-> Hello,
-> Yesterday night I took a quick look at the kitchensync sources to find out
-> how kpilot might use it or how kpilot might need to be changed. Please
-> forgive me if some questions might  be obvious or stupid, but I this is my
-> first look at kitchensync/ksync, and I didn't have too much time. Just give
-> me a hint on where to look. Additionally, it was very late at night, so my
-> brain wasn't working properly any more ;-))
->
-> My questions will of course be from a Palm/handheld syncing view, so they
-> are quite specific concerning the current functionality of the conduits. I
-> wouldn't like switching to something that - in theory - has a better and
-> cleaner architecture, but for the next few years will provide less features
-> than we currently have.
-
-Thats good! so then we find problems because you look at it from a different 
-point of view
-
-> 1) Do I understand it right from the ksync proposal on pim.kde.org that
-> kitchensync is the application that does all the communication with the
-> "devices" (korganizer, palm, opie, kabc, local files etc.), while ksync is
-> just the abstract library with the sync algorithm framework?
-
-It's a bit more.
-KitchenSync is the name of the whole framework (hmm deutsch oder englisch? ;)
-Konnector sind die Plugins, die Sachen vom Geraet holen, MetaDaten sammeln und 
-schreiben
-KSync ist 1. ein Kontainer und 2. Syncing Interface
-und KitchenSyncApp ist ne part
-
-
-> 2) Do we have to ditch KPilot completely? So once again, once something in
-> kpilot seems to get stable, the underlying infrastructure changes, and
-> everything has to be completely rewritten from scratch.... That thought is
-> not very comforting to me, no matter how big the advantages of a unified
-> sync machinery seems.
-
-It would be a lost to just ditch KPilot. I would like to see a port of KPilot 
-to KitchenSync where we improve the framework.
-
-
-> 3a) How can one sync the palm where you also have the backup record
-> available, so you possibly know how the record looked like (on the pc and
-> the palm side) after the previous sync
-
-The Palm Konnector would only have to care for the Palm side. There is 
-something called MetaSyncing. If it is enabled the PalmKonnector is demanded 
-to save the backend. Otherwise you do first syncs (just fetch it )
-
-> 3b) How can one achieve a "smart merge", i.e. from the backup record the
-> fields which have changed on the handheld and the pc are determined, and
-> the fields are merged, instead of copying the whole record over.
-
-This is part of KSync. Currently we don't have it but it's planned including 
-intelligent conflict resolution.
-So what happens if the PC have a XYZ field but the Palm not. Now you change 
-anything on the palm and on the next sync you want the Palm to take advance 
-but not to lose the stuff in the other fields.
-So there needs to be this kind of merge. Fill the entry with all fields from 
-the other record with the same uid but do not overwrite
-And then there needs to be the smart merge. Which will also be part of the 
-KSync.
-But this is needed and will be added as soon as I find the time to do it. 
-
-
-> 4) How can one use plugins that just copy something to the device and don't
-> need any record-based sync and conflict resolution (e.g. using libmal to
-> copy the AvantGo content to the palm).
-
-The KonnectorManager does allow you to either push QByteArrays or files behind 
-filenames to the device. 
-There is one short coming with it. It's asynchronus and currently no success 
-or failure is emmitted.
-But when taking in consideration that you want to fetch anything from the 
-device. You will need a special layer in Konnector which loads plugins for 
-Konnectors which allow some sort of getting stuff from the device.
-This is also varpoware
-
-
-> 5) How about responsiveness of the front end? I realized there are no
-> QTimer::singleShot to let qt process the queue between syncing two records.
-> Or did I miss something?
-
-currenlty this is true. While we aim for ASYNC the syncing is currently 
-synchron. I first want to get it right.
-
-
-> 6) How can one do the sync when you only know the changed records on one
-> side, but not those that stayed the same? Especially when working with
-> serial devices, minimizing the traffic is of very high priority, so I don't
-> think we should always transfer the whole calendar/todo/addressbook
-> database from and to the handheld (On windows to my surprise the sync of
-> these needs only about 3 seconds. We have to compete with that ...).
-
-This is implementation detail of the Konnector again. I would store all the 
-records on my mighty PC
-
-
-> 7) What if the device (i.e. Palm) does not support timestamps in any form
-> for the records?
-
-This is a problem with Qtopia. QtopiaDesktop is using md5sums ( quite fast ) 
-for figuring changes.
-I've a copy of the files around and templates to do the diffing
-
-
-> 8) How can one achieve archived records (i.e. marked as quasi-deleted from
-> the palm and deleted after the sync, but they exist locally on the pc side.
-> They are NO LONGER synced to the device. As an example take past events.
-> You don't need them on the handheld any longer, but of course you don't
-> want to loose the history on the PC.).
-
-Not thought of ;)
-A field inside the SyncEntry and the KonnectorPlugin needs to honor that
-
-
-> 9) What if one side (handheld) does not support all features the pc side
-> supports? I.e. the palm only has 5 phone/email fields, while you can have
-> many more on the pc. The two addressbook items should still correspond and
-> even be equal, although one side has less information available.
-
-see above about merging
-
-
-> 10) Is there a daemon or does the whole app have to be in memory? (Sorry if
-> this should be obvious, it was very late when I looked through the code and
-> wrote down these questions)
-
-All in one for now
-
-
-> 11) Is it possible to sync a list of todos where the order of the entries
-> is important? (Needed for the Project Manager conduits). I realize that
-> korganizer disregards the order of the todos currently, but other
-> applications might use the ics file corretly (i.e. preserving the order)
-
-we're using Syncee's they should not sort
-
-
-I hope this helps
-
-regards Holger
-\end{verbatim}
-}
-
-
-%\section{Further ideas and thoughts}\label{SectionFurtherThoughts}
-%TODO
-
-
-
-
-\end{document}
-
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc b/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc
deleted file mode 100644
index a55a0e647..000000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Time-factory.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the MAL-conduit plugin.
-*/
- 
-#include "options.h" 
-
-#include 
-#include 
-#include 
-
-#include  // Needed by pilot-link include
-#include "mal-conduit.h"
-#include "mal-setup.h"
-
-#include "mal-factory.moc"
-
-
-extern "C"
-{
-
-void *init_libmalconduit()
-{
-    return new MALConduitFactory;
-}
-
-} ;
-
-
-// A number of static variables
-KAboutData *MALConduitFactory::fAbout = 0L;
-const char *MALConduitFactory::fGroup = "MAL-conduit";
-const char *MALConduitFactory::fLastSync = "Last MAL Sync";
-const char *MALConduitFactory::fSyncTime = "Sync Frequency";
-const char *MALConduitFactory::fProxyType = "Proxy Type";
-const char *MALConduitFactory::fProxyServer = "Proxy Server";
-const char *MALConduitFactory::fProxyPort = "Proxy Port";
-const char *MALConduitFactory::fProxyUser = "Proxy User";
-const char *MALConduitFactory::fProxyPassword = "Proxy Password";
-
-MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
-    KLibFactory(p,n)
-{
-    FUNCTIONSETUP;
-
-    fInstance = new KInstance("MALconduit");
-    fAbout = new KAboutData("MALconduit",
-        I18N_NOOP("MAL Synchronization Conduit for KPilot"),
-        KPILOT_VERSION,
-        I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-        KAboutData::License_GPL,
-        "(C) 2002, Reinhold Kainhofer");
-    fAbout->addAuthor("Reinhold Kainhofer",
-        I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
-    fAbout->addAuthor("Jason Day",
-        I18N_NOOP("Author of libmal and the JPilot AvantGo conduit"), "jasonday@worldnet.att.net");
-    fAbout->addAuthor("Tom Whittaker",
-        I18N_NOOP("Author of syncmal"), "tom@tomw.org", "http://www.tomw.org/");
-    fAbout->addAuthor("AvantGo, Inc.",
-        I18N_NOOP("Authors of the malsync library (c) 1997-1999"), "www.avantgo.com", "http://www.avantgo.com/");
-}
-
-MALConduitFactory::~MALConduitFactory()
-{
-    FUNCTIONSETUP;
-
-    KPILOT_DELETE(fInstance);
-    KPILOT_DELETE(fAbout);
-}
-
-/* virtual */ TQObject *MALConduitFactory::createObject( TQObject *p,
-    const char *n,
-    const char *c,
-    const TQStringList &a)
-{
-    FUNCTIONSETUP;
-
-#ifdef DEBUG
-    DEBUGKPILOT << fname
-        << ": Creating object of class "
-        << c
-        << endl;
-#endif
-
-    if (qstrcmp(c,"ConduitConfig")==0)
-    {
-        TQWidget *w = dynamic_cast(p);
-
-        if (w)
-        {
-            return new MALWidgetSetup(w,n,a);
-        }
-        else 
-        {
-            kdError() << k_funcinfo
-                << ": Couldn't cast parent to widget."
-                << endl;
-            return 0L;
-        }
-    }
-
-    if (qstrcmp(c,"SyncAction")==0)
-    { 
-        KPilotDeviceLink *d = dynamic_cast(p);
-
-        if (d)
-        {
-            return new MALConduit(d,n,a);
-        }
-        else
-        {
-            kdError() << k_funcinfo
-                << ": Couldn't cast parent to KPilotDeviceLink"
-                << endl;
-            return 0L;
-        }
-    }
-
-    return 0L;
-}
-
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h b/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h
deleted file mode 100644
index f38cb5c83..000000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _TIME_FACTORY_H
-#define _TIME_FACTORY_H
-/* MAL-factory.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the mal-conduit plugin.
-*/
-
-#include 
-
-class KInstance;
-class KAboutData;
-
-class MALConduitFactory : public KLibFactory
-{
-Q_OBJECT
-
-public:
-    MALConduitFactory(TQObject * = 0L,const char * = 0L);
-    virtual ~MALConduitFactory();
-
-    static KAboutData *about() { return fAbout; } ;
-    static const char *lastSync() { return fLastSync; };
-    static const char *syncTime() {return fSyncTime;};
-    static const char *proxyType() {return fProxyType;};
-    static const char *proxyServer() {return fProxyServer;};
-    static const char *proxyPort() {return fProxyPort;};
-    static const char *proxyUser() {return fProxyUser;};
-    static const char *proxyPassword() {return fProxyPassword;};
-    static const char *malServer() {return fMALServer;};
-    static const char *malPort() {return fMALPort;};
-    static const char *malUser() {return fMALUser;};
-    static const char *malPassword() {return fMALPassword;};
-    
-protected:
-    virtual TQObject* createObject( TQObject* parent = 0,
-        const char* name = 0,
-        const char* classname = "TQObject",
-        const TQStringList &args = TQStringList() );
-private:
-    KInstance *fInstance;
-    static KAboutData *fAbout;
-    // KConfig entry keys.
-    static const char *fGroup;
-    static const char *fLastSync, *fSyncTime, 
-        *fProxyType, *fProxyServer, *fProxyPort, *fProxyUser, *fProxyPassword;
-} ;
-
-extern "C" {
-  void *init_libmalconduit();
-} ;
-
-#endif
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ConnectionsDialog.png b/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ConnectionsDialog.png
deleted file mode 100644
index 0ed0997f8662f2c6124d92b233d2174db878ec8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9676
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⪻dG0`3iaG^d^n;-5ZG+pA8qQSU6uB
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

diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ProxyTab.png b/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ProxyTab.png
deleted file mode 100644
index 2cc9cd5400903193ab06420f825d5c83be2fa7b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85254
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

diff --git a/kpilot/Documentation/HOWTO-CODE.txt b/kpilot/Documentation/HOWTO-CODE.txt
deleted file mode 100644
index 99c093c67..000000000
--- a/kpilot/Documentation/HOWTO-CODE.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-Coding Guidelines for KPilot
-============================
-
-Of course we can wage war about what constitutes "good programming
-practice". And agreeing on indentation style is difficult as well.
-Below you can find the guidelines I try to stick to when writing
-KPilot, split into "C++ Source Code" and "Header Files".
-
-(For actual coding information and some information about how
-KPilot works, see HOWTO-CONDUIT.txt)
-
-
-C++ Source Code
-===============
-
-There are coding guidelines for KDE somewhere. I think they say
-indent with 4 spaces, { on same line, } on separate line. I disagree,
-so code I write -- and code I maintain -- slowly mutates to
-
-	* Indent with tabs
-	* { and } on separate lines
-	* C comments only for the GPL header and KDoc stuff
-	* C++ before the stuff they document, same indent level,
-	  with possibly two extra lines with just // to set the
-	  comment off from the code.
-
-Whether or not anyone else follows is irrelevant, and I do try to
-avoid gratuitous reformatting. Honest.
-
-What I might do every now and then to get stuff "into shape" (and
-I'd really appreciate it if you did so too before sending me patches)
-is the following horrible invocation of indent:
-
-indent -kr \
-	--blank-lines-after-declarations \
-	--braces-after-if-line \
-	--dont-cuddle-else \
-	--dont-line-up-parentheses \
-	--honour-newlines \
-	--space-after-cast \
-	--brace-indent 0 \
-	--case-brace-indentation 0 \
-	--case-indentation 0 \
-	--continuation-indentation 8 \
-	--indent-level 8 \
-	--tab-size 8 \
-	--line-length 78
-
-This doesn't yield "perfect" code but it's close to my personal ideal.
-If this coding style gives you gas, just use your own favorite indent
-invocation to change it all back.
-
-NOTE: indent wreaks havoc with C++ class definitions in header files,
-so it's best not to touch those with it.
-
-
-Header Files
-============
-
-One thing we *do* need to agree on is how to protect
-.h files from double-inclusion. In Qt and KDE there's:
-
-	#ifndef QTCLASS_H
-	#ifndef _KDECLASS_H
-
-so for KPilot the convention will be
-
-	#ifndef _KPILOT_FILENAME_H
-
-where KPILOT is literal, ie. options.h is _KPILOT_OPTIONS_H and,
-unfortunately, kpilotOptions.h is _KPILOT_KPILOTOPTIONS_H. This is
-because the filename and the class don't always match up and not
-every file contains a class of interest.
-
-
-DEBUG Output
-============
-
-There are macros defined in options.h (which every source file
-should include) that provide some uniform debugging output.
-These are:
-
-	* FUNCTIONSETUP - Use this at the beginning of every function
-	  (or those that are vaguely interesting). This will print out
-	  a call trace indicator when debugging is on. It also defines
-	  a local symbol fname for use with DEBUG* below.
-	* FUNCTIONSETUPL(level) - Use this at the beginning of a function.
-	  It is like FUNCTIONSETUP but only prints if the debug level
-	  is at least @p level. This avoids excessive debug output from
-	  common functions.
-
-For regular debugging output, use one of the three DEBUG* macros:
-
-	* DEBUGLIBRARY in code in lib/
-	* DEBUGKPILOT in code in kpilot/
-	* DEBUGCONDUIT in code in conduits/
-
-This sends the debug output to the appropriate debug area. A typical
-debug output stream looks like this:
-
-	DEBUGKPILOT << fname << ": "
-		<< actual debug info
-		<< endl;
-
-Here, DEBUGKPILOT depends on what bit of code is being debugged; fname
-is defined by FUNCTIONSETUP and takes care of proper indentation for
-the call trace, the colon is for consistency and the actual debug
-info can be whatever you want.
-
-	Adriaan de Groot
-	March 5th 2001
-	September 5th 2001 (revised)
diff --git a/kpilot/Documentation/HOWTO-CONDUIT.txt b/kpilot/Documentation/HOWTO-CONDUIT.txt
deleted file mode 100644
index 7b6dccd0b..000000000
--- a/kpilot/Documentation/HOWTO-CONDUIT.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-One of the greatest assets of the Palm Pilot is its ability to
-interconnect with other applications.  KPilot supports this capabilty
-through conduits.  A conduit is a small shared library that is loaded by
-the daemon during the hot sync.  The conduit translates between the Palm
-Pilot and the application you're syncing with.
-
-*** How it works
-
-KPilot is divided into three major components: the GUI, the
-syncing daemon, and the conduits.  The GUI part is actually irrelevant
-for the operation of the daemon, although it _is_ required for the
-configuration dialog (and possibly viewing databases). In theory
-you could run the daemon on a box without even starting X, although
-that is difficult (in particular, how would you do conflict resolution?).
-
-The daemon sits around and polls the configured device every second or
-so (there are devices where this should be more often, I think). Once
-data arrives (and the device exists, consider hotplug with USB), the
-daemon enters sync mode, and constructs a queue of SyncActions to perform.
-These vary from checking the Pilot's username to performing full backups
-to -- whatever sync actions the conduits provide. This means that during
-a sync the shared library containing a conduit is loaded, a factory
-function is called to produce an Action, this action is run, and the
-library unloaded.
-
-*** How the conduits work
-
-The conduits can actually be divided into two parts: the configuration
-widget, and the Action. Both are produced by a factory function in
-the shared library. The conduits have only one really interesting method
-that they must override, and that is exec(). When this is called the 
-conduit is already set up with a socket descriptor and the conduit should
-quickly do its thing. In particular, conduits can't just sleep(45) and
-continue, since the connection with the Pilot will time out.
-
-*** Write your very own conduit
-
-Writing a conduit is actually rather easy.  The conduit class
-should inherit from ConduitAction and override the exec() method
-(which actually comes from SyncAction).
-
-
-*** Debugging things
-
-lib/options.h contains two defines that are really important for
-debugging. These are
-
-	// #define DEBUG                        (1)
-	// #define DEBUG_CERR                   (1)
-
-Uncommenting DEBUG will enable most of the debug information in
-KPilot. Uncommenting DEBUG_CERR will make debug output go direct
-to stderr (cerr) instead of through kdDebug. If in addition, you
-pass --debug N (say, N=1 or N=4) to KPilot or the daemon when you
-start them, they will print call traces (that's what FUNCTIONSETUP
-does, which you will see at the beginning of every function).
-
-Another useful tool is kpilotTest, which is in kpilot/kpilot. It
-is an uninstalled binary, which behaves like the daemon with a
-log window and which will run a single conduit. Something like:
-
-	kpilotTest -p /dev/ucom0 \		# port
-		-E conduit_knotes \		# .desktop file
-		-T				# _really_ run
-
-use kpilotTest -L to list the installed conduits and their
-desktop files (look at the "In ..." lines).
diff --git a/kpilot/Documentation/README b/kpilot/Documentation/README
deleted file mode 100644
index 9810abc0b..000000000
--- a/kpilot/Documentation/README
+++ /dev/null
@@ -1,17 +0,0 @@
-kpilot/Documentation
-====================
-
-This directory contains information pertinent to the design of
-KPilot -- which is therefore only really interesting for 
-developers of KPilot conduits, maintainers, etc.
-
-Files in this directory are:
-
-README			- This file
-README-3.2.1+		- The README for KPilot 3.2.1 with some changes
-			  that refer to KPilot 4 and KDE2, so it's quite
-			  confusing.
-README-4.0.0		- The real README for KPilot 4.0.0
-HOWTO-CONDUIT.txt	- An introduction to writing conduits, last
-			  updated for KPilot 3.1b9 (which is a LONG
-			  time ago)
diff --git a/kpilot/Documentation/README-3.2.1+ b/kpilot/Documentation/README-3.2.1+
deleted file mode 100644
index f32267b82..000000000
--- a/kpilot/Documentation/README-3.2.1+
+++ /dev/null
@@ -1,156 +0,0 @@
-KPILOT 4.0.0 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot and IBM Workpad
-(UNTESTED!) with a machine running some flavor of unix. The actual PC->PP
-communcations was originally based on pilot-link.0.8.7. By default it
-attempts to connnect using /dev/pilot which should be a link to the actual
-serial port, however this is configurable in the settings dialog. 
-
-	Additional release notes can be found in the user documentation.
-The user documentation (translations in: en and de) can be found
-under kpilot/doc in this directory or in the KDE documentation directory 
-under kpilot. Or run kpilot --htmlhelp to start the KDE help browser.
-
-
-Current features include:
-		* Now a KDE2 application.
-		o Plug in conduit support, currently including
-			KOrganizer, todolist, null and PopMail
-	        o Hot-Sync daemon.  - Now hot-sync with just the push of the
-          	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	        o Add/Delete/Edit memos.
-                o Add/Delete/Edit addresses.
-                o Full Category support for both memos and addresses.
-                o KPilot now respects secret data.
-                o More configuration options including port speed and 
-		  docking control.
-                o Now supports signature files for email.
-                o Drag and drop to docked icon for file install.
-                o International Support
-		o Full Backup/Restore capabilities of Palm Pilot
-		o File (prc,pdb) installation
-		o Email syncing capabilities (via POP3 & sendmail)
-	        o SmartSync backing up modified data even
-			for databases KPilot doesn't recognize
-	        o Import/Export to/from virtually any text format for
-			Addresses.
-	        o Import/Export to/from text files for memos
-		o Sort and display addresses in different ways
-		o A null conduit (programming example)
-		o Syncing with UNIX mailboxes
-		o Database dispositions (sync, backup only, or ignore)
-
-	(* = new in this release)
-
-INSTALLATION
-============
-	KPilot 4.0.0 _REQUIRES_ KDE 2 (http://www.kde.org/) and
-v2.2.0 or better of the QT widget set (http://www.troll.no/). 
-KPilot also _REQUIRES_ pilot-link, which is not distributed with 
-all the linux distro's out there. You may have to go looking.
-
-	If you have these packages, a simple (see *NOTE*):
-
-	./configure
-	make
-	make install
-
-	from the kpilot-4.0.0 directory should configure and install KPilot.  
-If you are using KPanel (the panel that comes with KDE) restarting it
-should insert an icon into the Utilities submenu.  If you are not using
-KPanel, the executable is named kpilot and will be installed in either
-/opt/kde/bin/ or /usr/local/kde/bin (whichever is appropriate for your
-system).
-
-	In some cases KPilot will not compile due to configuration
-differences; in this case a less simple
-
-	autoconf
-	automake
-	./configure
-	make
-	make install
-
-should do the trick. If this fails as well, you can subscribe to the
-KPilot mailing list and state the nature of the failure there.
-
-	*NOTE* that KPilot makes assumptions about where pilot-link and
-the Qt libraries are; in particular it is important to set QTDIR correctly
-(to the Qt 1.44 directories) when compiling KPilot. On many systems the
-command to do this will be
-
-	export QTDIR=/usr/lib/qt-2*
-
-but your mileage may vary. RedHat 6.2 systems ship with Qt 1.45 and Qt 2.1,
-in which case it is doubly important to set QTDIR properly.
-
-USING THE SOFTWARE
-==================
-	The user's documentation in the kpilot/doc directory is the
-best source for information on using KPilot.
-	When KPilot is run for the first time it will display the settings
-dialog.  The default device is /dev/pilot (which should be a link to the
-proper device for the pilot) though this is configurable. Please verify
-this is correct.  
-	IMPORTANT NOTE: the KPilot installation DOES NOT setup the serial
-link; your OS installation may also require special handling. See the
-section "Troubleshooting," below.
-	Other settings can be configured at this time but are
-not mandatory (though HIGHLY recommended).  The one setting that you might
-want to take notice of is "Local overrides pilot".  Setting this to true
-means that if both the local record and the pilot record are modified,
-during the next hot sync the local record will be considered the valid one
-and both will be set to that. By default the Pilot is considered to be the
-valid record and if both the local record and the pilot record have been
-modified the local is overwritten by the pilot copy.  
-	Hitting "OK" will continue to the main KPilot screen.
-	It is recommended you preform a full backup of your Pilot at this
-point so that all of the data visible in KPilot is accurate and any
-importing or exporting is properly merged the next time you hot-sync.  
-You can do a full backup of your Pilot by selecting Backup from the File
-Menu.
-
-TROUBLESHOOTING
-===============
-	The default serial device (/dev/pilot) does not exist on
-most systems. Be SURE to either (a) use the actual serial port the Pilot
-is attached to (i.e. /dev/ttyS0 for the device DOS calls COM1:) OR (b) set
-up the link to the actual serial port by running (as root) "ln -s
-/dev/ttySx /dev/pilot", where x is the number of the serial port. Note
-that some older Linux setups use /dev/cuax instead of /dev/ttySx.
-	If you're running Mandrake 7 and having trouble getting the
-daemon to start or KPilot can't connect to the daemon, check the system
-security setting. Sometimes local processes can't connect to *any*
-local ports.
-	More information is available in the user documentation.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	July 20, 2000
diff --git a/kpilot/Documentation/README-4.0.0 b/kpilot/Documentation/README-4.0.0
deleted file mode 100644
index f9fdccb13..000000000
--- a/kpilot/Documentation/README-4.0.0
+++ /dev/null
@@ -1,103 +0,0 @@
-KPILOT 4.0.0 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	Heiko Purnhagen, Jorg Habenicht,
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot, Palm III, IIIe,
-IIIc, IIIx, V, Vx, M100, Handspring Visor and IBM Workpad with a machine 
-running some flavor of unix. The actual PC->PP communcations was originally 
-based on pilot-link.0.8.7, though you should use pilot-link.0.9.3 now. 
-By default KPilot attempts to connnect using /dev/pilot which should be 
-a link to the actual serial port, however this is configurable in the 
-settings dialog. 
-
-	This is the first release of KPilot 4.x, the first version of
-KPilot that works with and under KDE2. It is released as part of KDE 2.1.
-
-INSTALLATION INSTRUCTIONS
-=========================
-
-	The file ../README contains minimal information on how to compile
-and install KPilot. Since KPilot is part of the kdepim package, you
-should also have the INSTALL file for kdepim, probably in ../../INSTALL.
-
-	This README file only contains the release notes for KPilot 4.0.0.
-
-UPGRADING FROM OLDER KPILOTS
-============================
-
-The first time you run KPilot 4.0.0, it will automatically display
-the setup screen and you can check all the configuration settings.
-If you used KPilot 3.x, you should also immediately configure all your
-conduits (again) because many things have changed there.
-
-CURRENT FEATURES
-================
-	* Conduit for KNotes.
-	* Now a KDE2 application.
-	o Plug in conduit support, currently including
-		KOrganizer, todolist, null and PopMail
-	o Hot-Sync daemon.  - Now hot-sync with just the push of the
-	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	o Add/Delete/Edit memos.
-	o Add/Delete/Edit addresses.
-	o Full Category support for both memos and addresses.
-	o KPilot now respects secret data.
-	o More configuration options including port speed and 
-	  docking control.
-	o Now supports signature files for email.
-	o Drag and drop to docked icon for file install.
-	o International Support
-	o Full Backup/Restore capabilities of Palm Pilot
-	o File (prc,pdb) installation
-	o Email syncing capabilities (via POP3 & sendmail)
-	o SmartSync backing up modified data even
-		for databases KPilot doesn't recognize
-	o Import/Export to/from virtually any text format for
-		Addresses.
-	o Import/Export to/from text files for memos
-	o Sort and display addresses in different ways
-	o A null conduit (programming example)
-	o Syncing with UNIX mailboxes
-	o Database dispositions (sync, backup only, or ignore)
-
-(* = new in this release)
-
-
-KNOWN BUGS
-==========
-	All the known bugs in KPilot can be found in the KDE bugs database
-
-	http://bugs.kde.org/db/pa/lkpilot.html
-
-Please check with that database before reporting bugs.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-It works with Adriaan's Palm V running PalmOS 3.5 as well.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	February 24, 2001
diff --git a/kpilot/Documentation/README-4.2.1 b/kpilot/Documentation/README-4.2.1
deleted file mode 100644
index 71db72853..000000000
--- a/kpilot/Documentation/README-4.2.1
+++ /dev/null
@@ -1,106 +0,0 @@
-KPILOT 4.2.1 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	Heiko Purnhagen, Jorg Habenicht,
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot, Palm III, IIIe,
-IIIc, IIIx, V, Vx, M100, Handspring Visor and IBM Workpad with a machine 
-running some flavor of unix. The actual PC->PP communcations was originally 
-based on pilot-link.0.8.7, though you should use pilot-link.0.9.3 now. 
-By default KPilot attempts to connnect using /dev/pilot which should be 
-a link to the actual serial port, however this is configurable in the 
-settings dialog. 
-
-	This is the second release of KPilot 4.x, the first version of
-KPilot that works with and under KDE2. It is released as part of KDE 2.2.
-
-INSTALLATION INSTRUCTIONS
-=========================
-
-	The file ../README contains minimal information on how to compile
-and install KPilot. Since KPilot is part of the kdepim package, you
-should also have the INSTALL file for kdepim, probably in ../../INSTALL.
-
-	This README file only contains the release notes for KPilot 4.2.1.
-
-UPGRADING FROM OLDER KPILOTS
-============================
-
-The first time you run KPilot 4.2.1, it will automatically display
-the setup screen and you can check all the configuration settings.
-If you used KPilot 3.x, you should also immediately configure all your
-conduits (again) because many things have changed there.
-
-CURRENT FEATURES
-================
-	* Conduit for abbrowser (experimental).
-	* Conduit for expenses (experimental).
-	* Improved international-character support.
-	o Conduit for KNotes (still experimental).
-	o Now a KDE2 application.
-	o Plug in conduit support, currently including
-		KOrganizer, todolist, null and PopMail
-	o Hot-Sync daemon.  - Now hot-sync with just the push of the
-	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	o Add/Delete/Edit memos.
-	o Add/Delete/Edit addresses.
-	o Full Category support for both memos and addresses.
-	o KPilot now respects secret data.
-	o More configuration options including port speed and 
-	  docking control.
-	o Now supports signature files for email.
-	o Drag and drop to docked icon for file install.
-	o International Support
-	o Full Backup/Restore capabilities of Palm Pilot
-	o File (prc,pdb) installation
-	o Email syncing capabilities (via POP3 & sendmail)
-	o SmartSync backing up modified data even
-		for databases KPilot doesn't recognize
-	o Import/Export to/from virtually any text format for
-		Addresses.
-	o Import/Export to/from text files for memos
-	o Sort and display addresses in different ways
-	o A null conduit (programming example)
-	o Syncing with UNIX mailboxes
-	o Database dispositions (sync, backup only, or ignore)
-
-(* = new in this release)
-
-
-KNOWN BUGS
-==========
-	All the known bugs in KPilot can be found in the KDE bugs database
-
-	http://bugs.kde.org/db/pa/lkpilot.html
-
-Please check with that database before reporting bugs.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-It works with Adriaan's Palm V running PalmOS 3.5 as well.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	April 11, 2001
diff --git a/kpilot/Documentation/README-4.2.2 b/kpilot/Documentation/README-4.2.2
deleted file mode 100644
index 604460fc7..000000000
--- a/kpilot/Documentation/README-4.2.2
+++ /dev/null
@@ -1,108 +0,0 @@
-KPILOT 4.2.2 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	Heiko Purnhagen, Jorg Habenicht,
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot, Palm III, IIIe,
-IIIc, IIIx, V, Vx, M100, Handspring Visor and IBM Workpad with a machine 
-running some flavor of unix. The actual PC->PP communcations was originally 
-based on pilot-link.0.8.7, though you should use pilot-link.0.9.3 now. 
-By default KPilot attempts to connnect using /dev/pilot which should be 
-a link to the actual serial port, however this is configurable in the 
-settings dialog. 
-
-	This is the second release of KPilot 4.x, the first version of
-KPilot that works with and under KDE2. It is released as part of KDE 2.2.
-KPilot 4.2.2 is the revision released AFTER KDE 2.2 alpha 1.
-
-INSTALLATION INSTRUCTIONS
-=========================
-
-	The file ../README contains minimal information on how to compile
-and install KPilot. Since KPilot is part of the kdepim package, you
-should also have the INSTALL file for kdepim, probably in ../../INSTALL.
-
-	This README file only contains the release notes for KPilot 4.2.2.
-
-UPGRADING FROM OLDER KPILOTS
-============================
-
-The first time you run KPilot 4.2.2, it may automatically display
-the setup screen and you can check all the configuration settings.
-If you used KPilot 3.x, you should also immediately configure all your
-conduits (again) because many things have changed there.
-
-CURRENT FEATURES
-================
-	* XML GUI support (courtesy of Martin Junius).
-	* Conduit for abbrowser (experimental).
-	* Conduit for expenses (experimental).
-	* Improved international-character support.
-	o Conduit for KNotes (still experimental).
-	o Now a KDE2 application.
-	o Plug in conduit support, currently including
-		KOrganizer, todolist, null and PopMail
-	o Hot-Sync daemon.  - Now hot-sync with just the push of the
-	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	o Add/Delete/Edit memos.
-	o Add/Delete/Edit addresses.
-	o Full Category support for both memos and addresses.
-	o KPilot now respects secret data.
-	o More configuration options including port speed and 
-	  docking control.
-	o Now supports signature files for email.
-	o Drag and drop to docked icon for file install.
-	o International Support
-	o Full Backup/Restore capabilities of Palm Pilot
-	o File (prc,pdb) installation
-	o Email syncing capabilities (via POP3 & sendmail)
-	o SmartSync backing up modified data even
-		for databases KPilot doesn't recognize
-	o Import/Export to/from virtually any text format for
-		Addresses.
-	o Import/Export to/from text files for memos
-	o Sort and display addresses in different ways
-	o A null conduit (programming example)
-	o Syncing with UNIX mailboxes
-	o Database dispositions (sync, backup only, or ignore)
-
-(* = new in this release)
-
-
-KNOWN BUGS
-==========
-	All the known bugs in KPilot can be found in the KDE bugs database
-
-	http://bugs.kde.org/db/pa/lkpilot.html
-
-Please check with that database before reporting bugs.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-It works with Adriaan's Palm V running PalmOS 3.5 as well.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	April 14, 2001
diff --git a/kpilot/Documentation/UML/vcal-classdiagram.xmi.tgz b/kpilot/Documentation/UML/vcal-classdiagram.xmi.tgz
deleted file mode 100644
index 1e222f37031b563a54c181ad946455e09ce2622e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134659
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%0Dwpl2M(X
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
geHYMdO*|8yVd}hEd4Cm  [ ...]
-##
-##  :    path to the application that will be loading the
-##                 plugin. This is used to get the list of library
-##                 dependencies.
-##  : path to the plugin (.so) that will be loaded.
-##  :   paths to additional libraries to get defined symbols from.
-##
-
-USAGE="Usage: checkPlugin.sh   [ ...]"
-
-UNDEF_RE="^ *U "
-DEF_RE="^[0-9a-fA-F]* [TdWBVDR] "
-TMP="/tmp/$$"
-
-APP_PATH="$1"
-PLUGIN_PATH="$2"
-
-test -z "$APP_PATH" && echo "$USAGE"
-test -z "$APP_PATH" && exit 1
-test -f "$APP_PATH" || echo "$USAGE"
-test -f "$APP_PATH" || exit 1
-
-test -z "$PLUGIN_PATH" && echo "$USAGE"
-test -z "$PLUGIN_PATH" && exit 1
-test -f "$PLUGIN_PATH" || echo "$USAGE"
-test -f "$PLUGIN_PATH" || exit 1
-
-shift 2
-
-if nm --demangle "$PLUGIN_PATH" > "$TMP-1" ; then
-	echo `wc -l < "$TMP-1"` "symbols in $PLUGIN_PATH"
-else
-	echo "nm failed on $PLUGIN_PATH"
-	exit 1
-fi
-
-cat "$TMP-1" | grep "$UNDEF_RE" | sed "s/$UNDEF_RE//" | sort > "$TMP-undef"
-
-T=`ldd "$APP_PATH" | grep -v "$APP_PATH" | grep -v "not found" | sed -e 's/.*=> //' -e 's/ (.*) *$//' | sort | uniq`
-
-for LIBF in $T $* ; do
-	test -f "$LIBF" || echo "$LIBF: Not found"
-	test -f "$LIBF" || exit 1
-
-	if nm --demangle "$LIBF" > "$TMP-2" 2> /dev/null ; then
-		nm --demangle --dynamic "$LIBF" >> "$TMP-2" 2> /dev/null
-		# echo `wc -l < "$TMP-2"` "symbols defined in $LIBF"
-	else
-		echo "nm failed on $LIBF"
-		exit 1
-	fi
-
-	cat "$TMP-2" | grep "$DEF_RE" | sed "s/$DEF_RE//" | sort | uniq > "$TMP-def"
-	cat "$TMP-undef" "$TMP-def" | sort | uniq -d > "$TMP-now-defined"
-	cat "$TMP-undef" "$TMP-now-defined" | sort | uniq -u > "$TMP-still"
-
-	echo `wc -l < "$TMP-now-defined"` "symbols resolved by $LIBF"
-	
-	cat "$TMP-still" > "$TMP-undef"
-done
-
-echo `wc -l < "$TMP-undef"` "undefined symbols remain"
-
-cat "$TMP-undef"
-
-rm -f "$TMP" "$TMP-1" "$TMP-2" "$TMP-undef" "$TMP-def" "$TMP-now-defined" "$TMP-still"
diff --git a/kpilot/Documentation/merge-into-svn.sh b/kpilot/Documentation/merge-into-svn.sh
deleted file mode 100755
index c012deed5..000000000
--- a/kpilot/Documentation/merge-into-svn.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-COPYTO=$1
-
-if [ "x$COPYTO" = "x" ] || [ ! -d "$COPYTO" ]
-then
-  echo "$(basename $0) "
-  exit 1
-fi
-
-STARTDIR=$(pwd)
-
-COPYFILES=""
-DELFILES=""
-NEWFILES=""
-
-function isversioned {
-  F=$1
-  svn info $F 2>&1 | grep Checksum > /dev/null
-  rc=$?
-  if [ $rc -eq 0 ]
-  then
-    echo 1
-  else
-    echo 0
-  fi
-}
-
-function checkCopy {
-
-echo "[-] Checking for files that need to be copied to: [$COPYTO]..."
-echo "-----------------------------------------------------"
-
-# first pass is to copy all files we care about from current to destination
-for f in $(find . | egrep -vi \
-"aap|build-|\.svn|\.libs|Makefile$|Makefile.in|~$|\.la$")
-do
-if [ -f $f ]; then
-  F=$(printf "%-60s\n" $f)
-  C=$(sum -r $f)
-  O=$(sum -r $COPYTO/$f 2>/dev/null)
-  if [ "$C" = "$O" ] ; then
-    S="SAME"
-  elif [ ! -f $COPYTO/$f ]; then
-    S="NEW"
-  else
-    S="DIFF"
-  fi
-
-  if [ "$S" != "SAME" ]; then
-    echo "file: [$F], status: [$S]"
-    if [ "$S" = "DIFF" ]; then
-      COPY="y"
-    elif [ "$S" = "NEW" ] ; then
-      V=$(isversioned $f)
-      if [ "$V" -eq 0 ]; then
-        echo " - new file, but not versioned, so ignoring."
-	COPY="n"
-      elif [ "$V" -eq 1 ]; then
-        echo -n " - new file.  versioned. copy this one? (Y/N) -> "
-        read ANS
-        ANS=$(echo $ANS | tr '[A-Z]' '[a-z]')
-        if [ "$ANS" = "y" ]; then
-          COPY="y"
-	  NEWFILES="$NEWFILES $f"
-        else
-          COPY="n"
-        fi
-      fi
-    fi
-    if [ "$COPY" = "y" ]; then
-      echo "  - copying this file..."
-      COPYFILES="$COPYFILES $f"
-    else 
-      echo "  - not copying it..."
-    fi
-  fi
-fi
-done
-}
-
-function checkDelete {
-
-echo "[-] Checking for files that should be deleted from: [$COPYTO] ..."
-echo "-----------------------------------------------------"
-
-# now see if there's anything that was in dest, but is not in new and
-# remove it
-cd $COPYTO
-for f in $(find . | egrep -vi \
-"aap|build|.svn|.libs|Makefile|~$|lib/pilot-link|.la$|.deps|.moc$|.lo$|\.o$")
-do
-if [ -f $f ]; then
-  F=$(printf "%-60s\n" $f)
-  if [ ! -f $STARTDIR/$f ] ; then
-    V=$(isversioned $f)
-    if [ "$V" -eq 1 ]; then
-      echo -n " - file: [$F] looks like it's been deleted. should I remove it?  (Y/N) -> "
-      read ANS
-      ANS=$(echo $ANS | tr '[A-Z]' '[a-z]')
-      if [ "$ANS" = "y" ]; then
-        echo "  - okay, I'll remove this one..."
-        DELFILES="$DELFILES $f"
-      fi
-    fi
-  fi
-fi
-done
-}
-
-checkCopy
-checkDelete
-
-cd "$STARTDIR"
-
-echo "okay, here are the files that I'll copy:"
-for f in $(echo $COPYFILES)
-do
-  echo " - $f"
-done
-
-echo "and here are the files that I'll do an svn remove on:"
-for f in $(echo $DELFILES)
-do
-  echo " - $f"
-done
-
-echo "and here are the files that I'll do an svn add on:"
-for f in $(echo $NEWFILES)
-do
-  echo " - $f"
-done
-
-echo -n "Okay to proceed? (y/n) -> "
-read ANS
-ANS=$(echo $ANS | tr '[A-Z]' '[a-z]')
-if [ "$ANS" != "y" ]; then
-  echo "  - okay, stopping."
-  exit
-fi
-
-cd "$STARTDIR"
-
-echo "okay, copying..."
-for f in $(echo $COPYFILES)
-do
-  cp --parents -v "$f" "$COPYTO"
-done
-
-cd "$COPYTO"
-
-echo "doing svn remove..."
-for f in $(echo $DELFILES)
-do
-  echo " - $f"
-  svn remove "$f"
-done
-
-cd "$COPYTO"
-
-echo "doing svn add..."
-for f in $(echo $NEWFILES)
-do
-  echo " - $f"
-  svn add "$f"
-done
diff --git a/kpilot/INSTALL b/kpilot/INSTALL
deleted file mode 100644
index 3fa5f0ff5..000000000
--- a/kpilot/INSTALL
+++ /dev/null
@@ -1,56 +0,0 @@
-Basic Installation
-==================
-
-
-KPilot uses the CMake build system which is the native build system
-for KDE4; for KDE3 applications like KPilot, CMake is also useable.
-You need CMake installed on your system to compile KPilot, but CMake
-is becoming more widespread now. You can get it from www.cmake.org .
-
-First configure KPilot by running
-
-	./configure [options]
-
-If you run configure with no options it will tell you which ones
-are available; you *must* provide at least one for configure to
-work. A most-vanilla configure looks like this:
-
-	./configure --enable-tests=no
-
-Suggested options are at least:
-
-	./configure --enable-debug=yes --enable-tests=yes
-
-You may need to specify a prefix or a location where pilot-link
-is installed; run ./configure --show for a summary of options.
-
-Once configure is done, compile KPilot, by running
-
-	make -f Makefile.cmake
-
-in the KPilot source directory (that is the one containing this
-INSTALL file). This will run CMake to generate the real Makefiles,
-then run make again to build the project in a build-* subdirectory.
-Once it is done, you can run
-
-	make -f Makefile.cmake install
-
-to install KPilot in the KDE directory.
-
-
-
-
-Advanced Installation
-=====================
-
-In order to build KPilot somewhere else, or if the sources are on
-read-only media, use CMake directly instead of using the basic
-Makefile included with KPilot. To do this,
-	1) Create a build directory somewhere
-	2) cd into that build directory
-	3) Run cmake /path/to/kpilot/sources
-	4) Run make
-
-In order to install KPilot somewhere else, use -DCMAKE_INSTALL_PREFIX .
-
-
diff --git a/kpilot/Mainpage.dox b/kpilot/Mainpage.dox
deleted file mode 100644
index 7e0b086c3..000000000
--- a/kpilot/Mainpage.dox
+++ /dev/null
@@ -1,31 +0,0 @@
-/** \mainpage %KPilot API Overview
-
-\section Architecture
-
-%KPilot consists of a core library of utility and communications
-classes which are used by two applications: KPilot itself
-(which is little more than a clumsy data viewer and
-configuration shell) and the KPilot daemon which does
-the actual communications with the hadheld.
-The daemon loads plugins (called conduits) on demand
-which are used for syncing specific data on the PC
-with the handheld.
-
-The lib/ directory holds the base library for KPilot.
-This boils down to a bunch of wrappers for pilot-link
-classes (not using p-l's C++ code because that isn't
-Qt-ish) and a few classes that do interesting things:
-KPilotDeviceLink for managing the device connection,
-and SyncAction for doing stuff during a sync.
-
-The kpilot/ directory houses several applications:
-kpilot and kpilotDaemon are installed, and kpilotTest
-which is not installed but which can function as a demon
-under closely-controlled circumstances from the command-line.
-
-Under conduits/ a bunch of directories hold the individual
-conduits; the "four button" apps are in vcalconduit/ (ToDo and
-Datebook), abbrowserconduit/ (Addresses, not the newer Contacts)
-and knotes/ or memofileconduit/ (Memos).
-
-*/
diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am
deleted file mode 100644
index e787d42e6..000000000
--- a/kpilot/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-## kdepim/kpilot/Makefile.am
-## (C) 1997 Stephan Kulow
-## Modified by Adriaan de Groot
-
-SUBDIRS = lib kpilot conduits
-
-messages:
-	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"`  > rc.cpp
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp"` -o $(podir)/kpilot.pot   
-	-rm -f rc.cpp
-
-DOXYGEN_REFERENCES = kpilot/lib kpilot/kpilot
-include $(top_srcdir)/admin/Doxyfile.am
-
-# Just for the KPilot developers: grab all the strings, for checking.
-devel-pot :
-	extractrc `find . -name "*.rc" -o -name "*.ui"` > /tmp/rc.cpp
-	xgettext -C --keyword=i18n --keyword=I18N_NOOP -o /tmp/kpilot.po \
-		`find . -name "*.cc"` /tmp/rc.cpp
-
diff --git a/kpilot/Makefile.cmake b/kpilot/Makefile.cmake
deleted file mode 100644
index 55dba5af5..000000000
--- a/kpilot/Makefile.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# This is a GNU makefile. You need GNU make to process it.
-# FreeBSD users should use gmake.
-#
-#
-
-# Unusual configuration things:
-#   CMAKE = path to cmake
-#   BUILD_DIR = directory to build things in
-#   CMAKE_FLAGS = extra flags to CMake.  These will get set by
-#      ./configure, saved to CMakeOptions.txt, and read in below...
-#
-
--include Makefile.cmake.in
-
-BUILD_DIR ?= build-$(shell uname -sr | tr -d [:space:] | tr -Cs a-zA-Z0-9 _ )
-# these come from CMakeOptions.txt (from ./configure)
-CMAKE_FLAGS ?=
-CMAKE ?= cmake
-
-all: build-check
-	@cd "$(BUILD_DIR)" && $(MAKE)
-
-check: lib tests
-	$(BUILD_DIR)/tests/testconstants
-	$(BUILD_DIR)/tests/testcategories --data-dir=tests/data
-	$(BUILD_DIR)/tests/testaddresses --data-dir=tests/data
-	$(BUILD_DIR)/tests/testdatebook --data-dir=tests/data
-
-install: build-check
-	@cd "$(BUILD_DIR)" && $(MAKE) install
-
-uninstall: 
-	@cd "$(BUILD_DIR)" && $(MAKE) uninstall
-
-lib: $(BUILD_DIR)/lib/libkpilot.so
-
-$(BUILD_DIR)/lib/libkpilot.so: build-check
-	@cd "$(BUILD_DIR)/lib" && $(MAKE)
-
-tests: build-check
-	@cd "$(BUILD_DIR)/tests" && $(MAKE)
-
-	
-build-check:
-	test -d "$(BUILD_DIR)" || mkdir -p "$(BUILD_DIR)"
-	test -d "$(BUILD_DIR)"
-	test -f "$(BUILD_DIR)/Makefile" || (cd "$(BUILD_DIR)" && $(CMAKE) .. )
-
-messages:
-	extractrc `find . -name *.rc` > rc.cc
-	extractrc `find . -name *.ui` >> rc.cc
-	xgettext -o kpilot.po --keyword=i18n rc.cc `find . -name *.h` `find . -name *.cc` 
-
-clean:
-	@rm -rf $(BUILD_DIR)
-
-svnclean:
-	@rm -rf `svn status --no-ignore | awk '/^[?I]/{print $2}'`
-
-help:
-	@echo "Usage: make ( all | install | uninstall | clean )"
-	@echo ""
-
-.PHONY : all check install uninstall lib build-check clean help 
-
diff --git a/kpilot/NEWS b/kpilot/NEWS
deleted file mode 100644
index 4e9a6983a..000000000
--- a/kpilot/NEWS
+++ /dev/null
@@ -1,24 +0,0 @@
-KPilot news. This file lists only major releases &c.
-For more detailed information and musings, see the
-ChangeLog or the README files. There is also the
-history page on www.kpilot.org.
-
-* November 18, 2006: KDE 3.5.5 is getting KPilot backported
-  to it, and KPilot itself now uses CMake as its buildsystem.
-* November 4, 2004: KDE 3.3.1 contains KPilot 4.4.5; there is
-  a 4.4.6 available from the website, but it is of dubious
-  quality.
-* January 18, 2004: KDE 3.2 released, with KPilot 4.4.0. I'd
-  say 4.4.0 is dead in the water, there's too much new useful
-  stuff in 4.4.1 (for the PIM release).
-* August 19, 2002: License change for the lib part of KPilot to
-  LGPL and an exception made in the COPYING file for libmal to
-  allow the AvantGo (tm) conduit to use that library.
-* May 23, 2002: KPilot 4.3.2 seems ok now. It's too late for
-  KDE 3.0.1. It should still work for KDE 2.2.2.
-* January 20, 2002: KPilot 4.3.0b still isn't ready for release.
-* April 8, 2001: KPilot 4.2.2 released with KDE 2.2a1.
-* February 12, 2001: KPilot 4.0.0 released with KDE 2.1.
-* 2000: KPilot 3.2.1 released. This is the last KDE 1.x release.
-
-
diff --git a/kpilot/README b/kpilot/README
deleted file mode 100644
index bffacdbdc..000000000
--- a/kpilot/README
+++ /dev/null
@@ -1,43 +0,0 @@
-KPILOT 4.9.1 by Adriaan de Groot
-=============================================
-	Additional work by Robert Ambrose,
-	Preston Brown, Adriaan de Groot,
-	Heiko Purnhagen, Joerg Habenicht,
-	David Bishop, Aaron Seigo,
-	Reinhold Kainhofer, Joern Ahrens,
-	Jason Kasper,
-	and probably many more.
-
-	KPilot is software for syncing PalmOS based handhelds
-such as the 3Com Palm Pilot with a machine running some flavor of UNIX.  
-
-	Developer's notes are listed in the file ChangeLog. This is
-probably only of interest if you want to see how certain features developed
-or if certain bugs have been reported before.
-
-	http://www.kpilot.org/
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real Pilot with my Palm Pilot Professional running OS v2.0.4.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.
-ie:  Should your Pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  Send mail to kde-pim@kde.org .
-
-	Dan Pilone
-	pilone@slac.com
-	July 20, 2000
-
-	Adriaan de Groot
-	groot@kde.org
-	November 18, 2006
-
diff --git a/kpilot/TODO b/kpilot/TODO
deleted file mode 100644
index 1729fafbc..000000000
--- a/kpilot/TODO
+++ /dev/null
@@ -1,201 +0,0 @@
-This is a TODO file. Open issues are unmarked, partly resolved issues
-are marked with a *, ignored issues get an -, and resolved issues a +
-(or they are completely removed from the list). Check the ChangeLog
-for details on how an issue is resolved, since resolved issues are
- periodically purged from this list.
-
-
-* Import pilot-link 0.12 CVS again
-* Implement correct full syncing in memofile conduit.  honestly, we should
-  really have a generic sync engine that knows how to do all of the
-  different sync types and only calls conduits for comparisons, list
-  fetching, pilotid->whateverId persistence and retrieval, etc.  *sigh*  is
-  that what opensync gives us?
-
-Essential
-=========
-3b) Implement reset to last sync and ignore conflict resolution options in
-    vcal conduits (bug #59221)
-4a) Config troubles: Start kpilotDaemon and then kpilot. Configure a conduit
-    in kpilot, then do a sync (which writes something to the  config, e.g.
-    run the docconduit). Now configure another conduit in kpilot. The config
-    file will be changed again, but the changes from the sync are lost (i.e.
-    after a sync, kpilot needs to reload the config). (seems connected to bug #56115)
-*4b) Conduits should not use the backup databases, otherwise a backup run will
-    screw up the conduit's mechanism to detect changes. (bug #59219)
-4c) Need to find a better way to detect runs without a conduit, and switch to
-    full sync in that case to prevent data loss.
-4d) Need to find a good way to avoid a mess when implementing new features
-    (e.g. after implementing the correct category sync, how do I ensure that
-    no category settings are lost?)
-5)  After the special sync is done, ask if the next sync should again be the
-    same special sync, a fast or a hot sync. (wish #59218)
-
-
-Important (hight priority)
-============================
-6a) The abook conduit currently only syncs one email address and one
-    phone number of each type. I need to find a way to sync two email
-    addresses to and from the handheld. (Bug #56364)
-7)  Check the first-time syncing behavior of all the conduits.
-15) Add force-first-time to the KNotes conduit.
-17) Include a calendar viewer, or get rid of the internal viewers
-    altogether.
-19) GJJ: Replace newlines in TODO summaries (not allowed in libkcal),
-    also do the same for phone numbers etc. (bug #56379)
-19b)Make the doc conduit use the new global settings instead of its own 
-
-
-Medium (nice to have, but not essential)
-========================================
-18) VCal conduit: events going over midnight need to be split up
-    on the handheld (bug #59223)
-20) GJJ: Check all debug output, what should be put in the log (i.e.
-    be visible to the user) and what is just debug output to track
-    down problems.
-21) GJJ: Hunt down and kill printfs. Hunt down bad i18n.
-26) ABook conduit: sync with preferred address (not home or work address)
-27) Update the conduit programming howto (some changes in the database
-    and record classes)
-31) GJJ: Extend all conduits to allow arbitrary URLs instead of local
-    files.
-32) JPilot conduit: fix the configure.in.in checks for gtk/glibc
-    (although the conduit isn't even remotely finished)
-32a)Find a replacement for the NULL conduit (skip databases when
-    doing a backup)
-
-
-Unimportant (lowest priority)
-=============================
-33) JPilot conduit: Implement the conduit as an external GTK application,
-    that is embedded into kpilot using qxembed
-34) JJ: Add tooltips to all controls in all conduit configure dialogs
-35) Do not store the RecordID with the vcalendar entry, but in the kpilot
-    config
-37) JJ: Show the sync log as a KPassivePopup
-39) Make an application that just has a LogWidget and KPilot's dcop
-    interface (and registration!) so that you can follow the daemon's
-    log output without starting KPilot at all.
-40) Allow the todo conduit to use the manana database (see jpilot)
-41) Allow the memo conduit to use the pedit32 database (see jpilot)
-42) Use pdf2text application to also install pdb files with the palmdoc
-    conduit.
-
-
-
-
-
-
-FINISHED TODO jobs
-==================
-
-+(1)  VCal conduit: Currently using the ResourceCalendar (standard
-    calendar) doesn't work for some (unknown) reason. Every sync
-    happens with the filename given in the setup dialog. Probably
-    very easy to fix.
-+(2) 4d) Need to find a good way to avoid a mess when implementing new features
-    (e.g. after implementing the correct category sync, how do I ensure that
-    no category settings are lost?)
-+(3a) Implement the CopyToPC and CopyToHH directions in the addressbook conduit (bug #59220)
-5)  After the special sync is done, ask if the next sync should again be the
-    same special sync, a fast or a hot sync. (wish #59218)
-
- Redesign the config dialog of kpilot (get rid of deprecated
-    options, include conflict resolution, etc.)
-+(3)  Fix all conduits to use the new global options: conflict resolution,
-    emergency sync, sync mode etc.
-+(4)  VCal conduit: Fields not supported on the handheld are erased
-    in the calendar (e.g. categories). I need to get the Event
-    before I copy all fields over, and only overwrite the fields
-    from the handheld, so the others remain unchanged.
-	 RESOLUTION: Found out that this is not true any longer, and everything
-	 works just fine!
-+(5)  AvantGo conduit: fix the configure.in.in checks for libmal
-+(6)  ABook conduit: fix the first sync setting
-+(8)  Find out what's the reason of the "Invalid unique ID" crashes in
-    the calendar conduits (and the addresssbook conduit) (bug #51216)
--(9)  GJJ: PalmDOC conduit: kpalmdoc is run as a modal dialog, not as
-    a standalone dialog (e.g. create a link  on the desktop to
-    kpalmdoc and start kpalmdoc from there. You can't access the
-    desktop until you quit kpalmdoc)
-    RESOLUTION: This is a general KDE Bug!!!!
--(10) GJJ: Add a flag to the log{Error,Message} functions to prevent
-    the addition of the trailing 
     and the date to each output
-    (e.g. to put all output from the AvantGo conduit in one line,
-    instead of one separate line for each .)
-    RESOLUTION: This is not possible in a QTextEdit in LogText mode.
-    However, I got rid of the pseudoo-progressbar, so this i no longer
-    needed.
-+(11) Merge between HEAD and BRANCH (again).
-+(12) ABook conduit: Check all fields for differences before asking
-    for conflict resolution. (i.e. don't ask for conflict resolution
-    of single fields, just for the whole record) (bug #59222)
-+(13) ABook conduit: custom field sync doesn't work with birthdate
-    (how do I convert a date to a string and back in an arbitrary
-    format???) (Bug #50871)
-+(14) ABook conduit: Fix categories sync
-    RESOLUTION: Fixed for the abook and the todo conduit
-+(16) Remove the edit capabilities from the built-in viewers. (fixes bug #54765)
-    Or write a SyncAction childclass that merges  the changes from the internal
-    editors to the databases on the handheld before the sync takes place
-		RESOLUTION: Implemented the InternalEditorAction that syncs these modifications
-+(19a)Implement the internal editor sync
-+(19a)When syncing, also backup the databases (if option is set)
-+(19b)Add all codecs that are supported by Qt, automatically fill the
-    combobox in the config dialog. Change the combobox to an editable
-	 Combobox so that the user can also give other encodings (if he
-	 installed the corresponding plugins).
-+(22) Update README, TODO, NEWS, AUTHORS in HEAD.
-+(23) GJJ: Move the conduit configuration dialog (for the umpteenth time)
-    to a list of QCheckBoxes, like noatun's plain playlist or
-    kdebugdialog
-+(24) PalmDOC conduit: choosing the bookmark type of the pdb->txt
-    conversion is not yet implemented. Only create .bm file, if there
-    are bookmarks in the text.
--(25) ABook conduit: sync with multiple email addresses (space-separated
-    list received from handheld)
-		RESOLUTION: Duplicate of 6a)
-+(28) GJJ: The question asked when kpilot and the pilot's usernames don't
-    match isn't very intuitive. It should be changed to a yes/no/cancel
-    with "Use KPilot name" "Use Pilot name" "Cancel". This is in
-    interactiveSync.cc.
--(29) Fix the NULL conduit's tooltip - OR - make it actually do what the
-    current tooltip says.
-    RESOLUTION: The NULL conduit is no longer needed at all, so I disabled
-    it completely
--(30) GJJ: Create good icons for the kpalmdoc converter application.
-+(38) Should interactiveSync and syncStack be moved to lib/ ?
-
-
-
-
-
-Specific JOBS
-=============
-
-***
-*** PilotLocalDatabase fixups
-***
-
-The PilotLocalDatabase class is really ugly and clunky -- and far worse,
-it has a hard-coded limit of 10000 records per database. This may have hurt
-us once or twice already (consider that a Visor w/ 16Mb could *easily*
-hold 10000 addresses). It needs careful reworking.
-
-I think using a Q(Ptr)List is the way to go here -- well, maybe a QVector
-would work as well; that depends on whether QVectors resize well. The tricky
-part is implementing the "current record pointer" with the same behavior
-as the current fCurrentRecord member, since conduits may depend on it.
-
-
-***
-*** Popmail Conduit & IOSlaves
-***
-
-The popmail conduit duplicates a lot of code found elsewhere -- it does
-SMTP sending and POP3 retrieval of mail messages. That should really be
-left to IOSlaves, which are better debugged. Using tickle() will be
-necessary while waiting for responses from the slaves, since you must keep
-the pilot awake. (This opens the door to multi-threading conduits, with
-possibly an asynchronous "pre-sync" action).
-
diff --git a/kpilot/cmake/modules/FindMal.cmake b/kpilot/cmake/modules/FindMal.cmake
deleted file mode 100644
index 9439d277e..000000000
--- a/kpilot/cmake/modules/FindMal.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-INCLUDE(CheckCXXSourceCompiles)
-
-set(CMAKE_INCLUDE_PATH "${MAL_BASE}/include")
-FIND_PATH(MAL_INCLUDE_DIR libmal.h 
-	${MAL_BASE}/include
-	${MAL_BASE}/include/libmal
-	/usr/include
-	/usr/include/libmal
-	/usr/local/include
-	/usr/local/include/libmal
-)
-set(CMAKE_LIBRARY_PATH "${MAL_BASE}/lib")
-FIND_LIBRARY(MAL_LIBRARY mal 
-	${MAL_BASE}/lib
-	/usr/lib
-	/usr/lib/libmal
-	/usr/local/lib
-	/usr/local/lib/libmal
-)
-
-IF (NOT MAL_INCLUDE_DIR)
-	MESSAGE(STATUS "Could not find libmal.h")
-ELSE (NOT MAL_INCLUDE_DIR)
-	MESSAGE(STATUS "Found libmal.h in ${MAL_INCLUDE_DIR}")
-ENDIF (NOT MAL_INCLUDE_DIR)
-
-IF (NOT MAL_LIBRARY)
-	MESSAGE(STATUS "Could not find libmal")
-ELSE (NOT MAL_LIBRARY)
-	MESSAGE(STATUS "Found libmal in ${MAL_LIBRARY}")
-ENDIF (NOT MAL_LIBRARY)
-
-IF (MAL_INCLUDE_DIR AND MAL_LIBRARY)
-	SET(MAL_FOUND TRUE)
-ENDIF (MAL_INCLUDE_DIR AND MAL_LIBRARY)
-
-IF (MAL_FOUND)
-	SET(CMAKE_REQUIRED_INCLUDES ${MAL_INCLUDE_DIR} ${PILOTLINK_INCLUDE_DIR})
-	CHECK_CXX_SOURCE_COMPILES("
-#include 
-#define LIBMAL_IS(a,b) ((LIBMAL_VERSION > a) || ((LIBMAL_VERSION == a) && ((LIBMAL_MAJOR > b) || (LIBMAL_MAJOR == b))))
-#if !LIBMAL_IS(0,40)
-#error \"Libmal version is < 0.40\"
-#else
-int main() { return 0; }
-#endif
-"
-		MAL_VERSION_OK)
-ENDIF (MAL_FOUND)
-
-IF (NOT MAL_VERSION_OK)
-	SET(MAL_FOUND FALSE)
-	MESSAGE(STATUS "Found mal, but it's not at least version 0.40.")
-ENDIF (NOT MAL_VERSION_OK)
-
-
-IF (MAL_FOUND)
-	MESSAGE(STATUS "Found mal: ${MAL_LIBRARY}")
-ELSE (MAL_FOUND)
-	MESSAGE(STATUS "Couldn't find acceptable mal version. Won't be able to build malconduit")
-ENDIF (MAL_FOUND)
-
diff --git a/kpilot/cmake/modules/FindPilotlink.cmake b/kpilot/cmake/modules/FindPilotlink.cmake
deleted file mode 100644
index 649419e6f..000000000
--- a/kpilot/cmake/modules/FindPilotlink.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-INCLUDE(CheckCXXSourceCompiles)
-
-set(CMAKE_INCLUDE_PATH "${PILOTLINK_BASE}/include")
-FIND_PATH(PILOTLINK_INCLUDE_DIR pi-dlp.h 
-	/usr/include
-	/usr/include/libpisock
-	/usr/local/include
-	)
-set(CMAKE_LIBRARY_PATH "${PILOTLINK_BASE}/lib")
-FIND_LIBRARY(PILOTLINK_LIBRARY pisock 
-	/usr/lib
-	/usr/local/lib
-	)
-
-IF (NOT PILOTLINK_INCLUDE_DIR)
-	MESSAGE(STATUS "Could not find pilot-link (pi-dlp.h)")
-ELSE (NOT PILOTLINK_INCLUDE_DIR)
-	MESSAGE(STATUS "Found pilot-link includes in  ${PILOTLINK_INCLUDE_DIR}")
-ENDIF (NOT PILOTLINK_INCLUDE_DIR)
-
-IF (NOT PILOTLINK_LIBRARY)
-	MESSAGE(STATUS "Could not find pilot-link (libpisock.so)")
-ELSE (NOT PILOTLINK_LIBRARY)
-	MESSAGE(STATUS "Found pilot-link libraries in ${PILOTLINK_LIBRARY}")
-ENDIF (NOT PILOTLINK_LIBRARY)
-
-IF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY)
-	SET(PILOTLINK_FOUND TRUE)
-ENDIF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY)
-
-IF (PILOTLINK_FOUND)
-	SET(CMAKE_REQUIRED_INCLUDES ${PILOTLINK_INCLUDE_DIR})
-	CHECK_CXX_SOURCE_COMPILES("
-#include 
-#if !PILOT_LINK_IS(0,12,0)
-#error \"Pilot-link version is < 0.12.0\"
-#else
-int main() { return 0; }
-#endif
-"
-		PILOTLINK_VERSION_OK)
-ENDIF (PILOTLINK_FOUND)
-
-IF (NOT PILOTLINK_VERSION_OK)
-	SET(PILOTLINK_FOUND FALSE)
-ENDIF (NOT PILOTLINK_VERSION_OK)
-
-
-IF (NOT PILOTLINK_FOUND)
-	IF (Pilotlink_FIND_REQUIRED)
-		MESSAGE(STATUS "KPilot requires pilot-link 0.12.0 or later. Pilot-link is available from pilot-link.org and is packaged by most distributions. Remember to install the development package with the compilation headers as well.")
-		MESSAGE(FATAL_ERROR "Could not find pilot-link.")
-	ENDIF (Pilotlink_FIND_REQUIRED)
-ENDIF (NOT PILOTLINK_FOUND)
-
diff --git a/kpilot/cmake/modules/KPilotCustom.cmake b/kpilot/cmake/modules/KPilotCustom.cmake
deleted file mode 100644
index 08b255dc0..000000000
--- a/kpilot/cmake/modules/KPilotCustom.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-MACRO(KDE3_INSTALL_ICONS_CUSTOM _theme)
-   ADD_CUSTOM_TARGET(install_icons )
-   SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake )
-   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n")
-   FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n")
-
-   FILE(GLOB _icons *.png)
-   FOREACH(_current_ICON ${_icons} )
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}")
-
-      SET(_icon_GROUP "unknown")
-
-      IF(${_group} STREQUAL "mime")
-         SET(_icon_GROUP  "mimetypes")
-      ENDIF(${_group} STREQUAL "mime")
-
-      IF(${_group} STREQUAL "filesys")
-         SET(_icon_GROUP  "filesystems")
-      ENDIF(${_group} STREQUAL "filesys")
-
-      IF(${_group} STREQUAL "device")
-         SET(_icon_GROUP  "devices")
-      ENDIF(${_group} STREQUAL "device")
-
-      IF(${_group} STREQUAL "app")
-         SET(_icon_GROUP  "apps")
-      ENDIF(${_group} STREQUAL "app")
-
-      IF(${_group} STREQUAL "action")
-         SET(_icon_GROUP  "actions")
-      ENDIF(${_group} STREQUAL "action")
-
-      IF( NOT ${_icon_GROUP} STREQUAL "unknown")
-#        message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
-         SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
-         FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
-         FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
-      ELSE( NOT ${_icon_GROUP} STREQUAL "unknown")
-         message(STATUS "icon: ${_current_ICON} doesn't fit naming conventions. ignoring." )
-      ENDIF( NOT ${_icon_GROUP} STREQUAL "unknown")
-
-   ENDFOREACH (_current_ICON)
-ENDMACRO(KDE3_INSTALL_ICONS_CUSTOM)
-
-
-MACRO(KPILOT_RPATH _thing)
-	set_target_properties(${_thing} PROPERTIES 
-		INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib;${KDE3_DIR}/lib;${PILOTLINK_LIBRARY}
-		INSTALL_RPATH_USE_LINK_PATH true
-	)
-ENDMACRO(KPILOT_RPATH _thing)
diff --git a/kpilot/cmake_uninstall.cmake.in b/kpilot/cmake_uninstall.cmake.in
deleted file mode 100644
index 397e3aa75..000000000
--- a/kpilot/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: 
-\"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(EXISTS "${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF("${rm_retval}" STREQUAL 0)
-    ELSE("${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-    ENDIF("${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "${file}")
-    MESSAGE(STATUS "File \"${file}\" does not exist.")
-  ENDIF(EXISTS "${file}")
-ENDFOREACH(file)
diff --git a/kpilot/conduits/CMakeLists.txt b/kpilot/conduits/CMakeLists.txt
deleted file mode 100644
index e8f49e53f..000000000
--- a/kpilot/conduits/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-include_directories(
-	${CMAKE_BINARY_DIR}/lib
-	${CMAKE_SOURCE_DIR}/lib
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-add_subdirectory(abbrowserconduit)
-add_subdirectory(docconduit)
-add_subdirectory(knotes)
-add_subdirectory(memofileconduit)
-add_subdirectory(notepadconduit)
-add_subdirectory(null)
-add_subdirectory(popmail)
-add_subdirectory(sysinfoconduit)
-add_subdirectory(timeconduit)
-
-FIND_PATH( HAVE_CALENDARLOCAL_H "libkcal/calendarlocal.h" ${KDE3_INCLUDE_DIR} )
-
-IF (HAVE_CALENDARLOCAL_H)
-	add_subdirectory(vcalconduit)
-ELSE (HAVE_CALENDARLOCAL_H)
-	MESSAGE(STATUS "No KDE PIM development headers were found.")
-ENDIF (HAVE_CALENDARLOCAL_H)
-
-###
-#
-# MAL seems to be broken, or the MAL API has changed somewhat
-# since the last time that the conduit was compiled by the development
-# team. Since we don't use the conduit it is disabled. 
-IF (MAL_FOUND)
- 	add_subdirectory(malconduit)
-ELSE (MAL_FOUND)
-	MESSAGE(STATUS "Couldn't find mal. Won't be able to build malconduit")
-ENDIF (MAL_FOUND)
-
diff --git a/kpilot/conduits/Makefile.am b/kpilot/conduits/Makefile.am
deleted file mode 100644
index fed44984b..000000000
--- a/kpilot/conduits/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-###
-### The NULL conduit is a neat programming example, but shouldn't be
-### installed on user systems.
-###
-
-if include_malconduit
-MAL_SUBDIR = malconduit
-else
-MAL_SUBDIR = 
-endif
-
-SUBDIRS = \
-	  abbrowserconduit \
-	  docconduit \
-	  knotes \
-	  $(MAL_SUBDIR) \
-	  memofileconduit \
-	  notepadconduit \
-	  popmail \
-	  sysinfoconduit \
-	  timeconduit \
-	  vcalconduit
-
-###
-### Subdirs you might have for experimental purposes:
-###
-###	null             - a conduit that just logs a single message.
-###	$(PERL_SUBDIR)   - fires off a perl interpreter in a thread.
-###	$(PYTHON_SUBDIR) - starts a python interpreter in a thread.
-###
diff --git a/kpilot/conduits/abbrowserconduit/CMakeLists.txt b/kpilot/conduits/abbrowserconduit/CMakeLists.txt
deleted file mode 100644
index 2459d1db9..000000000
--- a/kpilot/conduits/abbrowserconduit/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_abbrowser_SRCS
-	resolutionDialog.cc
-	abbrowser-factory.cc
-	abbrowser-setup.cc
-	kabcRecord.cc
-	abbrowser-conduit.cc
-)
-
-set(conduit_abbrowser_UIS
-	resolutionDialog_base.ui
-	kaddressbookConduit.ui
-)
-
-set(conduit_abbrowser_KCFGS
-	abbrowserSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
-kde3_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
-kde3_automoc(${conduit_abbrowser_SRCS})
-add_library(conduit_address SHARED ${conduit_abbrowser_SRCS})
-target_link_libraries(conduit_address kabc_file kabc)
-set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_address)
-
-install(
-	TARGETS conduit_address
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES abbrowser_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES abbrowserconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
diff --git a/kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
deleted file mode 100644
index d4bb9078f..000000000
--- a/kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
+++ /dev/null
@@ -1,276 +0,0 @@
-
-KPilotCustomFields
-This form lets you edit the custom fields synced from PalmOS handhelds by the addressbook conduit of KPilot.
-Reinhold Kainhofer <reinhold@kainhofer.com>
-
-    
-        KPILOT
-    
-    
-        
-            0
-            0
-            461
-            409
-        
-    
-    
-        KPilot Custom Fields
-    
-    
-        
-            unnamed
-        
-        
-            0
-        
-        
-            
-                mCustomFieldsGroups
-            
-            
-                KPilot Custom Fields
-            
-            
-                On your handheld, each address also provides four custom fields for your personal use. KPilot can sync these either to birthdate, URL, IM address, or just store them as a custom field on your PC with no special meaning. In the last case, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.
-            
-            
-                
-                    unnamed
-                
-                
-                    
-                        mCustom3Label
-                    
-                    
-                        Custom &3:
-                    
-                    
-                        X_CUSTOM3
-                    
-                    
-                        <qt>Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        mCustom4Label
-                    
-                    
-                        Custom &4:
-                    
-                    
-                        X_CUSTOM3
-                    
-                    
-                        <qt>Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        X_CUSTOM2
-                    
-                    
-                        <qt>Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        X_CUSTOM1
-                    
-                    
-                        <qt>Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        X_CUSTOM3
-                    
-                    
-                        <qt>Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        mCustom2Label
-                    
-                    
-                        Custom &2:
-                    
-                    
-                        X_CUSTOM2
-                    
-                    
-                        <qt>Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        mCustom1Label
-                    
-                    
-                        Custom &1:
-                    
-                    
-                        X_CUSTOM1
-                    
-                    
-                        <qt>Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        X_CUSTOM0
-                    
-                    
-                        
-                            3
-                            0
-                            0
-                            0
-                        
-                    
-                    
-                        <qt>Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt>
-                    
-                
-                
-                    
-                        mCustomFieldsExplanation
-                    
-                    
-                        If you let KPilot sync the handheld's custom fields as custom fields on the PC, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.
-                    
-                    
-                        WordBreak|AlignVCenter
-                    
-                
-            
-        
-        
-            
-                mMetaSyncGroup
-            
-            
-                true
-            
-            
-                KPilot's Private (meta-sync) Settings
-            
-            
-                
-                    unnamed
-                
-                
-                    
-                        mRecordIDLabel
-                    
-                    
-                        Record&ID:
-                    
-                    
-                        X_RecordID
-                    
-                
-                
-                    
-                        mSyncFlagLabel
-                    
-                    
-                        Sync &flag:
-                    
-                    
-                        X_Flag
-                    
-                
-                
-                    
-                        spacer2
-                    
-                    
-                        Horizontal
-                    
-                    
-                        Expanding
-                    
-                    
-                        
-                            41
-                            20
-                        
-                    
-                
-                
-                    
-                        spacer3
-                    
-                    
-                        Horizontal
-                    
-                    
-                        Expanding
-                    
-                    
-                        
-                            31
-                            20
-                        
-                    
-                
-                
-                    
-                        mMetaSyncSettingsWarning
-                    
-                    
-                        These values indicate the state of the record for KPilot, and connect an entry on the handheld with an entry on the PC.
-Do NOT change these values: doing so will almost certainly result in data loss when you next do a sync.
-                    
-                    
-                        WordBreak|AlignVCenter
-                    
-                
-                
-                    
-                        X_RecordID
-                    
-                    
-                        false
-                    
-                    
-                        2147483647
-                    
-                
-                
-                    
-                        X_Flag
-                    
-                    
-                        false
-                    
-                    
-                        3
-                    
-                
-            
-        
-        
-            
-                spacer1
-            
-            
-                Vertical
-            
-            
-                Expanding
-            
-            
-                
-                    20
-                    210
-                
-            
-        
-    
-
-
-
diff --git a/kpilot/conduits/abbrowserconduit/Makefile.am b/kpilot/conduits/abbrowserconduit/Makefile.am
deleted file mode 100644
index b012765ff..000000000
--- a/kpilot/conduits/abbrowserconduit/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-kde_module_LTLIBRARIES = conduit_address.la
-
-conduit_address_la_SOURCES = \
-	resolutionDialog_base.ui \
-	kaddressbookConduit.ui \
-	abbrowserSettings.kcfgc \
-	resolutionDialog.cc \
-	abbrowser-factory.cc \
-	abbrowser-setup.cc \
-	kabcRecord.cc \
-	abbrowser-conduit.cc
-conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkdecore -lkio -lkdeui
-conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file
-
-servicedir = $(kde_servicesdir)
-service_DATA = abbrowser_conduit.desktop
-kde_kcfg_DATA = abbrowserconduit.kcfg
-
-kabcustompagedir = $(kde_datadir)/kaddressbook/contacteditorpages
-kabcustompage_DATA = KPilotCustomFieldEditor.ui
-
-METASOURCES = AUTO
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc
deleted file mode 100644
index 11e25f2dd..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ /dev/null
@@ -1,1897 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2007 by Adriaan de Groot 
-**
-** The abbrowser conduit copies addresses from the Pilot's address book to
-** the KDE addressbook maintained via the kabc library.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include "resolutionDialog.h"
-#include "resolutionTable.h"
-#include "abbrowserSettings.h"
-#include "kabcRecord.h"
-
-#include "abbrowser-conduit.moc"
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-//
-//
-extern "C"
-{
-unsigned long version_conduit_address = Pilot::PLUGIN_API;
-}
-
-
-/* This is partly stolen from the boost libraries, partly from
-*  "Modern C++ design" for doing compile time checks; we need
-*  to make sure that the enum values in KABCSync:: and in the
-*  AbbrowserSettings class are the same so that both interpret
-*  configuration values the same way.
-*/
-template struct EnumerationMismatch;
-template<> struct EnumerationMismatch{};
-
-#define CHECK_ENUM(a) (void)sizeof(EnumerationMismatch<((int)KABCSync::a)==((int)AbbrowserSettings::a)>)
-
-static inline void compile_time_check()
-{
-	// Mappings for other phone
-	CHECK_ENUM(eOtherPhone);
-	CHECK_ENUM(eOtherPhone);
-	CHECK_ENUM(eAssistant);
-	CHECK_ENUM(eBusinessFax);
-	CHECK_ENUM(eCarPhone);
-	CHECK_ENUM(eEmail2);
-	CHECK_ENUM(eHomeFax);
-	CHECK_ENUM(eTelex);
-	CHECK_ENUM(eTTYTTDPhone);
-
-	// Mappings for custom fields
-	CHECK_ENUM(eCustomField);
-	CHECK_ENUM(eCustomBirthdate);
-	CHECK_ENUM(eCustomURL);
-	CHECK_ENUM(eCustomIM);
-}
-
-inline int faxTypeOnPC()
-{
-	return KABC::PhoneNumber::Fax |
-		( (AbbrowserSettings::pilotFax()==0) ?
-			KABC::PhoneNumber::Home :
-			KABC::PhoneNumber::Work );
-}
-
-
-using namespace KABC;
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-AbbrowserConduit::AbbrowserConduit(KPilotLink * o, const char *n, const TQStringList & a):
-		ConduitAction(o, n, a),
-		aBook(0L),
-		fAddressAppInfo(0L),
-		addresseeMap(),
-		syncedIds(),
-		abiter(),
-		fTicket(0L),
-		fCreatedBook(false),
-		fBookResource(0L)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Addressbook");
-}
-
-
-
-AbbrowserConduit::~AbbrowserConduit()
-{
-	FUNCTIONSETUP;
-
-	if (fTicket)
-	{
-		DEBUGKPILOT << fname << ": Releasing ticket" << endl;
-		aBook->releaseSaveTicket(fTicket);
-		fTicket=0L;
-	}
-
-	_cleanupAddressBookPointer();
-	// unused function warnings.
-	compile_time_check();
-}
-
-
-
-/*********************************************************************
-                L O A D I N G   T H E   D A T A
- *********************************************************************/
-
-
-
-/* Builds the map which links record ids to uid's of Addressee
-*/
-void AbbrowserConduit::_mapContactsToPilot(TQMap < recordid_t, TQString > &idContactMap)
-{
-	FUNCTIONSETUP;
-
-	idContactMap.clear();
-
-	for(AddressBook::Iterator contactIter = aBook->begin();
-		contactIter != aBook->end(); ++contactIter)
-	{
-		Addressee aContact = *contactIter;
-		TQString recid = aContact.custom(KABCSync::appString, KABCSync::idString);
-		if(!recid.isEmpty())
-		{
-			recordid_t id = recid.toULong();
-			// safety check:  make sure that we don't already have a map for this pilot id.
-			// if we do (this can come from a copy/paste in kaddressbook, etc.), then we need
-			// to reset our Addressee so that we can assign him a new pilot Id later and sync
-			// him properly.  if we don't do this, we'll lose one of these on the pilot.
-			if (!idContactMap.contains(id))
-			{
-				idContactMap.insert(id, aContact.uid());
-			}
-			else
-			{
-		DEBUGKPILOT << fname << ": found duplicate pilot key: ["
-						<< id << "], removing pilot id from addressee: ["
-						<< aContact.realName() << "]" << endl;
-				aContact.removeCustom(KABCSync::appString, KABCSync::idString);
-				aBook->insertAddressee(aContact);
-				abChanged = true;
-			}
-		}
-	}
-	DEBUGKPILOT << fname << ": Loaded " << idContactMap.size() <<
-	    " addresses from the addressbook. " << endl;
-}
-
-
-
-bool AbbrowserConduit::_prepare()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	syncedIds.clear();
-	pilotindex = 0;
-
-	return true;
-}
-
-
-
-void AbbrowserConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	AbbrowserSettings::self()->readConfig();
-
-	// Conflict page
-	SyncAction::ConflictResolution res = (SyncAction::ConflictResolution)AbbrowserSettings::conflictResolution();
-	setConflictResolution(res);
-
-	DEBUGKPILOT << fname
-		<< ": Reading addressbook "
-		<< ( AbbrowserSettings::addressbookType() == AbbrowserSettings::eAbookFile ?
-			AbbrowserSettings::fileName() : CSL1("Standard") )
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": "
-		<< " fConflictResolution=" << getConflictResolution()
-		<< " fArchive=" << AbbrowserSettings::archiveDeleted()
-		<< " fFirstTime=" << isFirstSync()
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": "
-		<< " fPilotStreetHome=" << AbbrowserSettings::pilotStreet()
-		<< " fPilotFaxHome=" << AbbrowserSettings::pilotFax()
-		<< " eCustom[0]=" << AbbrowserSettings::custom0()
-		<< " eCustom[1]=" << AbbrowserSettings::custom1()
-		<< " eCustom[2]=" << AbbrowserSettings::custom2()
-		<< " eCustom[3]=" << AbbrowserSettings::custom3()
-		<< endl;
-}
-
-
-
-bool isDeleted(const PilotAddress *addr)
-{
-	if (!addr)
-	{
-		return true;
-	}
-	if (addr->isDeleted() && !addr->isArchived())
-	{
-		return true;
-	}
-	if (addr->isArchived())
-	{
-		return !AbbrowserSettings::archiveDeleted();
-	}
-	return false;
-}
-
-bool isArchived(const PilotAddress *addr)
-{
-	if (addr && addr->isArchived())
-	{
-		return AbbrowserSettings::archiveDeleted();
-	}
-	else
-	{
-		return false;
-	}
-}
-
-
-
-bool AbbrowserConduit::_loadAddressBook()
-{
-	FUNCTIONSETUP;
-
-	startTickle();
-	switch ( AbbrowserSettings::addressbookType() )
-	{
-		case AbbrowserSettings::eAbookResource:
-			DEBUGKPILOT<<"Loading standard addressbook"<addResource( fBookResource );
-			if ( !r )
-			{
-				DEBUGKPILOT << "Unable to open resource for file " << fABookFile << endl;
-				KPILOT_DELETE( aBook );
-				stopTickle();
-				return false;
-			}
-			fCreatedBook=true;
-			break;
-		}
-		default: break;
-	}
-	// find out if this can fail for reasons other than a non-existent
-	// vcf file. If so, how can I determine if the missing file was the problem
-	// or something more serious:
-	if ( !aBook || !aBook->load() )
-	{
-		// Something went wrong, so tell the user and return false to exit the conduit
-		emit logError(i18n("Unable to initialize and load the addressbook for the sync.") );
-		addSyncLogEntry(i18n("Unable to initialize and load the addressbook for the sync.") );
-		WARNINGKPILOT << "Unable to initialize the addressbook for the sync." << endl;
-		_cleanupAddressBookPointer();
-		stopTickle();
-		return false;
-	}
-	abChanged = false;
-
-	fTicket=aBook->requestSaveTicket();
-	if (!fTicket)
-	{
-		WARNINGKPILOT << "Unable to lock addressbook for writing " << endl;
-		emit logError(i18n("Unable to lock addressbook for writing.  Can't sync!"));
-		addSyncLogEntry(i18n("Unable to lock addressbook for writing.  Can't sync!"));
-		_cleanupAddressBookPointer();
-		stopTickle();
-		return false;
-	}
-
-	fCtrPC->setStartCount(aBook->allAddressees().count());
-
-	// get the addresseMap which maps Pilot unique record(address) id's to
-	// a Abbrowser Addressee; allows for easy lookup and comparisons
-	if(aBook->begin() == aBook->end())
-	{
-		setFirstSync( true );
-	}
-	else
-	{
-		_mapContactsToPilot(addresseeMap);
-	}
-	stopTickle();
-	return(aBook != 0L);
-}
-
-bool AbbrowserConduit::_saveAddressBook()
-{
-	FUNCTIONSETUP;
-
-	bool saveSuccessful = false;
-
-	fCtrPC->setEndCount(aBook->allAddressees().count());
-
-	Q_ASSERT(fTicket);
-
-	if (abChanged)
-	{
-		saveSuccessful = aBook->save(fTicket);
-	}
-	else
-	{
-		DEBUGKPILOT << fname
-			<< "Addressbook not changed, no need to save it" << endl;
-	}
-	// XXX: KDE4: release ticket in all cases (save no longer releases it)
-	if ( !saveSuccessful ) // didn't save, delete ticket manually
-	{
-		aBook->releaseSaveTicket(fTicket);
-	}
-	fTicket=0L;
-
-	if ( AbbrowserSettings::addressbookType()!= AbbrowserSettings::eAbookResource )
-	{
-		KURL kurl(AbbrowserSettings::fileName());
-		if(!kurl.isLocalFile())
-		{
-			DEBUGKPILOT << fname << "Deleting local addressbook tempfile" << endl;
-			if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
-				emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
-					"the temporary local file \"%2\" manually")
-					.arg(AbbrowserSettings::fileName()).arg(fABookFile));
-			}
-			else {
-				KIO::NetAccess::removeTempFile(fABookFile);
-			}
-			TQFile backup(fABookFile + CSL1("~"));
-			backup.remove();
-		}
-
-	}
-
-	// now try to remove the resource from the addressbook...
-	if (fBookResource) 
-	{
-		bool r = aBook->removeResource( fBookResource );
-		if ( !r )
-		{
-			DEBUGKPILOT << fname <<": Unable to close resource." << endl;
-		}
-	}
-
-	return saveSuccessful;
-}
-
-
-
-void AbbrowserConduit::_getAppInfo()
-{
-	FUNCTIONSETUP;
-
-	delete fAddressAppInfo;
-	fAddressAppInfo = new PilotAddressInfo(fDatabase);
-	fAddressAppInfo->dump();
-}
-
-void AbbrowserConduit::_setAppInfo()
-{
-	FUNCTIONSETUP;
-	if (fDatabase) fAddressAppInfo->writeTo(fDatabase);
-	if (fLocalDatabase) fAddressAppInfo->writeTo(fLocalDatabase);
-}
-
-
-void AbbrowserConduit::_cleanupAddressBookPointer()
-{
-        if (fCreatedBook)
-        {
-                KPILOT_DELETE(aBook);
-                fCreatedBook=false;
-        }
-        else
-        {
-                aBook=0L;
-	}												         
-}
-
-
-
-
-/*********************************************************************
-                     D E B U G   O U T P U T
- *********************************************************************/
-
-
-
-
-
-void AbbrowserConduit::showPilotAddress(const PilotAddress *pilotAddress)
-{
-	FUNCTIONSETUPL(3);
-	if (debug_level < 3)
-	{
-		return;
-	}
-	if (!pilotAddress)
-	{
-		DEBUGKPILOT<< fname << "| EMPTY"<getTextRepresentation(
-				fAddressAppInfo,Qt::PlainText) << endl;
-}
-
-
-void AbbrowserConduit::showAddresses(
-	const Addressee &pcAddr,
-	const PilotAddress *backupAddr,
-	const PilotAddress *palmAddr)
-{
-	FUNCTIONSETUPL(3);
-	if (debug_level >= 3)
-	{
-		DEBUGKPILOT << fname << "abEntry:" << endl;
-		KABCSync::showAddressee(pcAddr);
-		DEBUGKPILOT << fname << "pilotAddress:" << endl;
-		showPilotAddress(palmAddr);
-		DEBUGKPILOT << fname << "backupAddress:" << endl;
-		showPilotAddress(backupAddr);
-		DEBUGKPILOT << fname << "------------------------------------------------" << endl;
-	}
-}
-
-
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-
-
-
-/* virtual */ bool AbbrowserConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	_prepare();
-
-	bool retrieved = false;
-	if(!openDatabases(CSL1("AddressDB"), &retrieved))
-	{
-		emit logError(i18n("Unable to open the addressbook databases on the handheld."));
-		return false;
-	}
-	setFirstSync( retrieved );
-
-	_getAppInfo();
-
-	// Local block
-	{
-		TQString dbpath = fLocalDatabase->dbPathName();
-		DEBUGKPILOT << fname << ": Local database path " << dbpath << endl;
-	}
-
-	if ( syncMode().isTest() )
-	{
-		TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord()));
-		return true;
-	}
-
-	if(!_loadAddressBook())
-	{
-		emit logError(i18n("Unable to open the addressbook."));
-		return false;
-	}
-	setFirstSync( isFirstSync() || (aBook->begin() == aBook->end()) );
-
-	DEBUGKPILOT << fname << ": First sync now " << isFirstSync()
-		<< " and addressbook is "
-		<< ((aBook->begin() == aBook->end()) ? "" : "non-")
-		<< "empty." << endl;
-
-	// perform syncing from palm to abbrowser
-	// iterate through all records in palm pilot
-
-	DEBUGKPILOT << fname << ": fullsync=" << isFullSync() << ", firstSync=" <<    isFirstSync() << endl;
-	DEBUGKPILOT << fname << ": "
-		<< "syncDirection=" << syncMode().name() << ", "
-		<< "archive = " << AbbrowserSettings::archiveDeleted() << endl;
-	DEBUGKPILOT << fname << ": conflictRes="<< getConflictResolution() << endl;
-	DEBUGKPILOT << fname << ": PilotStreetHome=" << AbbrowserSettings::pilotStreet() << ", PilotFaxHOme" << AbbrowserSettings::pilotFax() << endl;
-
-	if (!isFirstSync())
-	{
-		allIds=fDatabase->idList();
-	}
-
-	TQValueVector v(4);
-	v[0] = AbbrowserSettings::custom0();
-	v[1] = AbbrowserSettings::custom1();
-	v[2] = AbbrowserSettings::custom2();
-	v[3] = AbbrowserSettings::custom3();
-
-	fSyncSettings.setCustomMapping(v);
-	fSyncSettings.setFieldForOtherPhone(AbbrowserSettings::pilotOther());
-	fSyncSettings.setDateFormat(AbbrowserSettings::customDateFormat());
-	fSyncSettings.setPreferHome(AbbrowserSettings::pilotStreet()==0);
-	fSyncSettings.setFaxTypeOnPC(faxTypeOnPC());
-
-	/* Note:
-	   if eCopyPCToHH or eCopyHHToPC, first sync everything, then lookup
-	   those entries on the receiving side that are not yet syncced and delete
-	   them. Use slotDeleteUnsyncedPCRecords and slotDeleteUnsyncedHHRecords
-	   for this, and no longer purge the whole addressbook before the sync to
-	   prevent data loss in case of connection loss. */
-
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-
-	return true;
-}
-
-
-
-void AbbrowserConduit::slotPalmRecToPC()
-{
-	FUNCTIONSETUP;
-	PilotRecord *palmRec = 0L, *backupRec = 0L;
-
-	if ( syncMode() == SyncMode::eCopyPCToHH )
-	{
-		DEBUGKPILOT << fname << ": Done; change to PCtoHH phase." << endl;
-		abiter = aBook->begin();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	if(isFullSync())
-	{
-		palmRec = fDatabase->readRecordByIndex(pilotindex++);
-	}
-	else
-	{
-		palmRec = fDatabase->readNextModifiedRec();
-	}
-
-	// no record means we're done going in this direction, so switch to
-	// PC->Palm
-	if(!palmRec)
-	{
-		abiter = aBook->begin();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	// already synced, so skip:
-	if(syncedIds.contains(palmRec->id()))
-	{
-		KPILOT_DELETE(palmRec);
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-		return;
-	}
-
-	backupRec = fLocalDatabase->readRecordById(palmRec->id());
-	PilotRecord*compareRec=(backupRec)?(backupRec):(palmRec);
-	Addressee e = _findMatch(PilotAddress(compareRec));
-
-	PilotAddress*backupAddr=0L;
-	if (backupRec)
-	{
-		backupAddr=new PilotAddress(backupRec);
-	}
-
-	PilotAddress*palmAddr=0L;
-	if (palmRec)
-	{
-		palmAddr=new PilotAddress(palmRec);
-	}
-
-	syncAddressee(e, backupAddr, palmAddr);
-
-	syncedIds.append(palmRec->id());
-	KPILOT_DELETE(palmAddr);
-	KPILOT_DELETE(backupAddr);
-	KPILOT_DELETE(palmRec);
-	KPILOT_DELETE(backupRec);
-
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-}
-
-
-
-void AbbrowserConduit::slotPCRecToPalm()
-{
-	FUNCTIONSETUP;
-
-	if ( (syncMode()==SyncMode::eCopyHHToPC) ||
-		abiter == aBook->end() || (*abiter).isEmpty() )
-	{
-		DEBUGKPILOT << fname << ": Done; change to delete records." << endl;
-		pilotindex = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord()));
-		return;
-	}
-
-	PilotRecord *palmRec=0L, *backupRec=0L;
-	Addressee ad = *abiter;
-
-	abiter++;
-
-	// If marked as archived, don't sync!
-	if (KABCSync::isArchived(ad))
-	{
-		DEBUGKPILOT << fname << ": address with id " << ad.uid() <<
-			" marked archived, so don't sync." << endl;
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-
-	TQString recID(ad.custom(KABCSync::appString, KABCSync::idString));
-	bool ok;
-	recordid_t rid = recID.toLong(&ok);
-	if (recID.isEmpty() || !ok || !rid)
-	{
-		DEBUGKPILOT << fname << ": This is a new record." << endl;
-		// it's a new item(no record ID and not inserted by the Palm -> PC sync), so add it
-		syncAddressee(ad, 0L, 0L);
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	// look into the list of already synced record ids to see if the addressee hasn't already been synced
-	if (syncedIds.contains(rid))
-	{
-		DEBUGKPILOT << ": address with id " << rid << " already synced." << endl;
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-
-	backupRec = fLocalDatabase->readRecordById(rid);
-	// only update if no backup record or the backup record is not equal to the addressee
-
-	PilotAddress*backupAddr=0L;
-	if (backupRec)
-	{
-		backupAddr=new PilotAddress(backupRec);
-	}
-	if(!backupRec || isFirstSync() || !_equal(backupAddr, ad)  )
-	{
-		DEBUGKPILOT << fname << ": Updating entry." << endl;
-		palmRec = fDatabase->readRecordById(rid);
-		PilotAddress *palmAddr = 0L;
-		if (palmRec)
-		{
-			palmAddr = new PilotAddress(palmRec);
-		}
-		else
-		{
-		DEBUGKPILOT << fname << ": No HH record with id " << rid << endl;
-		}
-		syncAddressee(ad, backupAddr, palmAddr);
-		// update the id just in case it changed
-		if (palmRec) rid=palmRec->id();
-		KPILOT_DELETE(palmRec);
-		KPILOT_DELETE(palmAddr);
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": Entry not updated." << endl;
-	}
-	KPILOT_DELETE(backupAddr);
-	KPILOT_DELETE(backupRec);
-	
-	DEBUGKPILOT << fname << ": adding id:["<< rid << "] to syncedIds." << endl;
-
-	syncedIds.append(rid);
-	// done with the sync process, go on with the next one:
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-}
-
-
-
-void AbbrowserConduit::slotDeletedRecord()
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *backupRec = fLocalDatabase->readRecordByIndex(pilotindex++);
-	if(!backupRec || isFirstSync() )
-	{
-		KPILOT_DELETE(backupRec);
-		TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedPCRecords()));
-		return;
-	}
-
-	recordid_t id = backupRec->id();
-
-	TQString uid = addresseeMap[id];
-	Addressee e = aBook->findByUid(uid);
-
-		DEBUGKPILOT << fname << ": now looking at palm id: ["
-					<< id << "], kabc uid: [" << uid << "]." << endl;
-
-	PilotAddress*backupAddr=0L;
-	if (backupRec)
-	{
-		backupAddr=new PilotAddress(backupRec);
-	}
-	PilotRecord*palmRec=fDatabase->readRecordById(id);
-
-	if ( e.isEmpty() )
-	{
-		DEBUGKPILOT << fname << ": no Addressee found for this id." << endl;
-		DEBUGKPILOT << fname << "\n"
-			<< backupAddr->getTextRepresentation( 
-				fAddressAppInfo,Qt::PlainText) << endl;
-
-		if (palmRec) {
-		DEBUGKPILOT << fname << ": deleting from database on palm." << endl;
-			fDatabase->deleteRecord(id);
-			fCtrHH->deleted();
-		}
-		DEBUGKPILOT << fname << ": deleting from backup database." << endl;
-		fLocalDatabase->deleteRecord(id);
-
-		// because we just deleted a record, we need to go back one
-		pilotindex--;
-	}
-
-	KPILOT_DELETE(palmRec);
-	KPILOT_DELETE(backupAddr);
-	KPILOT_DELETE(backupRec);
-	TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord()));
-}
-
-
-
-void AbbrowserConduit::slotDeleteUnsyncedPCRecords()
-{
-	FUNCTIONSETUP;
-	if ( syncMode()==SyncMode::eCopyHHToPC )
-	{
-		TQStringList uids;
-		RecordIDList::iterator it;
-		TQString uid;
-		for ( it = syncedIds.begin(); it != syncedIds.end(); ++it)
-		{
-			uid=addresseeMap[*it];
-			if (!uid.isEmpty()) uids.append(uid);
-		}
-		// TODO: Does this speed up anything?
-		// qHeapSort( uids );
-		AddressBook::Iterator abit;
-		for (abit = aBook->begin(); abit != aBook->end(); ++abit)
-		{
-			if (!uids.contains((*abit).uid()))
-			{
-				DEBUGKPILOT<<"Deleting addressee "<<(*abit).realName()<<" from PC (is not on HH, and syncing with HH->PC direction)"<removeAddressee(*abit);
-				fCtrPC->deleted();
-			}
-		}
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedHHRecords()));
-}
-
-
-
-void AbbrowserConduit::slotDeleteUnsyncedHHRecords()
-{
-	FUNCTIONSETUP;
-	if ( syncMode()==SyncMode::eCopyPCToHH )
-	{
-		RecordIDList ids=fDatabase->idList();
-		RecordIDList::iterator it;
-		for ( it = ids.begin(); it != ids.end(); ++it )
-		{
-			if (!syncedIds.contains(*it))
-			{
-				DEBUGKPILOT<<"Deleting record with ID "<<*it<<" from handheld (is not on PC, and syncing with PC->HH direction)"<deleteRecord(*it);
-				fCtrHH->deleted();
-				fLocalDatabase->deleteRecord(*it);
-			}
-		}
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(slotCleanup()));
-}
-
-
-void AbbrowserConduit::slotCleanup()
-{
-	FUNCTIONSETUP;
-
-	// Set the appInfoBlock, just in case the category labels changed
-	_setAppInfo();
-	if(fDatabase)
-	{
-		fDatabase->resetSyncFlags();
-		fDatabase->cleanup();
-	}
-	if(fLocalDatabase)
-	{
-		fLocalDatabase->resetSyncFlags();
-		fLocalDatabase->cleanup();
-	}
-
-	// Write out the sync maps
-	TQString syncFile = fLocalDatabase->dbPathName() + CSL1(".sync");
-	DEBUGKPILOT << fname << ": Writing sync map to " << syncFile << endl;
-	KSaveFile map( syncFile );
-	if ( map.status() == 0 )
-	{
-		DEBUGKPILOT << fname << ": Writing sync map ..." << endl;
-		(*map.dataStream()) << addresseeMap ;
-		map.close();
-	}
-	// This also picks up errors from map.close()
-	if ( map.status() != 0 )
-	{
-		WARNINGKPILOT << "Could not make backup of sync map." << endl;
-	}
-
-	_saveAddressBook();
-	delayDone();
-}
-
-
-
-/*********************************************************************
-              G E N E R A L   S Y N C   F U N C T I O N
-         These functions modify the Handheld and the addressbook
- *********************************************************************/
-
-
-
-bool AbbrowserConduit::syncAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-	showAddresses(pcAddr, backupAddr, palmAddr);
-
-	if ( syncMode() == SyncMode::eCopyPCToHH )
-	{
-		if (pcAddr.isEmpty())
-		{
-			return _deleteAddressee(pcAddr, backupAddr, palmAddr);
-		}
-		else
-		{
-			return _copyToHH(pcAddr, backupAddr, palmAddr);
-		}
-	}
-
-	if ( syncMode() == SyncMode::eCopyHHToPC )
-	{
-		if (!palmAddr)
-		{
-			return _deleteAddressee(pcAddr, backupAddr, palmAddr);
-		}
-		else
-		{
-			return _copyToPC(pcAddr, backupAddr, palmAddr);
-		}
-	}
-
-	if ( !backupAddr || isFirstSync() )
-	{
-			DEBUGKPILOT<< fname << ": Special case: no backup." << endl;
-		/*
-		Resolution matrix (0..does not exist, E..exists, D..deleted flag set, A..archived):
-		  HH    PC  | Resolution
-		  ------------------------------------------------------------
-		   0     A  |  -
-		   0     E  |  PC -> HH, reset ID if not set correctly
-		   D     0  |  delete (error, should never occur!!!)
-		   D     E  |  CR (ERROR)
-		   E/A   0  |  HH -> PC
-		   E/A   E/A|  merge/CR
-		 */
-		if  (!palmAddr && KABCSync::isArchived(pcAddr) )
-		{
-			return true;
-		}
-		else if (!palmAddr && !pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1a"<HH
-			bool res=_copyToHH(pcAddr, 0L, 0L);
-			return res;
-		}
-		else if (!palmAddr && pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1b"< ERROR
-			return false;
-		}
-		else if ( (isDeleted(palmAddr) || isArchived(palmAddr)) && pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1c"<PC
-			return _copyToPC(pcAddr, 0L, palmAddr);
-		}
-		else
-		{
-			DEBUGKPILOT << fname << ": case: 1f"< { if (PC==B) -> delete, else -> CR }
-		     if HH.archied -> {if (PC==B) -> copyToPC, else -> CR }
-		     if PC.empty -> { if (HH==B) -> delete, else -> CR }
-		     if PC.archived -> {if (HH==B) -> delete on HH, else CR }
-		  2) if PC==HH -> { update B, update ID of PC if needed }
-		  3) if PC==B -> { HH!=PC, thus HH modified, so copy HH->PC }
-		     if HH==B -> { PC!=HH, thus PC modified, so copy PC->HH }
-		  4) else: all three addressees are different -> CR
-		*/
-
-		if (!palmAddr || isDeleted(palmAddr) )
-		{
-			DEBUGKPILOT << fname << ": case: 2a"<attributes()<<", isDeleted="<<
-				isDeleted(palmAddr)<<", isArchived="<created();
-	}
-	else
-	{
-		fCtrHH->updated();
-	}
-	KABCSync::copy(*paddr, pcAddr, *fAddressAppInfo, fSyncSettings);
-
-	DEBUGKPILOT << fname << "palmAddr->id=" << paddr->id()
-		<< ", pcAddr.ID=" << pcAddr.custom(KABCSync::appString, KABCSync::idString) << endl;
-
-	if(_savePalmAddr(paddr, pcAddr))
-	{
-		_savePCAddr(pcAddr, backupAddr, paddr);
-	}
-	if (paddrcreated) KPILOT_DELETE(paddr);
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_copyToPC(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-	if (!palmAddr)
-	{
-		return false;
-	}
-	// keep track of CUD's...
-	if (pcAddr.isEmpty())
-	{
-		fCtrPC->created();
-	}
-	else
-	{
-		fCtrPC->updated();
-	}
-	showPilotAddress(palmAddr);
-
-	KABCSync::copy(pcAddr, *palmAddr, *fAddressAppInfo, fSyncSettings);
-	if (isArchived(palmAddr))
-	{
-		KABCSync::makeArchived(pcAddr);
-	}
-
-	_savePCAddr(pcAddr, backupAddr, palmAddr);
-	_writeBackup(palmAddr);
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_writeBackup(PilotAddress *backup)
-{
-	FUNCTIONSETUP;
-	if (!backup) return false;
-
-	showPilotAddress(backup);
-
-	PilotRecord *pilotRec = backup->pack();
-	fLocalDatabase->writeRecord(pilotRec);
-	KPILOT_DELETE(pilotRec);
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_deleteAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-
-	if (palmAddr)
-	{
-		if (!syncedIds.contains(palmAddr->id())) {
-		DEBUGKPILOT << fname << ": adding id:["<< palmAddr->id() << "] to syncedIds." << endl;
-			syncedIds.append(palmAddr->id());
-		}
-		fDatabase->deleteRecord(palmAddr->id());
-		fCtrHH->deleted();
-		fLocalDatabase->deleteRecord(palmAddr->id());
-	}
-	else if (backupAddr)
-	{
-		if (!syncedIds.contains(backupAddr->id())) {
-		DEBUGKPILOT << fname << ": adding id:["<< backupAddr->id() << "] to syncedIds." << endl;
-			syncedIds.append(backupAddr->id());
-		}
-		fLocalDatabase->deleteRecord(backupAddr->id());
-	}
-	if (!pcAddr.isEmpty())
-	{
-		DEBUGKPILOT << fname << " removing " << pcAddr.formattedName() << endl;
-		abChanged = true;
-		aBook->removeAddressee(pcAddr);
-		fCtrPC->deleted();
-	}
-	return true;
-}
-
-
-
-/*********************************************************************
-                 l o w - l e v e l   f u n c t i o n s   f o r
-                   adding / removing palm/pc records
- *********************************************************************/
-
-
-
-bool AbbrowserConduit::_savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Saving to pilot " << palmAddr->id()
-		<< " " << palmAddr->getField(entryFirstname)
-		<< " " << palmAddr->getField(entryLastname)<< endl;
-
-	PilotRecord *pilotRec = palmAddr->pack();
-	DEBUGKPILOT << fname << ": record with id=" << pilotRec->id()
-		<< " len=" << pilotRec->size() << endl;
-	recordid_t pilotId = fDatabase->writeRecord(pilotRec);
-	DEBUGKPILOT << fname << ": Wrote "<getField(entryLastname)))
-		{
-		DEBUGKPILOT << fname  << ": last name not equal" << endl;
-			return false;
-		}
-		if(!_equal(abEntry.givenName(), piAddress->getField(entryFirstname)))
-		{
-		DEBUGKPILOT << fname  << ": first name not equal" << endl;
-			return false;
-		}
-		if(!_equal(abEntry.prefix(), piAddress->getField(entryTitle)))
-		{
-		DEBUGKPILOT << fname  << ": title/prefix not equal" << endl;
-			return false;
-		}
-		if(!_equal(abEntry.organization(), piAddress->getField(entryCompany)))
-		{
-		DEBUGKPILOT << fname  << ": company/organization not equal" << endl;
-			return false;
-		}
-	}
-	if (flags & eqFlagsNote)
-		if(!_equal(abEntry.note(), piAddress->getField(entryNote)))
-	{
-		DEBUGKPILOT << fname  << ": note not equal" << endl;
-			return false;
-	}
-
-	if (flags & eqFlagsCategory)
-	{
-		// Check that the name of the category of the HH record
-		// is one matching the PC record.
-		TQString addressCategoryLabel = fAddressAppInfo->categoryName(piAddress->category());
-		TQString cat = KABCSync::bestMatchedCategoryName(abEntry.categories(),
-			*fAddressAppInfo, piAddress->category());
-		if(!_equal(cat, addressCategoryLabel))
-		{
-			DEBUGKPILOT << fname  << ": category not equal" << endl;
-			return false;
-		}
-	}
-
-	if (flags & eqFlagsPhones)
-	{
-		// first, look for missing e-mail addresses on either side
-		TQStringList abEmails(abEntry.emails());
-		TQStringList piEmails(piAddress->getEmails());
-
-		if (abEmails.count() != piEmails.count())
-		{
-		DEBUGKPILOT << fname  << ": email count not equal" << endl;
-			return false;
-		}
-		for (TQStringList::Iterator it = abEmails.begin(); it != abEmails.end(); it++) {
-			if (!piEmails.contains(*it))
-			{
-		DEBUGKPILOT << fname  << ": pilot e-mail missing" << endl;
-			return false;
-			}
-		}
-		for (TQStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) {
-			if (!abEmails.contains(*it))
-			{
-		DEBUGKPILOT << fname  << ": kabc e-mail missing" << endl;
-			return false;
-			}
-		}
-
-		// now look for differences in phone numbers.  Note:  we can't just compare one
-		// of each kind of phone number, because there's no guarantee that if the user
-		// has more than one of a given type, we're comparing the correct two.
-
-		PhoneNumber::List abPhones(abEntry.phoneNumbers());
-		PhoneNumber::List piPhones = KABCSync::getPhoneNumbers(*piAddress);
-		// first make sure that all of the pilot phone numbers are in kabc
-		for (PhoneNumber::List::Iterator it = piPhones.begin(); it != piPhones.end(); it++) {
-			PhoneNumber piPhone = *it;
-			bool found=false;
-			for (PhoneNumber::List::Iterator it = abPhones.begin(); it != abPhones.end(); it++) {
-				PhoneNumber abPhone = *it;
-				// see if we have the same number here...
-				// * Note * We used to check for preferred number matching, but
-				//     this seems to have broke in kdepim 3.5 and I don't have time to
-				//     figure out why, so we won't check to see if preferred number match
-				if ( _equal(piPhone.number(), abPhone.number()) ) {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-		DEBUGKPILOT << fname  << ": not equal because kabc phone not found." << endl;
-				return false;
-			}
-		}
-		// now the other way.  *cringe*  kabc has the capacity to store way more addresses
-		// than the Pilot, so this might give false positives more than we'd want....
-		for (PhoneNumber::List::Iterator it = abPhones.begin(); it != abPhones.end(); it++) {
-			PhoneNumber abPhone = *it;
-			bool found=false;
-			for (PhoneNumber::List::Iterator it = piPhones.begin(); it != piPhones.end(); it++) {
-				PhoneNumber piPhone = *it;
-				if ( _equal(piPhone.number(), abPhone.number()) ) {
-					found = true;
-					break;
-				}
-			}
-			if (!found)
-			{
-				DEBUGKPILOT << fname  << ": not equal because pilot phone not found." << endl;
-				return false;
-			}
-		}
-
-		if(!_equal(KABCSync::getFieldForHHOtherPhone(abEntry,fSyncSettings),
-			piAddress->getPhoneField(PilotAddressInfo::eOther)))
-		{
-			DEBUGKPILOT << fname  << ": not equal because of other phone field." << endl;
-		   	return false;
-		}
-	}
-
-	if (flags & eqFlagsAdress)
-	{
-		KABC::Address address = KABCSync::getAddress(abEntry,fSyncSettings);
-		if(!_equal(address.street(), piAddress->getField(entryAddress)))
-		{
-			DEBUGKPILOT << fname  << ": address not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.locality(), piAddress->getField(entryCity)))
-		{
-			DEBUGKPILOT << fname  << ": city not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.region(), piAddress->getField(entryState)))
-		{
-		DEBUGKPILOT << fname  << ": state not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.postalCode(), piAddress->getField(entryZip)))
-		{
-		DEBUGKPILOT << fname  << ": zip not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.country(), piAddress->getField(entryCountry)))
-		{
-		DEBUGKPILOT << fname  << ": country not equal" << endl;
-			return false;
-		}
-	}
-
-	if (flags & eqFlagsCustom)
-	{
-		unsigned int customIndex = 0;
-		unsigned int hhField = entryCustom1;
-
-		for ( ; customIndex<4; ++customIndex,++hhField )
-		{
-			if (!_equal(KABCSync::getFieldForHHCustom(customIndex, abEntry, fSyncSettings),
-				piAddress->getField(hhField)))
-			{
-				DEBUGKPILOT << fname << ": Custom field " << customIndex
-					<< " (HH field " << hhField << ") differs." << endl;
-				return false;
-			}
-		}
-	}
-
-	// if any side is marked archived, but the other is not, the two
-	// are not equal.
-	if ( (flags & eqFlagsFlags) && (isArchived(piAddress) || KABCSync::isArchived(abEntry) ) )
-	{
-		DEBUGKPILOT << fname  << ": archived flags don't match" << endl;
-		return false;
-	}
-
-	return true;
-}
-
-
-
-
-
-
-
-
-
-
-/*********************************************************************
- C O N F L I C T   R E S O L U T I O N   a n d   M E R G I N G
- *********************************************************************/
-
-
-
-/** smartly merge the given field for the given entry. use the backup record to determine which record has been modified
-	@pc, @backup, @palm ... entries of the according databases
-	@returns string of the merged entries.
-*/
-TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString & backup,
-	const TQString & palm, ConflictResolution confRes)
-{
-	FUNCTIONSETUP;
-
-	// if both entries are already the same, no need to do anything
-	if(pc == palm) return pc;
-
-	// If this is a first sync, we don't have a backup record, so
-	if(isFirstSync() || backup.isEmpty()) {
-		if (pc.isEmpty() && palm.isEmpty() ) return TQString::null;
-		if(pc.isEmpty()) return palm;
-		if(palm.isEmpty()) return pc;
-	} else {
-		// only one side modified, so return that string, no conflict
-		if(palm == backup) return pc;
-		if(pc == backup) return palm;
-	}
-
-	DEBUGKPILOT<<"pc="<labels[1]=i18n("Handheld");
-	tab->labels[2]=i18n("Last sync");
-	if (!pcAddr.isEmpty())
-		tab->fExistItems=(eExistItems)(tab->fExistItems|eExistsPC);
-	if (backupAddr)
-		tab->fExistItems=(eExistItems)(tab->fExistItems|eExistsBackup);
-	if (palmAddr)
-		tab->fExistItems=(eExistItems)(tab->fExistItems|eExistsPalm);
-
-#define appendGen(desc, abfield, palmfield) \
-	tab->append(new ResolutionItem(desc, tab->fExistItems, \
-		(!pcAddr.isEmpty())?(abfield):(TQString::null), \
-		(palmAddr)?(palmAddr->palmfield):(TQString::null), \
-		(backupAddr)?(backupAddr->palmfield):(TQString::null) ))
-#define appendAddr(desc, abfield, palmfield) \
-	appendGen(desc, abfield, getField(palmfield))
-#define appendGenPhone(desc, abfield, palmfield) \
-	appendGen(desc, abfield, getPhoneField(PilotAddressInfo::palmfield))
-#define appendPhone(desc, abfield, palmfield) \
-	appendGenPhone(desc, pcAddr.phoneNumber(PhoneNumber::abfield).number(), palmfield)
-
-
-	appendAddr(i18n("Last name"), pcAddr.familyName(), entryLastname);
-	appendAddr(i18n("First name"), pcAddr.givenName(), entryFirstname);
-	appendAddr(i18n("Organization"), pcAddr.organization(), entryCompany);
-	appendAddr(i18n("Title"), pcAddr.prefix(), entryTitle);
-	appendAddr(i18n("Note"), pcAddr.note(), entryNote);
-
-	appendAddr(i18n("Custom 1"), KABCSync::getFieldForHHCustom(0, pcAddr, fSyncSettings), entryCustom1);
-	appendAddr(i18n("Custom 2"), KABCSync::getFieldForHHCustom(1, pcAddr, fSyncSettings), entryCustom2);
-	appendAddr(i18n("Custom 3"), KABCSync::getFieldForHHCustom(2, pcAddr, fSyncSettings), entryCustom3);
-	appendAddr(i18n("Custom 4"), KABCSync::getFieldForHHCustom(3, pcAddr, fSyncSettings), entryCustom4);
-
-	appendPhone(i18n("Work Phone"), Work, eWork);
-	appendPhone(i18n("Home Phone"), Home, eHome);
-	appendPhone(i18n("Mobile Phone"), Cell, eMobile);
-	appendGenPhone(i18n("Fax"), pcAddr.phoneNumber(faxTypeOnPC()).number(), eFax);
-	appendPhone(i18n("Pager"), Pager, ePager);
-	appendGenPhone(i18n("Other"), KABCSync::getFieldForHHOtherPhone(pcAddr,fSyncSettings), eOther);
-	appendGenPhone(i18n("Email"), pcAddr.preferredEmail(), eEmail);
-
-	KABC::Address abAddress = KABCSync::getAddress(pcAddr,fSyncSettings);
-	appendAddr(i18n("Address"), abAddress.street(), entryAddress);
-	appendAddr(i18n("City"), abAddress.locality(), entryCity);
-	appendAddr(i18n("Region"), abAddress.region(), entryState);
-	appendAddr(i18n("Postal code"), abAddress.postalCode(), entryZip);
-	appendAddr(i18n("Country"), abAddress.country(), entryCountry);
-
-	TQString palmAddrCategoryLabel;
-	if (palmAddr)
-	{
-		 palmAddrCategoryLabel = fAddressAppInfo->categoryName(palmAddr->category());
-	}
-	TQString backupAddrCategoryLabel;
-	if (backupAddr)
-	{
-		backupAddrCategoryLabel = fAddressAppInfo->categoryName(backupAddr->category());
-	}
-	int category = palmAddr ? palmAddr->category() : 0;
-	tab->append(new ResolutionItem(
-		i18n("Category"),
-		tab->fExistItems,
-		!pcAddr.isEmpty() ?
-			KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) :
-			TQString::null,
-		palmAddrCategoryLabel,
-		backupAddrCategoryLabel));
-#undef appendGen
-#undef appendAddr
-#undef appendGenPhone
-#undef appendPhone
-
-	return true;
-}
-
-
-/// This function just sets the phone number of type "type" to "phone"
-static inline void setPhoneNumber(Addressee &abEntry, int type, const TQString &nr)
-{
-	PhoneNumber phone = abEntry.phoneNumber(type);
-	phone.setNumber(nr);
-	abEntry.insertPhoneNumber(phone);
-}
-
-
-bool AbbrowserConduit::_applyResolutionTable(ResolutionTable*tab, Addressee &pcAddr,
-	PilotAddress *backupAddr, PilotAddress *palmAddr)
-{
-	FUNCTIONSETUP;
-	if (!tab) return false;
-	if (!palmAddr) {
-		WARNINGKPILOT << "Empty palmAddr after conflict resolution." << endl;
-		return false;
-	}
-
-	ResolutionItem*item=tab->first();
-#define SETGENFIELD(abfield, palmfield) \
-	if (item) {\
-		abfield; \
-		palmAddr->setField(palmfield, item->fResolved); \
-	}\
-	item=tab->next();
-#define SETFIELD(abfield, palmfield) \
-	SETGENFIELD(pcAddr.set##abfield(item->fResolved), palmfield)
-#define SETCUSTOMFIELD(abfield, palmfield) \
-	SETGENFIELD(KABCSync::setFieldFromHHCustom(abfield, pcAddr, item->fResolved, fSyncSettings), palmfield)
-#define SETGENPHONE(abfield, palmfield) \
-	if (item) { \
-		abfield; \
-		palmAddr->setPhoneField(PilotAddressInfo::palmfield, item->fResolved, PilotAddress::Replace); \
-	}\
-	item=tab->next();
-#define SETPHONEFIELD(abfield, palmfield) \
-	SETGENPHONE(setPhoneNumber(pcAddr, PhoneNumber::abfield, item->fResolved), palmfield)
-#define SETADDRESSFIELD(abfield, palmfield) \
-	SETGENFIELD(abAddress.abfield(item->fResolved), palmfield)
-
-	SETFIELD(FamilyName, entryLastname);
-	SETFIELD(GivenName, entryFirstname);
-	SETFIELD(Organization, entryCompany);
-	SETFIELD(Prefix, entryTitle);
-	SETFIELD(Note, entryNote);
-
-	SETCUSTOMFIELD(0, entryCustom1);
-	SETCUSTOMFIELD(1, entryCustom2);
-	SETCUSTOMFIELD(2, entryCustom3);
-	SETCUSTOMFIELD(3, entryCustom4);
-
-	SETPHONEFIELD(Work, eWork);
-	SETPHONEFIELD(Home, eHome);
-	SETPHONEFIELD(Cell, eMobile);
-	SETGENPHONE(setPhoneNumber(pcAddr, faxTypeOnPC(), item->fResolved), eFax);
-	SETPHONEFIELD(Pager, ePager);
-	SETGENPHONE(KABCSync::setFieldFromHHOtherPhone(pcAddr, item->fResolved, fSyncSettings), eOther);
-
-	// TODO: fix email
-	if (item)
-	{
-		palmAddr->setPhoneField(PilotAddressInfo::eEmail, item->fResolved, PilotAddress::Replace);
-		if (backupAddr)
-		{
-			pcAddr.removeEmail(backupAddr->getPhoneField(PilotAddressInfo::eEmail));
-		}
-		pcAddr.removeEmail(palmAddr->getPhoneField(PilotAddressInfo::eEmail));
-		pcAddr.insertEmail(item->fResolved, true);
-	}
-	item=tab->next();
-
-	KABC::Address abAddress = KABCSync::getAddress(pcAddr, fSyncSettings);
-	SETADDRESSFIELD(setStreet, entryAddress);
-	SETADDRESSFIELD(setLocality, entryCity);
-	SETADDRESSFIELD(setRegion, entryState);
-	SETADDRESSFIELD(setPostalCode, entryZip);
-	SETADDRESSFIELD(setCountry, entryCountry);
-	pcAddr.insertAddress(abAddress);
-
-	// TODO: Is this correct?
-	if (item)
-	{
-		palmAddr->setCategory( fAddressAppInfo->findCategory(item->fResolved) );
-		KABCSync::setCategory(pcAddr, item->fResolved);
-	}
-
-
-#undef SETGENFIELD
-#undef SETFIELD
-#undef SETCUSTOMFIELD
-#undef SETGENPHONE
-#undef SETPHONEFIELD
-#undef SETADDRESSFIELD
-
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_smartMergeTable(ResolutionTable*tab)
-{
-	FUNCTIONSETUP;
-	if (!tab) return false;
-	bool noconflict=true;
-	ResolutionItem*item;
-	for ( item = tab->first(); item; item = tab->next() )
-	{
-		// try to merge the three strings
-		item->fResolved=_smartMergeString(item->fEntries[0],
-			item->fEntries[2], item->fEntries[1], getConflictResolution());
-		// if a conflict occurred, set the default to something sensitive:
-		if (item->fResolved.isNull() && !(item->fEntries[0].isEmpty() &&
-			item->fEntries[1].isEmpty() && item->fEntries[2].isEmpty() ) )
-		{
-			item->fResolved=item->fEntries[0];
-			noconflict=false;
-		}
-		if (item->fResolved.isNull()) item->fResolved=item->fEntries[1];
-		if (item->fResolved.isNull()) item->fResolved=item->fEntries[2];
-	}
-	return  noconflict;
-}
-
-
-
-/** Merge the palm and the pc entries with the additional information of
- *  the backup.
- *  return value: no meaning yet
- */
-bool AbbrowserConduit::_smartMergeAddressee(Addressee &pcAddr,
-	PilotAddress *backupAddr, PilotAddress *palmAddr)
-{
-	FUNCTIONSETUP;
-
-	// Merge them, then look which records have to be written to device or abook
-	int res = SyncAction::eAskUser;
- 	bool result=true;
-	ResolutionTable tab;
-
-	result &= _buildResolutionTable(&tab, pcAddr, backupAddr, palmAddr);
-	// Now attempt a smart merge. If that fails, let conflict resolution do the job
-	bool mergeOk=_smartMergeTable(&tab);
-
-	if (!mergeOk)
-	{
-		TQString dlgText;
-		if (!palmAddr)
-		{
-			dlgText=i18n("The following address entry was changed, but does no longer exist on the handheld. Please resolve this conflict:");
-		}
-		else if (pcAddr.isEmpty())
-		{
-			dlgText=i18n("The following address entry was changed, but does no longer exist on the PC. Please resolve this conflict:");
-		}
-		else
-		{
-			dlgText=i18n("The following address entry was changed on the handheld as well as on the PC side. The changes could not be merged automatically, so please resolve the conflict yourself:");
-		}
-		ResolutionDlg*resdlg=new ResolutionDlg(0L, fHandle, i18n("Address conflict"), dlgText, &tab);
-		resdlg->exec();
-		KPILOT_DELETE(resdlg);
-	}
-	res=tab.fResolution;
-
-	// Disallow some resolution under certain conditions, fix wrong values:
-	switch (res) {
-		case SyncAction::eHHOverrides:
-			if (!palmAddr) res=SyncAction::eDelete;
-			break;
-		case SyncAction::ePCOverrides:
-			if (pcAddr.isEmpty()) res=SyncAction::eDelete;
-			break;
-		case SyncAction::ePreviousSyncOverrides:
-			if (!backupAddr) res=SyncAction::eDoNothing;
-			break;
-	}
-
-	PilotAddress*pAddr=palmAddr;
-	bool pAddrCreated=false;
-	// Now that we have done a possible conflict resolution, apply the changes
-	switch (res) {
-		case SyncAction::eDuplicate:
-			// Set the Palm ID to 0 so we don't overwrite the existing record.
-			pcAddr.removeCustom(KABCSync::appString, KABCSync::idString);
-			result &= _copyToHH(pcAddr, 0L, 0L);
-			{
-			Addressee pcadr;
-			result &= _copyToPC(pcadr, backupAddr, palmAddr);
-			}
-			break;
-		case SyncAction::eDoNothing:
-			break;
-		case SyncAction::eHHOverrides:
-				result &= _copyToPC(pcAddr, backupAddr, palmAddr);
-				break;
-		case SyncAction::ePCOverrides:
-			result &= _copyToHH(pcAddr, backupAddr, pAddr);
-			break;
-		case SyncAction::ePreviousSyncOverrides:
-			KABCSync::copy(pcAddr, *backupAddr, *fAddressAppInfo, fSyncSettings);
-			if (palmAddr && backupAddr) *palmAddr=*backupAddr;
-			result &= _savePalmAddr(backupAddr, pcAddr);
-			result &= _savePCAddr(pcAddr, backupAddr, backupAddr);
-			break;
-		case SyncAction::eDelete:
-			result &= _deleteAddressee(pcAddr, backupAddr, palmAddr);
-			break;
-		case SyncAction::eAskUser:
-		default:
-			if (!pAddr)
-			{
-				pAddr=new PilotAddress();
-				pAddrCreated=true;
-			}
-			result &= _applyResolutionTable(&tab, pcAddr, backupAddr, pAddr);
-showAddresses(pcAddr, backupAddr, pAddr);
-			// savePalmAddr sets the RecordID custom field already
-			result &= _savePalmAddr(pAddr, pcAddr);
-			result &= _savePCAddr(pcAddr, backupAddr, pAddr);
-			if (pAddrCreated) KPILOT_DELETE(pAddr);
-			break;
-	}
-
-	return result;
-}
-
-
-
-// TODO: right now entries are equal if both first/last name and organization are
-//  equal. This rules out two entries for the same person(e.g. real home and weekend home)
-//  or two persons with the same name where you don't know the organization.!!!
-Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const
-{
-	FUNCTIONSETUP;
-	// TODO: also search with the pilotID
-	// first, use the pilotID to UID map to find the appropriate record
-	if( !isFirstSync() && (pilotAddress.id() > 0) )
-	{
-		TQString id(addresseeMap[pilotAddress.id()]);
-		DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl;
-		if(!id.isEmpty())
-		{
-			Addressee res(aBook->findByUid(id));
-			if(!res.isEmpty()) return res;
-			DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl;
-		}
-	}
-
-	for(AddressBook::Iterator iter = aBook->begin(); iter != aBook->end(); ++iter)
-	{
-		Addressee abEntry = *iter;
-		TQString recID(abEntry.custom(KABCSync::appString, KABCSync::idString));
-		bool ok;
-		if (!recID.isEmpty() )
-		{
-			recordid_t rid = recID.toLong(&ok);
-			if (ok && rid)
-			{
-				if (rid==pilotAddress.id()) return abEntry;// yes, we found it
-				// skip this addressee, as it can an other corresponding address on the handheld
-				if (allIds.contains(rid)) continue;
-			}
-		}
-
-		if (_equal(&pilotAddress, abEntry, eqFlagsAlmostAll))
-		{
-			return abEntry;
-		}
-	}
-	DEBUGKPILOT << fname << ": Could not find any addressbook enty matching " << pilotAddress.getField(entryLastname) << endl;
-	return Addressee();
-}
-
-void AbbrowserConduit::slotTestRecord()
-{
-	FUNCTIONSETUP;
-
-	// Get a record and interpret it as an address.
-	PilotRecord *r = fDatabase->readRecordByIndex( pilotindex );
-	if (!r)
-	{
-		delayDone();
-		return;
-	}
-	PilotAddress a(r);
-	KPILOT_DELETE(r);
-
-	// Process this record.
-	showPilotAddress(&a);
-
-	// Schedule more work.
-	++pilotindex;
-	TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord()));
-}
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h
deleted file mode 100644
index 22e94469a..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h
+++ /dev/null
@@ -1,222 +0,0 @@
-#ifndef _ABBROWSER_CONDUIT_H
-#define _ABBROWSER_CONDUIT_H
-/* abbrowser-conduit.h                           KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2000 Gregory Stern
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include 
-
-#include 
-#include 
-
-#include "kabcRecord.h"
-
-
-class ResolutionTable;
-namespace KABC
-{
-class Addressee;
-class Address;
-class PhoneNumber;
-class Ticket;
-}
-
-using namespace KABC;
-
-typedef TQValueList RecordIDList;
-
-class AbbrowserConduit : public ConduitAction
-{
-Q_OBJECT
-public:
-	AbbrowserConduit(KPilotLink *o,const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~AbbrowserConduit();
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-	virtual bool exec();
-protected slots:
-	void slotPalmRecToPC();
-	void slotPCRecToPalm();
-	void slotDeletedRecord();
-	void slotDeleteUnsyncedPCRecords();
-	void slotDeleteUnsyncedHHRecords();
-	void slotCleanup();
-
-	void slotTestRecord();
-
-private:
-
-	/********************************************************/
-	/* Handle the configuration                             */
-	/********************************************************/
-
-	/* Read the global KPilot config file for settings
-	 * particular to the AbbrowserConduit conduit. */
-	void readConfig();
-
-	void showPilotAddress(const PilotAddress *pilotAddress);
-	void showAddresses(
-		const Addressee &pcAddr,
-		const PilotAddress *backupAddr,
-		const PilotAddress *palmAddr);
-
-
-	/********************************************************/
-	/* Loading and saving the addressbook and database      */
-	/********************************************************/
-
-
-	/* Given a list of contacts, creates the pilot id to contact key map
-	 * and a list of new contacts in O(n) time (single pass) */
-	void _mapContactsToPilot( TQMap < recordid_t, TQString> &idContactMap);
-	/* Do the preperations before doSync or doBackup.
-	 * Load contacts, set the pilot */
-	bool _prepare();
-	/* Load the contacts from the addressbook.
-	 * @return true if successful, false if not */
-	bool _loadAddressBook();
-	/* Save the contacts back to the addressbook.
-	 * @return true if successful, false if not */
-	bool _saveAddressBook();
-	void _getAppInfo();
-	void _setAppInfo();
-
-	void _cleanupAddressBookPointer();
-
-
-
-/*********************************************************************
-              G E N E R A L   S Y N C   F U N C T I O N
-         These functions modify the Handheld and the addressbook
- *********************************************************************/
-	bool syncAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-	bool _copyToHH(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-	bool _copyToPC(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-	bool _writeBackup(PilotAddress *backup);
-	bool _deleteAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-
-
-/*********************************************************************
-                 l o w - l e v e l   f u n c t i o n s   f o r
-                   adding / removing palm/pc records
- *********************************************************************/
-	bool _savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr);
-	bool _savePCAddr(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-
-
-/*********************************************************************
-                   C O P Y   R E C O R D S
- *********************************************************************/
-	inline bool _equal(const TQString & str1, const TQString & str2) const
-	{
-		return (str1.isEmpty() && str2.isEmpty()) || (str1 == str2);
-	} ;
-	typedef enum eqFlagsType
-	{
-		eqFlagsName=0x1,
-		eqFlagsAdress=0x2,
-		eqFlagsPhones=0x4,
-		eqFlagsNote=0x8,
-		eqFlagsCategory=0x10,
-		eqFlagsFlags=0x20,
-		eqFlagsCustom=0x40,
-		eqFlagsAll=0xFFFF,
-		eqFlagsAlmostAll=eqFlagsName|eqFlagsAdress|eqFlagsPhones|eqFlagsNote|eqFlagsCustom
-	};
-	bool _equal(const PilotAddress *piAddress, const Addressee &abEntry,
-		enum eqFlagsType flags=eqFlagsAll) const;
-
-/*********************************************************************
- C O N F L I C T   R E S O L U T I O N   a n d   M E R G I N G
- *********************************************************************/
-	/** smartly merge the given field for the given entry. use the
-	 *  backup record to determine which record has been modified
-	 *  @pc, @backup, @palm ... entries of the according databases
-	 *  @returns string of the merged entries.
-	 */
-	TQString _smartMergeString(const TQString &pc, const TQString & backup,
-		const TQString & palm, ConflictResolution confRes);
-	bool _buildResolutionTable(ResolutionTable*tab, const Addressee &pcAddr,
-		PilotAddress *backupAddr, PilotAddress *palmAddr);
-	bool _applyResolutionTable(ResolutionTable*tab, Addressee &pcAddr,
-		PilotAddress *backupAddr, PilotAddress *palmAddr);
-	bool _smartMergeTable(ResolutionTable*tab);
-	/** Merge the palm and the pc entries with the additional
-	 *  information of the backup record. Calls _smartMerge
-	 *  which does the actual syncing of the data structures.
-	 *  According to the return value of _smartMerge, this function
-	 *  writes the data back to the palm/pc.
-	 *  return value: no meaning yet
-	 */
-	bool _smartMergeAddressee(Addressee &pcAddr, PilotAddress *backupAddr,
-		PilotAddress *palmAddr);
-	Addressee _findMatch(const PilotAddress & pilotAddress) const;
-
-
-/********************************************************/
-/*   D A T A   M E M B E R S ,   S E T T I N G S        */
-/********************************************************/
-
-	AddressBook* aBook;
-
-	PilotAddressInfo *fAddressAppInfo;
-
-	KABCSync::Settings fSyncSettings;
-
-	int pilotindex;
-	bool abChanged;
-	/** addresseeMap maps record ids to IDs of Addressees. This is used to speed up searching the local addressbook */
-	TQMap < recordid_t, TQString> addresseeMap;
-	RecordIDList syncedIds, allIds;
-	TQString fABookFile;
-	AddressBook::Iterator abiter;
-	/** For a local file resource, we need to obtain a saveTicket 
-	*   when opening the abook, just in case we want to modify it
-	*   at all.
-	*/
-	Ticket *fTicket;
-	bool fCreatedBook;
-
-	/** if we add a resource from the addressbook, track it to remove it
-	 *  later...
-	 */
-	KABC::Resource *fBookResource;
-
-
-} ;
-
-#endif
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-factory.cc b/kpilot/conduits/abbrowserconduit/abbrowser-factory.cc
deleted file mode 100644
index 9a8450840..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-factory.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the factory for the abbrowser-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include "pluginfactory.h"
-
-#include "abbrowser-conduit.h"
-#include "abbrowser-setup.h"
-
-extern "C"
-{
-
-void *init_conduit_address()
-{
-	return new ConduitFactory(0,"abbrowserconduit");
-}
-
-}
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-factory.h b/kpilot/conduits/abbrowserconduit/abbrowser-factory.h
deleted file mode 100644
index bbf573c7f..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _ABBROWSER_FACTORY_H
-#define _ABBROWSER_FACTORY_H
-/* abbrowser-factory.h                       KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the factory for the abbrowser-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-extern "C"
-{
-
-void *init_conduit_address();
-
-}
-
-#endif
-
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc b/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc
deleted file mode 100644
index f4d80d2ce..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the setup dialog for the abbrowser-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include "kaddressbookConduit.h"
-#include "abbrowser-setup.h"
-#include "abbrowserSettings.h"
-
-
-
-static KAboutData *createAbout()
-{
-	KAboutData *fAbout = new KAboutData("abbrowserconduit",
-		I18N_NOOP("Abbrowser Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Abbrowser Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Dan Pilone\n(C) 2002-2003, Reinhold Kainhofer");
-	fAbout->addAuthor("Greg Stern",
-		I18N_NOOP("Primary Author"));
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-	fAbout->addAuthor("Reinhold Kainhofer", I18N_NOOP("Maintainer"),
-		"reinhold@kainhofer.com", "http://reinhold.kainhofer.com");
-	fAbout->addCredit("David Bishop", I18N_NOOP("UI"));
-	return fAbout;
-}
-
-AbbrowserWidgetSetup::AbbrowserWidgetSetup(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new AbbrowserWidget(w))
-{
-	FUNCTIONSETUP;
-
-	fConduitName=i18n("Addressbook");
-	fAbout = createAbout();
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-	fWidget=fConfigWidget;
-	fConfigWidget->fAbookFile->setMode(KFile::File);
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fSyncDestination,TQT_SIGNAL(clicked(int)));
-	CM(fAbookFile,TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fArchive,TQT_SIGNAL(toggled(bool)));
-	CM(fConflictResolution,TQT_SIGNAL(activated(int)));
-	CM(fOtherPhone,TQT_SIGNAL(activated(int)));
-	CM(fAddress,TQT_SIGNAL(activated(int)));
-	CM(fFax,TQT_SIGNAL(activated(int)));
-	CM(fCustom0,TQT_SIGNAL(activated(int)));
-	CM(fCustom1,TQT_SIGNAL(activated(int)));
-	CM(fCustom2,TQT_SIGNAL(activated(int)));
-	CM(fCustom3,TQT_SIGNAL(activated(int)));
-	CM(fCustomDate, TQT_SIGNAL(activated(int)));
-	CM(fCustomDate, TQT_SIGNAL(textChanged(const TQString&)));
-#undef CM
-}
-
-AbbrowserWidgetSetup::~AbbrowserWidgetSetup()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ void AbbrowserWidgetSetup::commit()
-{
-	FUNCTIONSETUP;
-
-	TQButtonGroup*grp=fConfigWidget->fSyncDestination;
-	AbbrowserSettings::setAddressbookType(grp->id(grp->selected()));
-	AbbrowserSettings::setFileName(fConfigWidget->fAbookFile->url());
-	AbbrowserSettings::setArchiveDeleted(fConfigWidget->fArchive->isChecked());
-
-	// Conflicts page
-	AbbrowserSettings::setConflictResolution(
-		fConfigWidget->fConflictResolution->currentItem()+SyncAction::eCROffset);
-
-	// Fields page
-	AbbrowserSettings::setPilotOther(fConfigWidget->fOtherPhone->currentItem());
-	AbbrowserSettings::setPilotStreet(fConfigWidget->fAddress->currentItem());
-	AbbrowserSettings::setPilotFax(fConfigWidget->fFax->currentItem());
-
-	// Custom fields page
-	AbbrowserSettings::setCustom0(fConfigWidget->fCustom0->currentItem());
-	AbbrowserSettings::setCustom1(fConfigWidget->fCustom1->currentItem());
-	AbbrowserSettings::setCustom2(fConfigWidget->fCustom2->currentItem());
-	AbbrowserSettings::setCustom3(fConfigWidget->fCustom3->currentItem());
-#ifdef DEBUG
-	DEBUGKPILOT <fCustom0->currentItem()<<"   "<<
-	  "Custom1: "<fCustom1->currentItem()<<"   "<<
-	  "Custom2: "<fCustom2->currentItem()<<"   "<<
-	  "Custom3: "<fCustom3->currentItem()<<"   "
-		<< " eCustom[0]=" << AbbrowserSettings::custom0()<<"    "
-		<< " eCustom[1]=" << AbbrowserSettings::custom1()<<"    "
-		<< " eCustom[2]=" << AbbrowserSettings::custom2()<<"    "
-		<< " eCustom[3]=" << AbbrowserSettings::custom3()<<"    "<<
-		endl;
-#endif
-	int fmtindex=fConfigWidget->fCustomDate->currentItem();
-	AbbrowserSettings::setCustomDateFormat(
-	  (fmtindex==0)?(TQString::null):fConfigWidget->fCustomDate->currentText() );
-
-	AbbrowserSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void AbbrowserWidgetSetup::load()
-{
-	FUNCTIONSETUP;
-	AbbrowserSettings::self()->readConfig();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Settings "
-		<< " fPilotStreetHome=" << AbbrowserSettings::pilotStreet()
-		<< " fPilotFaxHome=" << AbbrowserSettings::pilotFax()
-		<< " fArchive=" << AbbrowserSettings::archiveDeleted()
-		<< " eCustom[0]=" << AbbrowserSettings::custom0()
-		<< " eCustom[1]=" << AbbrowserSettings::custom1()
-		<< " eCustom[2]=" << AbbrowserSettings::custom2()
-		<< " eCustom[3]=" << AbbrowserSettings::custom3()
-		<< endl;
-#endif
-
-	// General page
-	fConfigWidget->fSyncDestination->setButton(AbbrowserSettings::addressbookType());
-	fConfigWidget->fAbookFile->setURL(AbbrowserSettings::fileName());
-	fConfigWidget->fArchive->setChecked(AbbrowserSettings::archiveDeleted());
-
-	// Conflicts page
-	fConfigWidget->fConflictResolution->setCurrentItem(
-	  AbbrowserSettings::conflictResolution() - SyncAction::eCROffset );
-
-	// Fields page
-	fConfigWidget->fOtherPhone->setCurrentItem(AbbrowserSettings::pilotOther());
-	fConfigWidget->fAddress->setCurrentItem(AbbrowserSettings::pilotStreet());
-	fConfigWidget->fFax->setCurrentItem(AbbrowserSettings::pilotFax());
-
-	// Custom fields page
-	fConfigWidget->fCustom0->setCurrentItem(AbbrowserSettings::custom0());
-	fConfigWidget->fCustom1->setCurrentItem(AbbrowserSettings::custom1());
-	fConfigWidget->fCustom2->setCurrentItem(AbbrowserSettings::custom2());
-	fConfigWidget->fCustom3->setCurrentItem(AbbrowserSettings::custom3());
-	TQString datefmt=AbbrowserSettings::customDateFormat();
-	if (datefmt.isEmpty())
-	{
-		fConfigWidget->fCustomDate->setCurrentItem(0);
-	}
-	else
-	{
-		fConfigWidget->fCustomDate->setCurrentText(datefmt);
-	}
-
-	unmodified();
-}
-
-/* static */ ConduitConfigBase *AbbrowserWidgetSetup::create(TQWidget *w, const char *n)
-{
-	return new AbbrowserWidgetSetup(w,n);
-}
-
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-setup.h b/kpilot/conduits/abbrowserconduit/abbrowser-setup.h
deleted file mode 100644
index 47eff1cf1..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-setup.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _ABBROWSER_ABBROWSER_SETUP_H
-#define _ABBROWSER_ABBROWSER_SETUP_H
-/* knotes-setup.h                       KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the KNotes conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class AbbrowserWidget;
-class KAboutData;
-
-class AbbrowserWidgetSetup : public ConduitConfigBase
-{
-public:
-	AbbrowserWidgetSetup(TQWidget *,const char *);
-	virtual ~AbbrowserWidgetSetup();
-	virtual void load();
-	virtual void commit();
-	static ConduitConfigBase *create(TQWidget *,const char *);
-private:
-	AbbrowserWidget *fConfigWidget;
-	KAboutData *fAbout;
-} ;
-
-#endif
-
diff --git a/kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc b/kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc
deleted file mode 100644
index f6ea2097f..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=abbrowserconduit.kcfg
-ClassName=AbbrowserSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop b/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
deleted file mode 100644
index 5c95db5d9..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit syncs the handheld addressbook with KDE's addressbook.
-Comment[af]=Hierdie pad sinkroniseer die draagbare toestel adresboek met KDE se adresboek.
-Comment[bg]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° адреÑника на KDE Ñ Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¸ уÑтройÑтва
-Comment[bs]=Ovaj conduit sinhronizuje adresar ruÄnog raÄunara sa KDEovim adresarom.
-Comment[ca]=Aquest conducte sincronitza la llibreta d'adreces de la vostra agenda electrònica amb la llibreta d'adreces de KDE.
-Comment[cs]=Toto propojení synchronizuje vašeho Pilota Knihou adres
-Comment[cy]=Mae'r cwndid yma yn cydamseru llyfr cyfeiriadau'r llawiadur efo llyfr cyfeiriadau KDE.
-Comment[da]=Denne kanal synkroniserer din håndholdte med KDE's adressebog.
-Comment[de]=Abgleich der Adressbücher von Taschencomputer und KDE.
-Comment[el]=Αυτός ο σÏνδεσμος συγχÏονίζει το βιβλίο διευθÏνσεων του υπολογιστή παλάμης με το βιβλίο διευθÏνσεων του KDE.
-Comment[eo]=Tiu kanalo sinkronigas vian poÅkomputil-adreslibron kun la KDE-aadreslibro.
-Comment[es]=Este conducto sincroniza la libreta de direcciones de su agenda electrónica con la de KDE
-Comment[et]=See kanal sünkroniseerib pihuarvuti ja KDE aadressiraamatu.
-Comment[eu]=Kanal honek agenda-elektronikoaren helbide-liburua KDE-ren helbide-liburuarekin sinkronizatzen du.
-Comment[fa]=این لوله، کتاب نشانی دستی را با کتاب نشانی KDE همگام می‌سازد.
-Comment[fi]=Tämä yhdyskäytävä synkronoi taskutietokoneen KDE:n osoitekirjan kanssa
-Comment[fr]=Ce canal synchronise le carnet d'adresses du périphérique avec celui de KDE.
-Comment[fy]=Dit conduit syngronisearret jo handheld mei KDE's adresboek.
-Comment[gl]=Este conducto sincroniza o caderno de enderezos do seu aparello portátil co caderno de enderezos de KDE.
-Comment[hi]=यह कनà¥à¤¡à¥à¤¯à¥‚इट हैंडहेलà¥à¤¡ पता-पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾ को केडीई के पता-पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾ से सिंक करती है.
-Comment[hu]=Ezzel a csatolóval egy kéziszámítógép és a KDE címjegyzéke között lehet szinkronizálást végezni.
-Comment[is]=Þessi rás samstillir póstfangaskrár KDE og lófatölvunnar
-Comment[it]=Questo condotto sincronizza il tuo palmare con la rubrica indirizzi di KDE
-Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã‚’KDEã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¸³ã¨åŒæœŸã•ã›ã¾ã™ã€‚
-Comment[kk]=Қалта құрылғыдағы адреÑтік кітапшамен KDE-нің адреÑтік кітапшаларды қадамдаÑтыру арнаÑÑ‹.
-Comment[km]=បំពង់​នáŸáŸ‡â€‹áž¢áž¶áž…​ឲ្យ​សៀវភៅ​អាសយដ្ឋាន​របស់​ឧបករណáŸâ€‹áž™áž½ážšážŠáŸƒ ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង​សៀវភៅ​អាសយដ្ឋាន​របស់ KDE
-Comment[lt]=Šis kanalas sinchronizuoja nešiojamą adresų knygelę su KDE adresų knygele.
-Comment[mk]=Овој канал ги Ñинхронизира адреÑарите од рачниот уред и од KDE.
-Comment[ms]=Saluran ini mensegerakkan buku alamat komputer telapak dengan buku alamat KDE.
-Comment[nb]=Denne kanalen synkroniserer Pilotens adressebok med KDEs adressebok.
-Comment[nds]=Synkroniseert de Adressböker vun Handreekners un KDE.
-Comment[ne]=यो कनà¥à¤¡à¥à¤¯à¥à¤Ÿà¤²à¥‡ केडीई को ठेगाना पà¥à¤¸à¥à¤¤à¤•à¤®à¤¾ हà¥à¤¯à¤¾à¤¨à¥à¤¡à¤² गरिà¤à¤•à¤¾ ठेगाना पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾ सिनà¥à¤• गरà¥à¤¦à¤› ।
-Comment[nl]=Dit conduit synchroniseert uw handheld met KDE's adresboek.
-Comment[nn]=Denne koplinga synkroniserer den handheldte adresseboka med med KDE-adresseboka.
-Comment[pl]=Ten łącznik synchronizuje książkę adresową palmtopa z książką adresową KDE.
-Comment[pt]=Esta conduta sincroniza o livro de endereços ou agenda do seu dispositivo com a agenda do KDE.
-Comment[pt_BR]=Este conduíte sincroniza o livro de endereços do handheld com o livro de endereços do KDE.
-Comment[ru]=Канал Ñинхронизации адреÑных книг КПК и KDE.
-Comment[sk]=Táto spojka synchronizuje adresár vášho prenosného zariadenia s adresárom KDE.
-Comment[sl]=Ta veznik usklajuje adresar v roÄnem raÄunalniku z adresarjem v KDE.
-Comment[sr]=Овај провод Ñинхронизује адреÑар ручног рачунара Ñа KDE-овим адреÑаром
-Comment[sr@Latn]=Ovaj provod sinhronizuje adresar ruÄnog raÄunara sa KDE-ovim adresarom
-Comment[sv]=Den här kanalen synkroniserar handdatorns adressbok med KDE:s adressbok.
-Comment[ta]=இநà¯à®¤ கà¯à®´à®¾à®¯à¯ கையில௠உளà¯à®³ à®®à¯à®•à®µà®°à®¿à®ªà¯à®ªà¯à®¤à¯à®¤à®•à®¤à¯à®¤à¯ˆ கேடிஇயின௠மà¯à®•à®µà®°à®¿à®ªà¯à®ªà¯à®¤à¯à®¤à®•à®¤à¯à®¤à¯‹à®Ÿà¯ ஒதà¯à®¤à®¿à®šà¯ˆà®•à¯à®•à®¿à®±à®¤à¯
-Comment[tg]=Канали ÑинхронизатÑиÑи китоби адреÑии Pilot ва KDE.
-Comment[tr]=Bu bileşen el bilgisayarı adres defteri ile KDE'ninkini birleştirir.
-Comment[uk]=Цей акведук Ñинхронізує адреÑну книгу кишенькового приÑтрою з адреÑною книгою KDE.
-Comment[zh_CN]=此管é“会将您的手æŒè®¾å¤‡ä¸Ž KDE 的地å€ç°¿åŒæ­¥ã€‚
-Comment[zh_TW]=此軟體讓您把 KDE 通訊錄與手邊通訊錄åŒæ­¥ã€‚
-Name=Addressbook
-Name[af]=Adresboek
-Name[ar]=دÙتر العناوين
-Name[az]=Ünvan Dəftəri
-Name[be]=ÐдраÑÐ½Ð°Ñ ÐºÐ½Ñ–Ð³Ð°
-Name[bg]=ÐдреÑник
-Name[br]=Karned chomlec'hioù
-Name[bs]=Adresar
-Name[ca]=Llibreta d'adreces
-Name[cs]=Kniha adres
-Name[cy]=Llyfr Cyfeiriadau
-Name[da]=Adressebog
-Name[de]=Adressbuch
-Name[el]=Βιβλίο διευθÏνσεων
-Name[eo]=Adresaro
-Name[es]=Libreta de direcciones
-Name[et]=Aadressiraamat
-Name[eu]=Helbide-liburua
-Name[fa]=کتاب نشانی
-Name[fi]=Osoitekirja
-Name[fr]=Carnet d'adresses
-Name[fy]=Adresboek
-Name[ga]=Leabhar Seoltaí
-Name[gl]=Libro de enderezos
-Name[hi]=पता-पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾
-Name[hr]=Adresar
-Name[hu]=Címjegyzék
-Name[id]=Buku alamat
-Name[is]=Póstfangaskrá
-Name[it]=Rubrica degli indirizzi
-Name[ja]=アドレス帳
-Name[kk]=ÐдреÑтік кітапшаÑÑ‹
-Name[km]=សៀវភៅ​អាសយដ្ឋាន
-Name[lt]=Adresų knygelė
-Name[mk]=ÐдреÑар
-Name[ms]=Buku Alamat
-Name[nb]=Addressebok
-Name[nds]=Adressbook
-Name[ne]=ठेगाना पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾
-Name[nl]=Adresboek
-Name[nn]=Adressebok
-Name[pl]=Książka adresowa
-Name[pt]=Livro de Endereços
-Name[pt_BR]=Livro de Endereços
-Name[ro]=Carte de adrese
-Name[ru]=ÐдреÑÐ½Ð°Ñ ÐºÐ½Ð¸Ð³Ð°
-Name[se]=ÄŒujuhusgirji
-Name[sk]=Adresár
-Name[sl]=Adresar
-Name[sr]=ÐдреÑар
-Name[sr@Latn]=Adresar
-Name[sv]=Adressbok
-Name[ta]=à®®à¯à®•à®µà®°à®¿à®ªà¯à®ªà¯à®¤à¯à®¤à®•à®®à¯
-Name[tg]=Китоби адреÑÓ£
-Name[tr]=Adresdefteri
-Name[uk]=ÐдреÑна книга
-Name[uz]=Манзиллар дафтари
-Name[zh_CN]=地å€ç°¿
-Name[zh_TW]=通訊錄
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_address
diff --git a/kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg b/kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg
deleted file mode 100644
index aed770641..000000000
--- a/kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-   
-  
-    
-				
-						
-						
-				
-        eAbookFile
-    
-    
-        $HOME/.kde/share/apps/kabc/std.vcf
-    
-		
-        true
-    
-    
-        -1
-    
-    
-				
-						
-						
-						
-						
-						
-						
-						
-						
-				
-        eOtherPhone
-    
-    
-				
-						
-						
-				
-        ePilotStreetHome
-    
-    
-				
-						
-						
-				
-        ePilotFaxHome
-    
-    
-				
-						
-						
-						
-						
-				
-        eCustomField
-    
-    
-				
-				
-        eCustomField
-    
-   
-				
-				
-        eCustomField
-    
-   
-				
-				
-        eCustomField
-    
-    
-        
-    
-  
-	
-
diff --git a/kpilot/conduits/abbrowserconduit/kabcRecord.cc b/kpilot/conduits/abbrowserconduit/kabcRecord.cc
deleted file mode 100644
index 9b49a2cad..000000000
--- a/kpilot/conduits/abbrowserconduit/kabcRecord.cc
+++ /dev/null
@@ -1,710 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2007 by Adriaan de Groot 
-**
-** The abbrowser conduit copies addresses from the Pilot's address book to
-** the KDE addressbook maintained via the kabc library. This file
-** deals with the actual copying of HH addresses to KABC addresses
-** and back again.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include 
-
-#include 
-#include 
-
-#include "kabcRecord.h"
-
-/**
- * Okay, this is so that we can map the Pilot phone types to Phone Number
- * types. Email addresses are NOT included in this map, and are handled
- * separately (not in PhoneNumber at all). The Pilot has 8 different kinds
- * of phone numbers (which may be *labeled* however you like). These
- * need to be mapped to the things that KABC::PhoneNumber handles.
- *
- * From KABC::PhoneNumber
- *		enum Types { Home = 1, Work = 2, Msg = 4, Pref = 8, Voice = 16, Fax = 32,
- *				Cell = 64, Video = 128, Bbs = 256, Modem = 512, Car = 1024,
- *				Isdn = 2048, Pcs = 4096, Pager = 8192 };
- *
- *
- * From PilotAddress:
- * enum EPhoneType {
- *		eWork=0, eHome, eFax, eOther, eEmail, eMain,
- *		ePager, eMobile
- *		};
- *
- * This array must have as many elements as PilotAddress::PhoneType
- * and its elements must be KABC::PhoneNumber::Types.
- */
-
-static KABC::PhoneNumber::Types pilotToPhoneMap[8] = {
-	KABC::PhoneNumber::Work,  // eWork
-	KABC::PhoneNumber::Home,  // eHome,
-	KABC::PhoneNumber::Fax,   // eFax,
-	(KABC::PhoneNumber::Types)0, // eOther -> wasn't mapped properly,
-	(KABC::PhoneNumber::Types)0, // eEmail -> shouldn't occur,
-	KABC::PhoneNumber::Home,  // eMain
-	KABC::PhoneNumber::Pager, // ePager,
-	KABC::PhoneNumber::Cell   // eMobile
-} ;
-
-KABC::PhoneNumber::List KABCSync::getPhoneNumbers(const PilotAddress &a)
-{
-	FUNCTIONSETUP;
-
-	KABC::PhoneNumber::List list;
-	TQString test;
-
-	PhoneSlot shownPhone = a.getShownPhone();
-
-	DEBUGKPILOT << fname << ": preferred pilot index is: ["
-		<< shownPhone << "], preferred phone number is: ["
-		<< a.getField(shownPhone) << "]" << endl;
-
-	for (PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i)
-	{
-		// skip email entries
-		if ( a.getPhoneType(i) == PilotAddressInfo::eEmail )
-		{
-			continue;
-		}
-
-		test = a.getField(i);
-		// only look at this if the field is populated
-		if (test.isEmpty())
-		{
-			continue;
-		}
-
-		int phoneType = pilotToPhoneMap[a.getPhoneType(i)];
-
-		// only populate a PhoneNumber if we have a corresponding type
-		if (phoneType >=0)
-		{
-			// if this is the preferred phone number, set it as such
-			if (shownPhone == i)
-			{
-				phoneType |= KABC::PhoneNumber::Pref;
-				DEBUGKPILOT << fname << ": found preferred pilot index: ["
-					<< i << "], text: [" << test << "]" << endl;
-			}
-			KABC::PhoneNumber ph(test, phoneType);
-			list.append(ph);
-		}
-		else
-		{
-			DEBUGKPILOT << fname << ": whoopsie.  pilot phone number: ["
-				<< test << "], index: [" << i << "], type: ["
-				<< phoneType << "], has no corresponding PhoneNumber type." << endl;
-		}
-	}
-
-	DEBUGKPILOT << fname << ": returning: ["
-		<< list.count() << "] phone numbers." << endl;
-
-	return list;
-}
-
-void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
-	PilotAddress &a,
-	const KABC::PhoneNumber::List &list)
-{
-	FUNCTIONSETUP;
-	TQString test;
-
-	// clear all phone numbers (not e-mails) first
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid() ; ++i )
-	{
-		PilotAddressInfo::EPhoneType ind = a.getPhoneType( i );
-		if (ind != PilotAddressInfo::eEmail)
-		{
-			a.setField(i, TQString());
-		}
-	}
-
-	// now iterate through the list and for each PhoneNumber in the list,
-	// iterate through our phone types using our map and set the first one
-	// we find as the type of address for the Pilot
-	for(KABC::PhoneNumber::List::ConstIterator listIter = list.begin();
-		   listIter != list.end(); ++listIter)
-	{
-		KABC::PhoneNumber phone = *listIter;
-
-		PilotAddressInfo::EPhoneType phoneType = PilotAddressInfo::eHome;
-
-		for ( int pilotPhoneType = PilotAddressInfo::eWork;
-			pilotPhoneType <= PilotAddressInfo::eMobile;
-			++pilotPhoneType)
-		{
-			int phoneKey = pilotToPhoneMap[pilotPhoneType];
-			if ( phone.type() & phoneKey)
-			{
-				DEBUGKPILOT << fname << ": found pilot type: ["
-					<< pilotPhoneType << "] ("
-					<< info.phoneLabel( (PilotAddressInfo::EPhoneType)pilotPhoneType)
-					<< ") for PhoneNumber: ["
-					<< phone.number() << "]" << endl;
-
-				phoneType = (PilotAddressInfo::EPhoneType) pilotPhoneType;
-				break;
-			}
-		}
-		PhoneSlot fieldSlot =
-			a.setPhoneField(phoneType, phone.number(), PilotAddress::NoFlags);
-
-		// if this is the preferred phone number, then set it as such
-		if (fieldSlot.isValid() && (phone.type() & KABC::PhoneNumber::Pref))
-		{
-			DEBUGKPILOT << fname << ": found preferred PhoneNumber. "
-				<< "setting showPhone to index: ["
-				<< fieldSlot << "], PhoneNumber: ["
-				<< phone.number() << "]" << endl;
-			a.setShownPhone( fieldSlot );
-		}
-
-		if (!fieldSlot.isValid())
-		{
-			DEBUGKPILOT << fname << ": Phone listing overflowed." << endl;
-		}
-	}
-
-	DEBUGKPILOT << fname << ": Pilot's showPhone now: ["
-		<< a.getShownPhone() << "]." << endl;
-
-	// after setting the numbers, make sure that something sensible is set as the
-	// shownPhone on the Pilot if nothing is yet...
-	TQString pref = a.getField(a.getShownPhone());
-	if (!a.getShownPhone().isValid() || pref.isEmpty())
-	{
-		DEBUGKPILOT << fname << ": Pilot's showPhone: ["
-			<< a.getShownPhone()
-			<< "] not properly set to a default."
-			<< endl;
-
-		for (PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i)
-		{
-			pref = a.getField(i);
-			if (!pref.isEmpty())
-			{
-				a.setShownPhone( i );
-				DEBUGKPILOT << fname << ": Pilot's showPhone now: ["
-					<< a.getShownPhone() 
-					<< "], and that's final." << endl;
-				break;
-			}
-		}
-	}
-}
-
-unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories,
-	const PilotAddressInfo &info,
-	unsigned int hhcategory)
-{
-	FUNCTIONSETUP;
-	// No categories in list, must be unfiled
-	if (pccategories.size()<1)
-	{
-		return Pilot::Unfiled;
-	}
-
-	// See if the suggested hhcategory is in the list, and if
-	// so that is the best match.
-	if (Pilot::validCategory(hhcategory) &&
-		pccategories.contains(info.categoryName(hhcategory)))
-	{
-		return hhcategory;
-	}
-
-	// Look for the first category from the list which is available on
-	// the handheld as well.
-	for(TQStringList::ConstIterator it = pccategories.begin(); it != pccategories.end(); ++it)
-	{
-		// Do not map unknown to unfiled when looking for category
-		int c = info.findCategory( *it, false );
-		if ( c >= 0)
-		{
-			Q_ASSERT(Pilot::validCategory(c));
-			return c;
-		}
-	}
-
-	// didn't find anything. return null
-	return Pilot::Unfiled;
-}
-
-void KABCSync::setCategory(KABC::Addressee & abEntry, const TQString &cat)
-{
-	if ( (!cat.isEmpty()))
-	{
-		abEntry.insertCategory(cat);
-	}
-}
-
-
-TQString KABCSync::getFieldForHHCustom(
-	const unsigned int index,
-	const KABC::Addressee &abEntry,
-	const KABCSync::Settings &settings)
-{
-	FUNCTIONSETUPL(4);
-
-	TQString retval;
-
-	if (index>3)
-	{
-		WARNINGKPILOT << "Bad index number " << index << endl;
-		retval = TQString();
-	}
-	if (settings.customMapping().count() != 4)
-	{
-		WARNINGKPILOT << "Mapping does not have 4 elements." << index << endl;
-		retval = TQString();
-	}
-
-	switch (settings.custom(index))
-	{
-	case eCustomBirthdate:
-		if (settings.dateFormat().isEmpty())
-		{
-			retval = KGlobal::locale()->formatDate(abEntry.birthday().date());
-		}
-		else
-		{
-			TQString tmpfmt(KGlobal::locale()->dateFormat());
-			KGlobal::locale()->setDateFormat(settings.dateFormat());
-			TQString ret(KGlobal::locale()->formatDate(abEntry.birthday().date()));
-			KGlobal::locale()->setDateFormat(tmpfmt);
-			retval = ret;
-		}
-		break;
-	case eCustomURL:
-		retval = abEntry.url().url();
-		break;
-	case eCustomIM:
-		retval = abEntry.custom(CSL1("KADDRESSBOOK"), CSL1("X-IMAddress"));
-		break;
-	case eCustomField:
-	default:
-		retval = abEntry.custom(appString, CSL1("CUSTOM")+TQString::number(index));
-		break;
-	}
-
-	return retval;
-}
-
-void KABCSync::setFieldFromHHCustom(
-	const unsigned int index,
-	KABC::Addressee &abEntry,
-	const TQString &value,
-	const KABCSync::Settings &settings)
-{
-	FUNCTIONSETUPL(4);
-
-	if (index>3)
-	{
-		WARNINGKPILOT << "Bad index number " << index << endl;
-		return;
-	}
-	if (settings.customMapping().count() != 4)
-	{
-		WARNINGKPILOT << "Mapping does not have 4 elements." << index << endl;
-		return;
-	}
-
-	switch (settings.custom(index))
-	{
-	case eCustomBirthdate:
-	{
-		TQDate bdate;
-		bool ok=false;
-		if (settings.dateFormat().isEmpty())
-		{
-			// empty format means use locale setting
-			bdate=KGlobal::locale()->readDate(value, &ok);
-		}
-		else
-		{
-			// use given format
-			bdate=KGlobal::locale()->readDate(value, settings.dateFormat(), &ok);
-		}
-
-		if (!ok)
-		{
-			TQString format = KGlobal::locale()->dateFormatShort();
-			TQRegExp re(CSL1("%[yY][^%]*"));
-			format.remove(re); // Remove references to year and following punctuation
-			bdate = KGlobal::locale()->readDate(value, format, &ok);
-		}
-		DEBUGKPILOT << "Birthdate from " << index << "-th custom field: "
-			<< bdate.toString() << endl;
-		DEBUGKPILOT << "Is Valid: " << bdate.isValid() << endl;
-		if (bdate.isValid())
-		{
-			abEntry.setBirthday(bdate);
-		}
-		else
-		{
-			abEntry.insertCustom(CSL1("KADDRESSBOOK"), CSL1("X-Birthday"), value);
-		}
-		break;
-	}
-	case eCustomURL:
-		abEntry.setUrl(value);
-		break;
-	case eCustomIM:
-		abEntry.insertCustom(CSL1("KADDRESSBOOK"), CSL1("X-IMAddress"), value);
-		break;
-	case eCustomField:
-	default:
-		abEntry.insertCustom(appString, CSL1("CUSTOM")+TQString::number(index), value);
-		break;
-	}
-}
-
-
-/** First search for a preferred  address. If we don't have one, search
- *  for home or work as specified in the config dialog. If we don't have
- *  such one, either, search for the other type. If we still have no luck,
- *  return an address with preferred + home/work flag (from config dlg). */
-KABC::Address KABCSync::getAddress(const KABC::Addressee &abEntry, const KABCSync::Settings &s)
-{
-	// preferhome == (AbbrowserSettings::pilotStreet==0)
-
-	// Check for preferred address first
-	KABC::Address ad(abEntry.address(KABC::Address::Pref));
-	if (!ad.isEmpty()) return ad;
-
-	// Look for home or work, whichever is preferred
-	int type = s.preferHome() ? KABC::Address::Home : KABC::Address::Work;
-	ad=abEntry.address(type);
-	if (!ad.isEmpty()) return ad;
-
-	// Switch preference if still none found
-	type = !s.preferHome() ? KABC::Address::Home : KABC::Address::Work;
-	ad=abEntry.address(type);
-	if (!ad.isEmpty()) return ad;
-
-	// Last-ditch attempt; see if there is a preferred home or work address
-	type = s.preferHome() ? KABC::Address::Home : KABC::Address::Work;
-	return abEntry.address(type | KABC::Address::Pref);
-}
-
-
-TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const KABCSync::Settings &s)
-{
-	switch(s.fieldForOtherPhone())
-	{
-		case eOtherPhone:
-			return abEntry.phoneNumber(0).number();
-		case eAssistant:
-			return abEntry.custom(CSL1("KADDRESSBOOK"), CSL1("AssistantsName"));
-		case eBusinessFax:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work).number();
-		case eCarPhone:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Car).number();
-		case eEmail2:
-			return abEntry.emails().first();
-		case eHomeFax:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home).number();
-		case eTelex:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Bbs).number();
-		case eTTYTTDPhone:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number();
-		default:
-			return TQString::null;
-	}
-}
-
-void KABCSync::setFieldFromHHOtherPhone(KABC::Addressee & abEntry, const TQString &nr, const KABCSync::Settings &s)
-{
-	int phoneType = 0;
-	switch (s.fieldForOtherPhone())
-	{
-	// One very special case which doesn't even map to a real phone type in KABC
-	case eAssistant:
-		abEntry.insertCustom(CSL1("KADDRESSBOOK"), CSL1("AssistantsName"), nr);
-		return;
-	// Special case: map phone to email, needs different handling.
-	case eEmail2:
-		abEntry.insertEmail(nr);
-		return;
-	// Remaining cases all map to various phone types
-	case eOtherPhone:
-		phoneType = 0;
-		break;
-	case eBusinessFax:
-		phoneType = KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work;
-		break;
-	case eHomeFax:
-		phoneType = KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home;
-		break;
-	case eCarPhone:
-		phoneType = KABC::PhoneNumber::Car;
-		break;
-	case eTelex:
-		phoneType = KABC::PhoneNumber::Bbs;
-		break;
-	case eTTYTTDPhone:
-		phoneType = KABC::PhoneNumber::Pcs;
-		break;
-	default:
-		WARNINGKPILOT << "Unknown phone mapping " << s.fieldForOtherPhone() << endl;
-		phoneType = 0;
-	}
-	KABC::PhoneNumber phone = abEntry.phoneNumber(phoneType);
-	phone.setNumber(nr);
-	phone.setType(phoneType); // Double-check in case there was no phonenumber of given type
-	abEntry.insertPhoneNumber(phone);
-}
-
-void KABCSync::setAddress(PilotAddress &toPilotAddr,
-	const KABC::Address & abAddress)
-{
-	toPilotAddr.setField(entryAddress, abAddress.street());
-	toPilotAddr.setField(entryCity, abAddress.locality());
-	toPilotAddr.setField(entryState, abAddress.region());
-	toPilotAddr.setField(entryZip, abAddress.postalCode());
-	toPilotAddr.setField(entryCountry, abAddress.country());
-}
-
-
-bool KABCSync::isArchived(const KABC::Addressee &addr)
-{
-	return addr.custom(KABCSync::appString, KABCSync::flagString) == TQString::number(SYNCDEL);
-}
-
-void KABCSync::makeArchived(KABC::Addressee &addr)
-{
-	FUNCTIONSETUP;
-	addr.insertCustom(KABCSync::appString, KABCSync::flagString, TQString::number(SYNCDEL));
-	addr.removeCustom(KABCSync::appString, KABCSync::idString);
-}
-
-
-
-
-void KABCSync::copy(PilotAddress &toPilotAddr,
-	const KABC::Addressee &fromAbEntry,
-	const PilotAddressInfo &appInfo,
-	const KABCSync::Settings &syncSettings)
-{
-	FUNCTIONSETUP;
-
-	toPilotAddr.setDeleted(false);
-
-	// don't do a reset since this could wipe out non copied info
-	//toPilotAddr.reset();
-	toPilotAddr.setField(entryLastname, fromAbEntry.familyName());
-	toPilotAddr.setField(entryFirstname, fromAbEntry.givenName());
-	toPilotAddr.setField(entryCompany, fromAbEntry.organization());
-	toPilotAddr.setField(entryTitle, fromAbEntry.prefix());
-	toPilotAddr.setField(entryNote, fromAbEntry.note());
-
-	// do email first, to ensure they get stored
-	toPilotAddr.setEmails(fromAbEntry.emails());
-
-	// now in one fell swoop, set all phone numbers from the Addressee.  Note,
-	// we don't need to differentiate between Fax numbers here--all Fax numbers
-	// (Home Fax or Work Fax or just plain old Fax) will get synced to the Pilot
-	KABCSync::setPhoneNumbers(appInfo,toPilotAddr,fromAbEntry.phoneNumbers());
-
-	// Other field is an oddball and if the user has more than one field set
-	// as "Other" then only one will be carried over.
-	TQString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings);
-	DEBUGKPILOT << fname << ": putting: ["< &customMapping() const
-		{
-			return fCustomMapping;
-		}
-		void setCustomMapping(const TQValueVector &v)
-		{
-			if (v.count()==4)
-			{
-				fCustomMapping = v;
-			}
-		}
-		int custom(int index) const
-		{
-			if ( (index<0) || (index>3) )
-			{
-				return 0;
-			}
-			else
-			{
-				return fCustomMapping[index];
-			}
-		}
-
-		int fieldForOtherPhone() const
-		{
-			return fOtherPhone;
-		}
-		void setFieldForOtherPhone(int v)
-		{
-			fOtherPhone = v;
-		}
-
-		bool preferHome() const
-		{
-			return fPreferHome;
-		}
-		void setPreferHome(bool v)
-		{
-			fPreferHome = v;
-		}
-
-		int faxTypeOnPC() const
-		{
-			return fFaxTypeOnPC;
-		}
-		void setFaxTypeOnPC(int v)
-		{
-			fFaxTypeOnPC = v;
-		}
-	private:
-		TQString fDateFormat;
-		TQValueVector fCustomMapping;
-		int fOtherPhone;
-		bool fPreferHome;
-		int fFaxTypeOnPC;
-	} ;
-
-
-	/** Return a list of all the phone numbers (max. 8) set in this
-	*   handheld entry @p a . Email entries are ignored.
-	*/
-	KABC::PhoneNumber::List getPhoneNumbers(const PilotAddress &a);
-
-	/** Set the phone numbers from @p list in the handheld entry
-	*   @p a (with info block @p info providing the mapping of category
-	*   names and some other fiddly stuff) as far as possible.
-	*   @em No overflow handling is done at all. If the desktop has
-	*   more than 5 phone entries, the remainder are dropped.
-	*/
-	void setPhoneNumbers(const PilotAddressInfo &info,
-		PilotAddress &a,
-		const KABC::PhoneNumber::List &list);
-
-	/** Given a list of category names from the KDE side (e.g. attached
-	*   to a PC-based Addressee) @p categorynames , look for the
-	*   category @em best matching the category @p category
-	*   in the appinfo block @p info . Here, best is defined as follows:
-	*     - if the name of category @p category is in the list, use it
-	*     - otherwise use the first category from the list that is a valid
-	*       category on the handheld.
-	*     - use Pilot::Unfiled if none match.
-	*
-	*   @return Category index that best matches.
-	*   @return Pilot::Unfiled if no best match.
-	*/
-	unsigned int bestMatchedCategory(const TQStringList &categorynames,
-		const PilotAddressInfo &info,
-		unsigned int category);
-
-	/** As above, but return the name of the category. */
-	inline TQString bestMatchedCategoryName(const TQStringList &categorynames,
-		const PilotAddressInfo &info,
-		unsigned int category)
-	{
-		return info.categoryName(
-			bestMatchedCategory(categorynames, info, category));
-	}
-
-	/** Give the addressee @p abEntry the category @p cat (leaving
-	*   existing category assignments intact).
-	*/
-	void setCategory(KABC::Addressee &abEntry, const TQString &cat);
-
-	/* These are string identifiers used for custom properties in the addressees,
-	*  used to store KPilot-specific settings.
-	*/
-	const TQString appString=CSL1("KPILOT"); ///< Identifier for the application
-	const TQString flagString=CSL1("Flag"); ///< Flags: synced or not
-	const TQString idString=CSL1("RecordID"); ///< Record ID on HH for this addressee
-
-
-	/** Get the string value for HH custom field @p index (0..3) from the addressee
-	*   @p abEntry . Which @em actual field this is depends on the mapping
-	*   of custom HH fields to PC fields. This mapping is given by the @p customMapping
-	*   which may be created from the conduit settings or by hand. Since one of the
-	*   possible actual fields is "birthday," which needs formatting, use the date format
-	*   string @p dateFormat. If this is empty, use the locale setting.
-	*
-	*   @return String value for HH custom field @p index
-	*   @return Null TQString on error (is also a valid return value)
-	*/
-	TQString getFieldForHHCustom(
-		unsigned int index,
-		const KABC::Addressee &abEntry,
-		const Settings &settings);
-
-	/** Set a field of the PC @p abEntry address from the custom HH field.
-	*   Use value @p value . The value comes from custom field @p index
-	*   using the interpretation of custom fields @p customMapping . Because
-	*   one of the interpretations includes the birthday, use the date format
-	*   @p dateFormat ; if empty, use the local format when setting dates from the HH.
-	*/
-	void setFieldFromHHCustom(
-		const unsigned int index,
-		KABC::Addressee &abEntry,
-		const TQString &value,
-		const Settings &settings);
-
-	/** The HH has a phone type "other" which may be mapped to any one of
-	*   several PC side phone numbers. Return the right one depending in the mapping.
-	*
-	* @note @p mappingForOther should come from AbbrowserSettings::pilotOther()
-	*/
-	TQString getFieldForHHOtherPhone(const KABC::Addressee &abEntry, const Settings &s);
-
-	/** The HH has a phone type "other" which may be mapped to any one
-	*   of several PC side phone numbers. Store the number @p nr in the
-	*   PC side phone field indicated by @p mappingForOther .
-	*
-	* @note @p mappingForOther should come from AbbrowserSettings::pilotOther()
-	*/
-	void setFieldFromHHOtherPhone(KABC::Addressee &abEntry, const TQString &nr, const Settings &s);
-
-	/** Returns the address portion of an addressee. Since the HH can only store
-	*   one address, we return the preferred address (if the Addressee @p abEntry
-	*   has one) and then either home or business depending on @p preferHome
-	*   and if that doesn't exist, the other one and if @em that doesn't exist,
-	*   return the preferred home or work address if it exists.
-	*/
-	KABC::Address getAddress(const KABC::Addressee &abEntry, const Settings &);
-
-	/** Set the address fields of the HH record from the @p abAddress . */
-	void setAddress(PilotAddress &toPilotAddr, const KABC::Address &abAddress);
-
-	bool isArchived(const KABC::Addressee &);
-	void makeArchived(KABC::Addressee &);
-
-	void copy(PilotAddress &toPilotAddr,
-		const KABC::Addressee &fromAbEntry,
-		const PilotAddressInfo &appInfo,
-		const Settings &syncSettings);
-	void copy(KABC::Addressee &toAbEntry,
-		const PilotAddress &fromPiAddr,
-		const PilotAddressInfo &appInfo,
-		const Settings &syncSettings);
-
-	void showAddressee(const KABC::Addressee &);
-}
-
-#endif
-
diff --git a/kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui b/kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui
deleted file mode 100644
index 6447caa07..000000000
--- a/kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui
+++ /dev/null
@@ -1,746 +0,0 @@
-
-AbbrowserWidget
-Adriaan de Groot and David Bishop
-
-    
-        Form2
-    
-    
-        
-            0
-            0
-            645
-            287
-        
-    
-    
-        
-            unnamed
-        
-        
-            0
-        
-        
-            6
-        
-        
-            
-                tabWidget
-            
-            
-                true
-            
-            
-                
-                    tab
-                
-                
-                    General
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            Spacer1
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                50
-                            
-                        
-                    
-                    
-                        
-                            fSyncDestination
-                        
-                        
-                            Sync Destination
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                
-                                    fSyncStdAbook
-                                
-                                
-                                    &Standard addressbook
-                                
-                                
-                                    <qt>Select this option to synchronize with KDE's standard addressbook (i.e. the addressbook that you edit in KAddressBook, and which you use in KMail)</qt>
-                                
-                            
-                            
-                                
-                                    fSyncFile
-                                
-                                
-                                    true
-                                
-                                
-                                    vCard &file:
-                                
-                                
-                                    <qt>Select this option to use a specific address book file, instead of the standard KDE address book. This file must be in the vCard format (.vcf). Type the location of this file in the edit box or select it clicking the file picker button.</qt>
-                                
-                            
-                            
-                                
-                                    fAbookFile
-                                
-                                
-                                    false
-                                
-                                
-                                    
-                                        3
-                                        5
-                                        0
-                                        0
-                                    
-                                
-                                
-                                    <qt>Enter the vCard file name here or select it by clicking the file picker button. vCard is a standard format for exchanging contact information. </qt>
-                                
-                            
-                        
-                    
-                    
-                        
-                            fArchive
-                        
-                        
-                            Store &archived records in the KDE addressbook
-                        
-                        
-                            <qt>If you delete an address on your handheld, you can determine if it should be archived on the PC. If you check that and this checkbox, the address will be added to your addressbook, but no longer synchronized with the handheld.</qt>
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Conflicts
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            groupBox4
-                        
-                        
-                            Conflict Resolution
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                
-                                    textLabel1_2_2
-                                
-                                
-                                    
-                                        4
-                                        5
-                                        0
-                                        0
-                                    
-                                
-                                
-                                    Conflict &resolution:
-                                
-                                
-                                    fConflictResolution
-                                
-                                
-                                    <qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.</qt>
-                                
-                            
-                            
-                                
-                                    
-                                        Use KPilot's Global Setting
-                                    
-                                
-                                
-                                    
-                                        Ask User
-                                    
-                                
-                                
-                                    
-                                        Do Nothing
-                                    
-                                
-                                
-                                    
-                                        Handheld Overrides
-                                    
-                                
-                                
-                                    
-                                        PC Overrides
-                                    
-                                
-                                
-                                    
-                                        Values From Last Sync (if possible)
-                                    
-                                
-                                
-                                    
-                                        Use Both Entries
-                                    
-                                
-                                
-                                    fConflictResolution
-                                
-                                
-                                    6
-                                
-                                
-                                    <qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.</qt>
-                                
-                            
-                            
-                                
-                                    textLabel1_7
-                                
-                                
-                                    <p>Select the default action if an event was modified on both sides here. </p>
-                                
-                                
-                                    WordBreak|AlignJustify|AlignVCenter
-                                
-                            
-                        
-                    
-                    
-                        
-                            spacer6
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                41
-                            
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Fields
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        11
-                    
-                    
-                        6
-                    
-                    
-                        
-                            TextLabel2
-                        
-                        
-                            Handheld other phone:
-                        
-                        
-                            <qt>Select which KAddressBook field should be used to store the Pilot's &quot;Other&quot; phone here.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Other Phone
-                            
-                        
-                        
-                            
-                                Assistant
-                            
-                        
-                        
-                            
-                                Business Fax
-                            
-                        
-                        
-                            
-                                Car Phone
-                            
-                        
-                        
-                            
-                                Email 2
-                            
-                        
-                        
-                            
-                                Home Fax
-                            
-                        
-                        
-                            
-                                Telex
-                            
-                        
-                        
-                            
-                                TTY/TTD Phone
-                            
-                        
-                        
-                            fOtherPhone
-                        
-                        
-                            
-                                3
-                                0
-                                0
-                                0
-                            
-                        
-                        
-                            <qt>Select which KAddressBook field should be used to store the Pilot's &quot;Other&quot; phone here.</qt>
-                        
-                    
-                    
-                        
-                            TextLabel4
-                        
-                        
-                            Handheld street address:
-                        
-                        
-                            <qt>Select which KAddressBook field should be used to store the Pilot's Street Address here.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Preferred, then Home Address
-                            
-                        
-                        
-                            
-                                Preferred, then Business Address
-                            
-                        
-                        
-                            fAddress
-                        
-                        
-                            <qt>Select which KAddressBook field should be used to store the Pilot's Street Address here.</qt>
-                        
-                    
-                    
-                        
-                            TextLabel5
-                        
-                        
-                            Handheld fax:
-                        
-                        
-                            <qt>Select which KAddressBook field should be used to store the Fax number from the Pilot here.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Home Fax
-                            
-                        
-                        
-                            
-                                Business Fax
-                            
-                        
-                        
-                            fFax
-                        
-                        
-                            <qt>Select which KAddressBook field should be used to store the Fax number from the Pilot here.</qt>
-                        
-                    
-                    
-                        
-                            Spacer2
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                0
-                                20
-                            
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Custom Fields
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            textLabel1
-                        
-                        
-                            
-                                5
-                                5
-                                0
-                                0
-                            
-                        
-                        
-                            Handheld custom field 1:
-                        
-                        
-                            <qt>Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            textLabel1_2
-                        
-                        
-                            Handheld custom field 2:
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            textLabel1_3
-                        
-                        
-                            Handheld custom field 3:
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            textLabel1_4
-                        
-                        
-                            Handheld custom field 4:
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Store as Custom Field
-                            
-                        
-                        
-                            
-                                Birthdate
-                            
-                        
-                        
-                            
-                                URL
-                            
-                        
-                        
-                            
-                                IM Address (ICQ, MS, ...)
-                            
-                        
-                        
-                            fCustom0
-                        
-                        
-                            
-                                3
-                                0
-                                0
-                                0
-                            
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Store as Custom Field
-                            
-                        
-                        
-                            
-                                Birthdate
-                            
-                        
-                        
-                            
-                                URL
-                            
-                        
-                        
-                            
-                                IM Address (ICQ, MSN, ...)
-                            
-                        
-                        
-                            fCustom1
-                        
-                        
-                            
-                                3
-                                0
-                                0
-                                0
-                            
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Store as Custom Field
-                            
-                        
-                        
-                            
-                                Birthdate
-                            
-                        
-                        
-                            
-                                URL
-                            
-                        
-                        
-                            
-                                IM Address (ICQ, MSN, ...)
-                            
-                        
-                        
-                            fCustom2
-                        
-                        
-                            
-                                3
-                                0
-                                0
-                                0
-                            
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            
-                                Store as Custom Field
-                            
-                        
-                        
-                            
-                                Birthdate
-                            
-                        
-                        
-                            
-                                URL
-                            
-                        
-                        
-                            
-                                IM Address (ICQ, MSN, ...)
-                            
-                        
-                        
-                            fCustom3
-                        
-                        
-                            
-                                3
-                                0
-                                0
-                                0
-                            
-                        
-                        
-                             <qt>Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.</qt>
-                        
-                    
-                    
-                        
-                            line1
-                        
-                        
-                            HLine
-                        
-                        
-                            Sunken
-                        
-                        
-                            Horizontal
-                        
-                    
-                    
-                        
-                            textLabel1_5
-                        
-                        
-                            Date &format:
-                        
-                        
-                            fCustomDate
-                        
-                        
-                            <qt>Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:<br> %d for the day, %m for the month, %y for the two-digit year, %Y for the four-digit year. For  example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would write the same date as 03/27/52. </qt>
-                        
-                    
-                    
-                        
-                            
-                                Locale Settings
-                            
-                        
-                        
-                            
-                                %d.%m.%Y
-                            
-                        
-                        
-                            
-                                %d.%m.%y
-                            
-                        
-                        
-                            
-                                %d/%m/%Y
-                            
-                        
-                        
-                            
-                                %d/%m/%y
-                            
-                        
-                        
-                            
-                                %m/%d/%Y
-                            
-                        
-                        
-                            
-                                %m/%d/%y
-                            
-                        
-                        
-                            fCustomDate
-                        
-                        
-                            
-                                3
-                                0
-                                0
-                                0
-                            
-                        
-                        
-                            true
-                        
-                        
-                            <qt>Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:<br> %d for the day, %m for the month, %y for the two-digit year, %Y for the four-digit year. For  example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would write the same date as 03/27/52. </qt>
-                        
-                    
-                    
-                        
-                            spacer5
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                31
-                                30
-                            
-                        
-                    
-                
-            
-        
-    
-
-
-    
-        fSyncFile
-        toggled(bool)
-        fAbookFile
-        setEnabled(bool)
-    
-
-
-    fArchive
-    tabWidget
-    fOtherPhone
-    fAddress
-    fFax
-
-
-
-    kurlrequester.h
-    klineedit.h
-    kpushbutton.h
-
-
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.cc b/kpilot/conduits/abbrowserconduit/resolutionDialog.cc
deleted file mode 100644
index aa8e2f148..000000000
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog.cc
+++ /dev/null
@@ -1,323 +0,0 @@
-/* resolutionDialog.h			KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "resolutionTable.h"
-#include "resolutionDialog_base.h"
-
-#include "resolutionDialog.moc"
-
-/** This class describes the controllers of the conflict resolution ListView,
- *  as well as its child radio buttons. There are two different constructors
- *  for them.
- *  Each controller has three child radio buttons, and if any of them is
- *  activated (stateChange), it sets the text of its parent (which is the
- *  controller, which is an instance of ResolutionCheckListItem, too).
- **/
-class ResolutionCheckListItem : TQCheckListItem {
-public:
-	ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb,
-		TQListView*parent);
-	ResolutionCheckListItem(TQString header, TQString text,
-		ResolutionCheckListItem*parent);
-	~ResolutionCheckListItem() {};
-	virtual void stateChange(bool newstate);
-	virtual void setValue(TQString text);
-	virtual void setCaption(TQString caption);
-
-protected:
-	void updateText();
-	/* fResItem is only set for the controller */
-	ResolutionItem*fResItem;
-	bool isController;
-	/* The description of the entry, e.g. Backup, PC, Palm for the radio buttons,
-	 * of the field name for the controllers
-	 */
-	TQString fCaption;
-	/* The currrent value of the entry (for controllers this changes with the
-	 * selected button */
-	TQString fText;
-};
-
-
-ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it,
-		ResolutionTable*tb, TQListView*parent) :
-	TQCheckListItem(parent, TQString::null, TQCheckListItem::Controller),
-	fResItem(it),
-	isController(true),
-	fCaption(it?(it->fName):(TQString::null)),
-	fText(it?(it->fResolved):(TQString::null))
-{
-	FUNCTIONSETUP;
-	if (it && tb)
-	{
-		// If all three texts are identical, there is no need for
-		// resolution so don't show the radio items below
-		bool itemsEqual=true;
-		TQString testtext(TQString::null);
-		const enum eExistItems its[3]={eExistsPC, eExistsPalm, eExistsBackup};
-		// get a valid text from a valid field, which will serve as the
-		// test text for the comparison
-		for (int i=0; i<3; i++)
-		{
-			if ((testtext.isNull()) && (it->fExistItems & its[i]) )
-				testtext=it->fEntries[i];
-		}
-		for (int i=0; i<3; i++)
-		{
-			if (it->fExistItems & its[i])
-				itemsEqual&=(it->fEntries[i]==testtext);
-		}
-		if (!itemsEqual)
-		{
-			ResolutionCheckListItem*item;
-			for (int i=2; i>=0; i--)
-			{
-				// Add only existing items
-				if (it->fExistItems & its[i])
-				{
-					item=new ResolutionCheckListItem(it->fEntries[i], tb->labels[i], this);
-					item->setOn(it->fEntries[i]==fText);
-				}
-			}
-		}
-		updateText();
-	}
-	setOpen(true);
-}
-
-ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header,
-		ResolutionCheckListItem*parent) :
-	TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton),
-	fResItem(0L),
-	isController(false),
-	fCaption(header),
-	fText(text)
-{
-	updateText();
-}
-
-void ResolutionCheckListItem::stateChange(bool newstate)
-{
-	if (newstate && !isController)
-	{
-		ResolutionCheckListItem*par=static_cast(parent());
-		{
-			par->setValue(fText);
-		}
-	}
-}
-
-void ResolutionCheckListItem::setValue(TQString text)
-{
-	FUNCTIONSETUP;
-	fText=text;
-	if (isController && fResItem)
-	{
-		fResItem->fResolved=text;
-	}
-	updateText();
-}
-
-void ResolutionCheckListItem::setCaption(TQString caption)
-{
-	fCaption=caption;
-	updateText();
-}
-
-void ResolutionCheckListItem::updateText()
-{
-	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText));
-	newText.replace(TQRegExp(CSL1("\n")),
-		i18n("Denoting newlines in Address entries. No need to translate", " | "));
-	setText(0, newText);
-}
-
-
-
-/*****************************************************************
- *
- *****************************************************************/
-
-ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH,
-	const TQString &caption, const TQString &helpText, ResolutionTable*tab) :
-	KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply),
-	tickleTimer(0L),
-	fHandle(fH),
-	fTable(tab)
-{
-	fWidget = new ResolutionDialogBase( this );
-	setMainWidget(fWidget);
-	fTable->fResolution=SyncAction::eDoNothing;
-	fWidget->fIntroText->setText(helpText);
-
-	fillListView();
-	adjustButtons(tab);
-
-	adjustSize();
-	resize(size());
-
-	if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
-
-	if (tickleTimer)
-	{
-		connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()));
-		// tickle the palm every 10 seconds to prevent a timeout until the
-		// sync is really finished.
-		tickleTimer->start( 10000 );
-	}
-
-	connect(fWidget->fKeepBoth, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBoth()));
-	connect(fWidget->fBackupValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseBackup()));
-	connect(fWidget->fPalmValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePalm()));
-	connect(fWidget->fPCValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePC()));
-}
-
-void ResolutionDlg::adjustButtons(ResolutionTable*tab)
-{
-	FUNCTIONSETUP;
-	if (!tab) return;
-	if (!(tab->fExistItems & eExistsPC) )
-	{
-		fWidget->fPCValues->setText(i18n("Delete entry"));
-		fWidget->fKeepBoth->setDisabled(TRUE);
-		fWidget->fKeepBoth->hide();
-	}
-	if (!(tab->fExistItems & eExistsPalm) )
-	{
-		fWidget->fPalmValues->setText(i18n("Delete entry"));
-		fWidget->fKeepBoth->setDisabled(TRUE);
-		fWidget->fKeepBoth->hide();
-	}
-	if (!(tab->fExistItems & eExistsBackup) )
-	{
-		fWidget->fBackupValues->setDisabled(TRUE);
-	}
-}
-
-void ResolutionDlg::fillListView()
-{
-	FUNCTIONSETUP;
-	fWidget->fResolutionView->setSorting(-1, FALSE);
-	fWidget->fResolutionView->clear();
-	for ( ResolutionItem* it = fTable->last(); it; it = fTable->prev() )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT<<"Building table, items="<fExistItems<<", PC="<<
-			it->fEntries[0]<<", Palm="<fEntries[1]<<", Backup="<<
-			it->fEntries[2]<fExistItems & eExistsPC)
-			hasValidValues = hasValidValues || !(it->fEntries[0].isEmpty());
-		if (it->fExistItems & eExistsPalm)
-			hasValidValues = hasValidValues || !(it->fEntries[1].isEmpty());
-		if (it->fExistItems & eExistsBackup)
-			hasValidValues = hasValidValues || !(it->fEntries[2].isEmpty());
-		if (hasValidValues)
-			new ResolutionCheckListItem(it, fTable, fWidget->fResolutionView);
-	}
-}
-
-void ResolutionDlg::slotKeepBoth()
-{
-	if ( (fTable->fExistItems & eExistsPC) && (fTable->fExistItems & eExistsPalm) )
-	{
-		fTable->fResolution=SyncAction::eDuplicate;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDoNothing;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotUseBackup()
-{
-	if (fTable->fExistItems & eExistsBackup)
-	{
-		fTable->fResolution=SyncAction::ePreviousSyncOverrides;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDoNothing;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotUsePalm()
-{
-	if (fTable->fExistItems & eExistsPalm)
-	{
-		fTable->fResolution=SyncAction::eHHOverrides;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDelete;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotUsePC()
-{
-	if (fTable->fExistItems & eExistsPC)
-	{
-		fTable->fResolution=SyncAction::ePCOverrides;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDelete;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotApply()
-{
-	fTable->fResolution=SyncAction::eAskUser;
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::_tickle()
-{
-	if (fHandle) fHandle->tickle();
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-ResolutionDlg::~ResolutionDlg()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.h b/kpilot/conduits/abbrowserconduit/resolutionDialog.h
deleted file mode 100644
index 2c7a8b0dd..000000000
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef RESOLUTIONDIALOG_H
-#define RESOLUTIONDIALOG_H
-/* resolutionDialog.h			KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include 
-class KPilotLink;
-class TQTimer;
-class TQListView;
-class ResolutionDialogBase;
-
-
-class ResolutionTable;
-
-class ResolutionDlg : public KDialogBase
-{
-    Q_OBJECT
-
-public:
-	ResolutionDlg( TQWidget* parent=0, 
-		KPilotLink*fH=0L, 
-		const TQString &caption=TQString(), 
-		const TQString &helpText=TQString(), 
-		ResolutionTable *tab=0L );
-	~ResolutionDlg();
-
-public slots:
-	void slotKeepBoth();
-	void slotUseBackup();
-	void slotUsePalm();
-	void slotUsePC();
-	void slotApply();
-	void _tickle();
-protected:
-	void fillListView();
-	void adjustButtons(ResolutionTable*tab);
-
-	TQTimer* tickleTimer;
-	KPilotLink* fHandle;
-	ResolutionTable*fTable;
-
-	ResolutionDialogBase*fWidget;
-};
-
-#endif // RESOLUTIONDIALOG_H
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui b/kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui
deleted file mode 100644
index 38fa73e89..000000000
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui
+++ /dev/null
@@ -1,129 +0,0 @@
-
-ResolutionDialogBase
-
-    
-        widget2
-    
-    
-        
-            0
-            0
-            459
-            350
-        
-    
-    
-        widget2
-    
-    
-        
-            unnamed
-        
-        
-            
-                fIntroText
-            
-            
-                The following record was edited both on the handheld and on the PC. Please choose which values shall be synced:
-            
-            
-                WordBreak|AlignVCenter
-            
-        
-        
-            
-                
-                    Field
-                
-                
-                    false
-                
-                
-                    false
-                
-            
-            
-                fResolutionView
-            
-            
-                true
-            
-            
-                AllColumns
-            
-            
-                <qt>Use this list to resolve, field by field, the conflicts created when a record was edited both on the handheld and on the PC. For each record, the different values from the last sync, the handheld and PC are displayed for each field, allowing you to choose the desired value.</qt>
-            
-        
-        
-            
-                textLabel1
-            
-            
-                Line breaks in any of the entries are denoted by a " | " (without the quotes).
-            
-            
-                WordBreak|AlignVCenter
-            
-        
-        
-            
-                frame3
-            
-            
-                GroupBoxPanel
-            
-            
-                
-                    unnamed
-                
-                
-                    
-                        fKeepBoth
-                    
-                    
-                        &Keep Both
-                    
-                    
-                        <qt>Click this button to use both values, resulting in the duplication of the record.</qt>
-                    
-                
-                
-                    
-                        fPCValues
-                    
-                    
-                        &PC Values
-                    
-                    
-                        <qt>Click this button to use the PC values for synchronizing all conflicting fields in this record.</qt>
-                    
-                
-                
-                    
-                        fBackupValues
-                    
-                    
-                        &Last Sync Values
-                    
-                    
-                        <qt>Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.</qt>
-                    
-                
-                
-                    
-                        fPalmValues
-                    
-                    
-                        &Handheld Values
-                    
-                    
-                        <qt>Click this button to use the handheld values for synchronizing all conflicting fields in this record.</qt>
-                    
-                
-            
-        
-    
-
-
-
diff --git a/kpilot/conduits/abbrowserconduit/resolutionTable.h b/kpilot/conduits/abbrowserconduit/resolutionTable.h
deleted file mode 100644
index 51c25190e..000000000
--- a/kpilot/conduits/abbrowserconduit/resolutionTable.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef RESOLUTIONTABLE_H
-#define RESOLUTIONTABLE_H
-/* resolutionTable.h			KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include 
-#include "syncAction.h"
-
-typedef enum eExistItems {
-	eExistsPC=0x1, eExistsPalm=0x2, eExistsBackup=0x4,
-	eExistsAll=eExistsPC|eExistsPalm|eExistsBackup
-};
-
-class ResolutionItem
-{
-public:
-	enum eExistItems fExistItems;
-	TQString fEntries[3];
-	TQString fResolved;
-	TQString fName;
-public:
-	ResolutionItem() {}
-	ResolutionItem(TQString name, int ex, TQString pc, TQString palm, TQString backup):fExistItems((eExistItems)ex),fName(name)
-		{fEntries[0]=pc;fEntries[1]=palm; fEntries[2]=backup; /*fExistItems=(eExistItems)ex;*/ }
-	~ResolutionItem() {}
-};
-
-/**
-@author Reinhold Kainhofer
-*/
-class ResolutionTable : public TQPtrList
-{
-public:
-	ResolutionTable():TQPtrList() {fResolution=SyncAction::eAskUser;};
-
-	~ResolutionTable() {};
-
-	SyncAction::ConflictResolution fResolution;
-	TQString labels[3];
-	enum eExistItems fExistItems;
-};
-
-#endif
-
diff --git a/kpilot/conduits/configure.in.bot b/kpilot/conduits/configure.in.bot
deleted file mode 100644
index 688f775f9..000000000
--- a/kpilot/conduits/configure.in.bot
+++ /dev/null
@@ -1,14 +0,0 @@
-dnl Configure.in.bot for KPilot conduits.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl Copyright (C) 2002 Reinhold Kainhofer
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-if test "$with_mal" = NOTFOUND -o "$with_mal" = no ; then
-    echo ""
-    echo "KPILOT: MAL headers or library not found. AvantGo conduit will not be compiled."
-    echo "KPILOT: Download libmal>=0.20 from http://jasonday.home.att.net/code/libmal/"
-    echo ""
-fi
diff --git a/kpilot/conduits/configure.in.in b/kpilot/conduits/configure.in.in
deleted file mode 100644
index c6a0d1437..000000000
--- a/kpilot/conduits/configure.in.in
+++ /dev/null
@@ -1,241 +0,0 @@
-dnl Configure.in.in for KPilot conduits.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl Copyright (C) 2002 Reinhold Kainhofer
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-
-
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the MAL conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-dnl
-dnl
-dnl Check to see if MAL header and library are available
-dnl
-
-dnl
-dnl Questions and comments can be sent to kde-pim@kde.org
-dnl
-dnl This was copied and adapted from kabc's ldap configure.in.in
-
-
-AC_DEFUN([KPILOT_CHECK_MAL],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-AC_REQUIRE([KPILOT_CHECK_PISOCK])
-
-AC_MSG_CHECKING(for libmal (for KPilots MAL conduit))
-AC_ARG_WITH(mal,
-[  --with-mal=PATH         set path for libmal files @<:@default=check@:>@],
-[ case "$withval" in
-  yes)
-    with_mal=CHECK
-    ;;
-  esac ],
-[ with_mal=CHECK ]
-)dnl
-
-if test "x$with_mal" = "xCHECK" ; then
-  with_mal=NOTFOUND
-  search_incs_tmp="$kde_includes /usr/include /usr/local/include"
-	dnl build the list of include dirs, both with and without libmal appended
-	search_incs="";
-	for idir in $search_incs_tmp; do
-		search_incs="$search_incs $idir $idir/libmal"
-	done
-  AC_FIND_FILE(libmal.h, $search_incs, mal_incdir)
-  if test -r $mal_incdir/libmal.h ; then
-    test "x$mal_incdir" != "x/usr/include" && MAL_INCLUDE="-I$mal_incdir"
-    with_mal=FOUND
-  fi
-  if test $with_mal = FOUND ; then
-    with_mal=NOTFOUND
-    for ext in la so sl a ; do
-      AC_FIND_FILE(libmal.$ext, $kde_libraries $libdir /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff $libdir/libmal /usr/lib/libmal /usr/local/lib/libmal,
-        mal_libdir)
-      if test -r $mal_libdir/libmal.$ext ; then
-        if test "x$mal_libdir" != "x/usr/lib$kdelibsuff" ; then
-          MAL_LIB="-L$mal_libdir "
-          test "$USE_RPATH" = yes && MAL_RPATH="-R $mal_libdir"
-        fi
-        MAL_LIB="${MAL_LIB}-lmal"
-        with_mal=FOUND
-        break
-      fi
-    done
-  fi
-fi
-
-case "$with_mal" in
-no) AC_MSG_RESULT(no) ;;
-NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
-*)
-  if test "x$with_mal" = "xFOUND" ; then
-    msg="incs=$mal_incdir libs=$mal_libdir"
-  else
-    msg="$with_mal"
-    MAL_ROOT="$with_mal"
-    if test "x$MAL_ROOT" != "x/usr" ; then
-      MAL_INCLUDE="-I${MAL_ROOT}/include"
-      MAL_LIB="-L${MAL_ROOT}/lib$kdelibsuff "
-      if test "$USE_RPATH" = "yes" ; then
-        MAL_RPATH="-R ${MAL_ROOT}/lib$kdelibsuff"
-      fi
-    fi
-    MAL_LIB="${MAL_LIBS}-lmal"
-  fi
-
-  kde_save_LIBS="$LIBS"
-  kde_save_CFLAGS="$CFLAGS"
-  kde_save_CPPFLAGS="$CPPFLAGS"
-  kde_save_LDFLAGS="$LDFLAGS"
-  LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
-  CFLAGS="$CFLAGS $MAL_INCLUDE"
-  CPPFLAGS="$CPPFLAGS $all_includes $PISOCK_INCLUDE $MAL_INCLUDE"
-  LDFLAGS="$LDFLAGS $PISOCK_LDFLAGS $all_libraries"
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_LINK(dnl
-  [
-  #include 
-  ],
-  [
-  PalmSyncInfo *psi;
-  ],
-  , with_mal=no
-  )
-  if test "$with_mal" = "no" ; then
-    MAL_LIB="$MAL_LIB -ldl"
-    LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
-    with_mal=yes
-    AC_TRY_LINK(dnl
-    [
-    #include 
-    ],
-    [
-    PalmSyncInfo *psi;
-    ],
-    , with_mal=no
-    )
-  fi
-  if test "$with_mal" = "no" ; then
-    MAL_INCLUDE=
-    MAL_LIB=
-    MAL_RPATH=
-    AC_MSG_RESULT(no (but first try gave $msg))
-  else
-    AC_DEFINE(HAVE_LIBMAL, 1, [Define if you have MAL libraries])
-		dnl check which version we have (pre 0.40 or >=0.40):
-    AC_TRY_LINK(dnl
-    [#include ],
-    [
-    PalmSyncInfo *psi;
-		psi->httpProxy;
-    ],
-    , mal_version20=yes
-    )
-    if test "$mal_version20" = "yes" ; then
-			AC_DEFINE(LIBMAL20, 1, [Define if we have the old libmal version (<0.40)])
-		fi
-    HAVE_LIBMAL=1
-    AC_MSG_RESULT($msg)
-  fi
-  AC_LANG_RESTORE
-  CFLAGS=$kde_save_CFLAGS
-  CPPFLAGS=$kde_save_CPPFLAGS
-  LIBS=$kde_save_LIBS
-  LDFLAGS=$kde_save_LDFLAGS
-  ;;
-esac
-
-AC_SUBST(MAL_INCLUDE)
-AC_SUBST(MAL_LIB)
-AC_SUBST(MAL_RPATH)
-
-AM_CONDITIONAL(include_malconduit, test "$HAVE_LIBMAL" = 1)
-
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the addressbook conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0
-KDE_CHECK_HEADER(kresources/factory.h,HAVE_KABC=1,
-	AC_MSG_WARN([KPILOT: Older kaddressbook version detected. No address book
-	conduit will be compiled.]))
-AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the notepad conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
-kpilot_save_cflags="$CPPFLAGS"
-kpilot_save_ldflags="$LDFLAGS"
-
-test -z "$PISOCK_INCLUDE" || CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
-KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,
-	AC_MSG_WARN([KPILOT: No notepad.h for pilot-link. Your pilot-link is too old.]))
-
-CPPFLAGS="$kpilot_save_cflags"
-LDFLAGS="$kpilot_save_ldflags"
-unset kpilot_save_cflags
-unset kpilot_save_ldflags
-
-AM_CONDITIONAL(include_notepad, test "$HAVE_NOTEPAD" = 1)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for embedded language conduits
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_PERL],[HAVE_PERL=0
-AC_MSG_CHECKING([for Perl embedding])
-if perl -MExtUtils::Embed -e ccopts > /dev/null 2> /dev/null ; then
-	PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts 2> /dev/null`
-	PERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2> /dev/null`
-	HAVE_PERL=1
-	AC_MSG_RESULT(yes)
-else
-	PERL_CFLAGS=""
-	PERL_LDFLAGS=""
-	AC_MSG_RESULT(no)
-fi
-AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
-AM_CONDITIONAL(include_perl, test "$HAVE_PERL" = 1)
-])
-
-AC_DEFUN([KPILOT_CHECK_PYTHON],[HAVE_PYTHON=0
-AC_MSG_CHECKING([for Python embedding])
-AM_CONDITIONAL(include_python, test "$HAVE_PYTHON" = 1)
-AC_MSG_RESULT(N/A)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                   actually call the checks
-dnl
-dnl ----------------------------------------------------------------------------
-
-KPILOT_CHECK_MAL
-KPILOT_CHECK_KABC
-KPILOT_CHECK_PERL
-KPILOT_CHECK_PYTHON
-KPILOT_CHECK_NOTEPAD
-
diff --git a/kpilot/conduits/docconduit/CMakeLists.txt b/kpilot/conduits/docconduit/CMakeLists.txt
deleted file mode 100644
index fa87eb0fb..000000000
--- a/kpilot/conduits/docconduit/CMakeLists.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(doc_shared_SRCS
-	makedoc9.cc
-	pilotDOCHead.cc
-	pilotDOCEntry.cc
-	pilotDOCBookmark.cc
-	DOC-converter.cc
-)
-
-set(conduit_doc_SRCS
-	${doc_shared_SRCS}
-	kpalmdoc_dlg.cc
-	kpalmdoc.cpp
-	doc-factory.cc
-	doc-setup.cc
-	doc-conduit.cc
-	doc-conflictdialog.cc
-)
-
-set(conduit_doc_UIS
-	kpalmdoc_dlgbase.ui
-	doc-setupdialog.ui
-)
-
-set(conduit_doc_KCFGS
-	docconduitSettings.kcfgc
-	kpalmdocSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
-kde3_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
-kde3_automoc(${conduit_doc_SRCS})
-add_library(conduit_doc SHARED ${conduit_doc_SRCS})
-
-kpilot_rpath(conduit_doc)
-
-set_target_properties(
-	conduit_doc PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_doc)
-
-install(
-	TARGETS conduit_doc
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-set(kpalmdoc_SRCS
-	${doc_shared_SRCS}
-	kpalmdoc_dlg.cc
-	kpalmdoc.cpp
-)
-kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
-kde3_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
-kde3_automoc(${kpalmdoc_SRCS})
-add_executable(kpalmdoc ${kpalmdoc_SRCS})
-target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot kdeui kio)
-kpilot_rpath(kpalmdoc)
-
-install(
-	TARGETS kpalmdoc conduit_doc
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-install(
-	FILES doc_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES docconduit.kcfg kpalmdoc.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
-install(
-	FILES kpalmdoc.desktop DESTINATION ${KDE3_XDG_APPS_DIR}
-)
-
-install(
-	FILES kpalmdoc.upd
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update
-)
-
-add_subdirectory(Icons)
diff --git a/kpilot/conduits/docconduit/DOC-converter.cc b/kpilot/conduits/docconduit/DOC-converter.cc
deleted file mode 100644
index 6502fe54e..000000000
--- a/kpilot/conduits/docconduit/DOC-converter.cc
+++ /dev/null
@@ -1,631 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** The doc converter synchronizes text files on the PC with DOC databases on the Palm
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-#include "DOC-converter.moc"
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include "pilotDOCHead.h"
-#include "pilotDOCEntry.h"
-#include "pilotDOCBookmark.h"
-
-
-
-#define min(a,b) (a= 0 && found -1) {
-			++found;
-			if (found>=from && found=0) {
-					fBookmarks.append(new docBookmark(/*bmkName.left(16)*/rx.cap(capSubexpression), pos));
-				} else {
-					// TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
-					TQString bmkText(bmkName);
-					for (int i=0; i<=rx.numCaptures(); ++i) {
-						bmkText.replace(CSL1("$%1").arg(i), rx.cap(i));
-						bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i));
-					}
-					fBookmarks.append(new docBookmark(bmkText.left(16), pos));
-				}
-				++nr;
-			}
-			++pos;
-		}
-	}
-	return nr;
-}
-
-
-
-
-
-
-
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) {
-	FUNCTIONSETUP;
-	docdb=0L;
-	eSortBookmarks=eSortNone;
-	fBookmarks.setAutoDelete( TRUE );
-}
-
-
-
-DOCConverter::~DOCConverter() {
-	FUNCTIONSETUP;
-}
-
-
-
-
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-
-
-
-void DOCConverter::setTXTpath(TQString path, TQString file) {
-	TQDir dr(path);
-	TQFileInfo pth(dr, file);
-	if (!file.isEmpty())
-		 txtfilename = pth.absFilePath();
-}
-
-
-
-void DOCConverter::setTXTpath(TQString filename) {
-	if (!filename.isEmpty()) txtfilename = filename;
-}
-
-
-
-void DOCConverter::setPDB(PilotDatabase * dbi) {
-	if (dbi) docdb = dbi;
-}
-
-
-
-TQString DOCConverter::readText() {
-	FUNCTIONSETUP;
-	if (txtfilename.isEmpty()) return TQString();
-	TQFile docfile(txtfilename);
-	if (!docfile.open(IO_ReadOnly))
-	{
-		emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename));
-		return TQString();
-	}
-
-	TQTextStream docstream(&docfile);
-
-	TQString doc = docstream.read();
-	docfile.close();
-	return doc;
-}
-
-
-
-int DOCConverter::findBmkEndtags(TQString &text, bmkList&fBmks) {
-	FUNCTIONSETUP;
-	// Start from the end of the text
-	int pos = text.length() - 1, nr=0;
-	bool doSearch=true;
-	while (pos >= 0/* && doSearch*/) {
-		DEBUGKPILOT<<"Current character is \'"<
-		while (text[pos].isSpace() && pos >= 0) {
-			DEBUGKPILOT<<"Skipping whitespaces at the end of the file"< is assumed to belong to the text, so there are no more bookmarks.
-		if (pos < 0 || text[pos] != '>') {
-			DEBUGKPILOT<<"Current character \'"<. Finish searching for bookmarks."<, now looking for the opening <"< 0) {
-//				DEBUGKPILOT<<"pos="<"<"));
-
-	rx.setMinimal(TRUE);
-	int pos = 0;
-	while (pos >= 0) {
-		pos = rx.search(text, pos);
-		if (pos >= 0) {
-			fBmks.append(new docBookmark(rx.cap(1), pos+1));
-			++nr;
-			text = text.remove(pos, rx.matchedLength());
-		}
-	}
-	return nr;
-}
-
-int DOCConverter::findBmkFile(TQString &, bmkList &fBmks) {
-	FUNCTIONSETUP;
-	int nr=0;
-
-	TQString bmkfilename = txtfilename;
-	if (bmkfilename.endsWith(CSL1(".txt"))){
-		bmkfilename.remove(bmkfilename.length()-4, 4);
-	}
-	TQString oldbmkfilename=bmkfilename;
-	bmkfilename+=CSL1(BMK_SUFFIX);
-	TQFile bmkfile(bmkfilename);
-	if (!bmkfile.open(IO_ReadOnly)) 	{
-		bmkfilename=oldbmkfilename+CSL1(PDBBMK_SUFFIX);
-		bmkfile.setName(bmkfilename);
-		if (!bmkfile.open(IO_ReadOnly)) {
-			DEBUGKPILOT<<"Unable to open bookmarks file "<dbPathName()<,,,,
-			// For an explanation see: http://home.kc.rr.com/krzysztow/PalmPilot/MakeDocJ/index.html
-			if (fieldnr>0){
-				DEBUGKPILOT<<"Working on bookmark \""<1) {
-						TQString name(bmkinfo[1]);
-						DEBUGKPILOT<<"Bookmark \""<1) {
-						TQString patt(bmkinfo[1]);
-						TQString name(patt);
-						if (fieldnr>2) {
-							int cap=bmkinfo[2].toInt(&ok);
-							if (ok) {
-								bmk=new docRegExpBookmark(patt, cap);
-							} else {
-								name=bmkinfo[2];
-								bmk=new docRegExpBookmark(patt, name);
-							}
-						} else{
-							bmk=new docRegExpBookmark(patt, name);
-						}
-						// The third entry in the line (optional) denotes the index of a capture subexpression (if an integer) or the bookmark text as regexp (if a string)
-						DEBUGKPILOT<<"RegExp Bookmark, pattern="<from=1;
-								bmk->to=1;
-							} else {
-								if (fieldnr>3) {
-									bool ok;
-									int tmp=bmkinfo[3].toInt(&ok);
-									if (ok) bmk->from=tmp;
-									if (fieldnr>4) {
-										tmp=bmkinfo[4].toInt(&ok);
-										if (ok) bmk->to=tmp;
-									}
-								}
-							}
-							fBmks.append(bmk);
-							bmk=0L;
-						} else {
-							DEBUGKPILOT<<"Could not allocate bookmark "<1) pattern=bmkinfo[1];
-					if (fieldnr>2) bookmark=bmkinfo[2];
-					DEBUGKPILOT<<"RegExp Bookmark, pattern="< in the text. We have to delete them immediately, otherwise the later bookmarks will be off.
-	if (fBmkTypes & eBmkInline) {
-		findBmkInline(text, fBookmarks);
-	}	 // end: Inline Bookmarks
-
-
-	// Read in regular expressions and positions from an external file (doc-filename with extension .bmk)
-	if (fBmkTypes & eBmkFile)
-	{
-		findBmkFile(text, fBookmarks);
-	}
-
-	// Process the bookmarks: find the occurrences of the regexps, and sort them if requested:
-	bmkSortedList pdbBookmarks;
-	pdbBookmarks.setAutoDelete(TRUE);
-	docBookmark*bmk;
-	for (bmk = fBookmarks.first(); bmk; bmk = fBookmarks.next())
-	{
-		bmk->findMatches(text, pdbBookmarks);
-	}
-
-	switch (eSortBookmarks)
-	{
-		case eSortName:
-			docBookmark::compare_pos=false;
-//			qHeapSort(pdbBookmarks);
-			pdbBookmarks.sort();
-			break;
-		case eSortPos:
-			docBookmark::compare_pos=true;
-			pdbBookmarks.sort();
-			break;
-		case eSortNone:
-		default:
-			break;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << "Bookmarks: "<bmkName.left(20)<<" at position "<position<isOpen()) {
-		emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) );
-		return false;
-	}
-
-	// Clean the whole database, otherwise the records would be just appended!
-	docdb->deleteRecord(0, true);
-
-	// Header record for the doc file format
-	PilotDOCHead docHead;
-	docHead.position=0;
-	docHead.recordSize=4096;
-	docHead.spare=0;
-	docHead.storyLen=text.length();
-	docHead.version=compress?DOC_COMPRESSED:DOC_UNCOMPRESSED;
-	docHead.numRecords=(int)( (text.length()-1)/docHead.recordSize)+1;
-	PilotRecord*rec=docHead.pack();
-	docdb->writeRecord(rec);
-	KPILOT_DELETE(rec);
-
-	DEBUGKPILOT << "Write header record: length="<readRecordByIndex(0);
-	if (!headerRec)
-	{
-		emit logError(i18n("Unable to read database header for database %1.").arg(docdb->dbPathName()));
-		KPILOT_DELETE(docdb);
-		return false;
-	}
-	PilotDOCHead header(headerRec);
-	KPILOT_DELETE(headerRec);
-
-	DEBUGKPILOT<<"Database "<dbPathName()<<" has "<recordCount()<readRecordByIndex(i);
-		if (rec)
-		{
-			PilotDOCEntry recText(rec, header.version==DOC_COMPRESSED);
-			doctext.append(recText.getText());
-			DEBUGKPILOT<<"Record "<dbPathName()));
-		}
-	}
-
-	// After the document records possibly come a few bookmark records, so read them in and put them in a separate bookmark file.
-	// for the ztxt conduit there might be annotations after the bookmarks, so the upper bound needs to be adapted.
-	int upperBmkRec=docdb->recordCount();
-	bmkSortedList bmks;
-	bmks.setAutoDelete(TRUE);
-	for (int i=header.numRecords+1; ireadRecordByIndex(i);
-		if (rec)
-		{
-			PilotDOCBookmark bookie(rec);
-			docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos);
-			bmks.append(bmk);
-			KPILOT_DELETE(rec);
-		} else {
-			emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
-		}
-	}
-	// TODO: Sort the list of bookmarks according to their position
-	docBookmark::compare_pos=true;
-	bmks.sort();
-
-	if ((fBmkTypes & eBmkFile) && (bmks.count()>0))
-	{
-		TQString bmkfilename = docfile.name();
-		if (bmkfilename.endsWith(CSL1(".txt"))){
-			bmkfilename.remove(bmkfilename.length()-4, 4);
-		}
-		bmkfilename+=CSL1(PDBBMK_SUFFIX);
-		TQFile bmkfile(bmkfilename);
-		if (!bmkfile.open(IO_WriteOnly))
-		{
-			emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
-				.arg(bmkfilename).arg(docdb ->dbPathName()));
-		}
-		else
-		{
-			DEBUGKPILOT<<"Writing "<position<<", "<bmkName<position, TQString(CSL1("<*") +
-				bmk->bmkName +
-				CSL1("*>")));
-		}
-	}
-
-	// Finally, write the actual text out to the file.
-	TQTextStream docstream(&docfile);
-	docstream<cleanup();
-	// reset all records to unchanged. I don't know if this is really such a wise idea?
-	docdb->resetSyncFlags();
-	return true;
-}
-
-
diff --git a/kpilot/conduits/docconduit/DOC-converter.h b/kpilot/conduits/docconduit/DOC-converter.h
deleted file mode 100644
index 802d60f20..000000000
--- a/kpilot/conduits/docconduit/DOC-converter.h
+++ /dev/null
@@ -1,183 +0,0 @@
-#ifndef _DOC_CONVERTER_H
-#define _DOC_CONVERTER_H
-/* DOC-converter.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-
-#define DOC_UNCOMPRESSED 1
-#define DOC_COMPRESSED 2
-
-
-#define BMK_SUFFIX ".bmk"
-#define PDBBMK_SUFFIX ".bm"
-
-#include 
-#include 
-
-class PilotDatabase;
-
-
-/****************************************************************************************************
- *  various bookmark classes. Most important is the bmkList  findMatches(TQString, bmkList &) function,
- *  which needs to return a list of all bookmarks found for the given bookmark expression.
- *  A bookmark usually consists of a bookmark text and an offset into the text document.
- ****************************************************************************************************/
-
-class docBookmark;
-#define bmkList TQPtrList
-#define bmkSortedList TQSortedList
-
-class docBookmark {
-public:
-	static bool compare_pos;
-	docBookmark():bmkName(), position(0) { };
-	docBookmark(TQString name, long int pos):bmkName(name), position(pos) { };
-	docBookmark(const docBookmark &bmk):bmkName(bmk.bmkName),position(bmk.position){};
-	virtual ~ docBookmark() { };
-	virtual int findMatches(TQString, bmkList &fBookmarks) {
-		FUNCTIONSETUP;
-		fBookmarks.append(new docBookmark(*this));
-		return 1;
-	};
-
-	TQString bmkName;
-	long int position;
-};
-
-class docMatchBookmark:public docBookmark {
- public:
-	docMatchBookmark():docBookmark() { from=0; to=100;};
-	docMatchBookmark(TQString pattrn, int options=0):docBookmark(),
-		pattern(pattrn), opts(options) { from=0; to=100; };
-	docMatchBookmark(TQString pattrn, TQString bmkname,
-		int options=0):docBookmark(bmkname, 0), pattern(pattrn),
-		opts(options) { from=0; to=100; };
-	virtual ~ docMatchBookmark() { };
-
-	virtual int findMatches(TQString, bmkList &fBookmarks);
-	TQString pattern;
-	int opts;
-	int from, to;
-};
-
-class docRegExpBookmark:public docMatchBookmark {
- public:
-	docRegExpBookmark():docMatchBookmark() { capSubexpression=-1;};
-	docRegExpBookmark(TQString regexp, int cap=0,
-		int options=0):docMatchBookmark(regexp, options) {capSubexpression=cap; };
-	docRegExpBookmark(TQString pattrn, TQString bmkname,
-		int options=0):docMatchBookmark(pattrn, bmkname, options) { capSubexpression=-1; };
-	virtual ~ docRegExpBookmark() { };
-
-	virtual int findMatches(TQString, bmkList &fBookmarks);
-	int capSubexpression;
-};
-
-
-/*************************************************************************************************************
- *  The converter class that does the real work for us.
- *************************************************************************************************************/
-
-class DOCConverter:public TQObject {
-Q_OBJECT
-private:
-	PilotDatabase * docdb;
-	TQString txtfilename;
-	TQString bmkfilename;
-	bool compress;
-
-	bmkList fBookmarks;
-public:
-	enum eSortBookmarksEnum
-	{
-		eSortNone,
-		eSortPos,
-		eSortName
-	} eSortBookmarks;
-
-public:
-	 DOCConverter(TQObject *parent=0L, const char *name=0L);
-	 virtual ~ DOCConverter();
-
-	TQString readText();
-	void setTXTpath(TQString path, TQString file);
-	void setTXTpath(TQString filename);
-	void setPDB(PilotDatabase * dbi);
-	TQString txtFilename() const {return txtfilename;}
-	TQString bmkFilename() const {return bmkfilename;}
-	void setBmkFilename(TQString bmkf) { bmkfilename=bmkf;}
-
-	bool getCompress() const { return compress; };
-	void setCompress(bool newcomp) {compress=newcomp;};
-
-	bool convertTXTtoPDB();
-	bool convertPDBtoTXT();
-
-	int setBookmarks(bmkList bookmarks) {
-		fBookmarks = bookmarks;
-		return fBookmarks.count();
-	};
-	int clearBookmarks() {
-		fBookmarks.clear();
-		return fBookmarks.count();
-	};
-	int addBookmark(docBookmark*bookmark) {
-		fBookmarks.append(bookmark);
-		return fBookmarks.count();
-	};
-
-	int findBmkEndtags(TQString &, bmkList&);
-	int findBmkInline(TQString &, bmkList&);
-	int findBmkFile(TQString &, bmkList&);
-
-
-	void setSort(enum eSortBookmarksEnum sort) {eSortBookmarks=sort;}
-	enum eSortBookmarksEnum getSort() {return eSortBookmarks;}
-
-	enum eBmkTypesEnum {
-		eBmkNone = 0,
-		eBmkFile = 1,
-		eBmkInline = 2,
-		eBmkEndtags = 4,
-		eBmkDefaultBmkFile = 8
-	} fBmkTypes;
-	void setBookmarkTypes(int types) {
-		fBmkTypes = (eBmkTypesEnum) types;
-	};
-
-protected:
-	int findBookmarks();
-
-private:
-	void readConfig();
-signals:
-	void logMessage(const TQString &);
-	void logError(const TQString &);
-};
-
-#endif
diff --git a/kpilot/conduits/docconduit/Icons/CMakeLists.txt b/kpilot/conduits/docconduit/Icons/CMakeLists.txt
deleted file mode 100644
index 3d1034d44..000000000
--- a/kpilot/conduits/docconduit/Icons/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-kde3_install_icons_custom( hicolor )
-
diff --git a/kpilot/conduits/docconduit/Icons/Makefile.am b/kpilot/conduits/docconduit/Icons/Makefile.am
deleted file mode 100644
index f371f4aed..000000000
--- a/kpilot/conduits/docconduit/Icons/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-METASOURCES = AUTO
-
-kpalmdocicondir = $(kde_datadir)/kpilot/icons
-kpalmdocicon_ICON = kpalmdoc
-
-KDE_ICON = kpalmdoc
-
diff --git a/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png
deleted file mode 100644
index 0f5fb75d587d485aad5153b76c8f8e5152ace017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 747
zcmVO=iswa+{v6c-a&0*RrvWxUZ?dqkOfVRv
zSgh1RBwg2?iHQlCTbj|HYsmLxEG$k+Cv0zj!7xmWZG%iELp=T#$GMBw>tSbSk63I<
zl7>cxo^^I~ei$Aergx;5$dd>b7M|~|w{=A_nW@{~Nq$X!({&vo1cieF6|;(2A
z5o&(`z{*Oz?!xTsJc-07rl+5>v9aR<04SHsWV2aBSwMU3EFORsbjE~on
zmzG{(7zTz>#c>>}Rf|+=i>4-}2DrJbswzSV^7%a3Y}T!|y861oU~o|5^tAZz5rq&4
zAy8G7o}L~Gg@T*BxVVgM+nA<}<2ab6#rpa?rl%)rfJ7n@0rn;*Cs7myzu%9dC@x@a
z?M;Kh*w|xoxii<`@CM@d`w54`w6(PXU|Ed@mSthv4u)X^wQt7tB${PeexzyIdw`jl
d7Y&tfi@#6T2khye?3e%m002ovPDHLkV1l9JRAT@D

diff --git a/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png
deleted file mode 100644
index d93aa4bae5172e64bbb5d424f35c9fce136b8d0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1088
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

diff --git a/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png
deleted file mode 100644
index 41cb3b9b1e5814c9a27cb787ba2b7cd3fce169f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3254
zcmV;n3`z5eP)fTvd9aUBz8MWCBD2qA%r1X4c02h2(!@u6Q5
zDmADew9s9#(h9Zd?oygAm5_?IkczI-_HByO*N;3IKv2z+5bH^asCX{M%buTe+L^y7gGkX49=I3mJex;5L9=yLNHn#ECAa
z-hco7uQBxilb7lgiw$nS{dTr(+s6L=`#Esnz>!+5_Px~tkpWl(d<$Uf)~%d8d9v;N
z2OoUEFaPbAn2wiDUkZh?idGWQSZq+gGQ+tGXSsCcGR@{9I#DFem@ltiEK81lIg<^pq@R6QJm2!d?wjD=MJFb`Y>W&tKACwb(NN4Rw9
z5>iUeOrBZRd5u8}$Apy@&y$2{{5S1)2RUWG8l}tXr)NB!f1m)I1s*v=X(TxKrWZ3P$~ec%Yy8o%^GQ9(stgXU|eDml+-&=IDPPu}!lJi;&}U&^y?_aGmA^bv!DgW1|&i-leQ&?Dw^=gv{BR=Ifb
zBIRn^vTL01WP-cC}Wk
z{k%7g?z`_k{{6sz&}zmcErnJNgf$kMIwZ36@jN`?BHzVAE+kjXG4jYTAAa~D>(;Hy
z*8a*Y_{)6WCFXj)&e+%(pMCZj!^6XzdH)PatnhPyu}-i;xJn}gLW0C=JN#ciJG!D1
z)6>(8j*c=qI(nqv_wT;@uITsq%>bMMhEg%_d*zi^y2O0F(V$Q&BBaD9gVq|OHA$>!
zEygTHi?muTk~jw7&A0xUQf_$=%7RKDiWPC9h+2xpDCWmMc#esQ3A-GKeklaEAm-zT
zKBU=LM70!3X_7c0YDUb@&2#zEC1z%3xbo$f%+JpQAeN0`>b!;|Ee1Me)ffZ7-@Nfp
zOiWDJe*e211JEPp+1XjPY}vx}^fbf6!yG$yjD^MmRtP-b!)l8);QJoF=i>om(I_mR4*?S}}k5!=FRS#LWQQRLsBo=y%-t
z#{qdc074*zPd-<`=0c<=kipV4>P?|+A*Deni&BPIDg0Ce`}Y1>U*{$!ChW}sK#!QC
zC}Qo}wVXeHo{^CejvYJ3=DRoI2O%=&ffRVsBM5SYIiIi)E}5{GflSDb0Z@rz`}jCg
zN`CUUzd&n46eV1lU!WN!7;8xq%b|b#(M?k*3r?4qpL_1PHVaQa`6P!99b)X^G1hM$
z!pr+eDQI15(P~7**Wx7;F2{hepcEv^ptMF9K!Y)s#VAH=i|wQ6_n-05!ceb-gU=ZWK(D2f13N+E>c>eZ_NR4SD&r-z4!nVOoSP$;a(
zfW?(iZQR4G6(>YdLNiI+E*IQ+!&>Zb8sf
zg|g`PrcE!HQmNDi;rl*szx_7PKKm?j93!RV`t|EXQA7{~luD)cmbf1Sk%CrBVJ&EL
zWBY83O_{K0?IP~(u~?hl)31!m^aRzLI-N}9ayfFj9AOyZ`#wPs@YY*zv3~t}Mn*=c
zR4SB8B}%0d`Fx&wz227rWni(DrHXLQ3BU-~XSD)@#o}R&1u3uyB!X?fzj-MGKwpRZ
zF_F*b+d$^$=UKmgJ+rg3OixdFNV7#Cq7pR*#{qduy5)t$Hba7Yl!2RjT<-8Y&N-Y;R10SQz#TD
z6bj_?dCs3d-v!{r$x|$}tV;tSTtmP*O&HwvS{txJq~c9eMoNsajNU$iNDl&?3^e+&
za5E;d>+B)trCVSrCBQi@y780;%19(}!OTa~6J3?^PRbYgxMB6t1Uiy6Q{~+rG
zF#;R`*t>V{icDy&34)+2^8El9V0`-@c0}6cHn=KeJ6Ks>1GfKGq89`%rM?HOdE<>Y
zjsU#y!V7&_=-fuHltNm$lGxXTaAHU;yR>N~YJX*EcL7#94>USPB?I!>Yp)#vc=gp+
zyI9E5r#JfjQfMXn^tV$W1>3f4zNPzb
-	-) Endtags of the form  at the end of the document
-	-) Regular expressions in a separate textname.bmk file 
-	   (textname.bmk ist the filename of the text with the .txt replaced by .bmk)
-		 
-
-In the design of the .bmk file, I tried to stay close to the 
-syntac of MakeDocJ bookmark files, but it turned out that I 
-needed to extend the syntax a little. Also, MakeDocJ uses Java 
-RegExps, while the PalmDoc conduit uses the QRegExp, which have
-some slight differences (especially concerning the ^ and $ 
-patterns as well as backreferences). So if you used MakeDocJ, 
-the .bmk file syntax will be quite familiar, but you will still
-have to adapt your bookmark files for Qt regular expressions 
-instead of Java regular expressions
-
- 
-		 
-1) INLINE TAGS
-
-Whenever a tag of the form <* someText *> appears in the text, 
-this sequence is removed from the text, and a bookmark is set 
-there with the bookmark name "someText" (the part between the 
-<* and the *>).
-
-
-2) ENDTAGS
-
-If the text ends with tags of the form , the string 
-in braces is used as bookmark name, and wherever it appears in 
-the text, a bookmark is set. 
-After the > any number of whitespace is allowed, but no other 
-characters like letters, numbers, or punctuation. Also, inside 
-the braces no line break must occur. The conduit searches the 
-text from the end and if it finds a line break inside a <...> 
-sequence, the tag and everything before it is assumed to belong 
-to the text and doesn't form a bookmark tag. 
-Between endtags any number of whitespace (spaces, tabs, line 
-feeds etc.) is allowed.
-
-As an example, assume you have a text ending in:
-... the bad guy was punished, and they lived happily 
-ever after! 
-
-        
-
-
-The conduit starts at the end, ignores all whitespace between 
-the tags, so it finds the tags "married", "princess", and "bad guy". 
-The "Tag with line feed" has a line feed, so it is assumed to belong 
-to the text. 
-Assume now you have a text ending in:
-... the bad guy was punished, and they lived happily 
-ever after! 
- The End 
-
-
-Here, only "married" and "princess" are found as bookmarks. Because 
-of the letters before the "princess" tags, the search for the 
-bookmarks ends at the letter "d" of "The End" (the conduit starts 
-from the end and moves backward until it finds some text which 
-cannot be seen as a endtag.
-
-
-
-
-3) REGULAR EXPRESSIONS IN A SEPARATE FILE
-
-This is by far the most complex way to specify bookmarks, but 
-it is also the mose powerful. 
-If you have a text with filename "My fairy tale.txt", the 
-bookmarks will be specified in a file called "My fairy tale.bmk" 
-(just the text filename with the .txt replaced by .bmk). This 
-file contains the bookmark definitions, one in each line. Lines 
-starting with a # are seen as comments, and empty lines are also 
-ignored.
-
-
-In the .bmk file, each bookmark line has one of the following syntaces 
-(I will explain all fields later on). Fields in [..] are optional:
-
-bmkName
-bmkPosition, bmkName
-+, bmkPatternRegExp[, bmkNameAsString[, firstIncludedBmk[, lastIncludedBmk]]]
-+, bmkPatternRegExp[, bmkNameIndexOfSubexpression[, firstIncludedBmk[, lastIncludedBmk]]]
--, bmkPatternRegExp[, bmkNameAsString]
--, bmkPatternRegExp[, bmkNameIndexOfSubexpression]
-
-  If the first field is a string, it is used as the bookmark name 
-and pattern to search for. 
-  If the first field is a number, it means the position of the 
-bookmark, and the second field is the name of the bookmark.
-  If the first field is either + or -, the second field gives 
-a regular expression that is used to find the position of the 
-bookmark. If the first field is a -, the search is done only 
-once and only the first match will be added as bookmark. If 
-the first field is a +, the search is done until the regular 
-expression can no longer be found (the fourth and fifth fields 
-can be used to include only a certain range of hits). If there 
-is a third field, and it is a string, it gives the name of the 
-bookmark as a regular expression (i.e. \1 are replaced by the 
-first subexpression of the search, where subexpressions are 
-specified by round brackets in the regexp of the second field). 
-If there is a third field, and it is a number, it gives the index 
-of the subexpression of bmkPatternRegExp that is used as the 
-bookmark name.
-If there is no third field, the whole matched text will be used 
-as bookmark name.
-The optional fourth and fifth fields can be used to set bookmarks 
-only after the first few ocurrences of the regexp in the text, and 
-to stop the search after the expression has been found a certain 
-number of times.
-
-
-
-If the PDB->PC sync is set up to store the bookmarks in a bookmark file, 
-it will create a file "My fairy tale.bm" (no "k") with entries of the form
-position,bmkName
-The .bmk file will be used if it exists, but if no .bmk file exists, the .bm file
-will be used. This way you can override the bookmark settings, while 
-at the same time the PDB->TXT sync does not destroy your possibly 
-existing .bmk file.
-
-
-
-Examples:
-
-1) Imagine you have a line like:
-frog princess
-In this case, the text is searched for "frog princess", and a 
-bookmark is set whenever "frog princess" occurs in the text. 
-The name of each of these bookmarks will be "frog princess".
-
-2) A bookmark line:
-55, Bookmark at offset 55
-Here, a bookmark will be set at offset 55 (55th character of 
-the text), and it will have the name "Bookmark at offs" (truncated 
-to 16 characters)
-
-3) A bookmark line
--,Chapter \d+
-causes a bookmark to be set at the first ocurrence of "Chapter XXX", 
-where XXX denotes one or more digits. The bookmark name will be 
-"Chapter XXX" (XXX replaced by the actual digits).
-
-4) A bookmark line
-+,Chapter \d+
-causes bookmarks to be set wherever "Chapter XXX" (XXX being one 
-or more digits) appears in the text. The bookmark name will again 
-be "Chapter XXX", but the search does not stop after the first hit.
-
-5) A bookmark line
-+,\n\s*(Chapter \d+)\D+, 1
-causes a bookmark to be set whenever a new line starts with 
-"Chapter XXX" (whitespace is allowed before the "Chapter"), and 
-uses the first subexpression in (..) as the bookmark name. If you 
-have a passage 
-     Chapter 15: here it starts
-The regular expression will match, so a bookmark will be set there 
-and the subexpression "Chapter 15" (which matches the (Chapter \d+) ) 
-will be used as bookmark text.
-
-6) A bookmark line
-+,\n\s*Part (\d+),\1\. part
-sets a bookmark whenever a line starts with "Part XXX". The XXX 
-will be stored as the first matched subexpression. The third field 
-"\1\. part" is the regular expression for the bookmark name, where 
-\1 is replaced by the first matched subexpression of the search (XXX 
-in this case). So if a line starts with "   Part 17: ", the bookmark 
-name will be "17. part".
-
-7) A bookmark line
-+,Table (\d+): ,\1\. Tabelle,5,25
-will match whenever "Table XXX: " appears in the text, and the bookmark 
-name will be "XXX. Tabelle". However, the fourth field means that the 
-first four hits are ignored (the 5th hit is the first hit to be included 
-as a bookmark), and the fifth field means that all further hits after the 
-25th will be ignored, too.
-
-8) In law texts, I use a regular expression
-+,\n *(§\.? *\d+[a-z]?\.?) +, 1
-to search for all paragraphs starting like "§. 15. " or "  §23 ", and set
-a bookmark there using only the part from the § to the last digit or the 
-full stop after the last digit (the pattern between the (), in our two 
-cases the bookmark names will be "§. 15." and "§23" ).
diff --git a/kpilot/conduits/docconduit/doc-conduit.cc b/kpilot/conduits/docconduit/doc-conduit.cc
deleted file mode 100644
index fbaa22f59..000000000
--- a/kpilot/conduits/docconduit/doc-conduit.cc
+++ /dev/null
@@ -1,1018 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** The doc conduit synchronizes text files on the PC with DOC databases on the Palm
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-
-// naming of the bookmark file:
-// PDB->TXT:	convert bookmarks to a .bm file
-// TXT->PDB:	If a .bmk file exists, use it, otherwise use the .bm file (from the PDB->TXT conversion)
-//			This way, the bookmark file is not overwritten, a manual bookmark file overrides, but the bookmarks from the handheld are still available
-
-
-#include "options.h"
-#include "doc-conduit.moc"
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include "doc-factory.h"
-#include "doc-conflictdialog.h"
-#include "DOC-converter.h"
-#include "pilotDOCHead.h"
-#include "docconduitSettings.h"
-
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-extern "C"
-{
-unsigned long version_conduit_doc = Pilot::PLUGIN_API;
-}
-
-TQString dirToString(eSyncDirectionEnum dir) {
-	switch(dir) {
-//		case eSyncAll: return "eSyncAll";
-		case eSyncPDAToPC: return CSL1("eSyncPDAToPC");
-		case eSyncPCToPDA: return CSL1("eSyncPCToPDA");
-		case eSyncNone: return CSL1("eSyncNone");
-		case eSyncConflict: return CSL1("eSyncConflict");
-		case eSyncDelete: return CSL1("eSyncDelete");
-		default: return CSL1("ERROR");
-	}
-}
-
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-DOCConduit::DOCConduit(KPilotLink * o,
-	const char *n, const TQStringList & a):ConduitAction(o, n, a)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("DOC");
-}
-
-
-
-DOCConduit::~DOCConduit()
-{
-	FUNCTIONSETUP;
-}
-
-
-bool DOCConduit::isCorrectDBTypeCreator(DBInfo dbinfo) {
-	return dbinfo.type == dbtype() && dbinfo.creator == dbcreator();
-}
-const unsigned long DOCConduit::dbtype() {
-	return get_long(DOCConduitFactory::dbDOCtype);
-}
-const unsigned long DOCConduit::dbcreator() {
-	return get_long(DOCConduitFactory::dbDOCcreator);
-}
-
-
-
-/*********************************************************************
-                L O A D I N G   T H E   D A T A
- *********************************************************************/
-
-
-
-void DOCConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	DOCConduitSettings::self()->readConfig();
-
-	eConflictResolution = (enum eSyncDirectionEnum) (DOCConduitSettings::conflictResolution() );
-	fTXTBookmarks = DOCConverter::eBmkNone;
-	if ( DOCConduitSettings::convertBookmarks() )
-	{
-		if ( DOCConduitSettings::bmkFileBookmarks() )
-			fTXTBookmarks |= DOCConverter::eBmkFile;
-		if ( DOCConduitSettings::inlineBookmarks() )
-			fTXTBookmarks |= DOCConverter::eBmkInline;
-		if ( DOCConduitSettings::endtagBookmarks() )
-			fTXTBookmarks |= DOCConverter::eBmkEndtags;
-	}
-
-	eSyncDirection = (enum eSyncDirectionEnum)(DOCConduitSettings::syncDirection() );
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Settings "
-		<< " tXTDirectory=" << DOCConduitSettings::tXTDirectory()
-		<< " pDBDirectory=" << DOCConduitSettings::pDBDirectory()
-		<< " keepPDBLocally=" << DOCConduitSettings::keepPDBsLocally()
-		<< " eConflictResolution=" << eConflictResolution
-		<< " tXTBookmarks=" << fTXTBookmarks
-		<< " pDBBookmarks=" << DOCConduitSettings::bookmarksToPC()
-		<< " compress=" << DOCConduitSettings::compress()
-		<< " eSyncDirection=" << eSyncDirection << endl;
-#endif
-}
-
-
-
-bool DOCConduit::pcTextChanged(TQString txtfn)
-{
-	FUNCTIONSETUP;
-	// How do I find out if a text file has changed shince we last synced it??
-	// Use KMD5 for now. If I realize it is too slow, then I have to go back to comparing modification times
-	// if there is no config setting yet, assume the file has been changed. the md5 sum will be written to the config file after the sync.
-	TQString oldDigest=DOCConduitSettings::self()->config()->readEntry(txtfn);
-	if (oldDigest.length()<=0)
-	{
-		return true;
-	}
-#ifdef DEBUG
-	DEBUGKPILOT<<"Old digest is "<readRecordByIndex(0);
-	PilotDOCHead docHeader(firstRec);
-	KPILOT_DELETE(firstRec);
-
-	int storyRecs = docHeader.numRecords;
-
-	// determine the index of the next modified record (does it lie
-	// beyond the actual text records?)
-	int modRecInd=-1;
-	PilotRecord*modRec=docdb->readNextModifiedRec(&modRecInd);
-#ifdef DEBUG
-	DEBUGKPILOT<<"Index of first changed record: "<readNextModifiedRec(&modRecInd);
-#ifdef DEBUG
-		DEBUGKPILOT<<"Reread Index of first changed records: "<= 0) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Handheld side has changed, condition="<<
-			((!DOCConduitSettings::ignoreBmkChanges()) || (modRecInd <= storyRecs))<deleteDatabase() !=0 ) {
-					WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl;
-				}
-				KPILOT_DELETE(database);
-			}
-		}
-		if (!DOCConduitSettings::localSync()) {
-			PilotDatabase *database=deviceLink()->database( sinfo.dbinfo.name );
-			if ( database->deleteDatabase() !=0 ) {
-					WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " from the handheld" << endl;
-			}
-			KPILOT_DELETE(database);
-		}
-		return true;
-	}
-	// preSyncAction should initialize the custom databases/files for the
-	// specific action chosen for this db and return a pointer to a docDBInfo
-	// instance which points either to a local database or a database on the handheld.
-	PilotDatabase *database = preSyncAction(sinfo);
-
-	if (database && ( !database->isOpen() ) ) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Database "<createDatabase(dbcreator(), dbtype()) ) {
-#ifdef DEBUG
-			DEBUGKPILOT<<"Failed"<isOpen()) {
-		DOCConverter docconverter;
-		connect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
-		connect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
-
-		docconverter.setTXTpath( DOCConduitSettings::tXTDirectory(), sinfo.txtfilename );
-		docconverter.setPDB(database);
-		docconverter.setCompress(DOCConduitSettings::compress());
-
-		switch (sinfo.direction) {
-			case eSyncPDAToPC:
-				docconverter.setBookmarkTypes(DOCConduitSettings::bookmarksToPC());
-				res = docconverter.convertPDBtoTXT();
-				break;
-			case eSyncPCToPDA:
-				docconverter.setBookmarkTypes(fTXTBookmarks);
-				res = docconverter.convertTXTtoPDB();
-				break;
-			default:
-				break;
-		}
-
-		// Now calculate the md5 checksum of the PC text and write it to the config file
-		if (res)
-		{
-			KMD5 docmd5;
-			TQFile txtfile(docconverter.txtFilename());
-			if (txtfile.open(IO_ReadOnly)) {
-				docmd5.update(txtfile);
-				TQString thisDigest(docmd5.hexDigest() /* .data() */);
-				DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest);
-				DOCConduitSettings::self()->config()->sync();
-#ifdef DEBUG
-				DEBUGKPILOT<<"MD5 Checksum of the text "<findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0)
-	{
-		// no more databases available, so check for PC->Palm sync
-		TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
-		return;
-	}
-	dbnr=dbinfo.index+1;
-#ifdef DEBUG
-	DEBUGKPILOT<<"Next Palm database to sync: "<Palm sync
-		TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
-		return;
-	}
-
-	// Walk through all files in the pdb directory and check if it has already been synced.
-	// if docnames isn't initialized, get a list of all *.pdb files in DOCConduitSettings::pDBDirectory()
-	if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
-		docnames=TQDir(DOCConduitSettings::pDBDirectory(), CSL1("*.pdb")).entryList() ;
-		dociterator=docnames.begin();
-	}
-	if (dociterator==docnames.end()) {
-		// no more databases available, so start the conflict resolution and then the actual sync proces
-		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
-		return;
-	}
-
-	TQString fn=(*dociterator);
-
-	TQDir dr(DOCConduitSettings::pDBDirectory());
-	TQFileInfo fl(dr, fn );
-	TQString pdbfilename=fl.absFilePath();
-	++dociterator;
-
-	//  Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced)
-	// If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced.
-	TQString dbname=fl.baseName(TRUE).left(30);
-	if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) {
-		if (fHandle->installFiles(pdbfilename, false)) {
-			DBInfo dbinfo;
-			// Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
-			// first fill everything with 0, so we won't have a buffer overflow.
-			memset(&dbinfo.name[0], 0, 33);
-			strncpy(&dbinfo.name[0], dbname.latin1(), 30);
-
-			docSyncInfo syncInfo(dbname, constructTXTFileName(dbname), pdbfilename, eSyncNone);
-			syncInfo.dbinfo=dbinfo;
-			needsSync(syncInfo);
-			fSyncInfoList.append(syncInfo);
-			fDBNames.append(dbname);
-		} else {
-#ifdef DEBUG
-			DEBUGKPILOT<<"Could not install database "<hasConflicts);
-	if (show) {
-		if (!dlg || !dlg->exec() ) {
-			KPILOT_DELETE(dlg)
-			emit logMessage(i18n("Sync aborted by user."));
-			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-			return;
-		}
-	}
-	KPILOT_DELETE(dlg)
-
-
-	// fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file
-	fDBNames.clear();
-	fSyncInfoListIterator=fSyncInfoList.begin();
-	TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
-	return;
-}
-
-
-
-void DOCConduit::syncDatabases() {
-	FUNCTIONSETUP;
-	if (fSyncInfoListIterator==fSyncInfoList.end()) {
-		// We're done, so clean up
-		TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-		return;
-	}
-
-	docSyncInfo sinfo=(*fSyncInfoListIterator);
-	++fSyncInfoListIterator;
-
-	switch (sinfo.direction) {
-		case eSyncConflict:
-#ifdef DEBUG
-			DEBUGKPILOT<<"Entry "<database( dbname );
-	}
-}
-
-
-bool DOCConduit::needsSync(docSyncInfo &sinfo)
-{
-	FUNCTIONSETUP;
-	sinfo.direction = eSyncNone;
-
-	PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name));
-	if (!fDBListSynced.contains(sinfo.handheldDB)) {
-		// the database wasn't included on last sync, so it has to be new.
-#ifdef DEBUG
-		DEBUGKPILOT<<"Database "<HH      HH->PC
-			-----------------------------------------
-			N   -   |     P          P           D
-			-   N   |     H          D           H
-			N   N   |     C          P           H
-		*/
-
-		if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
-		else sinfo.fPCStatus=eStatDoesntExist;
-		if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
-		else sinfo.fPalmStatus=eStatDoesntExist;
-		KPILOT_DELETE(docdb);
-
-		switch (eSyncDirection) {
-			case eSyncPDAToPC:
-				if (sinfo.fPalmStatus==eStatDoesntExist)
-					sinfo.direction=eSyncDelete;
-				else sinfo.direction=eSyncPDAToPC;
-				break;
-			case eSyncPCToPDA:
-				if (sinfo.fPCStatus==eStatDoesntExist)
-					sinfo.direction=eSyncDelete;
-				else sinfo.direction=eSyncPCToPDA;
-				break;
-			case eSyncNone: // means actually both directions!
-				if (sinfo.fPCStatus==eStatNew) {
-					if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict;
-					else sinfo.direction=eSyncPCToPDA;
-				} else {
-					if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
-					else {
-						sinfo.direction=eSyncNone;
-#ifdef DEBUG
-						DEBUGKPILOT<<"I'm supposed to find a sync direction, but the "<<
-						" text "<isOpen()) sinfo.fPalmStatus=eStatDeleted;
-	else if (hhTextChanged(docdb)) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Handheld side has changed!"<HH      HH->PC
-			-----------------------------------------
-			-   -   |     -          -           -
-			C   -   |     P          P           H
-			-   C   |     H          P           H
-			C   C   |     C          P           H
-			D   -   |     D          D           H
-			-   D   |     D          P           D
-			D   D   |     D          D           D
-			-----------------------------------------
-			C   D   |     C          P           D
-			D   C   |     C          D           H
-		*/
-
-
-	if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Nothing has changed, not need for a sync."<HH or HH->PC)
-	// should be done, check if the DB was deleted or if we are supposed
-	// to sync that direction
-
-	if (eSyncDirection==eSyncPCToPDA) {
-		if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete;
-		else sinfo.direction=eSyncPCToPDA;
-		return true;
-	}
-	if (eSyncDirection==eSyncPDAToPC) {
-		if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete;
-		else sinfo.direction=eSyncPDAToPC;
-		return true;
-	}
-
-
-	// ---------------------------------------------------------------
-	// Finally, do the normal case, where both directions are possible
-	// ---------------------------------------------------------------
-
-
-	// if either is deleted, and the other is not changed, delete
-	if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) ||
-	     ((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT<<"DB was deleted on one side and not changed on "
-			"the other -> Delete it."<retrieveDatabase(sinfo.pdbfilename, &dbinfo) )
-				{
-					WARNINGKPILOT << "Unable to retrieve database " << dbinfo.name <<
-						" from the handheld into " << sinfo.pdbfilename << "." << endl;
-					return 0L;
-				}
-			}
-			break;
-		case eSyncPCToPDA:
-			if (DOCConduitSettings::keepPDBsLocally())
-			{
-				// make sure the dir for the local db really exists!
-				TQDir dir(DOCConduitSettings::pDBDirectory());
-				if (!dir.exists())
-				{
-					dir.mkdir(dir.absPath());
-				}
-			}
-			break;
-		default:
-			break;
-	}
-	if (DOCConduitSettings::keepPDBsLocally())
-	{
-		return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
-			TQString::fromLatin1(dbinfo.name), false);
-	}
-	else
-	{
-		return deviceLink()->database(TQString::fromLatin1(dbinfo.name));
-	}
-}
-
-
-// res gives us information whether the sync worked and the db might need to be
-// transferred to the handheld or not (and we just need to clean up the mess)
-bool DOCConduit::postSyncAction(PilotDatabase * database,
-                                docSyncInfo &sinfo, bool res)
-{
-	FUNCTIONSETUP;
-	bool rs = true;
-
-	switch (sinfo.direction)
-	{
-	case eSyncPDAToPC:
-		// also reset the sync flags on the handheld
-#ifdef DEBUG
-		DEBUGKPILOT<<"Resetting sync flags for database "
-			<database(
-				TQString::fromLatin1(sinfo.dbinfo.name));
-#ifdef DEBUG
-			DEBUGKPILOT<<"Middle 1 Resetting sync flags for database "
-				<resetSyncFlags();
-				KPILOT_DELETE(db);
-			}
-		}
-#ifdef DEBUG
-		DEBUGKPILOT<<"End Resetting sync flags for database "
-			<(database);
-			if (localdb)
-			{
-#ifdef DEBUG
-				DEBUGKPILOT<<"Installing file "<dbPathName()<<" ("
-					<dbPathName();
-				// This deletes localdb as well, which is just a cast from database
-				KPILOT_DELETE(database);
-				if (!fHandle->installFiles(dbpathname, false))
-				{
-					rs = false;
-#ifdef DEBUG
-					DEBUGKPILOT<<"Could not install the database "<writeConfig();
-
-	emit syncDone(this);
-}
-
diff --git a/kpilot/conduits/docconduit/doc-conduit.h b/kpilot/conduits/docconduit/doc-conduit.h
deleted file mode 100644
index aefb4264f..000000000
--- a/kpilot/conduits/docconduit/doc-conduit.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef _doc_CONDUIT_H
-#define _doc_CONDUIT_H
-/* doc-conduit.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include 
-
-class docSyncInfo;
-typedef TQValueList syncInfoList;
-
-typedef enum eSyncDirectionEnum {
-		eSyncNone,
-//		eSyncAll,
-		eSyncPDAToPC,
-		eSyncPCToPDA,
-		eSyncDelete,
-		eSyncConflict
-	};
-typedef enum eTextStatus {
-	eStatNone=0,
-	eStatNew=1,
-	eStatChanged=2,
-	eStatBookmarksChanged=4,
-	eStatDeleted=8,
-	eStatDoesntExist=16
-	};
-
-
-TQString dirToString(eSyncDirectionEnum dir);
-
-class DOCConduit:public ConduitAction {
-Q_OBJECT
-public:
-	eSyncDirectionEnum eSyncDirection;
-
-public:
-	DOCConduit(KPilotLink * o,
-		const char *n = 0L, const TQStringList & a = TQStringList());
-	 virtual ~ DOCConduit();
-
-	bool encode(TQStringList fileName, PilotDatabase * db);
-	bool decode(PilotDatabase * db, TQString fileName);
-	virtual bool exec();
-protected:
-	virtual bool isCorrectDBTypeCreator(DBInfo dbinfo);
-	virtual const unsigned long dbtype();
-	virtual const unsigned long dbcreator();
-
-public slots:
-/** syncNextDB walks through all PalmDoc databases on the handheld and decides if they are supposed to be synced to the PC.
- * syncNextDB and syncNextDOC fist build the list of all PalmDoc texts, and then the method syncDatabases does the actual sync. */
-	void syncNextDB();
-	void syncNextTXT();
-	void checkPDBFiles();
-	void checkDeletedDocs();
-	void resolve();
-	void syncDatabases();
-	void cleanup();
-
- private:
-	 /**
-    * Read the global KPilot config file for settings
-    * particular to the docConduit conduit.
-    */
-	void readConfig();
-
-	/**
-	* Check if the database needs to be synced at all.
-	*/
-	bool needsSync(docSyncInfo &sinfo);
-	 /**
-    * If necessary, copy the database from the palm to a local dir.
-    * Also initialize the docDBInfo that will be passed to the docconverter
-    */
-	PilotDatabase *preSyncAction(docSyncInfo &sinfo) const;
-
-	bool doSync(docSyncInfo &sinfo);
-	 /**
-    * Clean up after the sync. The bool parameter res tells
-    * the function if the  conversion was successful or not
-    */
-	bool postSyncAction(PilotDatabase * dbinfo, docSyncInfo &sinfo, bool res = true);
-
-	bool pcTextChanged(TQString txtfn);
-	bool hhTextChanged(PilotDatabase*docdb);
-
-	/** Opens the database with name dbname. For a local sync, this will be a
-	 *  PilotLocalDatabase, otherwise it will be a database on the serial device
-	 *  (i.e. an object of class PilotSerialDatabase) */
-	PilotDatabase *openDOCDatabase(const TQString &dbname);
-
-	TQString constructPDBFileName(TQString name);
-	TQString constructTXTFileName(TQString name);
-
-	eSyncDirectionEnum  eConflictResolution;
-	int fTXTBookmarks, fPDBBookmarks;
-	TQStringList fDBListSynced;
-	TQStringList fDBNames;
-	syncInfoList fSyncInfoList;
-	syncInfoList::Iterator fSyncInfoListIterator;
-	long int dbnr;
-
-	TQStringList docnames;
-	TQStringList::Iterator dociterator;
-};
-
-class docSyncInfo
-{
-public:
-	docSyncInfo(TQString hhDB=TQString(), TQString txtfn=TQString(), TQString pdbfn=TQString(), eSyncDirectionEnum dir=eSyncNone)
-	{
-		handheldDB=hhDB;
-		txtfilename=txtfn;
-		pdbfilename=pdbfn;
-		direction=dir;
-		fPCStatus=eStatNone;
-		fPalmStatus=eStatNone;
-	};
-	~docSyncInfo(){};
-	TQString handheldDB, txtfilename, pdbfilename;
-	DBInfo dbinfo;
-	eSyncDirectionEnum direction;
-	eTextStatus fPCStatus, fPalmStatus;
-};
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.cc b/kpilot/conduits/docconduit/doc-conflictdialog.cc
deleted file mode 100644
index 50ecbbd1e..000000000
--- a/kpilot/conduits/docconduit/doc-conflictdialog.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "doc-conflictdialog.moc"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-
-ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk )
-    : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) {
-	FUNCTIONSETUP;
-	syncInfo=sinfo;
-	hasConflicts=false;
-
-	TQWidget *page = new TQWidget( this );
-	setMainWidget(page);
-	TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
-
-	// First, insert the texts on top:
-	textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page);
-	textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
-	topLayout->addWidget(textLabel1);
-
-	textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ),  page );
-	textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
-	topLayout->addWidget(textLabel2);
-
-	resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
-	TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox);
-	TQScrollView* sv = new TQScrollView(resolutionGroupBox);
-	playout->addWidget(sv);
-	sv->setResizePolicy(TQScrollView::AutoOneFit);
-	sv->setHScrollBarMode(TQScrollView::AlwaysOff);
-	sv->setMargin(5);
-	TQFrame* big_box = new TQFrame(sv->viewport());
-	sv->addChild(big_box);
-
-
-	resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 );
-	resolutionGroupBoxLayout->setAlignment( Qt::AlignTop );
-
-	// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
-	TQButtonGroup *bgroup = new TQButtonGroup( this );
-	bgroup->hide();
-	TQObject::connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotInfo(int)));
-
-	if (syncInfo) {
-		DEBUGKPILOT<<"Adding resolution options for the databases "<begin(); it!=syncInfo->end(); ++it ) {
-			docSyncInfo si=(*it);
-			conflictEntry cE;
-			cE.index=nr;
-			cE.conflict=(si.direction==eSyncConflict);
-			DEBUGKPILOT<<"Adding "<")+text+CSL1("");
-				DEBUGKPILOT<<"We have a conflict for database "<addWidget( cE.dbname, cE.index, 0 );
-
-			cE.resolution=new TQComboBox( FALSE, big_box);
-			cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
-				(TQSizePolicy::SizeType)0, 0, 0,
-				cE.resolution->sizePolicy().hasHeightForWidth() ) );
-			cE.resolution->clear();
-			cE.resolution->insertItem( i18n( "No Sync" ) );
-			cE.resolution->insertItem( i18n( "Sync Handheld to PC" ) );
-			cE.resolution->insertItem( i18n( "Sync PC to Handheld" ) );
-			cE.resolution->insertItem( i18n( "Delete Both Databases" ) );
-			cE.resolution->setCurrentItem((int)si.direction);
-			resolutionGroupBoxLayout->addWidget( cE.resolution, cE.index, 1);
-
-			cE.info = new TQPushButton( i18n("More Info..."), big_box );
-			resolutionGroupBoxLayout->addWidget(cE.info, cE.index, 2);
-			bgroup->insert(cE.info);
-
-			conflictEntries.append(cE);
-			++nr;
-		}
-	} else {
-		WARNINGKPILOT << "The list of text files is not available to the resolution dialog." << endl;
-	}
-
-
-	topLayout->addWidget( resolutionGroupBox );
-	resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
-
-	if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
-	if (tickleTimer) {
-		connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()) );
-		tickleTimer->start( 10000 ); // tickle the palm every 10 seconds to prevent a timeout until the sync is really finished.
-	}
-
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-ResolutionDialog::~ResolutionDialog()
-{
-	// no need to delete child widgets, Qt does it all for us
-}
-
-/* virtual slot */ void ResolutionDialog::slotOk() {
-	FUNCTIONSETUP;
-	TQValueList::Iterator ceIt;
-	for (ceIt=conflictEntries.begin(); ceIt!=conflictEntries.end(); ++ceIt) {
-		(*syncInfo)[(*ceIt).index].direction=(eSyncDirectionEnum)((*ceIt).resolution->currentItem());
-	}
-	KDialogBase::slotOk();
-}
-
-TQString eTextStatusToString(eTextStatus stat) {
-	switch(stat) {
-		case eStatNone: return i18n("unchanged");
-		case eStatNew: return i18n("new");
-		case eStatChanged: return i18n("changed");
-		case eStatBookmarksChanged: return i18n("only bookmarks changed");
-		case eStatDeleted: return i18n("deleted");
-		case eStatDoesntExist: return i18n("does not exist");
-		default: return i18n("unknown");
-	}
-}
-
-void ResolutionDialog::slotInfo(int index) {
-	FUNCTIONSETUP;
-	conflictEntry cE=conflictEntries[index];
-	int ix=cE.index;
-	if (!syncInfo) return;
-	docSyncInfo si=(*syncInfo)[ix];
-	TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
-	text+=i18n("Handheld: %1\n").arg(eTextStatusToString(si.fPalmStatus));
-	text+=i18n("Desktop: %1\n").arg(eTextStatusToString(si.fPCStatus));
-
-	KMessageBox::information(this, text, i18n("Database information"));
-}
-
-
-void ResolutionDialog::_tickle() {
-	FUNCTIONSETUP;
-	if (fHandle) fHandle->tickle();
-}
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h
deleted file mode 100644
index f0c8b2163..000000000
--- a/kpilot/conduits/docconduit/doc-conflictdialog.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef CONFLICTDIALOG_H
-#define CONFLICTDIALOG_H
-/* doc-conflictdialog.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include 
-#include "doc-conduit.h"
-
-
-class TQComboBox;
-class TQGridLayout;
-class TQGroupBox;
-
-class TQLabel;
-class TQPushButton;
-class TQTimer;
-class KPilotLink;
-
-
-typedef struct conflictEntry {
-	TQLabel*dbname;
-	TQComboBox* resolution;
-	TQPushButton*info;
-	int index;
-	bool conflict;
-};
-
-
-class ResolutionDialog : public KDialogBase
-{
-	Q_OBJECT
-
-public:
-	ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
-	~ResolutionDialog();
-
-	bool hasConflicts;
-public slots:
-	void _tickle();
-protected:
-	TQTimer* tickleTimer;
-	KPilotLink* fHandle;
-
-protected:
-	TQGroupBox* resolutionGroupBox;
-	TQGridLayout*resolutionGroupBoxLayout;
-
-	syncInfoList*syncInfo;
-	TQValueList conflictEntries;
-	TQLabel *textLabel1,*textLabel2;
-
-protected slots:
-	virtual void slotOk();
-	void slotInfo(int index);
-
-};
-
-#endif // CONFLICTDIALOG_H
diff --git a/kpilot/conduits/docconduit/doc-factory.cc b/kpilot/conduits/docconduit/doc-factory.cc
deleted file mode 100644
index cfab20f4d..000000000
--- a/kpilot/conduits/docconduit/doc-factory.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the doc-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "doc-factory.moc"
-#include "doc-factory.h"
-
-#include 
-#include 
-#include 
-
-#include "doc-conduit.h"
-#include "doc-setup.h"
-
-
-extern "C" {
-	void *init_conduit_doc() {
-		return new DOCConduitFactory;
-	}
-}
-
-
-
-// A number of static variables
-KAboutData * DOCConduitFactory::fAbout = 0L;
-
-const char *DOCConduitFactory::dbDOCtype = "TEXt";
-const char *DOCConduitFactory::dbDOCcreator = "REAd";
-
-
-
-DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n):
-KLibFactory(p, n)
-{
-	FUNCTIONSETUP;
-	fInstance = new KInstance("docconduit");
-	fAbout =new KAboutData("docconduit",
-		I18N_NOOP("Palm DOC Conduit for KPilot"), KPILOT_VERSION,
-		I18N_NOOP("Configures the DOC Conduit for KPilot"),
-		KAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer");
-
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Maintainer"), "reinhold@kainhofer.com",
-		"http://reinhold.kainhofer.com");
-}
-
-DOCConduitFactory::~DOCConduitFactory()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE(fInstance);
-	KPILOT_DELETE(fAbout);
-}
-
-
-/* virtual */ TQObject * DOCConduitFactory::createObject(TQObject * p,
-	const char *n, const char *c, const TQStringList & a)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname <<": Creating object of class " <(p);
-		if (w)
-		{
-			return new DOCWidgetConfig(w,n);
-		}
-		else
-		{
-			WARNINGKPILOT << "Couldn't cast parent to widget." << endl;
-			return 0L;
-		}
-	}
-	if (qstrcmp(c, "SyncAction") == 0)
-	{
-		KPilotLink * d = dynamic_cast < KPilotLink * >(p);
-		if (d)
-		{
-			return new DOCConduit(d, n, a);
-		}
-		else
-		{
-			WARNINGKPILOT << "Couldn't cast parent to KPilotLink" <
-	
-class KInstance;
-class KAboutData;
-
-
-class DOCConduitFactory:public KLibFactory 
-{
- 
-Q_OBJECT 
- 
-public:
-	DOCConduitFactory(TQObject * = 0L, const char * = 0L);
-	virtual ~ DOCConduitFactory();
-	
-	static KAboutData *about() { 
-		return fAbout;
-	};
-
-	static const char 
-		*fDBListSynced;
-	static const char *dbDOCtype;
-	static const char *dbDOCcreator;
- 
-
-protected:
-	virtual TQObject * createObject(TQObject * parent = 0, 
-		const char *name = 0, 
-		const char *classname = "TQObject", 
-		const TQStringList & args = TQStringList());
- 
-private:
-	KInstance * fInstance;
-	static KAboutData *fAbout;
-};
-
-
-extern "C" {
-	void *init_libdocconduit();
-}
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/doc-setup.cc b/kpilot/conduits/docconduit/doc-setup.cc
deleted file mode 100644
index 6e6858a5c..000000000
--- a/kpilot/conduits/docconduit/doc-setup.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the setup dialog for the doc-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include "doc-setupdialog.h"
-#include "doc-factory.h"
-#include "doc-setup.h"
-#include "docconduitSettings.h"
-
-
-DOCWidgetConfig::DOCWidgetConfig(TQWidget * w, const char *n):
-	ConduitConfigBase(w, n),
-	fConfigWidget(new DOCWidget(w))
-{
-	FUNCTIONSETUP;
-
-	fWidget=fConfigWidget;
-
-	TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
-	for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it)
-	{
-		fConfigWidget->fEncoding->insertItem(*it);
-	}
-
-	fConfigWidget->fTXTDir->setMode(KFile::Directory);
-	fConfigWidget->fPDBDir->setMode(KFile::Directory);
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,DOCConduitFactory::about());
-
-	fConduitName=i18n("Palm DOC");
-
-#define CMOD(a,b) connect(fConfigWidget->a,TQT_SIGNAL(b),this,TQT_SLOT(modified()))
-	CMOD(fTXTDir,textChanged(const TQString &));
-	CMOD(fPDBDir,textChanged(const TQString &));
-	CMOD(fkeepPDBLocally,clicked());
-	CMOD(fConflictResolution,clicked(int));
-	CMOD(fConvertBookmarks,stateChanged(int));
-	CMOD(fBookmarksBmk,stateChanged(int));
-	CMOD(fBookmarksInline,stateChanged(int));
-	CMOD(fBookmarksEndtags,stateChanged(int));
-	CMOD(fCompress,stateChanged(int));
-	CMOD(fSyncDirection,clicked(int));
-	CMOD(fNoConversionOfBmksOnly,stateChanged(int));
-	CMOD(fAlwaysUseResolution,stateChanged(int));
-	CMOD(fPCBookmarks,clicked(int));
-	CMOD(fEncoding,textChanged(const TQString &));
-#undef CMOD
-
-	fConfigWidget->adjustSize();
-}
-
-/* virtual */ void DOCWidgetConfig::commit()
-{
-	FUNCTIONSETUP;
-
-	DOCConduitSettings::setTXTDirectory( fConfigWidget->fTXTDir->url() );
-	DOCConduitSettings::setPDBDirectory( fConfigWidget->fPDBDir->url() );
-
-	DOCConduitSettings::setKeepPDBsLocally( fConfigWidget->fkeepPDBLocally->isChecked());
-	DOCConduitSettings::setConflictResolution( fConfigWidget->fConflictResolution->id(
-		fConfigWidget->fConflictResolution->selected()) );
-	DOCConduitSettings::setConvertBookmarks(fConfigWidget->fConvertBookmarks->isChecked());
-	DOCConduitSettings::setBmkFileBookmarks(fConfigWidget->fBookmarksBmk->isChecked());
-	DOCConduitSettings::setInlineBookmarks(fConfigWidget->fBookmarksInline->isChecked());
-	DOCConduitSettings::setEndtagBookmarks(fConfigWidget->fBookmarksEndtags->isChecked());
-	DOCConduitSettings::setCompress(fConfigWidget->fCompress->isChecked());
-	DOCConduitSettings::setSyncDirection(fConfigWidget->fSyncDirection->id(
-		fConfigWidget->fSyncDirection->selected()));
-	DOCConduitSettings::setIgnoreBmkChanges(fConfigWidget->fNoConversionOfBmksOnly->isChecked());
-	DOCConduitSettings::setAlwaysShowResolutionDialog(fConfigWidget->fAlwaysUseResolution->isChecked());
-	DOCConduitSettings::setBookmarksToPC( fConfigWidget->fPCBookmarks->id(
-		fConfigWidget->fPCBookmarks->selected()) );
-	DOCConduitSettings::setEncoding( fConfigWidget->fEncoding->currentText() );
-
-	DOCConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void DOCWidgetConfig::load()
-{
-	FUNCTIONSETUP;
-	DOCConduitSettings::self()->readConfig();
-
-	fConfigWidget->fTXTDir->setURL( DOCConduitSettings::tXTDirectory() );
-	fConfigWidget->fPDBDir->setURL( DOCConduitSettings::pDBDirectory() );
-	fConfigWidget->fkeepPDBLocally->setChecked( DOCConduitSettings::keepPDBsLocally() );
-	fConfigWidget->fConflictResolution->setButton(DOCConduitSettings::conflictResolution() );
-	fConfigWidget->fConvertBookmarks->setChecked(DOCConduitSettings::convertBookmarks() );
-	fConfigWidget->fBookmarksBmk->setChecked(DOCConduitSettings::bmkFileBookmarks() );
-	fConfigWidget->fBookmarksInline->setChecked(DOCConduitSettings::inlineBookmarks() );
-	fConfigWidget->fBookmarksEndtags->setChecked(DOCConduitSettings::endtagBookmarks() );
-	fConfigWidget->fCompress->setChecked(DOCConduitSettings::compress() );
-	fConfigWidget->fSyncDirection->setButton(DOCConduitSettings::syncDirection() );
-
-	fConfigWidget->fNoConversionOfBmksOnly->setChecked( DOCConduitSettings::ignoreBmkChanges() );
-	fConfigWidget->fAlwaysUseResolution->setChecked( DOCConduitSettings::alwaysShowResolutionDialog() );
-
-	fConfigWidget->fPCBookmarks->setButton(DOCConduitSettings::bookmarksToPC() );
-	fConfigWidget->fEncoding->setCurrentText(DOCConduitSettings::encoding() );
-	unmodified();
-}
-
diff --git a/kpilot/conduits/docconduit/doc-setup.h b/kpilot/conduits/docconduit/doc-setup.h
deleted file mode 100644
index 32d1b54bc..000000000
--- a/kpilot/conduits/docconduit/doc-setup.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _DOC_DOC_SETUP_H
-#define _DOC_DOC_SETUP_H
-/* doc-setup.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the doc conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class DOCWidget;
-
-class DOCWidgetConfig : public ConduitConfigBase
-{
-public:
-	DOCWidgetConfig(TQWidget *, const char *);
-	virtual void commit();
-	virtual void load();
-protected:
-	DOCWidget *fConfigWidget;
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/doc-setupdialog.ui b/kpilot/conduits/docconduit/doc-setupdialog.ui
deleted file mode 100644
index cbb45e344..000000000
--- a/kpilot/conduits/docconduit/doc-setupdialog.ui
+++ /dev/null
@@ -1,557 +0,0 @@
-
-DOCWidget
-Reinhold Kainhofer
-
-    
-        Form2
-    
-    
-        
-            0
-            0
-            564
-            266
-        
-    
-    
-        
-            3
-            3
-            0
-            0
-        
-    
-    
-        
-            unnamed
-        
-        
-            0
-        
-        
-            6
-        
-        
-            
-                tabWidget
-            
-            
-                
-                    tab
-                
-                
-                    General
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            TextLabel1
-                        
-                        
-                            &Text files:
-                        
-                        
-                            fTXTDir
-                        
-                        
-                            <qt>Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.</qt>
-                        
-                    
-                    
-                        
-                            fkeepPDBLocally
-                        
-                        
-                            Local co&py:
-                        
-                        
-                            true
-                        
-                        
-                            <qt>Check this box if you want to save a copy of the Palm DOC databases (.pdb files) on your PC.</qt>
-                        
-                    
-                    
-                        
-                            fTXTDir
-                        
-                        
-                            <qt>Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.</qt>
-                        
-                    
-                    
-                        
-                            fSyncDirection
-                        
-                        
-                            Synchronization Mode
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                11
-                            
-                            
-                                6
-                            
-                            
-                                
-                                    RadioButton3
-                                
-                                
-                                    Sync only P&C to PDA
-                                
-                                
-                                    2
-                                
-                                
-                                    <qt>Select this option to synchronize texts changed in your PC to Palm DOC databases in your handheld. Palm DOC databases modified in the handheld will not be converted to text files, but texts changed in the PC will be converted to the Palm DOC databases.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton2
-                                
-                                
-                                    Sync only P&DA to PC
-                                
-                                
-                                    <qt>Select this option to synchronize the changes made to Palm DOC databases in your handheld to the PC text files. Palm DOC databases modified in the handheld will be converted to text files, but texts changed in the PC will not be converted to the Palm DOC databases.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton1
-                                
-                                
-                                    Sync &all
-                                
-                                
-                                    true
-                                
-                                
-                                    0
-                                
-                                
-                                    <qt>Select this option to synchronize the file texts in your PC to Palm DOC databases in your handheld. Palm DOC databases modified in the handheld will be converted to text files, and texts changed in the PC will be converted to the Palm DOC databases, keeping both versions in sync.</qt>
-                                
-                            
-                        
-                    
-                    
-                        
-                            Spacer1
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                20
-                            
-                        
-                    
-                    
-                        
-                            fPDBDir
-                        
-                        
-                            <qt>Enter here, or select clicking the file picker button, the name and location of the folder where copies of the handheld databases are kept (.pdb files). Local copies are only made if the box is checked as well.</qt>
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    PC -> Handheld
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            fCompress
-                        
-                        
-                            &Compress
-                        
-                        
-                            true
-                        
-                        
-                            Check this box, if the text should be compressed on the handheld to save memory. Most doc reader on the handheld support compressed texts.
-                        
-                        
-                            <qt>The Palm DOC format supports compressing the text to save memory. Check this box to enable text compression, so the resulting Palm DOC database will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.</qt>
-                        
-                    
-                    
-                        
-                            fConvertBookmarks
-                        
-                        
-                            Convert &bookmarks
-                        
-                        
-                            true
-                        
-                        
-                            <qt>Check this box to enable bookmark creation when converting text files to Palm DOC databases. Most doc readers support bookmarks. In order to create a bookmark, it is necessary to to provide the location in the text where the bookmark should be set and the bookmark title, in at least one of the formats listed below.</qt>
-                        
-                    
-                    
-                        
-                            spacer9
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                20
-                            
-                        
-                    
-                    
-                        
-                            fBookmarksInline
-                        
-                        
-                            &Inline tags in text
-                        
-                        
-                            true
-                        
-                        
-                            Check this box to create bookmarks from inline tags in the text. The inline tag consist of tags in the form <* bookmarktext *>. The bookmark location is set using the location of the inline tag in the text, and  the name is the text between the <* and the *>. The inline tag (<*...*>) will be removed from the text.
-                        
-                    
-                    
-                        
-                            textLabel1
-                        
-                        
-                            &Encoding:
-                        
-                        
-                            fEncoding
-                        
-                    
-                    
-                        
-                            fBookmarksEndtags
-                        
-                        
-                            &Tags at end of text
-                        
-                        
-                            Check this box to convert tags of the form <bookmarkname> at the end of the text to bookmarks. The text inside the tag ("bookmarkname") will be searched in the text, and whenever found, a bookmark will be set there. The endtags <...> will then be removed from the end of the text.
-                        
-                    
-                    
-                        
-                            fBookmarksBmk
-                        
-                        
-                            Regular &expressions in .bmk file
-                        
-                        
-                            <qt>Check this box to use regular expressions in a file to search the text for bookmarks. The file should have the same name as the text file, but should end in .bmk instead of .txt (for instance, the regular expression file for textname.txt should be textname.bmk). See the documentation for a description of the format of the bmk file.</qt>
-                        
-                    
-                    
-                        
-                            fEncoding
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Handheld -> PC
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            spacer16
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                20
-                            
-                        
-                    
-                    
-                        
-                            fNoConversionOfBmksOnly
-                        
-                        
-                            Do not convert, if text unchanged (only bookmarks)
-                        
-                        
-                            <qt>Check this box to avoid syncing the text on the handheld to the PC if you only changed the bookmarks on the handheld (but not the text).</qt>
-                        
-                    
-                    
-                        
-                            fPCBookmarks
-                        
-                        
-                            Convert Bookmarks
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                
-                                    radioButton8
-                                
-                                
-                                    Do &not convert bookmarks
-                                
-                                
-                                    0
-                                
-                                
-                                    <qt>Check this box to avoid converting Palm DOC bookmarks to inline tags or to a bookmark file.</qt>
-                                
-                            
-                            
-                                
-                                    radioButton11
-                                
-                                
-                                    Convert into .bm &file
-                                
-                                
-                                    true
-                                
-                                
-                                    1
-                                
-                                
-                                    <qt>Check this box to convert the Palm DOC database bookmarks to a separate file, in the bmk format (see more about this format in the documentation). The resulting bookmark file shares the same filename as the resulting .txt file, but ends in .bmk instead. This approach creates a clean text file and a bookmark file.</qt>
-                                
-                            
-                            
-                                
-                                    radioButton9
-                                
-                                
-                                    Convert as &inline tags
-                                
-                                
-                                    2
-                                
-                                
-                                    <qt>Check this box to convert the Palm DOC database bookmarks to inline tags, in the form &lt;* BookmarkName *&gt;. These tags are inserted in the text in the position marked by the bookmark, and the text inside the tag corresponds to the bookmark name. Inline tags are easy to create, delete, move and edit.</qt>
-                                
-                            
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Conflicts
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            fConflictResolution
-                        
-                        
-                            Conflict Resolution
-                        
-                        
-                            If the same text was changed on the PC and the handheld, which of the two versions should be used as the new version?
-                        
-                        
-                            <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, the choice is between working with the files out of sync, or discarding the changes in one of them.</qt>
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                
-                                    radioButton12
-                                
-                                
-                                    &No resolution
-                                
-                                
-                                    0
-                                
-                                
-                                    <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to prevent KPilot from overwriting your modifications.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton5
-                                
-                                
-                                    P&DA overrides
-                                
-                                
-                                    1
-                                
-                                
-                                    <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PDA version overwrite the PC version in case of conflict.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton4
-                                
-                                
-                                    P&C overrides
-                                
-                                
-                                    2
-                                
-                                
-                                    <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PC version overwrite the PDA version in case of conflict.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton7
-                                
-                                
-                                    &Ask the user
-                                
-                                
-                                    true
-                                
-                                
-                                    4
-                                
-                                
-                                    <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to show the resolution dialog to let the user decide on a case by case basis.</qt>
-                                
-                            
-                        
-                    
-                    
-                        
-                            fAlwaysUseResolution
-                        
-                        
-                            &Always show the resolution dialog
-                        
-                        
-                            <qt>Check this box to force the resolution dialog to appear even when there are no conflicts.</qt>
-                        
-                    
-                    
-                        
-                            Spacer8
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                20
-                            
-                        
-                    
-                
-            
-        
-    
-
-
-
-
-    
-        fConvertBookmarks
-        toggled(bool)
-        fBookmarksInline
-        setEnabled(bool)
-    
-    
-        fConvertBookmarks
-        toggled(bool)
-        fBookmarksEndtags
-        setEnabled(bool)
-    
-    
-        fConvertBookmarks
-        toggled(bool)
-        fBookmarksBmk
-        setEnabled(bool)
-    
-    
-        fkeepPDBLocally
-        toggled(bool)
-        fPDBDir
-        setEnabled(bool)
-    
-
-
-    fTXTDir
-    fkeepPDBLocally
-    fPDBDir
-    fCompress
-    fConvertBookmarks
-    fBookmarksInline
-    fBookmarksEndtags
-    fBookmarksBmk
-    radioButton11
-    fNoConversionOfBmksOnly
-    RadioButton7
-    fAlwaysUseResolution
-    tabWidget
-    RadioButton1
-
-
-
-    kurlrequester.h
-    klineedit.h
-    kpushbutton.h
-
-
diff --git a/kpilot/conduits/docconduit/doc_conduit.desktop b/kpilot/conduits/docconduit/doc_conduit.desktop
deleted file mode 100644
index 324347e31..000000000
--- a/kpilot/conduits/docconduit/doc_conduit.desktop
+++ /dev/null
@@ -1,58 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=Adds text files to your handheld, suitable for DOC readers.
-Comment[af]=Voeg teks lêers by jou draagbare toestel in DOC leser formaat.
-Comment[bg]=ДобавÑне на текÑтови файлове към мобилно уÑтройÑтво.
-Comment[ca]=Afegeix fitxers de text a la vostra agenda, apropiat per a lectors de DOC.
-Comment[cs]=PÅ™idává textové soubory do vaÅ¡eho Pilotu, výhodné pro Ätenáře dokumentů.
-Comment[da]=Tilføjer tekstfiler til din håndholdte, passende for DOC-læsere.
-Comment[de]=Gibt Textdateien in Taschencomputer ein, passend für DOC-Leser.
-Comment[el]=ΠÏοσθέτει αÏχεία κειμένου στον υπολογιστή παλάμης σας, κατάλληλο για αναγνώστες DOC.
-Comment[es]=Añade archivos de texto a su agenda electrónica. Compatible con los lectores DOC.
-Comment[et]=Lisab DOC-riiderile sobilikud tekstifailid sinu pihuseadmele.
-Comment[eu]=Zure agenda elektronikora DOC irakurleentzako aproposak diren testu fitxategiak gehitzen ditu.
-Comment[fa]=پرونده‌های متن را به دستی شما اضاÙÙ‡ می‌کند، Ú©Ù‡ برای خوانندگان DOC Ù…Ùید است.
-Comment[fi]=Lisää tekstitiedostoja taskutietokoneeseen. Tämä on käyttökelpoinen DOC-lukijoille.
-Comment[fr]=Ajoute des fichiers texte à votre Palm, approprié pour les lecteurs de DOC.
-Comment[fy]=Heakket tekstfjilden ta oan jo handheld, geskikt faor DOC-lêzers.
-Comment[gl]=Engade ficheiros de texto ao seu aparello de man, axeitado para os lectores DOC.
-Comment[hu]=Szöveges fájlok hozzáadása a kézi számítógéphez, DOC-olvasók számára.
-Comment[is]=Bætir textaskrám, sem hægt er að lesa í DOC lesara, við lófatölvuna þína.
-Comment[it]=Aggiunge file di testo al tuo Pilot, adatti per lettori DOC.
-Comment[ja]=テキストファイルを DOC リーダーã«é©ã—ãŸå½¢å¼ã§ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã«è¿½åŠ ã—ã¾ã™ã€‚
-Comment[kk]=DOC файлды оқи алатын қалта құрылғыға мәтінді көшіру.
-Comment[km]=បន្ážáŸ‚ម​ឯកសារ​អážáŸ’ážáž”ទ​ទៅ​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នក (សមស្រប​សម្រាប់​កម្មវិធី​អាន DOC) ។
-Comment[lt]=Prideda teksto bylas prie Jūsų nešiojamos knygelės, tinka DOC skaityklėms.
-Comment[ms]=Menambah fail teks ke komputer telapak, sesuai dengan pembaca DOC.
-Comment[nb]=Legger til tekstfiler på PDA-en, som passer for DOC-lesere.
-Comment[nds]=Föögt Textdateien op den Handreekner to, de för DOC-Kiekers passt.
-Comment[ne]=DOC रिडरका लागि उपयà¥à¤•à¥à¤¤ हà¥à¤¨à¥‡ पाठ फाइल तपाईà¤à¤•à¥‹ हà¥à¤¯à¤¾à¤¨à¥à¤¡à¤¹à¥‡à¤²à¥à¤¡à¤®à¤¾ थपà¥à¤¦à¤› ।
-Comment[nl]=Voegt tekstvelden toe aan uw handheld, geschikt voor DOC-lezers.
-Comment[nn]=Legg til tekstfiler på den handhaldne, passar til DOC-lesarar.
-Comment[pl]=Dodaje pliki tekstowe do Twojego palmtopa, w postaci odpowiedniej dla przeglÄ…darek DOC.
-Comment[pt]=Adiciona ficheiros de texto ao seu PDA, indicado para os leitores de DOC.
-Comment[pt_BR]=Adiciona arquivos de texto ao seu handheld, adequado para leitors de DOC.
-Comment[ru]=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñ‚ÐµÐºÑтовых файлов на КПК.
-Comment[sk]=Pridá textové súbory do ruÄného zariadenia, vhodné pre Äítanie DOC.
-Comment[sl]=V vaÅ¡ roÄni raÄunalnik doda besedilne datoteke, primerne za bralnike DOC.
-Comment[sr]=Додаје текÑтуалне фајлове вашем ручном рачунару, погодне за DOC читаче.
-Comment[sr@Latn]=Dodaje tekstualne fajlove vaÅ¡em ruÄnom raÄunaru, pogodne za DOC ÄitaÄe.
-Comment[sv]=Lägger till textfiler i en handdator, lämpliga för DOC-läsare.
-Comment[ta]=DOC  படிபà¯à®ªà®µà®°à¯à®•à®³à¯à®•à¯à®•à¯ பொரà¯à®¤à¯à®¤à®®à®¾à®© உஙà¯à®•à®³à¯ பைலடà¯à®Ÿà¯à®•à¯à®•à¯à®°à®¿à®¯ உரை கோபà¯à®ªà¯à®•à®³à¯ˆ சேரà¯à®•à¯à®•à¯à®®à¯
-Comment[tr]=Metin dosyalarını el bilgisayarınıza ekler, DOC biçimi okuyucuları için uygundur.
-Comment[uk]=Додає текÑтові файли до вашого кишенькового приÑтрою так, що вони читатимутьÑÑ Ñƒ переглÑдачах DOC.
-Comment[zh_CN]=将文本文件添加到您的手æŒè®¾å¤‡ä¸­ï¼Œä»¥ä¾¿é€‚åˆ DOC 阅读程åºã€‚
-Comment[zh_TW]=新增文字到您的 handheld。
-Name=Palm DOC
-Name[ca]=DOC de Palm
-Name[cy]=DOC Palm
-Name[de]=Palm-DOC
-Name[fa]=رایانۀ جیبی DOC
-Name[hi]=पॉम डॉक
-Name[nds]=Palm-DOC
-Name[ne]=पालà¥à¤® DOC
-Name[pt]=DOC do Palm
-Name[ta]=பாம௠ஆவணமà¯
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_doc
diff --git a/kpilot/conduits/docconduit/docconduit.kcfg b/kpilot/conduits/docconduit/docconduit.kcfg
deleted file mode 100644
index 6301f4595..000000000
--- a/kpilot/conduits/docconduit/docconduit.kcfg
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-   
-  
-    
-    
-    
-        false
-    
-    
-      false
-    
-    
-        0
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        1
-    
-    
-        false
-    
-    
-        false
-    
-    
-        0
-    
-    
-        
-    
-    
-	ISO8859-15
-    
-  
-
-
diff --git a/kpilot/conduits/docconduit/docconduitSettings.kcfgc b/kpilot/conduits/docconduit/docconduitSettings.kcfgc
deleted file mode 100644
index 2a9a3a0f7..000000000
--- a/kpilot/conduits/docconduit/docconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=docconduit.kcfg
-ClassName=DOCConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/docconduit/kpalmdoc.cpp b/kpilot/conduits/docconduit/kpalmdoc.cpp
deleted file mode 100644
index 55956cf48..000000000
--- a/kpilot/conduits/docconduit/kpalmdoc.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* converter.cpp
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is the main program of the KDE PalmDOC converter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-
-#include "kpalmdoc_dlg.h"
-
-
-
-int main(int argc, char *argv[])
-{
-
-	KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
-		"KPalmDOC - KDE Converter for PalmDOC texts.\n\n",
-		KAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer");
-	about.addAuthor("Reinhold Kainhofer", I18N_NOOP("Main Developer"),
-		"reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
-	about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"),
-		"groot@kde.org", "http://www.kpilot.org/");
-
-	KCmdLineArgs::init(argc, argv, &about);
-	KApplication::addCmdLineOptions();
-
-	KApplication app;
-	ConverterDlg *dlg=new ConverterDlg(0L, i18n("PalmDOC Converter"));
-	dlg->show();
-	return app.exec();
-}
-
diff --git a/kpilot/conduits/docconduit/kpalmdoc.desktop b/kpilot/conduits/docconduit/kpalmdoc.desktop
deleted file mode 100644
index 6acbf66fd..000000000
--- a/kpilot/conduits/docconduit/kpalmdoc.desktop
+++ /dev/null
@@ -1,64 +0,0 @@
-# KDE Config File
-[Desktop Entry]
-Name=KPalmDOC
-Name[hi]=के-पॉम-डॉक
-Name[sv]=Kpalm DOC
-Name[ta]=கேகைdoc
-GenericName=PalmDOC Converter
-GenericName[af]=PalmDOC omskakelaar
-GenericName[bg]=Конвертиране на PalmDOC
-GenericName[bs]=PalmDOC konverter
-GenericName[ca]=Convertidor a PalmDOC
-GenericName[cs]=Konvertor PalmDoc
-GenericName[cy]=Trosiadydd PalmDOC
-GenericName[da]=PalmDOC konverterer
-GenericName[de]=PalmDOC-Konvertierung
-GenericName[el]=ΜετατÏοπέας PalmDOC
-GenericName[eo]=PalmDOC-konvertilo
-GenericName[es]=Conversor de PalmDOC
-GenericName[et]=PalmDOC konverter
-GenericName[eu]=PalmDOC bihurtzailea
-GenericName[fa]=مبدل PalmDOC
-GenericName[fi]=PalmDOC-muunnin
-GenericName[fr]=Convertisseur PalmDOC
-GenericName[fy]=PalmDOC-oersetter
-GenericName[ga]=Tiontaire PalmDOC
-GenericName[gl]=Convertidor de PalmDOC
-GenericName[hi]=पॉम-डॉक परिवरà¥à¤¤à¤•
-GenericName[hu]=PalmDOC-konverter
-GenericName[is]=PalmDOC umbreytir
-GenericName[it]=Convertitore PalmDOC
-GenericName[ja]= PalmDOC コンãƒãƒ¼ã‚¿
-GenericName[kk]=PalmDOC аударғышы
-GenericName[km]=កម្មវិធី​បម្លែង PalmDOC
-GenericName[lt]=PalmDOC konverteris
-GenericName[ms]=Penukar PalmDOC 
-GenericName[nb]=PalmDOC-konvertering
-GenericName[nds]=PalmDOC-Ãœmwanneln
-GenericName[ne]=PalmDOC रà¥à¤ªà¤¾à¤¨à¥à¤¤à¤°à¤£à¤•à¤°à¥à¤¤à¤¾
-GenericName[nl]=PalmDOC-conversie
-GenericName[nn]=PalmDOC-omformar
-GenericName[pl]=Konwerter formatu PalmDOC
-GenericName[pt]=Conversor de PalmDOC
-GenericName[pt_BR]=Conversor para PalmDOC
-GenericName[ro]=Convertor PalmDOC
-GenericName[ru]=Конвертер PalmDOC
-GenericName[sk]=PalmDOC prevod
-GenericName[sl]=Pretvornik v PalmDOC
-GenericName[sr]=PalmDOC конвертор
-GenericName[sr@Latn]=PalmDOC konvertor
-GenericName[sv]=Konvertering av Palm DOC
-GenericName[ta]=பாமà¯DOC மாறà¯à®±à®¿
-GenericName[tg]=Конвертёри PalmDOC
-GenericName[tr]=PalmDOC Çevirici
-GenericName[uk]=Перетворювач PalmDOC
-GenericName[zh_CN]=PalmDOC 转æ¢å™¨
-GenericName[zh_TW]=PalmDOC 轉æ›å™¨
-Exec=kpalmdoc
-Icon=kpalmdoc
-Type=Application
-DocPath=kpalmdoc/index.html
-Terminal=false
-X-KDE-StartupNotify=true
-X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Utility;X-KDE-Utilities-File;Office;PDA;
diff --git a/kpilot/conduits/docconduit/kpalmdoc.kcfg b/kpilot/conduits/docconduit/kpalmdoc.kcfg
deleted file mode 100644
index 4d3d22119..000000000
--- a/kpilot/conduits/docconduit/kpalmdoc.kcfg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-  
-	
-    
-    
-    
-        false
-    
-    
-       true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        true
-    
-    
-        0
-    
-    
-        ISO8859-15
-    
-	
-
diff --git a/kpilot/conduits/docconduit/kpalmdoc.upd b/kpilot/conduits/docconduit/kpalmdoc.upd
deleted file mode 100644
index 77d3d1eeb..000000000
--- a/kpilot/conduits/docconduit/kpalmdoc.upd
+++ /dev/null
@@ -1,6 +0,0 @@
-Id=kdepim_3.3
-File=converterrc
-Group=,General
-AllKeys
-
-
diff --git a/kpilot/conduits/docconduit/kpalmdocSettings.kcfgc b/kpilot/conduits/docconduit/kpalmdocSettings.kcfgc
deleted file mode 100644
index 6da45c5e2..000000000
--- a/kpilot/conduits/docconduit/kpalmdocSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=kpalmdoc.kcfg
-ClassName=KPalmDocSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc b/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
deleted file mode 100644
index 29713ffae..000000000
--- a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
+++ /dev/null
@@ -1,529 +0,0 @@
-/* kpalmdoc_dlg.cpp
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is the main dialog of the KDE PalmDOC converter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include "kpalmdoc_dlg.h"
-#include "kpalmdoc_dlgbase.h"
-#include "DOC-converter.h"
-#include "kpalmdocSettings.h"
-
-
-ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
-   : KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1,
-	   KDialogBase::Close, true, i18n("&About"))
-{
-	TQWidget *page = makeHBoxMainWidget();
-	dlg=new ConverterDlgBase(page);
-	TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
-	for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it)
-	{
-		dlg->fEncoding->insertItem(*it);
-	}
-
-	readSettings();
-
-	connect(dlg->fDirectories, TQT_SIGNAL(toggled(bool)),
-		this, TQT_SLOT(slotDirectories(bool)));
-	connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
-	connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
-
-	resize(minimumSize());
-}
-
-ConverterDlg::~ConverterDlg()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-void ConverterDlg::writeSettings()
-{
-	// General page
-	KPalmDocSettings::setTXTFolder( dlg->fTXTDir->url() );
-	KPalmDocSettings::setPDBFolder( dlg->fPDBDir->url() );
-	KPalmDocSettings::setSyncFolders( dlg->fDirectories->isChecked() );
-	KPalmDocSettings::setAskOverwrite( dlg->fAskOverwrite->isChecked() );
-	KPalmDocSettings::setVerboseMessages( dlg->fVerbose->isChecked() );
-	KPalmDocSettings::setEncoding( dlg->fEncoding->currentText() );
-
-	// PC->Handheld page
-	KPalmDocSettings::setCompress( dlg->fCompress->isChecked() );
-	KPalmDocSettings::setConvertBookmarks( dlg->fConvertBookmarks->isChecked() );
-	KPalmDocSettings::setBookmarksInline( dlg->fBookmarksInline->isChecked() );
-	KPalmDocSettings::setBookmarksEndtags( dlg->fBookmarksEndtags->isChecked() );
-	KPalmDocSettings::setBookmarksBmk( dlg->fBookmarksBmk->isChecked() );
-
-	// Handheld->PC page
-	KPalmDocSettings::setBookmarksToPC( dlg->fPCBookmarks->id(dlg->fPCBookmarks->selected()) );
-
-	KPalmDocSettings::self()->writeConfig();
-}
-
-void ConverterDlg::readSettings()
-{
-	FUNCTIONSETUP;
-
-	KPalmDocSettings::self()->readConfig();
-
-	// General Page:
-	dlg->fTXTDir->setURL(KPalmDocSettings::tXTFolder());
-	dlg->fPDBDir->setURL(KPalmDocSettings::pDBFolder());
-	bool dir=KPalmDocSettings::syncFolders();
-	dlg->fDirectories->setChecked(dir);
-	slotDirectories(dir);
-	dlg->fAskOverwrite->setChecked( KPalmDocSettings::askOverwrite() );
-	dlg->fVerbose->setChecked( KPalmDocSettings::verboseMessages() );
-	TQString encoding = KPalmDocSettings::encoding();
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Encoding=" << encoding << endl;
-#endif
-	dlg->fEncoding->setCurrentText( KPalmDocSettings::encoding() );
-
-	// PC->Handheld page
-	dlg->fCompress->setChecked(KPalmDocSettings::compress() );
-	dlg->fConvertBookmarks->setChecked(KPalmDocSettings::convertBookmarks());
-	dlg->fBookmarksInline->setChecked(KPalmDocSettings::bookmarksInline());
-	dlg->fBookmarksEndtags->setChecked(KPalmDocSettings::bookmarksEndtags());
-	dlg->fBookmarksBmk->setChecked(KPalmDocSettings::bookmarksBmk());
-
-	// Handheld->PC page
-	dlg->fPCBookmarks->setButton(KPalmDocSettings::bookmarksToPC() );
-}
-
-void ConverterDlg::slotClose()
-{
-  writeSettings();
-  kapp->quit();
-  delete this;
-}
-
-void ConverterDlg::slotToText()
-{
-	FUNCTIONSETUP;
-	// First, get the settings from the controls and initialize
-	// the converter object
-	int bmks=dlg->fPCBookmarks->id(dlg->fPCBookmarks->selected());
-	DOCConverter conv;
-	switch(bmks) {
-		case 0: conv.setBookmarkTypes(DOCConverter::eBmkNone); break;
-		case 1: conv.setBookmarkTypes(DOCConverter::eBmkInline); break;
-		case 2: conv.setBookmarkTypes(DOCConverter::eBmkEndtags); break;
-		case 3: conv.setBookmarkTypes(DOCConverter::eBmkDefaultBmkFile); break;
-		default:
-			break;
-	}
-
-	askOverwrite=dlg->fAskOverwrite->isChecked();
-	verbose=dlg->fVerbose->isChecked();
-
-
-	bool dir=dlg->fDirectories->isChecked();
-	TQString txturl=dlg->fTXTDir->url();
-	TQString pdburl=dlg->fPDBDir->url();
-
-	TQFileInfo txtinfo(txturl);
-	TQFileInfo pdbinfo(pdburl);
-
-	if (dir)
-	{
-		if (pdbinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("You selected to sync folders, "
-				"but gave a filename instead (%1)."
-				"
    Use folder %2 instead?    ").arg(pdburl)
-				.arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes)
-			{
-				pdburl=pdbinfo.dirPath(true);
-				pdbinfo.setFile(pdburl);
-			}
-			else return;
-		}
-
-		if (!pdbinfo.isDir())
-		{
-			// no directory, so error message and return
-			KMessageBox::sorry(this,
-				i18n("The folder %1 for "
-				"the handheld database files is not a valid "
-				"folder.").arg(pdburl));
-			return;
-		}
-
-		if (!pdbinfo.exists())
-		{
-			KMessageBox::sorry(this,
-				i18n("The folder %1 for "
-				"the handheld database files is not a "
-				"valid directory.").arg(pdburl));
-			return;
-		}
-
-
-		// Now check the to directory:
-		if (txtinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("You selected to sync folders, "
-				"but gave a filename instead (%1)."
-				"
    Use folder %2 instead?    ").arg(txturl)
-				.arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes) {
-				txturl=txtinfo.dirPath(true);
-				txtinfo.setFile(txturl);
-			}
-			else return;
-		}
-
-		// Now that we have a directory path, try to create it:
-		if (!txtinfo.isDir()) {
-			txtinfo.dir().mkdir(txturl, true);
-		}
-		if (!txtinfo.isDir()) {
-			KMessageBox::sorry(this,
-				i18n("The folder %1 for "
-				"the text files could not be created.").arg(txturl));
-			return;
-		}
-
-
-		// Now that we have both directories, create the converter object
-		DEBUGKPILOT<<"Pdbinfo.dir="<The file %1 does not "
-				"exist.").arg(pdburl));
-			return;
-		}
-
-		// Now check the to file
-/*		// I can't check if a given filename is a valid filename
-		if (!txtinfo.isFile())
-		{
-			KMessageBox::sorry(this, i18n("The filename %1 for the "
-				"text is not a valid filename.").arg(txturl));
-			return;
-		}*/
-		if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(),
-				txtinfo.dirPath(true), txtinfo.fileName(), &conv) )
-		{
-			KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl));
-		}
-
-	}
-
-}
-
-void ConverterDlg::slotToPDB()
-{
-	FUNCTIONSETUP;
-	// First, get the settings from the controls and initialize
-	// the converter object
-	bool compress=dlg->fCompress->isChecked();
-	int bmks=0;
-	if (dlg->fConvertBookmarks->isChecked())
-	{
-		if (dlg->fBookmarksInline->isChecked()) bmks|=DOCConverter::eBmkInline;
-		if (dlg->fBookmarksEndtags->isChecked()) bmks|=DOCConverter::eBmkEndtags;
-		if(dlg->fBookmarksBmk->isChecked()) bmks|=DOCConverter::eBmkDefaultBmkFile;
-	}
-	DOCConverter conv;
-	conv.setBookmarkTypes(bmks);
-	conv.setCompress(compress);
-	conv.setSort(DOCConverter::eSortName);
-
-
-	askOverwrite=dlg->fAskOverwrite->isChecked();
-	verbose=dlg->fVerbose->isChecked();
-
-
-	bool dir=dlg->fDirectories->isChecked();
-	TQString txturl=dlg->fTXTDir->url();
-	TQString pdburl=dlg->fPDBDir->url();
-
-	TQFileInfo txtinfo(txturl);
-	TQFileInfo pdbinfo(pdburl);
-
-	if (dir)
-	{
-		if (txtinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("You selected to sync folders, "
-				"but gave a filename instead (%1)."
-				"
    Use folder %2 instead?    ").arg(txturl)
-				.arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes)
-			{
-				txturl=txtinfo.dirPath(true);
-				txtinfo.setFile(txturl);
-			}
-			else return;
-		}
-
-		if (!txtinfo.isDir() || !txtinfo.exists())
-		{
-			KMessageBox::sorry(this,
-				i18n("The folder %1 for "
-				"the text files is not a valid folder.").arg(txturl));
-			return;
-		}
-
-
-		// Now check the to directory:
-		if (pdbinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("You selected to sync folders, "
-				"but gave a filename instead (%1)."
-				"
    Use folder %2 instead?    ")
-				.arg(pdburl)
-				.arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes) {
-				pdburl=pdbinfo.dirPath(true);
-				pdbinfo.setFile(pdburl);
-			}
-			else return;
-		}
-
-		// Now that we have a directory path, try to create it:
-		if (!pdbinfo.isDir()) {
-			pdbinfo.dir().mkdir(pdburl, true);
-		}
-		if (!pdbinfo.isDir()) {
-			KMessageBox::sorry(this, i18n("The folder %1 for "
-				"the PalmDOC files could not be created.").arg(pdburl));
-			return;
-		}
-
-
-		// Now that we have both directories, create the converter object
-		DEBUGKPILOT<<"Pdbinfo.dir="<The file %1 does not "
-				"exist.").arg(txturl));
-			return;
-		}
-
-		if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(),
-				pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) )
-		{
-			KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl));
-		}
-
-	}
-
-}
-
-
-void ConverterDlg::slotUser1()
-{
-	KAboutApplication ab(KGlobal::instance()->aboutData(), this);
-	ab.show();
-	ab.exec();
-	return;
-}
-
-void ConverterDlg::slotDirectories(bool dir)
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT<<"Slot Directories: "<fTextLabel->setText(i18n("&Text folder:"));
-		dlg->fPdbLabel->setText(i18n("&PalmDOC folder:"));
-		dlg->fTXTDir->setMode(KFile::LocalOnly | KFile::Directory);
-		dlg->fPDBDir->setMode(KFile::LocalOnly | KFile::Directory);
-	} else {
-		dlg->fTextLabel->setText(i18n("&Text file:"));
-		dlg->fPdbLabel->setText(i18n("&DOC file:"));
-		dlg->fTXTDir->setMode(KFile::LocalOnly | KFile::File);
-		dlg->fPDBDir->setMode(KFile::LocalOnly | KFile::File);
-	}
-}
-
-bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
-		TQString pdbdir, TQString pdbfile, DOCConverter*conv)
-{
-	FUNCTIONSETUP;
-	bool res=false;
-	TQFileInfo dbfileinfo(pdbdir, pdbfile);
-	DEBUGKPILOT<<"Working  on file "<The database file %1 already exists. Overwrite it?")
-			.arg(dbfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
-	{
-		PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
-		if (pdbdb)
-		{
-			if (!pdbdb->isOpen())
-			{
-#ifdef DEBUG
-				DEBUGKPILOT<createDatabase(get_long("REAd"), get_long("TEXt")) ) {
-				}
-			}
-
-			if (pdbdb->isOpen())
-			{
-				conv->setPDB(pdbdb);
-				conv->setTXTpath(txtdir, txtfile);
-				DEBUGKPILOT<<"Converting "<convertTXTtoPDB()) res=true;
-			}
-			delete pdbdb;
-		}
-		if ( !res && verbose )
-		{
-			KMessageBox::sorry(this, i18n("Error while converting the text %1.").arg(txtfile));
-		}
-	}
-	else
-	{
-		DEBUGKPILOT<<"Ignoring the file "<The text file %1 already exists. Overwrite it?")
-			.arg(txtfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
-	{
-		PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
-		if (pdbdb)
-		{
-			if (pdbdb->isOpen())
-			{
-				conv->setPDB(pdbdb);
-				conv->setTXTpath(txtdir, txtfile);
-				DEBUGKPILOT<<"Converting "<convertPDBtoTXT()) res=true;
-			}
-			delete pdbdb;
-		}
-		if ( !res && verbose )
-		{
-			KMessageBox::sorry(this, i18n("Error while converting the text %1.").arg(pdbfile));
-		}
-	}
-	else
-	{
-		DEBUGKPILOT<<"Ignoring the file "<
-class ConverterDlgBase;
-class DOCConverter;
-
-class ConverterDlg : public KDialogBase
-{
-    Q_OBJECT
-
-public:
-	ConverterDlg( TQWidget *parent=0, const TQString& caption=0);
-	~ConverterDlg();
-
-protected slots:
-	virtual void slotClose();
-	void slotToText();
-	void slotToPDB();
-	void slotDirectories(bool dir);
-	void slotUser1();
-protected:
-	void writeSettings();
-	void readSettings();
-
-	// These two functions convert one single file to or from a pdb database
-	bool convertTXTtoPDB(TQString txtdir, TQString txtfile,
-		TQString pdbdir, TQString pdbfile, DOCConverter*conv);
-	bool convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
-		TQString txtdir, TQString txtfile, DOCConverter*conv);
-
-
-	// The actual dialog widget (designer created) holding all controls
-	ConverterDlgBase*dlg;
-	// Settings
-	bool askOverwrite;
-	bool verbose;
-};
-
-#endif // CONVERTERDLG_H
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui b/kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui
deleted file mode 100644
index 8b3e89668..000000000
--- a/kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui
+++ /dev/null
@@ -1,435 +0,0 @@
-
-ConverterDlgBase
-
-    
-        ConverterDlgBase
-    
-    
-        
-            0
-            0
-            492
-            339
-        
-    
-    
-        
-            unnamed
-        
-        
-            
-                tabWidget
-            
-            
-                
-                    tab
-                
-                
-                    General
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            fPdbLabel
-                        
-                        
-                            
-                                4
-                                5
-                                0
-                                0
-                            
-                        
-                        
-                            &PalmDOC file:
-                        
-                        
-                            fPDBDir
-                        
-                    
-                    
-                        
-                            fTextLabel
-                        
-                        
-                            
-                                4
-                                5
-                                0
-                                0
-                            
-                        
-                        
-                            &Text file:
-                        
-                        
-                            fTXTDir
-                        
-                    
-                    
-                        
-                            fDirectories
-                        
-                        
-                            Convert whole &folders
-                        
-                    
-                    
-                        
-                            fPDBDir
-                        
-                        
-                            Folder where copies of the handheld databases are kept. You can install them to any PalmOS handheld, and distribute these copies to other people (but beware of copyright infringement).
-                        
-                    
-                    
-                        
-                            fAskOverwrite
-                        
-                        
-                            &Ask before overwriting files
-                        
-                    
-                    
-                        
-                            fVerbose
-                        
-                        
-                            &Verbose messages
-                        
-                    
-                    
-                        
-                            fTextToPDB
-                        
-                        
-                            Convert Text to PalmDOC
-                        
-                    
-                    
-                        
-                            fPDBToText
-                        
-                        
-                            Convert PalmDOC to Text
-                        
-                    
-                    
-                        
-                            spacer5
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                16
-                            
-                        
-                    
-                    
-                        
-                            fTXTDir
-                        
-                        
-                            Enter the name of the folder where the text files reside on the PC. All files with extension .txt will be synced to the handheld.
-                        
-                    
-                    
-                        
-                            fEncoding
-                        
-                    
-                    
-                        
-                            textLabel1
-                        
-                        
-                            &Encoding:
-                        
-                        
-                            fEncoding
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    PC -> Handheld
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            spacer6
-                        
-                        
-                            Horizontal
-                        
-                        
-                            Fixed
-                        
-                        
-                            
-                                20
-                                16
-                            
-                        
-                    
-                    
-                        
-                            spacer7
-                        
-                        
-                            Horizontal
-                        
-                        
-                            Fixed
-                        
-                        
-                            
-                                20
-                                16
-                            
-                        
-                    
-                    
-                        
-                            spacer8
-                        
-                        
-                            Horizontal
-                        
-                        
-                            Fixed
-                        
-                        
-                            
-                                20
-                                16
-                            
-                        
-                    
-                    
-                        
-                            fBookmarksInline
-                        
-                        
-                            &Inline tags in text
-                        
-                        
-                            true
-                        
-                        
-                            When a <* bookmarktext *> appears somewhere in the text, a bookmark will be set at this position, and the text between the <* and the *> will be used as bookmark name. The <*...*> will be removed from the text.
-                        
-                    
-                    
-                        
-                            fBookmarksEndtags
-                        
-                        
-                            &Tags at end of text
-                        
-                        
-                            Tags of the form <bookmarkname> at the end of the text will be used to search the text for the pattern between the < and >. Whenever "bookmarkname" appears in the text, a bookmark will be set there. The endtags <...> will then be removed from the end of the text.
-                        
-                    
-                    
-                        
-                            fCompress
-                        
-                        
-                            &Compress
-                        
-                        
-                            true
-                        
-                        
-                            Check this box, if the text should be compressed on the handheld to save memory. Most doc reader on the handheld support compressed texts.
-                        
-                        
-                            The Palm doc format supports compressing the text to save memory. If you check this box, the text will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.
-                        
-                    
-                    
-                        
-                            fConvertBookmarks
-                        
-                        
-                            Convert &bookmarks
-                        
-                        
-                            true
-                        
-                        
-                            Do you want to convert bookmarks? Most doc readers support bookmarks. You have to provide some information about where the bookmarks should be set and their titles. Check at least one of the bookmark types below.
-                        
-                    
-                    
-                        
-                            fBookmarksBmk
-                        
-                        
-                            Regular &expressions in .bmk file
-                        
-                        
-                            Use regular expressions in a file textname.bmk (textname.txt is the filename of the text) to search the text for bookmarks.See the documentation for a description of the format of the bmk file.
-                        
-                    
-                    
-                        
-                            spacer9
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                21
-                                200
-                            
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Handheld -> PC
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            spacer10
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                21
-                                190
-                            
-                        
-                    
-                    
-                        
-                            fPCBookmarks
-                        
-                        
-                            Convert Bookmarks
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                
-                                    radioButton9
-                                
-                                
-                                    false
-                                
-                                
-                                    Convert as &inline tags
-                                
-                                
-                                    1
-                                
-                            
-                            
-                                
-                                    radioButton8
-                                
-                                
-                                    false
-                                
-                                
-                                    Do &not convert bookmarks
-                                
-                                
-                                    0
-                                
-                            
-                            
-                                
-                                    radioButton10
-                                
-                                
-                                    false
-                                
-                                
-                                    Convert as &end tags
-                                
-                            
-                            
-                                
-                                    radioButton11
-                                
-                                
-                                    Convert into .bmk &file
-                                
-                                
-                                    true
-                                
-                            
-                        
-                    
-                
-            
-        
-    
-
-
-
-
-    
-        fConvertBookmarks
-        toggled(bool)
-        fBookmarksInline
-        setEnabled(bool)
-    
-    
-        fConvertBookmarks
-        toggled(bool)
-        fBookmarksEndtags
-        setEnabled(bool)
-    
-    
-        fConvertBookmarks
-        toggled(bool)
-        fBookmarksBmk
-        setEnabled(bool)
-    
-
-
-
-    kurlrequester.h
-    klineedit.h
-    kpushbutton.h
-
-
diff --git a/kpilot/conduits/docconduit/makedoc9.cc b/kpilot/conduits/docconduit/makedoc9.cc
deleted file mode 100644
index 1f1c56ff1..000000000
--- a/kpilot/conduits/docconduit/makedoc9.cc
+++ /dev/null
@@ -1,405 +0,0 @@
-// based on: MakeDoc, version 2
-// I only took the tBuf class from there and adapted it.
-//
-// Compresses text files into a format that is ready to export to a Pilot
-// and work with Rick Bram's PilotDOC reader.
-// Copyright (C) Reinhold Kainhofer, 2002
-// Copyrigth (C) Pat Beirne, 2000
-//
-// Original file (makedoc9.cpp) copyright by:
-// Copyright (C) Pat Beirne, 2000.
-// Distributable under the GNU General Public License Version 2 or later.
-//
-// ver 0.6 enforce 31 char limit on database names
-// ver 0.7 change header and record0 to structs
-// ver 2.0 added category control on the command line
-//              changed extensions from .prc to .pdb
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-
-#include 
-#include 
-#include 
-
-#include 
-
-
-#include "makedoc9.h"
-
-
-
-//
-// Issue()
-//
-// action: handle the details of writing a single
-//              character to the compressed stream
-//
-unsigned
- tBuf::Issue(byte src, int &bSpace)
-{
-	unsigned int iDest = len;
-	byte *dest = buf;
-
-	// TODO: which of the if parts should really be included???
-#if 0
-	// modified version of issue
-	// just issue the char
-	if (src >= 0x80 || src <= 8)
-		dest[iDest++] = 1;
-	dest[iDest++] = src;
-
-#else
-	// if there is an outstanding space char, see if
-	// we can squeeze it in with an ASCII char
-	if (bSpace)
-	{
-		if (src >= 0x40 && src <= 0x7F)
-			dest[iDest++] = src ^ 0x80;
-		else
-		{
-			// couldn't squeeze it in, so issue the space char by itself
-			// most chars go out simple, except the range 1...8,0x80...0xFF
-			dest[iDest++] = ' ';
-			if (src < 0x80 && (src == 0 || src > 8))
-				dest[iDest++] = src;
-			else
-				dest[iDest++] = 1, dest[iDest++] = src;
-		}
-		// knock down the space flag
-		bSpace = 0;
-	}
-	else
-	{
-		// check for a space char
-		if (src == ' ')
-			bSpace = 1;
-		else
-		{
-			if (src < 0x80 && (src == 0 || src > 8))
-				dest[iDest++] = src;
-			else
-				dest[iDest++] = 1, dest[iDest++] = src;
-
-		}
-	}
-#endif
-	len = iDest;
-	return iDest;
-}
-
-//
-// Compress
-//
-// params:      none
-//
-// action:      takes the given buffer,
-//                                      and compresses
-//                                      the original data down into a second buffer
-//
-// comment:     This version make heavy use of walking pointers.
-//
-unsigned tBuf::Compress()
-{
-	if (!buf)
-		return 0;
-	if (isCompressed) {
-//		cout<<"Buffer is already compressed!"< (1 << COUNT_BITS) + 2
-			|| pTestTail == pEnd)
-		{
-			// issue the codes
-			// first, check for short runs
-			if (pTestTail - pTestHead < 4)
-			{
-				if (pTestHead[0] > 0x7F || pTestHead[0] <= 8)
-					buf[len++] = 1;
-				buf[len++] = pTestHead[0];
-				pTestHead++;
-			}
-			// for longer runs, issue a run-code
-			else
-			{
-				unsigned int dist = pTestHead - pPrevHit;
-				unsigned int compound =
-					(dist << COUNT_BITS) + pTestTail - pTestHead - 4;
-
-//if (dist>=(1<7) printf("\n!! error len overflow");
-
-				buf[len++] = 0x80 + (compound >> 8);
-				buf[len++] = compound & 0xFF;
-//printf("\nissuing code for sequence len %d <%c%c%c>",pTestTail-pTestHead-1,pTestHead[0],pTestHead[1],pTestHead[2]);
-//printf("\n          <%x%x>",pOut[-2],pOut[-1]);
-				// and start again
-				pTestHead = pTestTail - 1;
-			}
-			// start the search again
-			pPrevHit = pBuffer;
-			// within range
-			if (pTestHead - pPrevHit > ((1 << DISP_BITS) - 1))
-				pPrevHit = pTestHead - ((1 << DISP_BITS) - 1);
-		}
-		// got a match
-		else
-		{
-			pPrevHit = pHit;
-		}
-		// when we get to the end of the buffer, don't inc past the end
-		// this forces the residue chars out one at a time
-		if (pTestTail == pEnd)
-			pTestTail--;
-	}
-
-
-	// final scan to merge consecutive high chars together
-	// and merge space chars
-	unsigned int k;
-
-	for (i = k = 0; i < len; i++, k++)
-	{
-		buf[k] = buf[i];
-		// skip the run-length codes
-		if (buf[k] >= 0x80 && buf[k] < 0xC0)
-			buf[++k] = buf[++i];
-		// if we hit a high char marker, look ahead for another
-		// and merge multiples together
-		else if (buf[k] == 1)
-		{
-			buf[k + 1] = buf[i + 1];
-			while (i + 2 < len && buf[i + 2] == 1 && buf[k] < 8)
-			{
-				buf[k]++;
-				buf[k + buf[k]] = buf[i + 3];
-				i += 2;
-			}
-			k += buf[k];
-			i++;
-		}
-		else if (buf[k] == ' ' && i < len - 1 && buf[i + 1] <= 0x7F
-			&& buf[i + 1] >= 0x40)
-			buf[k] = 0x80 | buf[++i];
-	}
-
-	// delete original buffer
-	delete[]pBuffer;
-	len = k;
-
-	isCompressed = true;
-	return k;
-}
-
-/*
-	Decompress
-
-	params:	none
-
-	action: make a new buffer
-					run through the source data
-					check the 4 cases:
-						0,9...7F represent self
-						1...8		escape n chars
-						80...bf reference earlier run
-						c0...ff	space+ASCII
-
-*/
-unsigned tBuf::Decompress()
-{
-	if (!buf)
-		return 0;
-	if (!isCompressed) {
-//		cout<<"Buffer already uncompressed. Doing nothing"< 0 && c < 9)
-			while (c--)
-				out_buf[i++] = in_buf[j++];
-
-		// codes 0, 9...0x7F represent themselves
-		else if (c < 0x80)
-			out_buf[i++] = c;
-
-		// codes 0xC0...0xFF represent "space + ascii char"
-		else if (c >= 0xC0)
-			out_buf[i++] = ' ', out_buf[i++] = c ^ 0x80;
-
-		// codes 0x80...0xBf represent sequences
-		else
-		{
-			int m, n;
-
-			c <<= 8;
-			c += in_buf[j++];
-			m = (c & 0x3FFF) >> COUNT_BITS;
-			n = c & ((1 << COUNT_BITS) - 1);
-			n += 3;
-			while (n--)
-			{
-				out_buf[i] = out_buf[i - m];
-				i++;
-			}
-		}
-	}
-	out_buf[i++]='\0';
-	out_buf[i++]='\0';
-	delete[]buf;
-	buf = pOut;
-	len = i;
-
-	isCompressed = false;
-	return i;
-}
-
-unsigned tBuf::DuplicateCR()
-{
-	if (!buf)
-		return 0;
-	byte *pBuf = new byte[2 * len];
-
-	unsigned int k, j;
-
-	for (j = k = 0; j < len; j++, k++)
-	{
-		pBuf[k] = buf[j];
-		if (pBuf[k] == 0x0A)
-			pBuf[k++] = 0x0D, pBuf[k] = 0x0A;
-	}
-	delete[]buf;
-	buf = pBuf;
-	len = k;
-	return k;
-}
-
-
-
-// this nasty little beast removes really low ASCII and 0's
-// and handles the CR problem
-//
-// if a cr appears before a lf, then remove the cr
-// if a cr appears in isolation, change to a lf
-unsigned tBuf::RemoveBinary()
-{
-	if (!buf)
-		return 0;
-	byte *in_buf = buf;
-	byte *out_buf = new byte[len];
-
-	unsigned int k, j;
-
-	for (j = k = 0; j < len; j++, k++)
-	{
-		// copy each byte
-		out_buf[k] = in_buf[j];
-
-		// throw away really low ASCII
-		if (( /*out_buf[k]>=0 && */ out_buf[k] < 9))
-			k--;
-
-		// for CR
-		if (out_buf[k] == 0x0D)
-		{
-			// if next is LF, then drop it
-			if (j < len - 1 && in_buf[j + 1] == 0x0A)
-				k--;
-			else						  // turn it into a LF
-				out_buf[k] = 0x0A;
-		}
-	}
-	delete[]buf;
-	buf = out_buf;
-	len = k;
-	return k;
-}
-
-void tBuf::setText(const byte * text, unsigned txtlen, bool txtcomp)
-{
-	if (buf)
-		delete[]buf;
-	buf = 0L;
-
-	if (txtlen <= 0)
-		txtlen = strlen((const char *) text);
-	len = txtlen;
-	buf = new byte[len];
-
-	memcpy(buf, text, len*sizeof(char));
-//	strncpy((char *) buf, (const char *) text, len);
-	isCompressed = txtcomp;
-//	cout<<"Setting text, compressed="<
-
-typedef unsigned char byte;
-typedef unsigned long DWORD;
-typedef unsigned short WORD;
-
-#define DISP_BITS 11
-#define COUNT_BITS 3
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////                                  //////////////////////
-/////////////////////      tBuf class                  //////////////////////
-/////////////////////                                  //////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-
-
-class tBuf {
- private:
-//      byte hichar[10];
-//      int hicharnum;
-//      bool space;
-
-	byte * buf;
-	unsigned len;
-	bool isCompressed;
- public:
-	 tBuf() {
-		buf = 0L;
-		len=0;
-		isCompressed=false;
-	};
-
-	~tBuf()
-	{
-		if (buf)
-			delete[]buf;
-	}
-
-	void Clear() {
-		delete[]buf;
-		buf = 0L;
-	}
-	void setText(const byte * text, unsigned int txtlen =
-		0, bool txtcomp = false);
-	byte *text() const {
-		return buf;
-	}
-	unsigned Len() const {
-		return len;
-	}
-	void setCompressed(bool compressed = true) {
-		isCompressed = compressed;
-	}
-	bool compressed() const {
-		return isCompressed;
-	}
-	unsigned RemoveBinary();
-	unsigned DuplicateCR();
-
-	unsigned Decompress();
-	unsigned Compress();
-
- private:
-	unsigned Issue(byte src, int &bSpace);
-	void Dump() const {
-		printf("\nbuffer len=%d", len);
-}};
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/pilotDOCBookmark.cc b/kpilot/conduits/docconduit/pilotDOCBookmark.cc
deleted file mode 100644
index 9b93f2af1..000000000
--- a/kpilot/conduits/docconduit/pilotDOCBookmark.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This is a C++ class for the DOC bookmark record structure
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pilotDOCBookmark.h"
-
-
-
-PilotDOCBookmark::PilotDOCBookmark():PilotRecordBase(), pos(0)
-{
-	FUNCTIONSETUP;
-	memset(&bookmarkName[0], 0, 16);
-}
-
-
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDOCBookmark()
-*/
-PilotDOCBookmark::PilotDOCBookmark(PilotRecord * rec):PilotRecordBase(rec)
-{
-	if (rec)
-	{
-		const pi_buffer_t *b = rec->buffer();
-		unsigned int offset = 0;
-		Pilot::dlp::read(b,offset,bookmarkName,16);
-		bookmarkName[16]='\0';
-		pos = Pilot::dlp::read(b,offset);
-	}
-}
-
-
-
-PilotDOCBookmark::PilotDOCBookmark(const PilotDOCBookmark & e):PilotRecordBase(e)
-{
-	FUNCTIONSETUP;
-	*this = e;
-}
-
-
-
-PilotDOCBookmark & PilotDOCBookmark::operator =(const PilotDOCBookmark & e)
-{
-	if (this != &e)
-	{
-		strncpy(&bookmarkName[0], &e.bookmarkName[0], 16);
-		bookmarkName[16]='\0';
-		pos = e.pos;
-	}
-	return *this;
-}
-
-
-
-PilotRecord *PilotDOCBookmark::pack() const
-{
-	pi_buffer_t *b = pi_buffer_new( 16 + Pilot::dlp::size );
-	pi_buffer_append(b, bookmarkName, 16);
-	b->data[16] = 0;
-	Pilot::dlp::append(b,pos);
-	PilotRecord* rec =  new PilotRecord(b, this);
-	return rec;
-}
diff --git a/kpilot/conduits/docconduit/pilotDOCBookmark.h b/kpilot/conduits/docconduit/pilotDOCBookmark.h
deleted file mode 100644
index fe511fc17..000000000
--- a/kpilot/conduits/docconduit/pilotDOCBookmark.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* pilotDOCBookmark.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#ifndef _KPILOT_PILOTDOCBOOKMARK_H
-#define _KPILOT_PILOTDOCBOOKMARK_H
-
-#include 
-class PilotRecord;
-
-
-class PilotDOCBookmark:public PilotRecordBase {
-public:
-	PilotDOCBookmark();
-	PilotDOCBookmark(PilotRecord * rec);
-	PilotDOCBookmark(const PilotDOCBookmark & e);
-	~PilotDOCBookmark() {};
-	PilotDOCBookmark & operator=(const PilotDOCBookmark & e);
-
-	PilotRecord *pack() const;
-
-public:
-	char bookmarkName[17];
-	long int pos;
-};
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/pilotDOCEntry.cc b/kpilot/conduits/docconduit/pilotDOCEntry.cc
deleted file mode 100644
index 75a51cefa..000000000
--- a/kpilot/conduits/docconduit/pilotDOCEntry.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This is a C++ class dealing with PalmDOC text records
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pilotDOCEntry.h"
-
-
-
-const int PilotDOCEntry::TEXT_SIZE = 4096;
-
-
-PilotDOCEntry::PilotDOCEntry():PilotRecordBase()
-{
-	FUNCTIONSETUP;
-	compress = false;
-}
-
-
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDOCEntry()
-*/
-PilotDOCEntry::PilotDOCEntry(PilotRecord * rec, bool compressed):PilotRecordBase(rec)
-{
-	if (rec) fText.setText((unsigned char *) rec->data(), rec->size(), compressed);
-	compress = compressed;
-}
-
-
-
-PilotDOCEntry::PilotDOCEntry(const PilotDOCEntry & e):PilotRecordBase(e)
-{
-	FUNCTIONSETUP;
-	// See PilotDateEntry::operator = for details
-	fText.setText(e.fText.text(), e.fText.Len(), e.fText.compressed());
-	compress = e.compress;
-}
-
-
-
-PilotDOCEntry & PilotDOCEntry::operator =(const PilotDOCEntry & e)
-{
-	if (this != &e)
-	{
-		fText.setText(e.fText.text(), e.fText.Len(), e.fText.compressed());
-		compress = e.compress;
-	}
-	return *this;
-}
-
-
-
-
-PilotRecord *PilotDOCEntry::pack()
-{
-	int len = compress ? fText.Compress() : fText.Decompress();
-
-	if (len<0)
-	{
-		return 0L;
-	}
-
-	pi_buffer_t *b = pi_buffer_new( len + 4 ); // +4 for safety
-	memcpy( b->data, (const char *) fText.text(), len );
-	b->used = len;
-	PilotRecord* rec =  new PilotRecord(b, this);
-	return rec;
-}
diff --git a/kpilot/conduits/docconduit/pilotDOCEntry.h b/kpilot/conduits/docconduit/pilotDOCEntry.h
deleted file mode 100644
index 4ecaf19a9..000000000
--- a/kpilot/conduits/docconduit/pilotDOCEntry.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* pilotDOCEntry.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to the mailinlist kde-pim@kde.org
-*/
-#ifndef _KPILOT_PILOTDOCENTRY_H
-#define _KPILOT_PILOTDOCENTRY_H
-
-#include 
-#include "makedoc9.h"
-
-
-class PilotRecord;
-
-
-class PilotDOCEntry:public PilotRecordBase {
-private:
-	bool compress;
-	tBuf fText;
-public:
-	static const int TEXT_SIZE;
-	PilotDOCEntry();
-	PilotDOCEntry(PilotRecord * rec, bool compressed = false);
-	PilotDOCEntry(const PilotDOCEntry & e);
-	~PilotDOCEntry() {};
-	PilotDOCEntry & operator=(const PilotDOCEntry & e);
-
-
-	TQString getText() {
-		fText.Decompress();
-		return TQString::fromLatin1((const char *) fText.text());
-	};
-	void setText(TQString newtext, bool compressed = false) {
-		fText.setText((const unsigned char *) newtext.latin1(),
-			newtext.length(), compressed);
-	};
-
-	bool getCompress() const {
-		return compress;
-	}
-	void setCompress(bool compressed) {
-		compress = compressed;
-	};
-
-	PilotRecord *pack(); // Not const because it can change the compression
-};
-
-
-
-#endif
-
diff --git a/kpilot/conduits/docconduit/pilotDOCHead.cc b/kpilot/conduits/docconduit/pilotDOCHead.cc
deleted file mode 100644
index 1f07e2867..000000000
--- a/kpilot/conduits/docconduit/pilotDOCHead.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This is a C++ class dealing with PalmDOC text records
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-#include "pilotDOCHead.h"
-
-#include "makedoc9.h"
-
-
-
-const int PilotDOCHead::textRecordSize = 4096;
-
-PilotDOCHead::PilotDOCHead():PilotRecordBase(),
-version(0),
-spare(0), storyLen(0), numRecords(0), recordSize(textRecordSize), position(0)
-{
-	FUNCTIONSETUP;
-}
-
-
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDOCHead()
-*/
-PilotDOCHead::PilotDOCHead(PilotRecord * rec):PilotRecordBase(rec)
-{
-	const unsigned char *b = (const unsigned char *) rec->data();
-	unsigned int offset = 0;
-
-	version = Pilot::dlp::read(b,offset);
-	spare = Pilot::dlp::read(b,offset);
-	storyLen = Pilot::dlp::read(b,offset);
-	numRecords = Pilot::dlp::read(b,offset);
-	recordSize = Pilot::dlp::read(b,offset);
-	position = Pilot::dlp::read(b,offset);
-}
-
-
-PilotDOCHead::PilotDOCHead(const PilotDOCHead & e):PilotRecordBase(e)
-{
-	FUNCTIONSETUP;
-	*this = e;
-}
-
-
-
-PilotDOCHead & PilotDOCHead::operator =(const PilotDOCHead & e)
-{
-	if (this != &e)
-	{
-		version = e.version;
-		spare = e.spare;
-		storyLen = e.storyLen;
-		numRecords = e.numRecords;
-		recordSize = e.recordSize;
-		position = e.position;
-	}
-	return *this;
-}
-
-
-
-
-PilotRecord *PilotDOCHead::pack() const
-{
-	pi_buffer_t *b = pi_buffer_new(16);
-
-	Pilot::dlp::append(b,version);
-	Pilot::dlp::append(b,spare);
-	Pilot::dlp::append(b,storyLen);
-	Pilot::dlp::append(b,numRecords);
-	Pilot::dlp::append(b,recordSize);
-	Pilot::dlp::append(b,position);
-
-	PilotRecord *rec =  new PilotRecord(b, this);
-	return rec;
-}
-
diff --git a/kpilot/conduits/docconduit/pilotDOCHead.h b/kpilot/conduits/docconduit/pilotDOCHead.h
deleted file mode 100644
index aeb7fb526..000000000
--- a/kpilot/conduits/docconduit/pilotDOCHead.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* pilotDOCHead.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to the mailinlist kde-pim@kde.org
-*/
-#ifndef _KPILOT_PILOTDOCHEAD_H
-#define _KPILOT_PILOTDOCHEAD_H
-
-#include 
-
-class PilotRecord;
-
-
-class PilotDOCHead:public PilotRecordBase {
- private:
-	static const int textRecordSize;
-
- public:
-	int version;
-	int spare;
-	long int storyLen;
-	int numRecords;
-	int recordSize;
-	long int position;
-
-	PilotRecord *pack() const;
-
- public:
-	 PilotDOCHead();
-	 PilotDOCHead(PilotRecord * rec);
-	 PilotDOCHead(const PilotDOCHead & e);
-	~PilotDOCHead() { }
-
-	PilotDOCHead & operator=(const PilotDOCHead & e);
-};
-
-
-
-#endif
-
diff --git a/kpilot/conduits/docconduit/tests/testcompress.cpp b/kpilot/conduits/docconduit/tests/testcompress.cpp
deleted file mode 100644
index b8367b2b9..000000000
--- a/kpilot/conduits/docconduit/tests/testcompress.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is just a very simple programm to check the compress/uncompress 
-** routines by taking one string, compress and then decompress it and
-** see if it is the original string.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include 
-#include 
-
-
-#include "../makedoc9.h"
-
-void main () 
-{
-	tBuf fText;
-	char*text="asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf";
-
-	fText.setText((const byte*)text);
-	cout<<"Decompressed text: "<ajJ;x5sa}?VVI)TP&Vwx_o7j?PuANdUt{S#RQ2NPZaoHu((~4
zjr#TOKqY_FjyI0i?PGXjt}9Pul3`N%^_)#+-SrQjSS@%I6|U|)dbT4wV#PfpHKmPu
z3oq}fu)p?u#-l3660P}qip+si8bdsTMB5*wem(zjDx)h;%C09mZ28=7w-;`7b7oo=
zc+9LhblFADh};|NDus-9w94#sb?{ltBWAyJ&HqEu(*is@
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-
-
-#include 
-//#include 
-
-#include   // required by pilot-link includes
-
-#include 
-
-#include "pilotMemo.h"
-#include "pilotSerialDatabase.h"
-
-//#include "KNotesIface_stub.h"
-
-#include "knotes-factory.h"
-
-#include "knotes-action.moc"
-#include "knotesconduitSettings.h"
-
-extern "C"
-{
-
-unsigned long version_conduit_knotes = Pilot::PLUGIN_API;
-
-}
-
-typedef TQString KNoteID_t;
-typedef const TQString &KNoteID_pt;
-
-class NoteAndMemo
-{
-public:
-	NoteAndMemo() : noteId(),memoId(-1) { } ;
-	NoteAndMemo(KNoteID_pt noteid,int memoid) : noteId(noteid),memoId(memoid) { } ;
-	bool operator ==(const NoteAndMemo &p) const
-	{
-		return (p.memo()==memoId) && (p.note()==noteId);
-	}
-
-	int memo() const { return memoId; } ;
-	KNoteID_t note() const { return noteId; } ;
-	inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ;
-	TQString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ;
-
-	static NoteAndMemo findNote(const TQValueList &,KNoteID_pt note);
-	static NoteAndMemo findMemo(const TQValueList &,int memo);
-
-protected:
-	KNoteID_t noteId;
-	int memoId;
-} ;
-
-NoteAndMemo NoteAndMemo::findNote(const TQValueList &l ,KNoteID_pt note)
-{
-	FUNCTIONSETUP;
-
-	for (TQValueList::ConstIterator it = l.begin();
-		it != l.end();
-		++it)
-	{
-		if ((*it).note()==note) return *it;
-	}
-
-	return NoteAndMemo();
-}
-
-NoteAndMemo NoteAndMemo::findMemo(const TQValueList &l , int memo)
-{
-	FUNCTIONSETUP;
-
-	for (TQValueList::ConstIterator it =l.begin();
-		it != l.end();
-		++it)
-	{
-		if ((*it).memo()==memo) return *it;
-	}
-
-	return NoteAndMemo();
-}
-
-class KNotesAction::KNotesActionPrivate
-{
-public:
-	KNotesActionPrivate() :
-		fNotesResource(0L),
-		fTimer(0L),
-		fDeleteCounter(0),
-		fModifiedNotesCounter(0),
-		fModifiedMemosCounter(0),
-		fAddedNotesCounter(0),
-		fAddedMemosCounter(0),
-		fDeletedNotesCounter(0),
-		fDeletedMemosCounter(0),
-		fDeleteNoteForMemo(false)
-	{ } ;
-	~KNotesActionPrivate()
-	{
-		fNotesResource->save();
-	
-		KPILOT_DELETE(fNotesResource);
-		KPILOT_DELETE(fTimer);
-	}
-
-	// The record index we're dealing with. Used by
-	// CopyHHToPC sync only.
-	int fRecordIndex;
-
-	KCal::CalendarLocal *fNotesResource;
-	// This is the collection of  notes held by KNotes and
-	KCal::Journal::List fNotes;
-	
-	// This iterates through that list; it's in here because
-	// we use slots to process one item at a time and need
-	// to keep track of where we are between slot calls.
-	KCal::Journal::List::ConstIterator fIndex;
-	
-	// The DCOP client for this application, and the KNotes stub.
-	// DCOPClient *fDCOP;
-	//KNotesIface_stub *fKNotes;
-
-	// The timer for invoking process() to do some more work.
-	TQTimer *fTimer;
-
-	// The database we're working with (MemoDB)
-	// PilotSerialDatabase *fDatabase;
-	// Some counter that needs to be preserved between calls to
-	// process(). Typically used to note how much work is done.
-	int fDeleteCounter; // Count deleted memos as well.
-	unsigned int fModifiedNotesCounter; // Count modified KNotes.
-	unsigned int fModifiedMemosCounter;
-	unsigned int fAddedNotesCounter;
-	unsigned int fAddedMemosCounter;
-	unsigned int fDeletedNotesCounter;
-	unsigned int fDeletedMemosCounter;
-
-	// We need to translate between the ids that KNotes uses and
-	// Pilot id's, so we make a list of pairs.
-	//
-	TQValueList fIdList;
-
-	// Setting to delete a KNote when the corresponding memo
-	// has been deleted.
-	bool fDeleteNoteForMemo;
-};
-
-
-
-KNotesAction::KNotesAction(KPilotLink *o,
-	const char *n, const TQStringList &a) :
-	ConduitAction(o,n ? n : "knotes-conduit",a),
-	fP(new KNotesActionPrivate)
-{
-	FUNCTIONSETUP;
-
-/*
-	if (fP) fP->fDCOP = KApplication::kApplication()->dcopClient();
-
-	if (fP && !fP->fDCOP)
-	{
-		WARNINGKPILOT << "Can't get DCOP client." << endl;
-	}
-*/
-}
-
-/* virtual */ KNotesAction::~KNotesAction()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fP);
-}
-
-/* virtual */ bool KNotesAction::exec()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname << ": Starting knotes conduit." << endl;
-
-	if (syncMode().isTest())
-	{
-		test();
-		delayDone();
-		return true;
-	}
-
-	TQString e;
-	if (!openKNotesResource()) return false;
-
-	// Database names seem to be latin1
-	if (!openDatabases(CSL1("MemoDB")))
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << "Can not open databases." << endl;
-#endif
-		emit logError(i18n("Could not open MemoDB on the handheld."));
-		return false;
-	}
-
-	fP->fTimer = new TQTimer(this);
-	fActionStatus = Init;
-	
-	// this is not needed. As it is done in the initstate in process();
-	// resetIndexes();
-
-	connect(fP->fTimer,TQT_SIGNAL(timeout()),TQT_SLOT(process()));
-	fP->fTimer->start(0,false);
-
-	return true;
-}
-
-void KNotesAction::test()
-{
-	if (!openKNotesResource()) return;
-	listNotes();
-}
-
-bool KNotesAction::openKNotesResource()
-{
-	FUNCTIONSETUP;
-	
-	KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
-	korgcfg.setGroup( "Time & Date" );
-	TQString tz(korgcfg.readEntry( "TimeZoneId" ) );
-	
-	fP->fNotesResource = new KCal::CalendarLocal(tz);
-	KURL mURL = KGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics";
-	
-	if( fP->fNotesResource->load( mURL.path() ) )
-	{
-		fP->fNotes = fP->fNotesResource->journals();
-		return true;
-	}
-	else
-	{
-		emit logError( i18n("Could not load the resource at: %1").arg(mURL.path()) );
-		return false;
-	}
-}
-
-
-void KNotesAction::resetIndexes()
-{
-	FUNCTIONSETUP;
-
-	fP->fRecordIndex = 0;
-	fP->fIndex = fP->fNotes.begin();
-}
-
-void KNotesAction::listNotes()
-{
-	FUNCTIONSETUP;
-	
-	KCal::Journal::List notes = fP->fNotesResource->journals();
-	DEBUGKPILOT << fname << ": the resource contains " << notes.size()
-		<< " note(s)." << endl;
-		
-	KCal::Journal::List::ConstIterator it;
-	int i = 1;
-	for ( it = notes.begin(); it != notes.end(); ++it )
-	{
-		DEBUGKPILOT << fname << ": note " << i << " has id " << (*it)->uid() 
-			<< endl;
-		i++;
-	}
-
-	DEBUGKPILOT << fname << ": "
-		<< "Sync direction: " << syncMode().name() << endl;
-}
-
-/* slot */ void KNotesAction::process()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
-
-	switch(fActionStatus)
-	{
-	case Init:
-		resetIndexes();
-		getAppInfo();
-		getConfigInfo();
-		switch(syncMode().mode())
-		{
-		case SyncAction::SyncMode::eBackup:
-		case SyncAction::SyncMode::eRestore:
-			// Impossible!
-			fActionStatus = Done;
-			break;
-		case SyncAction::SyncMode::eCopyHHToPC :
-			listNotes(); // Debugging
-			fActionStatus = MemosToKNotes;
-			break;
-		case SyncAction::SyncMode::eHotSync:
-		case SyncAction::SyncMode::eFullSync:
-		case SyncAction::SyncMode::eCopyPCToHH:
-			fActionStatus = ModifiedNotesToPilot;
-			break;
-		}
-		break;
-	case ModifiedNotesToPilot:
-		if (modifyNoteOnPilot())
-		{
-			resetIndexes();
-			fActionStatus = DeleteNotesOnPilot;
-		}
-		break;
-	case DeleteNotesOnPilot:
-		if (deleteNoteOnPilot())
-		{
-			resetIndexes();
-			fActionStatus = NewNotesToPilot;
-		}
-		break;
-	case NewNotesToPilot :
-		if (addNewNoteToPilot())
-		{
-			resetIndexes();
-			fDatabase->resetDBIndex();
-			switch(syncMode().mode())
-			{
-			case SyncAction::SyncMode::eBackup:
-			case SyncAction::SyncMode::eRestore:
-			case SyncAction::SyncMode::eCopyHHToPC :
-				// Impossible!
-				fActionStatus = Done;
-				break;
-			case SyncAction::SyncMode::eHotSync:
-			case SyncAction::SyncMode::eFullSync:
-				fActionStatus = MemosToKNotes;
-				break;
-			case SyncAction::SyncMode::eCopyPCToHH:
-				fActionStatus = Cleanup;
-				break;
-			}
-		}
-		break;
-	case MemosToKNotes :
-		if (syncMemoToKNotes())
-		{
-			fActionStatus=Cleanup;
-		}
-		break;
-	case Cleanup :
-		cleanupMemos();
-		break;
-	default :
-		if (fP->fTimer) fP->fTimer->stop();
-		delayDone();
-	}
-}
-
-
-void KNotesAction::getConfigInfo()
-{
-	FUNCTIONSETUP;
-
-	KNotesConduitSettings::self()->readConfig();
-
-	fP->fDeleteNoteForMemo = KNotesConduitSettings::deleteNoteForMemo();
-
-	TQValueList notes;
-	TQValueList memos;
-
-	// Make this match the type of KNoteID_t !
-	notes=KNotesConduitSettings::noteIds();
-	memos=KNotesConduitSettings::memoIds();
-
-	if (notes.count() != memos.count())
-	{
-		WARNINGKPILOT
-			<< ": Notes and memo id lists don't match ("
-			<< notes.count()
-			<< ","
-			<< memos.count()
-			<< ")"
-			<< endl;
-		notes.clear();
-		memos.clear();
-		setFirstSync( true );
-	}
-
-	TQValueList::ConstIterator iNotes = notes.begin();
-	TQValueList::ConstIterator iMemos = memos.begin();
-
-	while((iNotes != notes.end()) && (iMemos != memos.end()))
-	{
-		fP->fIdList.append(NoteAndMemo(*iNotes,*iMemos));
-		++iNotes;
-		++iMemos;
-	}
-}
-
-void KNotesAction::getAppInfo()
-{
-	FUNCTIONSETUP;
-
-	resetIndexes();
-}
-
-
-bool KNotesAction::modifyNoteOnPilot()
-{
-	FUNCTIONSETUP;
-	return true;
-	/*
-	if (fP->fIndex == fP->fNotes.end())
-	{
-		return true;
-	}
-	*/
-
-	//TODO DCOP_REMOVAL
-	/*
-	if (fP->fKNotes->isModified(CSL1("kpilot"),fP->fIndex.key()))
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": The note #"
-			<< fP->fIndex.key()
-			<< " with name "
-			<< fP->fIndex.data()
-			<< " is modified in KNotes."
-			<< endl;
-#endif
-
-		NoteAndMemo nm = NoteAndMemo::findNote(fP->fIdList,
-			fP->fIndex.key());
-
-		if (nm.valid())
-		{
-			TQString text,title,body;
-			title = fP->fIndex.data();
-			body = fP->fKNotes->text(fP->fIndex.key());
-			if (body.startsWith(title))
-			{
-				text = body;
-			}
-			else
-			{
-				text = title + CSL1("\n") + body;
-			}
-
-			PilotMemo *a = new PilotMemo(text);
-			PilotRecord *r = a->pack();
-			r->setID(nm.memo());
-
-			int newid = fDatabase->writeRecord(r);
-			fLocalDatabase->writeRecord(r);
-
-			if (newid != nm.memo())
-			{
-				WARNINGKPILOT
-					<< ": Memo id changed during write? "
-					<< "From "
-					<< nm.memo()
-					<< " to "
-					<< newid
-					<< endl;
-			}
-		}
-		else
-		{
-			WARNINGKPILOT << "Modified note unknown to Pilot" << endl;
-			// Add it anyway, with new PilotID.
-			int newid = addNoteToPilot();
-			fP->fIdList.remove(nm);
-			fP->fIdList.append(NoteAndMemo(fP->fIndex.key(),newid));
-		}
-
-		++(fP->fModifiedMemosCounter);
-	}
-	*/
-
-	//++(fP->fIndex);
-	//return false;
-}
-
-bool KNotesAction::deleteNoteOnPilot()
-{
-	FUNCTIONSETUP;
-
-	/*
-	TQValueList::Iterator i = fP->fIdList.begin();
-	while ( i != fP->fIdList.end() )
-	{
-		// TODO DCOP_REMOVE
-		if (fP->fNotes.contains((*i).note()))
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": Note " << (*i).note() << " still exists." << endl;
-#endif
-		}
-		else
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": Note " << (*i).note() << " is deleted." << endl;
-#endif
-			fDatabase->deleteRecord((*i).memo());
-			fLocalDatabase->deleteRecord((*i).memo());
-			i = fP->fIdList.remove(i);
-			fP->fDeletedMemosCounter++;
-			continue;
-		}
-		++i;
-	}
-	*/
-	return true;
-}
-
-bool KNotesAction::addNewNoteToPilot()
-{
-	FUNCTIONSETUP;
-
-	if (fP->fIndex == fP->fNotes.end())
-	{
-		return true;
-	}
-
-	KCal::Journal *j = (*fP->fIndex);
-
-	if( j->pilotId() == 0 )
-	{
-		DEBUGKPILOT << fname << ": Adding note with id " << j->uid() 
-			<< " to pilot." << endl;
-		
-		int newid = addNoteToPilot();
-		
-		++(fP->fAddedMemosCounter);
-	}
-	//TODO DCOP_REMOVAL
-	/*
-	if (fP->fKNotes->isNew(CSL1("kpilot"),fP->fIndex.key()))
-	{
-		int newid = addNoteToPilot();
-		fP->fIdList.append(NoteAndMemo(fP->fIndex.key(),newid));
-		++(fP->fAddedMemosCounter);
-	}
-	*/
-
-	++(fP->fIndex);
-	return false;
-}
-
-bool KNotesAction::syncMemoToKNotes()
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *rec = 0L;
-
-	if ( syncMode() == SyncAction::SyncMode::eCopyHHToPC )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Read record " << fP->fRecordIndex << endl;
-#endif
-		rec = fDatabase->readRecordByIndex(fP->fRecordIndex);
-		fP->fRecordIndex++;
-	}
-	else
-	{
-		rec = fDatabase->readNextModifiedRec();
-	}
-
-	if (!rec)
-	{
-		return true;
-	}
-
-	PilotMemo *memo = new PilotMemo(rec);
-	NoteAndMemo m = NoteAndMemo::findMemo(fP->fIdList,memo->id());
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Looking at memo "
-		<< memo->id()
-		<< " which was found "
-		<< m.toString()
-		<< endl;
-#endif
-
-	if (memo->isDeleted())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": It's been deleted." << endl;
-#endif
-		if (m.valid())
-		{
-			// We knew about the note already, but it
-			// has changed on the Pilot.
-			//
-			//
-			if (fP->fDeleteNoteForMemo)
-			{
-		//TODO DCOP_REMOVAL
-	//fP->fKNotes->killNote(m.note(),KNotesConduitSettings::suppressKNotesConfirm()
-	//) ;
-				fP->fDeletedNotesCounter++;
-			}
-		}
-		else
-		{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": It's new and deleted." << endl;
-#endif
-		}
-
-		fLocalDatabase->deleteRecord(rec->id());
-	}
-	else
-	{
-		if (m.valid())
-		{
-	#ifdef DEBUG
-			DEBUGKPILOT << fname << ": It's just modified." << endl;
-			DEBUGKPILOT << fname << ": <"
-//				<< fP->fNotes[m.note()]
-				<< "> <"
-				<< memo->shortTitle()
-				<< ">"
-				<< endl;
-	#endif
-			// Check if KNotes still knows about this note
-			//TODO DCOP_REMOVAL
-			/*
-			if (!(fP->fKNotes->name(m.note()).isEmpty()))
-			{
-				updateNote(m,memo);
-			}
-			else
-			{
-				uint c = fP->fIdList.remove(m);
-				if (!c)
-				{
-					WARNINGKPILOT
-						<< "Tried to remove valid note and failed."
-						<< endl;
-				}
-				addMemoToKNotes(memo);
-			}
-			*/
-		}
-		else
-		{
-			addMemoToKNotes(memo);
-		}
-		fLocalDatabase->writeRecord(rec);
-	}
-
-	KPILOT_DELETE(memo);
-	KPILOT_DELETE(rec);
-
-	return false;
-}
-
-void KNotesAction::updateNote(const NoteAndMemo &m, const PilotMemo *memo)
-{
-	FUNCTIONSETUP;
-	//TODO DCOP_REMOVAL
-	if (true/*fP->fNotes[m.note()] != memo->shortTitle()*/)
-	{
-		// Name changed. KNotes might complain though.
-		//TODO DCOP_REMOVAL
-		//fP->fKNotes->setName(m.note(), memo->shortTitle());
-	}
-	//TODO DCOP_REMOVAL
-	//fP->fKNotes->setText(m.note(),memo->text());
-	fP->fModifiedNotesCounter++;
-}
-
-void KNotesAction::addMemoToKNotes(const PilotMemo *memo)
-{
-	FUNCTIONSETUP;
-	// This note is new to KNotes
-	//TODO DCOP_REMOVAL
-	//KNoteID_t i = fP->fKNotes->newNote(memo->shortTitle(), memo->text());
-	//fP->fIdList.append(NoteAndMemo(i,memo->id()));
-	//fP->fAddedNotesCounter++;
-
-#ifdef DEBUG
-	//TODO DCOP_REMOVAL
-	//DEBUGKPILOT << fname << ": It's new with knote id " << i << endl;
-#endif
-}
-int KNotesAction::addNoteToPilot()
-{
-	FUNCTIONSETUP;
-	
-	KCal::Journal *j = (*fP->fIndex);
-	
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": The note #"
-		<< j->uid()
-		<< " with name "
-		<< j->summary()
-		<< " is new to the Pilot."
-		<< endl;
-#endif
-
-	TQString text = j->summary() + CSL1("\n");
-	text.append( j->description() );
-	//TODO DCOP_REMOVAL
-	//text.append(fP->fKNotes->text(fP->fIndex.key()));
-
-	PilotMemo *a = new PilotMemo(text);
-	PilotRecord *r = a->pack();
-
-	int newid = fDatabase->writeRecord(r);
-	fLocalDatabase->writeRecord(r);
-	
-	j->setPilotId( newid );
-
-	delete r;
-	delete a;
-	delete j;
-
-	fP->fAddedMemosCounter++;
-
-	return newid;
-}
-
-
-void KNotesAction::cleanupMemos()
-{
-	FUNCTIONSETUP;
-
-	// Tell KNotes we're up-to-date
-	//TODO DCOP_REMOVAL
-	//fP->fKNotes->sync(CSL1("kpilot"));
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Writing "
-		<< fP->fIdList.count()
-		<< " pairs to the config file."
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": The config file is read-only: "
-		<< KNotesConduitSettings::self()->config()->isReadOnly()
-		<< endl;
-#endif
-
-	TQValueList notes;
-	TQValueList memos;
-
-	for (TQValueList::ConstIterator i =
-		fP->fIdList.begin();
-		i!=fP->fIdList.end();
-		++i)
-	{
-		notes.append((*i).note());
-		memos.append((*i).memo());
-	}
-
-	KNotesConduitSettings::setNoteIds(notes);
-	KNotesConduitSettings::setMemoIds(memos);
-	KNotesConduitSettings::self()->writeConfig();
-
-	fActionStatus=Done;
-	fDatabase->cleanup();
-	fDatabase->resetSyncFlags();
-	fLocalDatabase->cleanup();
-	fLocalDatabase->resetSyncFlags();
-
-	// Tell the user what happened. If no changes were
-	// made, spoke remains false and we'll tack a
-	// message on to the end saying so, so that
-	// the user always gets at least one message.
-	bool spoke = false;
-	if (fP->fAddedMemosCounter)
-	{
-		addSyncLogEntry(i18n("Added one new memo.",
-			"Added %n new memos.",
-			fP->fAddedMemosCounter));
-	}
-	if (fP->fModifiedMemosCounter)
-	{
-		addSyncLogEntry(i18n("Modified one memo.",
-			"Modified %n memos.",
-			fP->fModifiedMemosCounter));
-		spoke = true;
-	}
-	if (fP->fDeletedMemosCounter)
-	{
-		addSyncLogEntry(i18n("Deleted one memo.",
-			"Deleted %n memos.",fP->fDeletedMemosCounter));
-		spoke = true;
-	}
-	if (fP->fAddedNotesCounter)
-	{
-		addSyncLogEntry(i18n("Added one note to KNotes.",
-			"Added %n notes to KNotes.",fP->fAddedNotesCounter));
-		spoke = true;
-	}
-	if (fP->fModifiedNotesCounter)
-	{
-		addSyncLogEntry(i18n("Modified one note in KNotes.",
-			"Modified %n notes in KNotes.",fP->fModifiedNotesCounter));
-		spoke = true;
-	}
-	if (fP->fDeletedNotesCounter)
-	{
-		addSyncLogEntry(i18n("Deleted one note from KNotes.",
-			"Deleted %n notes from KNotes.",fP->fDeletedNotesCounter));
-		spoke = true;
-	}
-	if (!spoke)
-	{
-		addSyncLogEntry(i18n("No change to KNotes."));
-	}
-}
-
-
-/* virtual */ TQString KNotesAction::statusString() const
-{
-	switch(fActionStatus)
-	{
-	case Init : return CSL1("Init");
-	case NewNotesToPilot :
-		return CSL1("NewNotesToPilot key=%1");
-			// TODO DCOP_REMOVAL .arg(fP->fIndex.key());
-	case ModifiedNotesToPilot :
-		return CSL1("ModifiedNotesToPilot key=%1");
-			//TODO DCOP_REMOVAL .arg(fP->fIndex.key());
-	case MemosToKNotes :
-		return CSL1("MemosToKNotes rec=%1")
-			.arg(fP->fRecordIndex);
-	case Cleanup : return CSL1("Cleanup");
-	case Done :
-		return CSL1("Done");
-	default :
-		return CSL1("Unknown (%1)").arg(fActionStatus);
-	}
-}
-
-
-
diff --git a/kpilot/conduits/knotes/knotes-action.h b/kpilot/conduits/knotes/knotes-action.h
deleted file mode 100644
index eb490e0a7..000000000
--- a/kpilot/conduits/knotes/knotes-action.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef _KPILOT_KNOTES_ACTION_H
-#define _KPILOT_KNOTES_ACTION_H
-/* knotes-action.h                      KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the SyncAction that the KNotes conduit performs.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include 
-
-
-class NoteAndMemo;
-class PilotMemo;
-
-class KNotesAction : public ConduitAction
-{
-Q_OBJECT
-public:
-	KNotesAction(
-		KPilotLink *o,
-		const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~KNotesAction();
-
-	enum Status { Init,
-		ModifiedNotesToPilot,
-		DeleteNotesOnPilot,
-		NewNotesToPilot,
-		MemosToKNotes,
-		Cleanup,
-		Done } ;
-	virtual TQString statusString() const;
-
-protected:
-	virtual bool exec();
-
-protected:
-	/**
-	* For test mode -- just list the notes KNotes has.
-	*/
-	void listNotes();
-
-	/** Run a test on the conduit. */
-	void test();
-
-	/**
-	* Loads the KNotes resource and retrieve the list of notes it
-	* has. @return false if the the resource could not be opened and a new
-	* resource could not be created. Modifies fP to store the notes in.
-	*/
-	bool openKNotesResource();
-
-	/**
-	* For actual processing. These are called by process
-	* and it is critical that fP->fIndex is set properly.
-	*
-	* Each returns true when it is completely finished processing,
-	* if it returns a bool. Void functions need only be called once.
-	*/
-	void getAppInfo();
-	void getConfigInfo();
-	bool modifyNoteOnPilot();
-	bool deleteNoteOnPilot();
-	bool addNewNoteToPilot();
-	bool syncMemoToKNotes();
-	void cleanupMemos();
-
-	void updateNote(const NoteAndMemo &,const PilotMemo *);
-
-	/**
-	* Add the Memo to KNotes.
-	*/
-	void addMemoToKNotes(const PilotMemo *);
-	/**
-	* Add the Note currently being processed to the
-	* pilot as a new memo. Returns the id of the record.
-	*/
-	int addNoteToPilot();
-
-
-	void resetIndexes();
-
-protected slots:
-	void process();
-
-private:
-	class KNotesActionPrivate;
-	KNotesActionPrivate *fP;
-} ;
-
-#endif
diff --git a/kpilot/conduits/knotes/knotes-conduit.desktop b/kpilot/conduits/knotes/knotes-conduit.desktop
deleted file mode 100644
index 9155d4b03..000000000
--- a/kpilot/conduits/knotes/knotes-conduit.desktop
+++ /dev/null
@@ -1,92 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit syncs the Memo Pad application with KNotes.
-Comment[af]=Hierdie pad synkroniseer die Memo Pad program met KNotes.
-Comment[bg]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° бележки на KDE Ñ Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¸ уÑтройÑтва
-Comment[bs]=Ovaj conduit sinhronizuje Memo Pad aplikaciju sa KNotes.
-Comment[ca]=Aquest conducte sincronitza l'aplicació Memo Pad amb Knotes.
-Comment[cs]=Toto propojení synchronizuje vašeho Pilota s poznámkami v KNotes.
-Comment[cy]=Mae'r cwndid yma yn cydamseru y cymhwysiad Memo Pad efo KNodiadau.
-Comment[da]=Denne kanal synkroniserer dit memopad-program med KNotes.
-Comment[de]=Abgleich des Memo Pad mit KNotes
-Comment[el]=Αυτός ο σÏνδεσμος συγχÏονίζει την εφαÏμογή Memo Pad με το KNotes.
-Comment[eo]=Tiu kanalo sinkronigas la MemoPad-aplikaĵon kun KNotoj.
-Comment[es]=Este conducto sincroniza la aplicación de Notas con KNotes.
-Comment[et]=See kanal sünkroniseerib Memo Pad rakenduse ja KNotesi.
-Comment[eu]=Kanal honek Memo Pad aplikazioa KNotes-ekin sinkronizatzen du.
-Comment[fa]=این لوله، کاربرد Memo Pad را با KNotes همگام می‌سازد.
-Comment[fi]=Tämä yhdyskäytävä synkronoi Memo Pad -ohelman KNotesin kanssa.
-Comment[fr]=Ce canal synchronise l'application « Memo Pad » avec KNotes.
-Comment[fy]=Dit conduit syngronisearret de Memo Pad mei KNotes.
-Comment[gl]=Este conducto sincroniza a aplicación Memo Pad con KNotes.
-Comment[hi]=यह कनà¥à¤¡à¥à¤¯à¥‚इट मेमो पेड अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤—ों को के-नोटà¥à¤¸ के साथ सिंक करता है
-Comment[hu]=Ezzel a csatolóval a Memo Pad program és a KNotes között lehet szinkronizálást végezni.
-Comment[is]=Þessi rás samstillir lófatölvuna þína við KNotes.
-Comment[it]=Questo condotto sincronizza l'applicazione Memo Pad con KNotes.
-Comment[ja]=ã“ã®ã‚³ãƒ³ã‚¸ãƒƒãƒˆã¯ãƒ¡ãƒ¢å¸³ã‚¢ãƒ—リケーションを KNotes ã¨åŒæœŸã•ã›ã¾ã™ã€‚
-Comment[kk]=Memo Pad қолданбаны KNotes жазбаларымен қадамдаÑтыру арнаÑÑ‹.
-Comment[km]=បំពង់​នáŸáŸ‡â€‹áž¢áž¶áž…​ឲ្យ​កម្មវិធី Memo Pad ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង KNotes ។
-Comment[lt]=Å is kanalas sinchronizuoja Memo Pad programÄ… su KNotes.
-Comment[mk]=Овој канал ја Ñинхронизира апликацијата Memo Pad Ñо КБелешки.
-Comment[ms]=Saluran ini mensegerakkan aplikasi Memo Pad dengan KNotes.
-Comment[nb]=Denne kanalen synkroniserer notatblokk-programmet med KNotes.
-Comment[nds]=Synkroniseert dat Palm-Programm "Memo Pad" mit KNotes.
-Comment[ne]=यो कनà¥à¤¡à¥à¤¯à¥à¤Ÿà¤²à¥‡ मेमो पà¥à¤¯à¤¾à¤¡ अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— केडीई टिपà¥à¤ªà¤£à¥€à¤®à¤¾ सिनà¥à¤• गरà¥à¤¦à¤› ।
-Comment[nl]=Dit conduit synchroniseert de Memo Pad met KNotes.
-Comment[nn]=Denne koplinga synkroniserer «Memo Pad»-applikasjonen med KNotes.
-Comment[pl]=Ten Å‚Ä…cznik synchronizuje program Memo Pad palmtopa z KNotes (notatkami).
-Comment[pt]=Esta conduta sincroniza os memorandos com o KNotes.
-Comment[pt_BR]=Este conduíte sincroniza a aplicação Memo Pad com o KNotes.
-Comment[ro]=Această conductă sincronizează aplicaţia Memo Pad cu KNotes.
-Comment[ru]=Канал Ñинхронизации заметок КПК и KDE.
-Comment[sk]=Táto spojka synchronizuje aplikáciu Memo Pad s KNotes
-Comment[sl]=Ta veznik usklajuje program Memo Pad s KNotice.
-Comment[sr]=Овај провод Ñинхронизује Memo Pad програме Ñа KNotes-ом.
-Comment[sr@Latn]=Ovaj provod sinhronizuje Memo Pad programe sa KNotes-om.
-Comment[sv]=Den här kanalen synkroniserar programmet Memo Pad med Knotes.
-Comment[ta]=இநà¯à®¤ காபà¯à®ªà¯à®•à¯ கà¯à®´à®¾à®¯à¯ கà¯à®±à®¿à®ªà¯à®ªà®¾à®£à¯ˆ அடà¯à®Ÿà¯ˆ பயனà¯à®ªà®¾à®Ÿà¯ கேகà¯à®±à®¿à®ªà¯à®ªà¯à®•à®³à¯à®Ÿà®©à¯ ஒதà¯à®¤à®¿à®šà¯ˆà®•à¯à®•à®¿à®±à®¤à¯
-Comment[tg]=Канали ÑинхронизатÑиÑи қайдоти Pilot ва KDE.
-Comment[tr]=Bu kanal KNotes ile el bilgisayarınızı senkronize etmenize olanak sağlar
-Comment[uk]=Цей акведук Ñинхронізує Memo Pad з тижневиком KNotes.
-Comment[zh_CN]=此管é“将会将您的备忘程åºä¸Ž KNotes åŒæ­¥ã€‚
-Comment[zh_TW]=此軟體將 KNote 與 Memo Pad 應用程å¼åŒæ­¥ã€‚
-Name=KNotes / Memos
-Name[be]=K Ðататкі
-Name[bg]=KNotes/Memos
-Name[cs]=KNotes / Poznámky
-Name[cy]=KNodiadau/Memos
-Name[da]=KNotes / Memoer
-Name[el]=KNotes / Υπομνήματα
-Name[eo]=KNotoj
-Name[et]=KNotes / memod
-Name[eu]=KNotes / Oharrak
-Name[fr]=KNotes / Mémos
-Name[fy]=KNotes / memo's
-Name[ga]=KNotes / Meamraim
-Name[hi]=के-नोटà¥à¤¸ / मेमो
-Name[hu]=KNotes / memók
-Name[is]=KNotes / minnisblöð
-Name[it]=KNotes / Memo
-Name[kk]=KNotes / Жазбалар
-Name[km]=KNotes / អនុស្សរណៈ
-Name[lt]=KNotes / Memo
-Name[mk]=КБелешки / Меморандуми
-Name[ms]=KNotes / Memo
-Name[nds]=KNotes / Notizen
-Name[ne]=केडीई टिपà¥à¤ªà¤£à¥€ / मेमो
-Name[nl]=KNotes / memo's
-Name[nn]=KNotes / Memoar
-Name[pl]=KNotes / Notatki
-Name[pt]=Notas / Memorandos
-Name[pt_BR]=KNotes / Memorandos
-Name[ru]=KNotes / Заметки
-Name[sk]=Poznámky / Memo
-Name[sl]=KNotice / Opomniki
-Name[sv]=Knotes/Memo Pad
-Name[ta]=கேகà¯à®±à®¿à®ªà¯à®ªà¯à®•à®³à¯/கà¯à®±à®¿à®ªà¯à®ªà®¾à®£à¯ˆà®•à®³à¯
-Name[tg]=KNotes / Қайдот
-Name[tr]=KNotlar / Hatırlatmalar
-Name[zh_CN]=KNotes / 备忘
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_knotes
diff --git a/kpilot/conduits/knotes/knotes-factory.cc b/kpilot/conduits/knotes/knotes-factory.cc
deleted file mode 100644
index 9601e81e5..000000000
--- a/kpilot/conduits/knotes/knotes-factory.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the factory for the knotes-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-
-#include 
-
-#include  // Needed by pilot-link include
-
-#include 
-
-#include "knotes-action.h"
-#include "knotes-setup.h"
-
-#include "knotes-factory.moc"
-
-
-extern "C"
-{
-
-void *init_conduit_knotes()
-{
-	return new KNotesConduitFactory;
-}
-
-}
-
-
-/* static */ KAboutData *KNotesConduitFactory::fAbout = 0L;
-
-KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) :
-	KLibFactory(p,n)
-{
-	FUNCTIONSETUP;
-
-	fInstance = new KInstance("knotesconduit");
-	fAbout = new KAboutData("knotesconduit",
-		I18N_NOOP("KNotes Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the KNotes Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Adriaan de Groot");
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Primary Author"),
-		"groot@kde.org",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-	fAbout->addCredit("David Bishop",
-		I18N_NOOP("UI"));
-}
-
-KNotesConduitFactory::~KNotesConduitFactory()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fInstance);
-	KPILOT_DELETE(fAbout);
-}
-
-/* virtual */ TQObject *KNotesConduitFactory::createObject( TQObject *p,
-	const char *n,
-	const char *c,
-	const TQStringList &a)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Creating object of class "
-		<< c
-		<< endl;
-#endif
-
-	if (qstrcmp(c,"ConduitConfigBase")==0)
-	{
-		TQWidget *w = dynamic_cast(p);
-		if (w)
-		{
-			return new KNotesConfigBase(w,0L);
-		}
-		else
-		{
-			return 0L;
-		}
-	}
-	else
-	if (qstrcmp(c,"SyncAction")==0)
-	{
-		KPilotLink *d = dynamic_cast(p);
-
-		if (d)
-		{
-			return new KNotesAction(d,n,a);
-		}
-		else
-		{
-			WARNINGKPILOT
-				<< "Couldn't cast parent to KPilotDeviceLink"
-				<< endl;
-			return 0L;
-		}
-	}
-
-	return 0L;
-}
diff --git a/kpilot/conduits/knotes/knotes-factory.h b/kpilot/conduits/knotes/knotes-factory.h
deleted file mode 100644
index 02b0f6102..000000000
--- a/kpilot/conduits/knotes/knotes-factory.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef _KPILOT_NULL_FACTORY_H
-#define _KPILOT_NULL_FACTORY_H
-/* null-factory.h                       KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the factory for the null-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include 
-
-class KInstance;
-class KAboutData;
-
-class KNotesConduitFactory : public KLibFactory
-{
-Q_OBJECT
-
-public:
-	KNotesConduitFactory(TQObject * = 0L,const char * = 0L);
-	virtual ~KNotesConduitFactory();
-
-	static KAboutData *about() { return fAbout; } ;
-
-	// The KNotes instance, unlike previous conduits (alphabetically)
-	// has const char * const members. The extra const prevents people
-	// from assigning to this variable, so you have to work hard to
-	// break its value. We store group and entry keys in here.
-
-protected:
-	virtual TQObject* createObject( TQObject* parent = 0,
-		const char* name = 0,
-		const char* classname = "TQObject",
-		const TQStringList &args = TQStringList() );
-private:
-	KInstance *fInstance;
-	static KAboutData *fAbout;
-} ;
-
-extern "C"
-{
-
-void *init_libknotesconduit();
-
-}
-
-
-#endif
diff --git a/kpilot/conduits/knotes/knotes-setup.cc b/kpilot/conduits/knotes/knotes-setup.cc
deleted file mode 100644
index 1127011ad..000000000
--- a/kpilot/conduits/knotes/knotes-setup.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the setup dialog for the knotes-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include "setup_base.h"
-
-#include "knotes-factory.h"
-#include "knotes-setup.h"
-#include "knotesconduitSettings.h"
-
-
-KNotesConfigBase::KNotesConfigBase(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(0L)
-{
-	fConfigWidget = new KNotesWidget(w);
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,KNotesConduitFactory::about());
-	fWidget = fConfigWidget;
-	TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fSuppressConfirm,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(toggled(bool)),
-		fConfigWidget->fSuppressConfirm,TQT_SLOT(setEnabled(bool)));
-	fConduitName=i18n("KNotes");
-}
-
-void KNotesConfigBase::commit()
-{
-	KNotesConduitSettings::setDeleteNoteForMemo( fConfigWidget->fDeleteNoteForMemo->isChecked() );
-	KNotesConduitSettings::setSuppressKNotesConfirm(fConfigWidget->fSuppressConfirm->isChecked());
-	KNotesConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-void KNotesConfigBase::load()
-{
-	KNotesConduitSettings::self()->readConfig();
-	fConfigWidget->fDeleteNoteForMemo->setChecked(KNotesConduitSettings::deleteNoteForMemo() );
-	fConfigWidget->fSuppressConfirm->setChecked(KNotesConduitSettings::suppressKNotesConfirm() );
-	fConfigWidget->fSuppressConfirm->setEnabled(KNotesConduitSettings::deleteNoteForMemo());
-	unmodified();
-}
-
-/* static */ ConduitConfigBase *KNotesConfigBase::create(TQWidget *w, const char *n)
-{
-	return new KNotesConfigBase(w,n);
-}
-
diff --git a/kpilot/conduits/knotes/knotes-setup.h b/kpilot/conduits/knotes/knotes-setup.h
deleted file mode 100644
index 652f22238..000000000
--- a/kpilot/conduits/knotes/knotes-setup.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _KPILOT_KNOTES_SETUP_H
-#define _KPILOT_KNOTES_SETUP_H
-/* knotes-setup.h                       KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the widget and behavior for the config dialog
-** of the KNotes conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class KNotesWidget;
-
-class KNotesConfigBase : public ConduitConfigBase
-{
-public:
-	KNotesConfigBase(TQWidget *parent, const char *name);
-
-	virtual void commit();
-	virtual void load();
-
-	static ConduitConfigBase *create(TQWidget *p, const char *n);
-private:
-	KNotesWidget *fConfigWidget;
-} ;
-
-#endif
diff --git a/kpilot/conduits/knotes/knotesconduit.kcfg b/kpilot/conduits/knotes/knotesconduit.kcfg
deleted file mode 100644
index 41d86d2b4..000000000
--- a/kpilot/conduits/knotes/knotesconduit.kcfg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-   
-  
-    
-        false
-    
-    
-        
-        false
-    
-
-    
-        
-        
-    
-    
-        
-        
-    
-  
-
diff --git a/kpilot/conduits/knotes/knotesconduitSettings.kcfgc b/kpilot/conduits/knotes/knotesconduitSettings.kcfgc
deleted file mode 100644
index 33152ac69..000000000
--- a/kpilot/conduits/knotes/knotesconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=knotesconduit.kcfg
-ClassName=KNotesConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/knotes/setup_base.ui b/kpilot/conduits/knotes/setup_base.ui
deleted file mode 100644
index e6aef8042..000000000
--- a/kpilot/conduits/knotes/setup_base.ui
+++ /dev/null
@@ -1,88 +0,0 @@
-
-KNotesWidget
-
-    
-        KNotesWidget
-    
-    
-        
-            0
-            0
-            436
-            394
-        
-    
-        
-        
-            unnamed
-        
-        
-            0
-        
-        
-            6
-        
-    
-        
-            tabWidget
-        
-        
-            
-                tab
-            
-            
-                General
-            
-            
-                
-                    unnamed
-                
-                
-                    
-                        fDeleteNoteForMemo
-                    
-                    
-                        Delete KNote when Pilot memo is deleted
-                    
-                    
-                        true
-                    
-                    
-                        <qt>Check this box if you wish to delete notes from KNotes automatically when the corresponding Pilot memo is deleted. Use this option with care, as the notes you want to keep in the handheld and in the desktop are not necessarily the same.</qt>
-                    
-                
-                
-                    
-                        fSuppressConfirm
-                    
-                    
-                        Suppress delete-confirmation in KNotes
-                    
-                    
-                        <qt>Check this box if you wish to delete notes from KNotes, without confirmation, when the corresponding Pilot memo is deleted. Use this option only if you want to keep the same notes in the handheld and in the PC.</qt>
-                    
-                
-                
-                    
-                        spacer1
-                    
-                    
-                        Vertical
-                    
-                    
-                        Expanding
-                    
-                    
-                        
-                            20
-                            101
-                        
-                    
-                
-            
-        
-    
-    
-
-
-
diff --git a/kpilot/conduits/malconduit/CMakeLists.txt b/kpilot/conduits/malconduit/CMakeLists.txt
deleted file mode 100644
index 092f340fd..000000000
--- a/kpilot/conduits/malconduit/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${MAL_INCLUDE_DIR}
-)
-
-set(conduit_mal_SRCS
-	mal-factory.cc 
-	mal-setup.cc 
-	mal-conduit.cc 
-)
-
-set(conduit_mal_UIS
-	mal-setup_dialog.ui
-)
-
-set(conduit_mal_KCFGS
-	malconduitSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
-kde3_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
-kde3_automoc(${conduit_mal_SRCS})
-add_library(conduit_mal SHARED ${conduit_mal_SRCS})
-target_link_libraries(conduit_mal ${MAL_LIBRARY})
-
-set_target_properties(
-	conduit_mal PROPERTIES 
-	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-	INSTALL_RPATH "${MAL_LIBRARY}"
-	INSTALL_RPATH_USE_LINK_PATH true
-)
-
-kde3_install_libtool_file(conduit_mal)
-
-install(
-	TARGETS conduit_mal
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES mal_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES malconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
diff --git a/kpilot/conduits/malconduit/Makefile.am b/kpilot/conduits/malconduit/Makefile.am
deleted file mode 100644
index d8a222431..000000000
--- a/kpilot/conduits/malconduit/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-### Makefile for the avantgo conduit
-###
-### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = mal_conduit.desktop
-kde_kcfg_DATA = malconduit.kcfg
-
-kde_module_LTLIBRARIES = conduit_mal.la
-
-conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc 
-conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI)
-
diff --git a/kpilot/conduits/malconduit/README b/kpilot/conduits/malconduit/README
deleted file mode 100644
index deeeb12ef..000000000
--- a/kpilot/conduits/malconduit/README
+++ /dev/null
@@ -1,12 +0,0 @@
-KPilot's malconduit
-+++++++++++++++++++
-
-Summary: This conduit syncs the handheld with 
-         MAL servers such as AvantGo. 
-Author: Reinhold Kainhofer, reinhold@kainhofer.com
-Date: August 15, 2002
-License: GPL, linking to libmal (MPL) is explicitly allowed
-Depends: The conduits needs libmal >=0.20 installed 
-         (otherwise it will not be compiled). libmal 
-         can be downloaded from
-         http://jasonday.home.att.net/code/libmal/							
diff --git a/kpilot/conduits/malconduit/mal-conduit.cc b/kpilot/conduits/malconduit/mal-conduit.cc
deleted file mode 100644
index 95c4d64b5..000000000
--- a/kpilot/conduits/malconduit/mal-conduit.cc
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-** MAL conduit for KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
- 
-
-
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-
-#include "mal-factory.h"
-#include "mal-conduit.moc"
-#include 
-#include "malconduitSettings.h"
-
-
-static MALConduit *conduitInstance=0L;
-
-int malconduit_logf(const char *, ...) __attribute__ ((format (printf, 1, 2)));
-
-int malconduit_logf(const char *format, ...)
-{
-	FUNCTIONSETUP;
-	va_list val;
-	int rval;
-	va_start(val, format);
-#define WRITE_MAX_BUF	4096
-	char msg[WRITE_MAX_BUF];
-	msg[0]='\0';
-	rval=vsnprintf(&msg[0], sizeof(msg), format, val);
-	va_end(val);
-	if (rval == -1) {
-		msg[WRITE_MAX_BUF-1] = '\0';
-		rval=WRITE_MAX_BUF-1;
-	}
-	if (conduitInstance)
-	{
-		conduitInstance->printLogMessage(msg);
-	}
-	else
-	{
-		// write out to stderr
-		WARNINGKPILOT<< msg << endl;
-	}
-	return rval;
-}
- 
-#ifndef LIBMAL20
-int32 cbTask (void * /*out*/,
-        int32 * /*returnErrorCode*/,
-        char *currentTask,
-        AGBool /*bufferable*/)
-{
-    if (currentTask) {
-        malconduit_logf ("%s\n", currentTask);
-    }
-
-    return AGCLIENT_CONTINUE;
-}
-
-static int32 cbItem (void */*out*/,
-        int32 * /*returnErrorCode*/,
-        int32   /*currentItemNumber*/,
-        int32   /*totalItemCount*/,
-        char *  /*currentItem*/)
-{
-//	The log widget only supports writing out whole lines. You just can't add a single character 
-//	to the last line. Thus I completely remove the pseudo-percentbar.
-/*    malconduit_logf (".");
-
-    if (currentItemNumber == totalItemCount) {
-        malconduit_logf ("\n");
-    }
-*/
-    return AGCLIENT_CONTINUE;
-}
-#endif
-
- 
-MALConduit::MALConduit(KPilotLink * o,
-	const char *n, 
-	const TQStringList & a) :
-	ConduitAction(o, n, a)
-{
-	FUNCTIONSETUP;
-#ifdef LIBMAL20
-	register_printStatusHook(malconduit_logf);
-	register_printErrorHook(malconduit_logf);
-#endif
-	conduitInstance=this;
-	fConduitName=i18n("MAL");
-}
-
-
-
-MALConduit::~MALConduit()
-{
-	FUNCTIONSETUP;
-}
-
-
-
-void MALConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	MALConduitSettings::self()->readConfig();
-#ifdef DEBUG
-	DEBUGKPILOT<<"Last sync was "<writeConfig();
-}
-
-
-
-bool MALConduit::skip() 
-{
-	TQDateTime now=TQDateTime::currentDateTime();
-	TQDateTime lastSync=MALConduitSettings::lastMALSync();
-	
-	if (!lastSync.isValid() || !now.isValid()) return false;
-	
-	switch ( MALConduitSettings::syncFrequency() ) 
-	{
-		case MALConduitSettings::eEveryHour:
-			if ( (lastSync.secsTo(now)<=3600) && (lastSync.time().hour()==now.time().hour()) ) return true;
-			else return false;
-		case MALConduitSettings::eEveryDay:
-			if ( lastSync.date() == now.date() ) return true;
-			else return false;
-		case MALConduitSettings::eEveryWeek:
-			if ( (lastSync.daysTo(now)<=7)  && ( lastSync.date().dayOfWeek()<=now.date().dayOfWeek()) ) return true;
-			else return false;
-		case MALConduitSettings::eEveryMonth:
-			if ( (lastSync.daysTo(now)<=31) && (lastSync.date().month()==now.date().month()) ) return true;
-			else return false;
-		case MALConduitSettings::eEverySync:
-		default:
-			return false;
-	}
-	return false;
-}
-
-
-
-/* virtual */ bool MALConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	
-	// TODO: set the log/error message hooks of libmal here!!!
-
-	if (skip()) 
-	{
-		emit logMessage(i18n("Skipping MAL sync, because last synchronization was not long enough ago."));
-		emit syncDone(this);
-		return true;
-	}
-	
-	// Now initiate the sync.
-	PalmSyncInfo* pInfo=syncInfoNew();
-	if (!pInfo) {
-		WARNINGKPILOT << "Could not allocate SyncInfo!" << endl;
-		emit logError(i18n("MAL synchronization failed (no SyncInfo)."));
-		return false;
-	}
-
-	TQString proxyServer( MALConduitSettings::proxyServer() );
-	int proxyPort( MALConduitSettings::proxyPort() );
-	TQString syncMessage;
-	bool canContinue = true;
-	// Set all proxy settings
-	switch (MALConduitSettings::proxyType()) 
-	{
-		case MALConduitSettings::eProxyHTTP:
-			if (proxyServer.isEmpty()) 
-			{
-				canContinue = false;
-				syncMessage = i18n("No proxy server is set.");
-				break;
-			}
-			syncMessage = i18n("Using proxy server: %1").arg(proxyServer);
-
-#ifdef DEBUG
-			DEBUGKPILOT<<" Using HTTP proxy server \""<(proxyServer.latin1()));
-			if (proxyPort>0 && proxyPort<65536) setHttpProxyPort( proxyPort );
-			else setHttpProxyPort(80);
-#else
-			pInfo->httpProxy = new char[ proxyServer.length() + 1 ];
-			strlcpy( pInfo->httpProxy, proxyServer.latin1(), proxyServer.length() + 1);
-			if (proxyPort>0 && proxyPort<65536) pInfo->httpProxyPort = proxyPort;
-			else pInfo->httpProxyPort = 80;
-#endif
-			
-			if (!MALConduitSettings::proxyUser().isEmpty()) 
-			{
-#ifdef LIBMAL20
-				setProxyUsername( const_cast(MALConduitSettings::proxyUser().latin1()) );
-				if (!MALConduitSettings::proxyPassword().isEmpty()) setProxyPassword( const_cast(MALConduitSettings::proxyPassword().latin1()) );
-#else
-				pInfo->proxyUsername = new char[ MALConduitSettings::proxyUser().length() + 1 ];
-				strlcpy( pInfo->proxyUsername, MALConduitSettings::proxyUser().latin1(), MALConduitSettings::proxyUser().length() + 1);
-				if (!MALConduitSettings::proxyPassword().isEmpty()) {
-//						pInfo->proxyPassword = MALConduitSettings::proxyPassword().latin1();
-					pInfo->proxyPassword = new char[ MALConduitSettings::proxyPassword().length() + 1 ];
-					strlcpy( pInfo->proxyPassword, MALConduitSettings::proxyPassword().latin1(), MALConduitSettings::proxyPassword().length() + 1);
-				}
-#endif
-			}
-			break;
-		case MALConduitSettings::eProxySOCKS:
-			if (proxyServer.isEmpty()) 
-			{
-				canContinue = false;
-				syncMessage = i18n("No SOCKS proxy is set.");
-				break;
-			}
-			syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer);
-#ifdef DEBUG
-			DEBUGKPILOT<<" Using SOCKS proxy server \""<(proxyServer.latin1()) );
-			if (proxyPort>0 && proxyPort<65536) setSocksProxyPort( proxyPort );
-			else setSocksProxyPort(1080);
-#else
-//			pInfo->socksProxy = proxyServer.latin1();
-			pInfo->socksProxy = new char[ proxyServer.length() + 1 ];
-			strlcpy( pInfo->socksProxy, proxyServer.latin1(), proxyServer.length() + 1);
-			if (proxyPort>0 && proxyPort<65536) pInfo->socksProxyPort = proxyPort;
-			else pInfo->socksProxyPort = 1080;
-#endif
-			break; 
-		default:
-			break;
-	}
-
-	logMessage(syncMessage);
-
-	if (!canContinue)
-	{
-		return false;
-	}
-
-#ifdef LIBMAL20
-	malsync( pilotSocket(), pInfo);
-#else
-	pInfo->sd = pilotSocket();
-	pInfo->taskFunc = cbTask;
-	pInfo->itemFunc = cbItem;
-	malsync( pInfo );
-	delete[] pInfo->httpProxy;
-	delete[] pInfo->proxyUsername;
-	delete[] pInfo->proxyPassword;
-	delete[] pInfo->socksProxy;
-	syncInfoFree(pInfo);
-#endif
-
-	saveConfig();
-	return delayDone();
-}
-
-void MALConduit::printLogMessage(TQString msg)
-{
-	FUNCTIONSETUP;
-	// Remove the pseudo-progressbar:
-	TQString newmsg(msg);
-	newmsg.replace( TQRegExp("^\\s*\\.*\\s*"), "");
-	newmsg.replace( TQRegExp("\\s*\\.*\\s*$"), "");
-	if (newmsg.length()>0)
-	{
-		emit logMessage(newmsg);
-	}
-}
-
diff --git a/kpilot/conduits/malconduit/mal-conduit.h b/kpilot/conduits/malconduit/mal-conduit.h
deleted file mode 100644
index 3f5c14a04..000000000
--- a/kpilot/conduits/malconduit/mal-conduit.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _MAL_CONDUIT_H
-#define _MAL_CONDUIT_H
-/* mal-conduit.h                           KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-
-#include 
-
-class MALConduit : public ConduitAction
-{
-Q_OBJECT
-public:
-	MALConduit(
-		KPilotLink *o,
-		const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~MALConduit();
-	void printLogMessage(TQString msg);
-	virtual bool exec();
-
-protected:
-	/**
-	 * Read in the config from the KPilot config files and fill the member variables accordingly
-	 */
-	void readConfig();
-	/**
-	 * Store the sync time in the KPilot configuration
-	 */
-	void saveConfig();
-	/**
-	 * Check if the last sync was not so long ago that according to MALConduitSettings::syncFrequency() we can skip the sync this time
-	 */
-	bool skip();
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/malconduit/mal-factory.cc b/kpilot/conduits/malconduit/mal-factory.cc
deleted file mode 100644
index 3e363d269..000000000
--- a/kpilot/conduits/malconduit/mal-factory.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Time-factory.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the MAL-conduit plugin.
-*/
- 
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h" 
-
-#include 
-#include 
-#include 
-
-#include  // Needed by pilot-link include
-#include "mal-conduit.h"
-#include "mal-setup.h"
-
-#include "mal-factory.moc"
-
-
-extern "C"
-{
-
-void *init_conduit_mal()
-{
-	return new MALConduitFactory;
-}
-
-unsigned long version_conduit_mal = Pilot::PLUGIN_API;
-
-}
-
-
-// A number of static variables
-//
-KAboutData *MALConduitFactory::fAbout = 0L;
-
-MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
-	KLibFactory(p,n)
-{
-	FUNCTIONSETUP;
-
-	fInstance = new KInstance("MALconduit");
-	fAbout = new KAboutData("MALconduit",
-		I18N_NOOP("MAL Synchronization Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-		KAboutData::License_GPL,
-		"(C) 2002, Reinhold Kainhofer");
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
-	fAbout->addCredit("Jason Day",
-		I18N_NOOP("Author of libmal and the JPilot AvantGo conduit"), "jasonday@worldnet.att.net");
-	fAbout->addCredit("Tom Whittaker",
-		I18N_NOOP("Author of syncmal"), "tom@tomw.org", "http://www.tomw.org/");
-	fAbout->addCredit("AvantGo, Inc.",
-		I18N_NOOP("Authors of the malsync library (c) 1997-1999"), "", "http://www.avantgo.com/");
-}
-
-MALConduitFactory::~MALConduitFactory()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fInstance);
-	KPILOT_DELETE(fAbout);
-}
-
-/* virtual */ TQObject *MALConduitFactory::createObject( TQObject *p,
-	const char *n,
-	const char *c,
-	const TQStringList &a)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Creating object of class "
-		<< c
-		<< endl;
-#endif
-
-	if (qstrcmp(c,"ConduitConfigBase")==0)
-	{
-		TQWidget *w = dynamic_cast(p);
-
-		if (w)
-		{
-			return new MALWidgetSetup(w,n);
-		}
-		else 
-		{
-			WARNINGKPILOT
-				<< "Couldn't cast parent to widget."
-				<< endl;
-			return 0L;
-		}
-	}
-
-	if (qstrcmp(c,"SyncAction")==0)
-	{ 
-		KPilotLink *d = dynamic_cast(p);
-
-		if (d)
-		{
-			return new MALConduit(d,n,a);
-		}
-		else
-		{
-			WARNINGKPILOT
-				<< "Couldn't cast parent to KPilotLink"
-				<< endl;
-			return 0L;
-		}
-	}
-
-	return 0L;
-}
-
diff --git a/kpilot/conduits/malconduit/mal-factory.h b/kpilot/conduits/malconduit/mal-factory.h
deleted file mode 100644
index a15316381..000000000
--- a/kpilot/conduits/malconduit/mal-factory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _TIME_FACTORY_H
-#define _TIME_FACTORY_H
-/* MAL-factory.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the mal-conduit plugin.
-*/
- 
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include 
-
-class KInstance;
-class KAboutData;
-
-class MALConduitFactory : public KLibFactory
-{
-Q_OBJECT
-
-public:
-	MALConduitFactory(TQObject * = 0L,const char * = 0L);
-	virtual ~MALConduitFactory();
-
-	static KAboutData *about() { return fAbout; } ;
-
-protected:
-	virtual TQObject* createObject( TQObject* parent = 0,
-		const char* name = 0,
-		const char* classname = "TQObject",
-		const TQStringList &args = TQStringList() );
-private:
-	KInstance *fInstance;
-	static KAboutData *fAbout;
-} ;
-
-extern "C"
-{
-
-void *init_libtimeconduit();
-
-}
-
-#endif
diff --git a/kpilot/conduits/malconduit/mal-setup.cc b/kpilot/conduits/malconduit/mal-setup.cc
deleted file mode 100644
index 1d1f89ff2..000000000
--- a/kpilot/conduits/malconduit/mal-setup.cc
+++ /dev/null
@@ -1,185 +0,0 @@
-/* MAL-setup.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the setup dialog for the MAL-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-
-#include "mal-setup_dialog.h"
-
-#include "mal-factory.h"
-#include "mal-setup.moc"
-#include "malconduitSettings.h"
-
-
-MALWidgetSetup::MALWidgetSetup(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new MALWidget(w))
-{
-	FUNCTIONSETUP;
-
-	fConduitName=i18n("MAL");
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,MALConduitFactory::about());
-	fWidget = fConfigWidget;
-
-	fConfigWidget->tabWidget->adjustSize();
-	fConfigWidget->resize(fConfigWidget->tabWidget->size());
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM( syncTime, TQT_SIGNAL(clicked(int)) );
-	CM( proxyType, TQT_SIGNAL(clicked(int)) );
-
-	CM( proxyServerName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( proxyCustomPortCheck, TQT_SIGNAL(clicked()) );
-	CM( proxyCustomPort, TQT_SIGNAL(valueChanged(int)) );
-	CM( proxyUserName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( proxyPassword, TQT_SIGNAL(textChanged(const TQString &)) );
-
-	CM( malServerName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( malCustomPortCheck, TQT_SIGNAL(clicked()) );
-	CM( malCustomPort, TQT_SIGNAL(valueChanged(int)) );
-	CM( malUserName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( malPassword, TQT_SIGNAL(textChanged(const TQString &)) );
-#undef CM
-}
-
-MALWidgetSetup::~MALWidgetSetup()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ void MALWidgetSetup::commit()
-{
-	FUNCTIONSETUP;
-
-	MALConduitSettings::setSyncFrequency(
-		fConfigWidget->syncTime->id(fConfigWidget->syncTime->selected()));
-
-	// Proxy settings
-	MALConduitSettings::setProxyType(
-		fConfigWidget->proxyType->id(fConfigWidget->proxyType->selected()));
-	MALConduitSettings::setProxyServer( fConfigWidget->proxyServerName->currentText() );
-
-	if (fConfigWidget->proxyCustomPortCheck->isChecked() )
-	{
-		MALConduitSettings::setProxyPort( fConfigWidget->proxyCustomPort->value());
-	}
-	else
-	{
-		MALConduitSettings::setProxyPort(0);
-	}
-	MALConduitSettings::setProxyUser( fConfigWidget->proxyUserName->text() );
-	MALConduitSettings::setProxyPassword( fConfigWidget->proxyPassword->password() );
-
-	// MAL Server settings (not yet possible!!!)
-	MALConduitSettings::setMALServer( fConfigWidget->malServerName->currentText() );
-
-	if (fConfigWidget->malCustomPortCheck->isChecked() )
-	{
-		MALConduitSettings::setMALPort( fConfigWidget->malCustomPort->value());
-	}
-	else
-	{
-		MALConduitSettings::setMALPort(0);
-	}
-	MALConduitSettings::setMALUser( fConfigWidget->malUserName->text() );
-	MALConduitSettings::setMALPassword( fConfigWidget->malPassword->text() );
-
-	MALConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-
-
-/* virtual */ void MALWidgetSetup::load()
-{
-	FUNCTIONSETUP;
-	MALConduitSettings::self()->readConfig();
-
-	fConfigWidget->syncTime->setButton( MALConduitSettings::syncFrequency() );
-
-	// Proxy settings
-	fConfigWidget->proxyType->setButton(MALConduitSettings::proxyType());
-	fConfigWidget->proxyServerName->setEditText(MALConduitSettings::proxyServer());
-
-	int proxyPortNr=MALConduitSettings::proxyPort();
-	if (proxyPortNr>0 && proxyPortNr<65536)
-	{
-		fConfigWidget->proxyCustomPortCheck->setChecked(true);
-		fConfigWidget->proxyCustomPort->setEnabled(true);
-		fConfigWidget->proxyCustomPort->setValue(proxyPortNr);
-	}
-	fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser());
-	fConfigWidget->proxyPassword->setText(TQString::null);
-	fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword());
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Got proxy password <"
-		<< MALConduitSettings::proxyPassword()
-		<< "> set Text <"
-		<< fConfigWidget->proxyPassword->text()
-		<< "> and Pwd <"
-		<< fConfigWidget->proxyPassword->password()
-		<< ">" << endl;
-#endif
-
-	// MAL Server settings (not yet possible!!!)
-	fConfigWidget->malServerName->setEditText(MALConduitSettings::mALServer());
-
-	int malPortNr=MALConduitSettings::mALPort();
-	if (malPortNr>0 && malPortNr<65536)
-	{
-		fConfigWidget->malCustomPortCheck->setChecked(true);
-		fConfigWidget->malCustomPort->setEnabled(true);
-		fConfigWidget->malCustomPort->setValue(proxyPortNr);
-	}
-	fConfigWidget->malUserName->setText(MALConduitSettings::mALUser());
-	fConfigWidget->malPassword->setText(MALConduitSettings::mALPassword());
-	unmodified();
-}
-
-/* static */ ConduitConfigBase *MALWidgetSetup::create(TQWidget *w, const char *n)
-{
-	return new MALWidgetSetup(w,n);
-}
-
diff --git a/kpilot/conduits/malconduit/mal-setup.h b/kpilot/conduits/malconduit/mal-setup.h
deleted file mode 100644
index 6a6337496..000000000
--- a/kpilot/conduits/malconduit/mal-setup.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _MAL_SETUP_H
-#define _MAL_SETUP_H
-/* mal-setup.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the mal conduit.
-*/
- 
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class MALWidget;
-
-class MALWidgetSetup : public ConduitConfigBase
-{
-Q_OBJECT
-public:
-	MALWidgetSetup(TQWidget *,const char *);
-	virtual ~MALWidgetSetup();
-	virtual void load();
-	virtual void commit();
-	static ConduitConfigBase *create(TQWidget *, const char *);
-private:
-	MALWidget *fConfigWidget;
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/malconduit/mal-setup_dialog.ui b/kpilot/conduits/malconduit/mal-setup_dialog.ui
deleted file mode 100644
index 8814d190c..000000000
--- a/kpilot/conduits/malconduit/mal-setup_dialog.ui
+++ /dev/null
@@ -1,634 +0,0 @@
-
-MALWidget
-Reinhold Kainhofer
-
-    
-        MalWidget
-    
-    
-        
-            0
-            0
-            534
-            505
-        
-    
-    
-        
-            unnamed
-        
-        
-            0
-        
-        
-            6
-        
-        
-            
-                tabWidget
-            
-            
-                true
-            
-            
-                
-                    tab
-                
-                
-                    General
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            syncTime
-                        
-                        
-                            Sync
-                        
-                        
-                            Select how often AvantGo should be synchronised
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                11
-                            
-                            
-                                6
-                            
-                            
-                                
-                                    RadioButton1
-                                
-                                
-                                    true
-                                
-                                
-                                    &Every sync
-                                
-                                
-                                    true
-                                
-                                
-                                    <qt>Select this option to synchronize with the MAL server on every HotSync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton1_2
-                                
-                                
-                                    Once per &hour
-                                
-                                
-                                    
-                                
-                                
-                                    <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one hour after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton1_3
-                                
-                                
-                                    Once a &day
-                                
-                                
-                                    <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one day after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton1_4
-                                
-                                
-                                    Once a &week
-                                
-                                
-                                    <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one week after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton1_5
-                                
-                                
-                                    Once a &month
-                                
-                                
-                                    <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one month after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt>
-                                
-                            
-                        
-                    
-                    
-                        
-                            Spacer3
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                20
-                            
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    Proxy
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        
-                            proxyType
-                        
-                        
-                            GroupBoxPanel
-                        
-                        
-                            Proxy Type
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                11
-                            
-                            
-                                6
-                            
-                            
-                                
-                                    RadioButton8
-                                
-                                
-                                    &No proxy
-                                
-                                
-                                    true
-                                
-                                
-                                    <qt>Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton8_2
-                                
-                                
-                                    &HTTP proxy
-                                
-                                
-                                    <qt>Select this option if you want KPilot to use a HTTP proxy.</qt>
-                                
-                            
-                            
-                                
-                                    RadioButton8_2_2
-                                
-                                
-                                    &SOCKS proxy
-                                
-                                
-                                    <qt>Select this option if you want KPilot to use a SOCKS proxy.</qt>
-                                
-                            
-                        
-                    
-                    
-                        
-                            proxyServerInformation
-                        
-                        
-                            false
-                        
-                        
-                            Server Information
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                11
-                            
-                            
-                                6
-                            
-                            
-                                
-                                    Spacer2
-                                
-                                
-                                    Horizontal
-                                
-                                
-                                    Expanding
-                                
-                                
-                                    
-                                        20
-                                        20
-                                    
-                                
-                            
-                            
-                                
-                                    proxyCustomPortCheck
-                                
-                                
-                                    Custom &port:
-                                
-                                
-                                    Check this box to use a non-standard proxy port.
-                                
-                            
-                            
-                                
-                                    TextLabel1
-                                
-                                
-                                    Ser&ver name:
-                                
-                                
-                                    proxyServerName
-                                
-                                
-                                    <qt>If you selected HTTP or SOCKS proxy, type the address of the proxy server to use here, in the form <i>foo.bar.com</i> (not <i>http://foo.bar.com</i> or <i>http://foo.bar.com:8080</i>).</qt>
-                                
-                            
-                            
-                                
-                                    proxyServerName
-                                
-                                
-                                    <qt>If you selected HTTP or SOCKS proxy, type the address of the proxy server to use here, in the form <i>foo.bar.com</i> (not <i>http://foo.bar.com</i> or <i>http://foo.bar.com:8080</i>).</qt>
-                                
-                            
-                            
-                                
-                                    proxyCustomPort
-                                
-                                
-                                    false
-                                
-                                
-                                    80
-                                
-                                
-                                    0
-                                
-                                
-                                    65535
-                                
-                                
-                                    <qt>Enter the port you want KPilot to use when connecting to your proxy server here.</qt>
-                                
-                            
-                            
-                                
-                                    proxyPassword
-                                
-                                
-                                    Password
-                                
-                                
-                                    <qt>If your proxy requires authentication, enter your password here.</qt>
-                                
-                            
-                            
-                                
-                                    proxyUserName
-                                
-                                
-                                    <qt>If your proxy requires authentication, enter your username here.</qt>
-                                
-                            
-                            
-                                
-                                    TextLabel2_2
-                                
-                                
-                                    &Password:
-                                
-                                
-                                    proxyPassword
-                                
-                            
-                            
-                                
-                                    TextLabel2
-                                
-                                
-                                    &User name:
-                                
-                                
-                                    proxyUserName
-                                
-                                
-                                    <qt>If your proxy requires authentication, enter your username here.</qt>
-                                
-                            
-                            
-                                
-                                    Line1
-                                
-                                
-                                    HLine
-                                
-                                
-                                    Sunken
-                                
-                                
-                                    Horizontal
-                                
-                            
-                            
-                                
-                                    proxyExclude
-                                
-                                
-                                    <qt>Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: <br><i>localhost,127.0.0.1,.lan</i><qt>
-                                
-                            
-                            
-                                
-                                    textLabel1
-                                
-                                
-                                    N&o proxy for:
-                                
-                                
-                                    proxyExclude
-                                
-                                
-                                    <qt>Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: <br><i>localhost,127.0.0.1,.lan</i><qt>
-                                
-                            
-                        
-                    
-                    
-                        
-                            Spacer3_2
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                70
-                            
-                        
-                    
-                
-            
-            
-                
-                    tab
-                
-                
-                    MAL Server
-                
-                
-                    
-                        unnamed
-                    
-                    
-                        11
-                    
-                    
-                        6
-                    
-                    
-                        
-                            GroupBox1_2
-                        
-                        
-                            false
-                        
-                        
-                            MAL Server Information
-                        
-                        
-                            
-                                unnamed
-                            
-                            
-                                11
-                            
-                            
-                                6
-                            
-                            
-                                
-                                    TextLabel1_2
-                                
-                                
-                                    &MAL server name:
-                                
-                                
-                                    malServerName
-                                
-                            
-                            
-                                
-                                    malCustomPortCheck
-                                
-                                
-                                    Custom &port:
-                                
-                            
-                            
-                                
-                                    malCustomPort
-                                
-                                
-                                    false
-                                
-                                
-                                    80
-                                
-                                
-                                    0
-                                
-                                
-                                    65535
-                                
-                            
-                            
-                                
-                                    Spacer2_2
-                                
-                                
-                                    Horizontal
-                                
-                                
-                                    Expanding
-                                
-                                
-                                    
-                                        20
-                                        20
-                                    
-                                
-                            
-                            
-                                
-                                    malServerName
-                                
-                            
-                            
-                                
-                                    malUserName
-                                
-                            
-                            
-                                
-                                    TextLabel2_2_2
-                                
-                                
-                                    &Password:
-                                
-                                
-                                    malPassword
-                                
-                            
-                            
-                                
-                                    textLabel
-                                
-                                
-                                    &User name:
-                                
-                                
-                                    malUserName
-                                
-                            
-                            
-                                
-                                    Line1_2
-                                
-                                
-                                    HLine
-                                
-                                
-                                    Sunken
-                                
-                                
-                                    Horizontal
-                                
-                            
-                            
-                                
-                                    malPassword
-                                
-                            
-                        
-                    
-                    
-                        
-                            Spacer5
-                        
-                        
-                            Vertical
-                        
-                        
-                            Expanding
-                        
-                        
-                            
-                                20
-                                20
-                            
-                        
-                    
-                    
-                        
-                            TextLabel1_3
-                        
-                        
-                            <qt>There is currently <b>no way to set server parameters on the desktop</b>; you need to use the <i>MobileLink</i> or <i>AGConnect</i> application on the handheld device. </qt>
-                        
-                    
-                
-            
-        
-    
-
-
-    
-        RadioButton8
-        toggled(bool)
-        proxyServerInformation
-        setDisabled(bool)
-    
-    
-        RadioButton8_2
-        toggled(bool)
-        proxyServerInformation
-        setEnabled(bool)
-    
-    
-        RadioButton8_2_2
-        toggled(bool)
-        proxyServerInformation
-        setEnabled(bool)
-    
-    
-        proxyCustomPortCheck
-        toggled(bool)
-        proxyCustomPort
-        setEditFocus(bool)
-    
-    
-        proxyCustomPortCheck
-        toggled(bool)
-        proxyCustomPort
-        setEnabled(bool)
-    
-    
-        malCustomPortCheck
-        toggled(bool)
-        malCustomPort
-        setEditFocus()
-    
-    
-        malCustomPortCheck
-        toggled(bool)
-        malCustomPort
-        setEnabled(bool)
-    
-
-
-    tabWidget
-
-
-
-    klineedit.h
-    knuminput.h
-
-
diff --git a/kpilot/conduits/malconduit/mal_conduit.desktop b/kpilot/conduits/malconduit/mal_conduit.desktop
deleted file mode 100644
index c502668dc..000000000
--- a/kpilot/conduits/malconduit/mal_conduit.desktop
+++ /dev/null
@@ -1,94 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=MAL (AvantGo) Conduit
-Name[af]=MAL (AvantGo) pad
-Name[ca]=Conducte MAL (AvantGo)
-Name[cs]=Propojení s AvantGo
-Name[cy]=Cwndid MAL (AvantGo)
-Name[de]=MAL- (AvantGo) Abgleich (Conduit)
-Name[el]=ΣÏνδεσμος MAL (AvantGo)
-Name[eo]=MAL (AvantGo) Kanalo
-Name[es]=Conducto MAL (AvantGo)
-Name[et]=MAL (AvantGo) kanal
-Name[eu]=MAL (AvantGo) kanala
-Name[fa]=لولۀ MAL (AvantGo)
-Name[fi]=MAL (AvantGo)- yhdyskäytävä
-Name[fr]=MAL (AvantGo) Canal
-Name[ga]=Seoladán MAL (AvantGo)
-Name[gl]=Conducto MAL (AvantGo)
-Name[he]=ממשק AvantGo) MAL)
-Name[hi]=à¤à¤®à¤à¤à¤² (AvantGo) कनà¥à¤¡à¥à¤¯à¥‚इट
-Name[hu]=MAL- (AvantGo) csatoló
-Name[is]=MAL (AvantGo)-rás
-Name[it]=Conduit MAL (AvantGo)
-Name[ja]=MAL (AvantGo) コンジット
-Name[kk]=MAL (AvantGo) арнаÑÑ‹
-Name[km]=បំពង់ MAL (AvantGo)
-Name[lt]=MAL (AvantGo) kanalas
-Name[ms]=Saluran MAL (AvantGo) 
-Name[nb]=MAL (AvantGo) kanal
-Name[nds]=MAL(AvantGo)-Synkroniseren
-Name[ne]=MAL (AvantGo) कनà¥à¤¡à¥à¤¯à¥à¤Ÿ
-Name[nn]=MAL-kopling (AvantGo)
-Name[nso]=Conduit ya MAL (AvantGo)
-Name[pl]=ÅÄ…cznik do MAL (AvantGo)
-Name[pt]=Conduta MAL (AvantGo)
-Name[pt_BR]=Conduto MAL (AvantGo)
-Name[ro]=Conductă MAL (AvantGo)
-Name[ru]=Канал MAL (AvantGo)
-Name[sk]=Spojka MAL (AvantGo)
-Name[sl]=Veznik MAL (AvantGo)
-Name[sr]=MAL (AvantGo) провод
-Name[sr@Latn]=MAL (AvantGo) provod
-Name[sv]=MAL (AvantGo)-kanal
-Name[ta]=MAL (AvantGo) காபà¯à®ªà¯à®•à¯ கà¯à®´à®¾à®¯à¯
-Name[tg]=Канали MAL (AvantGo)
-Name[tr]=MAL (AvantGo) Kanalı
-Name[uk]=Ðкведук MAL (AvantGo)
-Name[zh_CN]=MAL (AvantGo) 管é“
-Comment=Syncronize AvantGo (or generally a MAL server's content) to the handheld. This allows you to view web-pages offline on the handheld, like your cinema or TV schedule, or any other web page.
-Comment[af]=Sinkroniseer AvantGo (MAL bediener inhoud) informasie na die draagbare toestel. Dit maak dit moontlik om aflyn na web blaaie, soos TV en fliek skedules, te kyk.
-Comment[bg]=Синхронизиране на AvantGo към мобилно уÑтройÑтво. Тази приÑтавка ви позволÑва да разглеждате уеб Ñтраници без връзка Ñ ÐœÑ€ÐµÐ¶Ð°Ñ‚Ð°.
-Comment[ca]=Sincronitza AvantGo (o el contingut d'un servidor MAL en general) a l'agenda electrònica. Això us permet veure pàgines web a l'agenda electrònica en mode desconnectat, com ara la programació de TV o cinema o qualsevol altra pàgina web.
-Comment[cs]=Synchronizace AvantGo (nebo obecně obsahu MAL serverů) s PDA. To umožňuje offline prohlížení stránek v PDA např. TV programů, programů kin a mnoha dalších stránek.
-Comment[da]=Synkronisér AvantGo (eller mere alment indholdet på en MAL-server) med den håndholdte. Det lader dig kigge på nedsider offline på den håndholdte, såsom biografer eller tv-programmer, eller en hvilken som helst anden netside.
-Comment[de]=Gleicht AvantGo (oder allgemein den Inhalt eines MAL-Servers) mit dem Taschencomputer ab. So können Sie z. B. Internetseiten ohne Internetverbindung auf dem Taschencomputer lesen, zum Beispiel einen Kinoplan oder die aktuelle Programmzeitschrift.
-Comment[el]=ΣυγχÏονισμός ενός AvantGo (ή γενικότεÏα τα πεÏιεχόμενα ενός εξυπηÏετητή MAL) με τον υπολογιστή παλάμης. Αυτό σας επιτÏέπει να βλέπετε ιστοσελίδες στον υπολογιστή παλάμης χωÏίς να είστε συνδεδεμένοι, όπως το Ï€ÏόγÏαμμα των κινηματογÏάφων ή της τηλεόÏασης, ή οποιαδήποτε άλλη ιστοσελίδα.
-Comment[en_GB]=Syncronise AvantGo (or generally a MAL server's content) to the handheld. This allows you to view web-pages offline on the handheld, like your cinema or TV schedule, or any other web page.
-Comment[es]=Sincroniza AvantGo (o más genéricamente, el contenido de un servidor MAL) con la agenda electrónica. Le permite ver páginas web en la agenda electrónica sin estar conectado, como la programación de televisión o la cartelera de cine, o cualquier otra página web.
-Comment[et]=See kanal sünkroniseerib AvantGo (või üldisemalt MAL serveri sisu) pihuarvutiga. See võimaldab vaadata veebilehekülgi pihuseadmelt ilma võrguühendusega, näiteks uurida kino- või telekava või mis tahes muud huvipakkuvat veebilehekülge.
-Comment[eu]=Sinkronizatu AvantGo (edo orokorrean MAL zerbitzariaren edukina) agenda elektronikora. Honek web-orriak agendan konexio gabe ikusteko aukera ematen dizu, zure zine edo TB antolatzailean bezala, edo beste web orri bat bezala.
-Comment[fa]=همگام‌سازی AvantGo (یا عموماً محتوای کارساز MAL) با دستی. به شما اجازه می‌دهد Ú©Ù‡ صÙحات وب برون‌خطی روی دستی، مانند برنامۀ سینما یا تلویزیون شما، یا هر صÙحه وب دیگری را مشاهده کنید.
-Comment[fi]=Synkronoi AvantGo (tai yleisesti MAL-palvelimen sisältö) taskutietokoneeseen. Tämä mahdollistaa web-sivujen lukemisen offline-tilassa (esim. elokuva- tai tv-ohjelmasivujen).
-Comment[fr]=Synchronise AvantGo (ou plus généralement tout serveur MAL) avec votre Palm. Ceci vous permet de consulter des pages Web hors ligne sur votre Palm, comme des programmes TV, Cinéma ou n'importe quelle page Web.
-Comment[fy]=Avantgo mei de handheld syngronosearje (of eins mei de ynhâld fan in g MAL-tsjinner). Dit makket it mooglik om in webside sûnder ferbining te besjen op jo handheld.  Dit is hanjnich foar in soad saken lykas de TV-gids.
-Comment[gl]=Sincronizar AvantGo (ou xeralmente o contido dun servidor MAL) co aparello portátil. Isto permite ver as páxinas web fóra de liña no aparello portátil, como a programación do cine ou da TV, ou calquera outra páxina web.
-Comment[hu]=AvantGo (vagy MAL-kiszolgáló) adatainak szinkronizálása a kézi számítógéppel. Lehetővé teszi weboldalak offline módban való megtekintését, például a mozi- vagy tévéműsort, vagy bármi mást.
-Comment[is]=Samstillir AvantGo (eða venjulega innihald MAL þjóns) við lófatölvuna. Þetta gerir þér kleyft að skoða vefsíður þegar þú ert ótengd(ur) vefnum, t.d. kvikmynda eða sjónvarpsdagskrá.
-Comment[it]=Sincronizza AvantGo (o il contenuto di un generico server MAL) con il palmare. In questo modo potrai visualizzare le pagine web offline sul palmare come per esempio la programmazione di un cinema o una TV o qualsiasi altra pagina web.
-Comment[ja]=AvantGo (ã¾ãŸã¯ä¸€èˆ¬ã« MAL サーãƒã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„) ã¨ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã‚’åŒæœŸã•ã›ã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒãƒ³ãƒ‰ãƒ˜ãƒ«ãƒ‰ã§æ˜ ç”»ã‚„ TV 番組表ã€ãã®ä»–ã®ã‚¦ã‚§ãƒ–ページをオフラインã§é–²è¦§ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚
-Comment[kk]=AvantGo (немеÑе жалпы MAL Ñервердің мазмұнын) қалта құрылғымен қадамдаÑтыру арнаÑÑ‹. Бұл Ñол құрылғыда кино, ТВ кеÑтеңізді немеÑе баÑқа веб парақтарды желіге қоÑылмай көруге мүмкіндік береді.
-Comment[km]=ធ្វើ​សមកាលកម្ម AvantGo (ជាទូទៅ​គឺ មាážáž·áž€áž¶â€‹ážšáž”ស់​ម៉ាស៊ីន​បម្រើ MAL) ទៅ​នឹង​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒÂ áŸ” វា​អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​មើល​ទំពáŸážšâ€‹áž”ណ្ដាញ (កាលវិភាគ​រោង​ភាពយន្ហឬ ទូរទស្សនáŸ...) នៅ​ក្រៅ​បណ្ដាញ នៅ​លើ​ឧបករណáŸâ€‹áž™áž½ážšâ€‹ážŠáŸƒâ€‹ážšáž”ស់​អ្នក ។
-Comment[lt]=Sinchronizuoti AvantGo (ar MAL serverio turinį apskritai) su nešiojamu įrenginiu. Tai leis jums peržiūrėti žiniatinklio puslapius nešiojamame įrenginyje, tokius kaip kino teatro ar TV programas, bei bet kokį kitą puslapį, neprisijungus prie Interneto.
-Comment[ms]=Mensegerakkan AvantGo (atau kandungan pelayan MAL secara umum) ke komputer telapak. Ini membolehkan anda memaparkan laman web di luar talian pada komputer telapak, seperti pawagam atau jadual TV, atau laman web lain.
-Comment[nb]=Synkroniser AvantGo (eller generelt innholdet i en MAL-tjener) til PDA-en. På denne måten kan du se nettsider frakoblet på PDA-en. slik som TV-programlister, kinoprogrammer eller andre nettsider.
-Comment[nds]=Synkroniseert den Inholt vun AvantGo oder jichtenseen anner MAL-Server ("Mobile Application Link") mit den Handreekner. So kannst Du Nettsieden ahn Verbinnen op den Handreekner ankieken, t.B. dat Kino- oder Feernsehprogramm.
-Comment[ne]=AvantGo (वा साधारणतया à¤à¤‰à¤Ÿà¤¾ MAL सरà¥à¤­à¤°à¤•à¥‹ सामागà¥à¤°à¥€) हà¥à¤¯à¤¾à¤¨à¥à¤¡à¤¹à¥‡à¤²à¥à¤¡à¤®à¤¾ समकà¥à¤°à¤®à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । यसले तपाईà¤à¤²à¤¾à¤ˆ वेब पृषà¥à¤ , जसà¥à¤¤à¥ˆ: सिनेमा वा टी भी कारà¥à¤¯à¤¤à¤¾à¤²à¤¿à¤•à¤¾, वा अनà¥à¤¯ कà¥à¤¨à¥ˆ वेब पृषà¥à¤  हà¥à¤¯à¤¾à¤¨à¥à¤¡à¤¹à¥‡à¤²à¥à¤¡à¤•à¥‹ अफलाईनमा हेरà¥à¤¨ अनà¥à¤®à¤¤à¤¿ दिनà¥à¤› ।
-Comment[nl]=Avantgo met de handheld synchroniseren (of eigenlijk met de inhoud van een MAL-server). Dit maakt het mogelijk om een webpagina offline op uw handheld te bekijken. Dit is handig voor allerlei zaken als bijvoorbeeld de TV-gids.
-Comment[pl]=Synchronizuje AvantGo (lub ogólnie zawartość serwera MAL) z palmtopem. Pozwala to przeglądać bez połączenia z siecią strony WWW na palmtopie, np. repertuar kin lub program telewizyjny.
-Comment[pt]=Sincroniza o AvantGo (ou, genericamente, o conteúdo de um servidor de MAL) para o dispositivo móvel. Isto permite-lhe ver as páginas Web no dispositivo móvel sem estar ligado, como o seu horário de cinema ou TV ou ainda qualquer outra página Web.
-Comment[pt_BR]=Sincroniza AvantGo (ou geralmente o conteúodo de um servidor MAL) com o handheld. Isto permite que você visualize páginas web offline no handheld, por exemplo a grade do cinema ou TV, ou qualquer outra página.
-Comment[ru]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ AvantGo (Ñодержимого Ñерверов MAL) Ñ ÐšÐŸÐš. Это позволит вам проÑматривать веб-Ñтраницы без Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº Интернет.
-Comment[sk]=Synchronizuje AvantGo (alebo vÅ¡eobecne obsah MAL servera) s ruÄným zariadením. Toto umožní vidieÅ¥ webovské stránky bez pripojenia na ruÄnom zariadení, ako sú programy kina alebo TV, alebo hociakej webovskej stránky.
-Comment[sl]=Uskladi AvantGo (oziroma v sploÅ¡nem vsebino strežnika MAL) na roÄnem raÄunalniku. S tem si lahko na njem ogledujete spletne strani brez povezave, kot so razpored kino predstav ali pa TV spored ali pa katerokoli drugo spletno stran.
-Comment[sr]=Синхронизује AvantGo (или уопштено Ñадржај MAL Ñервера) Ñа ручним рачунаром. Ово вам омогућава да на ручном рачунару прегледате веб Ñтране ван везе, као биоÑкопÑки или ТВ програм, или било коју другу веб Ñтрану.
-Comment[sr@Latn]=Sinhronizuje AvantGo (ili uopÅ¡teno sadržaj MAL servera) sa ruÄnim raÄunarom. Ovo vam omogućava da na ruÄnom raÄunaru pregledate veb strane van veze, kao bioskopski ili TV program, ili bilo koju drugu veb stranu.
-Comment[sv]=Synkronisera AvantGo (eller mer allmänt innehållet på en MAL-server) med handdatorn. Det låter dig titta på webbsidor i nerkopplat läge på handdatorn, som bio eller tv-program, eller vilken annan webbsida som helst.
-Comment[ta]=AvantGo஠கையில௠வைதà¯à®¤à®¿à®°à¯à®ªà¯à®ªà®¤à®¿à®²à¯ கூடà¯à®Ÿà®¿à®£à¯ˆà®•à¯à®•à®µà¯à®®à¯ (அலà¯à®²à®¤à¯ ஒர௠MAL சேவகனின௠உளà¯à®³à®Ÿà®•à¯à®•à®¤à¯à®¤à®¿à®±à¯à®•à¯). இதனà¯à®®à¯‚லம௠கையில௠இரà¯à®ªà¯à®ªà®¤à®¿à®²à¯‡à®¯à¯‡  வலைபà¯à®ªà®•à¯à®•à®™à¯à®•à®³à¯ˆ பாரà¯à®•à¯à®•à®²à®¾à®®à¯, அதாவத௠சினிமா, தொலைகà¯à®•à®¾à®Ÿà¯à®Ÿà®¿ அடà¯à®Ÿà®µà¯à®£à¯ˆ, அலà¯à®²à®¤à¯ à®à®¤à®¾à®µà®¤à¯ ஒர௠வலைபà¯à®ªà®•à¯à®•à®®à¯.
-Comment[tr]=AvantGo içeriğini (ya da genel olarak MAL sunucuları içeriğini) el bilgisayarı ile birleştirir. Bu, web sayfalarını el bilgisayarınızda çevirim dışı olarak görüntülemenizi sağlar.
-Comment[uk]=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ AvantGo (або вміÑÑ‚ Ñерверів MAL) на кишеньковий приÑтрій . Це дозволÑÑ” переглÑдати веб-Ñторінки на кишеньковому приÑтрої без з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Інтернетом.
-Comment[zh_CN]=å°† AvantGo(或 MAL æœåŠ¡å™¨çš„内容)åŒæ­¥åˆ°æ‰‹æŒè®¾å¤‡ä¸­ã€‚è¿™å…许您在手æŒè®¾å¤‡ä¸­è„±æœºæŸ¥çœ‹ Web 页，比如影讯ã€ç”µè§†èŠ‚目时间表或任何其它网页。
-Comment[zh_TW]=åŒæ­¥ AvantGo (或通常為一 MAL 伺æœå™¨å…§å®¹) 與 handheld。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_mal
diff --git a/kpilot/conduits/malconduit/malconduit.kcfg b/kpilot/conduits/malconduit/malconduit.kcfg
deleted file mode 100644
index 146f7869c..000000000
--- a/kpilot/conduits/malconduit/malconduit.kcfg
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-   
-  
-    
-				QDateTime( QDate(1970,1,1), QTime(0,0,0) )
-		
-		
-    
-				
-					
-					
-					
-					
-					
-				
-        eEverySync
-    
-		
-    
-				
-					
-					
-					
-				
-        eProxyNone
-    
-    
-        
-    
-    
-        0
-    
-    
-        
-    
-    
-        
-    
-    
-        sync.avantgo.com
-    
-    
-        0
-    
-    
-        
-    
-    
-        
-    
-  
-
diff --git a/kpilot/conduits/malconduit/malconduitSettings.kcfgc b/kpilot/conduits/malconduit/malconduitSettings.kcfgc
deleted file mode 100644
index d4254c41b..000000000
--- a/kpilot/conduits/malconduit/malconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=malconduit.kcfg
-ClassName=MALConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/memofileconduit/CMakeLists.txt b/kpilot/conduits/memofileconduit/CMakeLists.txt
deleted file mode 100644
index 56994570f..000000000
--- a/kpilot/conduits/memofileconduit/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_memofile_SRCS
-	memofile-factory.cc
-	memofile.cc
-	memofiles.cc
-	memofile-conduit.cc
-)
-
-set(conduit_memofile_UIS
-	setup_base.ui
-)
-
-set(conduit_memofile_KCFGS
-	memofileSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
-kde3_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
-kde3_automoc(${conduit_memofile_SRCS})
-add_library(conduit_memofile SHARED ${conduit_memofile_SRCS})
-
-set_target_properties(
-	conduit_memofile PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_memofile)
-
-install(
-	TARGETS conduit_memofile
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES memofile-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES memofileconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
diff --git a/kpilot/conduits/memofileconduit/Makefile.am b/kpilot/conduits/memofileconduit/Makefile.am
deleted file mode 100644
index e4a244b51..000000000
--- a/kpilot/conduits/memofileconduit/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = memofile-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_memofile.la
-
-
-conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
-	memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc
-conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE)
-
-kde_kcfg_DATA = memofileconduit.kcfg
diff --git a/kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg b/kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg
deleted file mode 100644
index 82cc11880ff33d7c54638b6dc8fce48fd21543b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 111060
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
    \n" ) ); if ( addr.resource() ) { TQString addrBookName = addr.resource()->resourceName(); @@ -526,7 +526,7 @@ void AddresseeView::updateView() TQString strAddr = vCardAsHTML( mAddressee, mKIMProxy, (LinkMask)mLinkMask, true, (FieldMask)fieldMask ); - strAddr = TQString::fromLatin1( + strAddr = TQString::tqfromLatin1( "" "" // text and background color "%3" // dynamic part @@ -591,7 +591,7 @@ void AddresseeView::phoneNumberClicked( const TQString &number ) return; } - commandLine.replace( "%N", number ); + commandLine.tqreplace( "%N", number ); KRun::runCommand( commandLine ); } @@ -623,8 +623,8 @@ void AddresseeView::sendSMS( const TQString &number, const TQString &text ) *stream << text; file.close(); - commandLine.replace( "%N", number ); - commandLine.replace( "%F", file.name() ); + commandLine.tqreplace( "%N", number ); + commandLine.tqreplace( "%F", file.name() ); KRun::runCommand( commandLine ); } @@ -640,7 +640,7 @@ void AddresseeView::faxNumberClicked( const TQString &number ) return; } - commandLine.replace( "%N", number ); + commandLine.tqreplace( "%N", number ); KRun::runCommand( commandLine ); } diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index ae7281b5b..74c3a657b 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h @@ -84,7 +84,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser /** Sets which parts of the contact shall be presented as links. - The mask can be OR'ed LinkMask. By default all links are enabled. + The tqmask can be OR'ed LinkMask. By default all links are enabled. */ void enableLinks( int linkMask ); @@ -114,7 +114,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser @param addr The addressee object. - @param linkMask The mask for which parts of the contact will + @param linkMask The tqmask for which parts of the contact will be displayed as links. The links looks like this: "addr://" for addresses @@ -124,7 +124,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser "im:" for instant messaging addresses "sms://" for sending a sms @param internalLoading If true, the loading of internal pictures is done automatically. - @param fieldMask The mask for which fields of the contact will + @param fieldMask The tqmask for which fields of the contact will be displayed. */ static TQString vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks, diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp index 14feafb67..5807b0d68 100644 --- a/libkdepim/addressesdialog.cpp +++ b/libkdepim/addressesdialog.cpp @@ -176,7 +176,7 @@ AddresseeViewItem::email() const bool AddresseeViewItem::matches(const TQString& txt) const { - return d->address.realName().contains(txt, false) || d->address.preferredEmail().contains(txt, false); + return d->address.realName().tqcontains(txt, false) || d->address.preferredEmail().tqcontains(txt, false); } void AddresseeViewItem::setSelected(bool selected) @@ -1043,11 +1043,11 @@ AddressesDialog::filterChanged( const TQString& txt ) } p2 = static_cast( p2->nextSibling() ); } - if ( !pcount && !p->text( 0 ).contains( txt, false ) ) { + if ( !pcount && !p->text( 0 ).tqcontains( txt, false ) ) { p->setVisible( false ); } distlistgroupVisible += pcount; - if ( p->text( 0 ).contains( txt, false ) ) { + if ( p->text( 0 ).tqcontains( txt, false ) ) { distlistgroupVisible++; } } diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui index f6e9b7847..e0bf7a9a9 100644 --- a/libkdepim/addresspicker.ui +++ b/libkdepim/addresspicker.ui @@ -4,7 +4,7 @@ AddressPickerUI - + 0 0 @@ -66,7 +66,7 @@ - layout10 + tqlayout10 @@ -82,7 +82,7 @@ Expanding - + 20 16 @@ -132,7 +132,7 @@ Expanding - + 20 16 @@ -160,7 +160,7 @@ Expanding - + 20 20 @@ -181,7 +181,7 @@ &Selected Addresses - + WordBreak|AlignCenter @@ -200,7 +200,7 @@ &Address Book - + WordBreak|AlignCenter @@ -209,7 +209,7 @@ - layout1 + tqlayout1 @@ -315,7 +315,7 @@ - + klistview.h kpushbutton.h diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp index b566bd4b2..fb48f05ca 100644 --- a/libkdepim/broadcaststatus.cpp +++ b/libkdepim/broadcaststatus.cpp @@ -23,46 +23,46 @@ #include "broadcaststatus.h" #include "progressmanager.h" -KPIM::BroadcastStatus* KPIM::BroadcastStatus::instance_ = 0; -static KStaticDeleter broadcastStatusDeleter; +KPIM::BroadcasStatus* KPIM::BroadcasStatus::instance_ = 0; +static KStaticDeleter broadcasStatusDeleter; namespace KPIM { -BroadcastStatus* BroadcastStatus::instance() +BroadcasStatus* BroadcasStatus::instance() { if (!instance_) - broadcastStatusDeleter.setObject( instance_, new BroadcastStatus() ); + broadcasStatusDeleter.setObject( instance_, new BroadcasStatus() ); return instance_; } -BroadcastStatus::BroadcastStatus() +BroadcasStatus::BroadcasStatus() :mTransientActive( false ) { } -BroadcastStatus::~BroadcastStatus() +BroadcasStatus::~BroadcasStatus() { instance_ = 0; } -void BroadcastStatus::setStatusMsg( const TQString& message ) +void BroadcasStatus::seStatusMsg( const TQString& message ) { mStatusMsg = message; if( !mTransientActive ) emit statusMsg( message ); } -void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message ) +void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message ) { KLocale* locale = KGlobal::locale(); - setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) + seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" ) .arg( locale->formatTime( TQTime::currentTime(), true /* with seconds */ ) ) .arg( message ) ); } -void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages, +void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages, int numBytes, int numBytesRead, int numBytesToRead, @@ -94,12 +94,12 @@ void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages, else statusMsg = i18n( "Transmission complete. No new messages." ); - setStatusMsgWithTimestamp( statusMsg ); + seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setStatus( statusMsg ); + item->seStatus( statusMsg ); } -void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account, +void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes, int numBytesRead, @@ -142,18 +142,18 @@ void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account statusMsg = i18n( "Transmission for account %1 complete. No new messages.") .arg( account ); - setStatusMsgWithTimestamp( statusMsg ); + seStatusMsgWithTimestamp( statusMsg ); if ( item ) - item->setStatus( statusMsg ); + item->seStatus( statusMsg ); } -void BroadcastStatus::setTransientStatusMsg( const TQString& msg ) +void BroadcasStatus::setTransienStatusMsg( const TQString& msg ) { mTransientActive = true; emit statusMsg( msg ); } -void BroadcastStatus::reset() +void BroadcasStatus::reset() { mTransientActive = false; // restore diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h index ad5c11bc1..11eacd3e6 100644 --- a/libkdepim/broadcaststatus.h +++ b/libkdepim/broadcaststatus.h @@ -29,29 +29,29 @@ class ProgressItem; */ -class KDE_EXPORT BroadcastStatus : public QObject +class KDE_EXPORT BroadcasStatus : public QObject { Q_OBJECT public: - virtual ~BroadcastStatus(); + virtual ~BroadcasStatus(); /** Return the instance of the singleton object for this class */ - static BroadcastStatus *instance(); + static BroadcasStatus *instance(); - /** Return the last status message from setStatusMsg() */ + /** Return the last status message from seStatusMsg() */ TQString statusMsg() const { return mStatusMsg; } /** Sets a status bar message with timestamp */ - void setStatusMsgWithTimestamp( const TQString& message ); + void seStatusMsgWithTimestamp( const TQString& message ); /** Sets a transmission completed status bar message */ - void setStatusMsgTransmissionCompleted( int numMessages, + void seStatusMsgTransmissionCompleted( int numMessages, int numBytes = -1, int numBytesRead = -1, int numBytesToRead = -1, bool mLeaveOnServer = false, KPIM::ProgressItem* progressItem = 0 ); // set the same status in this progress item - void setStatusMsgTransmissionCompleted( const TQString& account, + void seStatusMsgTransmissionCompleted( const TQString& account, int numMessages, int numBytes = -1, int numBytesRead = -1, @@ -62,13 +62,13 @@ public: public slots: /** Emit an update status bar signal. It's a slot so it can be hooked up to other signals. */ - void setStatusMsg( const TQString& message ); + void seStatusMsg( const TQString& message ); /** Set a status message that will go away again with the next call of reset(). */ - void setTransientStatusMsg( const TQString& msg ); + void setTransienStatusMsg( const TQString& msg ); /** Reset the status message to what ever non-transient message was last active or has since been set. @@ -77,15 +77,15 @@ public slots: signals: - /** Emitted when setStatusMsg is called. */ + /** Emitted when seStatusMsg is called. */ void statusMsg( const TQString& ); protected: - BroadcastStatus(); + BroadcasStatus(); TQString mStatusMsg; bool mTransientActive; - static BroadcastStatus* instance_; + static BroadcasStatus* instance_; }; diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp index 719bd9209..d386ae101 100644 --- a/libkdepim/categoryeditdialog.cpp +++ b/libkdepim/categoryeditdialog.cpp @@ -66,23 +66,23 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, TQWidget *widget = new TQWidget( this ); setMainWidget( widget ); - TQGridLayout *layout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() ); d->mView = new TQListView( widget ); d->mView->addColumn( "" ); d->mView->header()->hide(); d->mView->setDefaultRenameAction( TQListView::Accept ); - layout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); + tqlayout->addMultiCellWidget( d->mView, 0, 3, 0, 0 ); d->mAddButton = new TQPushButton( i18n( "Add" ), widget ); - layout->addWidget( d->mAddButton, 0, 1 ); + tqlayout->addWidget( d->mAddButton, 0, 1 ); d->mEditButton = new TQPushButton( i18n( "Edit" ), widget ); - layout->addWidget( d->mEditButton, 1, 1 ); + tqlayout->addWidget( d->mEditButton, 1, 1 ); d->mDeleteButton = new TQPushButton( i18n( "Remove" ), widget ); - layout->addWidget( d->mDeleteButton, 2, 1 ); + tqlayout->addWidget( d->mDeleteButton, 2, 1 ); fillList(); diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui index 21a9faf26..b23a66972 100644 --- a/libkdepim/categoryeditdialog_base.ui +++ b/libkdepim/categoryeditdialog_base.ui @@ -4,7 +4,7 @@ CategoryEditDialog_base - + 0 0 @@ -54,7 +54,7 @@ - layout103 + tqlayout103 @@ -86,7 +86,7 @@ Expanding - + 20 20 @@ -103,5 +103,5 @@ mButtonAdd mButtonRemove - + diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui index 713efbbf8..c5030679a 100644 --- a/libkdepim/categoryselectdialog_base.ui +++ b/libkdepim/categoryselectdialog_base.ui @@ -4,7 +4,7 @@ CategorySelectDialog_base - + 0 0 @@ -73,7 +73,7 @@ Expanding - + 20 20 @@ -97,5 +97,5 @@ mButtonClear mButtonEdit - + diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui index fda2fc235..040990ef1 100644 --- a/libkdepim/cfgc/general_base.ui +++ b/libkdepim/cfgc/general_base.ui @@ -4,7 +4,7 @@ GeneralBase - + 0 0 @@ -42,5 +42,5 @@ - + diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui index 60207f9e3..fe5d43ac6 100644 --- a/libkdepim/cfgc/myoptions_base.ui +++ b/libkdepim/cfgc/myoptions_base.ui @@ -4,7 +4,7 @@ MyOptionsBase - + 0 0 @@ -16,7 +16,7 @@ textLabel1 - + 30 180 @@ -32,7 +32,7 @@ MyString - + 130 180 @@ -42,5 +42,5 @@ - + diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp index dfe7cbadf..98748e44a 100644 --- a/libkdepim/clicklineedit.cpp +++ b/libkdepim/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - repaint(); + tqrepaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - repaint(); + tqrepaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - repaint(); + tqrepaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - repaint(); + tqrepaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h index 0eb4c7a8d..65357375d 100644 --- a/libkdepim/clicklineedit.h +++ b/libkdepim/clicklineedit.h @@ -27,7 +27,7 @@ namespace KPIM { /** - This class provides a KLineEdit which contains a greyed-out hinting + This class provides a KLineEdit which tqcontains a greyed-out hinting text as long as the user didn't enter any text @short LineEdit with customizable "Click here" text diff --git a/libkdepim/csshelper.cpp b/libkdepim/csshelper.cpp index 6b37fbf13..4116e583e 100644 --- a/libkdepim/csshelper.cpp +++ b/libkdepim/csshelper.cpp @@ -328,7 +328,7 @@ namespace KPIM { if ( mQuoteFont[i].bold() ) quoteCSS += " font-weight: bold ! important;\n"; if ( mShrinkQuotes ) - quoteCSS += " font-size: " + TQString::fromLatin1( quoteFontSizes[i] ) + quoteCSS += " font-size: " + TQString::tqfromLatin1( quoteFontSizes[i] ) + "% ! important;\n"; quoteCSS += "}\n\n"; } diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp index ba78df0ea..5569c2587 100644 --- a/libkdepim/designerfields.cpp +++ b/libkdepim/designerfields.cpp @@ -50,7 +50,7 @@ DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent, void DesignerFields::initGUI( const TQString &uiFile ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); TQWidget *wdg = TQWidgetFactory::create( uiFile, 0, this ); if ( !wdg ) { @@ -61,7 +61,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) mTitle = wdg->caption(); mIdentifier = wdg->name(); - layout->addWidget( wdg ); + tqlayout->addWidget( wdg ); TQObjectList *list = wdg->queryList( "TQWidget" ); TQObjectListIt it( *list ); @@ -78,7 +78,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) << "KDatePicker"; while ( it.current() ) { - if ( allowedTypes.contains( it.current()->className() ) ) { + if ( allowedTypes.tqcontains( it.current()->className() ) ) { TQString name = it.current()->name(); if ( name.startsWith( "X_" ) ) { name = name.mid( 2 ); @@ -154,13 +154,13 @@ void DesignerFields::load( DesignerFields::Storage *storage ) wdg->setChecked( false ); } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) { QDateTimeEdit *wdg = static_cast( widIt.data() ); - wdg->setDateTime( TQDateTime::currentDateTime() ); + wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast( widIt.data() ); - wdg->setDateTime( TQDateTime::currentDateTime() ); + wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast( widIt.data() ); - wdg->setDate( TQDate::currentDate() ); + wdg->setDate( TQDate::tqcurrentDate() ); } else if ( widIt.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast( widIt.data() ); wdg->setCurrentItem( 0 ); diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp index 2ccdeb525..6d96b2358 100644 --- a/libkdepim/distributionlist.cpp +++ b/libkdepim/distributionlist.cpp @@ -63,7 +63,7 @@ void KPIM::DistributionList::insertEntry( const TQString& uid, const TQString& e TQString str = custom( "KADDRESSBOOK", s_customFieldName ); // Assumption: UIDs don't contain ; nor , str += ";" + uid + "," + email; - insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value } void KPIM::DistributionList::removeEntry( const Addressee& addr, const TQString& email ) @@ -88,7 +88,7 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e } if ( str.isEmpty() ) str = ";"; // keep something, for isDistributionList to work - insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value + insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value } bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr ) @@ -131,15 +131,15 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo return DistributionList(); } -static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) +static KABC::Addressee tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) { - KABC::Addressee a = book->findByUid( uidOrName ); + KABC::Addressee a = book->tqfindByUid( uidOrName ); if ( a.isEmpty() ) { // UID not found, maybe it is a name instead. // If we have an email, let's use that for the lookup. // [This is used by e.g. the Kolab resource] if ( !email.isEmpty() ) { - KABC::Addressee::List lst = book->findByEmail( email ); + KABC::Addressee::List lst = book->tqfindByEmail( email ); KABC::Addressee::List::ConstIterator listit = lst.begin(); for ( ; listit != lst.end(); ++listit ) if ( (*listit).formattedName() == uidOrName ) { @@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre const TQString uid = (*it).first; const TQString email = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, uid, email ); + KABC::Addressee a = tqfindByUidOrName( book, uid, email ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... kdWarning() << "Addressee not found: " << uid << endl; @@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const const TQString thisEmail = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail ); + KABC::Addressee a = tqfindByUidOrName( book, thisUid, thisEmail ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... continue; diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp index d01205742..12b25dedb 100644 --- a/libkdepim/embeddedurlpage.cpp +++ b/libkdepim/embeddedurlpage.cpp @@ -41,8 +41,8 @@ EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype, void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); new TQLabel( i18n("Showing URL %1").arg( url ), this ); } diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp index d46156f6d..beeb7b900 100644 --- a/libkdepim/kabcresourcecached.cpp +++ b/libkdepim/kabcresourcecached.cpp @@ -165,8 +165,8 @@ void ResourceCached::slotKABCSave() void ResourceCached::insertAddressee( const Addressee &addr ) { - if ( !mAddrMap.contains( addr.uid() ) ) { // new contact - if ( mDeletedAddressees.contains( addr.uid() ) ) { + if ( !mAddrMap.tqcontains( addr.uid() ) ) { // new contact + if ( mDeletedAddressees.tqcontains( addr.uid() ) ) { // it was first removed, then added, so it's an update... mDeletedAddressees.remove( addr.uid() ); @@ -189,7 +189,7 @@ void ResourceCached::insertAddressee( const Addressee &addr ) void ResourceCached::removeAddressee( const Addressee &addr ) { - if ( mAddedAddressees.contains( addr.uid() ) ) { + if ( mAddedAddressees.tqcontains( addr.uid() ) ) { mAddedAddressees.remove( addr.uid() ); return; } diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp index e5ef47e6f..187ce6375 100644 --- a/libkdepim/kaddrbook.cpp +++ b/libkdepim/kaddrbook.cpp @@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { } #endif - KABC::Addressee::List addressees = ab->findByEmail( email ); + KABC::Addressee::List addressees = ab->tqfindByEmail( email ); if ( addressees.count() > 0 ) { if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){ @@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { } #endif - KABC::Addressee::List addressees = ab->findByEmail( email ); + KABC::Addressee::List addressees = ab->tqfindByEmail( email ); if ( addressees.isEmpty() ) { KABC::Addressee a; @@ -181,7 +181,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); KABC::Addressee::List addressees = - ab->findByEmail( addressee.preferredEmail() ); + ab->tqfindByEmail( addressee.preferredEmail() ); if ( addressees.isEmpty() ) { if ( KAddrBookExternal::addAddressee( addressee ) ) { diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp index 330d8b84b..159356934 100644 --- a/libkdepim/kcmdesignerfields.cpp +++ b/libkdepim/kcmdesignerfields.cpp @@ -261,7 +261,7 @@ void KCMDesignerFields::defaults() void KCMDesignerFields::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); bool noDesigner = KStandardDirs::findExe("designer").isEmpty(); @@ -272,10 +272,10 @@ void KCMDesignerFields::initGUI() i18n("Warning: Qt Designer could not be found. It is probably not " "installed. You will only be able to import existing designer files."); TQLabel *lbl = new TQLabel( txt, this ); - layout->addWidget( lbl ); + tqlayout->addWidget( lbl ); } - TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); + TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); mPageView = new KListView( this ); mPageView->addColumn( i18n( "Available Pages" ) ); @@ -295,7 +295,7 @@ void KCMDesignerFields::initGUI() loadUiFiles(); - hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); + hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() ); TQString cwHowto = i18n("

    This section allows you to add your own GUI" " Elements ('Widgets') to store your own values" @@ -323,7 +323,7 @@ void KCMDesignerFields::initGUI() hbox->addWidget( activeLabel ); // ### why is this needed? Looks like a KActiveLabel bug... - activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); + activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum ); hbox->addStretch( 1 ); @@ -361,7 +361,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item ) "%7%8" "" ) .arg( i18n( "Key:" ) ) - .arg( item->text( 0 ).replace("X_","X-") ) + .arg( item->text( 0 ).tqreplace("X_","X-") ) .arg( i18n( "Type:" ) ) .arg( item->text( 1 ) ) .arg( i18n( "Classname:" ) ) diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 1791d4dab..c4221556c 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp @@ -49,7 +49,7 @@ class DateValidator : public QValidator if ( length <= 0 ) return Intermediate; - if ( mKeywords.contains( str.lower() ) ) + if ( mKeywords.tqcontains( str.lower() ) ) return Acceptable; bool ok = false; @@ -72,13 +72,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) // need at least one entry for popup to work setMaxCount( 1 ); - mDate = TQDate::currentDate(); + mDate = TQDate::tqcurrentDate(); TQString today = KGlobal::locale()->formatDate( mDate, true ); insertItem( today ); setCurrentItem( 0 ); changeItem( today, 0 ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); connect( lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( lineEnterPressed() ) ); @@ -138,13 +138,13 @@ void KDateEdit::popup() TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) ); - int dateFrameHeight = mPopup->sizeHint().height(); + int dateFrameHeight = mPopup->tqsizeHint().height(); if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() ) popupPoint.setY( popupPoint.y() - dateFrameHeight ); else popupPoint.setY( popupPoint.y() + height() ); - int dateFrameWidth = mPopup->sizeHint().width(); + int dateFrameWidth = mPopup->tqsizeHint().width(); if ( popupPoint.x() + dateFrameWidth > desk.right() ) popupPoint.setX( desk.right() - dateFrameWidth ); @@ -157,13 +157,13 @@ void KDateEdit::popup() if ( mDate.isValid() ) mPopup->setDate( mDate ); else - mPopup->setDate( TQDate::currentDate() ); + mPopup->setDate( TQDate::tqcurrentDate() ); mPopup->popup( popupPoint ); // The combo box is now shown pressed. Make it show not pressed again // by causing its (invisible) list box to emit a 'selected' signal. - // First, ensure that the list box contains the date currently displayed. + // First, ensure that the list box tqcontains the date currently displayed. TQDate date = parseDate(); assignDate( date ); updateView(); @@ -191,12 +191,12 @@ void KDateEdit::dateSelected( TQDate date ) void KDateEdit::lineEnterPressed() { - bool replaced = false; + bool tqreplaced = false; - TQDate date = parseDate( &replaced ); + TQDate date = parseDate( &tqreplaced ); if (assignDate( date ) ) { - if ( replaced ) + if ( tqreplaced ) updateView(); emit dateChanged( date ); @@ -204,18 +204,18 @@ void KDateEdit::lineEnterPressed() } } -TQDate KDateEdit::parseDate( bool *replaced ) const +TQDate KDateEdit::parseDate( bool *tqreplaced ) const { TQString text = currentText(); TQDate result; - if ( replaced ) - (*replaced) = false; + if ( tqreplaced ) + (*tqreplaced) = false; if ( text.isEmpty() ) result = TQDate(); - else if ( mKeywordMap.contains( text.lower() ) ) { - TQDate today = TQDate::currentDate(); + else if ( mKeywordMap.tqcontains( text.lower() ) ) { + TQDate today = TQDate::tqcurrentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { /* A day name has been entered. Convert to offset from today. @@ -235,8 +235,8 @@ TQDate KDateEdit::parseDate( bool *replaced ) const } result = today.addDays( i ); - if ( replaced ) - (*replaced) = true; + if ( tqreplaced ) + (*tqreplaced) = true; } else { result = KGlobal::locale()->readDate( text ); } @@ -286,7 +286,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().tqcontains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index 819ce9338..0adb6ee56 100644 --- a/libkdepim/kdateedit.h +++ b/libkdepim/kdateedit.h @@ -36,7 +36,7 @@ class TQEvent; /** A date editing widget that consists of an editable combo box. - The combo box contains the date in text form, and clicking the combo + The combo box tqcontains the date in text form, and clicking the combo box arrow will display a 'popup' style date picker. This widget also supports advanced features like allowing the user diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp index 2e28dd831..8e3f36953 100644 --- a/libkdepim/kdatepickerpopup.cpp +++ b/libkdepim/kdatepickerpopup.cpp @@ -97,12 +97,12 @@ void KDatePickerPopup::slotDateChanged( TQDate date ) void KDatePickerPopup::slotToday() { - emit dateChanged( TQDate::currentDate() ); + emit dateChanged( TQDate::tqcurrentDate() ); } void KDatePickerPopup::slotTomorrow() { - emit dateChanged( TQDate::currentDate().addDays( 1 ) ); + emit dateChanged( TQDate::tqcurrentDate().addDays( 1 ) ); } void KDatePickerPopup::slotNoDate() @@ -112,12 +112,12 @@ void KDatePickerPopup::slotNoDate() void KDatePickerPopup::slotNextWeek() { - emit dateChanged( TQDate::currentDate().addDays( 7 ) ); + emit dateChanged( TQDate::tqcurrentDate().addDays( 7 ) ); } void KDatePickerPopup::slotNextMonth() { - emit dateChanged( TQDate::currentDate().addMonths( 1 ) ); + emit dateChanged( TQDate::tqcurrentDate().addMonths( 1 ) ); } #include "kdatepickerpopup.moc" diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h index 080bf4988..70ed6793f 100644 --- a/libkdepim/kdatepickerpopup.h +++ b/libkdepim/kdatepickerpopup.h @@ -56,7 +56,7 @@ class KDE_EXPORT KDatePickerPopup: public QPopupMenu @param parent The object's parent. @param name The object's name. */ - KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::currentDate(), + KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(), TQWidget *parent = 0, const char *name = 0 ); /** diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp index 4d49c1148..6a7eea7c3 100644 --- a/libkdepim/kfileio.cpp +++ b/libkdepim/kfileio.cpp @@ -190,7 +190,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len, if (aAskIfExists) { TQString str; - str = i18n("File %1 exists.\nDo you want to replace it?") + str = i18n("File %1 exists.\nDo you want to tqreplace it?") .arg(aFileName); rc = KMessageBox::warningContinueCancel(0, str, i18n("Save to File"), i18n("&Replace")); diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h index 915528888..99d4d1dce 100644 --- a/libkdepim/kfileio.h +++ b/libkdepim/kfileio.h @@ -17,7 +17,7 @@ class TQString; namespace KPIM { -/** Load a file. Returns a pointer to the memory-block that contains +/** Load a file. Returns a pointer to the memory-block that tqcontains * the loaded file. Returns a null string if the file could not be loaded. * If withDialogs is FALSE no warning dialogs are opened if there are * problems. diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp index 5e2636738..2bf6ca1be 100644 --- a/libkdepim/kfoldertree.cpp +++ b/libkdepim/kfoldertree.cpp @@ -118,7 +118,7 @@ int KFolderTreeItem::compare( TQListViewItem * i, int col, bool ) const else { // sort by unread or total-column - Q_INT64 a = 0, b = 0; + TQ_INT64 a = 0, b = 0; if (col == static_cast(listView())->unreadIndex()) { a = mUnread; @@ -181,7 +181,7 @@ void KFolderTreeItem::setTotalCount( int aTotal ) } //----------------------------------------------------------------------------- -void KFolderTreeItem::setFolderSize( Q_INT64 aSize ) +void KFolderTreeItem::setFolderSize( TQ_INT64 aSize ) { if ( aSize < 0 ) return; // we need to update even if nothing changed, kids ... @@ -195,10 +195,10 @@ void KFolderTreeItem::setFolderSize( Q_INT64 aSize ) size = KIO::convertSize(mSize); } if ( childCount() > 0 && !isOpen() ) { - Q_INT64 recursiveSize = recursiveFolderSize(); + TQ_INT64 recursiveSize = recursiveFolderSize(); if ( recursiveSize != mSize ) { if ( mType != Root ) - size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) ); + size += TQString::tqfromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) ); else size = KIO::convertSize( recursiveSize ); } @@ -209,9 +209,9 @@ void KFolderTreeItem::setFolderSize( Q_INT64 aSize ) } //----------------------------------------------------------------------------- -Q_INT64 KFolderTreeItem::recursiveFolderSize() const +TQ_INT64 KFolderTreeItem::recursiveFolderSize() const { - Q_INT64 size = mSize; + TQ_INT64 size = mSize; for ( TQListViewItem *item = firstChild() ; item ; item = item->nextSibling() ) @@ -351,7 +351,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) { if ( mFolderIsCloseToQuota != v) { mFolderIsCloseToQuota = v; - repaint(); + tqrepaint(); } } @@ -391,9 +391,9 @@ void KFolderTree::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( style().isA("KeramikStyle") ) - frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const void KFolderTree::addUnreadColumn( const TQString & name, int width ) { mUnreadIndex = addColumn( name, width ); - setColumnAlignment( mUnreadIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); header()->adjustHeaderSize(); } @@ -472,7 +472,7 @@ void KFolderTree::addUnreadColumn( const TQString & name, int width ) void KFolderTree::addTotalColumn( const TQString & name, int width ) { mTotalIndex = addColumn( name, width ); - setColumnAlignment( mTotalIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); header()->adjustHeaderSize(); } @@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn() void KFolderTree::addSizeColumn( const TQString & name, int width ) { mSizeIndex = addColumn( name, width ); - setColumnAlignment( mSizeIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); + setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight ); header()->adjustHeaderSize(); } @@ -535,7 +535,7 @@ void KFolderTree::setFullWidth( bool fullWidth ) //----------------------------------------------------------------------------- void KFolderTree::slotSizeChanged( int section, int, int newSize ) { - viewport()->repaint( + viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false ); } diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h index 2d2805846..5ababa1cc 100644 --- a/libkdepim/kfoldertree.h +++ b/libkdepim/kfoldertree.h @@ -191,8 +191,8 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem virtual void setTotalCount( int aTotal ); /** set/get the total-count */ - Q_INT64 folderSize() { return mSize; } - virtual void setFolderSize( Q_INT64 aSize ); + TQ_INT64 folderSize() { return mSize; } + virtual void setFolderSize( TQ_INT64 aSize ); /** set/get the protocol of the item */ Protocol protocol() const { return mProtocol; } @@ -205,7 +205,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem /** recursive unread count */ virtual int countUnreadRecursive(); - virtual Q_INT64 recursiveFolderSize() const; + virtual TQ_INT64 recursiveFolderSize() const; /** paints the cell */ virtual void paintCell( TQPainter * p, const TQColorGroup & cg, @@ -233,7 +233,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem Type mType; int mUnread; int mTotal; - Q_INT64 mSize; + TQ_INT64 mSize; bool mFolderIsCloseToQuota; }; @@ -309,7 +309,7 @@ class KDE_EXPORT KFolderTree : public KListView int mSizeIndex; private slots: - /** repaints the complete column (instead of only parts of it as done in + /** tqrepaints the complete column (instead of only parts of it as done in TQListView) if the size has changed */ void slotSizeChanged( int section, int oldSize, int newSize ); diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp index ffccd5008..cb59200a6 100644 --- a/libkdepim/kimportdialog.cpp +++ b/libkdepim/kimportdialog.cpp @@ -323,7 +323,7 @@ void KImportDialog::readFile( int rows ) pDialog.setAutoClose(true); KProgress *progress = pDialog.progressBar(); - progress->setTotalSteps( mFile.contains(mSeparator, false) ); + progress->setTotalSteps( mFile.tqcontains(mSeparator, false) ); progress->setValue(0); int progressValue = 0; @@ -337,7 +337,7 @@ void KImportDialog::readFile( int rows ) if (x == mSeparator) { progress->setValue(progressValue++); - if (progressValue % 15 == 0) // try not to constantly repaint + if (progressValue % 15 == 0) // try not to constantly tqrepaint kapp->processEvents(); } @@ -550,9 +550,9 @@ void KImportDialog::assignColumn(TQListViewItem *item) for(int i=selection.leftCol();i<=selection.rightCol();++i) { if (i >= 0) { mTable->horizontalHeader()->setLabel(i,colItem->text(0)); - mColumnDict.replace(i,colItem->column()); + mColumnDict.tqreplace(i,colItem->column()); int format = mFormatCombo->currentItem() + 1; - mFormats.replace(i,format); + mFormats.tqreplace(i,format); colItem->column()->addColId(i); } } @@ -616,8 +616,8 @@ void KImportDialog::assignTemplate() continue; KImportColumn *col = mColumns.at(i); mTable->horizontalHeader()->setLabel( tableColumn, col->header() ); - mColumnDict.replace( tableColumn, col ); - mFormats.replace( tableColumn, format ); + mColumnDict.tqreplace( tableColumn, col ); + mFormats.tqreplace( tableColumn, format ); col->addColId( tableColumn ); } @@ -698,7 +698,7 @@ void KImportDialog::addColumn(KImportColumn *col) void KImportDialog::setData( uint row, uint col, const TQString &value ) { TQString val = value; - val.replace( "\\n", "\n" ); + val.tqreplace( "\\n", "\n" ); if ( row >= mData.count() ) { mData.resize( row + 1 ); @@ -734,7 +734,7 @@ void KImportDialog::saveTemplate() if ( fileName.isEmpty() ) return; - if ( !fileName.contains( ".desktop" ) ) + if ( !fileName.tqcontains( ".desktop" ) ) fileName += ".desktop"; TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) ); diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp index b7c37852c..e7e9e17f2 100644 --- a/libkdepim/kmailcompletion.cpp +++ b/libkdepim/kmailcompletion.cpp @@ -90,7 +90,7 @@ void KMailCompletion::postProcessMatches( TQStringList * pMatches )const return; //KCompletion has found the keywords for us, we can now map them to mail-addr - TQMap< TQString, bool > mailAddrDistinct; //TODO replace with QSet in KDE4 + TQMap< TQString, bool > mailAddrDistinct; //TODO tqreplace with QSet in KDE4 for ( TQStringList::ConstIterator sit ( pMatches->begin() ), sEnd( pMatches->end() ); sit != sEnd; ++sit ) { const TQStringList &mailAddr = m_keyMap[ (*sit) ]; //get all mailAddr for this keyword for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit ) { diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h index e56eb77cd..8f29d7e02 100644 --- a/libkdepim/kmailcompletion.h +++ b/libkdepim/kmailcompletion.h @@ -58,14 +58,14 @@ class KMailCompletion : public KCompletion * * Items may be added with KCompletion::addItem, those will only be returned as match if they * are in one of these formats: - * \li contains localpart@domain - * \li contains + * \li tqcontains localpart@domain + * \li tqcontains * or if they have also been added with this function. */ void addItemWithKeys( const TQString& email, int weight, const TQStringList * keyWords); /** - * Uses an internal map to replace all keywords in pMatches whith corrsesponding email addresses. + * Uses an internal map to tqreplace all keywords in pMatches whith corrsesponding email addresses. */ virtual void postProcessMatches( TQStringList * pMatches )const; diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h index 7d004c962..91ef133e9 100644 --- a/libkdepim/komposer/core/core.h +++ b/libkdepim/komposer/core/core.h @@ -46,7 +46,7 @@ namespace Komposer { Q_OBJECT public: - Core( TQWidget *parentWidget = 0, const char *name = 0 ); + Core( TQWidget *tqparentWidget = 0, const char *name = 0 ); virtual ~Core(); public slots: diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp index c7cf74927..d4fd5acc8 100644 --- a/libkdepim/komposer/core/pluginmanager.cpp +++ b/libkdepim/komposer/core/pluginmanager.cpp @@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent ) this, TQT_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( - KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) ); + KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ), + TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) ); } PluginManager::~PluginManager() @@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout() kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl << "Remaining plugins: " - << remaining.join( TQString::fromLatin1( ", " ) ) << endl + << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl << "Forcing Komposer shutdown now." << endl; #endif @@ -229,18 +229,18 @@ PluginManager::loadAllPlugins() d->config = KSharedConfig::openConfig( "komposerrc" ); TQMap entries = d->config->entryMap( - TQString::fromLatin1( "Plugins" ) ); + TQString::tqfromLatin1( "Plugins" ) ); TQMap::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) + if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) { key.setLength( key.length() - 7 ); //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl; - if ( it.data() == TQString::fromLatin1( "true" ) ) + if ( it.data() == TQString::tqfromLatin1( "true" ) ) { if ( !plugin( key ) ) d->pluginsToLoad.push( key ); @@ -305,13 +305,13 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) return 0; } - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( - TQString::fromLatin1( "Komposer/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), + TQString::tqfromLatin1( "Komposer/Plugin" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -408,7 +408,7 @@ PluginManager::plugin( const TQString &pluginId ) const if ( !info ) return 0; - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; else return 0; @@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const return it.key()->name(); } - return TQString::fromLatin1( "Unknown" ); + return TQString::tqfromLatin1( "Unknown" ); } QString @@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const return it.key()->pluginName(); } - return TQString::fromLatin1( "unknown" ); + return TQString::tqfromLatin1( "unknown" ); } QString @@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const return it.key()->icon(); } - return TQString::fromLatin1( "Unknown" ); + return TQString::tqfromLatin1( "Unknown" ); } KPluginInfo* @@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru if ( !infoForPluginId( pluginId ) ) return false; - d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); + d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); d->config->sync(); return true; diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index 7dd1673e9..3536ebb8e 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, : m_reference( reference ) { m_box = new TQGroupBox( 0, Qt::Vertical, text, parent ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() ); - boxLayout->setAlignment( Qt::AlignTop ); + TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() ); + boxLayout->tqsetAlignment( Qt::AlignTop ); m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); @@ -101,16 +101,16 @@ EditorSelection::readConfig() m_editorsCombo->clear(); KTrader::OfferList editors = KTrader::self()->query( - TQString::fromLatin1( "Komposer/Editor" ) ); + TQString::tqfromLatin1( "Komposer/Editor" ) ); KTrader::OfferList::ConstIterator it; int i = 0; for ( it = editors.begin(); it != editors.end(); ++it, ++i ) { - if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) ) + if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) ) continue; TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString(); m_editorsCombo->insertItem( name ); - if ( m_reference.contains( name ) ) + if ( m_reference.tqcontains( name ) ) m_editorsCombo->setCurrentItem( i ); } } diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp index 8895cfe9e..0fcba16b9 100644 --- a/libkdepim/komposer/core/tests/testmanager.cpp +++ b/libkdepim/komposer/core/tests/testmanager.cpp @@ -34,7 +34,7 @@ void TestManager::slotAllPluginsLoaded() { kdDebug()<<"Done"<shutdown(); - qApp->exit(); + tqApp->exit(); } void TestManager::slotPluginLoaded( Plugin *plugin ) diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp index b8abf17be..56f97d223 100644 --- a/libkdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -89,7 +89,7 @@ DefaultEditor::changeSignature( const TQString &sig ) int sigStart = text.findRev( "-- " ); TQString sigText = TQString( "-- \n%1" ).arg( sig ); - text.replace( sigStart, text.length(), sigText ); + text.tqreplace( sigStart, text.length(), sigText ); } void @@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac ) connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignJustify(bool)) ); - m_actionAlignLeft->setExclusiveGroup( "alignment" ); - m_actionAlignCenter->setExclusiveGroup( "alignment" ); - m_actionAlignRight->setExclusiveGroup( "alignment" ); - m_actionAlignJustify->setExclusiveGroup( "alignment" ); + m_actionAlignLeft->setExclusiveGroup( "tqalignment" ); + m_actionAlignCenter->setExclusiveGroup( "tqalignment" ); + m_actionAlignRight->setExclusiveGroup( "tqalignment" ); + m_actionAlignJustify->setExclusiveGroup( "tqalignment" ); // // Tools @@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt() void DefaultEditor::updateAligment() { - int align = m_textEdit->alignment(); + int align = m_textEdit->tqalignment(); switch ( align ) { case AlignRight: @@ -288,28 +288,28 @@ void DefaultEditor::setAlignLeft( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignLeft ); + m_textEdit->tqsetAlignment( AlignLeft ); } void DefaultEditor::setAlignRight( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignRight ); + m_textEdit->tqsetAlignment( AlignRight ); } void DefaultEditor::setAlignCenter( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignCenter ); + m_textEdit->tqsetAlignment( AlignCenter ); } void DefaultEditor::setAlignJustify( bool yes ) { if ( yes ) - m_textEdit->setAlignment( AlignJustify ); + m_textEdit->tqsetAlignment( AlignJustify ); } // diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index b615c40b8..922e51261 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -26,11 +26,11 @@ #include #include -KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) - : TQWidget( parentWidget, name ), m_part( 0 ) +KPartsGenericPart::KPartsGenericPart( TQWidget* tqparentWidget, const char* name ) + : TQWidget( tqparentWidget, name ), m_part( 0 ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); } void KPartsGenericPart::load() diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h index 5df3db240..1302b137d 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h @@ -34,7 +34,7 @@ class KPartsGenericPart : public TQWidget { Q_PROPERTY( TQString url READ url WRITE setURL ) Q_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype ) public: - KPartsGenericPart( TQWidget* parentWidget, const char* name ); + KPartsGenericPart( TQWidget* tqparentWidget, const char* name ); TQString url() const { return m_url; } void setURL( const TQString& url ) { m_url = url; load(); } diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp index 918d3b84c..308ae0cc7 100644 --- a/libkdepim/kpixmapregionselectorwidget.cpp +++ b/libkdepim/kpixmapregionselectorwidget.cpp @@ -227,7 +227,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) }; TQCursor cursor; - if ( m_selectedRegion.contains( mev->pos() ) + if ( m_selectedRegion.tqcontains( mev->pos() ) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp index 1af04fd46..93b3feaae 100644 --- a/libkdepim/kprefsdialog.cpp +++ b/libkdepim/kprefsdialog.cpp @@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, void KPrefsWidDate::readConfig() { - mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate() ); + mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate() ); } void KPrefsWidDate::writeConfig() @@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate() kdDebug() << "ITEMS: " << (*it)->name() << endl; TQWidget *page; - TQGridLayout *layout; + TQGridLayout *tqlayout; int currentRow; - if ( !mGroupPages.contains( group ) ) { + if ( !mGroupPages.tqcontains( group ) ) { page = addPage( group ); - layout = new TQGridLayout( page ); + tqlayout = new TQGridLayout( page ); mGroupPages.insert( group, page ); - mGroupLayouts.insert( group, layout ); + mGroupLayouts.insert( group, tqlayout ); currentRow = 0; mCurrentRows.insert( group, currentRow ); } else { page = mGroupPages[ group ]; - layout = mGroupLayouts[ group ]; + tqlayout = mGroupLayouts[ group ]; currentRow = mCurrentRows[ group ]; } @@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate() if ( wid ) { TQValueList widgets = wid->widgets(); if ( widgets.count() == 1 ) { - layout->addMultiCellWidget( widgets[ 0 ], + tqlayout->addMultiCellWidget( widgets[ 0 ], currentRow, currentRow, 0, 1 ); } else if ( widgets.count() == 2 ) { - layout->addWidget( widgets[ 0 ], currentRow, 0 ); - layout->addWidget( widgets[ 1 ], currentRow, 1 ); + tqlayout->addWidget( widgets[ 0 ], currentRow, 0 ); + tqlayout->addWidget( widgets[ 1 ], currentRow, 1 ); } else { kdError() << "More widgets than expected: " << widgets.count() << endl; } @@ -804,7 +804,7 @@ void KPrefsDialog::autoCreate() addWid( wid ); - mCurrentRows.replace( group, ++currentRow ); + mCurrentRows.tqreplace( group, ++currentRow ); } } diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index 3c9f85cc5..3667a7ae9 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h @@ -86,7 +86,7 @@ class KDE_EXPORT KPrefsWid : public QObject @short Widgets for bool settings in @ref KPrefsDialog. This class provides a control element for configuring bool values. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidBool : public KPrefsWid { @@ -119,7 +119,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid @short Widgets for int settings in @ref KPrefsDialog. This class provides a control element for configuring integer values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @@ -160,7 +160,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring time values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @@ -197,7 +197,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid @short Widgets for duration settings in @ref KPrefsDialog. This class provides a control element for configuring duration values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @@ -235,7 +235,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid @short Widgets for time settings in @ref KPrefsDialog. This class provides a control element for configuring date values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @@ -272,7 +272,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid @short Widgets for color settings in @ref KPrefsDialog. This class provides a control element for configuring color values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @@ -315,7 +315,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid @short Widgets for font settings in @ref KPrefsDialog. This class provides a control element for configuring font values. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidFont : public KPrefsWid { @@ -368,7 +368,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. The setting is interpreted as an int value, corresponding to the position of the radio button. The position of the button is defined by the sequence of @@ -417,7 +417,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid @ref KPrefsDialog. This class provides a control element for configuring selections. It is meant - to be used by KPrefsDialog. The user is responsible for the layout management. + to be used by KPrefsDialog. The user is responsible for the tqlayout management. The setting is interpreted as an int value, corresponding to the index in the combo box. @@ -452,7 +452,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidString : public KPrefsWid @@ -499,7 +499,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid @short Widgets for string settings in @ref KPrefsDialog. This class provides a control element for configuring string values. It is - meant to be used by KPrefsDialog. The user is responsible for the layout + meant to be used by KPrefsDialog. The user is responsible for the tqlayout management. */ class KDE_EXPORT KPrefsWidPath : public KPrefsWid @@ -708,7 +708,7 @@ class KDE_EXPORT KPrefsWidManager This class provides the framework for a preferences dialog. You have to subclass it and add the code to create the actual configuration widgets and - do the layout management. + do the tqlayout management. KPrefsDialog provides functions to add subclasses of @ref KPrefsWid via KPrefsWidManager. For these widgets the reading, writing and setting to diff --git a/libkdepim/kregexp3.cpp b/libkdepim/kregexp3.cpp index 6bb519e56..f34dad339 100644 --- a/libkdepim/kregexp3.cpp +++ b/libkdepim/kregexp3.cpp @@ -37,13 +37,13 @@ #include #endif -TQString KRegExp3::replace( const TQString & str, - const TQString & replacementStr, +TQString KRegExp3::tqreplace( const TQString & str, + const TQString & tqreplacementStr, int start, bool global ) { int oldpos, pos; - //-------- parsing the replacementStr into + //-------- parsing the tqreplacementStr into //-------- literal parts and backreferences: TQStringList literalStrs; TQValueList backRefs; @@ -55,30 +55,30 @@ TQString KRegExp3::replace( const TQString & str, TQRegExp brx("\\"); #ifdef DEBUG_KREGEXP3 - kdDebug() << "Analyzing replacementStr: \"" + replacementStr + "\"" << endl; + kdDebug() << "Analyzing tqreplacementStr: \"" + tqreplacementStr + "\"" << endl; #endif oldpos = 0; pos = 0; while ( true ) { - pos = rx.search( replacementStr, pos ); + pos = rx.search( tqreplacementStr, pos ); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Found match at pos %1").arg(pos) << endl; #endif if ( pos < 0 ) { - literalStrs << replacementStr.mid( oldpos ) - .replace( bbrx, "\\" ) - .replace( brx, "" ); + literalStrs << tqreplacementStr.mid( oldpos ) + .tqreplace( bbrx, "\\" ) + .tqreplace( brx, "" ); #ifdef DEBUG_KREGEXP3 kdDebug() << " No more matches. Last literal is \"" + literalStrs.last() + "\"" << endl; #endif break; } else { - literalStrs << replacementStr.mid( oldpos, pos-oldpos ) - .replace( bbrx, "\\" ) - .replace( brx, "" ); + literalStrs << tqreplacementStr.mid( oldpos, pos-oldpos ) + .tqreplace( bbrx, "\\" ) + .tqreplace( brx, "" ); #ifdef DEBUG_KREGEXP3 kdDebug() << TQString(" Inserting \"") + literalStrs.last() + "\" as literal." << endl; kdDebug() << " Searching for corresponding digit(s):" << endl; @@ -101,7 +101,7 @@ TQString KRegExp3::replace( const TQString & str, } #ifdef DEBUG_KREGEXP3 - kdDebug() << "Finished the analysis of replacementStr!" << endl; + kdDebug() << "Finished the analysis of tqreplacementStr!" << endl; #endif Q_ASSERT( literalStrs.count() == backRefs.count() + 1 ); @@ -145,7 +145,7 @@ TQString KRegExp3::replace( const TQString & str, iIt != backRefs.end() ; ++sIt, ++iIt ) { result += (*sIt); #ifdef DEBUG_KREGEXP3 - kdDebug() << " Adding literal replacement part:" << endl; + kdDebug() << " Adding literal tqreplacement part:" << endl; kdDebug() << " result == \"" + result + "\"" << endl; #endif result += cap( (*iIt) ); @@ -156,7 +156,7 @@ TQString KRegExp3::replace( const TQString & str, } result += (*sIt); #ifdef DEBUG_KREGEXP3 - kdDebug() << " Adding literal replacement part:" << endl; + kdDebug() << " Adding literal tqreplacement part:" << endl; kdDebug() << " result == \"" + result + "\"" << endl; #endif } @@ -173,7 +173,7 @@ TQString KRegExp3::replace( const TQString & str, oldpos = pos; if ( !global ) { - // only replace the first occurrence, so stop here: + // only tqreplace the first occurrence, so stop here: result += str.mid( oldpos ); break; } diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h index 40c7681d3..c9b53c5f1 100644 --- a/libkdepim/kregexp3.h +++ b/libkdepim/kregexp3.h @@ -36,21 +36,21 @@ #include -/** @short A TQRegExp (Qt3.x) with a replace() method. +/** @short A TQRegExp (Qt3.x) with a tqreplace() method. This class is simply there to provide a namespace for some nice enhancements of the mighty TQRegExp (Qt3 version) regular - expression engine, namely the method replace(), which can be - used to do search-and-replace like one is used to from perl or sed. + expression engine, namely the method tqreplace(), which can be + used to do search-and-tqreplace like one is used to from perl or sed. - It "simply" adds the ability to define a replacement string which - contains references to the captured substrings. The following + It "simply" adds the ability to define a tqreplacement string which + tqcontains references to the captured substrings. The following constructs are understood, which can be freely mixed in the - replacement string: + tqreplacement string: @section Sed syntax - Back references in the replacement string are made using \n + Back references in the tqreplacement string are made using \n (backslash-digit), where @p n is a single digit. With this mode of operation, only the first nine captured substrings can be referenced. @@ -60,7 +60,7 @@ @section Perl syntax - Back references in the replacement string are made using $n + Back references in the tqreplacement string are made using $n (dollarsign-digit), where @p n is a single digit. With this mode of operation, only the first nine captured substrings can be referenced. @@ -91,21 +91,21 @@ public: : TQRegExp( (TQRegExp)rx ) {} /** Replaces each matching subpattern in @p str with - @p replacementStr, inserting captured substrings for + @p tqreplacementStr, inserting captured substrings for \\n, $n and ${nn} as described in the class documentation. @param str The source string. - @param replacementStr The string which replaces matched + @param tqreplacementStr The string which tqreplaces matched substrings of @p str. @param start Start position for the search. If @p start is negative, starts @p -(start) positions from the end of @p str. - @param global If @p TRUE, requests to replace all occurrences - of the regexp with @p replacementStr; if @p FALSE, - only the first occurrence will be replaced. + @param global If @p TRUE, requests to tqreplace all occurrences + of the regexp with @p tqreplacementStr; if @p FALSE, + only the first occurrence will be tqreplaced. Equivalent to the /g switch to perl's s/// operator. @return The modified string. */ - TQString replace( const TQString & str, - const TQString & replacementStr, + TQString tqreplace( const TQString & str, + const TQString & tqreplacementStr, int start=0, bool global=TRUE ); }; diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp index c61a706b2..ef9746ee0 100644 --- a/libkdepim/krsqueezedtextlabel.cpp +++ b/libkdepim/krsqueezedtextlabel.cpp @@ -24,30 +24,30 @@ KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void KRSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KRSqueezedTextLabel::minimumSizeHint() const +TQSize KRSqueezedTextLabel::tqminimumSizeHint() const { - TQSize sh = TQLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KRSqueezedTextLabel::sizeHint() const +TQSize KRSqueezedTextLabel::tqsizeHint() const { - return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); } void KRSqueezedTextLabel::setText( const TQString &text ) { @@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() { } } -void KRSqueezedTextLabel::setAlignment( int alignment ) +void KRSqueezedTextLabel::tqsetAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(alignment); + TQLabel::tqsetAlignment(tqalignment); fullText = tmpFull; } diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h index a5e4e7760..13627252a 100644 --- a/libkdepim/krsqueezedtextlabel.h +++ b/libkdepim/krsqueezedtextlabel.h @@ -25,7 +25,7 @@ #include /** - * @short A replacement for TQLabel that squeezes its text + * @short A tqreplacement for TQLabel that squeezes its text * * A label class that squeezes its text into the label * @@ -48,12 +48,12 @@ public: KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void setAlignment( int ); + virtual void tqsetAlignment( int ); public slots: void setText( const TQString & ); diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp index 17dd1d439..c9d1f6143 100644 --- a/libkdepim/kscoring.cpp +++ b/libkdepim/kscoring.cpp @@ -47,19 +47,19 @@ static TQString toXml(const TQString& str) uint i = 0; while ( i < len ) { if (tmp[(int)i] == '<') { - tmp.replace(i, 1, "<"); + tmp.tqreplace(i, 1, "<"); len += 3; i += 4; } else if (tmp[(int)i] == '"') { - tmp.replace(i, 1, """); + tmp.tqreplace(i, 1, """); len += 5; i += 6; } else if (tmp[(int)i] == '&') { - tmp.replace(i, 1, "&"); + tmp.tqreplace(i, 1, "&"); len += 4; i += 5; } else if (tmp[(int)i] == '>') { - tmp.replace(i, 1, ">"); + tmp.tqreplace(i, 1, ">"); len += 3; i += 4; } else { @@ -91,7 +91,7 @@ NotifyDialog::NotifyDialog(TQWidget* p) void NotifyDialog::slotShowAgainToggled(bool flag) { - dict.replace(msg,!flag); + dict.tqreplace(msg,!flag); kdDebug(5100) << "note \"" << note << "\" will popup again: " << flag << endl; } @@ -109,7 +109,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s) arg(a.subject()). arg(s); me->note->setText(msg); - if ( i == dict.end() ) i = dict.replace(s,false); + if ( i == dict.end() ) i = dict.tqreplace(s,false); me->adjustSize(); me->exec(); } @@ -773,7 +773,7 @@ TQString KScoringRule::getExpireDateString() const bool KScoringRule::isExpired() const { - return (expires.isValid() && (expires < TQDate::currentDate())); + return (expires.isValid() && (expires < TQDate::tqcurrentDate())); } @@ -925,7 +925,7 @@ KScoringRule* KScoringManager::addRule(const ScorableArticle& a, TQString group, new KScoringExpression("From","CONTAINS", a.from(),"0")); if (score) rule->addAction(new ActionSetScore(score)); - rule->setExpireDate(TQDate::currentDate().addDays(30)); + rule->setExpireDate(TQDate::tqcurrentDate().addDays(30)); addRule(rule); KScoringEditor *edit = KScoringEditor::createEditor(this); edit->setRule(rule); diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp index 6c469f49a..de76d3e81 100644 --- a/libkdepim/kscoringeditor.cpp +++ b/libkdepim/kscoringeditor.cpp @@ -91,7 +91,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); // occupy at much width as possible - setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); setFrameStyle(Box | Sunken); setLineWidth(1); } @@ -421,7 +421,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) groupsBox = new KComboBox( false, groupB, "groupsBox" ); groupsBox->setDuplicatesEnabled(false); groupsBox->insertStringList(manager->getGroups()); - groupsBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + groupsBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); groupL->addWidget( groupsBox, 3, 1 ); // expires @@ -508,7 +508,7 @@ void RuleEditWidget::slotEditRule(const TQString& ruleName) expireEdit->setEnabled(b); expireLabel->setEnabled(b); if (b) - expireEdit->setValue(TQDate::currentDate().daysTo(rule->getExpireDate())); + expireEdit->setValue(TQDate::tqcurrentDate().daysTo(rule->getExpireDate())); else expireEdit->setValue(30); if (rule->getLinkMode() == KScoringRule::AND) { @@ -546,7 +546,7 @@ void RuleEditWidget::updateRule(KScoringRule *rule) rule->setGroups(TQStringList::split(";",groups)); bool b = expireCheck->isChecked(); if (b) - rule->setExpireDate(TQDate::currentDate().addDays(expireEdit->value())); + rule->setExpireDate(TQDate::tqcurrentDate().addDays(expireEdit->value())); else rule->setExpireDate(TQDate()); actionEditor->updateRule(rule); @@ -655,7 +655,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, TQStringList l = m->getGroups(); filterBox->insertItem(i18n("")); filterBox->insertStringList(l); - filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + filterBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); connect(filterBox,TQT_SIGNAL(activated(const TQString&)), this,TQT_SLOT(slotGroupFilter(const TQString&))); slotGroupFilter(i18n("")); @@ -881,7 +881,7 @@ KScoringEditor::KScoringEditor(KScoringManager* m, connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); ruleLister->slotRuleSelected(0); - resize(550, sizeHint().height()); + resize(550, tqsizeHint().height()); } void KScoringEditor::setDirty() @@ -918,7 +918,7 @@ void KScoringEditor::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),sizeHint().height()); + resize(width(),tqsizeHint().height()); } void KScoringEditor::slotApply() @@ -996,7 +996,7 @@ void KScoringEditorWidgetDialog::slotDoShrink() { updateGeometry(); TQApplication::sendPostedEvents(); - resize(width(),sizeHint().height()); + resize(width(),tqsizeHint().height()); } //============================================================================ diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp index f61b633ca..f1c5b657a 100644 --- a/libkdepim/ksubscription.cpp +++ b/libkdepim/ksubscription.cpp @@ -271,7 +271,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, else groupView->header()->setStretchEnabled(true, 0); - // layout + // tqlayout TQGridLayout *topL = new TQGridLayout(page,4,1,0, KDialog::spacingHint()); TQHBoxLayout *filterL = new TQHBoxLayout(KDialog::spacingHint()); TQVBoxLayout *arrL = new TQVBoxLayout(KDialog::spacingHint()); diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp index 2e82b7dfb..9b9559523 100644 --- a/libkdepim/ktimeedit.cpp +++ b/libkdepim/ktimeedit.cpp @@ -104,7 +104,7 @@ public: // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox. // Difficult to get all in one... -// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" mask would help. +// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help. KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) : TQComboBox( true, parent, name ) { diff --git a/libkdepim/kvcarddrag.cpp b/libkdepim/kvcarddrag.cpp index b8057367a..1217d6fba 100644 --- a/libkdepim/kvcarddrag.cpp +++ b/libkdepim/kvcarddrag.cpp @@ -68,7 +68,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQByteArray &content ) if ( !canDecode( e ) ) { return false; } - content = e->encodedData( vcard_mime_string ); + content = e->tqencodedData( vcard_mime_string ); return true; } #else @@ -77,7 +77,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQString &content ) if ( !canDecode( e ) ) { return false; } - content = TQString::fromUtf8( e->encodedData( vcard_mime_string ) ); + content = TQString::fromUtf8( e->tqencodedData( vcard_mime_string ) ); return true; } #endif @@ -88,9 +88,9 @@ bool KVCardDrag::decode( TQMimeSource *e, KABC::Addressee::List& addressees ) return false; } #if defined(KABC_VCARD_ENCODING_FIX) - addressees = KABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() ); + addressees = KABC::VCardConverter().parseVCardsRaw( e->tqencodedData( vcard_mime_string ).data() ); #else - addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) ); + addressees = KABC::VCardConverter().parseVCards( e->tqencodedData( vcard_mime_string ) ); #endif return true; } diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h index 30d8dd742..3e99a0e6d 100644 --- a/libkdepim/kvcarddrag.h +++ b/libkdepim/kvcarddrag.h @@ -66,7 +66,7 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag void setVCard( const TQString &content ); #endif /** - * Returns true if the MIME source @p e contains a vcard object. + * Returns true if the MIME source @p e tqcontains a vcard object. */ static bool canDecode( TQMimeSource *e ); diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp index e26b05300..13e1675b7 100644 --- a/libkdepim/kwidgetlister.cpp +++ b/libkdepim/kwidgetlister.cpp @@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w) void KWidgetLister::removeLastWidget() { - // The layout will take care that the + // The tqlayout will take care that the // widget is removed from screen, too. mWidgetList.removeLast(); enableControls(); diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h index cd1ed6254..19616aa1f 100644 --- a/libkdepim/kwidgetlister.h +++ b/libkdepim/kwidgetlister.h @@ -73,19 +73,19 @@ protected slots: /** Called whenever the user clicks on the 'more' button. Reimplementations should call this method, because this implementation does all the dirty work with adding the widgets - to the layout (through @ref addWidgetAtEnd) and enabling/disabling + to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling the control buttons. */ virtual void slotMore(); /** Called whenever the user clicks on the 'fewer' button. Reimplementations should call this method, because this implementation does all the dirty work with removing the widgets - from the layout (through @ref removeLastWidget) and + from the tqlayout (through @ref removeLastWidget) and enabling/disabling the control buttons. */ virtual void slotFewer(); /** Called whenever the user clicks on the 'clear' button. Reimplementations should call this method, because this implementation does all the dirty work with removing all but - @ref mMinWidgets widgets from the layout and enabling/disabling + @ref mMinWidgets widgets from the tqlayout and enabling/disabling the control buttons. */ virtual void slotClear(); @@ -115,7 +115,7 @@ protected: /** Because QT 2.x does not support signals/slots in template classes, we are forced to emulate this by forcing the implementers of subclasses of KWidgetLister to reimplement this - function which replaces the "@p new @p T" call. */ + function which tqreplaces the "@p new @p T" call. */ virtual TQWidget* createWidget( TQWidget *parent ); /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't check if @p aNum is inside the range @p diff --git a/libkdepim/kxface.cpp b/libkdepim/kxface.cpp index ecd24bc24..9813da7cc 100644 --- a/libkdepim/kxface.cpp +++ b/libkdepim/kxface.cpp @@ -132,8 +132,8 @@ TQString KXFace::fromImage( const TQImage &image ) tmp[i-1] = t; } } - tmp.replace( TQRegExp( "(\\w{12})" ), "\\1\n" ); - tmp.replace( TQRegExp( "(\\w{4})" ), "0x\\1," ); + tmp.tqreplace( TQRegExp( "(\\w{12})" ), "\\1\n" ); + tmp.tqreplace( TQRegExp( "(\\w{4})" ), "0x\\1," ); len = tmp.length(); char *fbuf = (char *)malloc( len + 1 ); strncpy( fbuf, (const char *)tmp, len ); diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp index 39d384e83..bf4f995ed 100644 --- a/libkdepim/ldapclient.cpp +++ b/libkdepim/ldapclient.cpp @@ -49,7 +49,7 @@ static KStaticDeleter configDeleter; TQString LdapObject::toString() const { - TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn ); + TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn ); for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { @@ -575,7 +575,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList ) // must use the correct SMTP server, by definition. // //mail = (*it1).client->base().simplifyWhiteSpace(); - //mail.replace( ",dc=", ".", false ); + //mail.tqreplace( ",dc=", ".", false ); //if( mail.startsWith("dc=", false) ) // mail.remove(0, 3); //mail.prepend( '@' ); diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp index a51ccfb9d..37b29f6d0 100644 --- a/libkdepim/ldapsearchdialog.cpp +++ b/libkdepim/ldapsearchdialog.cpp @@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); groupBox->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, + TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) TQSize buttonSize; mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox ); - buttonSize = mSearchButton->sizeHint(); + buttonSize = mSearchButton->tqsizeHint(); mSearchButton->setText( i18n( "Search" ) ); - if ( buttonSize.width() < mSearchButton->sizeHint().width() ) - buttonSize = mSearchButton->sizeHint(); + if ( buttonSize.width() < mSearchButton->tqsizeHint().width() ) + buttonSize = mSearchButton->tqsizeHint(); mSearchButton->setFixedWidth( buttonSize.width() ); mSearchButton->setDefault( true ); @@ -186,7 +186,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) mResultListView->setShowSortIndicator( true ); topLayout->addWidget( mResultListView ); - resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) ); setButtonText( User1, i18n( "Unselect All" ) ); setButtonText( User2, i18n( "Select All" ) ); diff --git a/libkdepim/linklocator.cpp b/libkdepim/linklocator.cpp index 0ea0fa680..46542f89b 100644 --- a/libkdepim/linklocator.cpp +++ b/libkdepim/linklocator.cpp @@ -176,12 +176,12 @@ TQString LinkLocator::getEmailAddress() // determine the local part of the email address int start = mPos - 1; - while ( start >= 0 && mText[start].unicode() < 128 && + while ( start >= 0 && mText[start].tqunicode() < 128 && ( mText[start].isLetterOrNumber() || mText[start] == '@' || // allow @ to find invalid email addresses allowedSpecialChars.find( mText[start] ) != -1 ) ) { if ( mText[start] == '@' ) - return TQString(); // local part contains '@' -> no email address + return TQString(); // local part tqcontains '@' -> no email address --start; } ++start; @@ -200,7 +200,7 @@ TQString LinkLocator::getEmailAddress() mText[end] == '.' || mText[end] == '-' ) ) { if ( mText[end] == '@' ) - return TQString(); // domain part contains '@' -> no email address + return TQString(); // domain part tqcontains '@' -> no email address if ( mText[end] == '.' ) dotPos = QMIN( dotPos, end ); // remember index of first dot in domain ++end; @@ -305,7 +305,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags, else hyperlink = str; - str = str.replace('&', "&"); + str = str.tqreplace('&', "&"); result += "" + str + ""; x += locator.mPos - start; continue; @@ -319,7 +319,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags, // remove the local part from the result (as '&'s have been expanded to // & we have to take care of the 4 additional characters per '&') - result.truncate(result.length() - len - (localPart.contains('&')*4)); + result.truncate(result.length() - len - (localPart.tqcontains('&')*4)); x -= len; result += "" + str + ""; @@ -361,7 +361,7 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath ) TQByteArray ba = pngFile.readAll(); pngFile.close(); - return TQString::fromLatin1("data:image/png;base64,%1") + return TQString::tqfromLatin1("data:image/png;base64,%1") .arg( KCodecs::base64Encode( ba ) ); } @@ -390,11 +390,11 @@ TQString LinkLocator::getEmoticon() return TQString::null; const TQString smiley = mText.mid( mPos, smileyLen ); - if ( !s_smileyEmoticonNameMap->contains( smiley ) ) + if ( !s_smileyEmoticonNameMap->tqcontains( smiley ) ) return TQString::null; // that's not a (known) smiley TQString htmlRep; - if ( s_smileyEmoticonHTMLCache->contains( smiley ) ) { + if ( s_smileyEmoticonHTMLCache->tqcontains( smiley ) ) { htmlRep = (*s_smileyEmoticonHTMLCache)[smiley]; } else { @@ -403,14 +403,14 @@ TQString LinkLocator::getEmoticon() #if KDE_IS_VERSION( 3, 3, 91 ) const TQString iconPath = locate( "emoticons", EmotIcons::theme() + - TQString::fromLatin1( "/" ) + - imageName + TQString::fromLatin1(".png") ); + TQString::tqfromLatin1( "/" ) + + imageName + TQString::tqfromLatin1(".png") ); #else const TQString iconPath = locate( "data", - TQString::fromLatin1( "kopete/pics/emoticons/" )+ + TQString::tqfromLatin1( "kopete/pics/emoticons/" )+ EmotIcons::theme() + - TQString::fromLatin1( "/" ) + - imageName + TQString::fromLatin1(".png") ); + TQString::tqfromLatin1( "/" ) + + imageName + TQString::tqfromLatin1(".png") ); #endif const TQString dataUrl = pngToDataUrl( iconPath ); diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h index 6078fed16..618bc6c8e 100644 --- a/libkdepim/linklocator.h +++ b/libkdepim/linklocator.h @@ -123,7 +123,7 @@ public: * - PreserveSpaces, preserves the appearance of * sequences of space and tab * characters in the resulting HTML. - * - ReplaceSmileys, replace text smileys with + * - ReplaceSmileys, tqreplace text smileys with * emoticon images. * - IgnoreUrls, doesn't parse any URLs. * - HighlightText, interprets text highlighting markup diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp index 434ef5ecc..4f4a79bcc 100644 --- a/libkdepim/maillistdrag.cpp +++ b/libkdepim/maillistdrag.cpp @@ -30,14 +30,14 @@ using namespace KPIM; -MailSummary::MailSummary( Q_UINT32 serialNumber, TQString messageId, +MailSummary::MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, TQString from, TQString to, time_t date ) : mSerialNumber( serialNumber ), mMessageId( messageId ), mSubject( subject ), mFrom( from ), mTo( to ), mDate( date ) {} -Q_UINT32 MailSummary::serialNumber() const +TQ_UINT32 MailSummary::serialNumber() const { return mSerialNumber; } @@ -67,7 +67,7 @@ time_t MailSummary::date() return mDate; } -void MailSummary::set( Q_UINT32 serialNumber, TQString messageId, +void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId, TQString subject, TQString from, TQString to, time_t date ) { mSerialNumber = serialNumber; @@ -114,7 +114,7 @@ TQDataStream& operator<< ( TQDataStream &s, MailSummary &d ) TQDataStream& operator>> ( TQDataStream &s, MailSummary &d ) { - Q_UINT32 serialNumber; + TQ_UINT32 serialNumber; TQString messageId, subject, from, to; time_t date; s >> serialNumber; @@ -150,7 +150,7 @@ TQDataStream& operator>> ( TQDataStream &s, MailList &mailList ) bool MailListDrag::decode( TQDropEvent* e, MailList& mailList ) { - TQByteArray payload = e->encodedData( MailListDrag::format() ); + TQByteArray payload = e->tqencodedData( MailListDrag::format() ); TQDataStream buffer( payload, IO_ReadOnly ); if ( payload.size() ) { e->accept(); @@ -221,16 +221,16 @@ bool MailListDrag::provides(const char *mimeType) const return TQStoredDrag::provides(mimeType); } -TQByteArray MailListDrag::encodedData(const char *mimeType) const +TQByteArray MailListDrag::tqencodedData(const char *mimeType) const { if (TQCString(mimeType) != "message/rfc822") { - return TQStoredDrag::encodedData(mimeType); + return TQStoredDrag::tqencodedData(mimeType); } TQByteArray rc; if (_src) { MailList ml; - TQByteArray enc = TQStoredDrag::encodedData(format()); + TQByteArray enc = TQStoredDrag::tqencodedData(format()); decode(enc, ml); KProgressDialog *dlg = new KProgressDialog(0, 0, TQString::null, i18n("Retrieving and storing messages..."), true); diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h index 929821898..7556cec5a 100644 --- a/libkdepim/maillistdrag.h +++ b/libkdepim/maillistdrag.h @@ -47,16 +47,16 @@ namespace KPIM { class KDE_EXPORT MailSummary { public: - MailSummary( Q_UINT32 serialNumber, TQString messageId, TQString subject, + MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, TQString from, TQString to, time_t date ); MailSummary() {} ~MailSummary() {} /*** Set fields for this mail summary ***/ - void set( Q_UINT32, TQString, TQString, TQString, TQString, time_t ); + void set( TQ_UINT32, TQString, TQString, TQString, TQString, time_t ); /*** KMail unique identification number ***/ - Q_UINT32 serialNumber() const; + TQ_UINT32 serialNumber() const; /*** MD5 checksum of message identification string ***/ TQString messageId(); @@ -74,7 +74,7 @@ public: time_t date(); private: - Q_UINT32 mSerialNumber; + TQ_UINT32 mSerialNumber; TQString mMessageId, mSubject, mFrom, mTo; time_t mDate; }; @@ -88,7 +88,7 @@ public: MailTextSource() {} virtual ~MailTextSource() {} - virtual TQCString text(Q_UINT32 serialNumber) const = 0; + virtual TQCString text(TQ_UINT32 serialNumber) const = 0; }; // Drag and drop object for mails @@ -103,7 +103,7 @@ public: bool provides(const char *mimeType) const; - TQByteArray encodedData(const char *) const; + TQByteArray tqencodedData(const char *) const; /* Reset the list of mail summaries */ void setMailList( MailList ); diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp index 2e6f703cb..1369009f7 100644 --- a/libkdepim/overlaywidget.cpp +++ b/libkdepim/overlaywidget.cpp @@ -51,9 +51,9 @@ void OverlayWidget::reposition() p.setX( mAlignWidget->width() - width() ); p.setY( -height() ); // Position in the toplevelwidget's coordinates - TQPoint pTopLevel = mAlignWidget->mapTo( topLevelWidget(), p ); - // Position in the widget's parentWidget coordinates - TQPoint pParent = parentWidget()->mapFrom( topLevelWidget(), pTopLevel ); + TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p ); + // Position in the widget's tqparentWidget coordinates + TQPoint pParent = tqparentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel ); // Move 'this' to that position. move( pParent ); } diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h index d0aed33a8..b9918468b 100644 --- a/libkdepim/overlaywidget.h +++ b/libkdepim/overlaywidget.h @@ -35,11 +35,11 @@ namespace KPIM { /** - * This is a widget that can align itself with another one, without using a layout, + * This is a widget that can align itself with another one, without using a tqlayout, * so that it can actually be on top of other widgets. - * Currently the only supported type of alignment is "right aligned, on top of the other widget". + * Currently the only supported type of tqalignment is "right aligned, on top of the other widget". * - * OverlayWidget inherits TQHBox for convenience purposes (layout, and frame) + * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame) */ class OverlayWidget : public QHBox { diff --git a/libkdepim/pluginloaderbase.cpp b/libkdepim/pluginloaderbase.cpp index 40a4beb2f..9be0ffd05 100644 --- a/libkdepim/pluginloaderbase.cpp +++ b/libkdepim/pluginloaderbase.cpp @@ -58,7 +58,7 @@ namespace KPIM { } const PluginMetaData * PluginLoaderBase::infoForName( const TQString & type ) const { - return mPluginMap.contains( type ) ? &(mPluginMap[type]) : 0 ; + return mPluginMap.tqcontains( type ) ? &(mPluginMap[type]) : 0 ; } @@ -114,7 +114,7 @@ namespace KPIM { void * PluginLoaderBase::mainFunc( const TQString & type, const char * mf_name ) const { - if ( type.isEmpty() || !mPluginMap.contains( type ) ) + if ( type.isEmpty() || !mPluginMap.tqcontains( type ) ) return 0; const TQString libName = mPluginMap[ type ].library; diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp index 227e73766..8c0ab889a 100644 --- a/libkdepim/progressdialog.cpp +++ b/libkdepim/progressdialog.cpp @@ -84,34 +84,34 @@ void TransactionItemView::resizeContents( int w, int h ) // (handling of TQEvent::LayoutHint in TQScrollView calls this method) //kdDebug(5300) << k_funcinfo << w << "," << h << endl; TQScrollView::resizeContents( w, h ); - // Tell the layout in the parent (progressdialog) that our size changed + // Tell the tqlayout in the parent (progressdialog) that our size changed updateGeometry(); // Resize the parent (progressdialog) - this works but resize horizontally too often - //parentWidget()->adjustSize(); + //tqparentWidget()->adjustSize(); TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted ); TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint ); - TQSize sz = parentWidget()->sizeHint(); - int currentWidth = parentWidget()->width(); + TQSize sz = tqparentWidget()->tqsizeHint(); + int currentWidth = tqparentWidget()->width(); // Don't resize to sz.width() every time when it only reduces a little bit if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 ) currentWidth = sz.width(); - parentWidget()->resize( currentWidth, sz.height() ); + tqparentWidget()->resize( currentWidth, sz.height() ); } -TQSize TransactionItemView::sizeHint() const +TQSize TransactionItemView::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize TransactionItemView::minimumSizeHint() const +TQSize TransactionItemView::tqminimumSizeHint() const { int f = 2 * frameWidth(); // Make room for a vertical scrollbar in all cases, to avoid a horizontal one - int vsbExt = verticalScrollBar()->sizeHint().width(); - int minw = topLevelWidget()->width() / 3; - int maxh = topLevelWidget()->height() / 2; - TQSize sz( mBigBox->minimumSizeHint() ); + int vsbExt = verticalScrollBar()->tqsizeHint().width(); + int minw = tqtopLevelWidget()->width() / 3; + int maxh = tqtopLevelWidget()->height() / 2; + TQSize sz( mBigBox->tqminimumSizeHint() ); sz.setWidth( QMAX( sz.width(), minw ) + f + vsbExt ); sz.setHeight( QMIN( sz.height(), maxh ) + f ); return sz; @@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent, { setSpacing( 2 ); setMargin( 2 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mFrame = new TQFrame( this ); mFrame->setFrameShape( TQFrame::HLine ); @@ -160,8 +160,8 @@ TransactionItem::TransactionItem( TQWidget* parent, mItemLabel = new TQLabel( item->label(), h ); // always interpret the label text as RichText, but disable word wrapping mItemLabel->setTextFormat( Qt::RichText ); - mItemLabel->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); - h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mItemLabel->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); + h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mProgress = new TQProgressBar( 100, h ); mProgress->setProgress( item->progress() ); @@ -175,17 +175,17 @@ TransactionItem::TransactionItem( TQWidget* parent, h = new TQHBox( this ); h->setSpacing( 5 ); - h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); mSSLLabel = new SSLLabel( h ); - mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mItemStatus = new TQLabel( item->status(), h ); // always interpret the status text as RichText, but disable word wrapping mItemStatus->setTextFormat( Qt::RichText ); - mItemStatus->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); - // richtext leads to sizeHint acting as if wrapping was enabled though, + mItemStatus->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine ); + // richtext leads to tqsizeHint acting as if wrapping was enabled though, // so make sure we only ever have the height of one line. - mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); - mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() ); + mItemStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + mItemStatus->setFixedHeight( mItemLabel->tqsizeHint().height() ); setCrypto( item->usesCrypto() ); if( first ) hideHLine(); } @@ -209,7 +209,7 @@ void TransactionItem::setLabel( const TQString& label ) mItemLabel->setText( label ); } -void TransactionItem::setStatus( const TQString& status ) +void TransactionItem::seStatus( const TQString& status ) { mItemStatus->setText( status ); } @@ -258,7 +258,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c TQVBox* rightBox = new TQVBox( this ); TQToolButton* pbClose = new TQToolButton( rightBox ); pbClose->setAutoRaise(true); - pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + pbClose->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); pbClose->setFixedSize( 16, 16 ); pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); @@ -309,7 +309,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) { TransactionItem *parent = 0; if ( item->parent() ) { - if ( mTransactionsToListviewItems.contains( item->parent() ) ) { + if ( mTransactionsToListviewItems.tqcontains( item->parent() ) ) { parent = mTransactionsToListviewItems[ item->parent() ]; parent->addSubTransaction( item ); } @@ -317,7 +317,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) const bool first = mTransactionsToListviewItems.empty(); TransactionItem *ti = mScrollView->addTransactionItem( item, first ); if ( ti ) - mTransactionsToListviewItems.replace( item, ti ); + mTransactionsToListviewItems.tqreplace( item, ti ); if ( first && mWasLastShown ) TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) ); @@ -326,7 +326,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) void ProgressDialog::slotTransactionCompleted( ProgressItem *item ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; mTransactionsToListviewItems.remove( item ); ti->setItemComplete(); @@ -347,7 +347,7 @@ void ProgressDialog::slotTransactionCanceled( ProgressItem* ) void ProgressDialog::slotTransactionProgress( ProgressItem *item, unsigned int progress ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; ti->setProgress( progress ); } @@ -356,16 +356,16 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item, void ProgressDialog::slotTransactionStatus( ProgressItem *item, const TQString& status ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; - ti->setStatus( status ); + ti->seStatus( status ); } } void ProgressDialog::slotTransactionLabel( ProgressItem *item, const TQString& label ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; ti->setLabel( label ); } @@ -375,7 +375,7 @@ void ProgressDialog::slotTransactionLabel( ProgressItem *item, void ProgressDialog::slotTransactionUsesCrypto( ProgressItem *item, bool value ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; ti->setCrypto( value ); } @@ -383,7 +383,7 @@ void ProgressDialog::slotTransactionUsesCrypto( ProgressItem *item, void ProgressDialog::slotTransactionUsesBusyIndicator( KPIM::ProgressItem *item, bool value ) { - if ( mTransactionsToListviewItems.contains( item ) ) { + if ( mTransactionsToListviewItems.tqcontains( item ) ) { TransactionItem *ti = mTransactionsToListviewItems[ item ]; if ( value ) ti->setTotalSteps( 0 ); diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h index cabcb69a2..b9a29e4b6 100644 --- a/libkdepim/progressdialog.h +++ b/libkdepim/progressdialog.h @@ -62,8 +62,8 @@ public: TransactionItem* addTransactionItem( ProgressItem *item, bool first ); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; public slots: void slotLayoutFirstItem(); @@ -88,7 +88,7 @@ public: void setProgress( int progress ); void setLabel( const TQString& ); - void setStatus( const TQString& ); + void seStatus( const TQString& ); void setCrypto( bool ); void setTotalSteps( int totalSteps ); diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp index 2e5f4d6eb..740e6c121 100644 --- a/libkdepim/progressmanager.cpp +++ b/libkdepim/progressmanager.cpp @@ -66,7 +66,7 @@ void ProgressItem::setComplete() void ProgressItem::addChild( ProgressItem *kiddo ) { - mChildren.replace( kiddo, true ); + mChildren.tqreplace( kiddo, true ); } void ProgressItem::removeChild( ProgressItem *kiddo ) @@ -93,7 +93,7 @@ void ProgressItem::cancel() if ( kid->canBeCanceled() ) kid->cancel(); } - setStatus( i18n( "Aborting..." ) ); + seStatus( i18n( "Aborting..." ) ); emit progressItemCanceled( this ); } @@ -111,7 +111,7 @@ void ProgressItem::setLabel( const TQString& v ) emit progressItemLabel( this, mLabel ); } -void ProgressItem::setStatus( const TQString& v ) +void ProgressItem::seStatus( const TQString& v ) { mStatus = v; emit progressItemStatus( this, mStatus ); diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index bf2842716..47409002f 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -75,7 +75,7 @@ class KDE_EXPORT ProgressItem : public QObject * @p v will be interpreted as rich text, so it might have to be escaped. * @param v The status string. */ - void setStatus( const TQString& v ); + void seStatus( const TQString& v ); /** * @return Whether this item can be cancelled. @@ -131,7 +131,7 @@ class KDE_EXPORT ProgressItem : public QObject * Reset the progress value of this item to 0 and the status string to * the empty string. */ - void reset() { setProgress( 0 ); setStatus( TQString::null ); mCompleted = 0; } + void reset() { setProgress( 0 ); seStatus( TQString::null ); mCompleted = 0; } void cancel(); @@ -358,7 +358,7 @@ class KDE_EXPORT ProgressManager : public QObject * @return the only top level progressitem when there's only one. * Returns 0 if there is no item, or more than one top level item. * Since this is used to calculate the overall progress, it will also return - * 0 if there is an item which uses a busy indicator, since that will invalidate + * 0 if there is an item which uses a busy indicator, since that will tqinvalidate * the overall progress. */ ProgressItem* singleItem() const; diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp index 11c0db929..bbee2d8ca 100644 --- a/libkdepim/qutf7codec.cpp +++ b/libkdepim/qutf7codec.cpp @@ -18,7 +18,7 @@ with any version of Qt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why the + This exception does not however tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ @@ -137,10 +137,10 @@ int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const } class QUtf7Decoder : public TQTextDecoder { - // the storage for our unicode char until it's finished + // the storage for our tqunicode char until it's finished ushort uc; // the state of the base64 decoding - // can be 0 (just finished three unicode chars) + // can be 0 (just finished three tqunicode chars) // 1 (have the upper 6 bits of uc already) // 2 (have the upper 12 bits of uc already) // 3 (have the upper 2 bits of uc already) @@ -148,7 +148,7 @@ class QUtf7Decoder : public TQTextDecoder { // 7 (have the upper 10 bits of uc already) // => n (have the upper (n * 6) % 16 bits of uc already) // "stepNo" cycles through all it's values every three - // unicode chars. + // tqunicode chars. char stepNo; // remembers if we are in shifted-sequence mode bool shifted; @@ -183,7 +183,7 @@ public: qWarning("QUtf7Decoder: 8bit char found in input. " "Parser has been re-initialized!"); resetParser(); - result += TQChar::replacement; + result += TQChar::tqreplacement; continue; } @@ -374,8 +374,8 @@ private: // if mayContinue, this char has already been written *t++ = toBase64( outbits | ( u >> 14 ) ); } - *t++ = toBase64( (u & 0x3F00 /* mask top 2 bits */ ) >> 8 ); - *t++ = toBase64( (u & 0x00FC /* mask msbyte */ ) >> 2 ); + *t++ = toBase64( (u & 0x3F00 /* tqmask top 2 bits */ ) >> 8 ); + *t++ = toBase64( (u & 0x00FC /* tqmask msbyte */ ) >> 2 ); // save 2 lowest-significant bits in outbits[5..4] outbits = (u & 0x0003) << 4; break; @@ -462,7 +462,7 @@ public: #endif // source and destination cursor - const TQChar * s = uc.unicode(); + const TQChar * s = uc.tqunicode(); TQCString::Iterator t = result.data(); if ( uc.isNull() ) { @@ -473,7 +473,7 @@ public: // normal operation: for (int i = 0 ; i < len_in_out ; i++/*, checkOutBuf(result,maxreslen,t,i,len_in_out,5)*/ ) { - ushort ch = s[i].unicode(); + ushort ch = s[i].tqunicode(); // // first, we check whether we might get around encoding: diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h index 675692afa..116fa02ad 100644 --- a/libkdepim/qutf7codec.h +++ b/libkdepim/qutf7codec.h @@ -18,7 +18,7 @@ with any version of Qt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why the + This exception does not however tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libkdepim/qutf7codecplugin.cpp b/libkdepim/qutf7codecplugin.cpp index e6dcf7c66..27b706820 100644 --- a/libkdepim/qutf7codecplugin.cpp +++ b/libkdepim/qutf7codecplugin.cpp @@ -18,7 +18,7 @@ with any version of Qt by TrollTech AS, Norway. In this case, the use of this plugin doesn't cause the resulting executable to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why the + This exception does not however tqinvalidate any other reasons why the executable file might be covered by the GNU General Public License. */ diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp index a8e7e76b5..80fe39123 100644 --- a/libkdepim/recentaddresses.cpp +++ b/libkdepim/recentaddresses.cpp @@ -162,11 +162,11 @@ RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name ) parent, name, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); mEditor = new KEditListBox( i18n( "Recent Addresses" ), page, "", false, KEditListBox::Add | KEditListBox::Remove ); - layout->addWidget( mEditor ); + tqlayout->addWidget( mEditor ); } void RecentAddressDialog::setAddresses( const TQStringList &addrs ) diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp index 93671a347..7011c7129 100644 --- a/libkdepim/sendsmsdialog.cpp +++ b/libkdepim/sendsmsdialog.cpp @@ -32,19 +32,19 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c { TQWidget *page = plainPage(); - TQGridLayout *layout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() ); - layout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); + tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 ); mMessageLength = new TQLabel( "0/160", page ); - mMessageLength->setAlignment( Qt::AlignRight ); - layout->addWidget( mMessageLength, 0, 2 ); + mMessageLength->tqsetAlignment( Qt::AlignRight ); + tqlayout->addWidget( mMessageLength, 0, 2 ); mText = new TQTextEdit( page ); - layout->addMultiCellWidget( mText, 1, 1, 0, 2 ); + tqlayout->addMultiCellWidget( mText, 1, 1, 0, 2 ); - layout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); - layout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); + tqlayout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 ); + tqlayout->addWidget( new TQLabel( recipientName, page ), 2, 2 ); setButtonText( Ok, i18n( "Send" ) ); diff --git a/libkdepim/spellingfilter.cpp b/libkdepim/spellingfilter.cpp index cc94968d4..e57745e50 100644 --- a/libkdepim/spellingfilter.cpp +++ b/libkdepim/spellingfilter.cpp @@ -89,7 +89,7 @@ void SpellingFilter::TextCensor::censorQuotations(const TQString& quotePrefix) int len = mPos - start; TQString spaces; spaces.fill(' ', len); - mText.replace(start, len, spaces); + mText.tqreplace(start, len, spaces); //kdDebug(5006) << "censored quotation [" // << start << ", " << mPos << ")" << endl; @@ -116,7 +116,7 @@ void SpellingFilter::TextCensor::censorUrls() // Replace url with spaces url.fill(' '); - mText.replace(start, url.length(), url); + mText.tqreplace(start, url.length(), url); //kdDebug(5006) << "censored url [" // << start << ", " << mPos << ")" << endl; @@ -141,7 +141,7 @@ void SpellingFilter::TextCensor::censorEmailAddresses() // Replace address with spaces address.fill(' '); - mText.replace(start, address.length(), address); + mText.tqreplace(start, address.length(), address); //kdDebug(5006) << "censored addr [" // << start << ", "<< mPos << ")" << endl; @@ -162,7 +162,7 @@ void SpellingFilter::TextCensor::censorString(const TQString& s) // Replace string with spaces TQString spaces; spaces.fill(' ', s.length()); - mText.replace(mPos, s.length(), spaces); + mText.tqreplace(mPos, s.length(), spaces); mPos += s.length(); //kdDebug(5006) << "censored string [" diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp index a7b240ea0..166376638 100644 --- a/libkdepim/statusbarprogresswidget.cpp +++ b/libkdepim/statusbarprogresswidget.cpp @@ -67,7 +67,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog box = new TQHBoxLayout( this, 0, 0 ); m_pButton = new TQPushButton( this ); - m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_pButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_pButton->setPixmap( SmallIcon( "up" ) ); box->addWidget( m_pButton ); @@ -88,12 +88,12 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog stack->addWidget( m_pProgressBar, 1 ); m_pLabel = new TQLabel( TQString::null, this ); - m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); m_pButton->setMaximumHeight( fontMetrics().height() ); - setMinimumWidth( minimumSizeHint().width() ); + setMinimumWidth( tqminimumSizeHint().width() ); mode = None; setMode(); diff --git a/libkdepim/tests/test_kregexp.cpp b/libkdepim/tests/test_kregexp.cpp index a44e3be0f..0644bbba5 100644 --- a/libkdepim/tests/test_kregexp.cpp +++ b/libkdepim/tests/test_kregexp.cpp @@ -9,8 +9,8 @@ main() // test for http://bugs.kde.org/show_bug.cgi?id=54886 KRegExp3 reg("^"); - TQString res = reg.replace(TQString::fromLatin1("Fun stuff"), - TQString::fromLatin1("[fun] ")); + TQString res = reg.tqreplace(TQString::tqfromLatin1("Fun stuff"), + TQString::tqfromLatin1("[fun] ")); kdDebug() << res << endl; } diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp index 993967cb6..e0d1d732d 100644 --- a/libkdepim/tests/testdateedit.cpp +++ b/libkdepim/tests/testdateedit.cpp @@ -34,10 +34,10 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); KDateEdit *edit = new KDateEdit( this ); - layout->addWidget( edit ); + tqlayout->addWidget( edit ); connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), this, TQT_SLOT( dateChanged( const TQDate& ) ) ); diff --git a/libkdepim/tests/testutf7encoder.cpp b/libkdepim/tests/testutf7encoder.cpp index 925bab21e..04ed8f702 100644 --- a/libkdepim/tests/testutf7encoder.cpp +++ b/libkdepim/tests/testutf7encoder.cpp @@ -9,7 +9,7 @@ void main( int argc, char * argv[] ) { TQTextEncoder * enc; - TQString arg = TQString::fromLatin1( argv[1] ); + TQString arg = TQString::tqfromLatin1( argv[1] ); int len; cout << "Original string:\n" diff --git a/libkholidays/parseholiday.c b/libkholidays/parseholiday.c index c215515e5..c78d36050 100644 --- a/libkholidays/parseholiday.c +++ b/libkholidays/parseholiday.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -1127,7 +1127,7 @@ yystpcpy (yydest, yysrc) /* Copy to YYRES the contents of YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than + tqcontains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. If YYRES is null, do not copy; instead, return the length of what the result would have been. */ diff --git a/libkholidays/parseholiday.h b/libkholidays/parseholiday.h index 709aa5671..3802c4d5a 100644 --- a/libkholidays/parseholiday.h +++ b/libkholidays/parseholiday.h @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/libkmime/boolflags.cpp b/libkmime/boolflags.cpp index 2110acbde..a9ba7a9f8 100644 --- a/libkmime/boolflags.cpp +++ b/libkmime/boolflags.cpp @@ -20,7 +20,7 @@ void BoolFlags::set(unsigned int i, bool b) { if(i>15) return; - unsigned char p; //bitmask + unsigned char p; //bitqmask int n; if(i<8) { //first byte @@ -43,7 +43,7 @@ bool BoolFlags::get(unsigned int i) { if(i>15) return false; - unsigned char p; //bitmask + unsigned char p; //bitqmask int n; if(i<8) { //first byte diff --git a/libkmime/kmime_charfreq.cpp b/libkmime/kmime_charfreq.cpp index fa496b996..a75d76853 100644 --- a/libkmime/kmime_charfreq.cpp +++ b/libkmime/kmime_charfreq.cpp @@ -77,7 +77,7 @@ void CharFreq::count( const char * it, size_t len ) { break; case 'F': // check for lines starting with From_ if not found already: if ( !mLeadingFrom ) - if ( prevChar == '\n' && end - it >= 5 && !qstrncmp( "From ", it, 5 ) ) + if ( prevChar == '\n' && end - it >= 5 && !tqstrncmp( "From ", it, 5 ) ) mLeadingFrom = true; ++printable; break; diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h index e85e063bc..8f2c8bda7 100644 --- a/libkmime/kmime_charfreq.h +++ b/libkmime/kmime_charfreq.h @@ -37,7 +37,7 @@ public: /** Returns true if buf has trailing whitespace, i.e. if any line ends with space (' ') or tab ('\t'). */ bool hasTrailingWhitespace() const; - /** Returns true if buf contains a line that starts with "From ". */ + /** Returns true if buf tqcontains a line that starts with "From ". */ bool hasLeadingFrom() const; /** Returns the percentage of printable characters: printable/total. If total == 0, the result is undefined. */ diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h index 3ff0c4a42..211867bca 100644 --- a/libkmime/kmime_codecs.h +++ b/libkmime/kmime_codecs.h @@ -87,7 +87,7 @@ public: * This function doesn't support chaining of blocks. The returned * block cannot be added to, but you don't need to finalize it, too. * - * Example usage (@p in contains the input data): + * Example usage (@p in tqcontains the input data): * 

        * KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
    * kdFatal( !codec ) << "no base64 codec found!?" << endl;
@@ -123,7 +123,7 @@ public:
    * This function doesn't support chaining of blocks. The returned
    * block cannot be added to, but you don't need to finalize it, too.
    *
-   * Example usage (@p in contains the input data):
+   * Example usage (@p in tqcontains the input data):
    * 
        * KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
    * kdFatal( !codec ) << "no base64 codec found!?" << endl;
@@ -230,7 +230,7 @@ public:
  * the output and then delete the decoder instance. If you want to
  * process another input block sequence, you create a new instance.
  *
- * Typical usage (@p in contains the (base64-encoded) input data),
+ * Typical usage (@p in tqcontains the (base64-encoded) input data),
  * taking into account all the conventions detailed above:
  *
  * 
    diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp
index 6eca383fa..b6b6229f0 100644
--- a/libkmime/kmime_content.cpp
+++ b/libkmime/kmime_content.cpp
@@ -313,9 +313,9 @@ TQCString Content::encodedContent(bool useCrLf)
 
     // add proper mime headers...
     if (convertNonMimeBinaries) {
-      h_ead.replace(TQRegExp("MIME-Version: .*\\n"),"");
-      h_ead.replace(TQRegExp("Content-Type: .*\\n"),"");
-      h_ead.replace(TQRegExp("Content-Transfer-Encoding: .*\\n"),"");
+      h_ead.tqreplace(TQRegExp("MIME-Version: .*\\n"),"");
+      h_ead.tqreplace(TQRegExp("Content-Type: .*\\n"),"");
+      h_ead.tqreplace(TQRegExp("Content-Transfer-Encoding: .*\\n"),"");
       h_ead+="MIME-Version: 1.0\n";
       h_ead+=contentType(true)->as7BitString()+"\n";
       h_ead+=contentTransferEncoding(true)->as7BitString()+"\n";
@@ -327,7 +327,7 @@ TQCString Content::encodedContent(bool useCrLf)
   e+="\n";
 
   //body
-  if(!b_ody.isEmpty()) { //this message contains only one part
+  if(!b_ody.isEmpty()) { //this message tqcontains only one part
     Headers::CTEncoding *enc=contentTransferEncoding();
 
     if(enc->needToEncode()) {
@@ -439,25 +439,25 @@ void Content::decodedText(TQStringList &l, bool trimText,
   if(!decodeText()) //this is not a text content !!
     return;
 
-  TQString unicode;
+  TQString tqunicode;
   bool ok=true;
 
   TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok);
 
-  unicode=codec->toUnicode(b_ody.data(), b_ody.length());
+  tqunicode=codec->toUnicode(b_ody.data(), b_ody.length());
 
   if (trimText && removeTrailingNewlines) {
     int i;
-    for (i=unicode.length()-1; i>=0; i--)
-      if (!unicode[i].isSpace())
+    for (i=tqunicode.length()-1; i>=0; i--)
+      if (!tqunicode[i].isSpace())
         break;
-    unicode.truncate(i+1);
+    tqunicode.truncate(i+1);
   } else {
-    if (unicode.right(1)=="\n")
-      unicode.truncate(unicode.length()-1);    // remove trailing new-line
+    if (tqunicode.right(1)=="\n")
+      tqunicode.truncate(tqunicode.length()-1);    // remove trailing new-line
   }
 
-  l=TQStringList::split('\n', unicode, true); //split the string at linebreaks
+  l=TQStringList::split('\n', tqunicode, true); //split the string at linebreaks
 }
 
 
@@ -630,7 +630,7 @@ void Content::changeEncoding(Headers::contentEncoding e)
 
   if(decodeText())
     enc->setCte(e); // text is not encoded until it's sent or saved so we just set the new encoding
-  else { // this content contains non textual data, that has to be re-encoded
+  else { // this content tqcontains non textual data, that has to be re-encoded
 
     if(e!=Headers::CEbase64) {
       //kdWarning(5003) << "Content::changeEncoding() : non textual data and encoding != base64 - this should not happen\n => forcing base64" << endl;
@@ -652,7 +652,7 @@ void Content::toStream(TQTextStream &ts, bool scrambleFromLines)
   TQCString ret=encodedContent(false);
 
   if (scrambleFromLines)
-    ret.replace(TQRegExp("\\n\\nFrom "), "\n\n>From ");
+    ret.tqreplace(TQRegExp("\\n\\nFrom "), "\n\n>From ");
 
   ts << ret;
 }
@@ -684,7 +684,7 @@ Headers::Generic*  Content::getNextHeader(TQCString &head)
     if (!folded)
       header = new Headers::Generic(head.left(pos1-2), this, head.mid(pos1, pos2-pos1));
     else
-      header = new Headers::Generic(head.left(pos1-2), this, head.mid(pos1, pos2-pos1).replace(TQRegExp("\\s*\\n\\s*")," "));
+      header = new Headers::Generic(head.left(pos1-2), this, head.mid(pos1, pos2-pos1).tqreplace(TQRegExp("\\s*\\n\\s*")," "));
 
     head.remove(0,pos2+1);
   }
@@ -816,8 +816,8 @@ int Content::lineCount()
 {
   int ret=0;
   if(type()==ATmimeContent)
-    ret+=h_ead.contains('\n');
-  ret+=b_ody.contains('\n');
+    ret+=h_ead.tqcontains('\n');
+  ret+=b_ody.tqcontains('\n');
 
   if(c_ontents && !c_ontents->isEmpty())
     for(Content *c=c_ontents->first(); c; c=c_ontents->next())
diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h
index 1d2aac2d3..8c828500f 100644
--- a/libkmime/kmime_content.h
+++ b/libkmime/kmime_content.h
@@ -35,7 +35,7 @@ namespace KMime {
 
 
 /** Base class for messages in mime format
-    It contains all the enums, static functions
+    It tqcontains all the enums, static functions
     and parser-classes, that are needed for
     mime handling */
 
@@ -110,7 +110,7 @@ class KDE_EXPORT Content : public Base {
     void changeEncoding(Headers::contentEncoding e);
 
     //saves the encoded content to the given textstream
-    // scrambleFromLines: replace "\nFrom " with "\n>From ", this is
+    // scrambleFromLines: tqreplace "\nFrom " with "\n>From ", this is
     // needed to avoid problem with mbox-files
     void toStream(TQTextStream &ts, bool scrambleFromLines=false);
 
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 9222ff914..6b06c9038 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -256,7 +256,7 @@ bool parseAtom( const char * & scursor, const char * const send,
   QPair maybeResult;
 
   if ( parseAtom( scursor, send, maybeResult, allow8Bit ) ) {
-    result += TQString::fromLatin1( maybeResult.first, maybeResult.second );
+    result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
     return true;
   }
 
@@ -296,7 +296,7 @@ bool parseToken( const char * & scursor, const char * const send,
   QPair maybeResult;
 
   if ( parseToken( scursor, send, maybeResult, allow8Bit ) ) {
-    result += TQString::fromLatin1( maybeResult.first, maybeResult.second );
+    result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
     return true;
   }
 
@@ -1065,9 +1065,9 @@ bool parseAddressList( const char* & scursor, const char * const send,
 }
 
 
-static TQString asterisk = TQString::fromLatin1("*0*",1);
-static TQString asteriskZero = TQString::fromLatin1("*0*",2);
-//static TQString asteriskZeroAsterisk = TQString::fromLatin1("*0*",3);
+static TQString asterisk = TQString::tqfromLatin1("*0*",1);
+static TQString asteriskZero = TQString::tqfromLatin1("*0*",2);
+//static TQString asteriskZeroAsterisk = TQString::tqfromLatin1("*0*",3);
 
 bool parseParameter( const char* & scursor, const char * const send,
 		     QPair & result, bool isCRLF ) {
@@ -1223,7 +1223,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
       // take the whole value to be in latin-1:
       KMIME_WARN << "No charset in extended-initial-value. "
 	"Assuming \"iso-8859-1\"." << endl;
-      value += TQString::fromLatin1( decBegin, source.second );
+      value += TQString::tqfromLatin1( decBegin, source.second );
       return;
     }
 
@@ -1263,7 +1263,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
   }
 
   if ( !textcodec ) {
-    value += TQString::fromLatin1( decCursor, decEnd - decCursor );
+    value += TQString::tqfromLatin1( decCursor, decEnd - decCursor );
     return;
   }
 
@@ -1348,7 +1348,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       } else {
 	// not encoded.
 	if ( (*it).qpair.first )
-	  value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second );
+	  value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second );
 	else
 	  value += (*it).qstring;
       }
@@ -1377,7 +1377,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       } else {
 	// not encoded
 	if ( (*it).qpair.first )
-	  value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second );
+	  value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second );
 	else
 	  value += (*it).qstring;
       }
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index 699b56e10..10751f034 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -94,7 +94,7 @@ namespace HeaderParsing {
 	           to and including the encoding specifier. The
 		   encoded-text is quite generously parsed and @p ok
 		   is still set to @p true when e.g. the encoded-word
-		   appears to be truncated or contains whitespace.
+		   appears to be truncated or tqcontains whitespace.
       @return the decoded string the encoded word represented.
   */
   bool parseEncodedWord( const char* & scursor, const char * const send,
diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp
index d4557c122..cef3f7a4c 100644
--- a/libkmime/kmime_headers.cpp
+++ b/libkmime/kmime_headers.cpp
@@ -529,7 +529,7 @@ void MessageID::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString MessageID::asUnicodeString()
 {
-  return TQString::fromLatin1(m_id);
+  return TQString::tqfromLatin1(m_id);
 }
 
 
@@ -567,7 +567,7 @@ void Control::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString Control::asUnicodeString()
 {
-  return TQString::fromLatin1(c_trlMsg);
+  return TQString::tqfromLatin1(c_trlMsg);
 }
 
 //-----------------------------------
@@ -797,7 +797,7 @@ void Date::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString Date::asUnicodeString()
 {
-  return TQString::fromLatin1(as7BitString(false));
+  return TQString::tqfromLatin1(as7BitString(false));
 }
 
 
@@ -811,7 +811,7 @@ TQDateTime Date::qdt()
 
 int Date::ageInDays()
 {
-  TQDate today=TQDate::currentDate();
+  TQDate today=TQDate::tqcurrentDate();
   return ( qdt().date().daysTo(today) );
 }
 
@@ -1075,7 +1075,7 @@ void References::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString References::asUnicodeString()
 {
-  return TQString::fromLatin1(r_ef);
+  return TQString::tqfromLatin1(r_ef);
 }
 
 
@@ -1221,7 +1221,7 @@ void UserAgent::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString UserAgent::asUnicodeString()
 {
-  return TQString::fromLatin1(u_agent);
+  return TQString::tqfromLatin1(u_agent);
 }
 
 //---------------------------------
@@ -1268,7 +1268,7 @@ void ContentType::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString ContentType::asUnicodeString()
 {
-  return TQString::fromLatin1(as7BitString(false));
+  return TQString::tqfromLatin1(as7BitString(false));
 }
 
 
@@ -1544,7 +1544,7 @@ void CTEncoding::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString CTEncoding::asUnicodeString()
 {
-  return TQString::fromLatin1(as7BitString(false));
+  return TQString::tqfromLatin1(as7BitString(false));
 }
 
 //--------------------------------
diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h
index 2ba0e1b8d..1c980a040 100644
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@@ -239,7 +239,7 @@ private:
 };
 
 /** This is the base class for all structured header fields. It
-    contains parsing methods for all basic token types found in
+    tqcontains parsing methods for all basic token types found in
     rfc2822.
 
     @section Parsing
diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp
index 75f1a91e9..702f5f811 100644
--- a/libkmime/kmime_mdn.cpp
+++ b/libkmime/kmime_mdn.cpp
@@ -240,9 +240,9 @@ namespace MDN {
     // headers that are only present for certain disposition {types,modifiers}:
     if ( d == Failed )
       result += "Failure: " + encodeRFC2047String( spec, "utf-8" ) + "\n";
-    else if ( m.contains( Error ) )
+    else if ( m.tqcontains( Error ) )
       result += "Error: " + encodeRFC2047String( spec, "utf-8" ) + "\n";
-    else if ( m.contains( Warning ) )
+    else if ( m.tqcontains( Warning ) )
       result += "Warning: " + encodeRFC2047String( spec, "utf-8" ) + "\n";
 
     return result;
diff --git a/libkmime/kmime_parsers.cpp b/libkmime/kmime_parsers.cpp
index 6527c9912..446f1af7c 100644
--- a/libkmime/kmime_parsers.cpp
+++ b/libkmime/kmime_parsers.cpp
@@ -149,11 +149,11 @@ bool UUEncoded::parse()
 
   while (success) {
     int beginPos=currentPos, uuStart=currentPos, endPos=0, lineCount=0, MCount=0, pos=0, len=0;
-    bool containsBegin=false, containsEnd=false;
+    bool tqcontainsBegin=false, tqcontainsEnd=false;
     TQCString tmp,fileName;
 
     if( (beginPos=s_rc.find(TQRegExp("begin [0-9][0-9][0-9]"),currentPos))>-1 && (beginPos==0 || s_rc.at(beginPos-1)=='\n') ) {
-      containsBegin=true;
+      tqcontainsBegin=true;
       uuStart=s_rc.find('\n', beginPos);
       if(uuStart==-1) {//no more line breaks found, we give up
         success = false;
@@ -166,9 +166,9 @@ bool UUEncoded::parse()
     if ( (endPos=s_rc.find("\nend",(uuStart>0)? uuStart-1:0))==-1 )
       endPos=s_rc.length(); //no end found
     else
-      containsEnd=true;
+      tqcontainsEnd=true;
 
-    if ((containsBegin && containsEnd) || firstIteration) {
+    if ((tqcontainsBegin && tqcontainsEnd) || firstIteration) {
 
       //printf("beginPos=%d , uuStart=%d , endPos=%d\n", beginPos, uuStart, endPos);
       //all lines in a uuencoded text start with 'M'
@@ -183,12 +183,12 @@ bool UUEncoded::parse()
 
       //printf("lineCount=%d , MCount=%d\n", lineCount, MCount);
       if( MCount==0 || (lineCount-MCount)>10 ||
-          ((!containsBegin || !containsEnd) && (MCount<15)) ) {  // harder check for splitted-articles
+          ((!tqcontainsBegin || !tqcontainsEnd) && (MCount<15)) ) {  // harder check for splitted-articles
         success = false;
         break; //too many "non-M-Lines" found, we give up
       }
 
-      if( (!containsBegin || !containsEnd) && s_ubject) {  // message may be split up => parse subject
+      if( (!tqcontainsBegin || !tqcontainsEnd) && s_ubject) {  // message may be split up => parse subject
 	TQRegExp rx("[0-9]+/[0-9]+");
 	pos=rx.search(TQString(s_ubject), 0);
 	len=rx.matchedLength();
@@ -207,7 +207,7 @@ bool UUEncoded::parse()
       if(beginPos>0)
         t_ext.append(s_rc.mid(currentPos,beginPos-currentPos));
 
-      if(containsBegin)
+      if(tqcontainsBegin)
         fileName = s_rc.mid(beginPos+10, uuStart-beginPos-11); //everything between "begin ### " and the next LF is considered as the filename
       else
         fileName = "";
@@ -281,7 +281,7 @@ bool YENCEncoded::parse()
 
   while (success) {
     int beginPos=currentPos, yencStart=currentPos;
-    bool containsPart=false;
+    bool tqcontainsPart=false;
     TQCString fileName,mimeType;
 
     if ((beginPos=s_rc.find("=ybegin ", currentPos))>-1 && ( beginPos==0 || s_rc.at( beginPos-1)=='\n') ) {
@@ -292,7 +292,7 @@ bool YENCEncoded::parse()
       } else {
         yencStart++;
         if (s_rc.find("=ypart", yencStart)==yencStart) {
-          containsPart=true;
+          tqcontainsPart=true;
           yencStart=s_rc.find( '\n', yencStart);
           if ( yencStart== -1) {
             success=false;
@@ -332,7 +332,7 @@ bool YENCEncoded::parse()
       }
 
       int partBegin, partEnd;
-      if (containsPart) {
+      if (tqcontainsPart) {
         if (!yencMeta(meta, "part", &p_artNr)) {
           success=false;
           break;
@@ -355,7 +355,7 @@ bool YENCEncoded::parse()
       int len=s_rc.length();
       bool lineStart=true;
       int lineLength=0;
-      bool containsEnd=false;
+      bool tqcontainsEnd=false;
       TQByteArray binary = TQByteArray(yencSize);
       while (pos@,.;:[]=\").
       @param str us-ascii string to work on.
       @param forceQuotes if @p true, always add quote characters.
diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp
index 7087a01a6..e3a40f812 100644
--- a/libkmime/tests/test_dates.cpp
+++ b/libkmime/tests/test_dates.cpp
@@ -80,14 +80,14 @@ main()
 							  "Z MMMM dddd yyyy") <decode( infile_buffer, withCRLF );
   if ( writing ) {
-    Q_LONG written = outfile.writeBlock( out );
-    assert( written == (Q_LONG)out.size() );
+    TQ_LONG written = outfile.writeBlock( out );
+    assert( written == (TQ_LONG)out.size() );
   }
 }
 
@@ -304,8 +304,8 @@ void encode_decode_kio( bool encode, const Codec * codec,
     else
       decode_kio_internal( dec, iit, iend, out );
     if ( writing && out.size() ) {
-      Q_LONG written = outfile.writeBlock( out );
-      assert( written == (Q_LONG)out.size() );
+      TQ_LONG written = outfile.writeBlock( out );
+      assert( written == (TQ_LONG)out.size() );
     }
   } while ( out.size() );
 
@@ -329,7 +329,7 @@ void encode_decode_chunkwise( bool encode, const Codec * codec,
 #define write_full_outdata_then_reset  do { \
      kdDebug( verbose ) << "  flushing output buffer." << endl; \
      if ( writing ) { \
-       Q_LONG outlen = outfile.writeBlock( outdata.data(), \
+       TQ_LONG outlen = outfile.writeBlock( outdata.data(), \
 					   outdata.size() ); \
        if ( outlen != (int)outdata.size() ) \
          exit(OUTFILE_WRITE_ERR); \
@@ -432,7 +432,7 @@ void encode_decode_chunkwise( bool encode, const Codec * codec,
   // Write out last (partial) output chunk:
   //
   if ( writing ) {
-    Q_LONG outlen = outfile.writeBlock( outdata.data(),
+    TQ_LONG outlen = outfile.writeBlock( outdata.data(),
 					oit - outdata.begin() );
     if ( outlen != oit - outdata.begin() )
       exit(OUTFILE_WRITE_ERR);
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 8a9c68989..53b77913f 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -313,7 +313,7 @@ Module::clearsign( Block& block,
 
 Kpgp::Result
 Module::encrypt( Block& block,
-                 const TQStringList& receivers, const KeyID& keyId,
+                 const TQStringList& tqreceivers, const KeyID& keyId,
                  bool sign, const TQCString& charset )
 {
   KeyIDList encryptionKeyIds; // list of keys which are used for encryption
@@ -324,8 +324,8 @@ Module::encrypt( Block& block,
 
   setUser( keyId );
 
-  if( !receivers.empty() ) {
-    Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers,
+  if( !tqreceivers.empty() ) {
+    Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers,
                                              keyId );
     if( Kpgp::Ok != result ) {
       return result;
@@ -1705,7 +1705,7 @@ Module::keysForAddress( const TQString& address )
     return KeyIDList();
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     return addressDataDict[addr].keyIds;
   }
   else {
@@ -1720,7 +1720,7 @@ Module::setKeysForAddress( const TQString& address, const KeyIDList& keyIds )
     return;
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     addressDataDict[addr].keyIds = keyIds;
   }
   else {
@@ -1782,7 +1782,7 @@ EncryptPref
 Module::encryptionPreference( const TQString& address )
 {
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     return addressDataDict[addr].encrPref;
   }
   else {
@@ -1798,7 +1798,7 @@ Module::setEncryptionPreference( const TQString& address,
     return;
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     addressDataDict[addr].encrPref = pref;
   }
   else {
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index e36f07fdf..ec937015b 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -123,7 +123,7 @@ public:
       Ok       if everything is o.k.
   */
   Kpgp::Result encrypt( Block& block,
-                const TQStringList& receivers, const KeyID& keyId,
+                const TQStringList& tqreceivers, const KeyID& keyId,
                 bool sign, const TQCString& charset = 0 );
 
   /** Determines the keys which should be used for encrypting the message
@@ -308,7 +308,7 @@ public:
 
   /** Parses the given message and splits it into OpenPGP blocks and
       Non-OpenPGP blocks.
-      Returns TRUE if the message contains at least one OpenPGP block and
+      Returns TRUE if the message tqcontains at least one OpenPGP block and
       FALSE otherwise.
       The format is then:
       
    diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp
index 157c73e3b..ec2ffd126 100644
--- a/libkpgp/kpgpbase.cpp
+++ b/libkpgp/kpgpbase.cpp
@@ -70,7 +70,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExitStatus;
+  int childExiStatus;
   struct pollfd pollin, pollout, pollerr;
   int pollstatus;
 
@@ -251,8 +251,8 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
 
   do {
     //kdDebug(5100) << "Checking if PGP is still running..." << endl;
-    childExitStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExitStatus, WNOHANG);
+    childExiStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
     //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
     if (pout[0] >= 0) {
       do {
@@ -351,14 +351,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
     close(ppass[0]);
 
   // Did the child exit normally?
-  if (WIFEXITED(childExitStatus) != 0) {
+  if (WIFEXITED(childExiStatus) != 0) {
     // Get the return code of the child
-    childExitStatus = WEXITSTATUS(childExitStatus);
-    kdDebug(5100) << "PGP exited with exit status " << childExitStatus
+    childExiStatus = WEXITSTATUS(childExiStatus);
+    kdDebug(5100) << "PGP exited with exit status " << childExiStatus
                   << endl;
   }
   else {
-    childExitStatus = -1;
+    childExiStatus = -1;
     kdDebug(5100) << "PGP exited abnormally!" << endl;
   }
 
@@ -371,7 +371,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
    */
   kdDebug(5100) << error << endl;
 
-  return childExitStatus;
+  return childExiStatus;
 }
 
 
@@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExitStatus;
+  int childExiStatus;
   char gpgcmd[1024] = "\0";
   struct pollfd poller[3];
   int num_pollers = 0;
@@ -529,8 +529,8 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
 
   do {
     //kdDebug(5100) << "Checking if GnuPG is still running..." << endl;
-    childExitStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExitStatus, WNOHANG);
+    childExiStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
     //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
     do {
       // poll the pipes
@@ -645,14 +645,14 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
     close(ppass[0]);
 
   // Did the child exit normally?
-  if (WIFEXITED(childExitStatus) != 0) {
+  if (WIFEXITED(childExiStatus) != 0) {
     // Get the return code of the child
-    childExitStatus = WEXITSTATUS(childExitStatus);
-    kdDebug(5100) << "GnuPG exited with exit status " << childExitStatus
+    childExiStatus = WEXITSTATUS(childExiStatus);
+    kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus
                   << endl;
   }
   else {
-    childExitStatus = -1;
+    childExiStatus = -1;
     kdDebug(5100) << "GnuPG exited abnormally!" << endl;
   }
 
@@ -663,7 +663,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   // get to know what's going on during the gpg calls.
   kdDebug(5100) << "gpg stderr:\n" << error << endl;
 
-  return childExitStatus;
+  return childExiStatus;
 }
 
 
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 301470b76..06c0d1e60 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -66,7 +66,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = PGP2 " +batchmode +language=en +verbose=1 -seat";
@@ -100,12 +100,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exitStatus = run(cmd.data(), passphrase);
+  exiStatus = run(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus != 0)
+  if(exiStatus != 0)
     status = ERROR;
 
 #if 0
@@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -227,11 +227,11 @@ int
 Base2::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+  exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
@@ -249,16 +249,16 @@ Base2::decrypt( Block& block, const char *passphrase )
     index1 = input.find('\n', index1);
     index2 = input.find("\n\n", index1);
     input.remove(index1, index2 - index1);
-    exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+    exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
     if( !output.isEmpty() )
       block.setProcessedText( output );
     block.setError( error );
   }
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
-  exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
+  exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
                     keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
+    exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
                       0, true );
 
-    if(exitStatus != 0) {
+    if(exiStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns )
 KeyList
 Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
   KeyList publicKeys;
 
   status = 0;
   if ( patterns.isEmpty() ) {
-    exitStatus = run( cmd, 0, true );
+    exiStatus = run( cmd, 0, true );
 
-    if ( exitStatus != 0 ) {
+    if ( exiStatus != 0 ) {
       status = ERROR;
       return KeyList();
     }
@@ -533,10 +533,10 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 
     for ( TQStringList::ConstIterator it = patterns.begin();
           it != patterns.end(); ++it ) {
-      exitStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+      exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
                         0, true );
 
-      if ( exitStatus != 0 ) {
+      if ( exiStatus != 0 ) {
         status = ERROR;
         return KeyList();
       }
@@ -547,7 +547,7 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
       // put all new keys into a map, remove duplicates
       while ( !publicKeys.isEmpty() ) {
         Key * key = publicKeys.take( 0 );
-        if ( !map.contains( key->primaryFingerprint() ) )
+        if ( !map.tqcontains( key->primaryFingerprint() ) )
           map.insert( key->primaryFingerprint(), key );
         else
           delete key;
@@ -576,16 +576,16 @@ int
 Base2::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   cmd = PGP2 " +batchmode +language=en -ks -f ";
   cmd += addUserId();
   cmd += " 0x" + keyID;
 
   status = 0;
-  exitStatus = run(cmd.data(),passphrase);
+  exiStatus = run(cmd.data(),passphrase);
 
-  if (exitStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase)
 
 TQCString Base2::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
+  exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
                     0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -646,7 +646,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
 
     if( !strncmp( output.data() + index, "pub", 3 ) ||
         !strncmp( output.data() + index, "sec", 3 ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example 1 (nothing special):
       // pub  1024/E2D074D3 2001/09/09 Test Key 
       // Example 2 (disabled key):
@@ -737,7 +737,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
       }
     }
     else if( output[index] == ' ' )
-    { // line contains additional key data
+    { // line tqcontains additional key data
 
       if( key == 0 )
         break;
@@ -748,20 +748,20 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line contains a fingerprint
+      { // line tqcontains a fingerprint
         // Example:
         //             Key fingerprint = 47 30 7C 76 05 BF 5E FB  72 41 00 F2 7D 0B D0 49
 
         TQCString fingerprint = output.mid( pos, index2-pos );
         // remove white space from the fingerprint
 	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	  fingerprint.replace( idx, 1, "" );
+	  fingerprint.tqreplace( idx, 1, "" );
 
         subkey->setFingerprint( fingerprint );
       }
       else if( !strncmp( output.data() + pos, "Expire: ", 8 ) ||
                !strncmp( output.data() + pos, "no expire ", 10 ) )
-      { // line contains additional key properties
+      { // line tqcontains additional key properties
         // Examples:
         //            Expire: 2001/09/10
         //                     no expire ENCRyption only
@@ -801,7 +801,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
         }
       }
       else
-      { // line contains an additional user id
+      { // line tqcontains an additional user id
         // Example:
         //                               Test key (2nd user ID) 
 
@@ -854,7 +854,7 @@ Base2::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[index+21] != ' ' )
-    { // line contains a validity value for a user ID
+    { // line tqcontains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
@@ -927,7 +927,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
 
     if( !strncmp( output.data() + index, "pub", 3 ) ||
         !strncmp( output.data() + index, "sec", 3 ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example 1:
       // pub  1024/E2D074D3 2001/09/09 Test Key 
       // Example 2 (disabled key):
@@ -1017,7 +1017,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
       }
     }
     else if( output[index] == ' ' )
-    { // line contains additional key data
+    { // line tqcontains additional key data
 
       if( key == 0 )
         break;
@@ -1027,7 +1027,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line contains a fingerprint
+      { // line tqcontains a fingerprint
         // Example:
         //             Key fingerprint = 47 30 7C 76 05 BF 5E FB  72 41 00 F2 7D 0B D0 49
 
@@ -1036,13 +1036,13 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         TQCString fingerprint = output.mid( pos, index2-pos );
         // remove white space from the fingerprint
 	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	  fingerprint.replace( idx, 1, "" );
+	  fingerprint.tqreplace( idx, 1, "" );
 
         subkey->setFingerprint( fingerprint );
       }
       else if( !strncmp( output.data() + pos, "Expire: ", 8 ) ||
                !strncmp( output.data() + pos, "no expire ", 10 ) )
-      { // line contains additional key properties
+      { // line tqcontains additional key properties
         // Examples:
         //            Expire: 2001/09/10
         //                     no expire ENCRyption only
@@ -1082,7 +1082,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         }
       }
       else
-      { // line contains an additional user id
+      { // line tqcontains an additional user id
         // Example:
         //                               Test key (2nd user ID) 
 
diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index 21ca1dc47..a5988a9cb 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
   int index;
   // used to work around a bug in pgp5. pgp5 treats files
   // with non ascii chars (umlauts, etc...) as binary files, but
@@ -112,14 +112,14 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
   if (signonly)
   {
     input.append("\n");
-    input.replace(TQRegExp("[ \t]+\n"), "\n");   //strip trailing whitespace
+    input.tqreplace(TQRegExp("[ \t]+\n"), "\n");   //strip trailing whitespace
   }
   //We have to do this otherwise it's all in vain
 
-  exitStatus = run(cmd.data(), passphrase);
+  exiStatus = run(cmd.data(), passphrase);
   block.setError( error );
 
-  if(exitStatus != 0)
+  if(exiStatus != 0)
     status = ERROR;
 
   // now parse the returned info
@@ -179,13 +179,13 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
     if (input[0] == '-')
       input = "- " + input;
     for ( int idx = 0 ; (idx = input.find("\n-", idx)) >= 0 ; idx += 4 )
-      input.replace(idx, 2, "\n- -");
+      input.tqreplace(idx, 2, "\n- -");
 
     output = "-----BEGIN PGP SIGNED MESSAGE-----\n\n" + input + "\n" + output;
   }
 
   block.setProcessedText( output );
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
 int
 Base5::decrypt( Block& block, const char *passphrase )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = run("pgpv -f +batchmode=1", passphrase);
+  exiStatus = run("pgpv -f +batchmode=1", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("Error running PGP");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase )
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase )
 Key*
 Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
-  exitStatus = run( "pgpk -ll 0x" + keyId, 0, true );
+  exiStatus = run( "pgpk -ll 0x" + keyId, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 
   if( readTrust )
   {
-    exitStatus = run( "pgpk -c 0x" + keyId, 0, true );
+    exiStatus = run( "pgpk -c 0x" + keyId, 0, true );
 
-    if(exitStatus != 0) {
+    if(exiStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 KeyList
 Base5::publicKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   TQCString cmd = "pgpk -ll";
   for ( TQStringList::ConstIterator it = patterns.begin();
@@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = run( cmd, 0, true );
+  exiStatus = run( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns )
 KeyList
 Base5::secretKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
   TQCString cmd = "pgpk -ll";
@@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = run( cmd, 0, true );
+  exiStatus = run( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns )
 
 TQCString Base5::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitStatus = run( "pgpk -xa 0x" + keyID, 0, true );
+  exiStatus = run( "pgpk -xa 0x" + keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -436,7 +436,7 @@ int
 Base5::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if(passphrase == 0) return false;
 
@@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase)
   cmd += addUserId();
 
   status = 0;
-  exitStatus = run(cmd.data(), passphrase);
+  exiStatus = run(cmd.data(), passphrase);
 
-  if (exitStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -492,7 +492,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     if( !strncmp( output.data() + offset, "pub", 3 ) ||
         !strncmp( output.data() + offset, "sec", 3 ) ||
         !strncmp( output.data() + offset, "sub", 3 ) )
-    { // line contains key data
+    { // line tqcontains key data
       //kdDebug(5100)<<"Key data:\n";
       int pos, pos2;
 
@@ -579,7 +579,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
           subkey->setCreationDate( epoch.secsTo( dt ) );
           // has the key already expired?
-          if( TQDateTime::currentDateTime() >= dt )
+          if( TQDateTime::tqcurrentDateTime() >= dt )
           {
             subkey->setExpired( true );
             key->setExpired( true );
@@ -647,7 +647,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     }
     else if( !strncmp( output.data() + offset, "f16", 3 ) ||
              !strncmp( output.data() + offset, "f20", 3 ) )
-    { // line contains a fingerprint
+    { // line tqcontains a fingerprint
       /* Examples:
          f16    Fingerprint16 = DE 2A 77 08 78 64 7C 42  72 75 B1 A7 3E 42 3F 79
          f20    Fingerprint20 = 226F 4B63 6DA2 7389 91D1  2A49 D58A 3EC1 5214 181E
@@ -657,13 +657,13 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       TQCString fingerprint = output.mid( pos, eol-pos );
       // remove white space from the fingerprint
       for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	fingerprint.replace( idx, 1, "" );
+	fingerprint.tqreplace( idx, 1, "" );
       assert( subkey != 0 );
       subkey->setFingerprint( fingerprint );
       //kdDebug(5100)<<"Fingerprint: "<addUserID( uid );
@@ -678,7 +678,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     else if ( !strncmp( output.data() + offset, "sig", 3 ) ||
               !strncmp( output.data() + offset, "SIG", 3 ) ||
               !strncmp( output.data() + offset, "ret", 3 ) )
-    { // line contains a signature
+    { // line tqcontains a signature
       // SIG = sig with own key; ret = sig with revoked key
       // we ignore it for now
     }
@@ -792,7 +792,7 @@ Base5::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[offset+23] != ' ' )
-    { // line contains a validity value for a user ID
+    { // line tqcontains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp
index 6ee6af221..fba6d4ec7 100644
--- a/libkpgp/kpgpbase6.cpp
+++ b/libkpgp/kpgpbase6.cpp
@@ -49,19 +49,19 @@ int
 Base6::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
+  exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
-  exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
+  exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
                     "0x" + keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
+    exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
                       "0x" + keyID, 0, true );
 
-    if(exitStatus != 0) {
+    if(exiStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -238,13 +238,13 @@ QStrList
 Base6::pubKeys()
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
   int compatibleMode = 1;
 
   status = 0;
-  exitStatus = run("pgp +batchmode +language=C -kv -f");
+  exiStatus = run("pgp +batchmode +language=C -kv -f");
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -319,9 +319,9 @@ Base6::pubKeys()
   }
 
   // Also look for pgp key groups
-  exitStatus = run("pgp +batchmode +language=C -gv -f");
+  exiStatus = run("pgp +batchmode +language=C -gv -f");
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns )
 int
 Base6::isVersion6()
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
-  exitStatus = run( PGP6, 0, true );
+  exiStatus = run( PGP6, 0, true );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
     return 0;
@@ -406,7 +406,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
 
     if( firstLine && ( !strncmp( output.data() + offset, "DSS", 3 ) ||
                        !strncmp( output.data() + offset, "RSA", 3 ) ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example 1:
       // RSA  1024      0xE2D074D3 2001/09/09 Test Key 
       // Example 2 (disabled key):
@@ -554,7 +554,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     else if( !strncmp( output.data() + offset, "DSS", 3 ) ||
              !strncmp( output.data() + offset, " DH", 3 ) ||
              !strncmp( output.data() + offset, "RSA", 3 ) )
-    { // line contains secondary key data (or data for the next key)
+    { // line tqcontains secondary key data (or data for the next key)
       if( fpr )
         break; // here begins the next key's data
       //kdDebug(5100)<<"Secondary key data:\n";
@@ -639,11 +639,11 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       canEncr = canEncr || encr;
     }
     else if( !strncmp( output.data() + offset, "Unknown type", 12 ) )
-    { // line contains key data of unknown type (ignored)
+    { // line tqcontains key data of unknown type (ignored)
       kdDebug(5100)<<"Unknown key type.\n";
     }
     else if( output[offset] == ' ' )
-    { // line contains additional key data
+    { // line tqcontains additional key data
       if( key == 0 )
         break;
       //kdDebug(5100)<<"Additional key data:\n";
@@ -653,7 +653,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line contains a fingerprint
+      { // line tqcontains a fingerprint
         // Example:
         //           Key fingerprint =  D0 6C BB 3A F5 16 82 C4  F3 A0 8A B3 7B 16 99 70
 
@@ -663,14 +663,14 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         TQCString fingerprint = output.mid( pos, eol-pos );
         // remove white space from the fingerprint
 	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	  fingerprint.replace( idx, 1, "" );
+	  fingerprint.tqreplace( idx, 1, "" );
 
         //kdDebug(5100)<<"Fingerprint: "<setFingerprint( fingerprint );
       }
       else
-      { // line contains an additional user id
+      { // line tqcontains an additional user id
         // Example:
         //                               Test key (2nd user ID) 
 
@@ -679,7 +679,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       }
     }
     else if( !strncmp( output.data() + offset, "sig", 3 ) )
-    { // line contains signature data (ignored)
+    { // line tqcontains signature data (ignored)
       //kdDebug(5100)<<"Signature.\n";
     }
     else // end of key data
@@ -804,7 +804,7 @@ Base6::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[offset+23] != ' ' )
-    { // line contains a validity value for a user ID
+    { // line tqcontains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index 768d5c023..5aa619ec6 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -73,7 +73,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = "--batch --armor --sign --encrypt --textmode";
@@ -109,12 +109,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exitStatus = runGpg(cmd.data(), passphrase);
+  exiStatus = runGpg(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if( exitStatus != 0 )
+  if( exiStatus != 0 )
   {
     // this error message is later hopefully overwritten
     errMsg = i18n( "Unknown error." );
@@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -208,19 +208,19 @@ int
 BaseG::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = runGpg("--batch --decrypt", passphrase);
+  exiStatus = runGpg("--batch --decrypt", passphrase);
   if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("Error running gpg");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
   if( readTrust )
-    exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
+    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
   else
-    exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
+    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID,
 KeyList
 BaseG::publicKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -417,9 +417,9 @@ BaseG::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = runGpg( cmd, 0, true );
+  exiStatus = runGpg( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns )
 KeyList
 BaseG::secretKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -449,9 +449,9 @@ BaseG::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = runGpg( cmd, 0, true );
+  exiStatus = runGpg( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -470,7 +470,7 @@ int
 BaseG::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   cmd = "--batch";
   cmd += addUserId();
@@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
   cmd += keyID;
 
   status = 0;
-  exitStatus = runGpg(cmd.data(), passphrase);
+  exiStatus = runGpg(cmd.data(), passphrase);
 
-  if (exitStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
 QCString
 BaseG::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
+  exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -542,7 +542,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     bool bIsPublicKey = false;
     if( ( bIsPublicKey = !strncmp( output.data() + index, "pub:", 4 ) )
         || !strncmp( output.data() + index, "sec:", 4 ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example: pub:f:1024:17:63CB691DFAEBD5FC:860451781::379:-:::scESC:
 
       // abort parsing if we found the start of the next key
@@ -657,7 +657,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       key->addSubkey( subkey );
     }
     else if( !strncmp( output.data() + index, "uid:", 4 ) )
-    { // line contains a user id
+    { // line tqcontains a user id
       // Example: uid:f::::::::Philip R. Zimmermann :
 
       UserID *userID = new UserID( "" );
@@ -710,19 +710,19 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           break;
         case 10: // User-ID
           TQCString uid = output.mid( pos, pos2-pos );
-          // replace "\xXX" with the corresponding character;
+          // tqreplace "\xXX" with the corresponding character;
           // other escaped characters, i.e. \n, \r etc., are ignored
           // because they shouldn't appear in user IDs
           for ( int idx = 0 ; (idx = uid.find( "\\x", idx )) >= 0 ; ++idx ) {
             char str[2] = "x";
             str[0] = (char) TQString( uid.mid( idx + 2, 2 ) ).toShort( 0, 16 );
-            uid.replace( idx, 4, str );
+            uid.tqreplace( idx, 4, str );
           }
           TQString uidString = TQString::fromUtf8( uid.data() );
           // check whether uid was utf-8 encoded
           bool isUtf8 = true;
           for ( unsigned int i = 0; i + 1 < uidString.length(); ++i ) {
-            if ( uidString[i].unicode() == 0xdbff &&
+            if ( uidString[i].tqunicode() == 0xdbff &&
                  uidString[i+1].row() == 0xde ) {
               // we found a non-Unicode character (see TQString::fromUtf8())
               isUtf8 = false;
@@ -778,7 +778,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
             else {
               // assume latin1 encoding
               kdDebug(5100) << "Assume latin1 encoding." << endl;
-              uidString = TQString::fromLatin1( uid.data() );
+              uidString = TQString::tqfromLatin1( uid.data() );
             }
           }
           userID->setText( uidString );
@@ -792,7 +792,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       key->addUserID( userID );
     }
     else if( !strncmp( output.data() + index, "fpr:", 4 ) )
-    { // line contains a fingerprint
+    { // line tqcontains a fingerprint
       // Example: fpr:::::::::17AFBAAF21064E513F037E6E63CB691DFAEBD5FC:
 
       if (key == 0) // invalid key data
diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp
index 015929c26..9d0a68055 100644
--- a/libkpgp/kpgpblock.cpp
+++ b/libkpgp/kpgpblock.cpp
@@ -122,7 +122,7 @@ Block::clearsign( const TQCString& keyId, const TQCString& charset )
 }
 
 Kpgp::Result
-Block::encrypt( const TQStringList& receivers, const TQCString& keyId,
+Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
                 const bool sign, const TQCString& charset )
 {
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
@@ -130,7 +130,7 @@ Block::encrypt( const TQStringList& receivers, const TQCString& keyId,
   if( pgp == 0 )
     return Kpgp::Failure;
 
-  return pgp->encrypt( *this, receivers, keyId, sign, charset );
+  return pgp->encrypt( *this, tqreceivers, keyId, sign, charset );
 }
 
 } // namespace Kpgp
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index a85dcea65..c741062a8 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -103,7 +103,7 @@ class KDE_EXPORT Block
   void setProcessedText( const TQCString& str );
 
   int status() const;
-  void setStatus( const int status );
+  void seStatus( const int status );
 
   BlockType type();
 
@@ -169,7 +169,7 @@ class KDE_EXPORT Block
       false  if there was an unresolvable error or if encryption was canceled
       true   if everything is o.k.
   */
-  Kpgp::Result encrypt( const TQStringList& receivers, const TQCString& keyId,
+  Kpgp::Result encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
                 const bool sign, const TQCString& charset = TQCString() );
 
  private:
@@ -235,7 +235,7 @@ Block::status() const
 }
 
 inline void
-Block::setStatus( const int status )
+Block::seStatus( const int status )
 {
   mStatus = status;
 }
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index e0d5bee27..294560465 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -115,7 +115,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   group = new TQVGroupBox( i18n("Warning"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
   // (mmutz) work around Qt label bug in 3.0.0 (and possibly later):
   // 1. Don't use rich text: No ...
   label = new TQLabel( i18n("Please check if encryption really "
@@ -126,13 +126,13 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   labelFont.setBold( true );
   label->setFont( labelFont );
   // 3. and activate wordwarp:
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
   // end; to remove the workaround, add .. around the
-  // text and remove lines TQFont... -> label->setAlignment(...).
+  // text and remove lines TQFont... -> label->tqsetAlignment(...).
   topLayout->addWidget( group );
 
   group = new TQVGroupBox( i18n("Encryption Tool"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   TQHBox * hbox = new TQHBox( group );
   label = new TQLabel( i18n("Select encryption tool to &use:"), hbox );
@@ -153,7 +153,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   topLayout->addWidget( group );
 
   mpOptionsGroupBox = new TQVGroupBox( i18n("Options"), this );
-  mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() );
+  mpOptionsGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
   storePass = new TQCheckBox( i18n("&Keep passphrase in memory"),
                              mpOptionsGroupBox );
   connect( storePass, TQT_SIGNAL( toggled( bool ) ),
@@ -1176,7 +1176,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
   // the button to unset any key:
   mEraseButton = new TQPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setPixmap( SmallIcon( "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -1192,7 +1192,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
   connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
   connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
 }
 
@@ -1480,21 +1480,21 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
   // calculate the optimal width for the dialog
   int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + bigvbox->sizeHint().width()
-                  + sv->verticalScrollBar()->sizeHint().width()
+                  + bigvbox->tqsizeHint().width()
+                  + sv->verticalScrollBar()->tqsizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
   // calculate the optimal height for the dialog
   int dialogHeight = marginHint()
-                   + label->sizeHint().height()
+                   + label->tqsizeHint().height()
                    + topLayout->spacing()
                    + sv->frameWidth()
-                   + bigvbox->sizeHint().height()
-                   + sv->horizontalScrollBar()->sizeHint().height()
+                   + bigvbox->tqsizeHint().height()
+                   + sv->horizontalScrollBar()->tqsizeHint().height()
                    + sv->frameWidth()
                    + topLayout->spacing()
-                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
                    + marginHint()
                    + 2;
   // don't make the dialog too large
@@ -1630,26 +1630,26 @@ CipherTextDialog::CipherTextDialog( const TQCString & text,
   mEditBox->setReadOnly(true);
   topLayout->addWidget( mEditBox, 10 );
 
-  TQString unicodeText;
+  TQString tqunicodeText;
   if (charset.isEmpty())
-    unicodeText = TQString::fromLocal8Bit(text.data());
+    tqunicodeText = TQString::fromLocal8Bit(text.data());
   else {
     bool ok=true;
     TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok);
     if(!ok)
-      unicodeText = TQString::fromLocal8Bit(text.data());
+      tqunicodeText = TQString::fromLocal8Bit(text.data());
     else
-      unicodeText = codec->toUnicode(text.data(), text.length());
+      tqunicodeText = codec->toUnicode(text.data(), text.length());
   }
 
-  mEditBox->setText(unicodeText);
+  mEditBox->setText(tqunicodeText);
 
   setMinimumSize();
 }
 
 void CipherTextDialog::setMinimumSize()
 {
-  // this seems to force a layout of the entire document, so we get a
+  // this seems to force a tqlayout of the entire document, so we get a
   // a proper contentsWidth(). Is there a better way?
   for ( int i = 0; i < mEditBox->paragraphs(); i++ )
       (void) mEditBox->paragraphRect( i );
@@ -1660,7 +1660,7 @@ void CipherTextDialog::setMinimumSize()
 
 
 #if KDE_IS_VERSION( 3, 1, 90 )
-  int maxWidth = KGlobalSettings::desktopGeometry(parentWidget()).width()-100;
+  int maxWidth = KGlobalSettings::desktopGeometry(tqparentWidget()).width()-100;
 #else
   KConfig gc("kdeglobals", false, false);
   gc.setGroup("Windows");
@@ -1668,9 +1668,9 @@ void CipherTextDialog::setMinimumSize()
   if (TQApplication::desktop()->isVirtualDesktop() &&
       gc.readBoolEntry("XineramaEnabled", true) &&
       gc.readBoolEntry("XineramaPlacementEnabled", true)) {
-    maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100;
+    maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(tqparentWidget())).width()-100;
   } else {
-    maxWidth = TQApplication::desktop()->geometry().width()-100;
+    maxWidth = TQApplication::desktop()->tqgeometry().width()-100;
   }
 #endif
 
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 858169ad8..a974f2645 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -89,8 +89,8 @@ TQString endecryptStr( const TQString &aStr )
 {
   TQString result;
   for (uint i = 0; i < aStr.length(); i++)
-    result += (aStr[i].unicode() < 0x20) ? aStr[i] :
-              TQChar(0x1001F - aStr[i].unicode());
+    result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
+              TQChar(0x1001F - aStr[i].tqunicode());
   return result;
 }
 
@@ -163,7 +163,7 @@ bool ExchangeAccount::authenticate( TQWidget *window )
 bool ExchangeAccount::authenticate()
 {
   long windowId;
-  TQWidgetList *widgets = TQApplication::topLevelWidgets();
+  TQWidgetList *widgets = TQApplication::tqtopLevelWidgets();
   if ( widgets->isEmpty() )
     windowId = 0;
   else
@@ -206,7 +206,7 @@ bool ExchangeAccount::authenticate( int windowId )
   // TODO: Remove this busy loop
   TQApplication::setOverrideCursor( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( !mCalendarURL && !mError );
   TQApplication::restoreOverrideCursor();
 
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index 3a1c46cc5..1047f36ef 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -226,7 +226,7 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
   TQApplication::setOverrideCursor
   ( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
 
@@ -247,7 +247,7 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event )
   // TODO: Remove this busy loop
   TQApplication::setOverrideCursor( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
   disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), 
@@ -266,7 +266,7 @@ int ExchangeClient::removeSynchronous( KCal::Event* event )
   // TODO: Remove this busy loop
   TQApplication::setOverrideCursor( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
   disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), 
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 60879d266..16b1a1a32 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -255,7 +255,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response,
           continue;
         }
         TQString uid = uidElement.text();
-        if ( ! m_uids.contains( uid ) ) {
+        if ( ! m_uids.tqcontains( uid ) ) {
           m_uids[uid] = 1;
           handleRecurrence(uid);
           successCount++;
@@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
   if ( mCalendar ) {
     KCal::Event *oldEvent = mCalendar->event( event->uid() );
     if ( oldEvent ) {
-      kdWarning() << "Already got his event, replace it..." << endl;
+      kdWarning() << "Already got his event, tqreplace it..." << endl;
       mCalendar->deleteEvent( oldEvent );
     }
     kdDebug() << "ADD EVENT" << endl;
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index 8e5525038..ae33a3693 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -261,7 +261,7 @@ void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
   kdDebug() << "Subscription ID.text(): " << subscriptionID.text() << endl;
   bool ok;
   ID id = subscriptionID.text().toLong( &ok );
-  if ( ! status.text().contains( "200" ) || !ok) {
+  if ( ! status.text().tqcontains( "200" ) || !ok) {
     kdError() << "UNSUBSCRIBE result is not 200 or no subscription ID found" << endl;
     emit error( ExchangeClient::ServerResponseError, "UNSUBSCRIBE yields an error response: \n" + response.toString() );
   }
@@ -285,7 +285,7 @@ void ExchangeMonitor::slotActivated( int )
     return;
 
   TQCString response( maxLen+2 );
-  Q_LONG len = mSocket->readBlock ( response.data(), maxLen+1 );
+  TQ_LONG len = mSocket->readBlock ( response.data(), maxLen+1 );
 
   if ( len <= 0 ) {
     kdDebug() << "Error: len<=0" << endl;
@@ -346,7 +346,7 @@ void ExchangeMonitor::slotPollResult( KIO::Job * job )
     TQDomElement item = responses.item( i ).toElement();
     TQDomElement status = item.namedItem( "status" ).toElement();
     TQDomElement subscriptionID = item.namedItem( "subscriptionID" ).toElement();
-    if ( status.text().contains( "200" ) ) {
+    if ( status.text().tqcontains( "200" ) ) {
       kdDebug() << "subscriptionID: " << subscriptionID.text() << endl;
       IDList IDs = makeIDList( subscriptionID.text() );
       TQValueList urls;
@@ -355,7 +355,7 @@ void ExchangeMonitor::slotPollResult( KIO::Job * job )
         urls += mSubscriptionMap[ *it ];
       }
       emit notify( IDs, urls );
-    } else if ( ! status.text().contains( "204" ) ) {
+    } else if ( ! status.text().tqcontains( "204" ) ) {
       kdWarning() << "POLL result is not 200 or 204, what's up?" << endl;
       emit error( ExchangeClient::ServerResponseError, "Poll result is wrong: \n" +  response.toString() );
     }
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index 29a796dd8..f62d6a321 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -256,7 +256,7 @@ void ExchangeUpload::startUpload( const KURL &url )
     offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 );
   else
     offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 );
-  offsetString = offsetString.replace( TQRegExp(" "), "0" );
+  offsetString = offsetString.tqreplace( TQRegExp(" "), "0" );
 
   kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl;
   kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl;
@@ -292,8 +292,8 @@ void ExchangeUpload::startUpload( const KURL &url )
     KCal::ICalFormat *format = new KCal::ICalFormat();
     TQString recurstr = format->toString( recurrence->defaultRRule() );
     // Strip leading "RRULE\n :" and whitespace
-    recurstr = recurstr.replace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
-    kdDebug() << "Recurrence rule after replace: \"" << recurstr << "\"" << endl;
+    recurstr = recurstr.tqreplace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
+    kdDebug() << "Recurrence rule after tqreplace: \"" << recurstr << "\"" << endl;
     delete format;
     TQDomElement rrule = addElement( doc, prop, "urn:schemas:calendar:", "rrule" );
     addElement( doc, rrule, "xml:", "v", recurstr );
@@ -360,8 +360,8 @@ void ExchangeUpload::slotPatchResult( KIO::Job *job )
                          .toElement();
   kdDebug() << "status: " << status.text() << endl;
   kdDebug() << "propstat: " << propstat.text() << endl;
-  if ( ! ( status.text().contains( "201" ) || 
-           propstat.text().contains( "200" ) ) )
+  if ( ! ( status.text().tqcontains( "201" ) || 
+           propstat.text().tqcontains( "200" ) ) )
     emit finished( this, ExchangeClient::EventWriteError,
                    "Upload error response: \n" + response.toString() ); 
   else 
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index fb2f1ac18..62eeba756 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -143,16 +143,16 @@ TQString Signature::withSeparator( bool * ok ) const
   }
   if ( ok ) *ok = true;
   if ( signature.isEmpty() ) return signature; // don't add a separator in this case
-  if ( signature.startsWith( TQString::fromLatin1("-- \n") ) )
+  if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
     // already have signature separator at start of sig:
-    return TQString::fromLatin1("\n") += signature;
-  else if ( signature.find( TQString::fromLatin1("\n-- \n") ) != -1 )
+    return TQString::tqfromLatin1("\n") += signature;
+  else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
     // already have signature separator inside sig; don't prepend '\n'
     // to improve abusing signatures as templates:
     return signature;
   else
     // need to prepend one:
-    return TQString::fromLatin1("\n-- \n") + signature;
+    return TQString::tqfromLatin1("\n-- \n") + signature;
 }
 
 
@@ -211,13 +211,13 @@ void Signature::writeConfig( KConfigBase * config ) const
 }
 
 TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Signature & sig ) {
-  return stream << static_cast(sig.mType)
+  return stream << static_cast(sig.mType)
 		<< sig.mUrl
 		<< sig.mText;
 }
 
 TQDataStream & KPIM::operator>>( TQDataStream & stream, KPIM::Signature & sig ) {
-    Q_UINT8 s;
+    TQ_UINT8 s;
     stream >> s
            >> sig.mUrl
            >> sig.mText;
@@ -382,7 +382,7 @@ void Identity::writeConfig( KConfigBase * config ) const
 }
 
 TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Identity & i ) {
-  return stream << static_cast(i.uoid())
+  return stream << static_cast(i.uoid())
 		<< i.identityName()
 		<< i.fullName()
 		<< i.organization()
@@ -406,7 +406,7 @@ TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Identity & i
 }
 
 TQDataStream & KPIM::operator>>( TQDataStream & stream, KPIM::Identity & i ) {
-  Q_UINT32 uoid;
+  TQ_UINT32 uoid;
   TQString format;
   stream        >> uoid
 		>> i.mIdentity
@@ -531,7 +531,7 @@ TQString Identity::fullEmailAddr(void) const
   // add DQUOTE's if necessary:
   bool needsQuotes=false;
   for (unsigned int i=0; i < mFullName.length(); i++) {
-    if ( specials.contains( mFullName[i] ) )
+    if ( specials.tqcontains( mFullName[i] ) )
       needsQuotes = true;
     else if ( mFullName[i] == '\\' || mFullName[i] == '"' ) {
       needsQuotes = true;
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index e7380ca66..939cb7042 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -201,7 +201,7 @@ void IdentityManager::writeConfig() const {
   int i = 0;
   for ( ConstIterator it = mIdentities.begin() ;
 	it != mIdentities.end() ; ++it, ++i ) {
-    KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
+    KConfigGroup cg( mConfig, TQString::tqfromLatin1("Identity #%1").arg(i) );
     (*it).writeConfig( &cg );
     if ( (*it).isDefault() ) {
       // remember which one is default:
@@ -326,7 +326,7 @@ Identity & IdentityManager::modifyIdentityForName( const TQString & name )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).identityName() == name ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() replacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() tqreplacement!"
 		    << "\n  name == \"" << name << "\"" << endl;
   return newFromScratch( name );
 }
@@ -335,7 +335,7 @@ Identity & IdentityManager::modifyIdentityForUoid( uint uoid )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).uoid() == uoid ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() replacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() tqreplacement!"
 		    << "\n  uoid == \"" << uoid << "\"" << endl;
   return newFromScratch( i18n("Unnamed") );
 }
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index dfb8e8ab5..4c8587be3 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -101,7 +101,7 @@ public:
   **/
   const Identity & identityForAddress( const TQString & addresses ) const;
 
-  /** @return true if @p addressList contains any of our addresses,
+  /** @return true if @p addressList tqcontains any of our addresses,
       false otherwise.
       @see #identityForAddress
   **/
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index c0b7cb8b3..be0c493fd 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -476,9 +476,9 @@ namespace KSieve {
 
     const int identifierLength = mState.cursor - identifierStart;
 
-    // Can use the fast fromLatin1 here, since identifiers are always
+    // Can use the fast tqfromLatin1 here, since identifiers are always
     // in the us-ascii subset:
-    result += TQString::fromLatin1( identifierStart, identifierLength );
+    result += TQString::tqfromLatin1( identifierStart, identifierLength );
 
     if ( atEnd() || isDelim( *mState.cursor ) )
       return true;
diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp
index dee04bd11..df5ac6e1b 100644
--- a/libksieve/tests/lexertest.cpp
+++ b/libksieve/tests/lexertest.cpp
@@ -37,7 +37,7 @@ using KSieve::Lexer;
 #include 
 using KSieve::Error;
 
-#include  // qstrlen
+#include  // tqstrlen
 #include 
 
 #include 
@@ -398,7 +398,7 @@ int main( int argc, char * argv[]  ) {
   if ( argc == 2 ) { // manual test
 
     const char * scursor = argv[1];
-    const char * const send = argv[1] + qstrlen( argv[1] );
+    const char * const send = argv[1] + tqstrlen( argv[1] );
 
     Lexer lexer( scursor, send );
 
@@ -424,7 +424,7 @@ int main( int argc, char * argv[]  ) {
     for ( int i = 0 ; i < numTestCases ; ++i ) {
       bool ok = true;
       const TestCase & t = testcases[i];
-      const char * const send = t.string + qstrlen( t.string );
+      const char * const send = t.string + tqstrlen( t.string );
       Lexer lexer( t.string, send, Lexer::IncludeComments );
       cerr << t.name << ":";
       for ( int j = 0 ; !lexer.atEnd() ; ++j ) {
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index fdc08a978..9d0d8e141 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -37,7 +37,7 @@ using KSieve::Parser;
 #include 
 #include 
 
-#include  // qstrlen
+#include  // tqstrlen
 #include 
 
 #include 
@@ -627,7 +627,7 @@ int main( int argc, char * argv[]  ) {
   if ( argc == 2 ) { // manual test
 
     const char * scursor = argv[1];
-    const char * const send = argv[1] + qstrlen( argv[1] );
+    const char * const send = argv[1] + tqstrlen( argv[1] );
 
     Parser parser( scursor, send );
     PrintingScriptBuilder psb;
@@ -644,7 +644,7 @@ int main( int argc, char * argv[]  ) {
       const TestCase & t = testCases[i];
       cerr << t.name << ":";
       VerifyingScriptBuilder v( t );
-      Parser p( t.script, t.script + qstrlen( t.script ) );
+      Parser p( t.script, t.script + tqstrlen( t.script ) );
       p.setScriptBuilder( &v );
       const bool ok = p.parse();
       if ( v.ok() )
diff --git a/mimelib/basicmsg.h b/mimelib/basicmsg.h
index d578a7580..eca41518a 100644
--- a/mimelib/basicmsg.h
+++ b/mimelib/basicmsg.h
@@ -25,7 +25,7 @@
 // library easier to use.  Second, it provides good example code to show
 // you how to create your own customized wrapper classes.
 
-// BasicMessage contains a DwMessage by reference.  The reason BasicMessage
+// BasicMessage tqcontains a DwMessage by reference.  The reason BasicMessage
 // "has-a" DwMessage and not "is-a" DwMessage is because we can assign
 // the DwMessage to an appropriately specialized subclass of BasicMessage
 // *after* the DwMessage is parsed.  For example, after we parse a DwMessage,
diff --git a/mimelib/doc/addrlist.html b/mimelib/doc/addrlist.html
index d3a563eef..80845fc04 100644
--- a/mimelib/doc/addrlist.html
+++ b/mimelib/doc/addrlist.html
@@ -52,7 +52,7 @@ protected:
 
    
 DwAddressList represents a list of addresses as described
 in RFC-822. In MIME++, DwAddressList is a container for objects
-of type DwAddress, and it contains
+of type DwAddress, and it tqcontains
 various member functions to manage its contained objects.
 DwAddressList is also a
 DwFieldBody. This reflects the
diff --git a/mimelib/doc/body.html b/mimelib/doc/body.html
index 1526751a4..c9856e24d 100644
--- a/mimelib/doc/body.html
+++ b/mimelib/doc/body.html
@@ -65,9 +65,9 @@ protected:
 A body is always part of an entity, which could be either a
 message or a body part. An entity has a collection of header
 fields and a body. If the content type of a body is ``multipart,'' then
-the body contains one or more body parts. If the content type is ``message,''
-then the body contains an encapsulated message. In all content types, the
-body contains a string of characters.
+the body tqcontains one or more body parts. If the content type is ``message,''
+then the body tqcontains an encapsulated message. In all content types, the
+body tqcontains a string of characters.
 
    
 In MIME++, a DwBody object is contained in a
 DwEntity object. The
@@ -79,7 +79,7 @@ or a single contained
 way to determine the type of DwBody is to access the Content-Type
 header field from the
 DwHeaders object of the
-DwEntity that contains it. For this reason, a
+DwEntity that tqcontains it. For this reason, a
 DwBody should always be part of a
 DwEntity.
 
    
@@ -87,7 +87,7 @@ In the tree (broken-down) representation of a message, a
 DwBody object can be an intermediate node, having both a
 parent node and one or more child nodes, or a leaf node, having a parent
 but no child nodes. In either case, the parent node is the
-DwEntity object that contains it. If it is an intermediate
+DwEntity object that tqcontains it. If it is an intermediate
 node, it must be of type multipart with DwBodyPart objects
 as child nodes, or of type message with a single
 DwMessage object as its child node.
@@ -169,14 +169,14 @@ method creates or updates the string representation from the broken-down
 representation. Only DwBody objects with content type of
 multipart or message require assembling. In either case, the
 DwBody object must be able to find the headers of the message
-or body part that contains it. Therefore, if the DwBody object
+or body part that tqcontains it. Therefore, if the DwBody object
 is not the child of a DwEntity (i.e.,
 DwMessage or DwBodyPart) object, the
 DwBody cannot be assembled because the content type cannot
 be determined.
 
    
 This function calls the Parse() member function of any
-DwBodyPart or DwMessage object it contains.
+DwBodyPart or DwMessage object it tqcontains.
 
    
 You should call this member function after you add a
 DwBodyPart object to a multipart body, or add a
@@ -219,7 +219,7 @@ returns the DwMessage encapsulated in it.
 aMessage) 
 
    
 For a DwBody with content type of message, this member function
-sets the DwMessage object it contains.
+sets the DwMessage object it tqcontains.
 
    
  static DwBody* NewBody(const
 DwString& aStr, DwMessageComponent* aParent) 
diff --git a/mimelib/doc/bodypart.html b/mimelib/doc/bodypart.html
index 6a3a29b6e..c74f716f1 100644
--- a/mimelib/doc/bodypart.html
+++ b/mimelib/doc/bodypart.html
@@ -47,7 +47,7 @@ of headers and a body. A body part is different from a message
 in that a body part is part of a multipart body.
 
    
 In MIME++, a DwBodyPart is a subclass of
-DwEntity; therefore, it contains
+DwEntity; therefore, it tqcontains
 both a DwHeaders object and a
 DwBody object, and it is contained
 in a multipart DwBody object.
@@ -120,7 +120,7 @@ This advanced function sets aPart as the next
 DwBodyPart object following this
 DwBodyPart in the list of DwBodyPart objects
 contained in a multipart DwBody. Since
-DwBody contains a member function for adding a
+DwBody tqcontains a member function for adding a
 DwBodyPart object to its list, this function should be avoided
 for most applications.
 
    
diff --git a/mimelib/doc/entity.html b/mimelib/doc/entity.html
index 08cf8b753..9a2d00187 100644
--- a/mimelib/doc/entity.html
+++ b/mimelib/doc/entity.html
@@ -47,7 +47,7 @@ protected:
 RFC-2045 defines an entity as either a message or a body
 part, both of which have a collection of headers and a body. In
 MIME++, an entity is represented by the class DwEntity, which
-contains both a DwHeaders object
+tqcontains both a DwHeaders object
 and a DwBody object.
 
    
 In the tree (broken-down) representation of message, a
@@ -58,7 +58,7 @@ be a DwMessage object. If a
 DwEntity object is an intermediate node, its parent must
 be a DwBody object. The child nodes of a
 DwEntity object are the DwHeaders and
-DwBody objects it contains.
+DwBody objects it tqcontains.
 
    
 Since DwEntity is an abstract base class, you cannot create
 instances of it directly. DwEntity has two derived classes,
@@ -108,7 +108,7 @@ executes the parse method for DwEntity objects. The parse
 method creates or updates the broken-down representation from the string
 representation. For DwEntity objects, the parse method parses
 the string representation and sets the values of the
-DwHeaders and DwBody objects it contains.
+DwHeaders and DwBody objects it tqcontains.
 This member function also calls the Parse() member functions
 of the contained DwHeaders and DwBody objects.
 
    
diff --git a/mimelib/doc/field.html b/mimelib/doc/field.html
index 19736f271..1a4a74b97 100644
--- a/mimelib/doc/field.html
+++ b/mimelib/doc/field.html
@@ -65,18 +65,18 @@ protected:
 
 
    
 DwField represents a header field as described in RFC-822.
-According to RFC-822, a field contains a field name and a field body. In
-MIME++, a DwField contains three elements: a
-DwString that contains its field
-name, a DwString that contains its field body, and a
-DwFieldBody object that contains
+According to RFC-822, a field tqcontains a field name and a field body. In
+MIME++, a DwField tqcontains three elements: a
+DwString that tqcontains its field
+name, a DwString that tqcontains its field body, and a
+DwFieldBody object that tqcontains
 a broken-down (that is, parsed) version of its field body.
 
    
 In the tree (broken-down) representation of message, a
 DwField object is always an intermediate node, having a parent
 node and a single child node. The parent node is the
-DwHeaders object that contains
-it. The child node is the DwFieldBody object it contains.
+DwHeaders object that tqcontains
+it. The child node is the DwFieldBody object it tqcontains.
 
    
 To get and set the field name, use the member functions
 FieldNameStr() and SetFieldNameStr(). To
@@ -212,7 +212,7 @@ aField) 
 
    
 This advanced function sets aField as the next field
 following this field in the list of fields contained in the headers. Since
-DwHeaders contains member functions for adding
+DwHeaders tqcontains member functions for adding
 DwField objects to its list, this function should be avoided
 for most applications.
 
    
@@ -234,7 +234,7 @@ The static member function CreateFieldBody() is called from
 the Parse() member function and is responsible for creating
 a DwFieldBody object for this particular field. A typical
 scenario might go as follows: This member function examines the field name
-for this field, finds that it contains "To", creates a
+for this field, finds that it tqcontains "To", creates a
 DwAddressList object to contain the field body, calls the
 Parse() member function for the
 DwAddressList, and sets the DwAddressList
diff --git a/mimelib/doc/fieldbdy.html b/mimelib/doc/fieldbdy.html
index 856fd5330..47b9a6acb 100644
--- a/mimelib/doc/fieldbdy.html
+++ b/mimelib/doc/fieldbdy.html
@@ -53,7 +53,7 @@ In the tree (broken-down) representation of a message, a
 DwFieldBody object may be either a leaf node, having a parent
 but no child nodes, or an intermediate node, having a parent and one or more
 child nodes. The parent node is the
-DwField object that contains it.
+DwField object that tqcontains it.
 Child nodes, if present, depend on the particular subclass of
 DwFieldBody that is instantiated. A
 DwAddressList object, for example, has
diff --git a/mimelib/doc/group.html b/mimelib/doc/group.html
index 1d374d874..683ff3a96 100644
--- a/mimelib/doc/group.html
+++ b/mimelib/doc/group.html
@@ -51,8 +51,8 @@ protected:
 
 
    
 DwGroup represents a group as described in RFC-822.
-A group contains a group name and a (possibly empty) list of
-mailboxes. In MIME++, a DwGroup object contains a
+A group tqcontains a group name and a (possibly empty) list of
+mailboxes. In MIME++, a DwGroup object tqcontains a
 string for the group name and a
 DwMailboxList object for the
 list of mailboxes.
diff --git a/mimelib/doc/headers.html b/mimelib/doc/headers.html
index 8bf94ad98..35519c395 100644
--- a/mimelib/doc/headers.html
+++ b/mimelib/doc/headers.html
@@ -155,7 +155,7 @@ the individual header fields.
 In the tree (broken-down) representation of a message, a
 DwHeaders object is an intermediate node, having both a parent
 node and several child nodes. The parent node is the
-DwEntity object that contains it.
+DwEntity object that tqcontains it.
 The child nodes are the DwField objects in the list it manages.
 (See the man page for
 DwMessageComponent for a discussion
@@ -167,7 +167,7 @@ but you access it through the Headers() member function of
 for you.
 
    
 While DwHeaders has public member functions for managing
-the list of DwField objects it contains, you will normally
+the list of DwField objects it tqcontains, you will normally
 use convenience functions to access the field bodies of the header fields
 directly. You can access the field body for a specific well-known header
 field by using the member function
@@ -416,7 +416,7 @@ function: most applications should use the
 
 
    
 Adds a DwField object to the list. If a header field with
-the same field name already exists, it is replaced by the new header field.
+the same field name already exists, it is tqreplaced by the new header field.
 
    
 DwHeaders takes responsibility for deleting the added
 DwField object.
@@ -430,7 +430,7 @@ to add header fields.
 
 
    
 Adds a DwField object to the list. If a header field with
-the same field name already exists, it is not replaced; thus, duplicate
+the same field name already exists, it is not tqreplaced; thus, duplicate
 header fields may occur when using this member function. (This is what you
 want for some header fields, such as the "Received" header field).
 
    
diff --git a/mimelib/doc/mailbox.html b/mimelib/doc/mailbox.html
index 492070ccb..72b509cdd 100644
--- a/mimelib/doc/mailbox.html
+++ b/mimelib/doc/mailbox.html
@@ -53,7 +53,7 @@ protected:
 
    
 RFC-822 defines a mailbox as an entity that can be the recipient of
 a message. A mailbox is more specific than an address, which may be
-either a mailbox or a group. An RFC-822 mailbox contains a full name,
+either a mailbox or a group. An RFC-822 mailbox tqcontains a full name,
 a local-part, an optional route, and a domain. For example,
 in the mailbox
 
    
@@ -66,7 +66,7 @@ deprecated according to RFC-1123.
 In MIME++, an RFC-822 mailbox is represented by a
 DwMailbox object. DwMailbox is a subclass
 of DwAddress, which reflects the
-fact that a mailbox is also an address. A DwMailbox contains
+fact that a mailbox is also an address. A DwMailbox tqcontains
 strings representing the full name, local-part, route, and domain of a mailbox.
 
    
 In the tree (broken-down) representation of message, a
@@ -77,7 +77,7 @@ but no child nodes. Its parent node must be a
 DwMailboxList object.
 
    
 DwMailbox has member functions for getting or setting the
-strings it contains.
+strings it tqcontains.
 
    
 DwMailbox object can be included in a list of
 DwMailbox objects. To get the next
diff --git a/mimelib/doc/mboxlist.html b/mimelib/doc/mboxlist.html
index 2bae2b4e3..541eae28d 100644
--- a/mimelib/doc/mboxlist.html
+++ b/mimelib/doc/mboxlist.html
@@ -54,7 +54,7 @@ protected:
 
    
 DwMailboxList represents a list of mailboxes as described
 in RFC-822. In MIME++, DwMailboxList is a container for objects
-of type DwMailbox, and it contains
+of type DwMailbox, and it tqcontains
 various member functions to manage its contained objects.
 DwAddressList is also a
 DwFieldBody. This reflects the
diff --git a/mimelib/doc/mediatyp.html b/mimelib/doc/mediatyp.html
index 01696084b..83e5c127a 100644
--- a/mimelib/doc/mediatyp.html
+++ b/mimelib/doc/mediatyp.html
@@ -84,7 +84,7 @@ type model.
 
    
 DwMediaType has member functions that allow you to set or
 get the type and subtype as either enumerated values or as strings. It also
-contains a list of
+tqcontains a list of
 DwParameter objects that represent
 the parameters of the field body. You can use convenience functions to directly
 access the boundary parameter of a multipart media type, or to access the
diff --git a/mimelib/doc/message.html b/mimelib/doc/message.html
index d08d5af4e..193236f88 100644
--- a/mimelib/doc/message.html
+++ b/mimelib/doc/message.html
@@ -40,11 +40,11 @@ protected:
 
    
 DwMessage represents an RFC-822/MIME message.
 
    
-A message contains both a collection of header fields and a
+A message tqcontains both a collection of header fields and a
 body. In the terminology of RFC-2045, the general term for the
 headers-body combination is entity. In MIME++,
 DwMessage is a direct subclass of
-DwEntity, and therefore contains
+DwEntity, and therefore tqcontains
 both a DwHeaders object and a
 DwBody object.
 
    
@@ -52,7 +52,7 @@ In the tree (broken-down) representation of message, a
 DwMessage object is almost always a root node, having child
 nodes but no parent node. The child nodes are the
 DwHeaders object and the DwBody object it
-contains. A DwMessage may sometimes be an intermediate node.
+tqcontains. A DwMessage may sometimes be an intermediate node.
 In this special case, the parent node is a DwBody object
 of type "message/*" and the DwMessage object represents an
 encapsulated message.
diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html
index 48a7ab549..2469c3712 100644
--- a/mimelib/doc/msgcmp.html
+++ b/mimelib/doc/msgcmp.html
@@ -133,7 +133,7 @@ These features are the following:
     A parent. Most message components are part of another component. A collection
     of headers is part of a message or body part, a header field is part of a
     collection of headers, a field-body is part of a header field, and so on.
-    The parent of a component is the component that contains it. This tree structure
+    The parent of a component is the component that tqcontains it. This tree structure
     is important, since a component's parent must be parsed before the component
     can be. Also, a component's string representation must be assembled before
     its parent's. To maintain consistency in the tree, whenever a component's
diff --git a/mimelib/doc/msgid.html b/mimelib/doc/msgid.html
index 69d10ef59..da64d38a9 100644
--- a/mimelib/doc/msgid.html
+++ b/mimelib/doc/msgid.html
@@ -49,7 +49,7 @@ protected:
 
    
 DwMsgId represents a msg-id as described in RFC-822.
 In the BNF grammar in RFC-822, a msg-id has a local-part and a
-domain. In MIME++, a DwMsgId contains strings that
+domain. In MIME++, a DwMsgId tqcontains strings that
 contain the local-part and the domain.
 
    
 In the tree (broken-down) representation of message, a
diff --git a/mimelib/doc/string.html b/mimelib/doc/string.html
index 80db3700c..7c2f4f237 100644
--- a/mimelib/doc/string.html
+++ b/mimelib/doc/string.html
@@ -59,13 +59,13 @@ public:
     DwString& insert(size_t aPos1, const char* aCstr);
     DwString& insert(size_t aPos1, size_t aLen2, char aChar);
     DwString& erase(size_t aPos=0, size_t aLen=npos);
-    DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr);
-    DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr,
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr,
         size_t aPos2, size_t aLen2);
-    DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf,
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf,
         size_t aLen2);
-    DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr);
-    DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
     size_t copy(char* aBuf, size_t aLen, size_t aPos=0) const;
     void swap(DwString& aStr);
     const char* c_str() const;
@@ -115,8 +115,8 @@ protected:
     size_t  mStart;
     size_t  mLength;
     void _copy();
-    void _replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
-    void _replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    void _tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
+    void _tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
     friend void mem_free(char*);
 
 public:
@@ -374,14 +374,14 @@ Erases (removes) at most aLen characters beginning at position
 aPos from this string. The function will not erase more
 characters than what are available. Returns *this.
 
    
- DwString& replace(size_t
+ DwString& tqreplace(size_t
 aPos1, size_t aLen1, const DwString& aStr) 
    
-DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr,
+DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr,
 size_t aPos2, size_t aLen2) 
    
-DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t
+DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t
 aLen2) 
    
-DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr) 
    
-DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
+DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr) 
    
+DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
     
 
    
 Removes aLen1 characters beginning at position
@@ -579,7 +579,7 @@ The third version searches for any character not in the NUL-terminated string
  DwString substr(size_t aPos=0,
 size_t aLen=npos) const 
 
    
-Returns a string that contains at most aLen characters from
+Returns a string that tqcontains at most aLen characters from
 the DwString object beginning at position
 aPos. The returned substring will not contain more characters
 than what are available in the superstring DwString object.
diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp
index 749f7c8ee..52e42befb 100644
--- a/mimelib/dwstring.cpp
+++ b/mimelib/dwstring.cpp
@@ -365,7 +365,7 @@ DwString::DwString(const char* aBuf, size_t aLen)
     mRep = new_rep_reference(sEmptyRep);
     mStart = 0;
     mLength = 0;
-    _replace(0, mLength, aBuf, aLen);
+    _tqreplace(0, mLength, aBuf, aLen);
 }
 
 
@@ -400,7 +400,7 @@ DwString::DwString(const char* aCstr)
     mLength = 0;
     if ( aCstr ) {
         size_t len = strlen(aCstr);
-        _replace(0, mLength, aCstr, len);
+        _tqreplace(0, mLength, aCstr, len);
     }
 }
 
@@ -418,7 +418,7 @@ DwString::DwString(size_t aLen, char aChar)
     mRep = new_rep_reference(sEmptyRep);
     mStart = 0;
     mLength = 0;
-    _replace(0, mLength, aLen, aChar);
+    _tqreplace(0, mLength, aLen, aChar);
 }
 
 
@@ -476,7 +476,7 @@ void DwString::resize(size_t aLen, char aChar)
     }
     // expanding string
     else if (aLen > mLength) {
-        _replace(mLength, 0, aLen-mLength, aChar);
+        _tqreplace(mLength, 0, aLen-mLength, aChar);
     }
 }
 
@@ -534,10 +534,10 @@ DwString& DwString::append(const DwString& aStr, size_t aPos,
     size_t len = DW_MIN(aLen, aStr.mLength - pos);
     if (&aStr == this) {
         DwString temp(aStr);
-        _replace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len);
+        _tqreplace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len);
     }
     else {
-        _replace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len);
+        _tqreplace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len);
     }
     return *this;
 }
@@ -547,7 +547,7 @@ DwString& DwString::append(const char* aBuf, size_t aLen)
 {
     assert(aBuf != 0);
     if (aBuf != 0) {
-        _replace(mLength, 0, aBuf, aLen);
+        _tqreplace(mLength, 0, aBuf, aLen);
     }
     return *this;
 }
@@ -557,14 +557,14 @@ DwString& DwString::append(const char* aCstr)
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    _replace(mLength, 0, aCstr, len);
+    _tqreplace(mLength, 0, aCstr, len);
     return *this;
 }
 
 
 DwString& DwString::append(size_t aLen, char aChar)
 {
-    _replace(mLength, 0, aLen, aChar);
+    _tqreplace(mLength, 0, aLen, aChar);
     return *this;
 }
 
@@ -601,7 +601,7 @@ DwString& DwString::assign(const char* aBuf, size_t aLen)
 {
     assert(aBuf != 0);
     assert(aLen != (size_t)-1);
-    _replace(0, mLength, aBuf, aLen);
+    _tqreplace(0, mLength, aBuf, aLen);
     return *this;
 }
 
@@ -610,7 +610,7 @@ DwString& DwString::assign(const char* aCstr)
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    _replace(0, mLength, aCstr, len);
+    _tqreplace(0, mLength, aCstr, len);
     return *this;
 }
 
@@ -618,7 +618,7 @@ DwString& DwString::assign(const char* aCstr)
 DwString& DwString::assign(size_t aLen, char aChar)
 {
     assert(aLen != (size_t)-1);
-    _replace(0, mLength, aLen, aChar);
+    _tqreplace(0, mLength, aLen, aChar);
     return *this;
 }
 
@@ -638,10 +638,10 @@ DwString& DwString::insert(size_t aPos1, const DwString& aStr,
     size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2);
     if (&aStr == this) {
         DwString temp(aStr);
-        _replace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
+        _tqreplace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
     }
     else {
-        _replace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
+        _tqreplace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
     }
     return *this;
 }
@@ -650,7 +650,7 @@ DwString& DwString::insert(size_t aPos1, const DwString& aStr,
 DwString& DwString::insert(size_t aPos, const char* aBuf, size_t aLen)
 {
     assert(aBuf != 0);
-    _replace(aPos, 0, aBuf, aLen);
+    _tqreplace(aPos, 0, aBuf, aLen);
     return *this;
 }
 
@@ -659,14 +659,14 @@ DwString& DwString::insert(size_t aPos, const char* aCstr)
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    _replace(aPos, 0, aCstr, len);
+    _tqreplace(aPos, 0, aCstr, len);
     return *this;
 }
 
 
 DwString& DwString::insert(size_t aPos, size_t aLen, char aChar)
 {
-    _replace(aPos, 0, aLen, aChar);
+    _tqreplace(aPos, 0, aLen, aChar);
     return *this;
 }
 
@@ -676,18 +676,18 @@ DwString& DwString::erase(size_t aPos, size_t aLen)
     assert(aPos <= mLength);
     size_t pos = DW_MIN(aPos, mLength);
     size_t len = DW_MIN(aLen, mLength - pos);
-    _replace(pos, len, "", 0);
+    _tqreplace(pos, len, "", 0);
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr)
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr)
 {
-    return replace(aPos1, aLen1, aStr, 0, aStr.mLength);
+    return tqreplace(aPos1, aLen1, aStr, 0, aStr.mLength);
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr,
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr,
     size_t aPos2, size_t aLen2)
 {
     assert(aPos2 <= aStr.mLength);
@@ -695,35 +695,35 @@ DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr,
     size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2);
     if (&aStr == this) {
         DwString temp(aStr);
-        _replace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
+        _tqreplace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
     }
     else {
-        _replace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
+        _tqreplace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
     }
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aBuf,
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aBuf,
     size_t aLen2)
 {
-    _replace(aPos1, aLen1, aBuf, aLen2);
+    _tqreplace(aPos1, aLen1, aBuf, aLen2);
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aCstr)
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aCstr)
 {
     size_t len2 = (aCstr) ? strlen(aCstr) : 0;
-    _replace(aPos1, aLen1, aCstr, len2);
+    _tqreplace(aPos1, aLen1, aCstr, len2);
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, size_t aLen2,
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, size_t aLen2,
     char aChar)
 {
-    _replace(aPos1, aLen1, aLen2, aChar);
+    _tqreplace(aPos1, aLen1, aLen2, aChar);
     return *this;
 }
 
@@ -1246,7 +1246,7 @@ void DwString::_copy()
 }
 
 
-void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2)
+void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2)
 {
     assert(aPos1 <= mLength);
     assert(aBuf != 0);
@@ -1291,7 +1291,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLe
             }
         }
     }
-    // Is the replacement smaller than the replaced?
+    // Is the tqreplacement smaller than the tqreplaced?
     else if (len2 < len1) {
         to = mRep->mBuffer + mStart + pos1;
         from = aBuf;
@@ -1338,7 +1338,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLe
 }
 
 
-void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
+void DwString::_tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
 {
     assert(aPos1 <= mLength);
     size_t pos1 = DW_MIN(aPos1, mLength);
@@ -1381,7 +1381,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
             }
         }
     }
-    // Is the replacement smaller than the replaced?
+    // Is the tqreplacement smaller than the tqreplaced?
     else if (len2 < len1) {
         to = mRep->mBuffer + mStart + pos1;
         for (i=0; i < len2; ++i) *to++ = aChar;
diff --git a/mimelib/headers.cpp b/mimelib/headers.cpp
index 7598ec7ea..588461889 100644
--- a/mimelib/headers.cpp
+++ b/mimelib/headers.cpp
@@ -336,7 +336,7 @@ void DwHeaders::AddOrReplaceField(DwField* aField)
             mFirstField = aField;
         }
         aField->SetNext(field->Next());
-        // Check whether we've replaced the last field
+        // Check whether we've tqreplaced the last field
         if ( !aField->Next() )
             mLastField = aField;
         delete field;
diff --git a/mimelib/mimelib/addrlist.h b/mimelib/mimelib/addrlist.h
index 5d26736a7..1225494d3 100644
--- a/mimelib/mimelib/addrlist.h
+++ b/mimelib/mimelib/addrlist.h
@@ -32,7 +32,7 @@
 //+ Description
 //. {\tt DwAddressList} represents a list of {\it addresses} as described
 //. in RFC-822.  In MIME++, {\tt DwAddressList} is a container for objects
-//. of type {\tt DwAddress}, and it contains various member functions
+//. of type {\tt DwAddress}, and it tqcontains various member functions
 //. to manage its contained objects.  {\tt DwAddressList} is also a
 //. {\tt DwFieldBody}.  This reflects the fact that certain RFC-822 header
 //. fields, such as the ``To'' header field, have a list of addresses
diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h
index 2133a724e..f19efa0ce 100644
--- a/mimelib/mimelib/body.h
+++ b/mimelib/mimelib/body.h
@@ -46,9 +46,9 @@ class DwBodyPart;
 //. is always part of an {\it entity}, which could be either a {\it message}
 //. or a {\it body part}.  An entity has a collection of {\it header fields}
 //. and a body.  If the content type of a body is ``multipart,'' then the
-//. body contains one or more body parts.  If the content type is ``message,''
-//. then the body contains an encapsulated message.  In all content types,
-//. the body contains a string of characters.
+//. body tqcontains one or more body parts.  If the content type is ``message,''
+//. then the body tqcontains an encapsulated message.  In all content types,
+//. the body tqcontains a string of characters.
 //.
 //. In MIME++, a {\tt DwBody} object is contained in a {\tt DwEntity} object.
 //. The {\tt DwBody} object may contain a discrete body consisting only of a
@@ -56,14 +56,14 @@ class DwBodyPart;
 //. contained {\tt DwBodyPart} objects or a single contained {\tt DwMessage}
 //. object.  The only reliable way to determine the type of {\tt DwBody} is
 //. to access the Content-Type header field from the {\tt DwHeaders} object
-//. of the {\tt DwEntity} that contains it.  For this reason, a {\tt DwBody}
+//. of the {\tt DwEntity} that tqcontains it.  For this reason, a {\tt DwBody}
 //. should always be part of a {\tt DwEntity}.
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwBody}
 //. object can be an intermediate node, having both a parent node and
 //. one or more child nodes, or a leaf node, having a parent but no child
 //. nodes.  In either case, the parent node is the {\tt DwEntity} object
-//. that contains it.  If it is an intermediate node, it must be of type
+//. that tqcontains it.  If it is an intermediate node, it must be of type
 //. multipart with {\tt DwBodyPart} objects as child nodes, or of type
 //. message with a single {\tt DwMessage} object as its child node.
 //.
@@ -145,14 +145,14 @@ public:
     //. from the broken-down representation.  Only {\tt DwBody} objects
     //. with content type of multipart or message require assembling.
     //. In either case, the {\tt DwBody} object must be able to find the
-    //. headers of the message or body part that contains it.  Therefore,
+    //. headers of the message or body part that tqcontains it.  Therefore,
     //. if the {\tt DwBody} object is not the child of a {\tt DwEntity}
     //. ({\it i.e.}, {\tt DwMessage} or {\tt DwBodyPart}) object, the
     //. {\tt DwBody} cannot be assembled because the content type cannot
     //. be determined.
     //.
     //. This function calls the {\tt Parse()} member function of any
-    //. {\tt DwBodyPart} or {\tt DwMessage} object it contains.
+    //. {\tt DwBodyPart} or {\tt DwMessage} object it tqcontains.
     //.
     //. You should call this member function after you add a {\tt DwBodyPart}
     //. object to a multipart body, or add a {\tt DwMessage} object to a
@@ -189,7 +189,7 @@ public:
 
     void SetMessage(DwMessage* aMessage);
     //. For a {\tt DwBody} with content type of message, this member function
-    //. sets the {\tt DwMessage} object it contains.
+    //. sets the {\tt DwMessage} object it tqcontains.
 
     static DwBody* NewBody(const DwString& aStr, DwMessageComponent* aParent);
     //. Creates a new {\tt DwBody} object on the free store.
diff --git a/mimelib/mimelib/bodypart.h b/mimelib/mimelib/bodypart.h
index 9ed7f672e..78e0db592 100644
--- a/mimelib/mimelib/bodypart.h
+++ b/mimelib/mimelib/bodypart.h
@@ -49,7 +49,7 @@ class DwBody;
 //. in that a body part is part of a multipart body.
 //.
 //. In MIME++, a {\tt DwBodyPart} is a subclass of {\tt DwEntity}; therefore,
-//. it contains both a {\tt DwHeaders} object and a {\tt DwBody} object,
+//. it tqcontains both a {\tt DwHeaders} object and a {\tt DwBody} object,
 //. and it is contained in a multipart {\tt DwBody} object.
 //.
 //. As with {\tt DwMessage}, most of the functionality of {\tt DwBodyPart} is
@@ -114,7 +114,7 @@ public:
     //. This advanced function sets {\tt aPart} as the next {\tt DwBodyPart}
     //. object following this {\tt DwBodyPart} in the list of {\tt DwBodyPart}
     //. objects contained in a multipart {\tt DwBody}.  Since {\tt DwBody}
-    //. contains a member function for adding a {\tt DwBodyPart} object to
+    //. tqcontains a member function for adding a {\tt DwBodyPart} object to
     //. its list, this function should be avoided for most applications.
 
     //+ Var sNewBodyPart
diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h
index e809c2820..1bb4662b8 100644
--- a/mimelib/mimelib/entity.h
+++ b/mimelib/mimelib/entity.h
@@ -44,7 +44,7 @@ class DwBody;
 //. RFC-2045 defines an {\it entity} as either a {\it message} or a
 //. {\it body part}, both of which have a collection of headers and
 //. a {\it body}.  In MIME++, an entity is represented by the class
-//. {\tt DwEntity}, which contains both a {\tt DwHeaders} object and
+//. {\tt DwEntity}, which tqcontains both a {\tt DwHeaders} object and
 //. a {\tt DwBody} object.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwEntity}
@@ -53,7 +53,7 @@ class DwBody;
 //. A {\tt DwEntity} object that is a root node must also be a {\tt DwMessage}
 //. object.  If a {\tt DwEntity} object is an intermediate node, its parent
 //. must be a {\tt DwBody} object.  The child nodes of a {\tt DwEntity}
-//. object are the {\tt DwHeaders} and {\tt DwBody} objects it contains.
+//. object are the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains.
 //.
 //. Since {\tt DwEntity} is an abstract base class, you cannot create
 //. instances of it directly.  {\tt DwEntity} has two derived classes,
@@ -101,7 +101,7 @@ public:
     //. method creates or updates the broken-down representation from the
     //. string representation.  For {\tt DwEntity} objects, the parse
     //. method parses the string representation and sets the values of
-    //. the {\tt DwHeaders} and {\tt DwBody} objects it contains. This
+    //. the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains. This
     //. member function also calls the {\tt Parse()} member functions
     //. of the contained {\tt DwHeaders} and {\tt DwBody} objects.
     //.
diff --git a/mimelib/mimelib/field.h b/mimelib/mimelib/field.h
index 9ada823cb..7cd8f97ca 100644
--- a/mimelib/mimelib/field.h
+++ b/mimelib/mimelib/field.h
@@ -44,16 +44,16 @@ class DwFieldBody;
 //+ Name DwField -- Class representing a MIME header field
 //+ Description
 //. {\tt DwField} represents a header field as described in RFC-822.
-//. According to RFC-822, a field contains a field name and a field body.
-//. In MIME++, a {\tt DwField} contains three elements: a {\tt DwString}
-//. that contains its field name, a {\tt DwString} that contains its
-//. field body, and a {\tt DwFieldBody} object that contains a broken-down
+//. According to RFC-822, a field tqcontains a field name and a field body.
+//. In MIME++, a {\tt DwField} tqcontains three elements: a {\tt DwString}
+//. that tqcontains its field name, a {\tt DwString} that tqcontains its
+//. field body, and a {\tt DwFieldBody} object that tqcontains a broken-down
 //. (that is, parsed) version of its field body.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwField}
 //. object is always an intermediate node, having a parent node and a single
-//. child node.  The parent node is the {\tt DwHeaders} object that contains
-//. it.  The child node is the {\tt DwFieldBody} object it contains.
+//. child node.  The parent node is the {\tt DwHeaders} object that tqcontains
+//. it.  The child node is the {\tt DwFieldBody} object it tqcontains.
 //.
 //. To get and set the field name, use the member functions
 //. {\tt FieldNameStr()} and {\tt SetFieldNameStr()}.
@@ -169,7 +169,7 @@ public:
     void SetNext(const DwField* aField);
     //. This {\it advanced} function sets {\tt aField} as the next field
     //. following this field in the list of fields contained in the headers.
-    //. Since {\tt DwHeaders} contains member functions for adding
+    //. Since {\tt DwHeaders} tqcontains member functions for adding
     //. {\tt DwField} objects to its list, this function should be
     //. avoided for most applications.
 
@@ -190,7 +190,7 @@ public:
     //. {\tt DwFieldBody} object for this particular field.  A typical
     //. scenario might go as follows:
     //. This member function examines the field name for this field,
-    //. finds that it contains "To", creates a {\tt DwAddressList} object
+    //. finds that it tqcontains "To", creates a {\tt DwAddressList} object
     //. to contain the field body, calls the {\tt Parse()} member
     //. function for the {\tt DwAddressList}, and sets the {\tt DwAddressList}
     //. object as this {\tt DwField} object's {\tt DwFieldBody}.
diff --git a/mimelib/mimelib/fieldbdy.h b/mimelib/mimelib/fieldbdy.h
index e5f3243a7..24a0c0b9b 100644
--- a/mimelib/mimelib/fieldbdy.h
+++ b/mimelib/mimelib/fieldbdy.h
@@ -47,7 +47,7 @@
 //. In the tree (broken-down) representation of a message, a {\tt DwFieldBody}
 //. object may be either a leaf node, having a parent but no child nodes, or
 //. an intermediate node, having a parent and one or more child nodes.  The
-//. parent node is the {\tt DwField} object that contains it.  Child nodes,
+//. parent node is the {\tt DwField} object that tqcontains it.  Child nodes,
 //. if present, depend on the particular subclass of {\tt DwFieldBody} that
 //. is instantiated.  A {\tt DwAddressList} object, for example, has
 //. {\tt DwAddress} objects as its child nodes.
diff --git a/mimelib/mimelib/group.h b/mimelib/mimelib/group.h
index 21cf930b8..ea0e7260a 100644
--- a/mimelib/mimelib/group.h
+++ b/mimelib/mimelib/group.h
@@ -47,8 +47,8 @@
 //+ Name DwGroup -- Class representing an RFC-822 address group
 //+ Description
 //. {\tt DwGroup} represents a {\it group} as described in RFC-822.  A group
-//. contains a group name and a (possibly empty) list of {\it mailboxes}.
-//. In MIME++, a {\tt DwGroup} object contains a string for the group name
+//. tqcontains a group name and a (possibly empty) list of {\it mailboxes}.
+//. In MIME++, a {\tt DwGroup} object tqcontains a string for the group name
 //. and a {\tt DwMailboxList} object for the list of mailboxes.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwGroup}
diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h
index f545a3db2..5debab9b8 100644
--- a/mimelib/mimelib/headers.h
+++ b/mimelib/mimelib/headers.h
@@ -87,7 +87,7 @@ class DwText;
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwHeaders}
 //. object is an intermediate node, having both a parent node and several
-//. child nodes.  The parent node is the {\tt DwEntity} object that contains
+//. child nodes.  The parent node is the {\tt DwEntity} object that tqcontains
 //. it.  The child nodes are the {\tt DwField} objects in the list it manages.
 //. (See the man page for {\tt DwMessageComponent} for a discussion of
 //. the tree representation of a message.)
@@ -97,7 +97,7 @@ class DwText;
 //. which creates the {\tt DwHeaders} object for you.
 //.
 //. While {\tt DwHeaders} has public member functions for managing the list
-//. of {\tt DwField} objects it contains, you will normally use convenience
+//. of {\tt DwField} objects it tqcontains, you will normally use convenience
 //. functions to access the field bodies of the header fields directly.
 //. You can access the field body for a specific well-known header field
 //. by using the member function {\tt ()}, where {\tt } is
@@ -347,7 +347,7 @@ public:
 
     void AddOrReplaceField(DwField* aField);
     //. Adds a {\tt DwField} object to the list.  If a header field with
-    //. the same field name already exists, it is replaced by the new
+    //. the same field name already exists, it is tqreplaced by the new
     //. header field.
     //.
     //. {\tt DwHeaders} takes responsibility for deleting the added
@@ -359,7 +359,7 @@ public:
 
     void AddField(DwField* aField);
     //. Adds a {\tt DwField} object to the list. If a header field with
-    //. the same field name already exists, it is {\it not} replaced;
+    //. the same field name already exists, it is {\it not} tqreplaced;
     //. thus, duplicate header fields may occur when using this member
     //. function.  (This is what you want for some header fields, such as
     //. the "Received" header field).
diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h
index 7e38ae4b4..2ef28258c 100644
--- a/mimelib/mimelib/mailbox.h
+++ b/mimelib/mimelib/mailbox.h
@@ -41,7 +41,7 @@
 //+ Description
 //. RFC-822 defines a {\it mailbox} as an entity that can be the recipient
 //. of a message.  A mailbox is more specific than an {\it address}, which
-//. may be either a mailbox or a {\it group}.  An RFC-822 mailbox contains
+//. may be either a mailbox or a {\it group}.  An RFC-822 mailbox tqcontains
 //. a full name, a {\it local-part}, an optional {\it route}, and a
 //. {\it domain}.  For example, in the mailbox
 //.
@@ -53,7 +53,7 @@
 //.
 //. In MIME++, an RFC-822 mailbox is represented by a {\tt DwMailbox} object.
 //. {\tt DwMailbox} is a subclass of {\tt DwAddress}, which reflects the
-//. fact that a mailbox is also an address.  A {\tt DwMailbox} contains
+//. fact that a mailbox is also an address.  A {\tt DwMailbox} tqcontains
 //. strings representing the full name, local-part, route, and domain
 //. of a mailbox.
 //.
@@ -63,7 +63,7 @@
 //. {\tt DwMailboxList} object.
 //.
 //. {\tt DwMailbox} has member functions for getting or setting the strings
-//. it contains.
+//. it tqcontains.
 //.
 //. {\tt DwMailbox} object can be included in a list of {\tt DwMailbox}
 //. objects.  To get the next {\tt DwMailbox} object in a list, use the
diff --git a/mimelib/mimelib/mboxlist.h b/mimelib/mimelib/mboxlist.h
index 723a8c55d..adbd9363d 100644
--- a/mimelib/mimelib/mboxlist.h
+++ b/mimelib/mimelib/mboxlist.h
@@ -42,7 +42,7 @@
 //+ Description
 //. {\tt DwMailboxList} represents a list of {\it mailboxes} as described
 //. in RFC-822.  In MIME++, {\tt DwMailboxList} is a container for objects
-//. of type {\tt DwMailbox}, and it contains various member functions to
+//. of type {\tt DwMailbox}, and it tqcontains various member functions to
 //. manage its contained objects.  {\tt DwAddressList} is also a
 //. {\tt DwFieldBody}.  This reflects the fact that certain RFC-822 header
 //. fields, such as the "From" header field, have a list of mailboxes as
diff --git a/mimelib/mimelib/mediatyp.h b/mimelib/mimelib/mediatyp.h
index f57b9aa3d..7fa164148 100644
--- a/mimelib/mimelib/mediatyp.h
+++ b/mimelib/mimelib/mediatyp.h
@@ -50,7 +50,7 @@ class DwParameter;
 //.
 //. {\tt DwMediaType} has member functions that allow you to set or get
 //. the type and subtype as either enumerated values or as strings.  It
-//. also contains a list of {\tt DwParameter} objects that represent the
+//. also tqcontains a list of {\tt DwParameter} objects that represent the
 //. parameters of the field body.  You can use convenience functions to
 //. directly access the boundary parameter of a multipart media type, or
 //. to access the name parameter that is often used with several media
diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h
index 5dbd7cc46..17ada56af 100644
--- a/mimelib/mimelib/message.h
+++ b/mimelib/mimelib/message.h
@@ -36,16 +36,16 @@
 //+ Description
 //. {\tt DwMessage} represents an RFC-822/MIME {\it message}.
 //.
-//. A {\it message} contains both a collection of {\it header fields} and
+//. A {\it message} tqcontains both a collection of {\it header fields} and
 //. a {\it body}. In the terminology of RFC-2045, the general term for the
 //. headers-body combination is {\it entity}. In MIME++, {\tt DwMessage}
-//. is a direct subclass of {\tt DwEntity}, and therefore contains both
+//. is a direct subclass of {\tt DwEntity}, and therefore tqcontains both
 //. a {\tt DwHeaders} object and a {\tt DwBody} object.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMessage}
 //. object is almost always a root node, having child nodes but no parent node.
 //. The child nodes are the {\tt DwHeaders} object and the {\tt DwBody} object
-//. it contains.  A {\tt DwMessage} may sometimes be an intermediate node.  In
+//. it tqcontains.  A {\tt DwMessage} may sometimes be an intermediate node.  In
 //. this special case, the parent node is a {\tt DwBody} object of type
 //. "message/*" and the {\tt DwMessage} object represents an encapsulated
 //. message.
diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h
index c9e6707ee..cc2cefb23 100644
--- a/mimelib/mimelib/msgcmp.h
+++ b/mimelib/mimelib/msgcmp.h
@@ -98,7 +98,7 @@
 //.    A collection of headers is part of a message or body part, a header
 //.    field is part of a collection of headers, a field-body is part
 //.    of a header field, and so on.  The parent of
-//.    a component is the component that contains it.  This tree structure
+//.    a component is the component that tqcontains it.  This tree structure
 //.    is important, since a component's parent must be parsed before the
 //.    component can be.  Also, a component's string representation must
 //.    be assembled before its parent's.  To maintain consistency in the
@@ -269,7 +269,7 @@ protected:
     // Is-modified flag
 
     DwMessageComponent* mParent;
-    // Component that contains this component
+    // Component that tqcontains this component
 
     componentType mClassId;
     // Class identifier for runtime type identification
diff --git a/mimelib/mimelib/msgid.h b/mimelib/mimelib/msgid.h
index de066cdbc..7e891bbf4 100644
--- a/mimelib/mimelib/msgid.h
+++ b/mimelib/mimelib/msgid.h
@@ -36,7 +36,7 @@
 //+ Description
 //. {\tt DwMsgId} represents a {\it msg-id} as described in RFC-822.  In
 //. the BNF grammar in RFC-822, a msg-id has a {\it local-part} and a
-//. {\it domain}.  In MIME++, a {\tt DwMsgId} contains strings that
+//. {\it domain}.  In MIME++, a {\tt DwMsgId} tqcontains strings that
 //. contain the local-part and the domain.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMsgId}
diff --git a/mimelib/mimelib/nntp.h b/mimelib/mimelib/nntp.h
index a2c17b78b..bd617903b 100644
--- a/mimelib/mimelib/nntp.h
+++ b/mimelib/mimelib/nntp.h
@@ -368,7 +368,7 @@ private:
     DwObserver* mObserver;
 
     virtual int PGetLine(char** aPtr, int* aLen);
-    virtual void PGetStatusResponse();
+    virtual void PGeStatusResponse();
     virtual void PGetTextResponse();
 
 };
diff --git a/mimelib/mimelib/string.h b/mimelib/mimelib/string.h
index 35be8e0b6..83242c6a9 100644
--- a/mimelib/mimelib/string.h
+++ b/mimelib/mimelib/string.h
@@ -88,7 +88,7 @@ public:
 //. other string classes.  {\tt DwString} also handles binary data, which can
 //. contain embedded NUL characters.
 //=============================================================================
-//+ Noentry _copy _replace Length AsCharBuf Substring Prefix Suffix Prepend
+//+ Noentry _copy _tqreplace Length AsCharBuf Substring Prefix Suffix Prepend
 //+ Noentry Append Insert Replace Delete mRep mStart mLength sEmptyString
 //+ Noentry ~DwString
 
@@ -285,13 +285,13 @@ public:
     //. available.
     //. Returns {\tt *this}.
 
-    DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr);
-    DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr,
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr,
         size_t aPos2, size_t aLen2);
-    DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf,
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf,
         size_t aLen2);
-    DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr);
-    DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
     //. Removes {\tt aLen1} characters beginning at position {\tt aPos1}
     //. and inserts other characters.
     //. Returns {\tt *this}.
@@ -453,7 +453,7 @@ public:
     //. string {\tt aCstr}.
 
     DwString substr(size_t aPos=0, size_t aLen=npos) const;
-    //. Returns a string that contains at most {\tt aLen} characters from
+    //. Returns a string that tqcontains at most {\tt aLen} characters from
     //. the {\tt DwString} object beginning at position {\tt aPos}.  The
     //. returned substring will not contain more characters than what are
     //. available in the superstring {\tt DwString} object.
@@ -557,8 +557,8 @@ protected:
     size_t  mLength;
 
     void _copy();
-    void _replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
-    void _replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    void _tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
+    void _tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
 
 private:
     static const size_t kEmptyBufferSize;
diff --git a/mimelib/multipar.cpp b/mimelib/multipar.cpp
index 07514fcf7..75825a841 100644
--- a/mimelib/multipar.cpp
+++ b/mimelib/multipar.cpp
@@ -305,7 +305,7 @@ void MultipartMessage::SetBodyPart(int aIdx, const MultipartBodyPart& aPart)
     DwBody& body = mMessage->Body();
     int numParts = NumberOfParts();
     DwBodyPart* part = 0;
-    // If indexed part exists already, just replace its values
+    // If indexed part exists already, just tqreplace its values
     if (0 <= aIdx && aIdx < numParts) {
         part = body.FirstBodyPart();
         for (int curIdx=0; curIdx < aIdx; ++curIdx) {
diff --git a/mimelib/nntp.cpp b/mimelib/nntp.cpp
index 56fb5cc9f..a89293ae6 100644
--- a/mimelib/nntp.cpp
+++ b/mimelib/nntp.cpp
@@ -72,7 +72,7 @@ int DwNntpClient::Open(const char* aServer, DwUint16 aPort)
     mStatusResponse = mTextResponse = "";
     int err = DwProtocolClient::Open(aServer, aPort);
     if (! err) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -119,7 +119,7 @@ int DwNntpClient::Article(int aArticleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -144,7 +144,7 @@ int DwNntpClient::Article(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -168,7 +168,7 @@ int DwNntpClient::Head(int aArticleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -192,7 +192,7 @@ int DwNntpClient::Head(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -216,7 +216,7 @@ int DwNntpClient::Body(int articleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -240,7 +240,7 @@ int DwNntpClient::Body(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -264,7 +264,7 @@ int DwNntpClient::Stat(int articleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -285,7 +285,7 @@ int DwNntpClient::Stat(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -306,7 +306,7 @@ int DwNntpClient::Group(const char* aNewsgroupName)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -322,7 +322,7 @@ int DwNntpClient::Help()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 1) {
             PGetTextResponse();
         }
@@ -341,7 +341,7 @@ int DwNntpClient::Last()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -357,7 +357,7 @@ int DwNntpClient::List()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -388,7 +388,7 @@ int DwNntpClient::Newgroups(const char* aDate, const char* aTime,
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -421,7 +421,7 @@ int DwNntpClient::Newnews(const char* aNewsgroups, const char* aDate,
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -440,7 +440,7 @@ int DwNntpClient::Next()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -456,7 +456,7 @@ int DwNntpClient::Post()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -472,7 +472,7 @@ int DwNntpClient::Quit()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -488,7 +488,7 @@ int DwNntpClient::Slave()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -592,12 +592,12 @@ int DwNntpClient::SendData(const char* aBuf, int aBufLen)
 
     // Get the server's response
 
-    PGetStatusResponse();
+    PGeStatusResponse();
     return mReplyCode;
 }
 
 
-void DwNntpClient::PGetStatusResponse()
+void DwNntpClient::PGeStatusResponse()
 {
     mReplyCode = 0;
     mStatusResponse = "";
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 8fa677705..57c546420 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -34,8 +34,8 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent)
   ui = new AttendeeSelectorWidget( this );
   setMainWidget( ui );
 
-  TQGridLayout *layout = static_cast( ui->layout() );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = static_cast( ui->tqlayout() );
+  tqlayout->setMargin( 0 );
 
   ui->addButton->setGuiItem( KStdGuiItem::add() );
   connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) );
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 49b60f5ff..66ed33c30 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -118,7 +118,7 @@ CalendarManager::CalendarManager()
       const TQStringList subResources = (*it)->subresources();
       TQMap prefixSet; // KDE4: QSet
       for ( TQStringList::ConstIterator subIt = subResources.begin(); subIt != subResources.end(); ++subIt ) {
-        if ( !(*subIt).contains( "/.INBOX.directory/" ) )
+        if ( !(*subIt).tqcontains( "/.INBOX.directory/" ) )
           // we don't care about shared folders
           continue;
         prefixSet.insert( (*subIt).left( (*subIt).find( "/.INBOX.directory/" ) ), 0 );
@@ -295,7 +295,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
 
     }
 
-    Attendee* setStatusOnMyself( Incidence* incidence, Attendee* myself,
+    Attendee* seStatusOnMyself( Incidence* incidence, Attendee* myself,
                             Attendee::PartStat status, const TQString &receiver ) const
     {
       Attendee* newMyself = 0;
@@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     bool cancelPastInvites( Incidence *incidence, const TQString &path ) const
     {
       TQString warnStr;
-      TQDateTime now = TQDateTime::currentDateTime();
+      TQDateTime now = TQDateTime::tqcurrentDateTime();
       TQDate today = now.date();
       Event * const event = dynamic_cast( incidence );
       Todo * const todo = dynamic_cast( incidence );
@@ -606,7 +606,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       }
 
       if ( ( myself && myself->RSVP() ) || heuristicalRSVP( incidence ) ) {
-        Attendee* newMyself = setStatusOnMyself( incidence, myself, status, receiver );
+        Attendee* newMyself = seStatusOnMyself( incidence, myself, status, receiver );
         if ( newMyself && status == Attendee::Delegated ) {
           newMyself->setDelegate( delegateString );
           newMyself->setRSVP( delegatorRSVP );
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       if ( status == Attendee::Delegated ) {
         incidence = icalToString( iCal );
         myself = findMyself( incidence, receiver );
-        myself->setStatus( status );
+        myself->seStatus( status );
         myself->setDelegate( delegateString );
         TQString name, email;
         KPIM::getNameAndMail( delegateString, name, email );
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 39a4ab28d..3fd76b8e5 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -104,7 +104,7 @@ namespace {
           writer->queue( contact );
 
           TQString addToLinkText = i18n( "[Add this contact to the addressbook]" );
-          TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).arg( count );
+          TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).arg( count );
           writer->queue(
                 "
    makeLink( op ) +
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 53bb0016f..26c366ab1 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -71,19 +71,19 @@ namespace {
 
 
 
-      TQString addedLineStyle = TQString::fromLatin1(
+      TQString addedLineStyle = TQString::tqfromLatin1(
         "style=\""
         "color: green;\"");
       TQString fileAddStyle( "style=\"font-weight: bold; "
                             "color: green; \"" );
 
-      TQString removedLineStyle = TQString::fromLatin1(
+      TQString removedLineStyle = TQString::tqfromLatin1(
         "style=\""
         "color: red;\"");
       TQString fileRemoveStyle( "style=\"font-weight: bold; "
                                "color: red ;\"" );
 
-      TQString tableStyle = TQString::fromLatin1(
+      TQString tableStyle = TQString::tqfromLatin1(
         "style=\""
         "text-align: -khtml-auto; "
         "border: solid black 1px; "
diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
index 06873fe5e..54efee6c0 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -5,7 +5,7 @@
     
         AttendeeSelectorWidget
     
-    
+    
         
             0
             0
@@ -48,7 +48,7 @@
             
                 attendeeEdit
             
-            
+            
                 
                     250
                     0
@@ -65,7 +65,7 @@
             
                 Expanding
             
-            
+            
                 
                     20
                     140
@@ -77,8 +77,8 @@
 
     libkdepim/addresseelineedit.h
 
-
-
+
+
 
     kpushbutton.h
     kpushbutton.h
diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index dcf74944f..4ab53c3b2 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -347,7 +347,7 @@ EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator )
   setupRulesPage();
   setupChangesPage();
 
-  resize( sizeHint() );
+  resize( tqsizeHint() );
 }
 
 EGroupwareWizard::~EGroupwareWizard()
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index d023a8d71..48ac3b5a7 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -33,14 +33,14 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
 {
   setCaption( i18n( "KDE Groupware Wizard" ) );
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mOverViewPage = new OverViewPage( this );
 
-  layout->addWidget( mOverViewPage );
+  tqlayout->addWidget( mOverViewPage );
 
   connect( mOverViewPage, TQT_SIGNAL( cancel() ),
-           qApp, TQT_SLOT( quit() ) );
+           tqApp, TQT_SLOT( quit() ) );
 
   resize( 400, 200 );
 }
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 79e06f585..4ad256f78 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -280,7 +280,7 @@ void CreateDisconnectedImapAccount::apply()
   es.setSetting( KEMailSettings::EmailAddress, mEmail );
 
   KPIM::IdentityManager identityManager;
-  if ( !identityManager.allEmails().contains( mEmail ) ) {
+  if ( !identityManager.allEmails().tqcontains( mEmail ) ) {
     // Not sure how to name the identity. First one is "Default", next one mAccountName, but then...
     // let's use the server name after that.
     TQString accountName = mAccountName;
@@ -375,8 +375,8 @@ bool CreateImapAccount::writeToWallet(const TQString & type, int id)
   if ( !mWallet || !mWallet->isOpen() ) {
     delete mWallet;
     WId window = 0;
-    if ( qApp->activeWindow() )
-      window = qApp->activeWindow()->winId();
+    if ( tqApp->activeWindow() )
+      window = tqApp->activeWindow()->winId();
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
     if ( !mWallet )
       return false;
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index e8a452b16..59b7a2514 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -72,7 +72,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
         c.writeEntry( "Default domain", basedn );
       }
 
-      basedn.replace(".",",dc=");
+      basedn.tqreplace(".",",dc=");
       basedn.prepend("dc=");
 
       // Set the changes
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 2ee90096b..e0a544ad9 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -42,54 +42,54 @@
 OverViewPage::OverViewPage( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   const TQString msg = i18n( "KDE Groupware Wizard" );
   TQLabel *label = new TQLabel( "
    " + msg + "
    " , this );
-  layout->addMultiCellWidget( label, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 );
 
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
 
   label = new TQLabel( "", this );
-  layout->addWidget( label, 1, 0 );
-  layout->setRowSpacing( 1, 20 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->setRowSpacing( 1, 20 );
 
   label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this );
-  layout->addMultiCellWidget( label, 2, 2, 0, 3 );
+  tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n("eGroupware"), this );
-  layout->addMultiCellWidget( button, 3, 3, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
 
   // FIXME: Maybe hyperlinks would be better than buttons.
 
   button = new TQPushButton( i18n("Kolab"), this );
-  layout->addMultiCellWidget( button, 4, 4, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
 
   button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
-  layout->addMultiCellWidget( button, 5, 5, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
 
   button = new TQPushButton( i18n("Microsoft Exchange"), this );
   button->hide(); // not quite ready yet
-  layout->addMultiCellWidget( button, 6, 6, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
 
 
   TQFrame *frame = new TQFrame( this );
   frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addMultiCellWidget( frame, 7, 7, 0, 3 );
+  tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 );
 
   TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
-  layout->addWidget( cancelButton, 8, 3 );
+  tqlayout->addWidget( cancelButton, 8, 3 );
 
   connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
 
-  layout->setRowStretch( 7, 1 );
+  tqlayout->setRowStretch( 7, 1 );
 
   KAcceleratorManager::manage( this );
 }
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index dfc638f70..beb059481 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -200,12 +200,12 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
 
     void apply()
     {
-      TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
+      TQMessageBox *msg = new TQMessageBox( tqApp->mainWidget() );
       msg->setText( "Preparing initial synchronization with Scalix server..." );
       msg->show();
-      qApp->processEvents();
+      tqApp->processEvents();
       sleep( 1 );
-      qApp->processEvents();
+      tqApp->processEvents();
 
       TQString error;
       TQCString dcopService;
diff --git a/wizards/servertype.h b/wizards/servertype.h
index 245036664..8e6954b4c 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -50,7 +50,7 @@ class ServerType : public QObject
     };
 
     /**
-      This map contains the uids and the user visible names
+      This map tqcontains the uids and the user visible names
       of a server type.
      */
     typedef TQValueList ConnectionInfoList;