summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--akregator/src/actionmanagerimpl.cpp98
-rw-r--r--akregator/src/addfeeddialog.cpp4
-rw-r--r--akregator/src/akregator_part.cpp38
-rw-r--r--akregator/src/akregator_view.cpp26
-rw-r--r--akregator/src/articleviewer.cpp126
-rw-r--r--akregator/src/dragobjects.h2
-rw-r--r--akregator/src/feedlistview.cpp2
-rw-r--r--akregator/src/folder.cpp2
-rw-r--r--akregator/src/librss/feeddetector.cpp2
-rw-r--r--akregator/src/librss/tools_p.cpp10
-rw-r--r--akregator/src/listtabwidget.cpp2
-rw-r--r--akregator/src/mainwindow.cpp12
-rw-r--r--akregator/src/notificationmanager.cpp6
-rw-r--r--akregator/src/pageviewer.cpp10
-rw-r--r--akregator/src/pluginmanager.cpp16
-rw-r--r--akregator/src/propertiesdialog.cpp2
-rw-r--r--akregator/src/tabwidget.cpp10
-rw-r--r--akregator/src/trayicon.cpp6
-rw-r--r--akregator/src/treenode.cpp4
-rw-r--r--akregator/src/viewer.cpp8
-rw-r--r--certmanager/certificateinfowidgetimpl.cpp14
-rw-r--r--certmanager/certificatewizardimpl.cpp18
-rw-r--r--certmanager/certmanager.cpp128
-rw-r--r--certmanager/conf/appearanceconfigwidgetbase.ui6
-rw-r--r--certmanager/conf/dirservconfigpage.cpp4
-rw-r--r--certmanager/hierarchyanalyser.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp28
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp8
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/obtainkeysjob.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmebackend.cpp10
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp8
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmejob.cpp10
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp10
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp2
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp10
-rw-r--r--certmanager/lib/kleo/dn.cpp2
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp4
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp2
-rw-r--r--certmanager/lib/tests/test_keygen.cpp2
-rw-r--r--certmanager/lib/tests/test_keylister.cpp2
-rw-r--r--certmanager/lib/ui/adddirectoryservicedialogimpl.cpp2
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp6
-rw-r--r--certmanager/lib/ui/directoryserviceswidgetbase.ui16
-rw-r--r--certmanager/lib/ui/kdhorizontalline.cpp10
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp2
-rw-r--r--certmanager/lib/ui/keylistview.cpp4
-rw-r--r--certmanager/lib/ui/keyrequester.cpp2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp8
-rw-r--r--certmanager/lib/ui/messagebox.cpp8
-rw-r--r--certmanager/lib/ui/progressdialog.cpp2
-rw-r--r--certmanager/storedtransferjob.cpp2
-rw-r--r--dependency-graph.dot2
-rw-r--r--kaddressbook/addresseditwidget.cpp16
-rw-r--r--kaddressbook/addresseeeditordialog.cpp2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp14
-rw-r--r--kaddressbook/addviewdialog.cpp2
-rw-r--r--kaddressbook/common/filter.cpp8
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp2
-rw-r--r--kaddressbook/customfieldswidget.cpp14
-rw-r--r--kaddressbook/distributionlisteditor.cpp6
-rw-r--r--kaddressbook/distributionlistentryview.cpp4
-rw-r--r--kaddressbook/distributionlistpicker.cpp4
-rw-r--r--kaddressbook/editors/imaddresswidget.cpp2
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp2
-rw-r--r--kaddressbook/emaileditwidget.cpp2
-rw-r--r--kaddressbook/extensionmanager.cpp4
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp2
-rw-r--r--kaddressbook/features/resourceselection.cpp8
-rw-r--r--kaddressbook/filtereditdialog.cpp8
-rw-r--r--kaddressbook/geowidget.cpp12
-rw-r--r--kaddressbook/imagewidget.cpp4
-rw-r--r--kaddressbook/jumpbuttonbar.cpp6
-rw-r--r--kaddressbook/kabcore.cpp36
-rw-r--r--kaddressbook/kabtools.cpp2
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbook_part.h4
-rw-r--r--kaddressbook/kaddressbookmain.cpp6
-rw-r--r--kaddressbook/kaddressbookmain.h4
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp10
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp8
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp6
-rw-r--r--kaddressbook/keywidget.cpp4
-rw-r--r--kaddressbook/ldapsearchdialog.cpp20
-rw-r--r--kaddressbook/phoneeditwidget.cpp8
-rw-r--r--kaddressbook/printing/mikesstyle.cpp2
-rw-r--r--kaddressbook/printing/selectionpage.cpp2
-rw-r--r--kaddressbook/printing/stylepage.cpp4
-rw-r--r--kaddressbook/searchmanager.cpp8
-rw-r--r--kaddressbook/typecombo.h4
-rw-r--r--kaddressbook/undocmds.cpp6
-rw-r--r--kaddressbook/viewmanager.cpp18
-rw-r--r--kaddressbook/views/cardview.cpp32
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp6
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
-rw-r--r--kaddressbook/views/contactlistview.cpp12
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp8
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp8
-rw-r--r--kaddressbook/xxport/eudora_xxport.cpp8
-rw-r--r--kaddressbook/xxport/gnokii_xxport.cpp134
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp2
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp10
-rw-r--r--kaddressbook/xxport/opera_xxport.cpp2
-rw-r--r--kaddressbook/xxport/pab_pablib.cpp4
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp12
-rw-r--r--kaddressbook/xxportmanager.cpp6
-rw-r--r--kaddressbook/xxportselectdialog.cpp4
-rw-r--r--kalarm/alarmcalendar.cpp24
-rw-r--r--kalarm/alarmevent.cpp42
-rw-r--r--kalarm/alarmlistview.cpp10
-rw-r--r--kalarm/alarmtimewidget.cpp16
-rw-r--r--kalarm/birthdaydlg.cpp8
-rw-r--r--kalarm/daemon.cpp10
-rw-r--r--kalarm/dcophandler.cpp11
-rw-r--r--kalarm/deferdlg.cpp2
-rw-r--r--kalarm/editdlg.cpp36
-rw-r--r--kalarm/emailidcombo.cpp2
-rw-r--r--kalarm/find.cpp16
-rw-r--r--kalarm/functions.cpp16
-rw-r--r--kalarm/kalarm.h2
-rw-r--r--kalarm/kalarmapp.cpp90
-rw-r--r--kalarm/kalarmd/adcalendar.cpp2
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp2
-rw-r--r--kalarm/kamail.cpp38
-rw-r--r--kalarm/lib/checkbox.cpp6
-rw-r--r--kalarm/lib/checkbox.h2
-rw-r--r--kalarm/lib/colourcombo.cpp4
-rw-r--r--kalarm/lib/colourlist.h2
-rw-r--r--kalarm/lib/combobox.cpp2
-rw-r--r--kalarm/lib/dateedit.cpp4
-rw-r--r--kalarm/lib/datetime.h2
-rw-r--r--kalarm/lib/label.cpp4
-rw-r--r--kalarm/lib/lineedit.cpp4
-rw-r--r--kalarm/lib/pushbutton.cpp6
-rw-r--r--kalarm/lib/pushbutton.h2
-rw-r--r--kalarm/lib/radiobutton.cpp6
-rw-r--r--kalarm/lib/radiobutton.h2
-rw-r--r--kalarm/lib/shellprocess.cpp2
-rw-r--r--kalarm/lib/slider.cpp2
-rw-r--r--kalarm/lib/spinbox.cpp10
-rw-r--r--kalarm/lib/spinbox2.cpp16
-rw-r--r--kalarm/lib/timespinbox.cpp2
-rw-r--r--kalarm/mainwindow.cpp82
-rw-r--r--kalarm/messagewin.cpp26
-rw-r--r--kalarm/prefdlg.cpp40
-rw-r--r--kalarm/recurrenceedit.cpp8
-rw-r--r--kalarm/sounddlg.cpp6
-rw-r--r--kalarm/soundpicker.cpp10
-rw-r--r--kalarm/templatedlg.cpp4
-rw-r--r--kalarm/traywindow.cpp20
-rw-r--r--kalarm/undo.cpp4
-rw-r--r--kandy/src/atcommand.cpp2
-rw-r--r--kandy/src/cmdpropertiesdialog_base.ui6
-rw-r--r--kandy/src/kandy.cpp30
-rw-r--r--kandy/src/kandyview.cpp6
-rw-r--r--kandy/src/mobilemain.cpp12
-rw-r--r--kandy/src/modem.cpp16
-rw-r--r--karm/desktoptracker.cpp6
-rw-r--r--karm/edittaskdialog.cpp4
-rw-r--r--karm/idletimedetector.cpp2
-rw-r--r--karm/kaccelmenuwatch.cpp4
-rw-r--r--karm/karm_part.cpp48
-rw-r--r--karm/karmstorage.cpp44
-rw-r--r--karm/ktimewidget.cpp2
-rw-r--r--karm/mainwindow.cpp64
-rw-r--r--karm/print.cpp2
-rw-r--r--karm/printdialog.cpp2
-rw-r--r--karm/taskview.cpp28
-rw-r--r--karm/timekard.cpp44
-rw-r--r--karm/tray.cpp4
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.cpp84
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.h10
-rw-r--r--kdgantt/KDGanttSemiSizingControl.cpp18
-rw-r--r--kdgantt/KDGanttView.cpp6
-rw-r--r--kdgantt/KDGanttViewItem.cpp12
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp82
-rw-r--r--kdgantt/KDGanttViewTaskLink.cpp6
-rw-r--r--kdgantt/KDGanttXMLTools.cpp102
-rw-r--r--kdgantt/KDGanttXMLTools.h10
-rw-r--r--kfile-plugins/vcf/kfile_vcf.cpp2
-rw-r--r--kgantt/kgantt/KGanttItem.cpp2
-rw-r--r--kgantt/kgantt/xQGanttBarView.cpp8
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort.cpp24
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort_Events.cpp18
-rw-r--r--kgantt/kgantt/xQGanttListViewPort.h2
-rw-r--r--kioslaves/imap4/imap4.cc82
-rw-r--r--kioslaves/imap4/imapparser.cc4
-rw-r--r--kioslaves/imap4/imapparser.h8
-rw-r--r--kioslaves/imap4/mailheader.cc10
-rw-r--r--kioslaves/imap4/mimehdrline.cc4
-rw-r--r--kioslaves/imap4/mimeheader.cc2
-rw-r--r--kioslaves/imap4/mimeio.cc2
-rw-r--r--kioslaves/imap4/rfcdecoder.cc10
-rw-r--r--kioslaves/mbox/stat.cc6
-rw-r--r--kioslaves/mbox/urlinfo.cc2
-rw-r--r--kioslaves/sieve/sieve.cpp20
-rw-r--r--kitchensync/libqopensync/group.cpp4
-rw-r--r--kitchensync/opensyncdbus/dbusclient.cpp12
-rw-r--r--kitchensync/src/aboutpage.cpp56
-rw-r--r--kitchensync/src/configguievo2.cpp6
-rw-r--r--kitchensync/src/configguigpe.cpp10
-rw-r--r--kitchensync/src/configguijescs.cpp8
-rw-r--r--kitchensync/src/configguildap.cpp26
-rw-r--r--kitchensync/src/configguimoto.cpp2
-rw-r--r--kitchensync/src/configguipalm.cpp2
-rw-r--r--kitchensync/src/configguisunbird.cpp12
-rw-r--r--kitchensync/src/configguisynce.cpp8
-rw-r--r--kitchensync/src/configguisyncmlobex.cpp4
-rw-r--r--kitchensync/src/genericdiffalgo.cpp6
-rw-r--r--kitchensync/src/groupconfig.cpp4
-rw-r--r--kitchensync/src/groupitem.cpp20
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp22
-rw-r--r--kitchensync/src/kwidgetlist.cpp16
-rw-r--r--kitchensync/src/mainwidget.cpp10
-rw-r--r--kitchensync/src/mainwindow.cpp2
-rw-r--r--kitchensync/src/memberconfig.cpp4
-rw-r--r--kitchensync/src/syncprocessmanager.cpp2
-rw-r--r--kmail/CMakeLists.txt1
-rw-r--r--kmail/accountdialog.cpp24
-rw-r--r--kmail/accountmanager.cpp6
-rw-r--r--kmail/accountwizard.cpp10
-rw-r--r--kmail/actionscheduler.cpp24
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/antispamwizard.cpp10
-rw-r--r--kmail/archivefolderdialog.cpp4
-rw-r--r--kmail/backupjob.cpp26
-rw-r--r--kmail/bodypartformatterfactory.cpp12
-rw-r--r--kmail/cachedimapjob.cpp22
-rw-r--r--kmail/callback.cpp12
-rw-r--r--kmail/chiasmuskeyselector.cpp2
-rw-r--r--kmail/compactionjob.cpp10
-rw-r--r--kmail/configuredialog.cpp38
-rw-r--r--kmail/configuredialog_p.cpp12
-rw-r--r--kmail/csshelper.cpp2
-rw-r--r--kmail/customtemplates.cpp2
-rw-r--r--kmail/distributionlistdialog.cpp2
-rw-r--r--kmail/expirejob.cpp18
-rw-r--r--kmail/favoritefolderview.cpp6
-rw-r--r--kmail/filehtmlwriter.cpp2
-rw-r--r--kmail/filterlogdlg.cpp2
-rw-r--r--kmail/folderdiaacltab.cpp8
-rw-r--r--kmail/folderdiaquotatab.cpp6
-rw-r--r--kmail/folderpropertiesdialog.ui12
-rw-r--r--kmail/folderrequester.cpp4
-rw-r--r--kmail/foldershortcutdialog.cpp2
-rw-r--r--kmail/folderstorage.cpp4
-rw-r--r--kmail/foldertreebase.cpp6
-rw-r--r--kmail/folderutil.cpp2
-rw-r--r--kmail/folderviewtooltip.h10
-rw-r--r--kmail/headeritem.cpp2
-rw-r--r--kmail/headerlistquicksearch.cpp6
-rw-r--r--kmail/headerstyle.cpp114
-rw-r--r--kmail/identitydialog.cpp16
-rw-r--r--kmail/identitylistview.cpp2
-rw-r--r--kmail/imapaccountbase.cpp28
-rw-r--r--kmail/imapjob.cpp8
-rw-r--r--kmail/importjob.cpp20
-rw-r--r--kmail/index.cpp8
-rw-r--r--kmail/interfaces/bodypart.h3
-rw-r--r--kmail/keyresolver.cpp34
-rw-r--r--kmail/kmaccount.cpp8
-rw-r--r--kmail/kmacctimap.cpp20
-rw-r--r--kmail/kmacctlocal.cpp16
-rw-r--r--kmail/kmacctmaildir.cpp12
-rw-r--r--kmail/kmail.kcfg8
-rw-r--r--kmail/kmail_part.cpp4
-rw-r--r--kmail/kmailicalifaceimpl.cpp26
-rw-r--r--kmail/kmcommands.cpp46
-rw-r--r--kmail/kmcomposewin.cpp274
-rw-r--r--kmail/kmedit.cpp22
-rw-r--r--kmail/kmfilter.cpp10
-rw-r--r--kmail/kmfilteraction.cpp50
-rw-r--r--kmail/kmfilterdlg.cpp14
-rw-r--r--kmail/kmfolder.cpp6
-rw-r--r--kmail/kmfoldercachedimap.cpp46
-rw-r--r--kmail/kmfoldercombobox.cpp4
-rw-r--r--kmail/kmfolderdir.cpp6
-rw-r--r--kmail/kmfolderimap.cpp12
-rw-r--r--kmail/kmfolderindex.cpp4
-rw-r--r--kmail/kmfoldermaildir.cpp20
-rw-r--r--kmail/kmfoldermbox.cpp18
-rw-r--r--kmail/kmfoldermgr.cpp8
-rw-r--r--kmail/kmfoldersearch.cpp4
-rw-r--r--kmail/kmfoldertree.cpp24
-rw-r--r--kmail/kmheaders.cpp44
-rw-r--r--kmail/kmkernel.cpp44
-rw-r--r--kmail/kmlineeditspell.cpp2
-rw-r--r--kmail/kmmainwidget.cpp306
-rw-r--r--kmail/kmmainwin.cpp12
-rw-r--r--kmail/kmmessage.cpp56
-rw-r--r--kmail/kmmimeparttree.cpp8
-rw-r--r--kmail/kmmsgbase.cpp30
-rw-r--r--kmail/kmmsginfo.cpp2
-rw-r--r--kmail/kmmsgpartdlg.cpp12
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp4
-rw-r--r--kmail/kmreadermainwin.cpp30
-rw-r--r--kmail/kmreaderwin.cpp200
-rw-r--r--kmail/kmsearchpatternedit.cpp8
-rw-r--r--kmail/kmsender.cpp30
-rw-r--r--kmail/kmservertest.cpp2
-rw-r--r--kmail/kmstartup.cpp16
-rw-r--r--kmail/kmsystemtray.cpp6
-rw-r--r--kmail/kmtransport.cpp10
-rw-r--r--kmail/listjob.cpp4
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp20
-rw-r--r--kmail/mailserviceimpl.h5
-rw-r--r--kmail/managesievescriptsdialog.cpp2
-rw-r--r--kmail/messagecomposer.cpp8
-rw-r--r--kmail/networkaccount.cpp2
-rw-r--r--kmail/newfolderdialog.cpp6
-rw-r--r--kmail/objecttreeparser.cpp114
-rw-r--r--kmail/partNode.cpp8
-rw-r--r--kmail/partnodebodypart.cpp4
-rw-r--r--kmail/popaccount.cpp26
-rw-r--r--kmail/quotajobs.h4
-rw-r--r--kmail/recipientseditor.cpp4
-rw-r--r--kmail/recipientspicker.cpp4
-rw-r--r--kmail/regexplineedit.cpp2
-rw-r--r--kmail/rulewidgethandlermanager.cpp54
-rw-r--r--kmail/searchjob.cpp4
-rw-r--r--kmail/searchwindow.cpp88
-rw-r--r--kmail/sievedebugdialog.cpp8
-rw-r--r--kmail/snippetwidget.cpp40
-rw-r--r--kmail/subscriptiondialog.cpp2
-rw-r--r--kmail/templateparser.cpp26
-rw-r--r--kmail/templatesconfiguration.cpp12
-rw-r--r--kmail/templatesinsertcommand.cpp4
-rw-r--r--kmail/urlhandlermanager.cpp10
-rw-r--r--kmail/util.cpp10
-rw-r--r--kmail/util.h2
-rw-r--r--kmail/vacation.cpp6
-rw-r--r--kmail/vacationdialog.cpp2
-rw-r--r--kmail/xfaceconfigurator.cpp2
-rw-r--r--kmailcvt/filter_evolution.cxx6
-rw-r--r--kmailcvt/filter_evolution_v2.cxx6
-rw-r--r--kmailcvt/filter_kmail_maildir.cxx10
-rw-r--r--kmailcvt/filter_lnotes.cxx6
-rw-r--r--kmailcvt/filter_mailapp.cxx8
-rw-r--r--kmailcvt/filter_mbox.cxx8
-rw-r--r--kmailcvt/filter_oe.cxx12
-rw-r--r--kmailcvt/filter_opera.cxx6
-rw-r--r--kmailcvt/filter_outlook.cxx4
-rw-r--r--kmailcvt/filter_plain.cxx6
-rw-r--r--kmailcvt/filter_pmail.cxx16
-rw-r--r--kmailcvt/filter_sylpheed.cxx8
-rw-r--r--kmailcvt/filter_thebat.cxx10
-rw-r--r--kmailcvt/filter_thunderbird.cxx8
-rw-r--r--kmailcvt/filters.cxx12
-rw-r--r--kmailcvt/kselfilterpage.cpp2
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.cpp40
-rw-r--r--kmobile/devices/skeleton/skeleton.cpp8
-rw-r--r--kmobile/kioslave/kio_mobile.cpp58
-rw-r--r--kmobile/kmobile.cpp30
-rw-r--r--kmobile/kmobileclient.cpp10
-rw-r--r--kmobile/kmobiledevice.cpp28
-rw-r--r--kmobile/kmobiledevice.h9
-rw-r--r--kmobile/kmobileitem.cpp12
-rw-r--r--kmobile/kmobileview.cpp26
-rw-r--r--kmobile/systemtray.cpp4
-rw-r--r--kmobile/testlibkmobile.cpp6
-rw-r--r--knode/articlewidget.cpp100
-rw-r--r--knode/headerview.cpp6
-rw-r--r--knode/knaccountmanager.cpp6
-rw-r--r--knode/knarticlefactory.cpp12
-rw-r--r--knode/knarticlefilter.cpp6
-rw-r--r--knode/knarticlemanager.cpp6
-rw-r--r--knode/knarticlewindow.cpp4
-rw-r--r--knode/kncleanup.cpp6
-rw-r--r--knode/kncollectionview.cpp6
-rw-r--r--knode/kncomposer.cpp118
-rw-r--r--knode/knconfig.cpp20
-rw-r--r--knode/knconfigwidgets.cpp18
-rw-r--r--knode/knconvert.cpp6
-rw-r--r--knode/knfilterdialog.cpp2
-rw-r--r--knode/knfiltermanager.cpp2
-rw-r--r--knode/knfolder.cpp6
-rw-r--r--knode/knfoldermanager.cpp4
-rw-r--r--knode/kngroup.cpp14
-rw-r--r--knode/kngroup.h2
-rw-r--r--knode/kngroupbrowser.cpp2
-rw-r--r--knode/kngroupdialog.cpp6
-rw-r--r--knode/kngroupmanager.cpp2
-rw-r--r--knode/kngrouppropdlg.cpp2
-rw-r--r--knode/kngroupselectdialog.cpp4
-rw-r--r--knode/knhdrviewitem.cpp2
-rw-r--r--knode/knmainwidget.cpp156
-rw-r--r--knode/knnntpaccount.cpp2
-rw-r--r--knode/knnntpclient.cpp16
-rw-r--r--knode/knode.cpp6
-rw-r--r--knode/knode_part.cpp4
-rw-r--r--knode/knprotocolclient.cpp6
-rw-r--r--knode/knserverinfo.cpp2
-rw-r--r--knode/knwidgets.cpp2
-rw-r--r--knode/utilities.cpp4
-rw-r--r--knotes/knote.cpp90
-rw-r--r--knotes/knotealarmdlg.cpp2
-rw-r--r--knotes/knotebutton.cpp8
-rw-r--r--knotes/knoteconfigdlg.cpp2
-rw-r--r--knotes/knoteedit.cpp54
-rw-r--r--knotes/knoteprinter.cpp2
-rw-r--r--knotes/knotesapp.cpp50
-rw-r--r--knotes/knotesnetrecv.cpp6
-rw-r--r--knotes/knotesnetsend.cpp10
-rw-r--r--knotes/resourcelocal.cpp2
-rw-r--r--kode/enum.cpp4
-rw-r--r--kode/kodemain.cpp12
-rw-r--r--kode/kwsdl/compiler.cpp2
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/inputfield.cpp2
-rw-r--r--kode/kwsdl/kung/loader.cpp2
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp2
-rw-r--r--kode/kxml_compiler/parser.cpp10
-rw-r--r--konsolekalendar/konsolekalendar.cpp37
-rw-r--r--konsolekalendar/konsolekalendaradd.cpp20
-rw-r--r--konsolekalendar/konsolekalendarchange.cpp36
-rw-r--r--konsolekalendar/konsolekalendardelete.cpp18
-rw-r--r--konsolekalendar/konsolekalendarepoch.cpp6
-rw-r--r--konsolekalendar/main.cpp84
-rw-r--r--kontact/interfaces/core.cpp8
-rw-r--r--kontact/interfaces/summary.cpp4
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp4
-rw-r--r--kontact/plugins/karm/karm_plugin.cpp2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp6
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h2
-rw-r--r--kontact/plugins/knotes/knotes_plugin.cpp2
-rw-r--r--kontact/plugins/knotes/knotetip.cpp8
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp4
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp4
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp12
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp10
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp12
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp6
-rw-r--r--kontact/plugins/kpilot/kpilot_plugin.cpp2
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp2
-rw-r--r--kontact/plugins/newsticker/newsticker_plugin.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp4
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp6
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp6
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp24
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp2
-rw-r--r--kontact/plugins/test/test_plugin.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp16
-rw-r--r--kontact/plugins/weather/weather_plugin.cpp2
-rw-r--r--kontact/src/aboutdialog.cpp6
-rw-r--r--kontact/src/iconsidepane.cpp8
-rw-r--r--kontact/src/kcmkontact.cpp2
-rw-r--r--kontact/src/main.cpp2
-rw-r--r--kontact/src/mainwindow.cpp100
-rw-r--r--kontact/src/profiledialog.cpp8
-rw-r--r--kontact/src/profilemanager.cpp2
-rw-r--r--korganizer/actionmanager.cpp174
-rw-r--r--korganizer/calendarview.cpp66
-rw-r--r--korganizer/datenavigatorcontainer.cpp2
-rw-r--r--korganizer/eventarchiver.cpp8
-rw-r--r--korganizer/filtereditdialog.cpp2
-rw-r--r--korganizer/freebusymanager.cpp8
-rw-r--r--korganizer/freebusyurldialog.cpp2
-rw-r--r--korganizer/history.cpp6
-rw-r--r--korganizer/importdialog.cpp4
-rw-r--r--korganizer/interfaces/korganizer/part.h2
-rw-r--r--korganizer/journalentry.cpp6
-rw-r--r--korganizer/kdatenavigator.cpp4
-rw-r--r--korganizer/koagenda.cpp68
-rw-r--r--korganizer/koagendaitem.cpp12
-rw-r--r--korganizer/koagendaview.cpp10
-rw-r--r--korganizer/koagendaview.h3
-rw-r--r--korganizer/koapp.cpp2
-rw-r--r--korganizer/koattendeeeditor.cpp8
-rw-r--r--korganizer/kocore.cpp2
-rw-r--r--korganizer/kodaymatrix.cpp6
-rw-r--r--korganizer/kodialogmanager.cpp4
-rw-r--r--korganizer/koeditoralarms.cpp6
-rw-r--r--korganizer/koeditorattachments.cpp28
-rw-r--r--korganizer/koeditordetails.cpp2
-rw-r--r--korganizer/koeditorfreebusy.cpp8
-rw-r--r--korganizer/koeditorgeneral.cpp8
-rw-r--r--korganizer/koeditorgeneralevent.cpp16
-rw-r--r--korganizer/koeditorgeneraljournal.cpp8
-rw-r--r--korganizer/koeditorgeneraltodo.cpp12
-rw-r--r--korganizer/koeditorrecurrence.cpp20
-rw-r--r--korganizer/koeventeditor.cpp4
-rw-r--r--korganizer/koeventviewer.cpp8
-rw-r--r--korganizer/kogroupware.cpp4
-rw-r--r--korganizer/koincidenceeditor.cpp6
-rw-r--r--korganizer/kolistview.cpp20
-rw-r--r--korganizer/komonthview.cpp14
-rw-r--r--korganizer/koprefs.cpp6
-rw-r--r--korganizer/koprefsdialog.cpp20
-rw-r--r--korganizer/korgac/alarmdialog.cpp6
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.cpp2
-rw-r--r--korganizer/korganizer.cpp8
-rw-r--r--korganizer/korganizer_part.cpp2
-rw-r--r--korganizer/kotodoeditor.cpp2
-rw-r--r--korganizer/kotodoview.cpp4
-rw-r--r--korganizer/kotodoviewitem.cpp2
-rw-r--r--korganizer/kowhatsnextview.cpp14
-rw-r--r--korganizer/mailscheduler.cpp2
-rw-r--r--korganizer/multiagendaview.cpp14
-rw-r--r--korganizer/navigatorbar.cpp4
-rw-r--r--korganizer/plugins/datenums/datenums.cpp4
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp4
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp4
-rw-r--r--korganizer/printing/calprintdefaultplugins.cpp36
-rw-r--r--korganizer/printing/calprinter.cpp2
-rw-r--r--korganizer/printing/calprintpluginbase.cpp36
-rw-r--r--korganizer/resourceview.cpp20
-rw-r--r--korganizer/searchdialog.cpp8
-rw-r--r--korn/account_input.cpp4
-rw-r--r--korn/accountmanager.cpp12
-rw-r--r--korn/boxcontainer.cpp4
-rw-r--r--korn/boxcontaineritem.cpp14
-rw-r--r--korn/dcopdrop.cpp2
-rw-r--r--korn/dockeditem.cpp4
-rw-r--r--korn/hvcontainer.cpp2
-rw-r--r--korn/hvitem.cpp4
-rw-r--r--korn/imap_proto.cpp4
-rw-r--r--korn/kconf_update/korn-3-4-config_change.cpp4
-rw-r--r--korn/keditlistboxman.cpp64
-rw-r--r--korn/kio_count.cpp8
-rw-r--r--korn/kio_delete.cpp2
-rw-r--r--korn/kio_read.cpp2
-rw-r--r--korn/kio_single_subject.cpp2
-rw-r--r--korn/kio_single_subject.h3
-rw-r--r--korn/kio_subjects.cpp4
-rw-r--r--korn/kmail_proto.cpp12
-rw-r--r--korn/kornaccountcfgimpl.cpp8
-rw-r--r--korn/kornboxcfgimpl.cpp10
-rw-r--r--korn/korncfgimpl.cpp14
-rw-r--r--korn/kornshell.cpp6
-rw-r--r--korn/maildrop.cpp16
-rw-r--r--korn/mailsubject.cpp2
-rw-r--r--korn/password.cpp8
-rw-r--r--korn/pop3_proto.cpp2
-rw-r--r--korn/subjectsdlg.cpp2
-rw-r--r--kresources/birthdays/resourcekabc.cpp22
-rw-r--r--kresources/blogging/xmlrpcjob.cpp4
-rw-r--r--kresources/caldav/configwidgets.cpp4
-rw-r--r--kresources/caldav/job.cpp6
-rw-r--r--kresources/caldav/resource.cpp32
-rw-r--r--kresources/carddav/configwidgets.cpp4
-rw-r--r--kresources/carddav/job.cpp2
-rw-r--r--kresources/carddav/resource.cpp18
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp8
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp2
-rw-r--r--kresources/egroupware/todostatemapper.cpp2
-rw-r--r--kresources/egroupware/xmlrpciface.cpp8
-rw-r--r--kresources/exchange/dateset.cpp4
-rw-r--r--kresources/exchange/resourceexchange.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp4
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp4
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp6
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp8
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp12
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp6
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp10
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp4
-rw-r--r--kresources/kolab/kcal/incidence.cpp2
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp16
-rw-r--r--kresources/kolab/knotes/note.cpp2
-rw-r--r--kresources/kolab/shared/kolabbase.cpp10
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp6
-rw-r--r--kresources/lib/folderconfig.cpp2
-rw-r--r--kresources/lib/folderlister.cpp4
-rw-r--r--kresources/lib/folderlistview.cpp4
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.cpp2
-rw-r--r--kresources/lib/webdavhandler.cpp2
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp12
-rw-r--r--kresources/remote/resourceremote.cpp2
-rw-r--r--kresources/scalix/kabc/contact.cpp28
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp2
-rw-r--r--kresources/scalix/kioslave/scalix.cpp16
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp10
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp4
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp2
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp2
-rw-r--r--kresources/scalix/scalixadmin/settings.cpp4
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp2
-rw-r--r--kresources/scalix/shared/scalixbase.cpp8
-rw-r--r--kresources/slox/kabcresourceslox.cpp4
-rw-r--r--kresources/slox/kcalresourceslox.cpp2
-rw-r--r--kresources/slox/webdavhandler.cpp4
-rw-r--r--ktnef/gui/attachpropertydialog.cpp2
-rw-r--r--ktnef/gui/ktnefmain.cpp32
-rw-r--r--ktnef/gui/qwmf.cpp62
-rw-r--r--ktnef/lib/ktnefmessage.cpp2
-rw-r--r--ktnef/lib/ktnefparser.cpp14
-rw-r--r--libemailfunctions/email.cpp8
-rw-r--r--libkcal/attachmenthandler.cpp4
-rw-r--r--libkcal/calformat.cpp6
-rw-r--r--libkcal/calhelper.cpp2
-rw-r--r--libkcal/confirmsavedialog.cpp2
-rw-r--r--libkcal/convertqtopia.cpp2
-rw-r--r--libkcal/dndfactory.cpp6
-rw-r--r--libkcal/exceptions.cpp2
-rw-r--r--libkcal/htmlexport.cpp22
-rw-r--r--libkcal/icalformat.cpp4
-rw-r--r--libkcal/icalformatimpl.cpp16
-rw-r--r--libkcal/incidencebase.cpp2
-rw-r--r--libkcal/incidenceformatter.cpp382
-rw-r--r--libkcal/person.cpp2
-rw-r--r--libkcal/qtopiaformat.cpp2
-rw-r--r--libkcal/recurrencerule.h16
-rw-r--r--libkcal/resourcecached.cpp4
-rw-r--r--libkcal/resourcecachedconfig.cpp4
-rw-r--r--libkcal/resourcecalendar.cpp6
-rw-r--r--libkcal/resourcelocalconfig.cpp4
-rw-r--r--libkcal/scheduler.cpp12
-rw-r--r--libkcal/vcalformat.cpp6
-rw-r--r--libkdenetwork/gpgmepp/CMakeLists.txt2
-rw-r--r--libkdenetwork/qgpgme/dataprovider.cpp2
-rw-r--r--libkdepim/addresseeemailselection.cpp10
-rw-r--r--libkdepim/addresseelineedit.cpp36
-rw-r--r--libkdepim/addresseeselector.cpp10
-rw-r--r--libkdepim/addresseeview.cpp112
-rw-r--r--libkdepim/addressesdialog.cpp2
-rw-r--r--libkdepim/broadcaststatus.cpp24
-rw-r--r--libkdepim/completionordereditor.cpp10
-rw-r--r--libkdepim/csshelper.cpp54
-rw-r--r--libkdepim/designerfields.cpp14
-rw-r--r--libkdepim/distributionlist.cpp2
-rw-r--r--libkdepim/embeddedurlpage.cpp4
-rw-r--r--libkdepim/htmldiffalgodisplay.cpp22
-rw-r--r--libkdepim/kaddrbook.cpp6
-rw-r--r--libkdepim/kcmdesignerfields.cpp32
-rw-r--r--libkdepim/kdateedit.cpp8
-rw-r--r--libkdepim/kdepim.widgets2
-rw-r--r--libkdepim/kfileio.cpp54
-rw-r--r--libkdepim/kfoldertree.cpp8
-rw-r--r--libkdepim/kincidencechooser.cpp8
-rw-r--r--libkdepim/komposer/core/pluginmanager.cpp2
-rw-r--r--libkdepim/komposer/plugins/default/defaulteditor.cpp4
-rw-r--r--libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp2
-rw-r--r--libkdepim/kpixmapregionselectorwidget.cpp18
-rw-r--r--libkdepim/kprefsdialog.cpp2
-rw-r--r--libkdepim/kregexp3.cpp10
-rw-r--r--libkdepim/kscoring.cpp16
-rw-r--r--libkdepim/kscoringeditor.cpp2
-rw-r--r--libkdepim/ksubscription.cpp2
-rw-r--r--libkdepim/ktimeedit.cpp6
-rw-r--r--libkdepim/kwidgetlister.cpp2
-rw-r--r--libkdepim/ldapclient.cpp56
-rw-r--r--libkdepim/ldapsearchdialog.cpp22
-rw-r--r--libkdepim/linklocator.cpp6
-rw-r--r--libkdepim/overlaywidget.cpp2
-rw-r--r--libkdepim/qutf7codec.cpp2
-rw-r--r--libkdepim/sendsmsdialog.cpp8
-rw-r--r--libkdepim/statusbarprogresswidget.cpp2
-rw-r--r--libkholidays/kholidays.cpp2
-rw-r--r--libkmime/kmime_codecs.cpp2
-rw-r--r--libkmime/kmime_content.cpp6
-rw-r--r--libkmime/kmime_header_parsing.cpp8
-rw-r--r--libkmime/kmime_headers.cpp16
-rw-r--r--libkmime/kmime_parsers.cpp16
-rw-r--r--libkmime/kmime_util.cpp12
-rw-r--r--libkmime/kqcstringsplitter.cpp8
-rw-r--r--libkpgp/kpgp.cpp24
-rw-r--r--libkpgp/kpgpbase2.cpp10
-rw-r--r--libkpgp/kpgpbase5.cpp6
-rw-r--r--libkpgp/kpgpbaseG.cpp14
-rw-r--r--libkpgp/kpgpui.cpp28
-rw-r--r--libkpimexchange/core/CMakeLists.txt2
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp2
-rw-r--r--libkpimexchange/core/exchangedownload.cpp14
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp4
-rw-r--r--libkpimexchange/core/exchangeprogress.cpp2
-rw-r--r--libkpimexchange/core/exchangeupload.cpp12
-rw-r--r--libkpimidentities/identity.cpp2
-rw-r--r--libkpimidentities/identitycombo.cpp8
-rw-r--r--libkpimidentities/identitymanager.cpp2
-rw-r--r--libksieve/shared/error.cpp30
-rw-r--r--libksieve/tests/parsertest.cpp2
-rw-r--r--mimelib/CMakeLists.txt2
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp28
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp8
-rw-r--r--wizards/groupwisewizard.cpp6
-rw-r--r--wizards/kmailchanges.cpp16
-rw-r--r--wizards/kolabkmailchanges.cpp2
-rw-r--r--wizards/kolabwizard.cpp8
-rw-r--r--wizards/scalixkmailchanges.cpp2
-rw-r--r--wizards/scalixwizard.cpp8
698 files changed, 5005 insertions, 4993 deletions
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index bb4741ed..09a9b3cd 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -199,7 +199,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
if (!d->tagActions.tqcontains(tag.id()))
{
- d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
+ d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
d->tagMenu->insert(d->tagActions[tag.id()]);
}
}
@@ -281,51 +281,51 @@ void ActionManagerImpl::initView(View* view)
d->view = view;
// tag actions
- new KAction(i18n("&New Tag..."), "", "", d->view, TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
+ new KAction(i18n("&New Tag..."), "", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
// Feed/Feed Group popup menu
- new KAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
- new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
- new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", d->view, TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
- new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", d->view, TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
- new KAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
+ new KAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
+ new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
+ new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
+ new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
+ new KAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
- KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
+ KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);
- ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
+ ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);
- ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
+ ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
ra->setExclusiveGroup( "ViewMode" );
vm->insert(ra);
// toolbar / feed menu
- new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), d->view, TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
- new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", d->view, TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
+ new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
+ new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
stopAction->setEnabled(false);
- new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
- new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
+ new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
+ new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
// Settings menu
- KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
+ KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
sqf->setChecked( Settings::showQuickFilter() );
- new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
- new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
- new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
- new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
+ new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
+ new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
+ new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
+ new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
- new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
- new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
+ new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
+ new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
- new KAction(i18n("&Delete"), "editdelete", "Delete", d->view, TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
+ new KAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
if (Settings::showTaggingGUI())
{
@@ -335,7 +335,7 @@ void ActionManagerImpl::initView(View* view)
KActionMenu* statusMenu = new KActionMenu ( i18n( "&Mark As" ),
actionCollection(), "article_set_status" );
- d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
+ d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
abortTTS->setEnabled(false);
@@ -345,29 +345,29 @@ void ActionManagerImpl::initView(View* view)
statusMenu->insert(new KAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
i18n("Mark selected article as read")),
- "Ctrl+E", d->view, TQT_SLOT(slotSetSelectedArticleRead()),
+ "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()),
actionCollection(), "article_set_status_read"));
statusMenu->insert(new KAction(KGuiItem(i18n("&New"), "",
i18n("Mark selected article as new")),
- "Ctrl+N", d->view, TQT_SLOT(slotSetSelectedArticleNew()),
+ "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()),
actionCollection(), "article_set_status_new" ));
statusMenu->insert(new KAction(KGuiItem(i18n("&Unread"), "",
i18n("Mark selected article as unread")),
- "Ctrl+U", d->view, TQT_SLOT(slotSetSelectedArticleUnread()),
+ "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()),
actionCollection(), "article_set_status_unread"));
KToggleAction* importantAction = new KToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
importantAction->setCheckedState(i18n("Remove &Important Mark"));
- connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));
+ connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool)));
- new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
- new KAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
- new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
- new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
+ new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
+ new KAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
+ new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
+ new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
}
void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
else
d->articleList = articleList;
- new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
- new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
+ new KAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
+ new KAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
}
void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -396,17 +396,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
else
d->listTabWidget = listTabWidget;
- new KAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
- new KAction(i18n("&Next Feed"), "", "N", listTabWidget, TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
- new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
- new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
-
- new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
- new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
- new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
- new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
- new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
- new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
+ new KAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
+ new KAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
+ new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
+ new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
+
+ new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
+ new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
+ new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
+ new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
+ new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
+ new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
}
void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -416,11 +416,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
else
d->tabWidget = tabWidget;
- new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
- new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
- new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
- new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
- new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
+ new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
+ new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
+ new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
+ new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
+ new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
}
TQWidget* ActionManagerImpl::container(const char* name)
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 78a80103..8c5f4d4b 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( )
feedURL.prepend("http://");
f->setXmlUrl(feedURL);
- widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
+ widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) );
connect( feed, TQT_SIGNAL(fetched(Feed* )),
this, TQT_SLOT(fetchCompleted(Feed *)) );
@@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/)
void AddFeedDialog::fetchError(Feed *)
{
- KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
+ KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
KDialogBase::slotCancel();
}
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 2b0f73e7..3cdbceb1 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -54,7 +54,7 @@
#include <tqstringlist.h>
#include <tqtimer.h>
#include <tqwidgetlist.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
#include <cerrno>
#include <sys/types.h>
@@ -146,7 +146,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
TQStringList storageParams;
- storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
+ storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
if (factory != 0)
{
@@ -168,7 +168,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
{
m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
- KMessageBox::error(tqparentWidget, 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.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
}
Filters::ArticleFilterList list;
@@ -232,7 +232,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
initFonts();
- RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
+ RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
}
void Part::loadPlugins()
@@ -432,7 +432,7 @@ bool Part::openFile()
copyFile(backup);
- KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
+ KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") );
}
if (!doc.setContent(listBackup))
@@ -447,7 +447,7 @@ bool Part::openFile()
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
copyFile(backup);
- KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
+ KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("OPML Parsing Error") );
}
m_view->loadFeeds(createDefaultFeedList());
}
@@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
if (file.open(IO_WriteOnly) == false)
{
//FIXME: allow to save the feedlist into different location -tpr 20041118
- KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
+ KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
return;
}
@@ -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)
@@ -575,7 +575,7 @@ void Part::loadTagSet(const TQString& path)
TQFile file(path);
if (file.open(IO_ReadOnly))
{
- doc.setContent(file.readAll());
+ doc.setContent(TQByteArray(file.readAll()));
file.close();
}
// if we can't load the tagset from the xml file, check for the backup in the backend
@@ -636,13 +636,13 @@ void Part::importFile(const KURL& url)
{
// Read OPML feeds list and build TQDom tree.
TQDomDocument doc;
- if (doc.setContent(file.readAll()))
+ if (doc.setContent(TQByteArray(file.readAll())))
m_view->importFeeds(doc);
else
- KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
+ KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
}
else
- KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
+ KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error"));
if (isRemote)
KIO::NetAccess::removeTempFile(filename);
@@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
if ( file.exists() &&
KMessageBox::questionYesNo(m_view,
- i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
+ i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
i18n("Export"),
i18n("Overwrite"),
KStdGuiItem::cancel()) == KMessageBox::No )
@@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
if ( !file.open(IO_WriteOnly) )
{
- KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
+ KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
return;
}
@@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
"can cause the loss of archived articles and crashes at startup.</b> "
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
- .arg( programName, programName, backendName );
+ .tqarg( programName, programName, backendName );
// TQString::arg( st ) only replaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) replacess all occurrences
// of %1 with s1 and all occurrences of %2 with s2. So don't
- // even think about changing the above to .arg( programName ).
+ // even think about changing the above to .tqarg( programName ).
else
msg = i18n("<qt>%1 seems to be running on another display on this "
"machine. <b>Running %1 and %2 at the same "
@@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
"the loss of archived articles and crashes at startup.</b> "
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
- .arg( oldProgramName, programName, backendName );
+ .tqarg( oldProgramName, programName, backendName );
}
else
{
@@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that it is "
"not already running on %2.</qt>")
- .arg( programName, oldHostName, backendName );
+ .tqarg( programName, oldHostName, backendName );
else
msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
"same time is not supported by the %4 backend and can cause "
@@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that %1 is "
"not running on %3.</qt>")
- .arg( oldProgramName, programName, oldHostName, backendName );
+ .tqarg( oldProgramName, programName, oldHostName, backendName );
}
KCursorSaver idle( KBusyPtr::idle() );
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 0d9b56af..6df0469c 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
virtual bool visitTagNode(TagNode* node)
{
- TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
+ TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
{
Tag tag = node->tag();
@@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
else
- msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
+ msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
if (node->title().isEmpty())
msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
else
- msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
+ msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@@ -222,11 +222,11 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
m_shuttingDown = false;
m_displayingAboutPage = false;
m_currentFrame = 0L;
- setFocusPolicy(TQWidget::StrongFocus);
+ setFocusPolicy(Qt::StrongFocus);
TQVBoxLayout *lt = new TQVBoxLayout( this );
- m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this);
+ m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this);
m_horizontalSplitter->setOpaqueResize(true);
lt->addWidget(m_horizontalSplitter);
@@ -285,7 +285,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
mainTabLayout->addWidget(m_searchBar);
- m_articleSplitter = new TQSplitter(TQSplitter::Vertical, m_mainTab, "panner2");
+ m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2");
m_articleList = new ArticleListView( m_articleSplitter, "articles" );
m_actionManager->initArticleListView(m_articleList);
@@ -317,7 +317,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
mainTabLayout->addWidget( m_articleSplitter );
- m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false);
+ m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false);
connectFrame(m_mainFrame);
m_tabs->addFrame(m_mainFrame);
@@ -431,7 +431,7 @@ void View::slotOpenNewTab(const KURL& url, bool background)
connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
- Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
+ Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled"));
frame->setAutoDeletePart(true); // delete page viewer when removing the tab
connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &)));
@@ -638,7 +638,7 @@ void View::slotNormalView()
m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
}
- m_articleSplitter->setOrientation(TQSplitter::Vertical);
+ m_articleSplitter->setOrientation(Qt::Vertical);
m_viewMode = NormalView;
Settings::setViewMode( m_viewMode );
@@ -662,7 +662,7 @@ void View::slotWidescreenView()
m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
}
- m_articleSplitter->setOrientation(TQSplitter::Horizontal);
+ m_articleSplitter->setOrientation(Qt::Horizontal);
m_viewMode = WidescreenView;
Settings::setViewMode( m_viewMode );
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)
void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
{
- if (button == TQt::MidButton)
+ if (button == Qt::MidButton)
{
KURL link = article.link();
switch (Settings::mMBBehaviour())
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setText(link, TQClipboard::Clipboard);
cb->setText(link, TQClipboard::Selection);
}
@@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
case 0:
return;
case 1:
- msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
+ msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
break;
default:
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 608e2a8d..a6ab467d 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
m_view->m_link = TQString();
TQString text;
- text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
- text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title())));
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title())));
text += node->title();
if(node->unread() == 0)
text += i18n(" (no unread articles)");
@@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
KURL u(m_view->m_imageDir);
u.setFileName(file);
- text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
+ text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
}
else text += "<div class=\"body\">";
if( !node->description().isEmpty() )
{
- text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description())));
- text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
+ text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
+ text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description());
text += "</div>\n"; // /description
}
if ( !node->htmlUrl().isEmpty() )
{
- text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl()));
- text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl());
+ text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl()));
+ text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl());
text += "</div>\n"; // / link
}
- //text += i18n("<b>Unread articles:</b> %1").arg(node->unread());
+ //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread());
text += "</div>"; // /body
m_view->renderContent(text);
@@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
m_view->m_link = TQString();
TQString text;
- text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
- text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
if(node->unread() == 0)
text += i18n(" (no unread articles)");
else
@@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
m_view->m_link = TQString();
TQString text;
- text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
- text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
if(node->unread() == 0)
text += i18n(" (no unread articles)");
else
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
void ArticleViewer::generateNormalModeCSS()
{
- const TQColorGroup & cg = TQApplication::palette().active();
+ const TQColorGroup & cg = TQApplication::tqpalette().active();
// from kmail::headerstyle.cpp
m_normalModeCSS = TQString(
@@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS()
" font-size: %2 ! important;\n"
" color: %3 ! important;\n"
" background: %4 ! important;\n"
- "}\n\n").arg(Settings::standardFont())
- .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
- .arg(cg.text().name())
- .arg(cg.base().name());
+ "}\n\n").tqarg(Settings::standardFont())
+ .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+ .tqarg(cg.text().name())
+ .tqarg(cg.base().name());
m_normalModeCSS += TQString(
"a {\n"
+ TQString(" color: %1 ! important;\n")
@@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS()
+" margin-bottom: 10pt;\n"
// +" width: 99%;\n"
+ "}\n\n")
- .arg(cg.link().name())
- .arg(cg.background().name())
- .arg(cg.text().name());
+ .tqarg(cg.link().name())
+ .tqarg(cg.background().name())
+ .tqarg(cg.text().name());
m_normalModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n"
".headertitle a:visited { color: %2 ! important; }\n"
".headertitle a:hover{ color: %3 ! important; }\n"
".headertitle a:active { color: %4 ! important; }\n")
- .arg(cg.highlightedText().name())
- .arg(cg.highlightedText().name())
- .arg(cg.highlightedText().name())
- .arg(cg.highlightedText().name());
+ .tqarg(cg.highlightedText().name())
+ .tqarg(cg.highlightedText().name())
+ .tqarg(cg.highlightedText().name())
+ .tqarg(cg.highlightedText().name());
m_normalModeCSS += TQString(
".headertitle {\n"
@@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS()
".headimage {\n"
" float: right;\n"
" margin-left: 5px;\n"
- "}\n\n").arg(cg.highlight().name())
- .arg(cg.highlightedText().name());
+ "}\n\n").tqarg(cg.highlight().name())
+ .tqarg(cg.highlightedText().name());
m_normalModeCSS += TQString(
"body { clear: none; }\n\n"
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
void ArticleViewer::generateCombinedModeCSS()
{
- const TQColorGroup & cg = TQApplication::palette().active();
+ const TQColorGroup & cg = TQApplication::tqpalette().active();
// from kmail::headerstyle.cpp
m_combinedModeCSS = TQString (
@@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS()
" font-size: %2 ! important;\n"
" color: %3 ! important;\n"
" background: %4 ! important;\n"
- "}\n\n").arg(Settings::standardFont())
- .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
- .arg(cg.text().name())
- .arg(cg.base().name());
+ "}\n\n").tqarg(Settings::standardFont())
+ .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+ .tqarg(cg.text().name())
+ .tqarg(cg.base().name());
m_combinedModeCSS += (
"a {\n"
+ TQString(" color: %1 ! important;\n")
@@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS()
+" margin-bottom: 10pt;\n"
// +" width: 99%;\n"
+ "}\n\n")
- .arg(cg.link().name())
- .arg(cg.background().name())
- .arg(cg.text().name());
+ .tqarg(cg.link().name())
+ .tqarg(cg.background().name())
+ .tqarg(cg.text().name());
m_combinedModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n"
".headertitle a:visited { color: %2 ! important; }\n"
".headertitle a:hover{ color: %3 ! important; }\n"
".headertitle a:active { color: %4 ! important; }\n")
- .arg(cg.highlightedText().name())
- .arg(cg.highlightedText().name())
- .arg(cg.highlightedText().name())
- .arg(cg.highlightedText().name());
+ .tqarg(cg.highlightedText().name())
+ .tqarg(cg.highlightedText().name())
+ .tqarg(cg.highlightedText().name())
+ .tqarg(cg.highlightedText().name());
m_combinedModeCSS += TQString(
".headertitle {\n"
" background: %1 ! important;\n"
@@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS()
".headimage {\n"
" float: right;\n"
" margin-left: 5px;\n"
- "}\n\n").arg(cg.highlight().name())
- .arg(cg.highlightedText().name());
+ "}\n\n").tqarg(cg.highlight().name())
+ .tqarg(cg.highlightedText().name());
m_combinedModeCSS += TQString(
"body { clear: none; }\n\n"
@@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage()
{
TQString location = locate("data", "akregator/about/main.html");
TQString content = KPIM::kFileToString(location);
- content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+ content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+ content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
else
- content = content.arg( "" );
+ content = content.tqarg( "" );
begin(KURL( location ));
TQString info =
@@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage()
"<p>We hope that you will enjoy Akregator.</p>\n"
"<p>Thank you,</p>\n"
"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n")
- .arg(AKREGATOR_VERSION) // Akregator version
- .arg("http://akregator.kde.org/"); // Akregator homepage URL
+ .tqarg(AKREGATOR_VERSION) // Akregator version
+ .tqarg("http://akregator.kde.org/"); // Akregator homepage URL
TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() ));
TQString appTitle = i18n("Akregator");
TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment.");
- write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
+ write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
end();
}
TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article)
{
TQString text;
- text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
if (!article.title().isEmpty())
{
- text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
if (article.link().isValid())
text += "<a href=\""+article.link().url()+"\">";
text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
}
if (article.pubDate().isValid())
{
- text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
- text += TQString ("%1:").arg(i18n("Date"));
+ text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
+ text += TQString ("%1:").tqarg(i18n("Date"));
text += "</span><span class=\"headertext\">";
text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
}
TQString author = article.author();
if (!author.isEmpty())
{
- text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
- text += TQString ("%1:").arg(i18n("Author"));
+ text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
+ text += TQString ("%1:").tqarg(i18n("Author"));
text += "</span><span class=\"headertext\">";
text += author+"</span>\n"; // TODO: might need RTL?
}
@@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
TQString file = Utils::fileNameForUrl(feed->xmlUrl());
KURL u(m_imageDir);
u.setFileName(file);
- text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
+ text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
}
if (!article.description().isEmpty())
{
- text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
+ text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
text += "<span class=\"content\">"+article.description()+"</span>";
text += "</div>";
}
@@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
//int length = article.enclosure().length();
//TQString lengthStr = KIO::convertSize(length);
- //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
+ //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type);
}
//kdDebug() << text << endl;
return text;
@@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article)
{
TQString text;
- text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
KURL link = article.link();
if (!article.title().isEmpty())
{
- text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
if (link.isValid())
text += "<a href=\""+link.url()+"\">";
text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
}
if (article.pubDate().isValid())
{
- text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
- text += TQString ("%1:").arg(i18n("Date"));
+ text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
+ text += TQString ("%1:").tqarg(i18n("Date"));
text += "</span><span class=\"headertext\">";
text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
}
@@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
TQString author = article.author();
if (!author.isEmpty())
{
- text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
- text += TQString ("%1:").arg(i18n("Author"));
+ text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
+ text += TQString ("%1:").tqarg(i18n("Author"));
text += "</span><span class=\"headertext\">";
text += author+"</span>\n"; // TODO: might need RTL?
}
@@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
TQString file = Utils::fileNameForUrl(feed->xmlUrl());
KURL u(m_imageDir);
u.setFileName(file);
- text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
+ text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
}
if (!article.description().isEmpty())
{
- text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
+ text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
text += "<span class=\"content\">"+article.description()+"</span>";
text += "</div>";
}
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index 5a232c09..ebe931f6 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -33,7 +33,7 @@
#include <tqstring.h>
#include <tqvaluelist.h>
-typedef class TQMemArray<char> TQByteArray;
+#include <tqcstring.h>
namespace Akregator {
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index 0ca068fd..ac9c8212 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -462,7 +462,7 @@ TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
{
- return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare));
+ return dynamic_cast<TreeNodeItem*> (KListView::tqfindItem(text, column, compare));
}
void NodeListView::ensureNodeVisible(TreeNode* node)
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index 78612ec7..d55c75ae 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -137,7 +137,7 @@ TQValueList<TreeNode*> Folder::tqchildren() const
void Folder::insertChild(TreeNode* node, TreeNode* after)
{
- int pos = d->tqchildren.findIndex(after);
+ int pos = d->tqchildren.tqfindIndex(after);
if (pos < 0)
prependChild(node);
diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp
index 099cc2a7..b12164f0 100644
--- a/akregator/src/librss/feeddetector.cpp
+++ b/akregator/src/librss/feeddetector.cpp
@@ -72,7 +72,7 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s)
TQString type;
int pos = reType.search(*it, 0);
if (pos != -1)
- type = reType.cap(1).lower();
+ type = TQString(reType.cap(1)).lower();
// we accept only type attributes indicating a feed
if ( type != "application/rss+xml" && type != "application/rdf+xml"
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index 48b4a52a..9c18fcae 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -69,8 +69,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
return HTML;
if (type == TQString::fromUtf8("text")
- || (type.startsWith(TQString::fromUtf8("text/"), false)
- && !type.startsWith(TQString::fromUtf8("text/xml"), false))
+ || (type.tqstartsWith(TQString::fromUtf8("text/"), false)
+ && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false))
)
return Text;
@@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
if (xmltypes.tqcontains(type)
- || type.endsWith(TQString::fromUtf8("+xml"), false)
- || type.endsWith(TQString::fromUtf8("/xml"), false))
+ || type.tqendsWith(TQString::fromUtf8("+xml"), false)
+ || type.tqendsWith(TQString::fromUtf8("/xml"), false))
return XML;
return Binary;
@@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver
name = email;
if (!email.isNull())
- return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name);
+ return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name);
else
return name;
}
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index a5b28662..a8c8f5d1 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node)
if (unread > 0)
{
//uncomment this to append unread count
- //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread()));
+ //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread()));
d->tabWidget->changeTab(view, d->captions[view]);
}
else
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index c6e8d09b..3111cab4 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -55,14 +55,14 @@
#include <tqmetaobject.h>
#include <tqpen.h>
#include <tqpainter.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
#include <tqtimer.h>
namespace Akregator {
BrowserInterface::BrowserInterface( MainWindow *shell, const char *name )
- : KParts::BrowserInterface( shell, name )
+ : KParts::BrowserInterface( TQT_TQOBJECT(shell), name )
{
m_shell = shell;
}
@@ -104,7 +104,7 @@ bool MainWindow::loadPart()
{
// now that the Part is loaded, we cast it to a Part to get
// our hands on it
- m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part", "KParts::ReadOnlyPart" ));
+ m_part = static_cast<Akregator::Part*>(factory->create(TQT_TQOBJECT(this), "akregator_part", "KParts::ReadOnlyPart" ));
if (m_part)
{
@@ -154,13 +154,13 @@ void MainWindow::setupActions()
{
connectActionCollection(actionCollection());
- KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
setStandardToolBarMenuEnabled(true);
createStandardStatusBarAction();
- KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
}
void MainWindow::saveProperties(KConfig* config)
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index 6220e97c..ce4251b8 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
if (feeds.count() == 1)
{
KNotifyClient::Instance inst(m_instance);
- KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0]));
+ KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0]));
}
else if (feeds.count() > 1)
{
@@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it)
message += *it + "\n";
KNotifyClient::Instance inst(m_instance);
- KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
+ KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message));
}
}
@@ -99,7 +99,7 @@ void NotificationManager::doNotify()
if (feedTitle != (*it).feed()->title())
{
feedTitle = (*it).feed()->title();
- message += TQString("<p><b>%1:</b></p>").arg(feedTitle);
+ message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle);
}
message += (*it).title() + "<br>";
}
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 64169225..47757590 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -53,7 +53,7 @@
#include <tqscrollview.h>
#include <tqstring.h>
#include <tqvaluelist.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
#include <cstdlib>
using std::abs;
@@ -356,13 +356,13 @@ 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::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+ if (url.tqstartsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
{
KHTMLPart::urlSelected(url,button,state,_target,args);
}
else
{
- if (button == LeftButton)
+ if (button == Qt::LeftButton)
{
m_url = completeURL(url);
browserExtension()->setURLArgs(args);
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
if ( !obj ) // not all views have a browser extension !
return;
- int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
+ int id = obj->tqmetaObject()->tqfindSlot("reparseConfiguration()");
if (id == -1)
return;
TQUObject o[1];
@@ -430,7 +430,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
if (isLink)
{
idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
- popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
+ popup.tqsetWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
popup.insertSeparator();
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index d12016d4..108fcf9b 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -92,8 +92,8 @@ PluginManager::createFromService( const KService::Ptr service )
if ( !lib ) {
KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>"
"<p>Error message:<br/><i>%2</i></p>" )
- .arg( service->library() )
- .arg( loader->lastErrorMessage() ) );
+ .tqarg( service->library() )
+ .tqarg( loader->lastErrorMessage() ) );
return 0;
}
//look up address of init function and cast it to pointer-to-function
@@ -167,12 +167,12 @@ PluginManager::showAbout( const TQString &constraint )
TQString str = "<html><body><table width=\"100%\" border=\"1\">";
- str += body.arg( i18n( "Name" ), s->name() );
- str += body.arg( i18n( "Library" ), s->library() );
- str += body.arg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
- str += body.arg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
- str += body.arg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() );
- str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() );
+ str += body.tqarg( i18n( "Name" ), s->name() );
+ str += body.tqarg( i18n( "Library" ), s->library() );
+ str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
+ str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
+ str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() );
+ str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() );
str += "</table></body></html>";
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index 658051f9..e3ce7b1e 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -102,7 +102,7 @@ void FeedPropertiesDialog::slotSetCaption(const TQString& c)
if(c.isEmpty())
setCaption(i18n("Feed Properties"));
else
- setCaption(i18n("Properties of %1").arg(c));
+ setCaption(i18n("Properties of %1").tqarg(c));
}
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 7ae02ba9..60ba42b3 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().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
- overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+ hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+ overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
- x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
+ x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
}
return x;
}
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
url = view->part()->url();
- kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
- kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
+ kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+ kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
}
void TabWidget::slotCloseTab()
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 963e6029..e4859335 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -74,7 +74,7 @@ TrayIcon::~TrayIcon()
void TrayIcon::mousePressEvent(TQMouseEvent *e) {
- if (e->button() == LeftButton) {
+ if (e->button() == Qt::LeftButton) {
emit showPart();
}
@@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const
// Paint the border
const int BORDER = 1;
TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
- finalShot.fill(KApplication::palette().active().foreground());
+ finalShot.fill(KApplication::tqpalette().active().foreground());
painter.begin(&finalShot);
painter.drawPixmap(BORDER, BORDER, shot);
painter.end();
@@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread)
void TrayIcon::viewButtonClicked()
{
- TQWidget *p=static_cast<TQWidget*>(tqparent());
+ TQWidget *p=TQT_TQWIDGET(tqparent());
KWin::forceActiveWindow(p->winId());
}
diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp
index 58e4ae8e..27ee2eca 100644
--- a/akregator/src/treenode.cpp
+++ b/akregator/src/treenode.cpp
@@ -96,7 +96,7 @@ TreeNode* TreeNode::nextSibling() const
TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
TreeNode* me = (TreeNode*)this;
- int idx = tqchildren.findIndex(me);
+ int idx = tqchildren.tqfindIndex(me);
return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
}
@@ -108,7 +108,7 @@ TreeNode* TreeNode::prevSibling() const
TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
TreeNode* me = (TreeNode*)this;
- int idx = tqchildren.findIndex(me);
+ int idx = tqchildren.tqfindIndex(me);
return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L;
}
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 2c52cf43..989ff8ae 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -130,7 +130,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
{
m_url = completeURL(url);
browserExtension()->setURLArgs(args);
- if (button == LeftButton)
+ if (button == Qt::LeftButton)
{
switch (Settings::lMBBehaviour())
{
@@ -146,7 +146,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
}
return;
}
- else if (button == MidButton)
+ else if (button == Qt::MidButton)
{
switch (Settings::mMBBehaviour())
{
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
{
TQString text = selectedText();
text.tqreplace( TQChar( 0xa0 ), ' ' );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
cb->setText(text);
connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,7 +212,7 @@ void Viewer::slotCopy()
void Viewer::slotCopyLinkAddress()
{
if(m_url.isEmpty()) return;
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
cb->setText(m_url.prettyURL(), TQClipboard::Selection);
}
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 8ce43aa5..9067672e 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) {
TQListViewItem * item = 0;
item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2")
- .arg( time_t2string( key.subkey(0).creationTime() ),
+ .tqarg( time_t2string( key.subkey(0).creationTime() ),
time_t2string( key.subkey(0).expirationTime() ) ) );
item = new TQListViewItem( listView, item, i18n("Can be used for signing"),
key.canSign() ? i18n("Yes") : i18n("No") );
@@ -187,7 +187,7 @@ static void showChainListError( TQWidget * tqparent, const GpgME::Error & err, c
const TQString msg = i18n("<qt><p>An error occurred while fetching "
"the certificate <b>%1</b> from the backend:</p>"
"<p><b>%2</b></p></qt>")
- .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
+ .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(),
TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) );
}
@@ -253,7 +253,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
}
void CertificateInfoWidgetImpl::startCertificateDump() {
- KProcess* proc = new KProcess( this );
+ KProcess* proc = new KProcess( TQT_TQOBJECT(this) );
(*proc) << "gpgsm"; // must be in the PATH
(*proc) << "--dump-keys";
(*proc) << mChain.front().primaryFingerprint();
@@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() {
this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) );
if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) {
- TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) );
+ TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) );
dumpView->setText( TQStyleSheet::escape( wmsg ) );
delete proc;
}
@@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) {
{
TQString wmsg = i18n("Failed to execute gpgsm:\n%1");
if ( rc == -1 )
- wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
+ wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
else
- wmsg = wmsg.arg( strerror(rc) );
+ wmsg = wmsg.tqarg( strerror(rc) );
dumpView->setText( TQStyleSheet::escape( wmsg ) );
}
}
@@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() {
item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() );
else {
item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)")
- .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
+ .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
item->setEnabled( false );
}
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 3c618e73..89f4d66e 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) {
if ( !label.isEmpty() )
if ( required )
return i18n("Format string for the labels in the \"Your Personal Data\" page - required field",
- "*%1 (%2):").arg( label, attr );
+ "*%1 (%2):").tqarg( label, attr );
else
return i18n("Format string for the labels in the \"Your Personal Data\" page",
- "%1 (%2):").arg( label, attr );
+ "%1 (%2):").tqarg( label, attr );
else if ( required )
return '*' + attr + ':';
@@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
TQString certParms;
certParms += "<GnupgKeyParms format=\"internal\">\n";
certParms += "Key-Type: RSA\n";
- certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] );
+ certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] );
certParms += "Key-Usage: ";
if ( signOnlyCB->isChecked() )
certParms += "Sign";
@@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
if ( err )
KMessageBox::error( this,
i18n( "Could not start certificate generation: %1" )
- .arg( TQString::fromLocal8Bit( err.asString() ) ),
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
i18n( "Certificate Manager Error" ) );
else {
generatePB->setEnabled( false );
@@ -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::tqfromLatin1( res.error().asString() ) ),
+ .tqarg( TQString::tqfromLatin1( res.error().asString() ) ),
i18n( "Certificate Manager Error" ) );
} else {
// next will stay enabled until the user clicks Generate
@@ -362,7 +362,7 @@ void CertificateWizardImpl::createPersonalDataPage()
if ( config.entryIsImmutable( attr ) )
le->setEnabled( false );
- _attrPairList.append(qMakePair(key, le));
+ _attrPairList.append(tqMakePair(key, le));
connect( le, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotEnablePersonalDataPageExit()) );
@@ -391,7 +391,7 @@ void CertificateWizardImpl::slotURLSelected( const TQString& _url )
// The application/pkcs10 mimetype didn't have a native extension,
// so the filedialog didn't have the checkbox for auto-adding it.
TQString fileName = url.fileName();
- int pos = fileName.findRev( '.' );
+ int pos = fileName.tqfindRev( '.' );
if ( pos < 0 ) // no extension
url.setFileName( fileName + ".p10" );
#endif
@@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
if ( result != 0 ) {
kdDebug() << "Couldn't connect to KMail\n";
KMessageBox::error( this,
- i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) );
+ i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) );
return;
}
@@ -481,7 +481,7 @@ void CertificateWizardImpl::accept()
if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
this,
i18n( "A file named \"%1\" already exists. "
- "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
+ "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return;
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 59fc7376..5f70bc22 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -2,7 +2,7 @@
certmanager.cpp
This file is part of Kleopatra, the KDE keymanager
- Copyright (c) 2001,2002,2004 Klarälvdalens Datakonsult AB
+ Copyright (c) 2001,2002,2004 Klar�lvdalens Datakonsult AB
Kleopatra is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -252,23 +252,23 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) {
void CertManager::createActions() {
KAction * action = 0;
- (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() );
+ (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
- action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() );
+ action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() );
// work around the fact that the stdaction has no shortcut
KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
reloadShortcut.append(KKey(CTRL + Key_R));
action->setShortcut( reloadShortcut );
- connectEnableOperationSignal( this, action );
+ connectEnableOperationSignal( TQT_TQOBJECT(this), action );
action = new KAction( i18n("Stop Operation"), "stop", Key_Escape,
- this, TQT_SIGNAL(stopOperations()),
+ TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
actionCollection(), "view_stop_operations" );
action->setEnabled( false );
(void) new KAction( i18n("New Key Pair..."), "filenew", 0,
- this, TQT_SLOT(newCertificate()),
+ TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
actionCollection(), "file_new_certificate" );
connect( new KToggleAction( i18n("Hierarchical Key List"), 0,
@@ -276,100 +276,100 @@ void CertManager::createActions() {
TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period,
- this, TQT_SLOT(slotExpandAll()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()),
actionCollection(), "view_expandall" );
action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
- this, TQT_SLOT(slotCollapseAll()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()),
actionCollection(), "view_collapseall" );
(void) new KAction( i18n("Refresh CRLs"), 0, 0,
- this, TQT_SLOT(slotRefreshKeys()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()),
actionCollection(), "certificates_refresh_clr" );
#ifdef NOT_IMPLEMENTED_ANYWAY
mRevokeCertificateAction = new KAction( i18n("Revoke"), 0,
- this, TQT_SLOT(revokeCertificate()),
+ TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()),
actionCollection(), "edit_revoke_certificate" );
connectEnableOperationSignal( this, mRevokeCertificateAction );
mExtendCertificateAction = new KAction( i18n("Extend"), 0,
- this, TQT_SLOT(extendCertificate()),
+ TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()),
actionCollection(), "edit_extend_certificate" );
connectEnableOperationSignal( this, mExtendCertificateAction );
#endif
mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete,
- this, TQT_SLOT(slotDeleteCertificate()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
actionCollection(), "edit_delete_certificate" );
- connectEnableOperationSignal( this, mDeleteCertificateAction );
+ connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5,
- this, TQT_SLOT(slotValidate()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotValidate()),
actionCollection(), "certificates_validate" );
- connectEnableOperationSignal( this, mValidateCertificateAction );
+ connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction );
mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0,
- this, TQT_SLOT(slotImportCertFromFile()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()),
actionCollection(), "file_import_certificates" );
- connectEnableOperationSignal( this, mImportCertFromFileAction );
+ connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction );
mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0,
- this, TQT_SLOT(importCRLFromFile()),
+ TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()),
actionCollection(), "file_import_crls" );
- connectEnableOperationSignal( this, mImportCRLFromFileAction );
+ connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction );
mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0,
- this, TQT_SLOT(slotExportCertificate()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()),
actionCollection(), "file_export_certificate" );
mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0,
- this, TQT_SLOT(slotExportSecretKey()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()),
actionCollection(), "file_export_secret_keys" );
- connectEnableOperationSignal( this, mExportSecretKeyAction );
+ connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction );
mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0,
- this, TQT_SLOT(slotViewDetails()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(),
"view_certificate_details" );
mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0,
- this, TQT_SLOT(slotDownloadCertificate()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
"download_certificate" );
const TQString dirmngr = KStandardDirs::findExe( "gpgsm" );
mDirMngrFound = !dirmngr.isEmpty();
action = new KAction( i18n("Dump CRL Cache..."), 0,
- this, TQT_SLOT(slotViewCRLs()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()),
actionCollection(), "crl_dump_crl_cache" );
action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
action = new KAction( i18n("Clear CRL Cache..."), 0,
- this, TQT_SLOT(slotClearCRLs()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()),
actionCollection(), "crl_clear_crl_cache" );
action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
- action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
+ action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around
if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
(void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
- mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
+ mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this),
TQT_SLOT(slotSearch()),
"query_lineedit_action");
TQStringList lst;
lst << i18n("In Local Certificates") << i18n("In External Certificates");
- mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
+ mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
"location_combo_action", mNextFindRemote? 1 : 0 );
- mFindAction = new KAction( i18n("Find"), "tqfind", 0, this, TQT_SLOT(slotSearch()),
+ mFindAction = new KAction( i18n("Find"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
actionCollection(), "tqfind" );
- KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
- KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
+ KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
+ KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
- new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()),
+ new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
actionCollection(), "configure_gpgme" );
createStandardStatusBarAction();
@@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) {
return;
if ( err )
KMessageBox::error( this, i18n("An error occurred while trying to refresh "
- "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ),
+ "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ),
i18n("Refreshing Keys Failed") );
}
@@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the certificates from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) );
}
@@ -592,7 +592,7 @@ static void selectKeys( Kleo::KeyListView * lv, const std::set<std::string> & fp
for ( TQListViewItemIterator it( lv ) ; it.current() ; ++it )
if ( Kleo::KeyListViewItem * item = Kleo::lvi_cast<Kleo::KeyListViewItem>( it.current() ) ) {
const char * fpr = item->key().primaryFingerprint();
- item->setSelected( fpr && fprs.tqfind( fpr ) != fprs.end() );
+ item->setSelected( fpr && fprs.find( fpr ) != fprs.end() );
}
}
@@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Erro
const TQString msg = i18n( "<qt><p>An error occurred while trying "
"to download the certificate %1:</p>"
"<p><b>%2</b></p></qt>" )
- .arg( certDisplayName )
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( certDisplayName )
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) );
}
@@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * tqparent, const GpgME::Error
const TQString msg = i18n( "<qt><p>An error occurred while trying "
"to import the certificate %1:</p>"
"<p><b>%2</b></p></qt>" )
- .arg( certDisplayName )
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( certDisplayName )
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n( "Certificate Import Failed" ) );
}
@@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res )
const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>");
TQStringList lines;
- lines.push_back( normalLine.arg( i18n("Total number processed:"),
+ lines.push_back( normalLine.tqarg( i18n("Total number processed:"),
TQString::number( res.numConsidered() ) ) );
- lines.push_back( normalLine.arg( i18n("Imported:"),
+ lines.push_back( normalLine.tqarg( i18n("Imported:"),
TQString::number( res.numImported() ) ) );
if ( res.newSignatures() )
- lines.push_back( normalLine.arg( i18n("New signatures:"),
+ lines.push_back( normalLine.tqarg( i18n("New signatures:"),
TQString::number( res.newSignatures() ) ) );
if ( res.newUserIDs() )
- lines.push_back( normalLine.arg( i18n("New user IDs:"),
+ lines.push_back( normalLine.tqarg( i18n("New user IDs:"),
TQString::number( res.newUserIDs() ) ) );
if ( res.numKeysWithoutUserID() )
- lines.push_back( normalLine.arg( i18n("Keys without user IDs:"),
+ lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"),
TQString::number( res.numKeysWithoutUserID() ) ) );
if ( res.newSubkeys() )
- lines.push_back( normalLine.arg( i18n("New subkeys:"),
+ lines.push_back( normalLine.tqarg( i18n("New subkeys:"),
TQString::number( res.newSubkeys() ) ) );
if ( res.newRevocations() )
- lines.push_back( boldLine.arg( i18n("Newly revoked:"),
+ lines.push_back( boldLine.tqarg( i18n("Newly revoked:"),
TQString::number( res.newRevocations() ) ) );
if ( res.notImported() )
- lines.push_back( boldLine.arg( i18n("Not imported:"),
+ lines.push_back( boldLine.tqarg( i18n("Not imported:"),
TQString::number( res.notImported() ) ) );
if ( res.numUnchanged() )
- lines.push_back( normalLine.arg( i18n("Unchanged:"),
+ lines.push_back( normalLine.tqarg( i18n("Unchanged:"),
TQString::number( res.numUnchanged() ) ) );
if ( res.numSecretKeysConsidered() )
- lines.push_back( normalLine.arg( i18n("Secret keys processed:"),
+ lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"),
TQString::number( res.numSecretKeysConsidered() ) ) );
if ( res.numSecretKeysImported() )
- lines.push_back( normalLine.arg( i18n("Secret keys imported:"),
+ lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"),
TQString::number( res.numSecretKeysImported() ) ) );
if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 )
- lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"),
+ lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"),
TQString::number( res.numSecretKeysConsidered()
- res.numSecretKeysImported()
- res.numSecretKeysUnchanged() ) ) );
if ( res.numSecretKeysUnchanged() )
- lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"),
+ lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"),
TQString::number( res.numSecretKeysUnchanged() ) ) );
KMessageBox::information( this,
i18n( "<qt><p>Detailed results of importing %1:</p>"
"<table>%2</table></qt>" )
- .arg( displayName ).arg( lines.join( TQString() ) ),
+ .tqarg( displayName ).tqarg( lines.join( TQString() ) ),
i18n( "Certificate Import Result" ) );
disconnectJobFromStatusBarProgress( res.error() );
@@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() {
if ( !mDirmngrProc->normalExit() )
KMessageBox::error( this, i18n( "The GpgSM process that tried to import the CRL file ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) );
else if ( mDirmngrProc->exitStatus() )
- KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
+ KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
else
KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) );
@@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
delete mDirmngrProc; mDirmngrProc = 0;
- KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) );
+ KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) );
return false;
}
return true;
@@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() {
if ( !mDirmngrProc->normalExit() )
KMessageBox::error( this, i18n( "The DirMngr process that tried to clear the CRL cache ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) );
else if ( mDirmngrProc->exitStatus() )
- KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
+ KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
else
KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) );
delete mDirmngrProc; mDirmngrProc = 0;
@@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * tqparent, const GpgME::Error & err ) {
const TQString msg = i18n("<qt><p>An error occurred while trying to delete "
"the certificates:</p>"
"<p><b>%1</b></p></qt>")
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") );
}
@@ -1031,7 +1031,7 @@ void CertManager::slotDeleteCertificate() {
return;
if ( !mHierarchyAnalyser ) {
- mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" );
+ mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" );
Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob();
assert( job );
connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
@@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() {
const TQString msg = keysToDelete.size() > keys.size()
? i18n("Do you really want to delete this certificate and the %1 certificates it certified?",
"Do you really want to delete these %n certificates and the %1 certificates they certified?",
- keys.size() ).arg( keysToDelete.size() - keys.size() )
+ keys.size() ).tqarg( keysToDelete.size() - keys.size() )
: i18n("Do you really want to delete this certificate?",
"Do you really want to delete these %n certificates?", keys.size() ) ;
@@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() {
"the certificates:</p>"
"<p><b>%1</b><p></qt>" );
KMessageBox::error( this,
- str.arg( i18n("Operation not supported by the backend.") ),
+ str.tqarg( i18n("Operation not supported by the backend.") ),
i18n("Certificate Deletion Failed") );
}
@@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * tqparent, const GpgME::Error
const TQString msg = i18n("<qt><p>An error occurred while trying to export "
"the certificate:</p>"
"<p><b>%1</b></p></qt>")
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n("Certificate Export Failed") );
}
@@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
KMessageBox::warningContinueCancel(
w,
i18n( "A file named \"%1\" already exists. "
- "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
+ "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return false;
@@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error &
const TQString msg = i18n("<qt><p>An error occurred while trying to export "
"the secret key:</p>"
"<p><b>%1</b></p></qt>")
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") );
}
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index 9fb7af20..0d059cf6 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -162,9 +162,9 @@
</connection>
<connection>
<sender>categoriesLV</sender>
- <signal>selectionChanged(QListViewItem*)</signal>
+ <signal>selectionChanged(TQListViewItem*)</signal>
<receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotSelectionChanged(QListViewItem*)</slot>
+ <slot>slotSelectionChanged(TQListViewItem*)</slot>
</connection>
<connection>
<sender>defaultLookPB</sender>
@@ -205,7 +205,7 @@
<slot access="protected">slotForegroundClicked()</slot>
<slot access="protected">slotBackgroundClicked()</slot>
<slot access="protected">slotFontClicked()</slot>
- <slot access="protected">slotSelectionChanged( QListViewItem * )</slot>
+ <slot access="protected">slotSelectionChanged( TQListViewItem * )</slot>
<slot access="protected">slotDefaultClicked()</slot>
<slot access="protected">slotItalicClicked()</slot>
<slot access="protected">slotBoldClicked()</slot>
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index fb367fd3..9647f6b8 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const
{
Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName );
if ( !entry ) {
- KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) );
+ KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) );
return 0;
}
if( entry->argType() != argType || entry->isList() != isList ) {
- KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) );
+ KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) );
return 0;
}
return entry;
diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp
index 96979adf..39322abc 100644
--- a/certmanager/hierarchyanalyser.cpp
+++ b/certmanager/hierarchyanalyser.cpp
@@ -63,7 +63,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) {
const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char * issuer_dn ) const {
static const std::vector<GpgME::Key> empty;
std::map< TQCString, std::vector<GpgME::Key> >::const_iterator it =
- mSubjectsByIssuer.tqfind( issuer_dn );
+ mSubjectsByIssuer.find( issuer_dn );
return it == mSubjectsByIssuer.end() ? empty : it->second ;
}
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 01340ecd..4c6ecbfb 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -90,20 +90,20 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
void KWatchGnuPGMainWindow::slotClear()
{
mCentralWidget->clear();
- mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
+ mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
}
void KWatchGnuPGMainWindow::createActions()
{
(void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
- this, TQT_SLOT( slotClear() ),
+ TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
actionCollection(), "clear_log" );
- (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() );
- (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
- (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() );
- (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() );
- ( void )KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection());
- ( void )KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
+ (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
+ (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
+ (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
+ (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
+ (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
+ (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
#if 0
(void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
@@ -134,8 +134,8 @@ void KWatchGnuPGMainWindow::startWatcher()
while( mWatcher->isRunning() ) {
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
}
- mCentralWidget->append(tr("[%1] Log stopped")
- .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate)));
+ mCentralWidget->append(tqtr("[%1] Log stopped")
+ .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
}
mWatcher->clearArguments();
KConfig* config = kapp->config();
@@ -147,8 +147,8 @@ void KWatchGnuPGMainWindow::startWatcher()
if( !mWatcher->start() ) {
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::tqcurrentDateTime().toString(TQt::ISODate) ) );
+ mCentralWidget->append( tqtr("[%1] Log started")
+ .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
}
connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
this, TQT_SLOT( slotWatcherExited() ) );
@@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
entry->setStringValue( TQString("socket://")+
config->readEntry("Socket",
WATCHGNUPGSOCKET ));
- logclients << TQString("%1 (%2)").arg(*it).arg(comp->description());
+ logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description());
}
entry = group->entry("debug-level");
if( entry ) {
@@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs()
if( KMessageBox::Yes !=
KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already "
"exists. Are you sure you want "
- "to overwrite it?").arg(filename),
+ "to overwrite it?").tqarg(filename),
i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) {
return;
}
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 5ce7f617..f27dad3b 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na
bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const {
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" );
return false;
}
bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
return false;
}
@@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const {
const TQFileInfo fi( KShell::tildeExpand( chiasmus ) );
if ( !fi.isExecutable() ) {
if ( reason )
- *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus );
+ *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus );
return false;
}
@@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas
if ( qstricmp( name, "Chiasmus" ) == 0 )
return checkForChiasmus( reason );
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
return 0;
}
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index c6b718ca..eb5a5ea3 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & c
const TQString msg = ( mMode == Encrypt
? i18n( "Encryption failed: %1" )
: i18n( "Decryption failed: %1" ) )
- .arg( TQString::fromLocal8Bit( mError.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
if ( !mStderr.isEmpty() ) {
- const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
+ const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
KMessageBox::detailedError( tqparent, msg, details, caption );
} else {
KMessageBox::error( tqparent, msg, caption );
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index 002bf018..a57685f2 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
@@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
if ( !mXiaLibrary ) {
if ( reason )
*reason = i18n( "Failed to load %1: %2" )
- .arg( libfile,KLibLoader::self()->lastErrorMessage() );
+ .tqarg( libfile,KLibLoader::self()->lastErrorMessage() );
kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
<< "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl;
return 0;
@@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) {
if ( reason )
*reason = i18n( "Failed to load %1: %2" )
- .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
+ .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
<< "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl;
return 0;
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index fe0b19b1..497a5a54 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
return;
}
- emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ),
+ emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ),
mIndex, mKeyPaths.size() );
const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 27680585..9594edfa 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -88,15 +88,15 @@ static bool check( GpgME::Context::Protocol proto, TQString * reason ) {
// error, check why:
const GpgME::EngineInfo ei = GpgME::engineInfo( proto );
if ( ei.isNull() )
- *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+ *reason = i18n("GPGME was compiled without support for %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
else if ( ei.fileName() && !ei.version() )
- *reason = i18n("Engine %1 is not installed properly.").arg( TQFile::decodeName( ei.fileName() ) );
+ *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) );
else if ( ei.fileName() && ei.version() && ei.requiredVersion() )
*reason = i18n("Engine %1 version %2 installed, "
"but at least version %3 is required.")
- .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
+ .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
else
- *reason = i18n("Unknown problem with engine for protocol %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+ *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
return false;
}
@@ -114,7 +114,7 @@ bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason
if ( qstricmp( name, SMIME ) == 0 )
return check( GpgME::Context::CMS, reason );
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
return false;
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 3aa3b336..31224685 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
if ( showErrors && rc != 0 ) {
TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>");
if ( rc == -1 )
- wmsg = wmsg.arg( i18n( "program not found" ) );
+ wmsg = wmsg.tqarg( i18n( "program not found" ) );
else if ( rc == -2 )
- wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
+ wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
else
- wmsg = wmsg.arg( strerror(rc) );
+ wmsg = wmsg.tqarg( strerror(rc) );
kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp
KMessageBox::error(0, wmsg);
}
@@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
}
else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
{
- TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
+ TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) );
kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
KMessageBox::error(0, wmsg);
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 61da793e..e55f237d 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d
TQString msg = previousWasBad ?
i18n( "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" ) :
i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" );
- msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
+ msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
msg.prepend( "<qt>" );
msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "<br/>";
const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" );
if ( !gpgAgent.isEmpty() ) {
msg += i18n( "gpg-agent was found in %1, but does not appear to be running." )
- .arg( gpgAgent );
+ .tqarg( gpgAgent );
} else {
msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
- .arg( "1.9" )
- .arg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link
+ .tqarg( "1.9" )
+ .tqarg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link
}
msg += "<br/>";
msg += i18n( "For information on how to set up gpg-agent, see %1" )
- .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
+ .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
msg += "<br/><br/>";
msg += i18n( "Enter passphrase:" );
Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index 2634579f..57afed41 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQStrin
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the keys from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .arg( TQString::fromLocal8Bit( mResult.error().asString() ) );
+ .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) );
KMessageBox::error( tqparent, msg, caption );
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index 5f629678..de673faf 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -140,20 +140,20 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto
static const Map & tokenMap = makeMap();
- const Map::const_iterator it1 = tokenMap.tqfind( token.lower() );
+ const Map::const_iterator it1 = tokenMap.find( token.lower() );
if ( it1 == tokenMap.end() )
return token;
- std::map<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken );
+ std::map<int,Desc>::const_iterator it2 = it1->second.find( subtoken );
if ( it2 == it1->second.end() )
- it2 = it1->second.tqfind( 0 );
+ it2 = it1->second.find( 0 );
if ( it2 == it1->second.end() )
return token;
const Desc & desc = it2->second;
TQString result = i18n( desc.display );
if ( desc.useCur )
- result = result.arg( cur );
+ result = result.tqarg( cur );
if ( desc.useTot )
- result = result.arg( tot );
+ result = result.tqarg( tot );
return result;
}
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index f15ab747..1d35f1c1 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -522,7 +522,7 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
if( !_cp->initialize() ) {
_initqStatus = IniStatus_InitError;
kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
- _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
+ _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName );
if ( errorMsg )
*errorMsg = _lastError;
delete _cp; _cp = 0;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index c6ce40fd..f4db77ea 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -111,7 +111,7 @@ Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::instance() {
// }
const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const {
- const BackendMap::const_iterator it = mBackends.tqfind( "SMIME" );
+ const BackendMap::const_iterator it = mBackends.find( "SMIME" );
if ( it == mBackends.end() )
return 0;
if ( !it->second )
@@ -120,7 +120,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const
}
const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() const {
- const BackendMap::const_iterator it = mBackends.tqfind( "OpenPGP" );
+ const BackendMap::const_iterator it = mBackends.find( "OpenPGP" );
if ( it == mBackends.end() )
return 0;
if ( !it->second )
@@ -129,7 +129,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() cons
}
const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::protocol( const char * name ) const {
- const BackendMap::const_iterator it = mBackends.tqfind( name );
+ const BackendMap::const_iterator it = mBackends.find( name );
if ( it == mBackends.end() )
return 0;
if ( !it->second )
@@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) {
if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) {
if ( reasons ) {
reasons->push_back( i18n("While scanning for %1 support in backend %2:")
- .arg( protocol, (*it)->displayName() ) );
+ .tqarg( protocol, (*it)->displayName() ) );
reasons->push_back( " " + reason );
}
}
@@ -267,7 +267,7 @@ namespace {
}
bool Kleo::CryptoBackendFactory::knowsAboutProtocol( const char * name ) const {
- return std::tqfind( mAvailableProtocols.begin(), mAvailableProtocols.end(),
+ return std::find( mAvailableProtocols.begin(), mAvailableProtocols.end(),
CaseInsensitiveString( name ) ) != mAvailableProtocols.end();
}
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index e82b02de..0f0c357d 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -507,7 +507,7 @@ const Kleo::DNAttributeMapper * Kleo::DNAttributeMapper::instance() {
TQString Kleo::DNAttributeMapper::name2label( const TQString & s ) const {
const std::map<const char*,const char*,ltstr>::const_iterator it
- = d->map.tqfind( s.stripWhiteSpace().upper().latin1() );
+ = d->map.find( s.stripWhiteSpace().upper().latin1() );
if ( it == d->map.end() )
return TQString();
return i18n( it->second );
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index e94f9700..a5944315 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -93,7 +93,7 @@ void Kleo::HierarchicalKeyListJob::slotNextKey( const GpgME::Key & key ) {
if ( const char * chain_id = key.chainID() )
mNextSet.insert( chain_id );
if ( const char * fpr = key.primaryFingerprint() )
- if ( mSentSet.tqfind( fpr ) == mSentSet.end() ) {
+ if ( mSentSet.find( fpr ) == mSentSet.end() ) {
mSentSet.insert( fpr );
emit nextKey( key );
}
@@ -131,7 +131,7 @@ void Kleo::HierarchicalKeyListJob::slotResult( const GpgME::KeyListResult & res
#if 0 // FIXME
const int current = mIt - mKeys.begin();
const int total = mKeys.size();
- emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
+ emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total );
#endif
}
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7d1a2730..e83f923e 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -92,7 +92,7 @@ void Kleo::MultiDeleteJob::slotResult( const GpgME::Error & err ) {
const int current = mIt - mKeys.begin();
const int total = mKeys.size();
- emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
+ emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total );
}
GpgME::Error Kleo::MultiDeleteJob::startAJob() {
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 090c3f3a..b95ad74b 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB
if ( res.error() )
showError( res.error() );
else
- KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ),
+ KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ),
"Key Generation Finished" );
}
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 212d0228..6667b2e7 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) {
TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" );
else if ( result.error() )
TQMessageBox::critical( this, "Key Listing Result",
- TQString("KeyListResult Error: %1").arg( result.error().asString() ) );
+ TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) );
else if ( result.isTruncated() )
TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" );
else
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
index a6210cab..a8d48a00 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
@@ -49,7 +49,7 @@
AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
: AddDirectoryServiceDialog( tqparent, name, modal, fl )
{
- portED->setValidator( new TQIntValidator( 0, 65535, portED ) );
+ portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) );
}
/*
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index b1a135a9..d257cc6a 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -150,7 +150,7 @@ private:
// second one is implementation name (gpg, gpgsm...)
const TQString impName = protocol ? protocol->displayName() : i18n( "failed" );
return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)",
- "%1 (%2)" ).arg( protoName, impName );
+ "%1 (%2)" ).tqarg( protoName, impName );
}
const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index dd92b160..c5ed43b1 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
dialogHeight = 400;
TQSize sz = scrollView->tqsizeHint();
scrollView->setMinimumSize( sz.width()
- + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
+ + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
}
if ( mComponentGUIs.empty() ) {
@@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
"properly. It did not return any components. "
"Try running \"%1\" on the command line for more "
"information.")
- .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+ .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
TQLabel * label = new TQLabel( msg, vbox );
label->tqsetAlignment( TQt::WordBreak );
label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
@@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const
{
TQString descr = mEntry->description();
if ( descr.isEmpty() ) // shouldn't happen
- descr = TQString( "<%1>" ).arg( mName );
+ descr = TQString( "<%1>" ).tqarg( mName );
return descr;
}
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 9ecc87f1..e35e2bb2 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -295,21 +295,21 @@ By clicking this button, you can remove the currently selected directory service
</connection>
<connection>
<sender>x500LV</sender>
- <signal>returnPressed(QListViewItem*)</signal>
+ <signal>returnPressed(TQListViewItem*)</signal>
<receiver>DirectoryServicesWidgetBase</receiver>
- <slot>slotServiceSelected(QListViewItem*)</slot>
+ <slot>slotServiceSelected(TQListViewItem*)</slot>
</connection>
<connection>
<sender>x500LV</sender>
- <signal>doubleClicked(QListViewItem*)</signal>
+ <signal>doubleClicked(TQListViewItem*)</signal>
<receiver>DirectoryServicesWidgetBase</receiver>
- <slot>slotServiceSelected(QListViewItem*)</slot>
+ <slot>slotServiceSelected(TQListViewItem*)</slot>
</connection>
<connection>
<sender>x500LV</sender>
- <signal>selectionChanged(QListViewItem*)</signal>
+ <signal>selectionChanged(TQListViewItem*)</signal>
<receiver>DirectoryServicesWidgetBase</receiver>
- <slot>slotServiceChanged(QListViewItem*)</slot>
+ <slot>slotServiceChanged(TQListViewItem*)</slot>
</connection>
<connection>
<sender>addServicePB</sender>
@@ -333,8 +333,8 @@ By clicking this button, you can remove the currently selected directory service
<Q_SLOTS>
<slot access="protected">slotAddService()</slot>
<slot access="protected">slotDeleteService()</slot>
- <slot access="protected">slotServiceChanged( QListViewItem* )</slot>
- <slot access="protected">slotServiceSelected( QListViewItem* )</slot>
+ <slot access="protected">slotServiceChanged( TQListViewItem* )</slot>
+ <slot access="protected">slotServiceSelected( TQListViewItem* )</slot>
<slot access="protected">slotMoveUp()</slot>
<slot access="protected">slotMoveDown()</slot>
</Q_SLOTS>
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 4f212517..ee809df7 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().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+ const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
if( va & AlignVCenter )
r.setTop( fm.height() / 2 ); // frame rect should be
else if( va & AlignTop )
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
x = 0;
}
TQRect r( x, 0, tw, h );
- int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+ int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
if ( va & AlignTop )
r.moveBy( 0, fm.descent() );
- const TQColor pen( (TQRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
- if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+ const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+ if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
va |= NoAccel;
- style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
+ tqstyle().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/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 5bdadfd0..e81adc43 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
d->selfRequester->setKeys( sender );
glay->addWidget( d->selfRequester, row, 1 );
++row;
- glay->addMultiCellWidget( new KSeparator( Horizontal, view ), row, row, 0, 1 );
+ glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 );
}
const TQStringList prefs = preferencesStrings();
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 7519f7e8..f1641339 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -261,7 +261,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) {
if ( !item )
return;
std::map<TQCString,KeyListViewItem*>::iterator it
- = d->itemMap.tqfind( item->key().primaryFingerprint() );
+ = d->itemMap.find( item->key().primaryFingerprint() );
if ( it == d->itemMap.end() )
return;
Q_ASSERT( it->second == item );
@@ -324,7 +324,7 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) {
Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const TQCString & s ) const {
if ( s.isEmpty() )
return 0;
- const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.tqfind( s );
+ const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.find( s );
if ( it == d->itemMap.end() )
return 0;
return it->second;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 7a56ab5a..16efbd46 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the keys from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
}
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 22737199..141e9e98 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -248,7 +248,7 @@ namespace {
"Created: %2\n"
"Expiry: %3\n"
"Fingerprint: %4" )
- .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+ .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
creation, expiry,
fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
else
@@ -257,10 +257,10 @@ namespace {
"Expiry: %3\n"
"Fingerprint: %4\n"
"Issuer: %5" )
- .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+ .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
creation, expiry,
fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
- .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+ .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
}
const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const {
@@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the keys from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
}
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 824600f1..0cef145b 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -127,7 +127,7 @@ private:
if ( const int err = file.status() )
KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
- .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+ .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
i18n("File Save Error") );
}
void slotUser2() {
@@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString
if ( err.code() != GPG_ERR_NO_DATA ) {
KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
- .arg( TQString::fromLocal8Bit( err.asString() ) ),
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
i18n("GnuPG Audit Log Error") );
return;
}
@@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) {
static TQString to_information_string( const SigningResult & result ) {
return result.error()
- ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
+ ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
: i18n("Signing successful") ;
}
@@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) {
static TQString to_information_string( const EncryptionResult & result ) {
return result.error()
- ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
+ ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
: i18n("Encryption successful") ;
}
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index d6552922..e0149b8f 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int
else if ( what.isEmpty() )
setLabelText( mBaseText );
else
- setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
+ setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) );
setProgress( current, total );
}
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index fd9e601b..b111b081 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -49,7 +49,7 @@ void StoredTransferJob::slotData( KIO::Job *, const TQByteArray &data )
if ( data.size() == 0 )
return;
unsigned int oldSize = m_data.size();
- m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim );
+ m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim );
memcpy( m_data.data() + oldSize, data.data(), data.size() );
}
diff --git a/dependency-graph.dot b/dependency-graph.dot
index 787125fe..d6b774b2 100644
--- a/dependency-graph.dot
+++ b/dependency-graph.dot
@@ -1,4 +1,4 @@
-# to create a ps file use 'dot -Tps -o dependency-graph.ps dependency-graph.dot' (dot it part of the graphviz package)
+# to create a ps file use 'dot -Tps -o dependency-graph.ps dependency-graph.dot' (dot is part of the graphviz package)
digraph "inter-dependency graph for kdepim" {
"akregator" -> "kaddressbook";
"akregator" -> "kontact";
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 4f616844..60c1f2a6 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -273,7 +273,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
mTypeCombo = new AddressTypeCombo( mAddressList, page );
topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
- TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
+ TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).tqarg( KABC::Address::streetLabel() ), page );
label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
topLayout->addWidget( label, 1, 0 );
mStreetTextEdit = new TQTextEdit( page );
@@ -281,34 +281,34 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
label->setBuddy( mStreetTextEdit );
topLayout->addWidget( mStreetTextEdit, 1, 1 );
- TabPressEater *eater = new TabPressEater( this );
+ TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
mStreetTextEdit->installEventFilter( eater );
- label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page );
+ label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page );
topLayout->addWidget( label, 2 , 0 );
mPOBoxEdit = new KLineEdit( page );
label->setBuddy( mPOBoxEdit );
topLayout->addWidget( mPOBoxEdit, 2, 1 );
- label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page );
+ label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).tqarg( KABC::Address::localityLabel() ), page );
topLayout->addWidget( label, 3, 0 );
mLocalityEdit = new KLineEdit( page );
label->setBuddy( mLocalityEdit );
topLayout->addWidget( mLocalityEdit, 3, 1 );
- label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page );
+ label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).tqarg( KABC::Address::regionLabel() ), page );
topLayout->addWidget( label, 4, 0 );
mRegionEdit = new KLineEdit( page );
label->setBuddy( mRegionEdit );
topLayout->addWidget( mRegionEdit, 4, 1 );
- label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page );
+ label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).tqarg( KABC::Address::postalCodeLabel() ), page );
topLayout->addWidget( label, 5, 0 );
mPostalCodeEdit = new KLineEdit( page );
label->setBuddy( mPostalCodeEdit );
topLayout->addWidget( mPostalCodeEdit, 5, 1 );
- label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page );
+ label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).tqarg( KABC::Address::countryLabel() ), page );
topLayout->addWidget( label, 6, 0 );
mCountryCombo = new KComboBox( page );
mCountryCombo->setEditable( true );
@@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
TQWidget *page = plainPage();
TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
- mGroup = new TQButtonGroup( 2, Horizontal, i18n( "street/postal", "Address Types" ), page );
+ mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
tqlayout->addWidget( mGroup );
mTypeList = KABC::Address::typeList();
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 9fe48731..7b1276c8 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -147,7 +147,7 @@ void AddresseeEditorDialog::slotCancel()
void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr )
{
if ( !addr.realName().isEmpty() )
- setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) );
+ setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) );
}
#include "addresseeeditordialog.moc"
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 097f513b..1ea2e77f 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1()
tqlayout->addWidget( button, 0, 1 );
tqlayout->addWidget( mNameEdit, 0, 2 );
tqlayout->addWidget( mNameLabel, 0, 2 );
- label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
+ label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 );
mRoleEdit = new KLineEdit( tab1 );
connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
@@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1()
tqlayout->addWidget( mRoleEdit, 1, 2 );
// Organization
- label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
+ label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 );
mOrgEdit = new KLineEdit( tab1 );
label->setBuddy( mOrgEdit );
connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1()
KIcon::SizeMedium ) );
homePageLayout->addWidget( label );
- label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
+ label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 );
mURLEdit = new KLineEdit( tab1 );
connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
@@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2()
label->setBuddy( mAssistantEdit );
tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
- label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+ label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 );
tqlayout->addWidget( label, 2, 3 );
mTitleEdit = new KLineEdit( tab2 );
connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
- if ( activePages.tqfind( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
+ if ( activePages.tqfind( (*it).mid( (*it).tqfindRev('/') + 1 ) ) == activePages.end() )
continue;
ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
@@ -558,7 +558,7 @@ void AddresseeEditorWidget::load()
mBirthdayPicker->setDate( mAddressee.birthday().date() );
TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
- TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate ));
+ TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate ));
mAnniversaryPicker->setDate( anniversary );
mNicknameEdit->setText( mAddressee.nickName() );
mCategoryEdit->setText( mAddressee.categories().join( "," ) );
@@ -652,7 +652,7 @@ void AddresseeEditorWidget::save()
if ( mAnniversaryPicker->date().isValid() )
mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary",
- mAnniversaryPicker->date().toString( TQt::ISODate ) );
+ mAnniversaryPicker->date().toString( Qt::ISODate ) );
else
mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 4f3a5807..548990d1 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -57,7 +57,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
TQT_SLOT( textChanged( const TQString& ) ) );
tqlayout->addWidget( mViewNameEdit, 0, 1 );
- mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page );
+ mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 932f6f10..910fc151 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -147,7 +147,7 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
// remove the old filters
uint count = config->readNumEntry( "Count" );
for ( uint i = 0; i < count; ++i )
- config->deleteGroup( TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
+ config->deleteGroup( TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) );
}
@@ -155,8 +155,8 @@ void Filter::save( KConfig *config, const TQString &baseGroup, Filter::List &lis
Filter::List::Iterator iter;
for ( iter = list.begin(); iter != list.end(); ++iter ) {
if ( !(*iter).mInternal ) {
- KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
- .arg( index ) );
+ KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup )
+ .tqarg( index ) );
(*iter).save( config );
index++;
}
@@ -179,7 +179,7 @@ Filter::List Filter::restore( KConfig *config, const TQString &baseGroup )
for ( int i = 0; i < count; i++ ) {
{
- KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
+ KConfigGroupSaver s( config, TQString( "%1_%2" ).tqarg( baseGroup ).tqarg( i ) );
f.restore( config );
}
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 716e1764..c5de16ad 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
%c country (in ISO format)
*/
- TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() );
+ TQString urlTemplate = KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() );
if ( urlTemplate.isEmpty() ) {
KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) );
return TQString();
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index 8cee7a9b..e0afc9d6 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -76,7 +76,7 @@ void ContactEditorWidgetManager::reload()
mFactories.clear();
kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl;
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget",
- TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).tqarg( KAB_CEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 5ceac5db..f22160d7 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *tqparent, const char *name )
tqlayout->addWidget( label, 0, 0 );
mTitle = new KLineEdit( page );
- mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
+ mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
label->setBuddy( mTitle );
tqlayout->addWidget( mTitle, 0, 1 );
@@ -276,13 +276,13 @@ void FieldWidget::loadContact( KABC::Addressee *addr )
wdg->setChecked( value == "true" || value == "1" );
} else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget );
- wdg->setDate( TQDate::fromString( value, TQt::ISODate ) );
+ wdg->setDate( TQDate::fromString( value, Qt::ISODate ) );
} else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget );
- wdg->setTime( TQTime::fromString( value, TQt::ISODate ) );
+ wdg->setTime( TQTime::fromString( value, Qt::ISODate ) );
} else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget );
- wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) );
+ wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) );
}
}
}
@@ -332,13 +332,13 @@ void FieldWidget::storeContact( KABC::Addressee *addr )
value = ( wdg->isChecked() ? "true" : "false" );
} else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
- value = wdg->date().toString( TQt::ISODate );
+ value = wdg->date().toString( Qt::ISODate );
} else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
- value = wdg->time().toString( TQt::ISODate );
+ value = wdg->time().toString( Qt::ISODate );
} else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
- value = wdg->dateTime().toString( TQt::ISODate );
+ value = wdg->dateTime().toString( Qt::ISODate );
}
if ( value.isEmpty() )
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 485b7797..2c6d39c9 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -159,7 +159,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
d->addressBook = book;
Q_ASSERT( d->addressBook );
d->lastLineId = 0;
- d->mapper = new TQSignalMapper( this );
+ d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( d->mapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( lineTextChanged( int ) ) );
setCaption( i18n( "Edit Distribution List" ) );
@@ -250,7 +250,7 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr
addressees.append( line );
TQObject::connect( line, TQT_SIGNAL( textChanged() ),
mapper, TQT_SLOT( map() ) );
- mapper->setMapping( line, ++lastLineId );
+ mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId );
line->setShown( true );
return line;
}
@@ -261,7 +261,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk()
const KPIM::DistributionList existing = KPIM::DistributionList::findByName( d->addressBook, name );
if ( !existing.isEmpty() && existing.uid() != d->distListUid )
{
- KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).arg( name ), i18n( "Name in Use" ) );
+ KMessageBox::error( this, i18n( "A distribution list with the name %1 already exists. Please choose another name." ).tqarg( name ), i18n( "Name in Use" ) );
return;
}
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 9ea49c3a..7b515782 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -106,10 +106,10 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
TQPixmap pixmap;
pixmap.convertFromImage( m_entry.addressee.photo().data() );
m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap );
- m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) );
+ m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).tqarg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) );
m_distListLabel->setURL( m_list.name() );
m_distListLabel->setText( m_list.name() );
- m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
+ m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).tqarg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
m_resourceLabel->tqsetAlignment( TQt::SingleLine );
m_emailGroup = new TQVButtonGroup( this );
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index fab91bc4..5810276e 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -107,12 +107,12 @@ void KPIM::DistributionListPickerDialog::slotUser1()
m_book->insertAddressee( list );
m_listBox->insertItem( name );
- TQListBoxItem* item = m_listBox->findItem( name );
+ TQListBoxItem* item = m_listBox->tqfindItem( name );
m_listBox->setSelected( item, true );
}
else
{
- KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).arg( name ), i18n( "Name Exists" ) );
+ KMessageBox::error( this, i18n( "A distribution list with the the name %1 already exists. Please choose another name" ).tqarg( name ), i18n( "Name Exists" ) );
}
}
while ( !validName );
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 1d64c5b9..aa3a9a48 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -50,7 +50,7 @@ IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *>
mProtocols = protocols;
populateProtocols();
- cmbProtocol->setCurrentItem( mProtocols.findIndex( protocol ) );
+ cmbProtocol->setCurrentItem( mProtocols.tqfindIndex( protocol ) );
edtAddress->setText( address.section( TQChar( 0xE120 ), 0, 0 ) );
edtNetwork->setText( address.section( TQChar( 0xE120 ), 1 ) );
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 3e306a03..aba21b65 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -85,7 +85,7 @@ void IMAddressLVI::setAddress( const TQString &address )
else {
TQString nickname = address.section( TQChar( 0xE120 ), 0, 0 );
setText( 1, i18n( "<nickname> on <server>","%1 on %2" )
- .arg( nickname ).arg( serverOrGroup ) );
+ .tqarg( nickname ).tqarg( serverOrGroup ) );
}
mAddress = address;
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 21d21e52..75677a69 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -302,7 +302,7 @@ void EmailEditDialog::remove()
{
TQString address = mEmailListBox->currentText();
- TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).arg( address );
+ TQString text = i18n( "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>" ).tqarg( address );
TQString caption = i18n( "Confirm Remove" );
if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue) {
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 0f8100db..1496be51 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -52,7 +52,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
Q_ASSERT( mExtensionBar );
TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar );
mSplitter = new TQSplitter( mExtensionBar );
- mSplitter->setOrientation( TQSplitter::Vertical );
+ mSplitter->setOrientation( Qt::Vertical );
tqlayout->addWidget( mSplitter );
createExtensionWidgets();
@@ -217,7 +217,7 @@ void ExtensionManager::createExtensionWidgets()
// load the other extensions
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension",
- TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).tqarg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 16277784..7ce25beb 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -343,7 +343,7 @@ void DistributionListWidget::editList()
void DistributionListWidget::removeList()
{
int result = KMessageBox::warningContinueCancel( this,
- i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ),
+ i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .tqarg( mNameCombo->currentText() ),
TQString(), KGuiItem( i18n("Delete"), "editdelete") );
if ( result != KMessageBox::Continue )
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 049f879b..5fe18f5d 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -241,13 +241,13 @@ void ResourceSelection::add()
if ( !ok )
return;
- TQString type = types[ descs.findIndex( desc ) ];
+ TQString type = types[ descs.tqfindIndex( desc ) ];
// Create new resource
KABC::Resource *resource = mManager->createResource( type );
if ( !resource ) {
KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>")
- .arg( type ) );
+ .tqarg( type ) );
return;
}
@@ -298,7 +298,7 @@ void ResourceSelection::remove()
int result = KMessageBox::warningContinueCancel( this,
i18n( "<qt>Do you really want to remove the address book <b>%1</b>?</qt>" )
- .arg( item->resource()->resourceName() ), "",
+ .tqarg( item->resource()->resourceName() ), "",
KGuiItem( i18n( "&Remove" ), "editdelete" ) );
if ( result == KMessageBox::Cancel )
return;
@@ -410,7 +410,7 @@ void ResourceSelection::slotSubresourceAdded( KPIM::ResourceABC *resource,
const TQString& subResource )
{
kdDebug(5720) << k_funcinfo << resource->resourceName() << " " << subResource << endl;
- TQListViewItem *i = mListView->findItem( resource->resourceName(), 0 );
+ TQListViewItem *i = mListView->tqfindItem( resource->resourceName(), 0 );
if ( !i )
// Not found
return;
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 60a67014..7428b363 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -265,11 +265,11 @@ void FilterDialog::initGUI()
connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
TQT_SLOT( edit() ) );
- KButtonBox *buttonBox = new KButtonBox( page, Vertical );
- buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT( add() ) );
- mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT( edit() ) );
+ KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
+ buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
+ mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
mEditButton->setEnabled( false );
- mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) );
+ mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
buttonBox->tqlayout();
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 4837a1ef..5dc43286 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -67,7 +67,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *nam
mLatitudeBox = new KDoubleSpinBox( -90, 90, 1, 0, 6, this );
mLatitudeBox->setEnabled( false );
- mLatitudeBox->setSuffix( "°" );
+ mLatitudeBox->setSuffix( "�" );
topLayout->addWidget( mLatitudeBox, 1, 2 );
label->setBuddy( mLatitudeBox );
@@ -76,7 +76,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *nam
mLongitudeBox = new KDoubleSpinBox( -180, 180, 1, 0, 6, this );
mLongitudeBox->setEnabled( false );
- mLongitudeBox->setSuffix( "°" );
+ mLongitudeBox->setSuffix( "�" );
topLayout->addWidget( mLongitudeBox, 2, 2 );
label->setBuddy( mLongitudeBox );
@@ -174,7 +174,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
mCityCombo = new KComboBox( page );
topLayout->addWidget( mCityCombo, 0, 1 );
- TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
+ TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
2, 5, spacingHint() );
@@ -182,7 +182,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
sexagesimalLayout->addWidget( label, 0, 0 );
mLatDegrees = new TQSpinBox( 0, 90, 1, sexagesimalGroup );
- mLatDegrees->setSuffix( "°" );
+ mLatDegrees->setSuffix( "�" );
mLatDegrees->setWrapping( false );
label->setBuddy( mLatDegrees );
sexagesimalLayout->addWidget( mLatDegrees, 0, 1 );
@@ -204,7 +204,7 @@ GeoDialog::GeoDialog( TQWidget *tqparent, const char *name )
sexagesimalLayout->addWidget( label, 1, 0 );
mLongDegrees = new TQSpinBox( 0, 180, 1, sexagesimalGroup );
- mLongDegrees->setSuffix( "°" );
+ mLongDegrees->setSuffix( "�" );
label->setBuddy( mLongDegrees );
sexagesimalLayout->addWidget( mLongDegrees, 1, 1 );
@@ -537,7 +537,7 @@ void GeoMapWidget::paintEvent( TQPaintEvent* )
TQPixmap pm( w, h );
TQPainter p;
- p.begin( &pm, this );
+ p.tqbegin( &pm, this );
p.setPen( TQColor( 255, 0, 0 ) );
p.setBrush( TQColor( 255, 0, 0 ) );
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 0dc83ae4..b4219322 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -206,7 +206,7 @@ void ImageButton::mousePressEvent( TQMouseEvent *event )
void ImageButton::mouseMoveEvent( TQMouseEvent *event )
{
- if ( (event->state() & LeftButton) &&
+ if ( (event->state() & Qt::LeftButton) &&
(event->pos() - mDragStartPos).manhattanLength() >
KGlobalSettings::dndEventDelay() ) {
startDrag();
@@ -254,7 +254,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
- TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, title, this );
+ TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
mImageButton = new ImageButton( i18n( "Picture" ), box );
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 4ef22bc5..1af942b2 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -57,7 +57,7 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar,
{
setToggleButton( true );
if ( !lastChar.isEmpty() )
- setText( TQString( "%1 - %2" ).arg( firstChar.upper() ).arg( lastChar.upper() ) );
+ setText( TQString( "%1 - %2" ).tqarg( firstChar.upper() ).tqarg( lastChar.upper() ) );
else
setText( firstChar.upper() );
}
@@ -72,7 +72,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *n
tqlayout->setAutoAdd( true );
tqlayout->setResizeMode( TQLayout::FreeResize );
- mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this );
+ mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
mGroupBox->setExclusive( true );
mGroupBox->tqlayout()->setSpacing( 0 );
mGroupBox->tqlayout()->setMargin( 0 );
@@ -98,7 +98,7 @@ void JumpButtonBar::updateButtons()
TQFontMetrics fm = fontMetrics();
TQPushButton *btn = new TQPushButton( "", this );
btn->hide();
- TQSize buttonSize = style().sizeFromContents( TQStyle::CT_PushButton, btn,
+ TQSize buttonSize = tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, btn,
fm.size( ShowPrefix, "X - X") ).
expandedTo( TQApplication::globalStrut() );
delete btn;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 14f9577a..23ebc277 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -94,7 +94,7 @@
KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
const TQString &file, const char *name )
- : KAB::Core( client, tqparent, name ), mStatusBar( 0 ), mViewManager( 0 ),
+ : KAB::Core( client, TQT_TQOBJECT(tqparent), name ), mStatusBar( 0 ), mViewManager( 0 ),
mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
mModified( false )
@@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
mAddressBook = new KABC::AddressBook;
mAddressBook->addResource( new KABC::ResourceFile( file ) );
if ( !mAddressBook->load() ) {
- KMessageBox::error( tqparent, i18n("Unable to load '%1'.").arg( file ) );
+ KMessageBox::error( tqparent, i18n("Unable to load '%1'.").tqarg( file ) );
}
}
mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) );
@@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent,
mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal,
"BlogFeed", "KADDRESSBOOK" );
- mSearchManager = new KAB::SearchManager( mAddressBook, tqparent );
+ mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(tqparent) );
connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( slotContactsUpdated() ) );
@@ -430,7 +430,7 @@ void KABCore::setContactSelected( const TQString &uid )
mActionMerge->setEnabled( ( list.size() == 2 ) && writable );
if ( mReadWrite ) {
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
@@ -552,11 +552,11 @@ void KABCore::copyContacts()
#if defined(KABC_VCARD_ENCODING_FIX)
TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setText( TQString::fromUtf8( clipText.data() ) );
#else
TQString clipText = AddresseeUtil::addresseesToClipboard( addrList );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
cb->setText( clipText );
#endif
}
@@ -575,7 +575,7 @@ void KABCore::cutContacts()
void KABCore::pasteContacts()
{
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
@@ -640,7 +640,7 @@ void KABCore::setWhoAmI()
}
TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
- if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
+ if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] );
}
@@ -661,7 +661,7 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character )
KABC::AddresseeList::ConstIterator it;
const KABC::AddresseeList::ConstIterator endIt( list.end() );
for ( it = list.begin(); it != endIt; ++it ) {
- if ( field->value( *it ).startsWith( character, false ) ) {
+ if ( field->value( *it ).tqstartsWith( character, false ) ) {
mViewManager->setSelected( (*it).uid(), true );
return;
}
@@ -720,7 +720,7 @@ void KABCore::newDistributionList()
bool foundUnused = false;
int i = 1;
while ( !foundUnused ) {
- name = i18n( "New Distribution List (%1)" ).arg( i++ );
+ name = i18n( "New Distribution List (%1)" ).tqarg( i++ );
foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty();
}
}
@@ -897,7 +897,7 @@ void KABCore::save()
if ( ticket ) {
if ( !mAddressBook->save( ticket ) ) {
KMessageBox::error( mWidget,
- i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) );
+ i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) );
mAddressBook->releaseSaveTicket( ticket );
} else {
setModified( false );
@@ -905,7 +905,7 @@ void KABCore::save()
} else {
KMessageBox::error( mWidget,
i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" )
- .arg( it.current()->resourceName() ) );
+ .tqarg( it.current()->resourceName() ) );
}
++it;
@@ -1205,7 +1205,7 @@ void KABCore::initGUI()
mDetailsSplitter = new TQSplitter( mWidget );
mLeftSplitter = new TQSplitter( mDetailsSplitter );
- mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal );
+ mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal );
topLayout->addWidget( searchTB );
topLayout->addWidget( mDetailsSplitter );
@@ -1292,7 +1292,7 @@ void KABCore::initGUI()
topLayout->setStretchFactor( mDetailsSplitter, 1 );
- mXXPortManager = new XXPortManager( this, mWidget );
+ mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) );
initActions();
}
@@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar()
void KABCore::initActions()
{
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+ connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( clipboardDataChanged() ) );
KAction *action;
@@ -1432,7 +1432,7 @@ void KABCore::initActions()
void KABCore::clipboardDataChanged()
{
if ( mReadWrite )
- mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() );
+ mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() );
}
void KABCore::updateIncSearchWidget()
@@ -1634,7 +1634,7 @@ void KABCore::removeSelectedContactsFromDistList()
"<b>Note:</b>The contacts will be not be removed from your addressbook nor from "
"any other distribution list."
"</qt>",
- uids.count() ).arg( mSelectedDistributionList ),
+ uids.count() ).tqarg( mSelectedDistributionList ),
names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) {
return;
}
@@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name )
mSearchManager->setSelectedDistributionList( name );
mViewHeaderLabel->setText( name.isNull() ?
i18n( "Contacts" ) :
- i18n( "Distribution List: %1" ).arg( name ) );
+ i18n( "Distribution List: %1" ).tqarg( name ) );
mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() );
if ( !name.isNull() ) {
mDetailsStack->raiseWidget( mDistListEntryView );
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 0b98eab3..31d7f368 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -43,7 +43,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
name.tqreplace( '/', '_' );
++number;
- uniquePart = TQString( "_%1" ).arg( number );
+ uniquePart = TQString( "_%1" ).tqarg( number );
} while ( existingFiles.tqcontains( name ) );
existingFiles.append( name );
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index a29380ad..6f0904b4 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -51,7 +51,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widget
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
- canvas->setFocusPolicy( TQWidget::ClickFocus );
+ canvas->setFocusPolicy( Qt::ClickFocus );
setWidget( canvas );
TQVBoxLayout *topLayout = new TQVBoxLayout( canvas );
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 05e099d2..3991e740 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -52,7 +52,11 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
virtual void addEmail( TQString addr );
virtual void importVCard( const KURL& url );
virtual void importVCardFromData( const TQString& vCard );
+#ifndef Q_MOC_RUN
virtual ASYNC showContactEditor( TQString uid );
+#else // Q_MOC_RUN
+ virtual void showContactEditor( TQString uid );
+#endif // Q_MOC_RUN
virtual void newContact();
virtual void newDistributionList();
virtual TQString getNameByPhone( TQString phone );
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 55f664a6..ee9de2f5 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose()
void KAddressBookMain::initActions()
{
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
KAction *action;
- action = KStdAction::keyBindings( this, TQT_SLOT( configureKeyBindings() ), actionCollection() );
+ action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() );
action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) );
- KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
+ KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() );
}
void KAddressBookMain::configureKeyBindings()
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 0047f534..7867634d 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -55,7 +55,11 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
virtual void addEmail( TQString addr );
virtual void importVCard( const KURL& url );
virtual void importVCardFromData( const TQString& vCard );
+#ifndef Q_MOC_RUN
virtual ASYNC showContactEditor( TQString uid );
+#else // QT_MOC_RUN
+ virtual void showContactEditor( TQString uid );
+#endif // QT_MOC_RUN
virtual void newContact();
virtual void newDistributionList();
virtual TQString getNameByPhone( TQString phone );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index b68e96c6..f1a3f525 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -46,7 +46,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
- TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this );
+ TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
KDialog::spacingHint() );
@@ -55,11 +55,11 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
groupLayout->addWidget( mBox, 0, 0 );
- KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
- mAddButton = bbox->addButton( i18n( "Add..." ), this, TQT_SLOT( add() ) );
- mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQT_SLOT( edit() ) );
+ KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
+ mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) );
+ mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) );
mEditButton->setEnabled( false );
- mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQT_SLOT( remove() ) );
+ mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false );
bbox->tqlayout();
groupLayout->addWidget( bbox, 0, 1 );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index c65255db..f2899ba3 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
KDialog::spacingHint() );
- TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage );
+ TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
boxLayout->tqsetAlignment( TQt::AlignTop );
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
tqlayout->addWidget( groupBox );
- groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
KDialog::spacingHint() );
label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
tqlayout->addWidget( groupBox );
- groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage );
+ groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
boxLayout->tqsetAlignment( TQt::AlignTop );
@@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings()
mFaxHook->setText( KABPrefs::instance()->faxHookApplication() );
mAddresseeWidget->restoreSettings();
mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() );
- mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) );
+ mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) );
mLocationMapURL->lineEdit()->setCursorPosition( 0 );
KConfig config( "kabcrc", false, false );
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index e0bbca23..996da428 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
tqlayout->addWidget( groupBox );
KButtonBox *buttons = new KButtonBox( this );
- buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
- mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQT_SLOT( slotEditHost() ) );
+ buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
+ mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) );
mEditButton->setEnabled( false );
- mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
+ mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
mRemoveButton->setEnabled( false );
buttons->tqlayout();
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 3949cd14..3541ddf1 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -122,7 +122,7 @@ void KeyWidget::addKey()
TQFile file( tmpFile );
if ( !file.open( IO_ReadOnly ) ) {
TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
- KMessageBox::error( this, text.arg( url.url() ) );
+ KMessageBox::error( this, text.tqarg( url.url() ) );
return;
}
@@ -154,7 +154,7 @@ void KeyWidget::removeKey()
TQString type = mKeyCombo->currentText();
TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" );
- if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
+ if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
return;
mKeyList.remove( mKeyList.at( pos ) );
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index f2304990..19b5dd6c 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
page );
groupBox->setFrameShape( TQGroupBox::Box );
groupBox->setFrameShadow( TQGroupBox::Sunken );
- groupBox->setColumnLayout( 0, TQt::Vertical );
+ groupBox->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
5, spacingHint() );
boxLayout->setColStretch( 1, 1 );
@@ -202,9 +202,9 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
mResultListView->setShowSortIndicator( true );
topLayout->addWidget( mResultListView );
- KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
- buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
- buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
+ KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal );
+ buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) );
+ buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) );
topLayout->addWidget( buttons );
@@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings()
} else {
mIsOK = true;
for ( int j = 0; j < mNumHosts; ++j ) {
- KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
+ KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
KPIM::LdapServer ldapServer;
KPIM::LdapSearch::readConfig( ldapServer, config, j, true );
ldapClient->setServer( ldapServer );
@@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
if ( attr == i18n( "Name" ) ) {
result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)";
- result = result.arg( query ).arg( query );
+ result = result.tqarg( query ).tqarg( query );
} else {
result += (startsWith ? "%1=%2*" : "%1=*%2*");
if ( attr == i18n( "Email" ) ) {
- result = result.arg( "mail" ).arg( query );
+ result = result.tqarg( "mail" ).tqarg( query );
} else if ( attr == i18n( "Home Number" ) ) {
- result = result.arg( "homePhone" ).arg( query );
+ result = result.tqarg( "homePhone" ).tqarg( query );
} else if ( attr == i18n( "Work Number" ) ) {
- result = result.arg( "telephoneNumber" ).arg( query );
+ result = result.tqarg( "telephoneNumber" ).tqarg( query );
} else {
// Error?
result = TQString();
@@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
if ( existing.isEmpty() ) {
addr.setUid( KApplication::randomString( 10 ) );
- addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
+ addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
addr.setResource( resource );
mCore->addressBook()->insertAddressee( addr );
TQString displayString;
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 2587ad3e..fc05df18 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -97,7 +97,7 @@ void PhoneTypeCombo::update()
}
}
- setCurrentItem( mLastSelected = mTypeList.findIndex( mType ) );
+ setCurrentItem( mLastSelected = mTypeList.tqfindIndex( mType ) );
blockSignals( blocked );
}
@@ -183,7 +183,7 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *tqparent, const char *name )
mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() );
tqlayout->addWidget( mRemoveButton, 1, 1 );
- mMapper = new TQSignalMapper( this );
+ mMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
@@ -271,7 +271,7 @@ void PhoneEditWidget::recreateNumberWidgets()
PhoneNumberWidget *wdg = new PhoneNumberWidget( this );
wdg->setNumber( *it );
- mMapper->setMapping( wdg, counter );
+ mMapper->setMapping( TQT_TQOBJECT(wdg), counter );
connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) );
mWidgetLayout->addWidget( wdg );
@@ -303,7 +303,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent )
mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
tqlayout->addWidget( mPreferredBox );
- mGroup = new TQButtonGroup( 2, Horizontal, i18n( "Types" ), page );
+ mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
tqlayout->addWidget( mGroup );
// fill widgets
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index d7fb26b8..63cfdcfd 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::tqcurrentDateTime() ) );
+ .tqarg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
p.setPen( TQt::black );
p.drawText( 0, fm.height(), text );
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index bf0a49a0..516431a5 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -51,7 +51,7 @@ SelectionPage::SelectionPage( TQWidget* tqparent, const char* name )
mButtonGroup = new TQButtonGroup( this );
mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
- mButtonGroup->setColumnLayout( 0, TQt::Vertical );
+ mButtonGroup->setColumnLayout( 0, Qt::Vertical );
mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 721cffaa..760f71d6 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -121,7 +121,7 @@ void StylePage::initGUI()
topLayout->addMultiCellWidget( label, 0, 0, 0, 1 );
TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
- group->setColumnLayout( 0, TQt::Vertical );
+ group->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
KDialog::spacingHint() );
sortLayout->tqsetAlignment( TQt::AlignTop );
@@ -141,7 +141,7 @@ void StylePage::initGUI()
topLayout->addWidget( group, 1, 0 );
group = new TQButtonGroup( i18n( "Print Style" ), this );
- group->setColumnLayout( 0, TQt::Vertical );
+ group->setColumnLayout( 0, Qt::Vertical );
TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
KDialog::spacingHint() );
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 462451f3..32b898cd 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -109,11 +109,11 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
const KABC::Field::List::ConstIterator fieldEndIt( fieldList.end() );
for ( ; fieldIt != fieldEndIt; ++fieldIt ) {
- if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) {
+ if ( type == StartsWith && (*fieldIt)->value( *it ).tqstartsWith( pattern, false ) ) {
mContacts.append( *it );
found = true;
break;
- } else if ( type == EndsWith && (*fieldIt)->value( *it ).endsWith( pattern, false ) ) {
+ } else if ( type == EndsWith && (*fieldIt)->value( *it ).tqendsWith( pattern, false ) ) {
mContacts.append( *it );
found = true;
break;
@@ -138,10 +138,10 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
int pos = (*customIt).tqfind( ':' );
if ( pos != -1 ) {
const TQString value = (*customIt).mid( pos + 1 );
- if ( type == StartsWith && value.startsWith( pattern, false ) ) {
+ if ( type == StartsWith && value.tqstartsWith( pattern, false ) ) {
mContacts.append( *it );
break;
- } else if ( type == EndsWith && value.endsWith( pattern, false ) ) {
+ } else if ( type == EndsWith && value.tqendsWith( pattern, false ) ) {
mContacts.append( *it );
break;
} else if ( type == Contains && value.tqfind( pattern, 0, false ) != -1 ) {
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index 0648bf42..7280b5c7 100644
--- a/kaddressbook/typecombo.h
+++ b/kaddressbook/typecombo.h
@@ -91,8 +91,8 @@ void TypeCombo<T>::updateTypes()
}
labelCount[ type ] = count;
if ( count > 1 ) {
- label = i18n("label (number)", "%1 (%2)").arg( label )
- .arg( TQString::number( count ) );
+ label = i18n("label (number)", "%1 (%2)").tqarg( label )
+ .tqarg( TQString::number( count ) );
}
insertItem( label );
}
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index c0cd5a8a..e05024bd 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -261,7 +261,7 @@ void CutCommand::unexecute()
mAddresseeList.clear();
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
kapp->processEvents();
cb->setText( mOldText );
}
@@ -289,7 +289,7 @@ void CutCommand::execute()
// Convert to clipboard
mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
mOldText = cb->text();
kapp->processEvents();
#if defined(KABC_VCARD_ENCODING_FIX)
@@ -391,7 +391,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
addressBook()->insertAddressee( newAddr );
mAddresseeList.append( newAddr );
mUIDList.append( uid );
- const bool inserted = addressBook()->tqfind( newAddr ) != addressBook()->end();
+ const bool inserted = addressBook()->find( newAddr ) != addressBook()->end();
if ( inserted ) {
if ( resourceExist( addr.resource() ) ) {
KABLock::self( addressBook() )->lock( addr.resource() );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index e6d04645..23b1a4cc 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -307,7 +307,7 @@ void ViewManager::editView()
void ViewManager::deleteView()
{
TQString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" )
- .arg( mActiveView->caption() );
+ .tqarg( mActiveView->caption() );
TQString caption = i18n( "Confirm Delete" );
if ( KMessageBox::warningContinueCancel( this, text, caption, KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Continue ) {
@@ -348,7 +348,7 @@ void ViewManager::addView()
firstConflict = false;
}
- newName = TQString( "%1 <%2>" ).arg( newName ).arg( numTries );
+ newName = TQString( "%1 <%2>" ).tqarg( newName ).tqarg( numTries );
numTries++;
}
@@ -363,7 +363,7 @@ void ViewManager::addView()
// try to set the active view
mActionSelectView->setItems( mViewNameList );
- mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) );
+ mActionSelectView->setCurrentItem( mViewNameList.tqfindIndex( newName ) );
setActiveView( newName );
editView();
@@ -387,7 +387,7 @@ void ViewManager::scrollDown()
void ViewManager::createViewFactories()
{
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View",
- TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).arg( KAB_VIEW_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).tqarg( KAB_VIEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
@@ -573,27 +573,27 @@ void ViewManager::initActions()
KAction *action;
- action = new KAction( i18n( "Modify View..." ), "configure", 0, this,
+ action = new KAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this),
TQT_SLOT( editView() ), mCore->actionCollection(),
"view_modify" );
action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
- action = new KAction( i18n( "Add View..." ), "window_new", 0, this,
+ action = new KAction( i18n( "Add View..." ), "window_new", 0, TQT_TQOBJECT(this),
TQT_SLOT( addView() ), mCore->actionCollection(),
"view_add" );
action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0,
- this, TQT_SLOT( deleteView() ),
+ TQT_TQOBJECT(this), TQT_SLOT( deleteView() ),
mCore->actionCollection(), "view_delete" );
mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) );
- action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
+ action = new KAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this),
TQT_SLOT( refreshView() ), mCore->actionCollection(),
"view_refresh" );
action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
- action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this,
+ action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this),
TQT_SLOT( configureFilters() ), mCore->actionCollection(),
"options_edit_filters" );
action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) );
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9149c653..110d3be8 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -61,7 +61,7 @@ class CardViewTip : public TQLabel
};
//
-// Warning: make sure you use findRef() instead of tqfind() to find an
+// Warning: make sure you use tqfindRef() instead of tqfind() to find an
// item! Only the pointer value is unique in the list.
//
class CardViewItemList : public TQPtrList<CardViewItem>
@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
// if we are the current item and the view has focus, draw focus rect
if ( mView->currentItem() == this && mView->hasFocus() ) {
- mView->style().drawPrimitive( TQStyle::PE_FocusRect, p,
+ mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
TQStyle::Style_FocusAtBorder,
TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -587,7 +587,7 @@ CardView::CardView( TQWidget *tqparent, const char *name )
viewport()->setMouseTracking( true );
viewport()->setFocusProxy( this );
- viewport()->setFocusPolicy( WheelFocus );
+ viewport()->setFocusPolicy(Qt::WheelFocus );
viewport()->setBackgroundMode( PaletteBase );
connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
@@ -616,7 +616,7 @@ void CardView::takeItem( CardViewItem *item )
{
if ( d->mCurrentItem == item )
d->mCurrentItem = item->nextItem();
- d->mItemList.take( d->mItemList.findRef( item ) );
+ d->mItemList.take( d->mItemList.tqfindRef( item ) );
setLayoutDirty( true );
}
@@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
calcLayout();
// allow setting costum colors in the viewport pale
- TQColorGroup cg = viewport()->palette().active();
+ TQColorGroup cg = viewport()->tqpalette().active();
TQRect clipRect( clipx, clipy, clipw, cliph );
TQRect cardRect;
@@ -953,7 +953,7 @@ void CardView::calcLayout()
CardViewItem *CardView::itemAfter( const CardViewItem *item ) const
{
- d->mItemList.findRef( item );
+ d->mItemList.tqfindRef( item );
return d->mItemList.next();
}
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
emit clicked( item );
// The RMB click
- if ( e->button() & TQt::RightButton ) {
+ if ( e->button() & Qt::RightButton ) {
// clear previous selection
bool blocked = signalsBlocked();
blockSignals( true );
@@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
item->tqrepaintCard();
emit selectionChanged();
} else if ( d->mSelectionMode == CardView::Extended ) {
- if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
+ if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
if ( item == other )
return;
@@ -1070,8 +1070,8 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
}
int from, to, a, b;
- a = d->mItemList.findRef( item );
- b = d->mItemList.findRef( other );
+ a = d->mItemList.tqfindRef( item );
+ b = d->mItemList.tqfindRef( other );
from = a < b ? a : b;
to = a > b ? a : b;
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
}
emit selectionChanged();
- } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
+ } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) {
item->setSelected( !item->isSelected() );
item->tqrepaintCard();
emit selectionChanged();
- } else if ( e->button() & TQt::LeftButton ) {
+ } else if ( e->button() & Qt::LeftButton ) {
bool b = signalsBlocked();
blockSignals( true );
selectAll( false );
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
return;
}
- if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
+ if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
startDrag();
@@ -1218,7 +1218,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
return;
}
- uint pos = d->mItemList.findRef( d->mCurrentItem );
+ uint pos = d->mItemList.tqfindRef( d->mCurrentItem );
CardViewItem *aItem = 0;
CardViewItem *old = d->mCurrentItem;
@@ -1347,8 +1347,8 @@ void CardView::keyPressEvent( TQKeyEvent *e )
// otherwise, ??????
bool s = ! aItem->isSelected();
int from, to, a, b;
- a = d->mItemList.findRef( aItem );
- b = d->mItemList.findRef( old );
+ a = d->mItemList.tqfindRef( aItem );
+ b = d->mItemList.tqfindRef( old );
from = a < b ? a : b;
to = a > b ? a : b;
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index fdccd52f..834431af 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
loTab->setSpacing( spacing );
loTab->setMargin( margin );
- TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
+ TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral );
@@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI()
sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding );
lSpacing->setBuddy( sbSpacing );
- TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab );
+ TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
TQHBox *hbMargin = new TQHBox( gbCards );
TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
@@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI()
void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l )
{
l->setFont( fnt );
- l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
+ l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) );
}
#include "configurecardviewdialog.moc"
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 309244e5..179a819a 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
- TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
+ TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
i18n("Row Separator"), this);
tqlayout->addWidget(group);
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 548ad5f9..31f0ac6c 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos )
if (a.isEmpty())
return;
- s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel())
- .arg(a.formattedName());
+ s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel())
+ .tqarg(a.formattedName());
s += '\n';
- s += i18n("label: value", "%1: %2").arg(a.organizationLabel())
- .arg(a.organization());
+ s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel())
+ .tqarg(a.organization());
TQString notes = a.note().stripWhiteSpace();
if ( !notes.isEmpty() ) {
notes += '\n';
- s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel());
+ s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel());
TQFontMetrics fm( font() );
// Begin word wrap code based on TQMultiLineEdit code
@@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e)
// To initiate a drag operation
void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e )
{
- if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+ if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
emit startAddresseeDrag();
}
else
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 5fdc89a5..fc9ac247 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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
@@ -58,8 +58,8 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
KTempFile tmpFile;
if ( tmpFile.status() != 0 ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
- KMessageBox::error( tqparentWidget(), txt.arg( url.url() )
- .arg( strerror( tmpFile.status() ) ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
+ .tqarg( strerror( tmpFile.status() ) ) );
return false;
}
@@ -71,7 +71,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
TQFile file( url.path() );
if ( !file.open( IO_WriteOnly ) ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
- KMessageBox::error( tqparentWidget(), txt.arg( url.path() ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( url.path() ) );
return false;
}
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 4356a599..1120e4f0 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -383,7 +383,7 @@ void CSVImportDialog::initGUI()
// Delimiter: comma, semicolon, tab, space, other
mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
- mDelimiterBox->setColumnLayout( 0, TQt::Vertical );
+ mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
mDelimiterBox->tqlayout()->setMargin( marginHint() );
TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
@@ -503,7 +503,7 @@ void CSVImportDialog::fillTable()
else if ( code == Guess ) {
TQTextCodec* codec = TQTextCodec::codecForContent( mFileArray.data(), mFileArray.size() );
if ( codec ) {
- KMessageBox::information( this, i18n( "Using codec '%1'" ).arg( codec->name() ), i18n( "Encoding" ) );
+ KMessageBox::information( this, i18n( "Using codec '%1'" ).tqarg( codec->name() ), i18n( "Encoding" ) );
inputStream.setCodec( codec );
}
}
@@ -663,7 +663,7 @@ void CSVImportDialog::reloadCodecs()
for ( int i = 0; ( codec = TQTextCodec::codecForIndex( i ) ); i++ )
mCodecs.append( codec );
- mCodecCombo->insertItem( i18n( "Local (%1)" ).arg( TQTextCodec::codecForLocale()->name() ), Local );
+ mCodecCombo->insertItem( i18n( "Local (%1)" ).tqarg( TQTextCodec::codecForLocale()->name() ), Local );
mCodecCombo->insertItem( i18n( "[guess]" ), Guess );
mCodecCombo->insertItem( i18n( "Latin1" ), Latin1 );
mCodecCombo->insertItem( i18n( "Unicode" ), Uni );
@@ -858,7 +858,7 @@ void CSVImportDialog::saveTemplate()
fileName += ".desktop";
if( TQFileInfo(fileName).exists() ) {
- if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").arg(fileName) ) == KMessageBox::No)
+ if(KMessageBox::questionYesNo( this, i18n("Do you want to overwrite file \"%1\"").tqarg(fileName) ) == KMessageBox::No)
return;
}
TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) );
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index ca804fe3..9844b550 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -152,9 +152,9 @@ TQString EudoraXXPort::email( const TQString& line ) const
{
int b;
TQString result;
- b = line.findRev( '\"' );
+ b = line.tqfindRev( '\"' );
if ( b == -1 ) {
- b = line.findRev( ' ' );
+ b = line.tqfindRev( ' ' );
if ( b == -1 )
return result;
}
@@ -168,9 +168,9 @@ TQString EudoraXXPort::comment( const TQString& line ) const
int b;
TQString result;
uint i;
- b = line.findRev( '>' );
+ b = line.tqfindRev( '>' );
if ( b == -1 ) {
- b = line.findRev( '\"' );
+ b = line.tqfindRev( '\"' );
if ( b == -1 )
return result;
}
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 343831a9..053a850e 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -63,7 +63,7 @@ extern "C" {
#define GNOKII_CHECK_ERROR(error) \
do { \
if (error) \
- kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\
+ kdError() << TQString("ERROR %1: %2\n").tqarg(error).tqarg(gn_error_print(error));\
} while (0)
// Locale conversion routines:
@@ -126,8 +126,8 @@ static TQString businit(void)
{
GNOKII_DEBUG( "Using new gnokii version." );
- GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").arg(TQString::number(LIBGNOKII_VERSION,16)) );
- GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").arg(TQString::number(gn_lib_version(),16)) );
+ GNOKII_DEBUG( TQString("Compiled with libgnokii version 0x%1\n").tqarg(TQString::number(LIBGNOKII_VERSION,16)) );
+ GNOKII_DEBUG( TQString("Using libgnokii runtime version 0x%1\n").tqarg(TQString::number(gn_lib_version(),16)) );
gn_error error = gn_lib_phoneprofile_load(NULL, &state);
if (error)
@@ -142,7 +142,7 @@ static TQString businit(void)
"You might try to run \"gnokii --identify\" on the command line to "
"check any cable/transport issues and to verify if your gnokii "
"configuration is correct.</center></qt>")
- .arg(gn_error_print(error));
+ .tqarg(gn_error_print(error));
}
// identify phone
@@ -152,7 +152,7 @@ static TQString businit(void)
imei = gn_lib_get_phone_imei(state);
GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n")
- .arg(manufacturer, model, revision, imei) );
+ .tqarg(manufacturer, model, revision, imei) );
return TQString();
}
@@ -166,7 +166,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
error = gn_lib_addressbook_memstat(state, memtype, &memstat->used, &memstat->free);
GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n")
- .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) );
+ .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) );
return error;
}
@@ -176,13 +176,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
- .arg(i18n("Mobile Phone information:"))
- .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
- .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
- .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision)))
- .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei)))
- .arg(format.arg(i18n("Phonebook status"))
- .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free)));
+ .tqarg(i18n("Mobile Phone information:"))
+ .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer)))
+ .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model)))
+ .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision)))
+ .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei)))
+ .tqarg(format.tqarg(i18n("Phonebook status"))
+ .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free)));
}
// read and evaluate all phone entries
@@ -209,9 +209,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
progress->setTotalSteps(memstat.used);
m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>")
- .arg(memstat.used)
- .arg(gn_memory_type2str(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(memstat.used)
+ .tqarg(gn_memory_type2str(memtype))
+ .tqarg(buildPhoneInfoString(memstat)) );
int num_read = 0;
@@ -233,10 +233,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
const char *name = gn_lib_get_pb_name(state);
const char *number = gn_lib_get_pb_number(state);
- GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i)
- .arg(GN_FROM(name)).arg(GN_FROM(number))
- .arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state))
- .arg(subentries_count));
+ GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i)
+ .tqarg(GN_FROM(name)).tqarg(GN_FROM(number))
+ .tqarg(gn_lib_get_pb_location(state)).tqarg(gn_lib_get_pb_caller_group(state))
+ .tqarg(subentries_count));
KABC::Addressee *a = new KABC::Addressee();
// try to split Name into FamilyName and GivenName
@@ -263,10 +263,10 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
}
a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(gn_lib_get_pb_caller_group(state)));
- a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(gn_lib_get_pb_location(state)));
+ a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(gn_lib_get_pb_location(state)));
// set ProductId
- a->setProductId(TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei));
+ a->setProductId(TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei));
// evaluate timestamp (ignore timezone)
TQDateTime datetime;
@@ -276,7 +276,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
else
datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day),
TQTime(ts.hour, ts.minute, ts.second) );
- GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString()));
+ GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString()));
a->setRevision(datetime);
if (!subentries_count)
@@ -295,7 +295,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
TQString s = GN_FROM(number).simplifyWhiteSpace();
GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n")
- .arg(n).arg(entry_type).arg(number_type).arg(s));
+ .tqarg(n).tqarg(entry_type).tqarg(number_type).tqarg(s));
if (s.isEmpty())
continue;
switch(entry_type) {
@@ -362,7 +362,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
break;
default:
GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n")
- .arg(entry_type).arg(s));
+ .tqarg(entry_type).tqarg(s));
break;
} // switch()
} // if(subentry)
@@ -425,8 +425,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
time.hour(), time.minute(), time.second(), 0 );
gn_lib_set_pb_date(state, ts);
- GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
- .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state))));
+ GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location)
+ .tqarg(GN_FROM(gn_lib_get_pb_name(state))).tqarg(GN_FROM(gn_lib_get_pb_number(state))));
const KABC::Address homeAddr = addr->address(KABC::Address::Home);
const KABC::Address workAddr = addr->address(KABC::Address::Work);
@@ -467,7 +467,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
// only one email allowed if we have URLS, notes, addresses (to avoid phone limitations)
if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) {
GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n")
- .arg(s));
+ .tqarg(s));
continue;
}
gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
@@ -507,8 +507,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
const char *number;
gn_lib_get_pb_subentry(state, st, &entry_type, &number_type, &number);
GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n")
- .arg(st).arg(entry_type)
- .arg(number_type).arg(GN_FROM(number)));
+ .tqarg(st).tqarg(entry_type)
+ .tqarg(number_type).tqarg(GN_FROM(number)));
}
gn_error error = gn_lib_phonebook_write_entry(state, memtype, phone_location);
@@ -656,9 +656,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
m_progressDlg->setButtonText(i18n("&Stop Export"));
m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> "
"of the Mobile Phone.<br><br>%3</qt>")
- .arg(list.count())
- .arg(gn_memory_type2str(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(list.count())
+ .tqarg(gn_memory_type2str(memtype))
+ .tqarg(buildPhoneInfoString(memstat)) );
// Now run the loop...
phone_entry_no = 1;
@@ -682,7 +682,7 @@ try_next_phone_entry:
break;
GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n")
- .arg(addr->realName()).arg(phone_entry_no).arg(phone_count));
+ .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count));
error = GN_ERR_NONE;
@@ -755,7 +755,7 @@ finish:
delete m_progressDlg;
if (!failedList.isEmpty()) {
- GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
+ GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
KMessageBox::informationList(tqparentWidget(),
i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
"Possible Reasons for this problem could be:<br><ul>"
@@ -851,7 +851,7 @@ static TQString businit(void)
"You might try to run \"gnokii --identify\" on the command line to "
"check any cable/transport issues and to verify if your gnokii "
"configuration is correct.</center></qt>")
- .arg(gn_error_print(error));
+ .tqarg(gn_error_print(error));
}
// identify phone
@@ -874,9 +874,9 @@ static TQString businit(void)
GNOKII_CHECK_ERROR(error);
GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n")
- .arg(manufacturer, model, revision, imei) );
+ .tqarg(manufacturer, model, revision, imei) );
- PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei);
+ PhoneProductId = TQString("%1-%2-%3-%4").tqarg(APP).tqarg(model).tqarg(revision).tqarg(imei);
return TQString();
}
@@ -908,7 +908,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
}
}
GNOKII_DEBUG( TQString("\n\nMobile phone memory status: Type: %1, used=%2, free=%3, total=%4\n\n")
- .arg(memtype).arg(memstat->used).arg(memstat->free).arg(memstat->used+memstat->free) );
+ .tqarg(memtype).tqarg(memstat->used).tqarg(memstat->free).tqarg(memstat->used+memstat->free) );
return error;
}
@@ -946,13 +946,13 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
- .arg(i18n("Mobile Phone information:"))
- .arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
- .arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
- .arg(format.arg(i18n("Revision")).arg(GN_FROM(revision)))
- .arg(format.arg(i18n("IMEI")).arg(GN_FROM(imei)))
- .arg(format.arg(i18n("Phonebook status"))
- .arg(i18n("%1 out of %2 contacts used").arg(memstat.used).arg(memstat.used+memstat.free)));
+ .tqarg(i18n("Mobile Phone information:"))
+ .tqarg(format.tqarg(i18n("Manufacturer")).tqarg(GN_FROM(manufacturer)))
+ .tqarg(format.tqarg(i18n("Phone model")).tqarg(GN_FROM(model)))
+ .tqarg(format.tqarg(i18n("Revision")).tqarg(GN_FROM(revision)))
+ .tqarg(format.tqarg(i18n("IMEI")).tqarg(GN_FROM(imei)))
+ .tqarg(format.tqarg(i18n("Phonebook status"))
+ .tqarg(i18n("%1 out of %2 contacts used").tqarg(memstat.used).tqarg(memstat.used+memstat.free)));
}
static TQString buildMemoryTypeString( gn_memory_type memtype )
@@ -989,9 +989,9 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
progress->setTotalSteps(memstat.used);
m_progressDlg->setLabel(i18n("<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>%3</qt>")
- .arg(memstat.used)
- .arg(buildMemoryTypeString(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(memstat.used)
+ .tqarg(buildMemoryTypeString(memtype))
+ .tqarg(buildPhoneInfoString(memstat)) );
int num_read = 0;
@@ -1008,8 +1008,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
if (error == GN_ERR_INVALIDMEMORYTYPE)
break;
if (error == GN_ERR_NONE) {
- GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name))
- .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count));
+ GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").tqarg(i).tqarg(GN_FROM(entry.name))
+ .tqarg(GN_FROM(entry.number)).tqarg(entry.location).tqarg(entry.caller_group).tqarg(entry.subentries_count));
KABC::Addressee *a = new KABC::Addressee();
// try to split Name into FamilyName and GivenName
@@ -1036,7 +1036,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
}
a->insertCustom(APP, "X_GSM_CALLERGROUP", s.setNum(entry.caller_group));
- a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").arg(memtypestr).arg(entry.location));
+ a->insertCustom(APP, "X_GSM_STORE_AT", TQString("%1%2").tqarg(memtypestr).tqarg(entry.location));
// set ProductId
a->setProductId(PhoneProductId);
@@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
else
datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day),
TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
- GNOKII_DEBUG(TQString(" date=%1\n").arg(datetime.toString()));
+ GNOKII_DEBUG(TQString(" date=%1\n").tqarg(datetime.toString()));
a->setRevision(datetime);
if (!entry.subentries_count)
@@ -1059,8 +1059,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
for (int n=0; n<entry.subentries_count; n++) {
TQString s = GN_FROM(entry.subentries[n].data.number).simplifyWhiteSpace();
GNOKII_DEBUG(TQString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n")
- .arg(n).arg(entry.subentries[n].entry_type)
- .arg(entry.subentries[n].number_type).arg(s));
+ .tqarg(n).tqarg(entry.subentries[n].entry_type)
+ .tqarg(entry.subentries[n].number_type).tqarg(s));
if (s.isEmpty())
continue;
switch(entry.subentries[n].entry_type) {
@@ -1127,7 +1127,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
break;
default:
GNOKII_DEBUG(TQString(" Not handled id=%1, entry=%2\n")
- .arg(entry.subentries[n].entry_type).arg(s));
+ .tqarg(entry.subentries[n].entry_type).tqarg(s));
break;
} // switch()
} // if(subentry)
@@ -1191,8 +1191,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
entry.date.minute = time.minute();
entry.date.second = time.second();
- GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
- .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number)));
+ GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").tqarg(phone_location)
+ .tqarg(GN_FROM(entry.name)).tqarg(GN_FROM(entry.number)));
const KABC::Address homeAddr = addr->address(KABC::Address::Home);
const KABC::Address workAddr = addr->address(KABC::Address::Work);
@@ -1244,7 +1244,7 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
// only one email allowed if we have URLS, notes, addresses (to avoid phone limitations)
if (n && !addr->url().isEmpty() && !addr->note().isEmpty() && addr->addresses().count()) {
GNOKII_DEBUG(TQString(" DROPPED email %1 in favor of URLs, notes and addresses.\n")
- .arg(s));
+ .tqarg(s));
continue;
}
subentry->entry_type = GN_PHONEBOOK_ENTRY_Email;
@@ -1289,8 +1289,8 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
for (int st=0; st<entry.subentries_count; st++) {
gn_phonebook_subentry *subentry = &entry.subentries[st];
GNOKII_DEBUG(TQString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n")
- .arg(st).arg(subentry->entry_type)
- .arg(subentry->number_type).arg(GN_FROM(subentry->data.number)));
+ .tqarg(st).tqarg(subentry->entry_type)
+ .tqarg(subentry->number_type).tqarg(GN_FROM(subentry->data.number)));
}
data.phonebook_entry = &entry;
@@ -1309,7 +1309,7 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me
entry.memory_type = memtype;
entry.location = phone_location;
data.phonebook_entry = &entry;
- GNOKII_DEBUG(TQString("Deleting entry %1\n").arg(phone_location));
+ GNOKII_DEBUG(TQString("Deleting entry %1\n").tqarg(phone_location));
gn_error error = gn_sm_functions(GN_OP_WritePhonebook, &data, &state);
GNOKII_CHECK_ERROR(error);
return error;
@@ -1447,9 +1447,9 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
m_progressDlg->setButtonText(i18n("&Stop Export"));
m_progressDlg->setLabel(i18n("<qt>Exporting <b>%1</b> contacts to the <b>%2</b> "
"of the Mobile Phone.<br><br>%3</qt>")
- .arg(list.count())
- .arg(buildMemoryTypeString(memtype))
- .arg(buildPhoneInfoString(memstat)) );
+ .tqarg(list.count())
+ .tqarg(buildMemoryTypeString(memtype))
+ .tqarg(buildPhoneInfoString(memstat)) );
// Now run the loop...
phone_entry_no = 1;
@@ -1473,7 +1473,7 @@ try_next_phone_entry:
break;
GNOKII_DEBUG(TQString("Try to write entry '%1' at phone_entry_no=%2, phone_count=%3\n")
- .arg(addr->realName()).arg(phone_entry_no).arg(phone_count));
+ .tqarg(addr->realName()).tqarg(phone_entry_no).tqarg(phone_count));
error = GN_ERR_NONE;
@@ -1546,7 +1546,7 @@ finish:
delete m_progressDlg;
if (!failedList.isEmpty()) {
- GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
+ GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
KMessageBox::informationList(tqparentWidget(),
i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
"Possible Reasons for this problem could be:<br><ul>"
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index b0e44c3d..f5848d1c 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -49,7 +49,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
{
TQString fileName = locateLocal( "data", "kabc/std.vcf" );
if ( !TQFile::exists( fileName ) ) {
- KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
+ KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) );
return KABC::AddresseeList();
}
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 307fb682..53ec7d99 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( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
- KMessageBox::error( tqparentWidget(), msg.arg( fileName ) );
+ KMessageBox::error( tqparentWidget(), msg.tqarg( 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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
@@ -106,8 +106,8 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
KTempFile tmpFile;
if ( tmpFile.status() != 0 ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
- KMessageBox::error( tqparentWidget(), txt.arg( url.url() )
- .arg( strerror( tmpFile.status() ) ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
+ .tqarg( strerror( tmpFile.status() ) ) );
return false;
}
@@ -121,7 +121,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
if ( !file.open( IO_WriteOnly ) ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
- KMessageBox::error( tqparentWidget(), txt.arg( filename ) );
+ KMessageBox::error( tqparentWidget(), txt.tqarg( filename ) );
return false;
}
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 9ddbcb39..71b01e6e 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -55,7 +55,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) ) {
TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
- KMessageBox::error( tqparentWidget(), msg.arg( fileName ) );
+ KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) );
return addrList;
}
diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp
index 344647f6..198e683f 100644
--- a/kaddressbook/xxport/pab_pablib.cpp
+++ b/kaddressbook/xxport/pab_pablib.cpp
@@ -46,7 +46,7 @@ adr_t A;
bool ret;
if (!in.isOpen()) {TQString msg;
- msg=i18n("Cannot open %1 for reading").arg(pabfile);
+ msg=i18n("Cannot open %1 for reading").tqarg(pabfile);
// info->alert(msg);
return false;
}
@@ -243,7 +243,7 @@ bool pab::knownPAB(void)
content_t id;
id=go(0);
if (id!=PAB_FILE_ID) {TQString msg;
- msg=i18n("%1 has no PAB id that I know of, cannot convert this").arg(pabfile);
+ msg=i18n("%1 has no PAB id that I know of, cannot convert this").tqarg(pabfile);
// info->alert(msg);
return false;
}
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 1b5b3c6f..7894e9c5 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( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) );
+ KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) );
return addrList;
}
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index e66016a1..74b1e9dc 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -250,15 +250,15 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
KIO::NetAccess::removeTempFile( fileName );
} else {
TQString text = i18n( "<qt>When trying to read the vCard, there was an error opening the file '%1': %2</qt>" );
- text = text.arg( (*it).url() );
- text = text.arg( kapp->translate( "TQFile",
- file.errorString().latin1() ) );
+ text = text.tqarg( (*it).url() );
+ text = text.tqarg( kapp->translate( "TQFile",
+ TQString(file.errorString()).latin1() ) );
KMessageBox::error( tqparentWidget(), text, caption );
anyFailures = true;
}
} else {
TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
- text = text.arg( KIO::NetAccess::lastErrorString() );
+ text = text.tqarg( KIO::NetAccess::lastErrorString() );
KMessageBox::error( tqparentWidget(), text, caption );
anyFailures = true;
}
@@ -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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
KTempFile tmpFile;
@@ -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( tqparentWidget(), 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\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
KTempFile tmpFile;
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 0f8332ed..8eabc81c 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -77,7 +77,7 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data
{
KAB::XXPort *obj = mXXPortObjects[ identifier ];
if ( !obj ) {
- KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) );
+ KMessageBox::error( mCore->widget(), i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) );
return;
}
@@ -101,7 +101,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data
{
KAB::XXPort *obj = mXXPortObjects[ identifier ];
if ( !obj ) {
- KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) );
+ KMessageBox::error( mCore->widget(), i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).tqarg( identifier ) );
return;
}
@@ -121,7 +121,7 @@ void XXPortManager::loadPlugins()
mXXPortObjects.clear();
const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort",
- TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).tqarg( KAB_XXPORT_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index f7badeaa..f65348cf 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -186,7 +186,7 @@ void XXPortSelectDialog::initGUI()
topLayout->addWidget( label );
mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page );
- mButtonGroup->setColumnLayout( 0, TQt::Vertical );
+ mButtonGroup->setColumnLayout( 0, Qt::Vertical );
mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
@@ -225,7 +225,7 @@ void XXPortSelectDialog::initGUI()
topLayout->addWidget( mButtonGroup );
TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page );
- sortingGroup->setColumnLayout( 0, TQt::Vertical );
+ sortingGroup->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2,
KDialog::spacingHint() );
sortLayout->tqsetAlignment( TQt::AlignTop );
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 2d4e962d..8cbc7ceb 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -61,7 +61,7 @@ using namespace KCal;
TQString AlarmCalendar::icalProductId()
{
- return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
+ return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString());
}
static const KAEvent::tqStatus eventTypes[AlarmCalendar::NCALS] = {
@@ -112,7 +112,7 @@ bool AlarmCalendar::initialiseCalendars()
{
kdError(5950) << "AlarmCalendar::initialiseCalendars(): '" << errorKey1 << "' calendar name = display calendar name\n";
TQString file = config->readPathEntry(errorKey1);
- KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").arg(errorKey1).arg(file));
+ KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").tqarg(errorKey1).tqarg(file));
return false;
}
if (activeCal == expiredCal)
@@ -133,14 +133,14 @@ bool AlarmCalendar::initialiseCalendars()
if (!errorKey1.isNull())
{
kdError(5950) << "AlarmCalendar::initialiseCalendars(): calendar names clash: " << errorKey1 << ", " << errorKey2 << endl;
- KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").arg(errorKey1).arg(errorKey2));
+ KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").tqarg(errorKey1).tqarg(errorKey2));
return false;
}
if (!mCalendars[ACTIVE]->valid())
{
TQString path = mCalendars[ACTIVE]->path();
kdError(5950) << "AlarmCalendar::initialiseCalendars(): invalid name: " << path << endl;
- KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").arg(path));
+ KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").tqarg(path));
return false;
}
return true;
@@ -321,7 +321,7 @@ int AlarmCalendar::load()
if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::load(): Load failure" << endl;
- KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Cannot open calendar:\n%1").tqarg(mUrl.prettyURL()));
return -1;
}
kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl;
@@ -338,7 +338,7 @@ int AlarmCalendar::load()
if (!fi.size())
return 0; // file is zero length
kdError(5950) << "AlarmCalendar::load(): Error loading calendar file '" << tmpFile << "'" << endl;
- KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").arg(mUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").tqarg(mUrl.prettyURL()));
// load() could have partially populated the calendar, so clear it out
mCalendar->close();
delete mCalendar;
@@ -383,7 +383,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
if (!mCalendar->save(saveFilename, new ICalFormat))
{
kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed.\n";
- KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").tqarg(mICalUrl.prettyURL()));
return false;
}
@@ -392,7 +392,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n";
- KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").tqarg(mICalUrl.prettyURL()));
return false;
}
}
@@ -446,7 +446,7 @@ void AlarmCalendar::close()
bool AlarmCalendar::importAlarms(TQWidget* tqparent)
{
KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
- TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), tqparent);
+ TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), tqparent);
if (url.isEmpty())
{
kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!KStandardDirs::exists(filename))
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl;
- KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
+ KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
return false;
}
}
@@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
- KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
+ KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
return false;
}
kdDebug(5950) << "--- Downloaded to " << filename << endl;
@@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!success)
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl;
- KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
+ KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
}
else
{
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 66534b69..54f60a3c 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -913,7 +913,7 @@ TQString KAEvent::uid(const TQString& id, tqStatus status)
else
{
oldtqStatus = ACTIVE;
- i = result.findRev('-');
+ i = result.tqfindRev('-');
len = 1;
}
if (status != oldtqStatus && i > 0)
@@ -1000,7 +1000,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
if (mEmailBcc)
cats.append(EMAIL_BCC_CATEGORY);
if (mKMailSerialNumber)
- cats.append(TQString("%1%2").arg(KMAIL_SERNUM_CATEGORY).arg(mKMailSerialNumber));
+ cats.append(TQString("%1%2").tqarg(KMAIL_SERNUM_CATEGORY).tqarg(mKMailSerialNumber));
if (mCopyToKOrganizer)
cats.append(KORGANIZER_CATEGORY);
if (mCommandXterm)
@@ -1008,11 +1008,11 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
else if (!mLogFile.isEmpty())
cats.append(LOG_CATEGORY + mLogFile);
if (mLateCancel)
- cats.append(TQString("%1%2").arg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).arg(mLateCancel));
+ cats.append(TQString("%1%2").tqarg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).tqarg(mLateCancel));
if (mDeferDefaultMinutes)
- cats.append(TQString("%1%2").arg(DEFER_CATEGORY).arg(mDeferDefaultMinutes));
+ cats.append(TQString("%1%2").tqarg(DEFER_CATEGORY).tqarg(mDeferDefaultMinutes));
if (!mTemplateName.isEmpty() && mTemplateAfterTime >= 0)
- cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(mTemplateAfterTime));
+ cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(mTemplateAfterTime));
if (mArchive && !original)
{
TQStringList params;
@@ -1032,7 +1032,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
unit = 'H';
count /= 60;
}
- params += TQString("%1%2").arg(count).arg(unit);
+ params += TQString("%1%2").tqarg(count).tqarg(unit);
}
if (mArchiveRepeatAtLogin)
params += AT_LOGIN_TYPE;
@@ -1084,7 +1084,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
{
// Alarm repetition is normally held in the main alarm, but since
// the main alarm has expired, store in a custom property.
- TQString param = TQString("%1:%2").arg(mRepeatInterval).arg(mRepeatCount);
+ TQString param = TQString("%1:%2").tqarg(mRepeatInterval).tqarg(mRepeatCount);
ev.setCustomProperty(APPNAME, REPEAT_PROPERTY, param);
}
@@ -1251,9 +1251,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
}
if (!mAudioFile.isEmpty() && mSoundVolume >= 0)
alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY,
- TQString::tqfromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
- .arg(TQString::number(mFadeVolume, 'f', 2))
- .arg(mFadeSeconds));
+ TQString::tqfromLatin1("%1;%2;%3").tqarg(TQString::number(mSoundVolume, 'f', 2))
+ .tqarg(TQString::number(mFadeVolume, 'f', 2))
+ .tqarg(mFadeSeconds));
break;
case KAAlarm::PRE_ACTION_ALARM:
setProcedureAlarm(alarm, mPreAction);
@@ -1277,9 +1277,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
case T_MESSAGE:
alarm->setDisplayAlarm(AlarmText::toCalendarText(mText));
alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
- TQString::tqfromLatin1("%1;%2;%3").arg(mBgColour.name())
- .arg(mFgColour.name())
- .arg(mDefaultFont ? TQString() : mFont.toString()));
+ TQString::tqfromLatin1("%1;%2;%3").tqarg(mBgColour.name())
+ .tqarg(mFgColour.name())
+ .tqarg(mDefaultFont ? TQString() : mFont.toString()));
break;
case T_COMMAND:
if (mCommandScript)
@@ -2093,7 +2093,7 @@ TQString KAEvent::recurrenceText(bool brief) const
else
{
TQString mins;
- return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(frequency/60)).arg(mins.sprintf("%02d", frequency%60));
+ return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(frequency/60)).tqarg(mins.sprintf("%02d", frequency%60));
}
case RecurrenceRule::rDaily:
return i18n("1 Day", "%n Days", frequency);
@@ -2125,7 +2125,7 @@ TQString KAEvent::repetitionText(bool brief) const
if (mRepeatInterval % 60 == 0)
return i18n("1 Hour", "%n Hours", mRepeatInterval/60);
TQString mins;
- return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(mRepeatInterval/60)).arg(mins.sprintf("%02d", mRepeatInterval%60));
+ return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(mRepeatInterval/60)).tqarg(mins.sprintf("%02d", mRepeatInterval%60));
}
if (mRepeatInterval % (7*1440))
return i18n("1 Day", "%n Days", mRepeatInterval/1440);
@@ -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::tqfromLatin1("%1;;").arg(cats[0]));
+ TQString::tqfromLatin1("%1;;").tqarg(cats[0]));
}
cats.remove(cats.begin());
}
@@ -2918,7 +2918,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
while ((it = cats.tqfind(TEMPL_DEF_TIME_CAT)) != cats.end())
{
cats.remove(it);
- cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0));
+ cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(0));
}
}
@@ -2937,7 +2937,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
}
if (addLateCancel)
- cats.append(TQString("%1%2").arg(LATE_CANCEL_CATEGORY).arg(1));
+ cats.append(TQString("%1%2").tqarg(LATE_CANCEL_CATEGORY).tqarg(1));
event->setCategories(cats);
@@ -3321,11 +3321,11 @@ void KAAlarmEventBase::dumpDebug() const
kdDebug(5950) << "-- Attachments:" << mEmailAttachments.join(", ") << ":\n";
kdDebug(5950) << "-- Bcc:" << (mEmailBcc ? "true" : "false") << ":\n";
}
- kdDebug(5950) << "-- mBgColour:" << mBgColour.name() << ":\n";
- kdDebug(5950) << "-- mFgColour:" << mFgColour.name() << ":\n";
+ kdDebug(5950) << "-- mBgColour:" << TQString(mBgColour.name()) << ":\n";
+ kdDebug(5950) << "-- mFgColour:" << TQString(mFgColour.name()) << ":\n";
kdDebug(5950) << "-- mDefaultFont:" << (mDefaultFont ? "true" : "false") << ":\n";
if (!mDefaultFont)
- kdDebug(5950) << "-- mFont:" << mFont.toString() << ":\n";
+ kdDebug(5950) << "-- mFont:" << TQString(mFont.toString()) << ":\n";
kdDebug(5950) << "-- mBeep:" << (mBeep ? "true" : "false") << ":\n";
kdDebug(5950) << "-- mSpeak:" << (mSpeak ? "true" : "false") << ":\n";
if (mActionType == T_AUDIO)
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 4ef40f56..34eeffda 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -348,7 +348,7 @@ TQString AlarmListView::whatsThisText(int column) const
void AlarmListView::contentsMousePressEvent(TQMouseEvent* e)
{
TQListView::contentsMousePressEvent(e);
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
{
TQPoint p(contentsToViewport(e->pos()));
if (itemAt(p))
@@ -531,7 +531,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const
if (dateTime.isDateOnly())
{
int days = now.date().daysTo(dateTime.date());
- return i18n("n days", " %1d ").arg(days);
+ return i18n("n days", " %1d ").tqarg(days);
}
int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60;
if (mins < 0)
@@ -540,10 +540,10 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const
minutes[0] = (mins%60) / 10 + '0';
minutes[1] = (mins%60) % 10 + '0';
if (mins < 24*60)
- return i18n("hours:minutes", " %1:%2 ").arg(mins/60).arg(minutes);
+ return i18n("hours:minutes", " %1:%2 ").tqarg(mins/60).tqarg(minutes);
int days = mins / (24*60);
mins = mins % (24*60);
- return i18n("days hours:minutes", " %1d %2:%3 ").arg(days).arg(mins/60).arg(minutes);
+ return i18n("days hours:minutes", " %1d %2:%3 ").tqarg(days).tqarg(mins/60).tqarg(minutes);
}
/******************************************************************************
@@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in
*/
int AlarmListViewItem::typeIconWidth(AlarmListView* v)
{
- return iconWidth() + 2 * v->style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ return iconWidth() + 2 * v->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
}
/******************************************************************************
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 4ce88148..4443ae2f 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -104,7 +104,7 @@ void AlarmTimeWidget::init(int mode)
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
- : TQString("%1\n%2").arg(enterDateText).arg(recurText)));
+ : TQString("%1\n%2").tqarg(enterDateText).tqarg(recurText)));
mAtTimeRadio->setFocusWidget(mDateEdit);
// Time edit box and Any time checkbox
@@ -115,8 +115,8 @@ void AlarmTimeWidget::init(int mode)
connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged()));
static const TQString enterTimeText = i18n("Enter the time to schedule the alarm.");
TQWhatsThis::add(mTimeEdit,
- ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis())
- : TQString("%1\n%2\n\n%3").arg(enterTimeText).arg(recurText).arg(TimeSpinBox::shiftWhatsThis())));
+ ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(enterTimeText).tqarg(TimeSpinBox::shiftWhatsThis())
+ : TQString("%1\n%2\n\n%3").tqarg(enterTimeText).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis())));
mAnyTime = -1; // current status is uninitialised
if (mode & DEFER_TIME)
@@ -147,8 +147,8 @@ void AlarmTimeWidget::init(int mode)
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())));
+ ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(i18n_TimeAfterPeriod()).tqarg(TimeSpinBox::shiftWhatsThis())
+ : TQString("%1\n%2\n\n%3").tqarg(i18n_TimeAfterPeriod()).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis())));
mAfterTimeRadio->setFocusWidget(mDelayTimeEdit);
// Set up the tqlayout, either narrow or wide
@@ -182,7 +182,7 @@ void AlarmTimeWidget::init(int mode)
setButton(id(mAtTimeRadio));
// Timeout every minute to update alarm time fields.
- MinuteTimer::connect(this, TQT_SLOT(slotTimer()));
+ MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(slotTimer()));
}
/******************************************************************************
@@ -266,7 +266,7 @@ DateTime AlarmTimeWidget::getDateTime(int* minsFromNow, bool checkExpired, bool
else
{
result.set(mDateEdit->date(), mTimeEdit->time());
- if (checkExpired && result <= now.addSecs(1))
+ if (checkExpired && result <= TQDateTime(now.addSecs(1)))
{
if (showErrorMessage)
KMessageBox::sorry(const_cast<AlarmTimeWidget*>(this), i18n("Alarm time has already expired"));
@@ -290,7 +290,7 @@ DateTime AlarmTimeWidget::getDateTime(int* minsFromNow, bool checkExpired, bool
int delayMins = mDelayTimeEdit->value();
if (minsFromNow)
*minsFromNow = delayMins;
- return now.addSecs(delayMins * 60);
+ return TQDateTime(now.addSecs(delayMins * 60));
}
}
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 5ed43275..16e8a4ac 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -85,7 +85,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* tqparent)
mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: "));
mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix"));
- TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Alarm Text"), topWidget);
+ 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);
@@ -105,7 +105,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* tqparent)
i18n("Enter text to appear after the person's name in the alarm message, "
"including any necessary leading spaces."));
- TQGroupBox* group = new TQGroupBox(1, TQt::Horizontal, i18n("Select Birthdays"), topWidget);
+ TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("Select Birthdays"), topWidget);
topLayout->addWidget(group);
mAddresseeList = new BListView(group);
mAddresseeList->setMultiSelection(true);
@@ -421,7 +421,7 @@ BListView::BListView(TQWidget* tqparent, const char* name)
: KListView(tqparent, name)
{
KAccel* accel = new KAccel(this);
- accel->insert(KStdAccel::SelectAll, this, TQT_SLOT(slotSelectAll()));
- accel->insert(KStdAccel::Deselect, this, TQT_SLOT(slotDeselect()));
+ accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()));
+ accel->insert(KStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect()));
accel->readSettings();
}
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index f3a466ea..f7e340f8 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -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::tqfromLatin1(DAEMON_APP_NAME));
+ .tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME));
}
else
{
@@ -236,8 +236,8 @@ 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::tqfromLatin1(DAEMON_APP_NAME))
- .arg(kapp->aboutData()->appName()));
+ .tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME))
+ .tqarg(kapp->aboutData()->appName()));
break;
case KAlarmd::FAILURE:
default:
@@ -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::tqfromLatin1(DAEMON_APP_NAME));
+ .tqarg(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::tqfromLatin1(DAEMON_APP_NAME)));
+ KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
}
}
diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp
index 5f6e8507..c76f2a7f 100644
--- a/kalarm/dcophandler.cpp
+++ b/kalarm/dcophandler.cpp
@@ -32,6 +32,7 @@
#include "karecurrence.h"
#include "mainwindow.h"
#include "preferences.h"
+#include "dcophandler.h"
#include "dcophandler.moc"
static const char* DCOP_OBJECT_NAME = "request"; // DCOP name of KAlarm's request interface
@@ -325,7 +326,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
if (startDateTime.length() > 10)
{
// Both a date and a time are specified
- start = TQDateTime::fromString(startDateTime, TQt::ISODate);
+ start = TQDateTime::fromString(startDateTime, Qt::ISODate);
}
else
{
@@ -339,12 +340,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
if (t.isEmpty())
{
// It's a date
- start = TQDate::fromString(startDateTime, TQt::ISODate);
+ start = TQDate::fromString(startDateTime, Qt::ISODate);
}
else
{
// It's a time, so use today as the date
- start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, TQt::ISODate));
+ start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate));
}
}
if (!start.isValid())
@@ -426,7 +427,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl;
return false;
}
- end.setDate(TQDate::fromString(endDateTime, TQt::ISODate));
+ end.setDate(TQDate::fromString(endDateTime, Qt::ISODate));
}
else
{
@@ -435,7 +436,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl;
return false;
}
- end = TQDateTime::fromString(endDateTime, TQt::ISODate);
+ end = TQDateTime::fromString(endDateTime, Qt::ISODate);
}
if (!end.isValid())
{
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 75b95b8f..4709f6a8 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -107,7 +107,7 @@ void DeferAlarmDlg::slotOk()
case KAEvent::LIMIT_NONE:
break; // can't happen with a valid endTime
}
- KMessageBox::sorry(this, text.arg(endTime.formatLocale()));
+ KMessageBox::sorry(this, text.tqarg(endTime.formatLocale()));
}
else
accept();
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index b93f681e..f4ea9e65 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -129,10 +129,10 @@ inline TQString recurText(const KAEvent& event)
{
TQString r;
if (event.repeatCount())
- r = TQString::tqfromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
+ r = TQString::tqfromLatin1("%1 / %2").tqarg(event.recurrenceText()).tqarg(event.repetitionText());
else
r = event.recurrenceText();
- return i18n("&Recurrence - [%1]").arg(r);
+ return i18n("&Recurrence - [%1]").tqarg(r);
}
// Collect these widget labels together to ensure consistent wording and
@@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
tqlayout->addWidget(mEmailFrame);
// Deferred date/time: visible only for a deferred recurring event.
- mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
+ 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->tqsizeHint());
@@ -318,8 +318,8 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
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()));
+ TQString("%1\n\n%2").tqarg(i18n("Enter the start time for alarms based on this template."))
+ .tqarg(TimeSpinBox::shiftWhatsThis()));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls
box->setFixedHeight(box->tqsizeHint().height());
grid->addWidget(box, 0, 1, tqalignment);
@@ -328,7 +328,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
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")));
+ i18n("Set the '%1' option for alarms based on this template.").tqarg(i18n("Any time")));
grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment);
box = new TQHBox(mTemplateTimeGroup);
@@ -345,8 +345,8 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->tqsizeHint());
mTemplateTimeAfter->setReadOnly(mReadOnly);
TQWhatsThis::add(mTemplateTimeAfter,
- TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod())
- .arg(TimeSpinBox::shiftWhatsThis()));
+ TQString("%1\n\n%2").tqarg(AlarmTimeWidget::i18n_TimeAfterPeriod())
+ .tqarg(TimeSpinBox::shiftWhatsThis()));
box->setFixedHeight(box->tqsizeHint().height());
grid->addWidget(box, 1, 1, tqalignment);
@@ -363,7 +363,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
static const TQString reminderText = i18n("Enter how long in advance of the main alarm to display a reminder alarm.");
mReminder = new Reminder(i18n("Rem&inder:"),
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()),
+ TQString("%1\n\n%2").tqarg(reminderText).tqarg(TimeSpinBox::shiftWhatsThis()),
true, true, mainPage);
mReminder->setFixedSize(mReminder->tqsizeHint());
topLayout->addWidget(mReminder, 0, TQt::AlignAuto);
@@ -517,7 +517,7 @@ void EditAlarmDlg::initCommand(TQWidget* tqparent)
// 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->tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, button).width()); // 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);
@@ -712,7 +712,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
int afterTime = event->templateAfterTime();
if (afterTime >= 0)
{
- mTimeWidget->setDateTime(now.addSecs(afterTime * 60));
+ mTimeWidget->setDateTime(TQDateTime(now.addSecs(afterTime * 60)));
mTimeWidget->selectTimeFromNow();
}
else
@@ -1424,7 +1424,7 @@ void EditAlarmDlg::slotOk()
mTabs->setCurrentPage(mMainPageIndex);
mReminder->setFocusOnCount();
KMessageBox::sorry(this, i18n("Reminder period must be less than the recurrence interval, unless '%1' is checked."
- ).arg(Reminder::i18n_first_recurrence_only()));
+ ).tqarg(Reminder::i18n_first_recurrence_only()));
return;
}
}
@@ -1479,15 +1479,15 @@ void EditAlarmDlg::slotTry()
if (mCommandRadio->isOn() && mCmdOutputGroup->selectedId() != EXEC_IN_TERMINAL)
{
theApp()->commandMessage((ShellProcess*)proc, this);
- KMessageBox::information(this, i18n("Command executed:\n%1").arg(text));
+ KMessageBox::information(this, i18n("Command executed:\n%1").tqarg(text));
theApp()->commandMessage((ShellProcess*)proc, 0);
}
else if (mEmailRadio->isOn())
{
TQString bcc;
if (mEmailBcc->isChecked())
- bcc = i18n("\nBcc: %1").arg(Preferences::emailBccAddress());
- KMessageBox::information(this, i18n("Email sent to:\n%1%2").arg(mEmailAddresses.join("\n")).arg(bcc));
+ bcc = i18n("\nBcc: %1").tqarg(Preferences::emailBccAddress());
+ KMessageBox::information(this, i18n("Email sent to:\n%1%2").tqarg(mEmailAddresses.join("\n")).tqarg(bcc));
}
}
}
@@ -1728,7 +1728,7 @@ bool EditAlarmDlg::checkEmailData()
if (!bad.isEmpty())
{
mEmailToEdit->setFocus();
- KMessageBox::error(this, i18n("Invalid email address:\n%1").arg(bad));
+ KMessageBox::error(this, i18n("Invalid email address:\n%1").tqarg(bad));
return false;
}
}
@@ -1752,7 +1752,7 @@ bool EditAlarmDlg::checkEmailData()
break; // empty
case -1:
mEmailAttachList->setFocus();
- KMessageBox::error(this, i18n("Invalid email attachment:\n%1").arg(att));
+ KMessageBox::error(this, i18n("Invalid email attachment:\n%1").tqarg(att));
return false;
}
}
@@ -2012,7 +2012,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
default:
break;
}
- if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.arg(alarmtext))
+ if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.tqarg(alarmtext))
== KMessageBox::Cancel)
return false;
}
diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp
index 20b0ad19..388fa457 100644
--- a/kalarm/emailidcombo.cpp
+++ b/kalarm/emailidcombo.cpp
@@ -31,7 +31,7 @@ void EmailIdCombo::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
KPIM::IdentityCombo::mousePressEvent(e);
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index 77e84140..e3732eaa 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -113,7 +113,7 @@ void Find::display()
"This option is only available if expired alarms are currently being displayed."));
grid->addWidget(mExpired, 1, 2, TQt::AlignAuto);
- mActiveExpiredSep = new KSeparator(TQt::Horizontal, kalarmWidgets);
+ mActiveExpiredSep = new KSeparator(Qt::Horizontal, kalarmWidgets);
grid->addMultiCellWidget(mActiveExpiredSep, 2, 2, 0, 2);
// Alarm actions
@@ -307,40 +307,40 @@ void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent)
if (!(mOptions & FIND_MESSAGE))
break;
mFind->setData(event.cleanText());
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
break;
case KAEvent::FILE:
if (!(mOptions & FIND_FILE))
break;
mFind->setData(event.cleanText());
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
break;
case KAEvent::COMMAND:
if (!(mOptions & FIND_COMMAND))
break;
mFind->setData(event.cleanText());
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
break;
case KAEvent::EMAIL:
if (!(mOptions & FIND_EMAIL))
break;
mFind->setData(event.emailAddresses(", "));
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
if (found)
break;
mFind->setData(event.emailSubject());
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
if (found)
break;
mFind->setData(event.emailAttachments().join(", "));
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
if (found)
break;
mFind->setData(event.cleanText());
- found = (mFind->tqfind() == KFind::Match);
+ found = (mFind->find() == KFind::Match);
break;
}
if (found)
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 97d04689..26b16d22 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -633,7 +633,7 @@ void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* event)
if (event && event->action() == KAEvent::EMAIL
&& Preferences::emailAddress().isEmpty())
KMessageBox::information(tqparent, i18n("Please set the 'From' email address...",
- "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress()));
+ "%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress()));
if (!Daemon::monitoringAlarms())
{
@@ -705,7 +705,7 @@ TQString runKMail(bool minimise)
TQCString dcopName;
TQString errmsg;
if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg))
- return i18n("Unable to start KMail\n(%1)").arg(errmsg);
+ return i18n("Unable to start KMail\n(%1)").tqarg(errmsg);
return TQString();
}
@@ -747,9 +747,9 @@ bool readConfigWindowSize(const char* window, TQSize& result)
{
KConfig* config = KGlobal::config();
config->setGroup(TQString::tqfromLatin1(window));
- TQWidget* desktop = KApplication::desktop();
- TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), 0),
- config->readNumEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), 0));
+ TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
+ TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").tqarg(desktop->width()), 0),
+ config->readNumEntry(TQString::tqfromLatin1("Height %1").tqarg(desktop->height()), 0));
if (s.isEmpty())
return false;
result = s;
@@ -764,9 +764,9 @@ void writeConfigWindowSize(const char* window, const TQSize& size)
{
KConfig* config = KGlobal::config();
config->setGroup(TQString::tqfromLatin1(window));
- TQWidget* desktop = KApplication::desktop();
- config->writeEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), size.width());
- config->writeEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), size.height());
+ TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
+ config->writeEntry(TQString::tqfromLatin1("Width %1").tqarg(desktop->width()), size.width());
+ config->writeEntry(TQString::tqfromLatin1("Height %1").tqarg(desktop->height()), size.height());
config->sync();
}
diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h
index e0af27f5..f433b3ff 100644
--- a/kalarm/kalarm.h
+++ b/kalarm/kalarm.h
@@ -33,7 +33,7 @@
#define AUTOSTART_BY_KALARMD // temporary fix for autostart before session restoration
-#define OLD_DCOP // retain DCOP pre-1.2 compatibility
+// #define OLD_DCOP // retain DCOP pre-1.2 compatibility
#endif // KALARM_H
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index fd81aed4..d37e0dcd 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp()
mSpeechEnabled(false)
{
Preferences::initialise();
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged()));
+ Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged()));
KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId());
KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type());
@@ -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::tqfromLatin1("--calendarURL")).arg(TQString::tqfromLatin1("--handleEvent")).arg(TQString::tqfromLatin1("--triggerEvent")).arg(TQString::tqfromLatin1("--cancelEvent")))
+ USAGE(i18n("%1 requires %2, %3 or %4").tqarg(TQString::tqfromLatin1("--calendarURL")).tqarg(TQString::tqfromLatin1("--handleEvent")).tqarg(TQString::tqfromLatin1("--triggerEvent")).tqarg(TQString::tqfromLatin1("--cancelEvent")))
if (count > 1)
- USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::tqfromLatin1("--handleEvent")).arg(TQString::tqfromLatin1("--triggerEvent")).arg(TQString::tqfromLatin1("--cancelEvent")));
+ USAGE(i18n("%1, %2, %3 mutually exclusive").tqarg(TQString::tqfromLatin1("--handleEvent")).tqarg(TQString::tqfromLatin1("--triggerEvent")).tqarg(TQString::tqfromLatin1("--cancelEvent")));
if (!initCheck(true)) // open the calendar, don't register with daemon yet
{
exitCode = 1;
@@ -341,7 +341,7 @@ int KAlarmApp::newInstance()
{
TQString calendarUrl = args->getOption("calendarURL");
if (KURL(calendarUrl).url() != AlarmCalendar::activeCalendar()->urlString())
- USAGE(i18n("%1: wrong calendar file").arg(TQString::tqfromLatin1("--calendarURL")))
+ USAGE(i18n("%1: wrong calendar file").tqarg(TQString::tqfromLatin1("--calendarURL")))
}
TQString eventID = args->getOption(option);
args->clear(); // free up memory
@@ -369,7 +369,7 @@ int KAlarmApp::newInstance()
}
if (!KAlarm::edit(eventID))
{
- USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::tqfromLatin1("--edit")).arg(eventID))
+ USAGE(i18n("%1: Event %2 not found, or not editable").tqarg(TQString::tqfromLatin1("--edit")).tqarg(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::tqfromLatin1("--exec")).arg(TQString::tqfromLatin1("--file")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--exec")).tqarg(TQString::tqfromLatin1("--file")))
if (args->isSet("mail"))
- USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--mail")).arg(TQString::tqfromLatin1("--file")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--mail")).tqarg(TQString::tqfromLatin1("--file")))
if (args->count())
- USAGE(i18n("message incompatible with %1").arg(TQString::tqfromLatin1("--file")))
+ USAGE(i18n("message incompatible with %1").tqarg(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::tqfromLatin1("--mail")).arg(TQString::tqfromLatin1("--exec")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--mail")).tqarg(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::tqfromLatin1("--mail")))
+ USAGE(i18n("%1: invalid email address").tqarg(TQString::tqfromLatin1("--mail")))
alAddresses += KCal::Person(TQString(), 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::tqfromLatin1("--subject")).arg(TQString::tqfromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--subject")).tqarg(TQString::tqfromLatin1("--mail")))
if (args->isSet("from-id"))
- USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--from-id")).arg(TQString::tqfromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--from-id")).tqarg(TQString::tqfromLatin1("--mail")))
if (args->isSet("attach"))
- USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--attach")).arg(TQString::tqfromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--attach")).tqarg(TQString::tqfromLatin1("--mail")))
if (args->isSet("bcc"))
- USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--bcc")).arg(TQString::tqfromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--bcc")).tqarg(TQString::tqfromLatin1("--mail")))
}
bool alarmNoTime = false;
@@ -478,7 +478,7 @@ int KAlarmApp::newInstance()
colourText.tqreplace(0, 2, "#");
bgColour.setNamedColor(colourText);
if (!bgColour.isValid())
- USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--color")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--color")))
}
if (args->isSet("colorfg"))
{
@@ -489,14 +489,14 @@ int KAlarmApp::newInstance()
colourText.tqreplace(0, 2, "#");
fgColour.setNamedColor(colourText);
if (!fgColour.isValid())
- USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--colorfg")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--colorfg")))
}
if (args->isSet("time"))
{
TQCString dateTime = args->getOption("time");
if (!convWakeTime(dateTime, alarmTime, alarmNoTime))
- USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--time")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--time")))
}
else
alarmTime = TQDateTime::tqcurrentDateTime();
@@ -505,9 +505,9 @@ int KAlarmApp::newInstance()
if (haveRecurrence)
{
if (args->isSet("login"))
- USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--login")).arg(TQString::tqfromLatin1("--recurrence")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--login")).tqarg(TQString::tqfromLatin1("--recurrence")))
if (args->isSet("until"))
- USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--recurrence")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(TQString::tqfromLatin1("--recurrence")))
TQCString rule = args->getOption("recurrence");
recurrence.set(TQString::fromLocal8Bit(static_cast<const char*>(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::tqfromLatin1("--login")).arg(TQString::tqfromLatin1("--interval")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--login")).tqarg(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::tqfromLatin1("--repeat")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--repeat")))
}
else if (haveRecurrence)
- USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--interval")).arg(TQString::tqfromLatin1("--repeat")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--interval")).tqarg(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::tqfromLatin1("--until")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--until")))
if (endTime < alarmTime)
- USAGE(i18n("%1 earlier than %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--time")))
+ USAGE(i18n("%1 earlier than %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(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::tqfromLatin1("--interval")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--interval")))
if (alarmNoTime && recurType == KARecurrence::MINUTELY)
- USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::tqfromLatin1("--interval")))
+ USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(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::tqfromLatin1("--interval")).arg(TQString::tqfromLatin1("--repeat")).arg(TQString::tqfromLatin1("--recurrence")));
+ USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").tqarg(TQString::tqfromLatin1("--interval")).tqarg(TQString::tqfromLatin1("--repeat")).tqarg(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::tqfromLatin1("--repeat")).arg(TQString::tqfromLatin1("--interval")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--repeat")).tqarg(TQString::tqfromLatin1("--interval")))
if (args->isSet("until"))
- USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--interval")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--until")).tqarg(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::tqfromLatin1("--play")).arg(TQString::tqfromLatin1("--play-repeat")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--play")).tqarg(TQString::tqfromLatin1("--play-repeat")))
if (args->isSet("beep"))
- USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--beep")).arg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--beep")).tqarg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
if (args->isSet("speak"))
- USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--speak")).arg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--speak")).tqarg(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::tqfromLatin1("--volume")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("--volume")))
audioVolume = static_cast<float>(volumepc) / 100;
}
#endif
}
#ifndef WITHOUT_ARTS
else if (args->isSet("volume"))
- USAGE(i18n("%1 requires %2 or %3").arg(TQString::tqfromLatin1("--volume")).arg(TQString::tqfromLatin1("--play")).arg(TQString::tqfromLatin1("--play-repeat")))
+ USAGE(i18n("%1 requires %2 or %3").tqarg(TQString::tqfromLatin1("--volume")).tqarg(TQString::tqfromLatin1("--play")).tqarg(TQString::tqfromLatin1("--play-repeat")))
#endif
if (args->isSet("speak"))
{
if (args->isSet("beep"))
- USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--beep")).arg(TQString::tqfromLatin1("--speak")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--beep")).tqarg(TQString::tqfromLatin1("--speak")))
if (!mSpeechEnabled)
- USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::tqfromLatin1("--speak")))
+ USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").tqarg(TQString::tqfromLatin1("--speak")))
}
int reminderMinutes = 0;
bool onceOnly = args->isSet("reminder-once");
@@ -616,18 +616,18 @@ 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::tqfromLatin1("--reminder")).arg(TQString::tqfromLatin1("--reminder-once")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(TQString::tqfromLatin1("--reminder")).tqarg(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::tqfromLatin1("--exec")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::tqfromLatin1("--exec")))
if (args->isSet("mail"))
- USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::tqfromLatin1("--mail")))
+ USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::tqfromLatin1("--mail")))
KARecurrence::Type recurType;
TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder");
if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes))
- USAGE(i18n("Invalid %1 parameter").arg(opt))
+ USAGE(i18n("Invalid %1 parameter").tqarg(opt))
if (recurType == KARecurrence::MINUTELY && alarmNoTime)
- USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(opt))
+ USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(opt))
}
int lateCancel = 0;
@@ -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::tqfromLatin1("late-cancel")))
+ USAGE(i18n("Invalid %1 parameter").tqarg(TQString::tqfromLatin1("late-cancel")))
}
else if (args->isSet("auto-close"))
- USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--auto-close")).arg(TQString::tqfromLatin1("--late-cancel")))
+ USAGE(i18n("%1 requires %2").tqarg(TQString::tqfromLatin1("--auto-close")).tqarg(TQString::tqfromLatin1("--late-cancel")))
int flags = KAEvent::DEFAULT_FONT;
if (args->isSet("ack-confirm"))
@@ -728,7 +728,7 @@ int KAlarmApp::newInstance()
#endif
if (!usage.isEmpty())
{
- usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::tqfromLatin1("--file")).arg(TQString::tqfromLatin1("--exec"));
+ usage += i18n(": option(s) only valid with a message/%1/%2").tqarg(TQString::tqfromLatin1("--file")).tqarg(TQString::tqfromLatin1("--exec"));
break;
}
@@ -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::tqfromLatin1("cat >>%1").arg(event.logFile()));
+ logproc = new ShellProcess(TQString::tqfromLatin1("cat >>%1").tqarg(event.logFile()));
connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
logproc->start(KProcess::Stdin);
TQCString heading;
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 2752a368..e1f0823a 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -51,7 +51,7 @@ ADCalendar::ADCalendar(const TQString& url, const TQCString& appname)
kdError(5900) << "ADCalendar::ADCalendar(" << url << "): calendar already exists" << endl;
assert(0);
}
- mUrlIndex = mCalendarUrls.findIndex(url); // get unique index for this URL
+ mUrlIndex = mCalendarUrls.tqfindIndex(url); // get unique index for this URL
if (mUrlIndex < 0)
{
mUrlIndex = static_cast<int>(mCalendarUrls.count());
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index 68344fa2..9f471e4d 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -104,7 +104,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo
KConfig* config = KGlobal::config();
config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName));
config->writeEntry(TITLE_KEY, cinfo->title());
- config->writeEntry(DCOP_OBJECT_KEY, TQString::fromLocal8Bit(cinfo->dcopObject()));
+ config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject())));
config->writeEntry(START_CLIENT_KEY, cinfo->startClient());
config->writePathEntry(CALENDAR_KEY, cinfo->calendar()->urlString());
config->sync();
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 98647d93..55840662 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -115,14 +115,14 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
if (identity.isNull())
{
kdError(5950) << "KAMail::send(): identity" << event.emailFromId() << "not found" << endl;
- errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").arg(event.emailFromId()));
+ errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").tqarg(event.emailFromId()));
return false;
}
from = identity.fullEmailAddr();
if (from.isEmpty())
{
kdError(5950) << "KAMail::send(): identity" << identity.identityName() << "uoid" << identity.uoid() << ": no email address" << endl;
- errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").arg(identity.identityName()));
+ errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").tqarg(identity.identityName()));
return false;
}
}
@@ -167,7 +167,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
if (command.isNull())
{
- errmsgs = errors(i18n("%1 not found").arg(TQString::tqfromLatin1("sendmail"))); // give up
+ errmsgs = errors(i18n("%1 not found").tqarg(TQString::tqfromLatin1("sendmail"))); // give up
return false;
}
@@ -387,14 +387,14 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
TQString from = data.from;
from.tqreplace(TQRegExp("^.*<"), TQString()).tqreplace(TQRegExp(">.*$"), TQString());
message = TQString::tqfromLatin1(buff);
- message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
+ message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").tqarg(timenow).tqarg(tod.tv_usec).tqarg(from);
}
message += TQString::tqfromLatin1("From: ") + data.from;
message += TQString::tqfromLatin1("\nTo: ") + data.event.emailAddresses(", ");
if (!data.bcc.isEmpty())
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());
+ message += TQString::tqfromLatin1("\nX-Mailer: %1/" KALARM_VERSION).tqarg(kapp->aboutData()->programName());
return message;
}
@@ -427,12 +427,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
TQCString boundary;
boundary.sprintf("------------_%lu_-%lx=", 2*timenow, timenow);
message += TQString::tqfromLatin1("\nMIME-Version: 1.0");
- message += TQString::tqfromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").arg(boundary);
+ message += TQString::tqfromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").tqarg(boundary.data());
if (!event.message().isEmpty())
{
// There is a message body
- message += TQString::tqfromLatin1("\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").tqarg(boundary.data());
message += event.message();
}
@@ -446,12 +446,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
KIO::UDSEntry uds;
if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) {
kdError(5950) << "KAMail::appendBodyAttachments(): not found: " << attachment << endl;
- return i18n("Attachment not found:\n%1").arg(attachment);
+ return i18n("Attachment not found:\n%1").tqarg(attachment);
}
KFileItem fi(uds, url);
if (fi.isDir() || !fi.isReadable()) {
kdError(5950) << "KAMail::appendBodyAttachments(): not file/not readable: " << attachment << endl;
- return attachError.arg(attachment);
+ return attachError.tqarg(attachment);
}
// Check if the attachment is a text file
@@ -463,21 +463,21 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
text = (mimeType == textMimeTypes[i]);
}
- 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());
+ message += TQString::tqfromLatin1("\n--%1").tqarg(boundary.data());
+ message += TQString::tqfromLatin1("\nContent-Type: %2; name=\"%3\"").tqarg(mimeType).tqarg(fi.text());
+ message += TQString::tqfromLatin1("\nContent-Transfer-Encoding: %1").tqarg(TQString::tqfromLatin1(text ? "8bit" : "BASE64"));
+ message += TQString::tqfromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").tqarg(fi.text());
// Read the file contents
TQString tmpFile;
if (!KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) {
kdError(5950) << "KAMail::appendBodyAttachments(): load failure: " << attachment << endl;
- return attachError.arg(attachment);
+ return attachError.tqarg(attachment);
}
TQFile file(tmpFile);
if (!file.open(IO_ReadOnly) ) {
kdDebug(5950) << "KAMail::appendBodyAttachments() tmp load error: " << attachment << endl;
- return attachError.arg(attachment);
+ return attachError.tqarg(attachment);
}
TQIODevice::Offset size = file.size();
char* contents = new char [size + 1];
@@ -509,9 +509,9 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
}
delete[] contents;
if (atterror)
- return attachError.arg(attachment);
+ return attachError.tqarg(attachment);
}
- message += TQString::tqfromLatin1("\n--%1--\n.\n").arg(boundary);
+ message += TQString::tqfromLatin1("\n--%1--\n.\n").tqarg(boundary.data());
}
return TQString();
}
@@ -922,10 +922,10 @@ char* KAMail::base64Encode(const char* in, TQIODevice::Offset size, TQIODevice::
TQStringList KAMail::errors(const TQString& err, bool sendfail)
{
TQString error1 = sendfail ? i18n("Failed to send email")
- : i18n("Error copying sent email to KMail %1 folder").arg(i18n_sent_mail());
+ : i18n("Error copying sent email to KMail %1 folder").tqarg(i18n_sent_mail());
if (err.isEmpty())
return TQStringList(error1);
- TQStringList errs(TQString::tqfromLatin1("%1:").arg(error1));
+ TQStringList errs(TQString::tqfromLatin1("%1:").tqarg(error1));
errs += err;
return errs;
}
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index cff6cdb1..1d9cabff 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -44,7 +44,7 @@ void CheckBox::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? Qt::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQCheckBox::mousePressEvent(e);
@@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQCheckBox::mouseReleaseEvent(e);
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 6b6985cd..e535d4ea 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -80,7 +80,7 @@ class CheckBox : public TQCheckBox
protected slots:
void slotClicked();
private:
- TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
+ Qt::FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox
TQWidget* mFocusWidget; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly; // value cannot be changed
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 769e6518..5cea7fb8 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -41,7 +41,7 @@ ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& de
addColours();
connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int)));
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged()));
+ Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged()));
}
void ColourCombo::setColour(const TQColor& colour)
@@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h
index 7bee8d14..91fabaf9 100644
--- a/kalarm/lib/colourlist.h
+++ b/kalarm/lib/colourlist.h
@@ -95,7 +95,7 @@ class ColourList
/** Returns the index to the first occurrence of colour @p c in the list.
* Returns -1 if colour @p c is not in the list.
*/
- int findIndex(const TQColor& c) const { return mList.findIndex(c.rgb()); }
+ int findIndex(const TQColor& c) const { return mList.tqfindIndex(c.rgb()); }
/** Returns the first colour in the list. If the list is empty, the result is undefined. */
TQColor first() const { return TQColor(mList.first()); }
/** Returns the last colour in the list. If the list is empty, the result is undefined. */
diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp
index 0c526cae..2acb5a44 100644
--- a/kalarm/lib/combobox.cpp
+++ b/kalarm/lib/combobox.cpp
@@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQComboBox::mousePressEvent(e);
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 38a6a5cb..0a916d9f 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -81,7 +81,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons
errString = i18n("today");
else
errString = KGlobal::locale()->formatDate(limit, true);
- errString = defaultError.arg(errString);
+ errString = defaultError.tqarg(errString);
}
KMessageBox::sorry(this, errString);
}
@@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e)
if (isReadOnly())
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
KDateEdit::mousePressEvent(e);
diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h
index 976bada9..bcfa434b 100644
--- a/kalarm/lib/datetime.h
+++ b/kalarm/lib/datetime.h
@@ -169,7 +169,7 @@ class DateTime
* If it is a date-time, both time and date are included in the output.
* If it is date-only, only the date is included in the output.
*/
- TQString toString(TQt::DateFormat f = TQt::TextDate) const
+ TQString toString(Qt::DateFormat f = Qt::TextDate) const
{
if (mDateOnly)
return mDateTime.date().toString(f);
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index d2b18ba1..d532b67e 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -55,7 +55,7 @@ void Label::setBuddy(TQWidget* bud)
if (w)
{
while (w->focusProxy())
- w = w->focusProxy();
+ w = TQT_TQWIDGET(w->focusProxy());
if (!w->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING))
w = 0;
}
@@ -106,7 +106,7 @@ void Label::activated()
LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
: TQWidget(tqparent, name)
{
- setFocusPolicy(ClickFocus);
+ setFocusPolicy(Qt::ClickFocus);
setFixedSize(TQSize(1,1));
}
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index d85a9945..f19ed806 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -78,11 +78,11 @@ void LineEdit::init()
void LineEdit::focusInEvent(TQFocusEvent* e)
{
if (mNoSelect)
- TQFocusEvent::setReason(TQFocusEvent::Other);
+ e->setReason(TQFocusEvent::Other);
KLineEdit::focusInEvent(e);
if (mNoSelect)
{
- TQFocusEvent::resetReason();
+ e->resetReason();
mNoSelect = false;
}
}
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index e1e04099..c251fa3c 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -44,7 +44,7 @@ void PushButton::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? Qt::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQPushButton::mousePressEvent(e);
@@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQPushButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 615ea10c..d0f4b065 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -71,7 +71,7 @@ class PushButton : public TQPushButton
virtual void keyPressEvent(TQKeyEvent*);
virtual void keyReleaseEvent(TQKeyEvent*);
private:
- TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
+ Qt::FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton
bool mReadOnly; // value cannot be changed
};
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index d0809788..f34a574e 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -44,7 +44,7 @@ void RadioButton::setReadOnly(bool ro)
if ((int)ro != (int)mReadOnly)
{
mReadOnly = ro;
- setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
+ setFocusPolicy(ro ? Qt::NoFocus : mFocusPolicy);
if (ro)
clearFocus();
}
@@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQRadioButton::mousePressEvent(e);
@@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQRadioButton::mouseReleaseEvent(e);
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index 9395be60..baa7cba3 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -80,7 +80,7 @@ class RadioButton : public TQRadioButton
protected slots:
void slotClicked();
private:
- TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
+ Qt::FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton
TQWidget* mFocusWidget; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly; // value cannot be changed
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 09daf91d..c2f2e11b 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -185,7 +185,7 @@ const TQCString& ShellProcess::shellPath()
}
// Get the shell filename with the path stripped off
- int i = mShellPath.findRev('/');
+ int i = mShellPath.tqfindRev('/');
if (i >= 0)
mShellName = mShellPath.mid(i + 1);
else
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index 0b30f744..f901f6db 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e)
if (mReadOnly)
{
// Swallow up the event if it's the left button
- if (e->button() == TQt::LeftButton)
+ if (e->button() == Qt::LeftButton)
return;
}
TQSlider::mousePressEvent(e);
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 19608eab..fc8e6b7c 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -201,7 +201,7 @@ void SpinBox::updateDisplay()
*/
bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
{
- if (obj == editor())
+ if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(editor()))
{
int step = 0;
bool shift = false;
@@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseButtonDblClick:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->button() == TQt::LeftButton)
+ if (me->button() == Qt::LeftButton)
{
// It's a left button press. Set normal or shift stepping as appropriate.
if (mReadOnly)
@@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseButtonRelease:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->button() == TQt::LeftButton && mShiftMouse)
+ if (me->button() == Qt::LeftButton && mShiftMouse)
{
setShiftStepping(false, mCurrentButton); // cancel shift stepping
return false; // forward event to the destination widget
@@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
case TQEvent::MouseMove:
{
TQMouseEvent* me = (TQMouseEvent*)e;
- if (me->state() & TQt::LeftButton)
+ if (me->state() & Qt::LeftButton)
{
// The left button is down. Track which spin button it's in.
if (mReadOnly)
@@ -325,7 +325,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e)
TQKeyEvent* ke = (TQKeyEvent*)e;
int key = ke->key();
int state = ke->state();
- if ((state & TQt::LeftButton)
+ if ((state & Qt::LeftButton)
&& (key == TQt::Key_Shift || key == TQt::Key_Alt))
{
// The left mouse button is down, and the Shift or Alt key has changed
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 8627838b..3d7cde02 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -85,9 +85,9 @@ void SpinBox2::init()
mSpinbox->setSelectOnStep(false); // default
mUpdown2->setSelectOnStep(false); // always false
setFocusProxy(mSpinbox);
- mUpdown2->setFocusPolicy(TQWidget::NoFocus);
+ mUpdown2->setFocusPolicy(Qt::NoFocus);
mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this);
- if (!mirrorStyle(style()))
+ if (!mirrorStyle(tqstyle()))
mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate
connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange()));
connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int)));
@@ -243,7 +243,7 @@ TQSize SpinBox2::tqminimumSizeHint() const
void SpinBox2::styleChange(TQStyle&)
{
- if (mirrorStyle(style()))
+ if (mirrorStyle(tqstyle()))
mSpinMirror->show(); // show rounded corners with Plastik etc.
else
mSpinMirror->hide(); // keep normal shading with other styles
@@ -282,16 +282,16 @@ void SpinBox2::arrange()
*/
void SpinBox2::getMetrics() const
{
- TQRect rect = mUpdown2->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField);
- if (style().inherits("PlastikStyle"))
+ TQRect rect = mUpdown2->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mUpdown2, TQStyle::SC_SpinWidgetButtonField);
+ if (tqstyle().inherits("PlastikStyle"))
rect.setLeft(rect.left() - 1); // Plastik excludes left border from spin widget rectangle
xUpdown2 = mReverseLayout ? 0 : rect.left();
wUpdown2 = mUpdown2->width() - rect.left();
- xSpinbox = mSpinbox->style().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left();
+ xSpinbox = mSpinbox->tqstyle().querySubControlMetrics(TQStyle::CC_SpinWidget, mSpinbox, TQStyle::SC_SpinWidgetEditField).left();
wGap = 0;
// Make style-specific adjustments for a better appearance
- if (style().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING))
+ if (tqstyle().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING))
{
xSpinbox = 0; // show the edit control left border
wGap = 2; // leave a space to the right of the left-hand pair of spin buttons
@@ -422,7 +422,7 @@ void SpinMirror::redraw()
void SpinMirror::redraw(const TQPixmap& px)
{
TQCanvas* c = canvas();
- c->setBackgroundPixmap(px);
+ c->tqsetBackgroundPixmap(px);
c->setAllChanged();
c->update();
}
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index f8700a50..1a2a6500 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -31,7 +31,7 @@ class TimeSpinBox::TimeValidator : public TQValidator
{
public:
TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0)
- : TQValidator(tqparent, name),
+ : TQValidator(TQT_TQOBJECT(tqparent), name),
minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
virtual State validate(TQString&, int&) const;
int minMinute, maxMinute;
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 07e976c6..34b13e5f 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -182,7 +182,7 @@ MainWindow::~MainWindow()
else
theApp()->trayWindow()->removeWindow(this);
}
- MinuteTimer::disconnect(this);
+ MinuteTimer::disconnect(TQT_TQOBJECT(this));
mMinuteTimerActive = false; // to ensure that setUpdateTimer() works correctly
setUpdateTimer();
MainWindow* main = mainMainWindow();
@@ -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::tqfromLatin1(UI_FILE)));
+ KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").tqarg(TQString::tqfromLatin1(UI_FILE)));
mMenuError = false;
}
}
@@ -326,55 +326,55 @@ void MainWindow::columnsReordered()
void MainWindow::initActions()
{
KActionCollection* actions = actionCollection();
- mActionTemplates = new KAction(i18n("&Templates..."), 0, this, TQT_SLOT(slotTemplates()), actions, "templates");
- mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new");
- mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
- mActionCreateTemplate = new KAction(i18n("Create Tem&plate..."), 0, this, TQT_SLOT(slotNewTemplate()), actions, "createTemplate");
- mActionCopy = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy");
- mActionModify = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify");
- mActionDelete = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete");
- mActionReactivate = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete");
- mActionEnable = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable");
- mActionView = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQT_SLOT(slotView()), actions, "view");
- mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
+ mActionTemplates = new KAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates");
+ mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new");
+ mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
+ mActionCreateTemplate = new KAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate");
+ mActionCopy = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy");
+ mActionModify = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify");
+ mActionDelete = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete");
+ mActionReactivate = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete");
+ mActionEnable = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable");
+ mActionView = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view");
+ mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
mActionShowTime->setCheckedState(i18n("Hide &Alarm Times"));
- mActionShowTimeTo = new KToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
+ mActionShowTimeTo = new KToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms"));
- mActionShowExpired = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
+ mActionShowExpired = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms());
- mActionToggleTrayIcon = new KToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
+ mActionToggleTrayIcon = new KToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray"));
- new KAction(i18n("Import &Alarms..."), 0, this, TQT_SLOT(slotImportAlarms()), actions, "importAlarms");
- new KAction(i18n("Import &Birthdays..."), 0, this, TQT_SLOT(slotBirthdays()), actions, "importBirthdays");
- new KAction(i18n("&Refresh Alarms"), "reload", 0, this, TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms");
+ new KAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms");
+ new KAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays");
+ new KAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms");
Daemon::createAlarmEnableAction(actions, "alarmEnable");
if (undoText.isNull())
{
// Get standard texts, etc., for Undo and Redo actions
- KAction* act = KStdAction::undo(this, 0, actions);
+ KAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions);
undoIcon = act->icon();
undoShortcut = act->shortcut();
undoText = act->text();
undoTextStripped = KAlarm::stripAccel(undoText);
delete act;
- act = KStdAction::redo(this, 0, actions);
+ act = KStdAction::redo(TQT_TQOBJECT(this), 0, actions);
redoIcon = act->icon();
redoShortcut = act->shortcut();
redoText = act->text();
redoTextStripped = KAlarm::stripAccel(redoText);
delete act;
}
- 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::tqfind(mListView, TQT_SLOT(slotFind()), actions);
- mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions);
- mActionFindPrev = KStdAction::findPrev(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);
- KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actions);
- KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actions);
- KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actions);
+ mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo");
+ mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo");
+ KStdAction::find(TQT_TQOBJECT(mListView), TQT_SLOT(slotFind()), actions);
+ mActionFindNext = KStdAction::findNext(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindNext()), actions);
+ mActionFindPrev = KStdAction::findPrev(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindPrev()), actions);
+ KStdAction::selectAll(TQT_TQOBJECT(mListView), TQT_SLOT(slotSelectAll()), actions);
+ KStdAction::deselect(TQT_TQOBJECT(mListView), TQT_SLOT(slotDeselect()), actions);
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actions);
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actions);
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actions);
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actions);
setStandardToolBarMenuEnabled(true);
createGUI(UI_FILE);
@@ -388,7 +388,7 @@ void MainWindow::initActions()
connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int)));
connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndotqStatus(const TQString&, const TQString&)));
connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool)));
- Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged()));
+ Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPrefsChanged()));
connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction()));
// Set menu item states
@@ -485,13 +485,13 @@ void MainWindow::setUpdateTimer()
{
// Timeout every minute.
needTimer->mMinuteTimerActive = true;
- MinuteTimer::connect(needTimer, TQT_SLOT(slotUpdateTimeTo()));
+ MinuteTimer::connect(TQT_TQOBJECT(needTimer), TQT_SLOT(slotUpdateTimeTo()));
kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl;
}
else if (!needTimer && timerWindow)
{
timerWindow->mMinuteTimerActive = false;
- MinuteTimer::disconnect(timerWindow);
+ MinuteTimer::disconnect(TQT_TQOBJECT(timerWindow));
kdDebug(5950) << "MainWindow::setUpdateTimer(): stopped timer" << endl;
}
}
@@ -1023,8 +1023,8 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type)
TQString actText = Undo::actionText(type, id);
TQString descrip = Undo::description(type, id);
TQString text = descrip.isEmpty()
- ? i18n("Undo/Redo [action]", "%1 %2").arg(action).arg(actText)
- : i18n("Undo [action]: message", "%1 %2: %3").arg(action).arg(actText).arg(descrip);
+ ? i18n("Undo/Redo [action]", "%1 %2").tqarg(action).tqarg(actText)
+ : i18n("Undo [action]: message", "%1 %2: %3").tqarg(action).tqarg(actText).tqarg(descrip);
menu->insertItem(text, id);
}
}
@@ -1043,7 +1043,7 @@ void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo)
else
{
mActionUndo->setEnabled(true);
- mActionUndo->setText(TQString("%1 %2").arg(undoText).arg(undo));
+ mActionUndo->setText(TQString("%1 %2").tqarg(undoText).tqarg(undo));
}
if (redo.isNull())
{
@@ -1053,7 +1053,7 @@ void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo)
else
{
mActionRedo->setEnabled(true);
- mActionRedo->setText(TQString("%1 %2").arg(redoText).arg(redo));
+ mActionRedo->setText(TQString("%1 %2").tqarg(redoText).tqarg(redo));
}
}
@@ -1088,7 +1088,7 @@ void MainWindow::slotConfigureToolbar()
{
saveMainWindowSettings(KGlobal::config(), WINDOW_NAME);
KEditToolbar dlg(factory());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
+ connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
}
@@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p
*/
void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int)
{
- if (button != TQt::RightButton && !item)
+ if (button != Qt::RightButton && !item)
{
kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl;
mListView->clearSelection();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index c6a0916c..7bf51b0a 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -429,12 +429,12 @@ void MessageWin::initView()
if (mDateTime.isDateOnly() || TQDate::tqcurrentDate().daysTo(mDateTime.date()) > 0)
{
setRemainingTextDay();
- MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay())); // update every day
+ MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); // update every day
}
else
{
setRemainingTextMinute();
- MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute
+ MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute
}
topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter);
topLayout->addSpacing(KDialog::spacingHint());
@@ -510,7 +510,7 @@ void MessageWin::initView()
mOkButton = new KPushButton(KStdGuiItem::close(), topWidget);
// 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->setFocusPolicy(Qt::ClickFocus); // don't allow keyboard selection
mOkButton->setFixedSize(mOkButton->tqsizeHint());
connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
@@ -520,7 +520,7 @@ void MessageWin::initView()
{
// Edit button
mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
- mEditButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection
+ mEditButton->setFocusPolicy(Qt::ClickFocus); // don't allow keyboard selection
mEditButton->setFixedSize(mEditButton->tqsizeHint());
connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter);
@@ -531,7 +531,7 @@ void MessageWin::initView()
{
// Defer button
mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget);
- mDeferButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection
+ mDeferButton->setFocusPolicy(Qt::ClickFocus); // don't allow keyboard selection
mDeferButton->setFixedSize(mDeferButton->tqsizeHint());
connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer()));
grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter);
@@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay()
if (days <= 0 && !mDateTime.isDateOnly())
{
// The alarm is due today, so start refreshing every minute
- MidnightTimer::disconnect(this, TQT_SLOT(setRemainingTextDay()));
+ MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay()));
setRemainingTextMinute();
- MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute
+ MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute
}
else
{
@@ -650,7 +650,7 @@ void MessageWin::setRemainingTextMinute()
else if (mins % 60 == 1)
text = i18n("in 1 hour 1 minute's time", "in %n hours 1 minute's time", mins/60);
else
- text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).arg(mins%60);
+ text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).tqarg(mins%60);
mRemainingText->setText(text);
}
@@ -859,7 +859,7 @@ void MessageWin::slotPlayAudio()
kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl;
if (!haveErrorMessage(ErrMsg_AudioFile))
{
- KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mAudioFile));
+ KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mAudioFile));
clearErrorMessage(ErrMsg_AudioFile);
}
return;
@@ -882,7 +882,7 @@ void MessageWin::slotPlayAudio()
kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")\n";
if (!haveErrorMessage(ErrMsg_Volume))
{
- KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError),
+ KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").tqarg(mKMixError),
TQString(), TQString::tqfromLatin1("KMixError"));
clearErrorMessage(ErrMsg_Volume);
}
@@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event)
if (mDeferButton)
{
mDeferLimit = event.deferralLimit().dateTime();
- MidnightTimer::connect(this, TQT_SLOT(checkDeferralLimit())); // check every day
+ MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); // check every day
mDisableDeferral = false;
checkDeferralLimit();
}
@@ -1519,7 +1519,7 @@ void MessageWin::checkDeferralLimit()
int n = TQDate::tqcurrentDate().daysTo(mDeferLimit.date());
if (n > 0)
return;
- MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit()));
+ MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit()));
if (n == 0)
{
// The deferral limit will be reached today
@@ -1540,7 +1540,7 @@ void MessageWin::checkDeferralLimit()
*/
void MessageWin::slotDefer()
{
- mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime::tqcurrentDateTime().addSecs(60),
+ mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime(TQDateTime::tqcurrentDateTime().addSecs(60)),
false, this, "deferDlg");
if (mDefaultDeferMinutes > 0)
mDeferDlg->setDeferMinutes(mDefaultDeferMinutes);
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index ec6aa483..90b48dd8 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -233,7 +233,7 @@ PrefsTabBase::PrefsTabBase(TQVBox* frame)
mPage(frame)
{
if (!mIndentWidth)
- mIndentWidth = style().subRect(TQStyle::SR_RadioButtonIndicator, this).width();
+ mIndentWidth = tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, this).width();
}
void PrefsTabBase::apply(bool syncToDisc)
@@ -310,7 +310,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
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::tqfromLatin1(DAEMON_APP_NAME)));
+ .tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment);
group->setFixedHeight(group->tqsizeHint().height());
@@ -325,7 +325,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
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()));
+ TQWhatsThis::add(box, TQString("%1\n\n%2").tqarg(startOfDayText).tqarg(TimeSpinBox::shiftWhatsThis()));
itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls
itemBox->setFixedHeight(box->tqsizeHint().height());
@@ -404,7 +404,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
cmd.tqreplace("%w", "<command; sleep>");
cmd.tqreplace("%C", "[command]");
cmd.tqreplace("%W", "[command; sleep]");
- TQWhatsThis::add(radio, whatsThis.arg(cmd));
+ TQWhatsThis::add(radio, whatsThis.tqarg(cmd));
grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto);
++index;
}
@@ -470,7 +470,7 @@ void MiscPrefTab::apply(bool syncToDisc)
if (KStandardDirs::findExe(cmd).isEmpty())
{
mXtermCommand->setFocus();
- if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd))
+ if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").tqarg(cmd))
!= KMessageBox::Continue)
return;
}
@@ -618,10 +618,10 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
"your system is configured to use sendmail or a sendmail compatible mail transport agent."));
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 = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()), box);
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()));
+ i18n("After sending an email, store a copy in KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls
box->setFixedHeight(box->tqsizeHint().height());
@@ -793,18 +793,18 @@ TQString EmailPrefTab::validate()
TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg)
{
- TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").arg(msg);
+ TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").tqarg(msg);
switch (group->selectedId())
{
case Preferences::MAIL_FROM_CONTROL_CENTRE:
if (!KAMail::controlCentreAddress().isEmpty())
return TQString();
- errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg);
+ errmsg = i18n("No email address is currently set in the KDE Control Center. %1").tqarg(errmsg);
break;
case Preferences::MAIL_FROM_KMAIL:
if (KAMail::identitiesExist())
return TQString();
- errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg);
+ errmsg = i18n("No KMail identities currently exist. %1").tqarg(errmsg);
break;
case Preferences::MAIL_FROM_ADDR:
if (!addr->text().stripWhiteSpace().isEmpty())
@@ -902,12 +902,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint());
- TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
+ TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck()));
tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
mAutoClose->setMinimumSize(mAutoClose->tqsizeHint());
- TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
+ TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin()));
tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
TQHBox* box = new TQHBox(group);
@@ -942,14 +942,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
if (theApp()->speechEnabled())
mSound->insertItem(SoundPicker::i18n_Speak()); // index 3
mSound->setMinimumSize(mSound->tqsizeHint());
- TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
+ TQWhatsThis::add(mSound, defsetting.tqarg(SoundPicker::i18n_Sound()));
htqlayout->addWidget(mSound);
htqlayout->addStretch(1);
#ifndef WITHOUT_ARTS
mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound");
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()));
+ TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").tqarg(SoundDlg::i18n_Repeat()));
htqlayout->addWidget(mSoundRepeat);
#endif
@@ -978,13 +978,13 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
mCmdScript->setMinimumSize(mCmdScript->tqsizeHint());
- TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
+ TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript()));
tqlayout->addWidget(mCmdScript);
tqlayout->addStretch();
mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
mCmdXterm->setMinimumSize(mCmdXterm->tqsizeHint());
- TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
+ TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow()));
tqlayout->addWidget(mCmdXterm);
// EMAIL ALARMS
@@ -995,21 +995,21 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
// BCC email to sender
mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint());
- TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
+ TQWhatsThis::add(mEmailBcc, defsetting.tqarg(EditAlarmDlg::i18n_CopyEmailToSelf()));
tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
// MISCELLANEOUS
// Show in KOrganizer
mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg");
mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->tqsizeHint());
- TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer()));
+ TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(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->tqsizeHint());
- TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate()));
+ TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate()));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the control
// Recurrence
@@ -1179,7 +1179,7 @@ TQString EditPrefTab::validate()
if (mSound->currentItem() == SoundPicker::PLAY_FILE && mSoundFile->text().isEmpty())
{
mSoundFile->setFocus();
- return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());;
+ return i18n("You must enter a sound file when %1 is selected as the default sound type").tqarg(SoundPicker::i18n_File());;
}
return TQString();
}
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 5ac3c9bf..e360ef49 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -103,7 +103,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* na
* selection of its corresponding radio button.
*/
- TQGroupBox* recurGroup = new TQGroupBox(1, TQt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
+ TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
topLayout->addWidget(recurGroup);
TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame");
tqlayout = new TQVBoxLayout(ruleFrame, 0);
@@ -111,7 +111,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* na
tqlayout = new TQHBoxLayout(tqlayout, 0);
TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0);
- mRuleButtonGroup = new ButtonGroup(1, TQt::Horizontal, ruleFrame);
+ mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame);
mRuleButtonGroup->setInsideMargin(0);
mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame);
lay->addWidget(mRuleButtonGroup);
@@ -268,7 +268,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* na
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()));
+ TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").tqarg(lastTimeText).tqarg(TimeSpinBox::shiftWhatsThis()));
mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup);
mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->tqsizeHint());
mEndAnyTimeCheckBox->setReadOnly(mReadOnly);
@@ -619,7 +619,7 @@ void RecurrenceEdit::enableExceptionButtons()
mChangeExceptionButton->setEnabled(enable);
// Prevent the exceptions list box receiving keyboard focus is it's empty
- mExceptionDateList->setFocusPolicy(mExceptionDateList->count() ? TQWidget::WheelFocus : TQWidget::NoFocus);
+ mExceptionDateList->setFocusPolicy(mExceptionDateList->count() ? Qt::WheelFocus : Qt::NoFocus);
}
/******************************************************************************
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index 02d3af55..feb53bd6 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -133,7 +133,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
i18n("Select to choose the volume for playing the sound file."));
// Volume slider
- mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box);
+ mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box);
mVolumeSlider->setTickmarks(TQSlider::Below);
mVolumeSlider->setTickInterval(10);
mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
@@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
grid->addWidget(mFadeVolumeBox, 4, 2);
label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox);
label->setFixedSize(label->tqsizeHint());
- mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox);
+ mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox);
mFadeSlider->setTickmarks(TQSlider::Below);
mFadeSlider->setTickInterval(10);
mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
@@ -299,7 +299,7 @@ void SoundDlg::playSound()
|| !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
{
kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl;
- KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName));
+ KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mFileName));
return;
}
mPlayTimer = new TQTimer(this);
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 25d871c4..c6915601 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -114,9 +114,9 @@ void SoundPicker::showSpeak(bool show)
if (show == mSpeakShowing)
return; // no change
TQString whatsThis = "<p>" + i18n("Choose a sound to play when the message is displayed.")
- + "<br>" + i18n("%1: the message is displayed silently.").arg("<b>" + i18n_None() + "</b>")
- + "<br>" + i18n("%1: a simple beep is sounded.").arg("<b>" + i18n_Beep() + "</b>")
- + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").arg("<b>" + i18n_File() + "</b>");
+ + "<br>" + i18n("%1: the message is displayed silently.").tqarg("<b>" + i18n_None() + "</b>")
+ + "<br>" + i18n("%1: a simple beep is sounded.").tqarg("<b>" + i18n_Beep() + "</b>")
+ + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").tqarg("<b>" + i18n_File() + "</b>");
if (!show && mTypeCombo->currentItem() == SPEAK)
mTypeCombo->setCurrentItem(NONE);
if (mTypeCombo->count() == SPEAK+1)
@@ -124,7 +124,7 @@ void SoundPicker::showSpeak(bool show)
if (show)
{
mTypeCombo->insertItem(i18n_Speak());
- whatsThis += "<br>" + i18n("%1: the message text is spoken.").arg("<b>" + i18n_Speak() + "</b>") + "</p>";
+ whatsThis += "<br>" + i18n("%1: the message text is spoken.").tqarg("<b>" + i18n_Speak() + "</b>") + "</p>";
}
TQWhatsThis::add(mTypeBox, whatsThis + "</p>");
mSpeakShowing = show;
@@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi
defaultDir = kdeSoundDir;
}
#ifdef WITHOUT_ARTS
- TQString filter = TQString::tqfromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
+ TQString filter = TQString::tqfromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").tqarg(i18n("Sound Files")).tqarg(i18n("All Files"));
#else
TQStringList filters = KDE::PlayObjectFactory::mimeTypes();
TQString filter = filters.join(" ");
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index 6e493b91..64a247c7 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -80,8 +80,8 @@ TemplateDlg::TemplateDlg(TQWidget* tqparent, const char* name)
tqlayout->addWidget(mDeleteButton);
KAccel* accel = new KAccel(this);
- accel->insert(KStdAccel::SelectAll, mTemplateList, TQT_SLOT(slotSelectAll()));
- accel->insert(KStdAccel::Deselect, mTemplateList, TQT_SLOT(slotDeselect()));
+ accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll()));
+ accel->insert(KStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect()));
accel->readSettings();
mTemplateList->refresh();
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 190cb538..3dd686a9 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -88,15 +88,15 @@ TrayWindow::TrayWindow(MainWindow* tqparent, const char* name)
AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable");
a->plug(contextMenu());
connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledtqStatus(bool)));
- KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
- KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
- KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
+ KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
+ KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
// Replace the default handler for the Quit context menu item
const char* quitName = KStdAction::name(KStdAction::Quit);
actcol->remove(actcol->action(quitName));
actcol->accel()->remove(quitName);
- KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol);
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol);
// Set icon to correspond with the alarms enabled menu status
Daemon::checktqStatus();
@@ -173,12 +173,12 @@ void TrayWindow::setEnabledtqStatus(bool status)
*/
void TrayWindow::mousePressEvent(TQMouseEvent* e)
{
- if (e->button() == LeftButton && !theApp()->wantRunInSystemTray())
+ if (e->button() == Qt::LeftButton && !theApp()->wantRunInSystemTray())
{
// Left click: display/hide the first main window
mAssocMainWindow = MainWindow::toggleWindow(mAssocMainWindow);
}
- else if (e->button() == MidButton)
+ else if (e->button() == Qt::MidButton)
MainWindow::executeNew(); // display a New Alarm dialog
else
KSystemTray::mousePressEvent(e);
@@ -191,7 +191,7 @@ void TrayWindow::mousePressEvent(TQMouseEvent* e)
*/
void TrayWindow::mouseReleaseEvent(TQMouseEvent* e)
{
- if (e->button() == LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible())
+ if (e->button() == Qt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible())
{
mAssocMainWindow->raise();
mAssocMainWindow->setActiveWindow();
@@ -266,9 +266,9 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
minutes[0] = (mins%60) / 10 + '0';
minutes[1] = (mins%60) % 10 + '0';
if (Preferences::showTooltipAlarmTime())
- item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").arg(prefix).arg(mins/60).arg(minutes);
+ item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
else
- item.text += i18n("prefix + hours:minutes", "%1%2:%3").arg(prefix).arg(mins/60).arg(minutes);
+ item.text += i18n("prefix + hours:minutes", "%1%2:%3").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
item.text += ' ';
space = true;
}
@@ -353,7 +353,7 @@ void TrayTooltip::maybeTip(const TQPoint&)
if (Daemon::monitoringAlarms())
text = kapp->aboutData()->programName();
else
- text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
+ text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName());
kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
if (Preferences::tooltipAlarmCount())
tqparent->tooltipAlarmText(text);
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index c3b56612..81d101c3 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -207,7 +207,7 @@ Undo::List Undo::mRedoList;
Undo* Undo::instance()
{
if (!mInstance)
- mInstance = new Undo(kapp);
+ mInstance = new Undo(TQT_TQOBJECT(kapp));
return mInstance;
}
@@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQ
case UndoItem::ERR_PROG: err = i18n("Program error"); break;
default: err = i18n("Unknown error"); break;
}
- KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err));
+ KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
return false;
}
diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index e43814b4..d010bb0b 100644
--- a/kandy/src/atcommand.cpp
+++ b/kandy/src/atcommand.cpp
@@ -306,7 +306,7 @@ void ATCommand::extractParameters()
TQStringList::ConstIterator end = paraList.end();
int argNum = 1;
while(it != end) {
- addParameter(new ATParameter(*it,i18n("Arg %1").arg(TQString::number(argNum++)),
+ addParameter(new ATParameter(*it,i18n("Arg %1").tqarg(TQString::number(argNum++)),
false));
++it;
}
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 57359e3e..4b768c36 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -147,9 +147,9 @@
<connections>
<connection>
<sender>mParameterList</sender>
- <signal>rightButtonClicked(QListViewItem*,const QPoint&amp;,int)</signal>
+ <signal>rightButtonClicked(TQListViewItem*,const QPoint&amp;,int)</signal>
<receiver>CmdPropertiesDialog_base</receiver>
- <slot>editParameterName(QListViewItem*)</slot>
+ <slot>editParameterName(TQListViewItem*)</slot>
</connection>
<connection>
<sender>buttonOk</sender>
@@ -165,7 +165,7 @@
</connection>
</connections>
<Q_SLOTS>
- <slot>editParameterName(QListViewItem *)</slot>
+ <slot>editParameterName(TQListViewItem *)</slot>
<slot access="protected">slotAccept()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 4766947a..5e68abe4 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -102,7 +102,7 @@ Kandy::~Kandy()
void Kandy::load(const TQString& filename)
{
if (!mView->loadFile(filename)) {
- KMessageBox::error(this,i18n("Could not load file %1").arg(filename));
+ KMessageBox::error(this,i18n("Could not load file %1").tqarg(filename));
}
mFilename = filename;
@@ -113,7 +113,7 @@ void Kandy::save(const TQString & filename)
{
if (!filename.isEmpty()) {
if (!mView->saveFile(filename)) {
- KMessageBox::error(this,i18n("Could not save file %1.").arg(filename));
+ KMessageBox::error(this,i18n("Could not save file %1.").tqarg(filename));
} else {
mFilename = filename;
setTitle();
@@ -123,25 +123,25 @@ void Kandy::save(const TQString & filename)
void Kandy::setupActions()
{
- KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
- KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
-// KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
+ KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
+// KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
- new KAction(i18n("Mobile GUI"),0,this,TQT_SLOT(showMobileGui()),
+ new KAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()),
actionCollection(),"show_mobilegui");
- mConnectAction = new KAction(i18n("Connect"),0,this,TQT_SLOT(modemConnect()),
+ mConnectAction = new KAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()),
actionCollection(),"modem_connect");
- mDisconnectAction = new KAction(i18n("Disconnect"),0,this,
+ mDisconnectAction = new KAction(i18n("Disconnect"),0,TQT_TQOBJECT(this),
TQT_SLOT(modemDisconnect()),actionCollection(),
"modem_disconnect");
@@ -300,7 +300,7 @@ bool Kandy::queryClose()
{
if (mView->isModified()) {
switch (KMessageBox::warningYesNoCancel(this,
- i18n("Save changes to profile %1?").arg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
+ i18n("Save changes to profile %1?").tqarg(mFilename), TQString(), KStdGuiItem::save(), KStdGuiItem::discard())) {
case KMessageBox::Yes :
fileSave();
return true;
@@ -319,7 +319,7 @@ void Kandy::modemConnect()
if (!mScheduler->modem()->open()) {
KMessageBox::sorry(this,
i18n("Cannot open modem tqdevice %1.")
- .arg(KandyPrefs::serialDevice()), i18n("Modem Error"));
+ .tqarg(KandyPrefs::serialDevice()), i18n("Modem Error"));
return;
}
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index 38fcb9cb..6e76235b 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -65,7 +65,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent)
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- TQSplitter *mainSplitter = new TQSplitter( Horizontal, this );
+ TQSplitter *mainSplitter = new TQSplitter( Qt::Horizontal, this );
topLayout->addWidget( mainSplitter );
TQWidget *commandBox = new TQWidget( mainSplitter );
@@ -99,7 +99,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *tqparent)
commandLayout->addWidget( buttonExecute );
connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) );
- TQSplitter *ioSplitter = new TQSplitter( Vertical, mainSplitter );
+ TQSplitter *ioSplitter = new TQSplitter( Qt::Vertical, mainSplitter );
TQWidget *inBox = new TQWidget( ioSplitter );
@@ -250,7 +250,7 @@ void KandyView::executeCommand()
if (p->userInput()) {
bool ok = false;
TQString value = KInputDialog::getText(TQString(),
- i18n("Enter value for %1:").arg(p->name()),TQString(),&ok,this);
+ i18n("Enter value for %1:").tqarg(p->name()),TQString(),&ok,this);
if (!ok)
return;
p->setValue(value);
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 7b39d8d3..de3e2b3e 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -71,17 +71,17 @@ MobileMain::~MobileMain()
void MobileMain::setupActions()
{
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- new KAction(i18n("Terminal"),0,this,TQT_SLOT(showTerminal()),
+ new KAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()),
actionCollection(),"show_terminal");
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
- KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
createGUI("kandymobileui.rc");
}
@@ -169,7 +169,7 @@ bool MobileMain::queryClose()
#if 0
if (m_view->isModified()) {
switch (KMessageBox::warningYesNoCancel(this,
- i18n("Save changes to profile %1?").arg(mFilename))) {
+ i18n("Save changes to profile %1?").tqarg(mFilename))) {
case KMessageBox::Yes :
fileSave();
return true;
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index 4b085de6..113f2e4b 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -196,7 +196,7 @@ bool Modem::open()
if ( ( fd = ::open( fdev, O_RDWR | O_NOCTTY | O_NONBLOCK ) ) == -1 ) {
emit errorMessage( i18n( "Unable to open tqdevice '%1'. "
"Please check that you have sufficient permissions." )
- .arg( fdev ) );
+ .tqarg( fdev ) );
return false;
}
@@ -204,7 +204,7 @@ bool Modem::open()
if ( tcgetattr( fd, &init_tty ) == -1 ) {
int errnumber = errno;
emit errorMessage( i18n( "Communication setup failed (tcgetattr code: %1)" )
- .arg(strerror(errnumber)) );
+ .tqarg(strerror(errnumber)) );
::close( fd );
fd = 0;
return false;
@@ -279,7 +279,7 @@ bool Modem::lockDevice()
#ifdef HAVE_LOCKDEV
is_locked = !dev_lock( (*prefs).serialDevice().local8Bit() );
if (!is_locked)
- emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).arg(
+ emit errorMessage( i18n( "Unable to lock tqdevice '%1'." ).tqarg(
(*prefs).serialDevice() ));
return is_locked;
#else
@@ -299,7 +299,7 @@ bool Modem::lockDevice()
if ( ( lfd = ::open( TQFile::encodeName( fileName ), O_RDONLY ) ) < 0 ) {
emit errorMessage( i18n( "Unable to open lock file '%1'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return false;
}
@@ -307,7 +307,7 @@ bool Modem::lockDevice()
if ( count < 0 ) {
emit errorMessage( i18n( "Unable to read lock file '%1'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
::close( lfd );
return false;
}
@@ -317,13 +317,13 @@ bool Modem::lockDevice()
count = sscanf( buf, "%d", &pid );
if ( ( count != 1 ) || ( pid <= 0 ) ) {
emit errorMessage( i18n( "Unable to get PID from file '%1'.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return false;
}
if ( !kill( (pid_t) pid, 0 ) ) {
emit errorMessage( i18n( "Process with PID %1, which is locking the tqdevice, is still running.")
- .arg( pid ) );
+ .tqarg( pid ) );
return false;
}
@@ -336,7 +336,7 @@ bool Modem::lockDevice()
if ( ( lfd = creat( TQFile::encodeName( fileName ).data(), 0644 ) ) == -1 ) {
emit errorMessage( i18n( "Unable to create lock file '%1'. "
"Please check that you have sufficient permissions.")
- .arg( fileName ) );
+ .tqarg( fileName ) );
return false;
}
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index 3c9e5e84..773f6aea 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -84,7 +84,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
if (desktopList.size()==0) {
for (int i=0; i<maxDesktops; i++) {
TaskVector *v = &(desktopTracker[i]);
- TaskVector::iterator tit = std::tqfind(v->begin(), v->end(), task);
+ TaskVector::iterator tit = std::find(v->begin(), v->end(), task);
if (tit != v->end())
desktopTracker[i].erase(tit);
// if the task was priviously tracking this desktop then
@@ -102,9 +102,9 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
if (desktopList.size()>0) {
for (int i=0; i<maxDesktops; i++) {
TaskVector& v = desktopTracker[i];
- TaskVector::iterator tit = std::tqfind(v.begin(), v.end(), task);
+ TaskVector::iterator tit = std::find(v.begin(), v.end(), task);
// Is desktop i in the desktop list?
- if ( std::tqfind( desktopList.begin(), desktopList.end(), i)
+ if ( std::find( desktopList.begin(), desktopList.end(), i)
!= desktopList.end()) {
if (tit == v.end()) // not yet in start vector
v.push_back(task); // track in desk i
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index a556550a..8c165154 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -1,7 +1,7 @@
/*
* karm
* This file only: Copyright (C) 1999 Espen Sand, espensa@online.no
- * Modifications (see CVS log) Copyright (C) 2000 Klarälvdalens
+ * Modifications (see CVS log) Copyright (C) 2000 Klar�lvdalens
* Datakonsult AB <kalle@dalheimer.de>, Jesper Pedersen <blackie@kde.org>
*
*
@@ -173,7 +173,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
{
int lines = (int)(desktopCount/2);
if (lines*2 != desktopCount) lines++;
- groupBox = new TQButtonGroup( lines, TQGroupBox::Horizontal,
+ groupBox = new TQButtonGroup( lines, Qt::Horizontal,
i18n("In Desktop"), page, "_desktopsGB");
}
lay1->addWidget(groupBox);
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 46ae03e9..38ae04d7 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -72,7 +72,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
int id = TQMessageBox::warning( 0, i18n("Idle Detection"),
i18n("Desktop has been idle since %1."
- " What should we do?").arg(idleStartTQString),
+ " What should we do?").tqarg(idleStartTQString),
i18n("Revert && Stop"),
i18n("Revert && Continue"),
i18n("Continue Timing"),0,2);
diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp
index 75e4854e..18a0f511 100644
--- a/karm/kaccelmenuwatch.cpp
+++ b/karm/kaccelmenuwatch.cpp
@@ -25,7 +25,7 @@ void KAccelMenuWatch::setMenu( TQPopupMenu *menu )
// we use _menuList to ensure that the signal is
// connected only once per menu.
- if ( !_menuList.findRef( menu ) ) {
+ if ( !_menuList.tqfindRef( menu ) ) {
_menuList.append( menu );
connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) );
}
@@ -74,7 +74,7 @@ void KAccelMenuWatch::removeDeadMenu()
TQPopupMenu *sdr = (TQPopupMenu *) sender();
assert( sdr );
- if ( !_menuList.findRef( sdr ) )
+ if ( !_menuList.tqfindRef( sdr ) )
return;
// remove all accels
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index d8982e2e..abe8fed6 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName,
TQObject *tqparent, const char *name )
: DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name),
_accel ( new KAccel( tqparentWidget ) ),
- _watcher ( new KAccelMenuWatch( _accel, tqparentWidget ) )
+ _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(tqparentWidget) ) )
{
// we need an instance
setInstance( karmPartFactory::instance() );
@@ -117,109 +117,109 @@ void karmPart::makeMenus()
(void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(_preferences,
+ actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
TQT_SLOT(showDialog()),
actionCollection() );
(void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
KAction* actionStartNewSession = new KAction( i18n("Start &New Session"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
KAction* actionResetAll = new KAction( i18n("&Reset All Times"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new KAction( i18n("&Start"),
TQString::tqfromLatin1("1rightarrow"), Key_S,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new KAction( i18n("S&top"),
TQString::tqfromLatin1("stop"), 0,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new KAction( i18n("Stop &All Timers"),
Key_Escape,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new KAction( i18n("&New..."),
TQString::tqfromLatin1("filenew"), CTRL+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new KAction( i18n("&Delete"),
TQString::tqfromLatin1("editdelete"), Key_Delete,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new KAction( i18n("&Edit..."),
TQString::tqfromLatin1("edit"), CTRL + Key_E,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new KAction( i18n("&Add Comment..."),
// TQString::tqfromLatin1("document"),
// CTRL+ALT+Key_E,
-// _taskView,
+// TQT_TQOBJECT(_taskView),
// TQT_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+ALT+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new KAction( i18n("Import &Legacy Flat File..."), 0,
- _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new KAction( i18n("&Export to CSV File..."), 0,
- _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new KAction( i18n("Export &History to CSV File..."), 0,
- this, TQT_SLOT(exportcsvHistory()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new KAction( i18n("Import Tasks From &Planner..."), 0,
- _taskView, TQT_SLOT(importPlanner()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
"import_planner");
new KAction( i18n("Configure KArm..."), 0,
- _preferences, TQT_SLOT(showDialog()), actionCollection(),
+ TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(),
"configure_karm");
/*
@@ -544,10 +544,10 @@ int karmPart::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, TQt::ISODate );
+ startDate = TQDate::fromString( datetime, Qt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, TQt::ISODate );
+ startTime = TQTime::fromString( datetime, Qt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
@@ -576,7 +576,7 @@ int karmPart::bookTime
TQString karmPart::getError( int mkb ) const
{
if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ];
- else return i18n( "Invalid error number: %1" ).arg( mkb );
+ else return i18n( "Invalid error number: %1" ).tqarg( mkb );
}
int karmPart::totalMinutesForTaskId( const TQString& taskId )
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 4a7dabc2..7dc025c2 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -199,8 +199,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
// Complete the loading but return a message
if ( !newParent )
err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
- .arg(task->name())
- .arg((*todo)->relatedToUid());
+ .tqarg(task->name())
+ .tqarg((*todo)->relatedToUid());
if (!err) task->move( newParent);
}
@@ -268,8 +268,8 @@ TQString KarmStorage::buildTaskView(KCal::ResourceCalendar *rc, TaskView *view)
// Complete the loading but return a message
if ( !newParent )
err = i18n("Error loading \"%1\": could not find tqparent (uid=%2)")
- .arg(task->name())
- .arg((*todo)->relatedToUid());
+ .tqarg(task->name())
+ .tqarg((*todo)->relatedToUid());
if (!err) task->move( newParent);
}
@@ -391,12 +391,12 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview,
TQFile f(filename);
if( !f.exists() )
- err = i18n("File \"%1\" not found.").arg(filename);
+ err = i18n("File \"%1\" not found.").tqarg(filename);
if (!err)
{
if( !f.open( IO_ReadOnly ) )
- err = i18n("Could not open \"%1\".").arg(filename);
+ err = i18n("Could not open \"%1\".").tqarg(filename);
}
if (!err)
@@ -667,7 +667,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
if (filename.isEmpty()) filename=rc.url.url();
TQFile f( filename );
if( !f.open( IO_WriteOnly ) ) {
- err = i18n( "Could not open \"%1\"." ).arg( filename );
+ err = i18n( "Could not open \"%1\"." ).tqarg( filename );
}
if (!err)
{
@@ -809,13 +809,13 @@ long KarmStorage::printTaskHistory (
// write the time in seconds for the given task for the given day to s
daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
daytaskkey = TQString::tqfromLatin1("%1_%2")
- .arg(daykey)
- .arg(task->uid());
+ .tqarg(daykey)
+ .tqarg(task->uid());
if (taskdaytotals.tqcontains(daytaskkey))
{
cell.push_back(TQString::tqfromLatin1("%1")
- .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
+ .tqarg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
sum += taskdaytotals[daytaskkey]; // in seconds
if (daytotals.tqcontains(daykey))
@@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory (
}
// Total for task
- cell.push_back(TQString::tqfromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes)));
+ cell.push_back(TQString::tqfromLatin1("%1").tqarg(formatTime(sum/60, rc.decimalMinutes)));
// room for the recursive total time (that cannot be calculated now)
cell.push_back(delim);
@@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory (
add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix,
rc );
}
- cell[colrectot]=(TQString::tqfromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes )));
+ cell[colrectot]=(TQString::tqfromLatin1("%1").tqarg(formatTime((add+sum)/60, rc.decimalMinutes )));
for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i];
return add+sum;
}
@@ -917,11 +917,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
// header
retval += i18n("Task History\n");
retval += i18n("From %1 to %2")
- .arg(KGlobal::locale()->formatDate(from))
- .arg(KGlobal::locale()->formatDate(to));
+ .tqarg(KGlobal::locale()->formatDate(from))
+ .tqarg(KGlobal::locale()->formatDate(to));
retval += cr;
retval += i18n("Printed on: %1")
- .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
+ .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
retval += cr;
day=from;
@@ -938,8 +938,8 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
{
daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
daytaskkey = TQString(TQString::tqfromLatin1("%1_%2"))
- .arg(daykey)
- .arg((*event).todoUid());
+ .tqarg(daykey)
+ .tqarg((*event).todoUid());
if (taskdaytotals.tqcontains(daytaskkey))
taskdaytotals.tqreplace(daytaskkey,
@@ -998,7 +998,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
if (daytotals.tqcontains(daykey))
{
retval += TQString::tqfromLatin1("%1")
- .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
+ .tqarg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
sum += daytotals[daykey]; // in seconds
}
retval += delim;
@@ -1006,9 +1006,9 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
}
retval += TQString::tqfromLatin1("%1%2%3%4")
- .arg( formatTime( sum/60, rc.decimalMinutes ) )
- .arg( delim ).arg( delim )
- .arg( i18n( "Total" ) );
+ .tqarg( formatTime( sum/60, rc.decimalMinutes ) )
+ .tqarg( delim ).tqarg( delim )
+ .tqarg( i18n( "Total" ) );
}
// above taken from timekard.cpp
@@ -1021,7 +1021,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView *taskview,
if (filename.isEmpty()) filename=rc.url.url();
TQFile f( filename );
if( !f.open( IO_WriteOnly ) ) {
- err = i18n( "Could not open \"%1\"." ).arg( filename );
+ err = i18n( "Could not open \"%1\"." ).tqarg( filename );
}
if (!err)
{
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index b1f7790f..e480dea4 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -17,7 +17,7 @@ class TimeValidator : public TQValidator
{
public:
TimeValidator( ValidatorType tp, TQWidget *tqparent=0, const char *name=0)
- : TQValidator(tqparent, name)
+ : TQValidator(TQT_TQOBJECT(tqparent), name)
{
_tp = tp;
}
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 2ab850aa..6d1ce29e 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile )
: DCOPObject ( "KarmDCOPIface" ),
KParts::MainWindow(0,TQt::WStyle_ContextHelp),
_accel ( new KAccel( this ) ),
- _watcher ( new KAccelMenuWatch( _accel, this ) ),
+ _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
_totalSum ( 0 ),
_sessionSum( 0 )
{
@@ -202,10 +202,10 @@ void MainWindow::updateStatusBar( )
TQString time;
time = formatTime( _sessionSum );
- statusBar()->changeItem( i18n("Session: %1").arg(time), 0 );
+ statusBar()->changeItem( i18n("Session: %1").tqarg(time), 0 );
time = formatTime( _totalSum );
- statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1);
+ statusBar()->changeItem( i18n("Total: %1" ).tqarg(time), 1);
}
void MainWindow::starStatusBar()
@@ -251,88 +251,88 @@ void MainWindow::makeMenus()
*actionNew,
*actionNewSub;
- (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection());
- (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
- actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+ (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection());
+ (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection());
+ actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(_preferences,
+ actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
TQT_SLOT(showDialog()),
actionCollection() );
- (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
+ (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() );
KAction* actionStartNewSession = new KAction( i18n("Start &New Session"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
KAction* actionResetAll = new KAction( i18n("&Reset All Times"),
0,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new KAction( i18n("&Start"),
TQString::tqfromLatin1("1rightarrow"), Key_S,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new KAction( i18n("S&top"),
TQString::tqfromLatin1("stop"), Key_S,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new KAction( i18n("Stop &All Timers"),
Key_Escape,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new KAction( i18n("&New..."),
TQString::tqfromLatin1("filenew"), CTRL+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new KAction( i18n("&Delete"),
TQString::tqfromLatin1("editdelete"), Key_Delete,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new KAction( i18n("&Edit..."),
TQString::tqfromLatin1("edit"), CTRL + Key_E,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new KAction( i18n("&Add Comment..."),
// TQString::tqfromLatin1("document"),
// CTRL+ALT+Key_E,
-// _taskView,
+// TQT_TQOBJECT(_taskView),
// TQT_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
TQString::tqfromLatin1("document"),
CTRL+Key_M,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
@@ -340,29 +340,29 @@ void MainWindow::makeMenus()
actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"),
TQString::tqfromLatin1("klipper"),
0,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipSession() ),
actionCollection(),
"clip_session");
actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
TQString::tqfromLatin1("klipper"),
CTRL+ALT+Key_C,
- _taskView,
+ TQT_TQOBJECT(_taskView),
TQT_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new KAction( i18n("Import &Legacy Flat File..."), 0,
- _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new KAction( i18n("&Export to CSV File..."), 0,
- _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new KAction( i18n("Export &History to CSV File..."), 0,
- this, TQT_SLOT(exportcsvHistory()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new KAction( i18n("Import Tasks From &Planner..."), 0,
- _taskView, TQT_SLOT(importPlanner()), actionCollection(),
+ TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
"import_planner");
/*
@@ -578,10 +578,10 @@ int MainWindow::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, TQt::ISODate );
+ startDate = TQDate::fromString( datetime, Qt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, TQt::ISODate );
+ startTime = TQTime::fromString( datetime, Qt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
@@ -610,7 +610,7 @@ int MainWindow::bookTime
TQString MainWindow::getError( int mkb ) const
{
if ( mkb <= KARM_MAX_ERROR_NO ) return m_error[ mkb ];
- else return i18n( "Invalid error number: %1" ).arg( mkb );
+ else return i18n( "Invalid error number: %1" ).tqarg( mkb );
}
int MainWindow::totalMinutesForTaskId( const TQString& taskId )
@@ -718,10 +718,10 @@ TQString MainWindow::exportcsvfile( TQString filename, TQString from, TQString t
ReportCriteria rc;
rc.url=filename;
rc.from=TQDate::fromString( from );
- if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate );
+ if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, Qt::ISODate );
kdDebug(5970) << "rc.from " << rc.from << endl;
rc.to=TQDate::fromString( to );
- if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate );
+ if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate );
kdDebug(5970) << "rc.to " << rc.to << endl;
rc.reportType=(ReportCriteria::REPORTTYPE) type; // history report or totals report
rc.decimalMinutes=decimalMinutes;
diff --git a/karm/print.cpp b/karm/print.cpp
index 891c06fe..d045a665 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -79,7 +79,7 @@ void MyPrinter::print()
painter.drawText(xMargin, yoff, pageWidth, height,
TQPainter::AlignCenter,
- i18n("KArm - %1").arg(now));
+ i18n("KArm - %1").tqarg(now));
painter.setFont(origFont);
yoff += height + 10;
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 6b3ca85b..b8d05ace 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -53,7 +53,7 @@ PrintDialog::PrintDialog()
tqlayout->addStretch(1);
// Date Range
- TQGroupBox *rangeGroup = new TQGroupBox(1, Horizontal, i18n("Date Range"),
+ TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"),
page);
tqlayout->addWidget(rangeGroup);
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 1ac108e0..6a8f6e05 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -131,7 +131,7 @@ void TaskView::contentsMousePressEvent ( TQMouseEvent * e )
int leftborder = treeStepSize() * ( task->depth() + ( rootIsDecorated() ? 1 : 0)) + itemMargin();
if ((leftborder < e->x()) && (e->x() < 19 + leftborder ))
{
- if ( e->button() == LeftButton )
+ if ( e->button() == Qt::LeftButton )
if ( task->isComplete() ) task->setPercentComplete( 0, _storage );
else task->setPercentComplete( 100, _storage );
}
@@ -154,7 +154,7 @@ void TaskView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
if ( e->pos().y() >= task->itemPos() && // doubleclick was onto current_item()
e->pos().y() < task->itemPos()+task->height() )
{
- if ( activeTasks.findRef(task) == -1 ) // task is active
+ if ( activeTasks.tqfindRef(task) == -1 ) // task is active
{
stopAllTimers();
startCurrentTimer();
@@ -388,7 +388,7 @@ void TaskView::startTimerFor(Task* task, TQDateTime startTime )
kdDebug(5970) << "Entering TaskView::startTimerFor" << endl;
if (save()==TQString())
{
- if (task != 0 && activeTasks.findRef(task) == -1)
+ if (task != 0 && activeTasks.tqfindRef(task) == -1)
{
_idleTimeDetector->startIdleDetection();
if (!task->isComplete())
@@ -462,7 +462,7 @@ void TaskView::resetTimeForAllTasks()
void TaskView::stopTimerFor(Task* task)
{
kdDebug(5970) << "Entering stopTimerFor. task = " << task->name() << endl;
- if ( task != 0 && activeTasks.findRef(task) != -1 ) {
+ if ( task != 0 && activeTasks.tqfindRef(task) != -1 ) {
activeTasks.removeRef(task);
task->setRunning(false, _storage);
if ( activeTasks.count() == 0 ) {
@@ -613,7 +613,7 @@ void TaskView::editTask()
// bool ok;
// TQString comment = KLineEditDlg::getText(i18n("Comment"),
-// i18n("Log comment for task '%1':").arg(task->name()),
+// i18n("Log comment for task '%1':").tqarg(task->name()),
// TQString(), &ok, this);
// if ( ok )
// task->addComment( comment, _storage );
@@ -651,7 +651,7 @@ void TaskView::deleteTask(bool markingascomplete)
response = KMessageBox::warningContinueCancel( 0,
i18n( "Are you sure you want to delete "
"the task named\n\"%1\" and its entire history?")
- .arg(task->name()),
+ .tqarg(task->name()),
i18n( "Deleting Task"), KStdGuiItem::del());
}
else {
@@ -659,7 +659,7 @@ void TaskView::deleteTask(bool markingascomplete)
i18n( "Are you sure you want to delete the task named"
"\n\"%1\" and its entire history?\n"
"NOTE: all its subtasks and their history will also "
- "be deleted.").arg(task->name()),
+ "be deleted.").tqarg(task->name()),
i18n( "Deleting Task"), KStdGuiItem::del());
}
}
@@ -820,16 +820,16 @@ void TaskView::clipTotals()
i18n("Copy This Task"), i18n("Copy All Tasks") );
if (response == KMessageBox::Yes) // This task only
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
}
else // All tasks
{
- KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime));
}
}
else
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime));
}
}
@@ -844,16 +844,16 @@ void TaskView::clipSession()
i18n("Copy This Task"), i18n("Copy All Tasks") );
if (response == KMessageBox::Yes) // this task only
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
}
else // only task
{
- KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime));
}
}
else
{
- KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
+ KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime));
}
}
@@ -863,7 +863,7 @@ void TaskView::clipHistory()
if (dialog.exec()== TQDialog::Accepted)
{
TimeKard t;
- KApplication::clipboard()->
+ KApplication::tqclipboard()->
setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) );
}
}
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index d7de4840..c5016857 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -62,8 +62,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
retval += cr + cr;
retval += TQString(TQString::tqfromLatin1("%1 %2"))
- .arg(i18n("Time"), timeWidth)
- .arg(i18n("Task"));
+ .tqarg(i18n("Time"), timeWidth)
+ .tqarg(i18n("Task"));
retval += cr;
retval += line;
@@ -92,10 +92,10 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
// total
buf.fill('-', reportWidth);
- retval += TQString(TQString::tqfromLatin1("%1")).arg(buf, timeWidth) + cr;
+ retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr;
retval += TQString(TQString::tqfromLatin1("%1 %2"))
- .arg(formatTime(sum),timeWidth)
- .arg(i18n("Total"));
+ .tqarg(formatTime(sum),timeWidth)
+ .tqarg(i18n("Total"));
}
else
retval += i18n("No tasks.");
@@ -110,8 +110,8 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which)
s += buf.fill(' ', level);
s += TQString(TQString::tqfromLatin1("%1 %2"))
- .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
- .arg(task->name());
+ .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
+ .tqarg(task->name());
s += cr;
for (Task* subTask = task->firstChild();
@@ -136,15 +136,15 @@ void TimeKard::printTaskHistory(const Task *task,
{
TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
- .arg(daykey)
- .arg(task->uid());
+ .tqarg(daykey)
+ .tqarg(task->uid());
if (taskdaytotals.tqcontains(daytaskkey))
{
if ( !totalsOnly )
{
s += TQString::tqfromLatin1("%1")
- .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth);
+ .tqarg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth);
}
sectionsum += taskdaytotals[daytaskkey]; // in seconds
@@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task,
}
// Total for task this section (e.g. week)
- s += TQString::tqfromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth);
+ s += TQString::tqfromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth);
// Task name
TQString buf;
s += buf.fill(' ', level + 1);
- s += TQString::tqfromLatin1("%1").arg(task->name());
+ s += TQString::tqfromLatin1("%1").tqarg(task->name());
s += cr;
for (Task* subTask = task->firstChild();
@@ -223,8 +223,8 @@ TQString TimeKard::sectionHistoryAsText(
{
TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
- .arg(daykey)
- .arg((*event).todoUid());
+ .tqarg(daykey)
+ .tqarg((*event).todoUid());
if (taskdaytotals.tqcontains(daytaskkey))
taskdaytotals.tqreplace(daytaskkey,
@@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText(
// day headings
for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
{
- retval += TQString::tqfromLatin1("%1").arg(day.day(), timeWidth);
+ retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth);
}
retval += cr;
retval += line;
@@ -287,7 +287,7 @@ TQString TimeKard::sectionHistoryAsText(
if ( !totalsOnly )
{
retval += TQString::tqfromLatin1("%1")
- .arg(formatTime(daytotals[daykey]/60), timeWidth);
+ .tqarg(formatTime(daytotals[daykey]/60), timeWidth);
}
sum += daytotals[daykey]; // in seconds
}
@@ -299,8 +299,8 @@ TQString TimeKard::sectionHistoryAsText(
}
retval += TQString::tqfromLatin1("%1 %2")
- .arg(formatTime(sum/60), totalTimeWidth)
- .arg(i18n("Total"));
+ .tqarg(formatTime(sum/60), totalTimeWidth)
+ .tqarg(i18n("Total"));
}
return retval;
}
@@ -313,11 +313,11 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from,
retval += totalsOnly ? i18n("Task Totals") : i18n("Task History");
retval += cr;
retval += i18n("From %1 to %2")
- .arg(KGlobal::locale()->formatDate(from))
- .arg(KGlobal::locale()->formatDate(to));
+ .tqarg(KGlobal::locale()->formatDate(from))
+ .tqarg(KGlobal::locale()->formatDate(to));
retval += cr;
retval += i18n("Printed on: %1")
- .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
+ .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
if ( perWeek )
{
@@ -353,7 +353,7 @@ TQDate Week::end() const
TQString Week::name() const
{
- return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start()));
+ return i18n("Week of %1").tqarg(KGlobal::locale()->formatDate(start()));
}
TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to)
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 3758dd7f..20486b4b 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -59,9 +59,9 @@ KarmTray::KarmTray(MainWindow* tqparent)
// this are experiments/tests
/*
for (int i=0; i<30; i++)
- _tray->insertTitle(i 18n("bla ").arg(i));
+ _tray->insertTitle(i 18n("bla ").tqarg(i));
for (int i=0; i<30; i++)
- _tray->insertTitle2(i 18n("bli ").arg(i));
+ _tray->insertTitle2(i 18n("bli ").tqarg(i));
*/
// experimenting with menus for the tray
/*
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index da6744c8..35c3eb0f 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -3,7 +3,7 @@
*/
/****************************************************************************
- ** Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB. All rights reserved.
+ ** Copyright (C) 2002-2004 Klar�lvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KDGantt library.
**
@@ -73,7 +73,7 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
{
orient = o;
#ifndef TQT_NO_CURSOR
- if ( o == KDGanttMinimizeSplitter::Horizontal )
+ if ( o == Qt::Horizontal )
setCursor( splitHCursor );
else
setCursor( splitVCursor );
@@ -84,7 +84,7 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
{
updateCursor( e->pos() );
- if ( !(e->state()&LeftButton) )
+ if ( !(e->state()&Qt::LeftButton) )
return;
if ( _activeButton != 0)
@@ -104,7 +104,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
{
- if ( e->button() == LeftButton ) {
+ if ( e->button() == Qt::LeftButton ) {
_activeButton = onButton( e->pos() );
mouseOffset = s->pick(e->pos());
if ( _activeButton != 0)
@@ -119,7 +119,7 @@ void KDGanttSplitterHandle::updateCursor( const TQPoint& p)
setCursor( arrowCursor );
}
else {
- if ( orient == KDGanttMinimizeSplitter::Horizontal )
+ if ( orient == Qt::Horizontal )
setCursor( splitHCursor );
else
setCursor( splitVCursor );
@@ -158,7 +158,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
updateCursor( e->pos() );
}
else {
- if ( !opaque() && e->button() == LeftButton ) {
+ if ( !opaque() && e->button() == Qt::LeftButton ) {
TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
- mouseOffset;
s->setRubberband( -1 );
@@ -241,7 +241,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
p.setBrush( tqcolorGroup().background() );
p.setPen( tqcolorGroup().foreground() );
p.drawRect( rect() );
- tqparentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
+ tqparentWidget()->tqstyle().tqdrawPrimitive( 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
@@ -256,13 +256,13 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
if ( index == _activeButton ) {
p.save();
- p.translate( tqparentWidget()->style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
- tqparentWidget()->style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
- p.drawPolygon( *it, true );
+ p.translate( tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+ tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+ p.tqdrawPolygon( *it, true );
p.restore();
}
else {
- p.drawPolygon( *it, true );
+ p.tqdrawPolygon( *it, true );
}
index++;
}
@@ -302,7 +302,7 @@ public:
bool firstShow;
};
-void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, int pos,
int space, int spacer );
#endif // DOXYGEN_SKIP_INTERNAL
@@ -384,7 +384,7 @@ static TQSize minSizeHint( const TQWidget* w )
KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *tqparent, const char *name )
:TQFrame(tqparent,name,WPaintUnclipped)
{
- orient = Horizontal;
+ orient = Qt::Horizontal;
init();
}
@@ -412,7 +412,7 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
void KDGanttMinimizeSplitter::init()
{
data = new TQSplitterData;
- if ( orient == Horizontal )
+ if ( orient == Qt::Horizontal )
tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
else
tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
@@ -424,7 +424,7 @@ void KDGanttMinimizeSplitter::init()
\brief the orientation of the splitter
By default the orientation is horizontal (the widgets are side by side).
- The possible orientations are TQt:Vertical and TQt::Horizontal (the default).
+ The possible orientations are TQt:Vertical and Qt::Horizontal (the default).
*/
void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
{
@@ -432,7 +432,7 @@ void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
return;
orient = o;
- if ( orient == Horizontal )
+ if ( orient == Qt::Horizontal )
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
else
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
@@ -561,8 +561,8 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
paint.setRasterOp( XorROP );
TQRect r = contentsRect();
const int rBord = 3; //Themable????
- int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
- if ( orient == Horizontal ) {
+ int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
+ if ( orient == Qt::Horizontal ) {
if ( opaqueOldPos >= 0 )
paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
2*rBord, r.height() );
@@ -601,8 +601,8 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h )
{
- style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(),
- (orientation() == TQt::Horizontal ?
+ tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(),
+ (orientation() == Qt::Horizontal ?
TQStyle::Style_Horizontal : 0));
}
@@ -644,9 +644,9 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id )
p = adjustPos( p, id );
TQSplitterLayoutStruct *s = data->list.at(id);
- int oldP = orient == Horizontal ? s->wid->x() : s->wid->y();
+ int oldP = orient == Qt::Horizontal ? s->wid->x() : s->wid->y();
bool upLeft;
- if ( TQApplication::reverseLayout() && orient == Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
p += s->wid->width();
upLeft = p > oldP;
} else
@@ -661,8 +661,8 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id )
void KDGanttMinimizeSplitter::setG( TQWidget *w, int p, int s, bool isSplitter )
{
- if ( orient == Horizontal ) {
- if ( TQApplication::reverseLayout() && orient == Horizontal && !isSplitter )
+ if ( orient == Qt::Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient == Qt::Horizontal && !isSplitter )
p = contentsRect().width() - p - s;
w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
} else
@@ -688,7 +688,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
} else if ( s->isSplitter ) {
int pos1, pos2;
int dd = s->sizer;
- if( TQApplication::reverseLayout() && orient == Horizontal ) {
+ if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
pos1 = pos;
pos2 = pos + dd;
} else {
@@ -704,7 +704,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
}
} else {
int dd, newLeft, nextPos;
- if( TQApplication::reverseLayout() && orient == Horizontal ) {
+ if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
dd = w->tqgeometry().right() - pos;
dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
newLeft = pos+1;
@@ -741,7 +741,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
} else if ( s->isSplitter ) {
int dd = s->sizer;
int pos1, pos2;
- if( TQApplication::reverseLayout() && orient == Horizontal ) {
+ if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
pos2 = pos - dd;
pos1 = pos2 + 1;
} else {
@@ -758,7 +758,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
} else {
int left = pick( w->pos() );
int right, dd,/* newRight,*/ newLeft, nextPos;
- if ( TQApplication::reverseLayout() && orient == Horizontal ) {
+ if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
dd = pos - left + 1;
dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->tqmaximumSize())));
newLeft = pos-dd+1;
@@ -836,8 +836,8 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
}
}
TQRect r = contentsRect();
- if ( orient == Horizontal && TQApplication::reverseLayout() ) {
- int splitterWidth = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
+ if ( orient == Qt::Horizontal && TQApplication::reverseLayout() ) {
+ int splitterWidth = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
if ( min )
*min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth;
if ( max )
@@ -873,7 +873,7 @@ void KDGanttMinimizeSplitter::doResize()
TQRect r = contentsRect();
int i;
int n = data->list.count();
- TQMemArray<QLayoutStruct> a( n );
+ TQMemArray<TQLayoutStruct> a( n );
for ( i = 0; i< n; i++ ) {
a[i].init();
TQSplitterLayoutStruct *s = data->list.at(i);
@@ -975,7 +975,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
if ( maxt < mint )
maxt = mint;
- if ( orient == Horizontal ) {
+ if ( orient == Qt::Horizontal ) {
setMaximumSize( maxl, maxt );
setMinimumSize( minl, mint );
} else {
@@ -1110,9 +1110,9 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const
constPolish();
int l = 0;
int t = 0;
- if ( tqchildren() ) {
- const TQObjectList * c = tqchildren();
- TQObjectListIt it( *c );
+ if ( !childrenListObject().isEmpty() ) {
+ const TQObjectList c = childrenListObject();
+ TQObjectListIt it( c );
TQObject * o;
while( (o=it.current()) != 0 ) {
@@ -1127,7 +1127,7 @@ TQSize KDGanttMinimizeSplitter::tqsizeHint() const
}
}
}
- return orientation() == Horizontal ? TQSize( l, t ) : TQSize( t, l );
+ return orientation() == Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l );
}
@@ -1140,9 +1140,9 @@ TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
constPolish();
int l = 0;
int t = 0;
- if ( tqchildren() ) {
- const TQObjectList * c = tqchildren();
- TQObjectListIt it( *c );
+ if ( !childrenListObject().isEmpty() ) {
+ const TQObjectList c = childrenListObject();
+ TQObjectListIt it( c );
TQObject * o;
while( (o=it.current()) != 0 ) {
@@ -1157,7 +1157,7 @@ TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
}
}
}
- return orientation() == Horizontal ? TQSize( l, t ) : TQSize( t, l );
+ return orientation() == Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l );
}
@@ -1309,7 +1309,7 @@ void KDGanttMinimizeSplitter::processChildEvents()
void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
{
- int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
+ int sw = tqstyle().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
TQSplitterLayoutStruct *s = data->list.first();
while ( s ) {
if ( s->isSplitter )
@@ -1348,7 +1348,7 @@ static inline int toFixed( int i ) { return i * 256; }
static inline int fRound( int i ) {
return ( i % 256 < 128 ) ? i / 256 : 1 + i / 256;
}
-void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, int pos,
int space, int spacer )
{
typedef int fixed;
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 86b5340d..9137da06 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -3,7 +3,7 @@
*/
/****************************************************************************
- ** Copyright (C) 2001-2004 Klarälvdalens Datakonsult AB. All rights reserved.
+ ** Copyright (C) 2001-2004 Klar�lvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KDGantt library.
**
@@ -106,14 +106,14 @@ private:
void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE );
TQCOORD pick( const TQPoint &p ) const
- { return orient == Horizontal ? p.x() : p.y(); }
+ { return orient == Qt::Horizontal ? p.x() : p.y(); }
TQCOORD pick( const TQSize &s ) const
- { return orient == Horizontal ? s.width() : s.height(); }
+ { return orient == Qt::Horizontal ? s.width() : s.height(); }
TQCOORD trans( const TQPoint &p ) const
- { return orient == Vertical ? p.x() : p.y(); }
+ { return orient == Qt::Vertical ? p.x() : p.y(); }
TQCOORD trans( const TQSize &s ) const
- { return orient == Vertical ? s.width() : s.height(); }
+ { return orient == Qt::Vertical ? s.width() : s.height(); }
TQSplitterData *data;
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index e6258e90..08c1a004 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -3,7 +3,7 @@
*/
/****************************************************************************
- ** Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB. All rights reserved.
+ ** Copyright (C) 2002-2004 Klar�lvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KDGantt library.
**
@@ -65,7 +65,7 @@
KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent,
const char* name ) :
- KDGanttSizingControl( tqparent, name ), _orient( Horizontal ),
+ KDGanttSizingControl( tqparent, name ), _orient( Qt::Horizontal ),
_arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0)
{
init();
@@ -262,12 +262,12 @@ void KDGanttSemiSizingControl::setup()
delete _tqlayout;
TQBoxLayout* butLayout; // _tqlayout will delete me
- if ( _orient == Horizontal || isMinimized() )
+ if ( _orient == Qt::Horizontal || isMinimized() )
_tqlayout = new TQHBoxLayout( this );
else
_tqlayout = new TQVBoxLayout( this );
- if ( _orient == Vertical && !isMinimized() )
+ if ( _orient == Qt::Vertical && !isMinimized() )
butLayout = new TQHBoxLayout( _tqlayout );
else
butLayout = new TQVBoxLayout( _tqlayout );
@@ -288,7 +288,7 @@ void KDGanttSemiSizingControl::setup()
}
//------------------------------ Setup the button at the correct possition
- if ( _arrowPos == After && _orient == Vertical && !isMinimized() ) {
+ if ( _arrowPos == After && _orient == Qt::Vertical && !isMinimized() ) {
butLayout->addStretch( 1 );
butLayout->addWidget( _but, 0, TQt::AlignLeft );
}
@@ -305,7 +305,7 @@ void KDGanttSemiSizingControl::setup()
else
widget = _maximizedWidget;
if( widget ) {
- if ( _arrowPos == Before || _orient == Vertical && !isMinimized() )
+ if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() )
_tqlayout->addWidget( widget, 1 );
else
_tqlayout->insertWidget( 0, widget, 1 );
@@ -318,20 +318,20 @@ void KDGanttSemiSizingControl::setup()
if ( isMinimized() ) {
widget = _minimizedWidget;
if( widget ) {
- if ( _arrowPos == Before || _orient == Vertical && !isMinimized() )
+ if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() )
_tqlayout->addWidget( widget, 1 );
else
_tqlayout->insertWidget( 0, widget, 1 );
}
}
else {
- if ( _arrowPos == Before || _orient == Vertical && !isMinimized() )
+ if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() )
_tqlayout->addStretch( 1 );
else
_tqlayout->insertStretch( 0, 1 );
widget = _maximizedWidget;
// the following is only the special case
- // arrowPos == Before and _orient == Vertical
+ // arrowPos == Before and _orient == Qt::Vertical
//widget->move( 0+x(), _but->height()+y());
}
}
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index f7eeeacd..1c2667b3 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -81,7 +81,7 @@
*/
KDGanttView::KDGanttView( TQWidget* tqparent, const char* name )
- : KDGanttMinimizeSplitter( TQt::Vertical, tqparent, name ),
+ : KDGanttMinimizeSplitter( Qt::Vertical, tqparent, name ),
myCanvasView(0),
myTimeHeaderScroll(0),
mFixedHorizon( false )
@@ -458,11 +458,11 @@ void KDGanttView::slotmouseButtonClicked ( int button, TQListViewItem * item,
//emit mouseButtonClicked ( button , gItem, pos, c );
{
switch ( button ) {
- case LeftButton:
+ case Qt::LeftButton:
emit lvItemLeftClicked( gItem );
emit itemLeftClicked( gItem );
break;
- case MidButton:
+ case Qt::MidButton:
emit lvItemMidClicked( gItem );
emit itemMidClicked( gItem );
break;
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index eff5c26e..9c9c1e98 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -916,10 +916,10 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
// items which don't have any tqshapes
return;
}
- item->setBrush(TQt::SolidPattern);
+ item->setBrush(Qt::SolidPattern);
item->setZ(5);
itemShape = (KDCanvasPolygonItem*) item;
- itemBack->setBrush(TQt::SolidPattern);
+ itemBack->setBrush(Qt::SolidPattern);
itemBack->setZ(3);
itemShapeBack = (KDCanvasPolygonItem*) itemBack;
@@ -1306,11 +1306,11 @@ void KDGanttViewItem::updateCanvasItems()
if (blockUpdating) return;
TQPen p,pBack;
TQBrush b;
- b.setStyle(TQt::SolidPattern);
+ b.setStyle(Qt::SolidPattern);
if ( enabled() ) {
textCanvas->setColor(myTextColor);
if (isHighlighted) {
- b.setStyle(TQt::SolidPattern);
+ b.setStyle(Qt::SolidPattern);
b.setColor(myStartColorHL);
startShape->setBrush(b);
b.setColor(myMiddleColorHL);
@@ -1323,7 +1323,7 @@ void KDGanttViewItem::updateCanvasItems()
p.setColor(myEndColorHL);
endLine->setPen(p);
} else {
- b.setStyle(TQt::SolidPattern);
+ b.setStyle(Qt::SolidPattern);
b.setColor(myStartColor);
// qDebug("update color %s %s", listViewText().latin1(),myStartColor.name().latin1() );
startShape->setBrush(b);
@@ -1341,7 +1341,7 @@ void KDGanttViewItem::updateCanvasItems()
//TQColor discol = TQt::lightGray;
TQColor discol = TQColor(232,232,232);
textCanvas->setColor( TQColor(150,150,150) );
- b.setStyle(TQt::SolidPattern);
+ b.setStyle(Qt::SolidPattern);
b.setColor(discol);
startShape->setBrush(b);
midShape->setBrush(b);
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 197ba18b..88591e88 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -59,13 +59,13 @@
#include <kdebug.h>
KDTimeTableWidget:: KDTimeTableWidget( TQWidget* tqparent,KDGanttView* myGantt)
- : TQCanvas (tqparent)
+ : TQCanvas (TQT_TQOBJECT(tqparent))
{
myGanttView = myGantt;
taskLinksVisible = true;
flag_blockUpdating = false;
int_blockUpdating = 0;
- gridPen.setStyle(TQt::DotLine);
+ gridPen.setStyle(Qt::DotLine);
gridPen.setColor(TQColor(100,100,100));
maximumComputedGridHeight = 0;
denseLineCount = 0;
@@ -229,8 +229,8 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPoints(i+(cw/2),0,i+(cw/2),h);
*/
- itcol.current()->setPen( TQPen::NoPen );
- itcol.current()->setBrush( TQBrush( colcol, SolidPattern) );
+ itcol.current()->setPen( TQPen(TQPen::NoPen) );
+ itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
itcol.current()->setSize(cw ,h );
itcol.current()->move( i, 0 );
itcol.current()->show();
@@ -243,8 +243,8 @@ void KDTimeTableWidget::computeVerticalGrid()
templine->setPoints(i+(cw/2),0,i+(cw/2),h);
*/
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
- temprect->setPen( TQPen::NoPen );
- temprect->setBrush( TQBrush( colcol, SolidPattern) );
+ temprect->setPen( TQPen(TQPen::NoPen) );
+ temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
temprect->setSize(cw ,h );
temprect->move( i, 0 );
temprect->setZ(-20);
@@ -275,16 +275,16 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPen(colPen);
itcol.current()->setPoints(i+(cw/2),0,i+(cw/2),h);
*/
- itcol.current()->setPen( TQPen::NoPen );
- itcol.current()->setBrush( TQBrush( colcol, SolidPattern) );
+ itcol.current()->setPen( TQPen(TQPen::NoPen) );
+ itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
itcol.current()->setSize(cw ,h );
itcol.current()->move( i, 0 );
itcol.current()->show();
++itcol;
} else {
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
- temprect->setPen( TQPen::NoPen );
- temprect->setBrush( TQBrush( colcol, SolidPattern) );
+ temprect->setPen( TQPen(TQPen::NoPen) );
+ temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
temprect->setSize(cw ,h );
temprect->move( i, 0 );
temprect->setZ(-20);
@@ -331,16 +331,16 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPen(colPen);
itcol.current()->setPoints(i+mid,0,mid,h);
*/
- itcol.current()->setPen( TQPen::NoPen );
- itcol.current()->setBrush( TQBrush( colcol, SolidPattern) );
+ itcol.current()->setPen( TQPen(TQPen::NoPen) );
+ itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
itcol.current()->setSize(mid ,h );
itcol.current()->move( left, 0 );
itcol.current()->show();
++itcol;
} else {
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
- temprect->setPen( TQPen::NoPen );
- temprect->setBrush( TQBrush( colcol, SolidPattern) );
+ temprect->setPen( TQPen(TQPen::NoPen) );
+ temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
temprect->setSize(mid,h );
temprect->move( left, 0 );
temprect->setZ(-20);
@@ -385,16 +385,16 @@ void KDTimeTableWidget::computeVerticalGrid()
itcol.current()->setPen(colPen);
itcol.current()->setPoints(i+mid,0,mid,h);
*/
- itcol.current()->setPen( TQPen::NoPen );
- itcol.current()->setBrush( TQBrush( colcol, SolidPattern) );
+ itcol.current()->setPen( TQPen(TQPen::NoPen) );
+ itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) );
itcol.current()->setSize(mid ,h );
itcol.current()->move( left, 0 );
itcol.current()->show();
++itcol;
} else {
temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem);
- temprect->setPen( TQPen::NoPen );
- temprect->setBrush( TQBrush( colcol, SolidPattern) );
+ temprect->setPen( TQPen(TQPen::NoPen) );
+ temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) );
temprect->setSize(mid ,h );
temprect->move( left, 0 );
temprect->setZ(-20);
@@ -792,7 +792,7 @@ void KDTimeHeaderWidget::preparePopupMenu()
if (flagZoomToFit)
myPopupMenu->changeItem( 1, i18n("Zoom (Fit)"));
else
- myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) );
+ myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( TQString::number( zoomFactor(), 'f',3) ) );
int i = 0;
int id;
while ( ( id = scalePopupMenu->idAt( i++ )) >= 0 ) {
@@ -2447,16 +2447,16 @@ void KDTimeHeaderWidget::mousePressEvent ( TQMouseEvent * e )
{
mouseDown = false;
switch ( e->button() ) {
- case LeftButton:
+ case Qt::LeftButton:
mouseDown = true;
beginMouseDown = e->pos().x();
endMouseDown = e->pos().x();
break;
- case RightButton:
+ case Qt::RightButton:
if (flagShowPopupMenu)
myPopupMenu->popup(e->globalPos());
break;
- case MidButton:
+ case Qt::MidButton:
break;
default:
break;
@@ -2539,7 +2539,7 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
***************************************************************** */
KDLegendWidget:: KDLegendWidget( TQWidget* tqparent,
KDGanttMinimizeSplitter* legendParent ) :
- KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Vertical,
+ KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Qt::Vertical,
tqparent)
{
myLegendParent = legendParent;
@@ -2645,9 +2645,9 @@ void KDLegendWidget::clearLegend ( )
{
if ( myLegend ) delete myLegend;
if ( dock )
- myLegend = new TQGroupBox( 1, TQt::Horizontal, scroll->viewport() );
+ myLegend = new TQGroupBox( 1, Qt::Horizontal, scroll->viewport() );
else
- myLegend = new TQGroupBox( 1, TQt::Horizontal, i18n( "Legend" ), scroll->viewport() );
+ myLegend = new TQGroupBox( 1, Qt::Horizontal, i18n( "Legend" ), scroll->viewport() );
myLegend->setBackgroundColor( TQt::white );
myLegend->setFont( font() );
scroll->addChild( myLegend );
@@ -2884,7 +2884,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
c = fc;
// draw to last interesting column
- const TQColorGroup &cg = ( palette().inactive() );
+ const TQColorGroup &cg = ( tqpalette().inactive() );
while ( c < lc && !drawables.isEmpty() ) {
int i = header()->mapToLogical( c );
@@ -3516,7 +3516,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
currentItem = 0;
movingItem = 0;
mouseDown = true;
- if (e->button() == RightButton && mySignalSender->editable()) {
+ if (e->button() == Qt::RightButton && mySignalSender->editable()) {
lastClickedItem = (KDGanttViewItem*) mySignalSender->myListView->itemAt( TQPoint(2,e->pos().y()));
if ( lastClickedItem ) {
if ( lastClickedItem->displaySubitemsAsGroup() && ! lastClickedItem->isOpen() ) {
@@ -3537,7 +3537,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
TQCanvasItemList::Iterator it;
for ( it = il.begin(); it != il.end(); ++it ) {
switch ( e->button() ) {
- case LeftButton:
+ case Qt::LeftButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
currentItem = getItem(*it);
@@ -3590,7 +3590,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
break;
}
break;
- case RightButton:
+ case Qt::RightButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
currentItem = getItem(*it);
@@ -3602,7 +3602,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
break;
}
break;
- case MidButton:
+ case Qt::MidButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
currentItem = getItem(*it);
@@ -3618,10 +3618,10 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
break;
}
}
- if (e->button() == RightButton ) {
+ if (e->button() == Qt::RightButton ) {
mySignalSender->gvContextMenuRequested( currentItem, e->globalPos() );
}
- if (autoScrollEnabled && e->button() == LeftButton) {
+ if (autoScrollEnabled && e->button() == Qt::LeftButton) {
myScrollTimer->start(50);
}
}
@@ -3643,7 +3643,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e )
// if ( currentLink || currentItem )
{
switch ( e->button() ) {
- case LeftButton:
+ case Qt::LeftButton:
myScrollTimer->stop();
{
mySignalSender->itemLeftClicked( currentItem );
@@ -3675,7 +3675,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e )
movingGVItem = 0;
}
break;
- case RightButton:
+ case Qt::RightButton:
{
mySignalSender->itemRightClicked( currentItem );
mySignalSender->gvItemRightClicked( currentItem );
@@ -3684,7 +3684,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e )
if ( currentLink )
mySignalSender->taskLinkRightClicked( currentLink );
break;
- case MidButton:
+ case Qt::MidButton:
{
mySignalSender->itemMidClicked( currentItem );
mySignalSender->gvItemMidClicked( currentItem );
@@ -3713,7 +3713,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
{
TQCanvasItemList il = canvas() ->collisions ( e->pos() );
- if ( il.isEmpty() && e->button() == LeftButton ) {
+ if ( il.isEmpty() && e->button() == Qt::LeftButton ) {
//not directly sending a signal here (encapsulation and whatnot)
mySignalSender->emptySpaceDoubleClicked(e);
return;
@@ -3722,7 +3722,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
TQCanvasItemList::Iterator it;
for ( it = il.begin(); it != il.end(); ++it ) {
switch ( e->button() ) {
- case LeftButton:
+ case Qt::LeftButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
if ( getItem(*it)->enabled() )
@@ -3739,7 +3739,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
}
break;
/*
- case RightButton:
+ case Qt::RightButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
mySignalSender->itemRightClicked(getItem(*it));
@@ -3751,7 +3751,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
break;
}
break;
- case MidButton:
+ case Qt::MidButton:
switch (getType(*it)) {
case Type_is_KDGanttViewItem:
mySignalSender->itemMidClicked(getItem(*it));
@@ -4024,8 +4024,8 @@ void KDIntervalColorRectangle::tqlayout( KDTimeHeaderWidget* timeHeader, int hei
int right = timeHeader->getCoordX(mEnd);
if ( right == left )
++right;
- setPen( TQPen::NoPen );
- setBrush( TQBrush(mColor, SolidPattern) );
+ setPen( TQPen(TQPen::NoPen) );
+ setBrush( TQBrush(mColor, Qt::SolidPattern) );
setSize( right - left, height );
move( left, 0 );
show();
diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp
index 4d21073e..d0aa9bd0 100644
--- a/kdgantt/KDGanttViewTaskLink.cpp
+++ b/kdgantt/KDGanttViewTaskLink.cpp
@@ -3,7 +3,7 @@
KDGantt - a multi-platform charting engine
*/
/****************************************************************************
- ** Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB. All rights reserved.
+ ** Copyright (C) 2002-2004 Klar�lvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KDGantt library.
**
@@ -268,7 +268,7 @@ void KDGanttViewTaskLink::showMe( bool visible )
TQPen p;
TQBrush b;
p.setWidth(wid);
- b.setStyle(TQt::SolidPattern);
+ b.setStyle(Qt::SolidPattern);
if (ishighlighted) {
b.setColor(myColorHL);
p.setColor(myColorHL);
@@ -333,7 +333,7 @@ void KDGanttViewTaskLink::showMeType( bool visible )
TQPen p;
TQBrush b;
p.setWidth(wid);
- b.setStyle(TQt::SolidPattern);
+ b.setStyle(Qt::SolidPattern);
if (ishighlighted) {
b.setColor(myColorHL);
p.setColor(myColorHL);
diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp
index 248829d3..e6246138 100644
--- a/kdgantt/KDGanttXMLTools.cpp
+++ b/kdgantt/KDGanttXMLTools.cpp
@@ -4,7 +4,7 @@
*/
/****************************************************************************
- ** Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB. All rights reserved.
+ ** Copyright (C) 2002-2004 Klar�lvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KDGantt library.
**
@@ -266,20 +266,20 @@ void createTimeNode( TQDomDocument& doc, TQDomNode& tqparent,
}
-TQString penStyleToString( TQt::PenStyle style )
+TQString penStyleToString( Qt::PenStyle style )
{
switch( style ) {
- case TQt::NoPen:
+ case Qt::NoPen:
return "NoPen";
- case TQt::SolidLine:
+ case Qt::SolidLine:
return "SolidLine";
- case TQt::DashLine:
+ case Qt::DashLine:
return "DashLine";
- case TQt::DotLine:
+ case Qt::DotLine:
return "DotLine";
- case TQt::DashDotLine:
+ case Qt::DashDotLine:
return "DashDotLine";
- case TQt::DashDotDotLine:
+ case Qt::DashDotDotLine:
return "DashDotDotLine";
default: // should not happen
return "SolidLine";
@@ -288,39 +288,39 @@ TQString penStyleToString( TQt::PenStyle style )
-TQString brushStyleToString( TQt::BrushStyle style )
+TQString brushStyleToString( Qt::BrushStyle style )
{
// PENDING(kalle) Support custom patterns
switch( style ) {
- case TQt::NoBrush:
+ case Qt::NoBrush:
return "NoBrush";
- case TQt::SolidPattern:
+ case Qt::SolidPattern:
return "SolidPattern";
- case TQt::Dense1Pattern:
+ case Qt::Dense1Pattern:
return "Dense1Pattern";
- case TQt::Dense2Pattern:
+ case Qt::Dense2Pattern:
return "Dense2Pattern";
- case TQt::Dense3Pattern:
+ case Qt::Dense3Pattern:
return "Dense3Pattern";
- case TQt::Dense4Pattern:
+ case Qt::Dense4Pattern:
return "Dense4Pattern";
- case TQt::Dense5Pattern:
+ case Qt::Dense5Pattern:
return "Dense5Pattern";
- case TQt::Dense6Pattern:
+ case Qt::Dense6Pattern:
return "Dense6Pattern";
- case TQt::Dense7Pattern:
+ case Qt::Dense7Pattern:
return "Dense7Pattern";
- case TQt::HorPattern:
+ case Qt::HorPattern:
return "HorPattern";
- case TQt::VerPattern:
+ case Qt::VerPattern:
return "VerPattern";
- case TQt::CrossPattern:
+ case Qt::CrossPattern:
return "CrossPattern";
- case TQt::BDiagPattern:
+ case Qt::BDiagPattern:
return "BDiagPattern";
- case TQt::FDiagPattern:
+ case Qt::FDiagPattern:
return "FDiagPattern";
- case TQt::DiagCrossPattern:
+ case Qt::DiagCrossPattern:
return "DiagCrossPattern";
default: // should not happen (but can for a custom pattern)
return "SolidPattern";
@@ -399,7 +399,7 @@ bool readBrushNode( const TQDomElement& element, TQBrush& brush )
{
bool ok = true;
TQColor tempColor;
- TQt::BrushStyle tempStyle;
+ Qt::BrushStyle tempStyle;
TQPixmap tempPixmap;
TQDomNode node = element.firstChild();
while( !node.isNull() ) {
@@ -506,7 +506,7 @@ bool readPenNode( const TQDomElement& element, TQPen& pen )
bool ok = true;
int tempWidth;
TQColor tempColor;
- TQt::PenStyle tempStyle;
+ Qt::PenStyle tempStyle;
TQDomNode node = element.firstChild();
while( !node.isNull() ) {
TQDomElement element = node.toElement();
@@ -705,60 +705,60 @@ bool readTimeNode( const TQDomElement& element, TQTime& value )
-TQt::PenStyle stringToPenStyle( const TQString& style )
+Qt::PenStyle stringToPenStyle( const TQString& style )
{
if( style == "NoPen" )
- return TQt::NoPen;
+ return Qt::NoPen;
else if( style == "SolidLine" )
- return TQt::SolidLine;
+ return Qt::SolidLine;
else if( style == "DashLine" )
- return TQt::DashLine;
+ return Qt::DashLine;
else if( style == "DotLine" )
- return TQt::DotLine;
+ return Qt::DotLine;
else if( style == "DashDotLine" )
- return TQt::DashDotLine;
+ return Qt::DashDotLine;
else if( style == "DashDotDotLine" )
- return TQt::DashDotDotLine;
+ return Qt::DashDotDotLine;
else // should not happen
- return TQt::SolidLine;
+ return Qt::SolidLine;
}
-TQt::BrushStyle stringToBrushStyle( const TQString& style )
+Qt::BrushStyle stringToBrushStyle( const TQString& style )
{
// PENDING(kalle) Support custom patterns
if( style == "NoBrush" )
- return TQt::NoBrush;
+ return Qt::NoBrush;
else if( style == "SolidPattern" )
- return TQt::SolidPattern;
+ return Qt::SolidPattern;
else if( style == "Dense1Pattern" )
- return TQt::Dense1Pattern;
+ return Qt::Dense1Pattern;
else if( style == "Dense2Pattern" )
- return TQt::Dense2Pattern;
+ return Qt::Dense2Pattern;
else if( style == "Dense3Pattern" )
- return TQt::Dense3Pattern;
+ return Qt::Dense3Pattern;
else if( style == "Dense4Pattern" )
- return TQt::Dense4Pattern;
+ return Qt::Dense4Pattern;
else if( style == "Dense5Pattern" )
- return TQt::Dense5Pattern;
+ return Qt::Dense5Pattern;
else if( style == "Dense6Pattern" )
- return TQt::Dense6Pattern;
+ return Qt::Dense6Pattern;
else if( style == "Dense7Pattern" )
- return TQt::Dense7Pattern;
+ return Qt::Dense7Pattern;
else if( style == "HorPattern" )
- return TQt::HorPattern;
+ return Qt::HorPattern;
else if( style == "VerPattern" )
- return TQt::VerPattern;
+ return Qt::VerPattern;
else if( style == "CrossPattern" )
- return TQt::CrossPattern;
+ return Qt::CrossPattern;
else if( style == "BDiagPattern" )
- return TQt::BDiagPattern;
+ return Qt::BDiagPattern;
else if( style == "FDiagPattern" )
- return TQt::FDiagPattern;
+ return Qt::FDiagPattern;
else if( style == "DiagCrossPattern" )
- return TQt::DiagCrossPattern;
+ return Qt::DiagCrossPattern;
else // should not happen (but can with custom patterns)
- return TQt::SolidPattern;
+ return Qt::SolidPattern;
}
}
diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h
index 4d316f8b..8ea81f46 100644
--- a/kdgantt/KDGanttXMLTools.h
+++ b/kdgantt/KDGanttXMLTools.h
@@ -4,7 +4,7 @@
*/
/****************************************************************************
- ** Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB. All rights reserved.
+ ** Copyright (C) 2002-2004 Klar�lvdalens Datakonsult AB. All rights reserved.
**
** This file is part of the KDGantt library.
**
@@ -45,10 +45,10 @@
#include <tqdatetime.h>
namespace KDGanttXML {
- TQString penStyleToString( TQt::PenStyle style );
- TQt::PenStyle stringToPenStyle( const TQString& style );
- TQString brushStyleToString( TQt::BrushStyle style );
- TQt::BrushStyle stringToBrushStyle( const TQString& style );
+ TQString penStyleToString( Qt::PenStyle style );
+ Qt::PenStyle stringToPenStyle( const TQString& style );
+ TQString brushStyleToString( Qt::BrushStyle style );
+ Qt::BrushStyle stringToBrushStyle( const TQString& style );
void createBoolNode( TQDomDocument& doc, TQDomNode& tqparent,
const TQString& elementName, bool value );
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp
index 84b29696..6edc1655 100644
--- a/kfile-plugins/vcf/kfile_vcf.cpp
+++ b/kfile-plugins/vcf/kfile_vcf.cpp
@@ -58,7 +58,7 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
if (!file.open(IO_ReadOnly))
{
- kdDebug(7034) << "Couldn't open " << TQFile::encodeName(info.path()) << endl;
+ kdDebug(7034) << "Couldn't open " << TQString(TQFile::encodeName(info.path())) << endl;
return false;
}
diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp
index 7939d49c..35af0c7a 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/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp
index dc931499..f85fea6b 100644
--- a/kgantt/kgantt/xQGanttBarView.cpp
+++ b/kgantt/kgantt/xQGanttBarView.cpp
@@ -100,7 +100,7 @@ xQGanttBarView::drawHeader()
TQDate t = startDate.addDays(-startDate.dayOfWeek()+1);
- tmp = _toplevelitem->getStart().secsTo(t)/60;
+ tmp = _toplevelitem->getStart().secsTo(TQDateTime(t))/60;
a = _viewport->screenX(tmp) - contentsX();
p.fillRect(a, top, (int) (5. * dayWidth), height, TQBrush(TQColor(240,240,240)));
@@ -110,7 +110,7 @@ xQGanttBarView::drawHeader()
t = startDate.addDays(-startDate.day()+1);
- tmp = _toplevelitem->getStart().secsTo(t)/60;
+ tmp = _toplevelitem->getStart().secsTo(TQDateTime(t))/60;
a = _viewport->screenX(tmp) - contentsX();
e = t.daysInMonth();
@@ -124,7 +124,7 @@ xQGanttBarView::drawHeader()
// draw snapgrid for first month
- tmp = _toplevelitem->getStart().secsTo(startDate)/60;
+ tmp = _toplevelitem->getStart().secsTo(TQDateTime(startDate))/60;
a = _viewport->screenX(tmp) - contentsX()+1;
double dx = (double)
((_viewport->screenX(_viewport->_snapgrid*1000) - _viewport->screenX(0))/1000.);
@@ -143,7 +143,7 @@ xQGanttBarView::drawHeader()
for(int i=0; i<end; i++, t = t.addDays(1) ) {
- tmp = _toplevelitem->getStart().secsTo(t)/60;
+ tmp = _toplevelitem->getStart().secsTo(TQDateTime(t))/60;
a = _viewport->screenX(tmp) - contentsX();
p.setPen( TQPen(TQColor(black)) );
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index c1dc60d6..005ca596 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -88,7 +88,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
recalc(); adjustSize();
- setFocusPolicy(TQWidget::StrongFocus);
+ setFocusPolicy(Qt::StrongFocus);
_mode = Init;
}
@@ -117,7 +117,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
_toolbar->insertButton("ganttSelect.png", 0,
TQT_SIGNAL(clicked()),
- this, TQT_SLOT(setSelect()),
+ TQT_TQOBJECT(this), TQT_SLOT(setSelect()),
true, i18n("Select") );
KPopupMenu *selectMenu = new KPopupMenu(_toolbar);
@@ -128,7 +128,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
*/
TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", KIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelecttask.png not found !\n");
- selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) );
+ selectMenu->insertItem(pix, i18n("Select All"), TQT_TQOBJECT(this), TQT_SLOT(selectAll()) );
/*
@@ -136,7 +136,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
*/
pix = _iconloader->loadIcon("ganttUnselecttask", KIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttUnselecttask.png not found !\n");
- selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) );
+ selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) );
KToolBarButton* b = _toolbar->getButton(0);
@@ -145,30 +145,30 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
_toolbar->insertButton("viewmag.png", 1,
TQT_SIGNAL(clicked()),
- this, TQT_SLOT(setZoom()),
+ TQT_TQOBJECT(this), TQT_SLOT(setZoom()),
true, i18n("Zoom") );
KPopupMenu* zoomMenu = new KPopupMenu(_toolbar);
pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag.png not found !\n");
- zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) );
+ zoomMenu->insertItem(pix, i18n("Zoom All"), TQT_TQOBJECT(this), TQT_SLOT(zoomAll()) );
zoomMenu->insertSeparator();
pix = _iconloader->loadIcon("viewmag+.png", KIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag+.png not found !\n");
- zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) );
+ zoomMenu->insertItem(pix, i18n("Zoom In +"), TQT_TQOBJECT(this), TQT_SLOT(zoomIn()) );
pix = _iconloader->loadIcon("viewmag-.png", KIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag-.png not found !\n");
- zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) );
+ zoomMenu->insertItem(pix, i18n("Zoom Out -"), TQT_TQOBJECT(this), TQT_SLOT(zoomOut()) );
b = _toolbar->getButton(1);
b->setDelayedPopup(zoomMenu);
_toolbar->insertButton("move.png", 2,
TQT_SIGNAL(clicked()),
- this, TQT_SLOT(setMove()),
+ TQT_TQOBJECT(this), TQT_SLOT(setMove()),
true, i18n("Move") );
return _toolbar;
@@ -338,7 +338,7 @@ xQGanttBarViewPort::drawGrid(TQPainter* p, int x1, int y1, int x2, int y2)
for(ptrDate = _holidays.first(); ptrDate != 0; ptrDate = _holidays.next() ) {
if(*ptrDate > cmp) {
- tmp = _toplevelitem->getStart().secsTo(*ptrDate)/60;
+ tmp = _toplevelitem->getStart().secsTo(TQDateTime(*ptrDate))/60;
a = screenX( tmp );
p->fillRect( a, y1, w, y2, _hol );
}
@@ -350,7 +350,7 @@ xQGanttBarViewPort::drawGrid(TQPainter* p, int x1, int y1, int x2, int y2)
for(int i=0; i<=end; i++, start = start.addDays(1) ) {
int dayOfWeek = start.dayOfWeek();
- tmp = _toplevelitem->getStart().secsTo(start)/60;
+ tmp = _toplevelitem->getStart().secsTo(TQDateTime(start))/60;
a = screenX( tmp );
// draw saturday
@@ -674,7 +674,7 @@ xQGanttBarViewPort::drawHeader(TQPainter* p, int /*x1*/, int /*y1*/, int /*x2*/,
for(int i=0; i<=end; i++, t = t.addDays(1) ) {
- tmp = itemstart.secsTo(t)/60;
+ tmp = itemstart.secsTo(TQDateTime(t))/60;
a = screenX( tmp );
if(t.dayOfWeek() == 1) {
diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
index be6d38b5..d7542d1c 100644
--- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp
@@ -43,7 +43,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
_itemTextEdit->hide();
// right mousebutton & control -> popup menu
- if(e->button() == RightButton && e->state() == ControlButton ) {
+ if(e->button() == Qt::RightButton && e->state() == ControlButton ) {
_menu->popup(e->globalPos());
return;
}
@@ -64,7 +64,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
/*
* edit text
*/
- if(e->button() == MidButton && _mode == Select) {
+ if(e->button() == Qt::MidButton && _mode == Select) {
xTQTaskPosition* tp = _gItemList.tqfind(_currentItem);
TQPainter p(this);
@@ -91,7 +91,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e)
/*
* open/close item, move start, end, item
*/
- if(e->button() == LeftButton && _mode == Select) {
+ if(e->button() == Qt::LeftButton && _mode == Select) {
_timediff = 0;
@@ -210,21 +210,21 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e)
if(!_Mousemoved) {
- if(e->button() == LeftButton)
+ if(e->button() == Qt::LeftButton)
zoom(1.4, e->x(), e->y() );
- if(e->button() == RightButton)
+ if(e->button() == Qt::RightButton)
zoom(0.7, e->x(), e->y() );
- if(e->button() == MidButton)
+ if(e->button() == Qt::MidButton)
zoomAll();
}
else {
- if(_currentMButton == LeftButton) {
+ if(_currentMButton == Qt::LeftButton) {
TQPainter p(this);
TQPen pen(DashLine);
@@ -284,7 +284,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
case Select: {
- if(_currentMButton == LeftButton && _currentItem) {
+ if(_currentMButton == Qt::LeftButton && _currentItem) {
TQPainter p(this);
p.setRasterOp(XorROP);
@@ -442,7 +442,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e)
case Zoom: {
- if(_currentMButton == LeftButton) {
+ if(_currentMButton == Qt::LeftButton) {
static TQString strpos;
diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h
index bb0d1b15..a2e97ca3 100644
--- a/kgantt/kgantt/xQGanttListViewPort.h
+++ b/kgantt/kgantt/xQGanttListViewPort.h
@@ -114,7 +114,7 @@ protected:
void mousePressEvent(TQMouseEvent* e) {
- if(e->button() == RightButton && e->state() == ControlButton ) {
+ if(e->button() == Qt::RightButton && e->state() == ControlButton ) {
_menu->popup(e->globalPos());
return;
}
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 29ab5980..b04b5b60 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -610,9 +610,9 @@ IMAP4Protocol::listDir (const KURL & _url)
}
if ( !selectInfo.alert().isNull() ) {
if ( !myBox.isEmpty() ) {
- warning( i18n( "Message from %1 while processing '%2': %3" ).arg( myHost, myBox, selectInfo.alert() ) );
+ warning( i18n( "Message from %1 while processing '%2': %3" ).tqarg( myHost, myBox, selectInfo.alert() ) );
} else {
- warning( i18n( "Message from %1: %2" ).arg( myHost, selectInfo.alert() ) );
+ warning( i18n( "Message from %1: %2" ).tqarg( myHost, TQString(selectInfo.alert()) ) );
}
selectInfo.setAlert( 0 );
}
@@ -934,7 +934,7 @@ IMAP4Protocol::mkdir (const KURL & _url, int)
if ( ask &&
messageBox(QuestionYesNo,
i18n("The following folder will be created on the server: %1 "
- "What do you want to store in this folder?").arg( aBox ),
+ "What do you want to store in this folder?").tqarg( aBox ),
i18n("Create Folder"),
i18n("&Messages"), i18n("&Subfolders")) == KMessageBox::No )
{
@@ -979,7 +979,7 @@ IMAP4Protocol::copy (const KURL & src, const KURL & dest, int, bool overwrite)
{
KURL testDir = dest;
- TQString subDir = dBox.right (dBox.length () - dBox.findRev ('/'));
+ TQString subDir = dBox.right (dBox.length () - dBox.tqfindRev ('/'));
TQString topDir = dBox.left (sub);
testDir.setPath ("/" + topDir);
dType =
@@ -1272,8 +1272,8 @@ IMAP4Protocol::special (const TQByteArray & aData)
completeQueue.removeRef (cmd);
error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 "
"failed. The server returned: %2")
- .arg(_url.prettyURL())
- .arg(cmd