summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
commit3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch)
tree89de88213bd261e4ccaade899ab2d6ec34b3a5a7
parent1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff)
downloadtdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz
tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip
Rename a number of old tq methods that are no longer tq specific
-rw-r--r--NewsLog.txt16
-rw-r--r--akregator/src/addfeeddialog.cpp4
-rw-r--r--akregator/src/addfeedwidgetbase.ui12
-rw-r--r--akregator/src/akregator_part.cpp36
-rw-r--r--akregator/src/akregator_view.cpp34
-rw-r--r--akregator/src/article.cpp24
-rw-r--r--akregator/src/article.h4
-rw-r--r--akregator/src/articlefilter.cpp146
-rw-r--r--akregator/src/articlefilter.h4
-rw-r--r--akregator/src/articlelistview.cpp4
-rw-r--r--akregator/src/articleviewer.cpp126
-rw-r--r--akregator/src/dragobjects.cpp6
-rw-r--r--akregator/src/dragobjects.h2
-rw-r--r--akregator/src/feed.cpp34
-rw-r--r--akregator/src/feed.h8
-rw-r--r--akregator/src/feedlist.cpp12
-rw-r--r--akregator/src/feedlistview.cpp16
-rw-r--r--akregator/src/feedlistview.h2
-rw-r--r--akregator/src/feedstorage.h2
-rw-r--r--akregator/src/feedstoragedummyimpl.cpp4
-rw-r--r--akregator/src/feedstoragedummyimpl.h2
-rw-r--r--akregator/src/folder.cpp72
-rw-r--r--akregator/src/folder.h18
-rw-r--r--akregator/src/frame.cpp8
-rw-r--r--akregator/src/kcursorsaver.h6
-rw-r--r--akregator/src/librss/article.cpp44
-rw-r--r--akregator/src/librss/category.cpp4
-rw-r--r--akregator/src/librss/document.cpp304
-rw-r--r--akregator/src/librss/enclosure.cpp20
-rw-r--r--akregator/src/librss/global.h2
-rw-r--r--akregator/src/librss/image.cpp12
-rw-r--r--akregator/src/librss/loader.cpp4
-rw-r--r--akregator/src/librss/loader.h10
-rw-r--r--akregator/src/librss/testlibrss.cpp6
-rw-r--r--akregator/src/librss/testlibrss.h4
-rw-r--r--akregator/src/librss/textinput.cpp8
-rw-r--r--akregator/src/librss/tools_p.cpp12
-rw-r--r--akregator/src/listtabwidget.cpp14
-rw-r--r--akregator/src/mainwindow.cpp2
-rw-r--r--akregator/src/mk4storage/feedstoragemk4impl.cpp4
-rw-r--r--akregator/src/mk4storage/feedstoragemk4impl.h2
-rw-r--r--akregator/src/mk4storage/metakit/CHANGES20
-rw-r--r--akregator/src/mk4storage/metakit/README2
-rw-r--r--akregator/src/mk4storage/metakit/src/column.h2
-rw-r--r--akregator/src/mk4storage/metakit/tests/regress.cpp2
-rw-r--r--akregator/src/mk4storage/mk4confwidgetbase.ui8
-rw-r--r--akregator/src/nodelist.cpp4
-rw-r--r--akregator/src/notificationmanager.cpp6
-rw-r--r--akregator/src/pageviewer.cpp8
-rw-r--r--akregator/src/pluginmanager.cpp16
-rw-r--r--akregator/src/progressmanager.cpp8
-rw-r--r--akregator/src/propertiesdialog.cpp2
-rw-r--r--akregator/src/propertieswidgetbase.ui14
-rw-r--r--akregator/src/searchbar.cpp10
-rw-r--r--akregator/src/searchbar.h2
-rw-r--r--akregator/src/settings_advancedbase.ui4
-rw-r--r--akregator/src/settings_appearance.ui2
-rw-r--r--akregator/src/settings_archive.ui4
-rw-r--r--akregator/src/settings_browser.ui4
-rw-r--r--akregator/src/settings_general.ui2
-rw-r--r--akregator/src/simplenodeselector.cpp10
-rw-r--r--akregator/src/tabwidget.cpp12
-rw-r--r--akregator/src/tag.h2
-rw-r--r--akregator/src/tagaction.cpp2
-rw-r--r--akregator/src/tagnode.cpp2
-rw-r--r--akregator/src/tagpropertieswidgetbase.ui10
-rw-r--r--akregator/src/tagset.cpp16
-rw-r--r--akregator/src/trayicon.cpp2
-rw-r--r--akregator/src/treenode.cpp12
-rw-r--r--akregator/src/treenodeitem.cpp2
-rw-r--r--akregator/src/viewer.cpp6
-rw-r--r--certmanager/certificateinfowidget.ui4
-rw-r--r--certmanager/certificateinfowidgetimpl.cpp18
-rw-r--r--certmanager/certificatewizard.ui28
-rw-r--r--certmanager/certificatewizardimpl.cpp18
-rw-r--r--certmanager/certmanager.cpp62
-rw-r--r--certmanager/certmanager.h2
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp2
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp24
-rw-r--r--certmanager/conf/appearanceconfigwidgetbase.ui4
-rw-r--r--certmanager/conf/configuredialog.cpp12
-rw-r--r--certmanager/conf/dirservconfigpage.cpp6
-rw-r--r--certmanager/conf/dnorderconfigpage.cpp2
-rw-r--r--certmanager/crlview.cpp4
-rw-r--r--certmanager/hierarchyanalyser.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp6
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp16
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp20
-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/gnupgprocessbase.cpp14
-rw-r--r--certmanager/lib/backends/qgpgme/gnupgprocessbase.h6
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmebackend.cpp10
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp12
-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.cpp6
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp4
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp4
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h2
-rw-r--r--certmanager/lib/cryptplug.cpp10
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp26
-rw-r--r--certmanager/lib/cryptplugwrapper.h32
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp2
-rw-r--r--certmanager/lib/kleo/dn.cpp2
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp2
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp2
-rw-r--r--certmanager/lib/tests/gnupgviewer.h6
-rw-r--r--certmanager/lib/tests/test_gnupgprocessbase.cpp6
-rw-r--r--certmanager/lib/tests/test_keygen.cpp4
-rw-r--r--certmanager/lib/tests/test_keylister.cpp2
-rw-r--r--certmanager/lib/ui/adddirectoryservicedialog.ui4
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp6
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp14
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule_p.h18
-rw-r--r--certmanager/lib/ui/directoryserviceswidget.cpp2
-rw-r--r--certmanager/lib/ui/directoryserviceswidgetbase.ui16
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp4
-rw-r--r--certmanager/lib/ui/kdhorizontalline.cpp22
-rw-r--r--certmanager/lib/ui/kdhorizontalline.h6
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp12
-rw-r--r--certmanager/lib/ui/keylistview.cpp38
-rw-r--r--certmanager/lib/ui/keylistview.h8
-rw-r--r--certmanager/lib/ui/keyrequester.cpp8
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp18
-rw-r--r--certmanager/lib/ui/messagebox.cpp14
-rw-r--r--certmanager/lib/ui/passphrasedialog.cpp2
-rw-r--r--certmanager/lib/ui/progressdialog.cpp2
-rw-r--r--certmanager/storedtransferjob.cpp2
-rw-r--r--doc/api/doxygen.css2
-rw-r--r--indexlib/boost-compat/config/abi/borland_prefix.hpp6
-rw-r--r--indexlib/boost-compat/config/user.hpp4
-rw-r--r--kabc/frontend/mainWindow.ui8
-rw-r--r--kaddressbook/TODO2
-rw-r--r--kaddressbook/addresseditwidget.cpp34
-rw-r--r--kaddressbook/addresseeeditordialog.cpp8
-rw-r--r--kaddressbook/addresseeeditorextension.cpp6
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp144
-rw-r--r--kaddressbook/addviewdialog.cpp20
-rw-r--r--kaddressbook/advancedcustomfields.cpp8
-rw-r--r--kaddressbook/common/filter.cpp8
-rw-r--r--kaddressbook/common/kabprefs.h4
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp4
-rw-r--r--kaddressbook/contacteditorwidgetmanager.h2
-rw-r--r--kaddressbook/customfieldswidget.cpp40
-rw-r--r--kaddressbook/distributionlisteditor.cpp16
-rw-r--r--kaddressbook/distributionlistentryview.cpp14
-rw-r--r--kaddressbook/distributionlistpicker.cpp12
-rw-r--r--kaddressbook/editors/cryptowidget.cpp2
-rw-r--r--kaddressbook/editors/imeditorbase.ui4
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp18
-rw-r--r--kaddressbook/editors/imeditorwidget.h2
-rw-r--r--kaddressbook/emaileditwidget.cpp6
-rw-r--r--kaddressbook/extensionmanager.cpp8
-rw-r--r--kaddressbook/features/distributionlistngwidget.cpp12
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp4
-rw-r--r--kaddressbook/features/resourceselection.cpp6
-rw-r--r--kaddressbook/filtereditdialog.cpp4
-rw-r--r--kaddressbook/freebusywidget.cpp8
-rw-r--r--kaddressbook/geowidget.cpp8
-rw-r--r--kaddressbook/imagewidget.cpp12
-rw-r--r--kaddressbook/imeditwidget.cpp2
-rw-r--r--kaddressbook/incsearchwidget.cpp22
-rw-r--r--kaddressbook/interfaces/xxport.h2
-rw-r--r--kaddressbook/jumpbuttonbar.cpp18
-rw-r--r--kaddressbook/kabcore.cpp38
-rw-r--r--kaddressbook/kabtools.cpp2
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbookview.cpp8
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.cpp6
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp22
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.cpp6
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp24
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp6
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.cpp6
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp12
-rw-r--r--kaddressbook/keywidget.cpp18
-rw-r--r--kaddressbook/ldapsearchdialog.cpp24
-rw-r--r--kaddressbook/nameeditdialog.cpp36
-rw-r--r--kaddressbook/phoneeditwidget.cpp30
-rw-r--r--kaddressbook/printing/detailledstyle.cpp6
-rw-r--r--kaddressbook/printing/ds_appearance.ui26
-rw-r--r--kaddressbook/printing/kabentrypainter.cpp14
-rw-r--r--kaddressbook/printing/mikesstyle.cpp6
-rw-r--r--kaddressbook/printing/printingwizard.cpp2
-rw-r--r--kaddressbook/printing/printprogress.cpp6
-rw-r--r--kaddressbook/printing/selectionpage.cpp10
-rw-r--r--kaddressbook/printing/stylepage.cpp10
-rw-r--r--kaddressbook/searchmanager.cpp8
-rw-r--r--kaddressbook/secrecywidget.cpp6
-rw-r--r--kaddressbook/simpleaddresseeeditor.cpp2
-rw-r--r--kaddressbook/soundwidget.cpp4
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.cpp2
-rw-r--r--kaddressbook/typecombo.h4
-rw-r--r--kaddressbook/undocmds.cpp6
-rw-r--r--kaddressbook/viewconfigurefieldspage.cpp12
-rw-r--r--kaddressbook/viewconfigurefilterpage.cpp4
-rw-r--r--kaddressbook/viewconfigurewidget.cpp2
-rw-r--r--kaddressbook/viewmanager.cpp12
-rw-r--r--kaddressbook/views/cardview.cpp16
-rw-r--r--kaddressbook/views/cardview.h10
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp18
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp12
-rw-r--r--kaddressbook/views/contactlistview.cpp14
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp8
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp6
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp6
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp8
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp42
-rw-r--r--kaddressbook/xxport/gnokii_xxport.cpp160
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp2
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp10
-rw-r--r--kaddressbook/xxport/opera_xxport.cpp22
-rw-r--r--kaddressbook/xxport/pab_pablib.cpp4
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp36
-rw-r--r--kaddressbook/xxportmanager.cpp8
-rw-r--r--kaddressbook/xxportselectdialog.cpp14
-rw-r--r--kalarm/Changelog4
-rw-r--r--kalarm/alarmcalendar.cpp68
-rw-r--r--kalarm/alarmcalendar.h8
-rw-r--r--kalarm/alarmevent.cpp146
-rw-r--r--kalarm/alarmevent.h12
-rw-r--r--kalarm/alarmlistview.cpp24
-rw-r--r--kalarm/alarmlistview.h2
-rw-r--r--kalarm/alarmtext.cpp14
-rw-r--r--kalarm/alarmtimewidget.cpp52
-rw-r--r--kalarm/alarmtimewidget.h2
-rw-r--r--kalarm/birthdaydlg.cpp44
-rw-r--r--kalarm/calendarcompat.cpp10
-rw-r--r--kalarm/daemon.cpp66
-rw-r--r--kalarm/daemon.h14
-rw-r--r--kalarm/dcophandler.cpp2
-rw-r--r--kalarm/deferdlg.cpp10
-rw-r--r--kalarm/editdlg.cpp220
-rw-r--r--kalarm/find.cpp18
-rw-r--r--kalarm/fontcolour.cpp26
-rw-r--r--kalarm/fontcolourbutton.cpp20
-rw-r--r--kalarm/functions.cpp78
-rw-r--r--kalarm/functions.h22
-rw-r--r--kalarm/kalarmapp.cpp160
-rw-r--r--kalarm/kalarmd/adcalendar.cpp2
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp14
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp36
-rw-r--r--kalarm/kalarmd/alarmdaemon.h4
-rw-r--r--kalarm/kalarmd/alarmguiiface.h6
-rw-r--r--kalarm/kamail.cpp70
-rw-r--r--kalarm/karecurrence.cpp2
-rw-r--r--kalarm/latecancel.cpp22
-rw-r--r--kalarm/latecancel.h2
-rw-r--r--kalarm/lib/buttongroup.cpp2
-rw-r--r--kalarm/lib/checkbox.h2
-rw-r--r--kalarm/lib/dateedit.cpp4
-rw-r--r--kalarm/lib/lineedit.cpp4
-rw-r--r--kalarm/lib/messagebox.cpp6
-rw-r--r--kalarm/lib/radiobutton.h2
-rw-r--r--kalarm/lib/shellprocess.cpp20
-rw-r--r--kalarm/lib/shellprocess.h8
-rw-r--r--kalarm/lib/spinbox2.cpp22
-rw-r--r--kalarm/lib/spinbox2.h20
-rw-r--r--kalarm/lib/synchtimer.cpp4
-rw-r--r--kalarm/lib/timeedit.cpp4
-rw-r--r--kalarm/lib/timeperiod.cpp4
-rw-r--r--kalarm/lib/timespinbox.cpp14
-rw-r--r--kalarm/lib/timespinbox.h4
-rw-r--r--kalarm/mainwindow.cpp60
-rw-r--r--kalarm/mainwindow.h2
-rw-r--r--kalarm/messagewin.cpp208
-rw-r--r--kalarm/messagewin.h2
-rw-r--r--kalarm/prefdlg.cpp262
-rw-r--r--kalarm/preferences.cpp148
-rw-r--r--kalarm/recurrenceedit.cpp190
-rw-r--r--kalarm/recurrenceeditprivate.h2
-rw-r--r--kalarm/reminder.cpp14
-rw-r--r--kalarm/repetition.cpp30
-rw-r--r--kalarm/sounddlg.cpp42
-rw-r--r--kalarm/soundpicker.cpp16
-rw-r--r--kalarm/specialactions.cpp12
-rw-r--r--kalarm/templatedlg.cpp22
-rw-r--r--kalarm/templatepickdlg.cpp2
-rw-r--r--kalarm/timeselector.cpp12
-rw-r--r--kalarm/traywindow.cpp28
-rw-r--r--kalarm/traywindow.h2
-rw-r--r--kalarm/undo.cpp22
-rw-r--r--kandy/RELEASENOTES4
-rw-r--r--kandy/configure.in.in2
-rw-r--r--kandy/src/atcommand.cpp2
-rw-r--r--kandy/src/cmdpropertiesdialog_base.ui2
-rw-r--r--kandy/src/commandset.cpp2
-rw-r--r--kandy/src/kandy.cpp10
-rw-r--r--kandy/src/kandy.kcfg2
-rw-r--r--kandy/src/kandyprefsdialog.cpp6
-rw-r--r--kandy/src/kandyview.cpp8
-rw-r--r--kandy/src/mobilegui.cpp8
-rw-r--r--kandy/src/mobilegui.h2
-rw-r--r--kandy/src/mobilegui_base.ui20
-rw-r--r--kandy/src/mobilemain.cpp2
-rw-r--r--kandy/src/modem.cpp20
-rw-r--r--karm/csvexportdialog_base.ui6
-rw-r--r--karm/doc/design4
-rw-r--r--karm/edittaskdialog.cpp12
-rw-r--r--karm/idletimedetector.cpp8
-rw-r--r--karm/karm_part.cpp26
-rw-r--r--karm/karmstorage.cpp78
-rw-r--r--karm/karmstorage.h6
-rw-r--r--karm/ktimewidget.cpp20
-rw-r--r--karm/mainwindow.cpp48
-rw-r--r--karm/plannerparser.cpp8
-rw-r--r--karm/preferences.cpp98
-rw-r--r--karm/print.cpp12
-rw-r--r--karm/printdialog.cpp28
-rw-r--r--karm/task.cpp20
-rw-r--r--karm/task.h8
-rw-r--r--karm/taskview.cpp30
-rw-r--r--karm/taskview.h8
-rw-r--r--karm/test/README2
-rw-r--r--karm/test/lifetest.php4
-rw-r--r--karm/test/lockerthread.cpp2
-rw-r--r--karm/test/locking.cpp6
-rw-r--r--karm/test/runscripts.cpp2
-rw-r--r--karm/test/script.cpp2
-rw-r--r--karm/timekard.cpp70
-rw-r--r--karm/tray.cpp6
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.cpp164
-rw-r--r--kdgantt/KDGanttMinimizeSplitter.h6
-rw-r--r--kdgantt/KDGanttSemiSizingControl.cpp32
-rw-r--r--kdgantt/KDGanttSemiSizingControl.h4
-rw-r--r--kdgantt/KDGanttView.cpp206
-rw-r--r--kdgantt/KDGanttView.h12
-rw-r--r--kdgantt/KDGanttViewItem.cpp168
-rw-r--r--kdgantt/KDGanttViewItem.h6
-rw-r--r--kdgantt/KDGanttViewItemDrag.cpp6
-rw-r--r--kdgantt/KDGanttViewItemDrag.h2
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp62
-rw-r--r--kdgantt/KDGanttViewSubwidgets.h8
-rw-r--r--kdgantt/KDGanttViewTaskItem.cpp2
-rw-r--r--kdgantt/KDGanttXMLTools.cpp2
-rw-r--r--kdgantt/Makefile.am2
-rw-r--r--kdgantt/itemAttributeDialog.ui6
-rw-r--r--kdgantt/itemAttributeDialog.ui.h22
-rw-r--r--kdgantt/qlayoutengine_p.h14
-rw-r--r--kfile-plugins/ics/kfile_ics.cpp4
-rw-r--r--kgantt/kgantt/KGantt.cpp4
-rw-r--r--kgantt/kgantt/KGantt.h4
-rw-r--r--kgantt/kgantt/KGanttItem.h2
-rw-r--r--kgantt/kgantt/KGanttRelation.h2
-rw-r--r--kgantt/kgantt/itemedit.ui28
-rw-r--r--kgantt/kgantt/itemedit2.ui10
-rw-r--r--kioslaves/imap4/imap4.cc94
-rw-r--r--kioslaves/imap4/imapcommand.cc2
-rw-r--r--kioslaves/imap4/imapcommand.h2
-rw-r--r--kioslaves/imap4/imaplist.cc4
-rw-r--r--kioslaves/imap4/imapparser.cc18
-rw-r--r--kioslaves/imap4/imapparser.h8
-rw-r--r--kioslaves/imap4/mailheader.h4
-rw-r--r--kioslaves/imap4/mimeheader.cc2
-rw-r--r--kioslaves/imap4/rfcdecoder.cc8
-rw-r--r--kioslaves/mbox/readmbox.cc4
-rw-r--r--kioslaves/mbox/stat.cc4
-rw-r--r--kioslaves/opengroupware/opengroupware.cpp4
-rw-r--r--kioslaves/sieve/sieve.cpp22
-rw-r--r--kitchensync/libqopensync/group.cpp6
-rw-r--r--kitchensync/libqopensync/member.cpp6
-rw-r--r--kitchensync/libqopensync/member.h4
-rw-r--r--kitchensync/libqopensync/plugin.cpp6
-rw-r--r--kitchensync/opensyncdbus/dbusclient.cpp12
-rw-r--r--kitchensync/src/aboutpage.cpp62
-rw-r--r--kitchensync/src/configgui.cpp4
-rw-r--r--kitchensync/src/configguiblank.cpp2
-rw-r--r--kitchensync/src/configguievo2.cpp24
-rw-r--r--kitchensync/src/configguifile.cpp2
-rw-r--r--kitchensync/src/configguigcalendar.cpp2
-rw-r--r--kitchensync/src/configguignokii.cpp20
-rw-r--r--kitchensync/src/configguigpe.cpp32
-rw-r--r--kitchensync/src/configguiirmc.cpp2
-rw-r--r--kitchensync/src/configguijescs.cpp28
-rw-r--r--kitchensync/src/configguildap.cpp48
-rw-r--r--kitchensync/src/configguimoto.cpp14
-rw-r--r--kitchensync/src/configguiopie.cpp32
-rw-r--r--kitchensync/src/configguipalm.cpp2
-rw-r--r--kitchensync/src/configguisunbird.cpp32
-rw-r--r--kitchensync/src/configguisynce.cpp24
-rw-r--r--kitchensync/src/configguisyncmlhttp.cpp2
-rw-r--r--kitchensync/src/configguisyncmlobex.cpp6
-rw-r--r--kitchensync/src/connectionwidgets.cpp46
-rw-r--r--kitchensync/src/genericdiffalgo.cpp6
-rw-r--r--kitchensync/src/groupconfig.cpp10
-rw-r--r--kitchensync/src/groupconfigcommon.cpp20
-rw-r--r--kitchensync/src/groupconfigdialog.cpp2
-rw-r--r--kitchensync/src/groupitem.cpp118
-rw-r--r--kitchensync/src/groupitem.h4
-rw-r--r--kitchensync/src/groupview.cpp2
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp22
-rw-r--r--kitchensync/src/mainwidget.cpp4
-rw-r--r--kitchensync/src/memberconfig.cpp6
-rw-r--r--kitchensync/src/multiconflictdialog.cpp20
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kitchensync/src/pluginpicker.cpp16
-rw-r--r--kitchensync/src/singleconflictdialog.cpp16
-rw-r--r--kitchensync/src/syncprocess.cpp4
-rw-r--r--kitchensync/src/syncprocess.h4
-rw-r--r--kitchensync/src/syncprocessmanager.cpp2
-rw-r--r--kmail/ChangeLog8
-rw-r--r--kmail/Mainpage.dox34
-rw-r--r--kmail/aboutdata.cpp4
-rw-r--r--kmail/accountdialog.cpp46
-rw-r--r--kmail/accountmanager.cpp10
-rw-r--r--kmail/accountwizard.cpp48
-rw-r--r--kmail/acljobs.cpp2
-rw-r--r--kmail/actionscheduler.cpp24
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/antispamwizard.cpp42
-rw-r--r--kmail/antispamwizard.h2
-rw-r--r--kmail/archivefolderdialog.cpp6
-rw-r--r--kmail/attachmentcollector.cpp2
-rw-r--r--kmail/backupjob.cpp28
-rw-r--r--kmail/bodyvisitor.h2
-rw-r--r--kmail/cachedimapjob.cpp28
-rw-r--r--kmail/callback.cpp8
-rw-r--r--kmail/chiasmuskeyselector.cpp14
-rw-r--r--kmail/compactionjob.cpp12
-rw-r--r--kmail/composercryptoconfiguration.ui2
-rw-r--r--kmail/configuredialog.cpp230
-rw-r--r--kmail/configuredialog_p.cpp32
-rw-r--r--kmail/configuredialog_p.h2
-rw-r--r--kmail/copyfolderjob.cpp6
-rw-r--r--kmail/csshelper.cpp2
-rw-r--r--kmail/customtemplates.cpp4
-rw-r--r--kmail/customtemplates_base.ui18
-rw-r--r--kmail/distributionlistdialog.cpp4
-rw-r--r--kmail/encodingdetector.cpp2
-rw-r--r--kmail/encodingdetector.h2
-rw-r--r--kmail/expirejob.cpp18
-rw-r--r--kmail/expirypropertiesdialog.cpp10
-rw-r--r--kmail/favoritefolderview.cpp14
-rw-r--r--kmail/filehtmlwriter.h2
-rw-r--r--kmail/filterimporterexporter.cpp2
-rw-r--r--kmail/filterlog.h2
-rw-r--r--kmail/filterlogdlg.cpp4
-rw-r--r--kmail/folderdiaacltab.cpp18
-rw-r--r--kmail/folderdiaacltab.h2
-rw-r--r--kmail/folderdiaquotatab.cpp12
-rw-r--r--kmail/folderdiaquotatab.h2
-rw-r--r--kmail/folderdiaquotatab_p.cpp16
-rw-r--r--kmail/folderpropertiesdialog.ui24
-rw-r--r--kmail/folderrequester.cpp6
-rw-r--r--kmail/foldershortcutdialog.cpp2
-rw-r--r--kmail/folderstorage.cpp26
-rw-r--r--kmail/folderstorage.h22
-rw-r--r--kmail/foldertreebase.cpp16
-rw-r--r--kmail/folderutil.cpp2
-rw-r--r--kmail/folderviewtooltip.h16
-rw-r--r--kmail/headeritem.cpp6
-rw-r--r--kmail/headeritem.h12
-rw-r--r--kmail/headerlistquicksearch.cpp36
-rw-r--r--kmail/headerlistquicksearch.h12
-rw-r--r--kmail/headerstyle.cpp112
-rw-r--r--kmail/htmlstatusbar.cpp4
-rw-r--r--kmail/identitydialog.cpp34
-rw-r--r--kmail/identitydrag.cpp4
-rw-r--r--kmail/identitydrag.h2
-rw-r--r--kmail/identitylistview.cpp2
-rw-r--r--kmail/imapaccountbase.cpp38
-rw-r--r--kmail/imapaccountbase.h6
-rw-r--r--kmail/imapjob.cpp16
-rw-r--r--kmail/importarchivedialog.cpp4
-rw-r--r--kmail/importjob.cpp22
-rw-r--r--kmail/index.cpp2
-rw-r--r--kmail/kcursorsaver.h6
-rw-r--r--kmail/keyresolver.cpp22
-rw-r--r--kmail/khtmlparthtmlwriter.cpp2
-rw-r--r--kmail/klistboxdialog.cpp2
-rw-r--r--kmail/kmaccount.cpp22
-rw-r--r--kmail/kmaccount.h8
-rw-r--r--kmail/kmacctcachedimap.cpp4
-rw-r--r--kmail/kmacctimap.cpp28
-rw-r--r--kmail/kmacctlocal.cpp24
-rw-r--r--kmail/kmacctmaildir.cpp20
-rw-r--r--kmail/kmacctseldlg.cpp2
-rw-r--r--kmail/kmail.antispamrc10
-rw-r--r--kmail/kmail.kcfg6
-rw-r--r--kmail/kmail_part.cpp4
-rw-r--r--kmail/kmailicalifaceimpl.cpp86
-rw-r--r--kmail/kmatmlistview.cpp4
-rw-r--r--kmail/kmcommands.cpp88
-rw-r--r--kmail/kmcommands.h6
-rw-r--r--kmail/kmcomposewin.cpp104
-rw-r--r--kmail/kmcomposewin.h6
-rw-r--r--kmail/kmedit.cpp18
-rw-r--r--kmail/kmedit.h2
-rw-r--r--kmail/kmfawidgets.cpp6
-rw-r--r--kmail/kmfilter.cpp10
-rw-r--r--kmail/kmfilteraction.cpp78
-rw-r--r--kmail/kmfilterdlg.cpp46
-rw-r--r--kmail/kmfolder.cpp20
-rw-r--r--kmail/kmfolder.h16
-rw-r--r--kmail/kmfoldercachedimap.cpp66
-rw-r--r--kmail/kmfoldercachedimap.h8
-rw-r--r--kmail/kmfolderdia.cpp16
-rw-r--r--kmail/kmfolderdia.h4
-rw-r--r--kmail/kmfolderdir.cpp6
-rw-r--r--kmail/kmfolderdir.h2
-rw-r--r--kmail/kmfolderimap.cpp82
-rw-r--r--kmail/kmfolderimap.h24
-rw-r--r--kmail/kmfolderindex.cpp12
-rw-r--r--kmail/kmfolderindex.h6
-rw-r--r--kmail/kmfoldermaildir.cpp28
-rw-r--r--kmail/kmfoldermaildir.h14
-rw-r--r--kmail/kmfoldermbox.cpp54
-rw-r--r--kmail/kmfoldermbox.h4
-rw-r--r--kmail/kmfoldermgr.cpp10
-rw-r--r--kmail/kmfolderseldlg.cpp6
-rw-r--r--kmail/kmfolderseldlg.h2
-rw-r--r--kmail/kmfoldertree.cpp26
-rw-r--r--kmail/kmheaders.cpp110
-rw-r--r--kmail/kmheaders.h12
-rw-r--r--kmail/kmkernel.cpp44
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmlineeditspell.cpp2
-rw-r--r--kmail/kmmainwidget.cpp114
-rw-r--r--kmail/kmmainwidget.h8
-rw-r--r--kmail/kmmessage.cpp90
-rw-r--r--kmail/kmmessage.h34
-rw-r--r--kmail/kmmimeparttree.cpp10
-rw-r--r--kmail/kmmsgbase.cpp266
-rw-r--r--kmail/kmmsgbase.h28
-rw-r--r--kmail/kmmsginfo.cpp34
-rw-r--r--kmail/kmmsginfo.h10
-rw-r--r--kmail/kmmsgpart.cpp2
-rw-r--r--kmail/kmmsgpart.h2
-rw-r--r--kmail/kmmsgpartdlg.cpp30
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp8
-rw-r--r--kmail/kmreaderwin.cpp112
-rw-r--r--kmail/kmreaderwin.h2
-rw-r--r--kmail/kmsearchpattern.cpp34
-rw-r--r--kmail/kmsearchpattern.h18
-rw-r--r--kmail/kmsearchpatternedit.cpp8
-rw-r--r--kmail/kmsearchpatternedit.h2
-rw-r--r--kmail/kmsender.cpp42
-rw-r--r--kmail/kmstartup.cpp16
-rw-r--r--kmail/kmsystemtray.cpp12
-rw-r--r--kmail/kmtransport.cpp6
-rw-r--r--kmail/listjob.cpp10
-rw-r--r--kmail/localsubscriptiondialog.cpp2
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp8
-rw-r--r--kmail/main.cpp2
-rw-r--r--kmail/managesievescriptsdialog.cpp10
-rw-r--r--kmail/managesievescriptsdialog_p.h2
-rw-r--r--kmail/messageactions.cpp12
-rw-r--r--kmail/messageactions.h2
-rw-r--r--kmail/messagecomposer.cpp10
-rw-r--r--kmail/networkaccount.cpp2
-rw-r--r--kmail/newfolderdialog.cpp10
-rw-r--r--kmail/objecttreeparser.cpp94
-rw-r--r--kmail/objecttreeparser.h4
-rw-r--r--kmail/objecttreeparser_p.cpp4
-rw-r--r--kmail/partNode.cpp10
-rw-r--r--kmail/partNode.h4
-rw-r--r--kmail/partnodebodypart.cpp4
-rw-r--r--kmail/popaccount.cpp36
-rw-r--r--kmail/quotajobs.h4
-rw-r--r--kmail/recipientseditor.cpp26
-rw-r--r--kmail/recipientseditor.h4
-rw-r--r--kmail/recipientseditortest.cpp6
-rw-r--r--kmail/recipientspicker.cpp6
-rw-r--r--kmail/redirectdialog.cpp2
-rw-r--r--kmail/regexplineedit.cpp4
-rw-r--r--kmail/renamejob.cpp2
-rw-r--r--kmail/rulewidgethandlermanager.cpp6
-rw-r--r--kmail/searchjob.cpp6
-rw-r--r--kmail/searchwindow.cpp18
-rw-r--r--kmail/searchwindow.h2
-rw-r--r--kmail/sieveconfig.cpp2
-rw-r--r--kmail/sievedebugdialog.cpp10
-rw-r--r--kmail/sievejob.cpp2
-rw-r--r--kmail/signatureconfigurator.cpp8
-rw-r--r--kmail/simplestringlisteditor.cpp2
-rw-r--r--kmail/smimeconfiguration.ui14
-rw-r--r--kmail/snippetdlg.cpp6
-rw-r--r--kmail/snippetdlgbase.ui10
-rw-r--r--kmail/snippetsettingsbase.ui8
-rw-r--r--kmail/snippetwidget.cpp82
-rw-r--r--kmail/stringutil.cpp2
-rw-r--r--kmail/subscriptiondialog.cpp4
-rw-r--r--kmail/templateparser.cpp40
-rw-r--r--kmail/templatesconfiguration.cpp18
-rw-r--r--kmail/templatesconfiguration_base.ui10
-rw-r--r--kmail/templatesinsertcommand.cpp2
-rw-r--r--kmail/tests/signedmail.mbox6
-rw-r--r--kmail/twindowpositioner.cpp2
-rw-r--r--kmail/urlhandlermanager.cpp6
-rw-r--r--kmail/util.cpp10
-rw-r--r--kmail/util.h2
-rw-r--r--kmail/vacation.cpp14
-rw-r--r--kmail/vacationdialog.cpp4
-rw-r--r--kmail/warningconfiguration.ui12
-rw-r--r--kmail/xfaceconfigurator.cpp10
-rw-r--r--kmail/xfaceconfigurator.h2
-rw-r--r--kmailcvt/filter_evolution.cxx6
-rw-r--r--kmailcvt/filter_evolution_v2.cxx6
-rw-r--r--kmailcvt/filter_kmail_maildir.cxx12
-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.cxx62
-rw-r--r--kmailcvt/filter_opera.cxx8
-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.cxx10
-rw-r--r--kmailcvt/filter_thebat.cxx8
-rw-r--r--kmailcvt/filter_thunderbird.cxx8
-rw-r--r--kmailcvt/filters.cxx14
-rw-r--r--kmailcvt/kimportpagedlg.ui12
-rw-r--r--kmailcvt/kselfilterpage.cpp4
-rw-r--r--kmailcvt/kselfilterpagedlg.ui8
-rw-r--r--kmobile/DESIGN36
-rw-r--r--kmobile/TODO8
-rw-r--r--kmobile/devices/digicam/libkmobile_digicam.desktop2
-rw-r--r--kmobile/devices/gammu/libkmobile_gammu.desktop2
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.cpp66
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.h4
-rw-r--r--kmobile/devices/gnokii/gnokiiconfigui.ui8
-rw-r--r--kmobile/devices/gnokii/libkmobile_gnokii.desktop2
-rw-r--r--kmobile/devices/skeleton/libkmobile_skeleton.desktop2
-rw-r--r--kmobile/devices/skeleton/skeleton.cpp28
-rw-r--r--kmobile/devices/skeleton/skeleton.h4
-rw-r--r--kmobile/kioslave/kio_mobile.cpp80
-rw-r--r--kmobile/kioslave/mimetypes/mobile_device.desktop2
-rw-r--r--kmobile/kmobile.cpp40
-rw-r--r--kmobile/kmobile_selectiondialog.ui6
-rw-r--r--kmobile/kmobileclient.cpp90
-rw-r--r--kmobile/kmobileclient.h40
-rw-r--r--kmobile/kmobiledevice.cpp64
-rw-r--r--kmobile/kmobiledevice.h70
-rw-r--r--kmobile/kmobileiface.h44
-rw-r--r--kmobile/kmobileitem.cpp36
-rw-r--r--kmobile/kmobileitem.h4
-rw-r--r--kmobile/kmobileui.rc16
-rw-r--r--kmobile/kmobileview.cpp138
-rw-r--r--kmobile/kmobileview.h46
-rw-r--r--kmobile/libkmobile.desktop2
-rw-r--r--kmobile/main.cpp2
-rw-r--r--kmobile/pref.cpp10
-rw-r--r--kmobile/systemtray.cpp6
-rw-r--r--kmobile/testlibkmobile.cpp14
-rw-r--r--knode/articlewidget.cpp48
-rw-r--r--knode/headerview.cpp12
-rw-r--r--knode/knaccountmanager.cpp10
-rw-r--r--knode/knarticle.cpp2
-rw-r--r--knode/knarticle.h2
-rw-r--r--knode/knarticlefactory.cpp24
-rw-r--r--knode/knarticlefilter.cpp8
-rw-r--r--knode/knarticlemanager.cpp6
-rw-r--r--knode/kncleanup.cpp8
-rw-r--r--knode/kncollectionview.cpp2
-rw-r--r--knode/kncomposer.cpp56
-rw-r--r--knode/knconfig.cpp24
-rw-r--r--knode/knconfig.h2
-rw-r--r--knode/knconfigpages.cpp2
-rw-r--r--knode/knconfigwidgets.cpp36
-rw-r--r--knode/knconvert.cpp10
-rw-r--r--knode/kndisplayedheader.cpp4
-rw-r--r--knode/knfilterconfigwidget.cpp2
-rw-r--r--knode/knfilterdialog.cpp8
-rw-r--r--knode/knfolder.cpp6
-rw-r--r--knode/knfoldermanager.cpp4
-rw-r--r--knode/kngroup.cpp8
-rw-r--r--knode/kngroup.h8
-rw-r--r--knode/kngroupbrowser.cpp6
-rw-r--r--knode/kngroupdialog.cpp6
-rw-r--r--knode/kngroupmanager.cpp10
-rw-r--r--knode/kngroupmanager.h4
-rw-r--r--knode/kngrouppropdlg.cpp6
-rw-r--r--knode/kngroupselectdialog.cpp2
-rw-r--r--knode/knhdrviewitem.cpp8
-rw-r--r--knode/knhdrviewitem.h2
-rw-r--r--knode/knjobdata.cpp6
-rw-r--r--knode/knjobdata.h2
-rw-r--r--knode/knmainwidget.cpp42
-rw-r--r--knode/knmainwidget.h4
-rw-r--r--knode/knmemorymanager.cpp4
-rw-r--r--knode/knnetaccess.cpp38
-rw-r--r--knode/knnetaccess.h2
-rw-r--r--knode/knnntpaccount.cpp4
-rw-r--r--knode/knnntpclient.cpp18
-rw-r--r--knode/knode.cpp2
-rw-r--r--knode/knode_part.cpp2
-rw-r--r--knode/knprotocolclient.cpp6
-rw-r--r--knode/knrangefilter.cpp4
-rw-r--r--knode/knsearchdialog.cpp6
-rw-r--r--knode/knserverinfo.cpp2
-rw-r--r--knode/knstatusfilter.cpp2
-rw-r--r--knode/knstringfilter.cpp2
-rw-r--r--knode/knwidgets.cpp8
-rw-r--r--knode/knwidgets.h2
-rw-r--r--knode/smtpaccountwidget_base.ui2
-rw-r--r--knode/utilities.cpp6
-rw-r--r--knotes/ChangeLog10
-rw-r--r--knotes/knote.cpp38
-rw-r--r--knotes/knotebutton.cpp16
-rw-r--r--knotes/knotebutton.h2
-rw-r--r--knotes/knoteconfigdlg.cpp68
-rw-r--r--knotes/knoteedit.cpp8
-rw-r--r--knotes/knoteprinter.cpp14
-rw-r--r--knotes/knoteprinter.h8
-rw-r--r--knotes/knotesalarm.cpp2
-rw-r--r--knotes/knotesapp.cpp10
-rw-r--r--knotes/knoteslegacy.cpp4
-rw-r--r--knotes/knotesnetrecv.cpp6
-rw-r--r--knotes/knotesnetsend.cpp4
-rw-r--r--knotes/resourcelocal.cpp4
-rw-r--r--knotes/resourcelocalconfig.cpp8
-rw-r--r--kode/code.cpp2
-rw-r--r--kode/enum.cpp4
-rw-r--r--kode/file.cpp2
-rw-r--r--kode/kodemain.cpp4
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp6
-rw-r--r--kode/kwsdl/kung/complexbaseinputfield.cpp8
-rw-r--r--kode/kwsdl/kung/dateinputfield.cpp2
-rw-r--r--kode/kwsdl/kung/inputfield.cpp2
-rw-r--r--kode/kwsdl/kung/listinputfield.cpp12
-rw-r--r--kode/kwsdl/kung/pageinputfield.cpp12
-rw-r--r--kode/kxml_compiler/creator.cpp4
-rw-r--r--kode/kxml_compiler/creator.h2
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp2
-rw-r--r--kode/kxml_compiler/parser.cpp2
-rw-r--r--kode/kxml_compiler/parser.h2
-rw-r--r--kode/printer.cpp2
-rw-r--r--kode/style.cpp2
-rw-r--r--konsolekalendar/konsolekalendar.cpp22
-rw-r--r--konsolekalendar/konsolekalendaradd.cpp14
-rw-r--r--konsolekalendar/konsolekalendarchange.cpp28
-rw-r--r--konsolekalendar/konsolekalendardelete.cpp14
-rw-r--r--konsolekalendar/konsolekalendarepoch.cpp4
-rw-r--r--konsolekalendar/konsolekalendarexports.h2
-rw-r--r--konsolekalendar/main.cpp46
-rw-r--r--kontact/Thoughts2
-rw-r--r--kontact/interfaces/core.cpp12
-rw-r--r--kontact/interfaces/summary.cpp18
-rw-r--r--kontact/interfaces/summary.h2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp8
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp12
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp8
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h10
-rw-r--r--kontact/plugins/knotes/knotetip.cpp8
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp14
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp12
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp14
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp40
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp12
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp32
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp16
-rw-r--r--kontact/plugins/kpilot/summarywidget.h2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp24
-rw-r--r--kontact/plugins/newsticker/newsfeeds.h282
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp14
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp14
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp52
-rw-r--r--kontact/plugins/summary/dropwidget.cpp6
-rw-r--r--kontact/plugins/summary/dropwidget.h2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp14
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp36
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
-rw-r--r--kontact/plugins/test/test_part.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp38
-rw-r--r--kontact/src/aboutdialog.cpp10
-rw-r--r--kontact/src/iconsidepane.cpp20
-rw-r--r--kontact/src/iconsidepane.h8
-rw-r--r--kontact/src/kcmkontact.cpp6
-rw-r--r--kontact/src/main.cpp4
-rw-r--r--kontact/src/mainwindow.cpp90
-rw-r--r--kontact/src/profiledialog.cpp10
-rw-r--r--kontact/src/profilemanager.cpp2
-rw-r--r--korganizer/actionmanager.cpp46
-rw-r--r--korganizer/archivedialog.cpp2
-rw-r--r--korganizer/calendarview.cpp96
-rw-r--r--korganizer/calendarview.h6
-rw-r--r--korganizer/datechecker.cpp8
-rw-r--r--korganizer/datenavigator.cpp12
-rw-r--r--korganizer/datenavigatorcontainer.cpp18
-rw-r--r--korganizer/datenavigatorcontainer.h4
-rw-r--r--korganizer/eventarchiver.cpp10
-rw-r--r--korganizer/exportwebdialog.cpp4
-rw-r--r--korganizer/filteredit_base.ui10
-rw-r--r--korganizer/filtereditdialog.cpp2
-rw-r--r--korganizer/freebusymanager.cpp20
-rw-r--r--korganizer/freebusymanager.h2
-rw-r--r--korganizer/freebusyurldialog.cpp4
-rw-r--r--korganizer/history.cpp6
-rw-r--r--korganizer/importdialog.cpp4
-rw-r--r--korganizer/incidencechanger.cpp2
-rw-r--r--korganizer/interfaces/korganizer/baseview.h2
-rw-r--r--korganizer/interfaces/korganizer/mainwindow.h2
-rw-r--r--korganizer/interfaces/korganizer/part.h2
-rw-r--r--korganizer/journalentry.cpp16
-rw-r--r--korganizer/kdatenavigator.cpp22
-rw-r--r--korganizer/koagenda.cpp14
-rw-r--r--korganizer/koagendaitem.cpp20
-rw-r--r--korganizer/koagendaitem.h2
-rw-r--r--korganizer/koagendaview.cpp42
-rw-r--r--korganizer/koagendaview.h4
-rw-r--r--korganizer/koapp.cpp8
-rw-r--r--korganizer/koattendeeeditor.cpp18
-rw-r--r--korganizer/koattendeeeditor.h4
-rw-r--r--korganizer/kocore.cpp4
-rw-r--r--korganizer/kodaymatrix.cpp24
-rw-r--r--korganizer/kodaymatrix.h6
-rw-r--r--korganizer/kodialogmanager.cpp4
-rw-r--r--korganizer/koeditoralarms.cpp10
-rw-r--r--korganizer/koeditoralarms_base.ui14
-rw-r--r--korganizer/koeditorattachments.cpp14
-rw-r--r--korganizer/koeditordetails.cpp6
-rw-r--r--korganizer/koeditorfreebusy.cpp26
-rw-r--r--korganizer/koeditorgeneral.cpp8
-rw-r--r--korganizer/koeditorgeneralevent.cpp20
-rw-r--r--korganizer/koeditorgeneralevent.h2
-rw-r--r--korganizer/koeditorgeneraljournal.cpp4
-rw-r--r--korganizer/koeditorgeneraltodo.cpp28
-rw-r--r--korganizer/koeditorgeneraltodo.h2
-rw-r--r--korganizer/koeditorrecurrence.cpp14
-rw-r--r--korganizer/koeditorrecurrence.h2
-rw-r--r--korganizer/koeventeditor.cpp6
-rw-r--r--korganizer/koeventviewer.cpp8
-rw-r--r--korganizer/koeventviewer.h2
-rw-r--r--korganizer/kogroupware.cpp14
-rw-r--r--korganizer/kogroupwareprefspage.ui16
-rw-r--r--korganizer/koincidenceeditor.cpp6
-rw-r--r--korganizer/kojournaleditor.cpp4
-rw-r--r--korganizer/kojournalview.cpp6
-rw-r--r--korganizer/kojournalview.h2
-rw-r--r--korganizer/kolistview.cpp16
-rw-r--r--korganizer/kolistview.h4
-rw-r--r--korganizer/komailclient.cpp24
-rw-r--r--korganizer/komonthview.cpp30
-rw-r--r--korganizer/komonthview.h2
-rw-r--r--korganizer/koprefs.cpp4
-rw-r--r--korganizer/koprefsdialog.cpp6
-rw-r--r--korganizer/korgac/alarmdialog.cpp12
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.cpp6
-rw-r--r--korganizer/korgac/testalarmdlg.cpp16
-rw-r--r--korganizer/korganizer.cpp2
-rw-r--r--korganizer/korganizer.h2
-rw-r--r--korganizer/korganizer_part.cpp8
-rw-r--r--korganizer/korganizer_part.h2
-rw-r--r--korganizer/kotimelineview.cpp4
-rw-r--r--korganizer/kotimelineview.h2
-rw-r--r--korganizer/kotodoeditor.cpp8
-rw-r--r--korganizer/kotodoview.cpp12
-rw-r--r--korganizer/kotodoview.h2
-rw-r--r--korganizer/kotodoviewitem.cpp8
-rw-r--r--korganizer/kotodoviewitem.h4
-rw-r--r--korganizer/koviewmanager.cpp2
-rw-r--r--korganizer/kowhatsnextview.cpp28
-rw-r--r--korganizer/kowhatsnextview.h4
-rw-r--r--korganizer/mailscheduler.cpp2
-rw-r--r--korganizer/multiagendaview.cpp14
-rw-r--r--korganizer/multiagendaview.h2
-rw-r--r--korganizer/navigatorbar.cpp24
-rw-r--r--korganizer/plugins/datenums/configdialog.cpp2
-rw-r--r--korganizer/plugins/datenums/datenums.cpp4
-rw-r--r--korganizer/plugins/exchange/exchange.cpp6
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp2
-rw-r--r--korganizer/plugins/exchange/exchangedialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp4
-rw-r--r--korganizer/plugins/printing/journal/calprintjournalconfig_base.ui8
-rw-r--r--korganizer/plugins/printing/list/calprintlistconfig_base.ui8
-rw-r--r--korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui8
-rw-r--r--korganizer/plugins/printing/year/calprintyearconfig_base.ui6
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp4
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp16
-rw-r--r--korganizer/plugins/projectview/koprojectview.h2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp4
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.h2
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.cpp2
-rw-r--r--korganizer/previewdialog.cpp2
-rw-r--r--korganizer/printing/calprintdayconfig_base.ui6
-rw-r--r--korganizer/printing/calprintdefaultplugins.cpp36
-rw-r--r--korganizer/printing/calprinter.cpp10
-rw-r--r--korganizer/printing/calprintincidenceconfig_base.ui2
-rw-r--r--korganizer/printing/calprintmonthconfig_base.ui4
-rw-r--r--korganizer/printing/calprintpluginbase.cpp54
-rw-r--r--korganizer/printing/calprinttodoconfig_base.ui12
-rw-r--r--korganizer/printing/calprintweekconfig_base.ui10
-rw-r--r--korganizer/publishdialog_base.ui2
-rw-r--r--korganizer/resourceview.cpp24
-rw-r--r--korganizer/resourceview.h2
-rw-r--r--korganizer/searchdialog.cpp16
-rw-r--r--korganizer/statusdialog.cpp10
-rw-r--r--korganizer/statusdialog.h2
-rw-r--r--korganizer/template_management_dialog_base.ui2
-rw-r--r--korganizer/timelabels.cpp6
-rw-r--r--korn/ChangeLog4
-rw-r--r--korn/accountmanager.cpp12
-rw-r--r--korn/boxcontainer.cpp4
-rw-r--r--korn/boxcontaineritem.cpp28
-rw-r--r--korn/dcopdrop.cpp4
-rw-r--r--korn/dockeditem.cpp2
-rw-r--r--korn/hvitem.cpp2
-rw-r--r--korn/imap_proto.cpp4
-rw-r--r--korn/kconf_update/korn-3-4-config_change.cpp6
-rw-r--r--korn/keditlistboxman.cpp64
-rw-r--r--korn/kio.cpp4
-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_subjects.cpp4
-rw-r--r--korn/kmail_proto.cpp12
-rw-r--r--korn/kornaccountcfg.ui4
-rw-r--r--korn/kornaccountcfgimpl.cpp16
-rw-r--r--korn/kornaccountcfgimpl.h2
-rw-r--r--korn/kornboxcfg.ui130
-rw-r--r--korn/kornboxcfgimpl.cpp10
-rw-r--r--korn/korncfgimpl.cpp26
-rw-r--r--korn/kornshell.cpp6
-rw-r--r--korn/maildlg.cpp2
-rw-r--r--korn/maildrop.cpp16
-rw-r--r--korn/mailsubject.cpp2
-rw-r--r--korn/mbox_proto.cpp2
-rw-r--r--korn/password.cpp10
-rw-r--r--korn/polldrop.cpp2
-rw-r--r--korn/pop3_proto.cpp2
-rw-r--r--korn/process_proto.cpp2
-rw-r--r--korn/progress_dialog.ui6
-rw-r--r--korn/qmail_proto.cpp2
-rw-r--r--korn/subjectsdlg.cpp6
-rw-r--r--kresources/birthdays/resourcekabc.cpp10
-rw-r--r--kresources/birthdays/resourcekabcconfig.cpp2
-rw-r--r--kresources/blogging/resourcebloggingsettings.ui4
-rw-r--r--kresources/blogging/xmlrpcjob.cpp4
-rw-r--r--kresources/caldav/config.cpp2
-rw-r--r--kresources/caldav/configwidgets.cpp6
-rw-r--r--kresources/caldav/job.cpp6
-rw-r--r--kresources/caldav/resource.cpp32
-rw-r--r--kresources/carddav/config.cpp2
-rw-r--r--kresources/carddav/configwidgets.cpp6
-rw-r--r--kresources/carddav/job.cpp2
-rw-r--r--kresources/carddav/resource.cpp18
-rw-r--r--kresources/egroupware/debugdialog.cpp6
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp8
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpcconfig.cpp2
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp4
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpcconfig.cpp2
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.cpp4
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpcconfig.cpp2
-rw-r--r--kresources/egroupware/todostatemapper.cpp2
-rw-r--r--kresources/egroupware/xmlrpciface.cpp2
-rw-r--r--kresources/exchange/resourceexchange.cpp6
-rw-r--r--kresources/exchange/resourceexchangeconfig.cpp2
-rw-r--r--kresources/featureplan/benchmarkfeaturelist.cpp2
-rw-r--r--kresources/featureplan/dumpfeaturelist.cpp2
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplanconfig.cpp2
-rw-r--r--kresources/groupdav/groupdavglobals.cpp2
-rw-r--r--kresources/groupware/kabc_resourcegroupwareconfig.cpp2
-rw-r--r--kresources/groupware/kcal_resourcegroupwareconfig.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp4
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.cpp4
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp10
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp6
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp12
-rw-r--r--kresources/groupwise/soap/groupwiseserver.h4
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp2
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp8
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp6
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp6
-rw-r--r--kresources/groupwise/soap/soapC.cpp2958
-rw-r--r--kresources/groupwise/soap/soapH.h314
-rw-r--r--kresources/groupwise/soap/soapStub.h306
-rw-r--r--kresources/groupwise/soap/stdsoap2.h4
-rw-r--r--kresources/kolab/kabc/contact.cpp18
-rw-r--r--kresources/kolab/kabc/contact.h4
-rw-r--r--kresources/kolab/kcal/event.cpp16
-rw-r--r--kresources/kolab/kcal/incidence.cpp30
-rw-r--r--kresources/kolab/kcal/incidence.h4
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp18
-rw-r--r--kresources/kolab/kcal/task.cpp34
-rw-r--r--kresources/kolab/kcal/task.h6
-rw-r--r--kresources/kolab/knotes/note.cpp2
-rw-r--r--kresources/kolab/knotes/resourcekolab.cpp2
-rw-r--r--kresources/kolab/shared/kolabbase.cpp32
-rw-r--r--kresources/kolab/shared/kolabbase.h10
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp8
-rw-r--r--kresources/lib/folderconfig.cpp2
-rw-r--r--kresources/lib/folderlister.cpp4
-rw-r--r--kresources/lib/folderlistview.cpp6
-rw-r--r--kresources/lib/folderselectdialog.cpp10
-rw-r--r--kresources/lib/kabc_resourcegroupwarebaseconfig.cpp2
-rw-r--r--kresources/lib/kcal_cachesettingsdlg.cpp2
-rw-r--r--kresources/lib/kcal_resourcegroupwarebaseconfig.cpp2
-rw-r--r--kresources/newexchange/Incidence.mapping4
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp8
-rw-r--r--kresources/remote/resourceremote.cpp2
-rw-r--r--kresources/remote/resourceremoteconfig.cpp2
-rw-r--r--kresources/scalix/kabc/contact.cpp20
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp8
-rw-r--r--kresources/scalix/kioslave/scalix.cpp14
-rw-r--r--kresources/scalix/knotes/resourcescalix.cpp2
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.cpp12
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.cpp12
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp10
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp4
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.cpp10
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp14
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp18
-rw-r--r--kresources/scalix/scalixadmin/settings.cpp4
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp4
-rw-r--r--kresources/scalix/shared/scalixbase.cpp32
-rw-r--r--kresources/scalix/shared/scalixbase.h10
-rw-r--r--kresources/slox/kabcresourceslox.cpp4
-rw-r--r--kresources/slox/kabcresourcesloxconfig.cpp2
-rw-r--r--kresources/slox/kcalresourceslox.cpp16
-rw-r--r--kresources/slox/kcalresourcesloxconfig.cpp2
-rw-r--r--kresources/slox/sloxbase.h2
-rw-r--r--kresources/slox/webdavhandler.cpp8
-rw-r--r--kresources/slox/webdavhandler.h6
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.cpp4
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp2
-rw-r--r--ktnef/gui/attachpropertydialog.cpp2
-rw-r--r--ktnef/gui/attachpropertydialogbase.ui6
-rw-r--r--ktnef/gui/ktnefmain.cpp8
-rw-r--r--ktnef/gui/ktnefview.cpp2
-rw-r--r--ktnef/gui/qwmf.cpp12
-rw-r--r--ktnef/gui/qwmf.h8
-rw-r--r--ktnef/gui/wmfstruct.h8
-rw-r--r--ktnef/ktnef/ktnefparser.h2
-rw-r--r--ktnef/lib/ktnefparser.cpp88
-rw-r--r--ktnef/lib/ktnefwriter.cpp2
-rw-r--r--ktnef/tests/mapi_attach_data_obj.tnefbin348539 -> 348479 bytes
-rw-r--r--libemailfunctions/networkstatus.cpp36
-rw-r--r--libemailfunctions/networkstatus.h20
-rw-r--r--libemailfunctions/tests/testemail.cpp2
-rw-r--r--libkcal/attachmenthandler.cpp4
-rw-r--r--libkcal/attendee.cpp10
-rw-r--r--libkcal/attendee.h6
-rw-r--r--libkcal/calendar.cpp10
-rw-r--r--libkcal/calendarlocal.cpp4
-rw-r--r--libkcal/calendarnull.cpp2
-rw-r--r--libkcal/calendarresources.h2
-rw-r--r--libkcal/calfilter.cpp4
-rw-r--r--libkcal/calformat.cpp10
-rw-r--r--libkcal/calselectdialog.cpp10
-rw-r--r--libkcal/confirmsavedialog.cpp4
-rw-r--r--libkcal/convertqtopia.cpp2
-rw-r--r--libkcal/dndfactory.cpp8
-rw-r--r--libkcal/dummyscheduler.cpp2
-rw-r--r--libkcal/exceptions.cpp2
-rw-r--r--libkcal/htmlexport.cpp24
-rw-r--r--libkcal/icaldrag.cpp2
-rw-r--r--libkcal/icalformat.cpp18
-rw-r--r--libkcal/icalformatimpl.cpp32
-rw-r--r--libkcal/incidence.cpp34
-rw-r--r--libkcal/incidence.h14
-rw-r--r--libkcal/incidencebase.cpp22
-rw-r--r--libkcal/incidencebase.h6
-rw-r--r--libkcal/incidenceformatter.cpp406
-rw-r--r--libkcal/person.cpp2
-rw-r--r--libkcal/qtopiaformat.cpp6
-rw-r--r--libkcal/resourcecached.cpp14
-rw-r--r--libkcal/resourcecachedconfig.cpp2
-rw-r--r--libkcal/resourcecalendar.cpp6
-rw-r--r--libkcal/resourcelocalconfig.cpp4
-rw-r--r--libkcal/resourcelocaldirconfig.cpp2
-rw-r--r--libkcal/scheduler.cpp60
-rw-r--r--libkcal/scheduler.h30
-rw-r--r--libkcal/tests/fbrecurring.cpp2
-rw-r--r--libkcal/tests/readandwrite.cpp2
-rw-r--r--libkcal/tests/testcalendar.cpp2
-rw-r--r--libkcal/tests/testfields.cpp30
-rw-r--r--libkcal/tests/testrecurprevious.cpp2
-rw-r--r--libkcal/tests/testrecurrence.cpp2
-rw-r--r--libkcal/tests/testrecurrencetype.cpp2
-rw-r--r--libkcal/tests/testrecurson.cpp2
-rw-r--r--libkcal/tests/testvcalexport.cpp2
-rw-r--r--libkcal/todo.cpp8
-rw-r--r--libkcal/vcaldrag.cpp2
-rw-r--r--libkcal/vcalformat.cpp34
-rw-r--r--libkcal/vcalformat.h4
-rw-r--r--libkcal/versit/readme.txt10
-rw-r--r--libkmime/CLASSTREE.bodyparts2
-rw-r--r--libkmime/kmime_content.cpp18
-rw-r--r--libkmime/kmime_content.h2
-rw-r--r--libkmime/kmime_header_parsing.cpp20
-rw-r--r--libkmime/kmime_headers.cpp20
-rw-r--r--libkmime/kmime_parsers.cpp4
-rw-r--r--libkmime/kmime_util.cpp10
-rw-r--r--libkmime/tests/test_dates.cpp10
-rw-r--r--libkpgp/kpgp.cpp28
-rw-r--r--libkpgp/kpgp.h4
-rw-r--r--libkpgp/kpgpbase.cpp32
-rw-r--r--libkpgp/kpgpbase2.cpp62
-rw-r--r--libkpgp/kpgpbase5.cpp60
-rw-r--r--libkpgp/kpgpbase6.cpp36
-rw-r--r--libkpgp/kpgpbaseG.cpp60
-rw-r--r--libkpgp/kpgpblock.cpp8
-rw-r--r--libkpgp/kpgpblock.h22
-rw-r--r--libkpgp/kpgpui.cpp62
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp10
-rw-r--r--libkpimexchange/core/exchangedownload.cpp8
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp2
-rw-r--r--libkpimexchange/core/exchangeprogress.cpp4
-rw-r--r--libkpimexchange/core/exchangeupload.cpp4
-rw-r--r--libkpimidentities/identity.cpp10
-rw-r--r--libkpimidentities/identitycombo.cpp2
-rw-r--r--libkpimidentities/identitymanager.cpp2
-rw-r--r--libksieve/parser/lexer.cpp6
-rw-r--r--libksieve/shared/error.cpp30
-rw-r--r--libksieve/tests/parsertest.cpp2
-rw-r--r--libtdenetwork/gpgmepp/importresult.cpp4
-rw-r--r--libtdenetwork/gpgmepp/importresult.h4
-rw-r--r--libtdenetwork/gpgmepp/key.cpp2
-rw-r--r--libtdenetwork/gpgmepp/key.h4
-rw-r--r--libtdenetwork/libgpgme-copy/assuan/assuan-uds.c2
-rw-r--r--libtdenetwork/libgpgme-copy/assuan/assuan.h4
-rw-r--r--libtdenetwork/libgpgme-copy/gpgme/ChangeLog8
-rw-r--r--libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c4
-rw-r--r--libtdenetwork/libgpgme-copy/gpgme/gpgme.h2
-rw-r--r--libtdenetwork/qgpgme/dataprovider.cpp2
-rw-r--r--libtdepim/addresseeemailselection.cpp10
-rw-r--r--libtdepim/addresseelineedit.cpp10
-rw-r--r--libtdepim/addresseeselector.cpp18
-rw-r--r--libtdepim/addresseeview.cpp158
-rw-r--r--libtdepim/addressesdialog.cpp4
-rw-r--r--libtdepim/addresspicker.ui14
-rw-r--r--libtdepim/broadcaststatus.cpp28
-rw-r--r--libtdepim/categoryeditdialog.cpp12
-rw-r--r--libtdepim/categoryeditdialog_base.ui4
-rw-r--r--libtdepim/categoryselectdialog_base.ui2
-rw-r--r--libtdepim/clicklineedit.cpp8
-rw-r--r--libtdepim/completionordereditor.cpp6
-rw-r--r--libtdepim/csshelper.cpp56
-rw-r--r--libtdepim/designerfields.cpp14
-rw-r--r--libtdepim/embeddedurlpage.cpp8
-rw-r--r--libtdepim/htmldiffalgodisplay.cpp22
-rw-r--r--libtdepim/kaddrbook.cpp6
-rw-r--r--libtdepim/kcmdesignerfields.cpp34
-rw-r--r--libtdepim/kconfigwizard.cpp2
-rw-r--r--libtdepim/kdateedit.cpp12
-rw-r--r--libtdepim/kdatepickerpopup.cpp8
-rw-r--r--libtdepim/kdatepickerpopup.h2
-rw-r--r--libtdepim/kfileio.cpp54
-rw-r--r--libtdepim/kfoldertree.cpp10
-rw-r--r--libtdepim/kfoldertree.h4
-rw-r--r--libtdepim/kimportdialog.cpp6
-rw-r--r--libtdepim/kincidencechooser.cpp10
-rw-r--r--libtdepim/komposer/core/pluginmanager.cpp24
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp10
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp22
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditorui.rc2
-rw-r--r--libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp6
-rw-r--r--libtdepim/kpixmapregionselectorwidget.cpp8
-rw-r--r--libtdepim/kprefsdialog.cpp18
-rw-r--r--libtdepim/kprefsdialog.h24
-rw-r--r--libtdepim/kregexp3.cpp10
-rw-r--r--libtdepim/krsqueezedtextlabel.cpp16
-rw-r--r--libtdepim/krsqueezedtextlabel.h6
-rw-r--r--libtdepim/kscoring.cpp10
-rw-r--r--libtdepim/kscoringeditor.cpp18
-rw-r--r--libtdepim/ksubscription.cpp10
-rw-r--r--libtdepim/ksubscription.h6
-rw-r--r--libtdepim/kvcarddrag.cpp8
-rw-r--r--libtdepim/kwidgetlister.cpp4
-rw-r--r--libtdepim/kwidgetlister.h6
-rw-r--r--libtdepim/ldapclient.cpp58
-rw-r--r--libtdepim/ldapsearchdialog.cpp30
-rw-r--r--libtdepim/linklocator.cpp22
-rw-r--r--libtdepim/maillistdrag.cpp8
-rw-r--r--libtdepim/maillistdrag.h2
-rw-r--r--libtdepim/overlaywidget.cpp4
-rw-r--r--libtdepim/overlaywidget.h6
-rw-r--r--libtdepim/progressdialog.cpp56
-rw-r--r--libtdepim/progressdialog.h10
-rw-r--r--libtdepim/progressmanager.cpp16
-rw-r--r--libtdepim/progressmanager.h20
-rw-r--r--libtdepim/qutf7codec.cpp12
-rw-r--r--libtdepim/qutf7codec.h4
-rw-r--r--libtdepim/qutf7codecplugin.cpp4
-rw-r--r--libtdepim/recentaddresses.cpp6
-rw-r--r--libtdepim/sendsmsdialog.cpp26
-rw-r--r--libtdepim/statusbarprogresswidget.cpp8
-rw-r--r--libtdepim/tests/test_kregexp.cpp4
-rw-r--r--libtdepim/tests/testdateedit.cpp6
-rw-r--r--libtdepim/tests/testutf7decoder.cpp2
-rw-r--r--libtdepim/tests/testutf7encoder.cpp2
-rw-r--r--libtdepim/tests/testutf7encoder2.cpp2
-rw-r--r--libtdepim/tests/testwizard.cpp2
-rw-r--r--mimelib/doc/msgcmp.html26
-rw-r--r--mimelib/mimelib/msgcmp.h24
-rw-r--r--plugins/kmail/bodypartformatter/attendeeselector.cpp6
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp40
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp4
-rw-r--r--plugins/kmail/bodypartformatter/text_xdiff.cpp8
-rw-r--r--plugins/kmail/bodypartformatter/ui_attendeeselector.ui4
-rw-r--r--wizards/egroupwarewizard.cpp4
-rw-r--r--wizards/exchangewizard.cpp2
-rw-r--r--wizards/groupwarewizard.cpp6
-rw-r--r--wizards/groupwisewizard.cpp2
-rw-r--r--wizards/kmailchanges.cpp16
-rw-r--r--wizards/kolabkmailchanges.cpp2
-rw-r--r--wizards/kolabwizard.cpp10
-rw-r--r--wizards/overviewpage.cpp28
-rw-r--r--wizards/scalixkmailchanges.cpp2
-rw-r--r--wizards/scalixwizard.cpp10
-rw-r--r--wizards/sloxwizard.cpp2
1213 files changed, 11562 insertions, 11562 deletions
diff --git a/NewsLog.txt b/NewsLog.txt
index 9bd2bde6..bc32c09d 100644
--- a/NewsLog.txt
+++ b/NewsLog.txt
@@ -66,7 +66,7 @@ Problems addressed
------------------
* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
-* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
+* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
-* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
+* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
@@ -551,7 +551,7 @@ Problems addressed
* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
-* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
+* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
-* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
+* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------
-* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
+* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
* kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
Problems addressed
------------------
-* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
+* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
*Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
* Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------
-* Prevent crash after changing the tqlayout and replying then. (778728)
+* Prevent crash after changing the layout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -2063,7 +2063,7 @@ Bugfixes
Korganizer
-----------
-- proko35 W1-9 icon tqalignment was improved.
+- proko35 W1-9 icon alignment was improved.
Additional Fixes
================
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 1cca9d90..bb37d26e 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").tqarg(feedURL) );
+ widget->statusLabel->setText( i18n("Downloading %1").arg(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.").tqarg(feedURL));
+ KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
KDialogBase::slotCancel();
}
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 7d9a8a48..8ee0614d 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -75,7 +75,7 @@
<property name="name">
<cstring>urlEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -115,7 +115,7 @@
<cstring>statusLabel</cstring>
</property>
<property name="text">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
</widget>
<spacer>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 223db5a0..a21aaa70 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
TQStringList storageParams;
- storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
+ storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
if (factory != 0)
{
@@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
{
m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
- KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
+ KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
}
Filters::ArticleFilterList list;
@@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
initFonts();
- RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
+ RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
}
void Part::loadPlugins()
@@ -428,11 +428,11 @@ bool Part::openFile()
if (file.size() > 0) // don't backup empty files
{
- TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
+ TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
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>").tqarg(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>").arg(backup), i18n("XML Parsing Error") );
}
if (!doc.setContent(listBackup))
@@ -444,10 +444,10 @@ bool Part::openFile()
{
if (file.size() > 0) // don't backup empty files
{
- TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
+ TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().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>").tqarg(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>").arg(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)").tqarg(m_file), i18n("Write error") );
+ KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
return;
}
@@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
{
// this is a dirty fix to get the main window used for the tray icon
- TQWidgetList *l = kapp->tqtopLevelWidgets();
+ TQWidgetList *l = kapp->topLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;
@@ -639,10 +639,10 @@ void Part::importFile(const KURL& url)
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)").tqarg(filename), i18n("OPML Parsing Error") );
+ KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(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.").tqarg(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.").arg(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?").tqarg(file.name()),
+ i18n("The file %1 already exists; do you want to overwrite it?").arg(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").tqarg(file.name()), i18n("Write Error") );
+ KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(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>")
- .tqarg( programName, programName, backendName );
+ .arg( 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 .tqarg( programName ).
+ // even think about changing the above to .arg( 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>")
- .tqarg( oldProgramName, programName, backendName );
+ .arg( 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>")
- .tqarg( programName, oldHostName, backendName );
+ .arg( 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>")
- .tqarg( oldProgramName, programName, oldHostName, backendName );
+ .arg( oldProgramName, programName, oldHostName, backendName );
}
KCursorSaver idle( KBusyPtr::idle() );
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 3aa9dd2c..e296f29c 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -90,18 +90,18 @@
#include <tqfile.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmultilineedit.h>
#include <tqpopupmenu.h>
#include <tqptrlist.h>
-#include <tqstylesheet.h>
-#include <tqtextstream.h>
+#include <stylesheet.h>
+#include <textstream.h>
#include <tqtimer.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqvaluevector.h>
#include <tqwhatsthis.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
namespace Akregator {
@@ -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>").tqarg(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>").arg(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>").tqarg(node->title());
+ msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(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>").tqarg(node->title());
+ msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
{
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
if (!Settings::resetQuickFilterOnNodeChange())
{
- m_searchBar->slotSetqStatus(Settings::statusFilter());
+ m_searchBar->slotSeStatus(Settings::statusFilter());
m_searchBar->slotSetText(Settings::textFilter());
}
@@ -884,7 +884,7 @@ void View::slotFeedAdd()
}
- TreeNode* lastChild = group->tqchildren().last();
+ TreeNode* lastChild = group->children().last();
addFeed(TQString(), lastChild, group, false);
}
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
if (delay > 0)
m_markReadTimer->start( delay*1000, true );
else
- a.setqStatus(Article::Read);
+ a.seStatus(Article::Read);
}
}
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
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>").tqarg(TQStyleSheet::escape(articles.first().title()));
+ msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
break;
default:
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
- (*it).setqStatus(Article::Read);
+ (*it).seStatus(Article::Read);
}
void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
- (*it).setqStatus(Article::Unread);
+ (*it).seStatus(Article::Unread);
}
void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
return;
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
- (*it).setqStatus(Article::New);
+ (*it).seStatus(Article::New);
}
void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
if (article.isNull())
return;
- article.setqStatus(Article::Read);
+ article.seStatus(Article::Read);
}
void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
m_searchBar->slotSetText(config->readEntry("searchLine"));
int statusfilter = config->readNumEntry("searchCombo", -1);
if (statusfilter != -1)
- m_searchBar->slotSetqStatus(statusfilter);
+ m_searchBar->slotSeStatus(statusfilter);
}
int selectedID = config->readNumEntry("selectedNodeID", -1);
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 3b7f321a..36ba87d6 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
0001 0000 Keep
*/
- enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
+ enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
TQString guid;
Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
if (article.meta("deleted") == "true")
{ // if article is in deleted state, we just add the status and omit the rest
d->status = Private::Read | Private::Deleted;
- d->archive->setqStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
}
else
{ // article is not deleted, let's add it to the archive
@@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
d->archive->setCommentsLink(d->guid, article.commentsLink().url());
d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
- d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
+ d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
d->archive->setAuthor(d->guid, article.author());
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
int statusInt = status.toInt();
if (statusInt == New)
statusInt = Unread;
- setqStatus(statusInt);
+ seStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
- setqStatus(Read);
+ seStatus(Read);
d->status = Private::Deleted | Private::Read;
- d->archive->setqStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);
if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
return Unread;
}
-void Article::setqStatus(int stat)
+void Article::seStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
- int oldtqStatus = status();
+ int oldStatus = status();
- if (oldtqStatus != stat)
+ if (oldStatus != stat)
{
switch (stat)
{
@@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
- d->archive->setqStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
if (d->feed)
- d->feed->setArticleChanged(*this, oldtqStatus);
+ d->feed->setArticleChanged(*this, oldStatus);
}
}
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
void Article::setKeep(bool keep)
{
d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
- d->archive->setqStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}
diff --git a/akregator/src/article.h b/akregator/src/article.h
index 8d1baa2a..902aa47c 100644
--- a/akregator/src/article.h
+++ b/akregator/src/article.h
@@ -57,7 +57,7 @@ namespace Akregator
class Article
{
public:
- enum tqStatus { Unread=0, Read, New };
+ enum Status { Unread=0, Read, New };
typedef TQValueList<Article> List;
Article();
@@ -80,7 +80,7 @@ namespace Akregator
bool isNull() const;
int status() const;
- void setqStatus(int s);
+ void seStatus(int s);
void offsetPubDate(int secs);
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 21009190..fc1ff29a 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj)
switch (subj)
{
case Title:
- return TQString::tqfromLatin1("Title");
+ return TQString::fromLatin1("Title");
case Link:
- return TQString::tqfromLatin1("Link");
+ return TQString::fromLatin1("Link");
case Author:
- return TQString::tqfromLatin1("Author");
+ return TQString::fromLatin1("Author");
case Description:
- return TQString::tqfromLatin1("Description");
- case tqStatus:
- return TQString::tqfromLatin1("Status");
+ return TQString::fromLatin1("Description");
+ case Status:
+ return TQString::fromLatin1("Status");
case KeepFlag:
- return TQString::tqfromLatin1("KeepFlag");
+ return TQString::fromLatin1("KeepFlag");
default: // should never happen (TM)
- return TQString::tqfromLatin1("Description");
+ return TQString::fromLatin1("Description");
}
}
Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
{
- if (subjStr == TQString::tqfromLatin1("Title"))
+ if (subjStr == TQString::fromLatin1("Title"))
return Title;
- else if (subjStr == TQString::tqfromLatin1("Link"))
+ else if (subjStr == TQString::fromLatin1("Link"))
return Link;
- else if (subjStr == TQString::tqfromLatin1("Description"))
+ else if (subjStr == TQString::fromLatin1("Description"))
return Description;
- else if (subjStr == TQString::tqfromLatin1("Author"))
+ else if (subjStr == TQString::fromLatin1("Author"))
return Author;
- else if (subjStr == TQString::tqfromLatin1("Status"))
- return tqStatus;
- else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
+ else if (subjStr == TQString::fromLatin1("Status"))
+ return Status;
+ else if (subjStr == TQString::fromLatin1("KeepFlag"))
return KeepFlag;
// hopefully never reached
@@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
switch (pred)
{
case Contains:
- return TQString::tqfromLatin1("Contains");
+ return TQString::fromLatin1("Contains");
case Equals:
- return TQString::tqfromLatin1("Equals");
+ return TQString::fromLatin1("Equals");
case Matches:
- return TQString::tqfromLatin1("Matches");
+ return TQString::fromLatin1("Matches");
case Negation:
- return TQString::tqfromLatin1("Negation");
+ return TQString::fromLatin1("Negation");
default:// hopefully never reached
- return TQString::tqfromLatin1("Contains");
+ return TQString::fromLatin1("Contains");
}
}
Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
{
- if (predStr == TQString::tqfromLatin1("Contains"))
+ if (predStr == TQString::fromLatin1("Contains"))
return Contains;
- else if (predStr == TQString::tqfromLatin1("Equals"))
+ else if (predStr == TQString::fromLatin1("Equals"))
return Equals;
- else if (predStr == TQString::tqfromLatin1("Matches"))
+ else if (predStr == TQString::fromLatin1("Matches"))
return Matches;
- else if (predStr == TQString::tqfromLatin1("Negation"))
+ else if (predStr == TQString::fromLatin1("Negation"))
return Negation;
// hopefully never reached
@@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
void Criterion::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));
+ config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
- config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
+ config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));
- config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
+ config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));
- config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
+ config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
}
void Criterion::readConfig(KConfig* config)
{
- m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject")));
- m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate")));
- TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii());
+ m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
+ m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
+ TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii());
if (type != TQVariant::Invalid)
{
- m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
+ m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
}
}
@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
// ### Maybe use prettyURL here?
concreteSubject = TQVariant(article.link().url());
break;
- case tqStatus:
+ case Status:
concreteSubject = TQVariant(article.status());
break;
case KeepFlag:
@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const
void ArticleMatcher::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
+ config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
- config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
+ config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());
int index = 0;
for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it)
{
- config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index));
+ config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index));
(*it).writeConfig(config);
++index;
}
@@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const
void ArticleMatcher::readConfig(KConfig* config)
{
m_criteria.clear();
- m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));
+ m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
- int count = config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
+ int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
for (int i = 0; i < count; ++i)
{
Criterion c;
- config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
+ config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
c.readConfig(config);
m_criteria.append(c);
}
@@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const
ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr)
{
- if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
+ if (assocStr == TQString::fromLatin1("LogicalAnd"))
return LogicalAnd;
- else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
+ else if (assocStr == TQString::fromLatin1("LogicalOr"))
return LogicalOr;
else
return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
switch (association)
{
case LogicalAnd:
- return TQString::tqfromLatin1("LogicalAnd");
+ return TQString::fromLatin1("LogicalAnd");
case LogicalOr:
- return TQString::tqfromLatin1("LogicalOr");
+ return TQString::fromLatin1("LogicalOr");
default:
- return TQString::tqfromLatin1("None");
+ return TQString::fromLatin1("None");
}
}
@@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
void TagMatcher::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
- config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
+ config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
+ config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
}
void TagMatcher::readConfig(KConfig* config)
{
- d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
+ d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
}
bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
void SeStatusAction::exec(Article& article)
{
if (!article.isNull())
- article.setqStatus(m_status);
+ article.seStatus(m_status);
}
int SeStatusAction::status() const
@@ -457,20 +457,20 @@ int SeStatusAction::status() const
return m_status;
}
-void SeStatusAction::setqStatus(int status)
+void SeStatusAction::seStatus(int status)
{
m_status = status;
}
void SeStatusAction::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
- config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
+ config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction"));
+ config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
}
void SeStatusAction::readConfig(KConfig* config)
{
- m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
+ m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
}
bool SeStatusAction::operator==(const AbstractAction& other)
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
void ArticleFilterList::writeConfig(KConfig* config) const
{
- config->setGroup(TQString::tqfromLatin1("Filters"));
- config->writeEntry(TQString::tqfromLatin1("count"), count());
+ config->setGroup(TQString::fromLatin1("Filters"));
+ config->writeEntry(TQString::fromLatin1("count"), count());
int index = 0;
for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
{
- config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
+ config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
(*it).writeConfig(config);
++index;
}
@@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const
void ArticleFilterList::readConfig(KConfig* config)
{
clear();
- config->setGroup(TQString::tqfromLatin1("Filters"));
- int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
+ config->setGroup(TQString::fromLatin1("Filters"));
+ int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
for (int i = 0; i < count; ++i)
{
- config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
+ config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
ArticleFilter filter;
filter.readConfig(config);
append(filter);
@@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config)
void AssignTagAction::readConfig(KConfig* config)
{
- m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
+ m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
}
void AssignTagAction::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
- config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
+ config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
+ config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
}
bool AssignTagAction::operator==(const AbstractAction& other)
@@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/)
void DeleteAction::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
+ config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
}
bool DeleteAction::operator==(const AbstractAction& other)
@@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config)
delete d->action;
d->action = 0;
- d->name = config->readEntry(TQString::tqfromLatin1("name"));
- d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
+ d->name = config->readEntry(TQString::fromLatin1("name"));
+ d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);
- TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
+ TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));
- if (matcherType == TQString::tqfromLatin1("TagMatcher"))
+ if (matcherType == TQString::fromLatin1("TagMatcher"))
d->matcher = new TagMatcher();
- else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
+ else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
d->matcher = new ArticleMatcher();
if (d->matcher)
d->matcher->readConfig(config);
- TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
+ TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));
- if (actionType == TQString::tqfromLatin1("AssignTagAction"))
+ if (actionType == TQString::fromLatin1("AssignTagAction"))
d->action = new AssignTagAction();
- else if (actionType == TQString::tqfromLatin1("DeleteAction"))
+ else if (actionType == TQString::fromLatin1("DeleteAction"))
d->action = new DeleteAction();
- else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
+ else if (actionType == TQString::fromLatin1("SeStatusAction"))
d->action = new SeStatusAction();
if (d->action)
@@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)
void ArticleFilter::writeConfig(KConfig* config) const
{
- config->writeEntry(TQString::tqfromLatin1("name"), d->name);
- config->writeEntry(TQString::tqfromLatin1("id"), d->id);
+ config->writeEntry(TQString::fromLatin1("name"), d->name);
+ config->writeEntry(TQString::fromLatin1("id"), d->id);
d->matcher->writeConfig(config);
d->action->writeConfig(config);
}
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index c39d72e8..ddf05490 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
virtual void exec(Article& article);
int status() const;
- void setqStatus(int status);
+ void seStatus(int status);
virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
@@ -259,7 +259,7 @@ class Criterion
public:
enum Subject {
- Title, Description, Author, Link, tqStatus, KeepFlag
+ Title, Description, Author, Link, Status, KeepFlag
};
static TQString subjectToString(Subject subj);
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index 0ec644ad..3449ee9c 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message)
const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
- t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+ t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
}
void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index f8ad74bc..40195069 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").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
- text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title())));
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(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.replace("/", "_").replace(":", "_");
KURL u(m_view->m_imageDir);
u.setFileName(file);
- text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
+ text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
}
else text += "<div class=\"body\">";
if( !node->description().isEmpty() )
{
- text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
- text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description());
+ text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description())));
+ text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
text += "</div>\n"; // /description
}
if ( !node->htmlUrl().isEmpty() )
{
- 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 += 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 += "</div>\n"; // / link
}
- //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread());
+ //text += i18n("<b>Unread articles:</b> %1").arg(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").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
- text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
+ 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());
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").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
- text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
+ 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());
if(node->unread() == 0)
text += i18n(" (no unread articles)");
else
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
void ArticleViewer::generateNormalModeCSS()
{
- const TQColorGroup & cg = TQApplication::tqpalette().active();
+ const TQColorGroup & cg = TQApplication::palette().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").tqarg(Settings::standardFont())
- .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
- .tqarg(cg.text().name())
- .tqarg(cg.base().name());
+ "}\n\n").arg(Settings::standardFont())
+ .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+ .arg(cg.text().name())
+ .arg(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")
- .tqarg(cg.link().name())
- .tqarg(cg.background().name())
- .tqarg(cg.text().name());
+ .arg(cg.link().name())
+ .arg(cg.background().name())
+ .arg(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")
- .tqarg(cg.highlightedText().name())
- .tqarg(cg.highlightedText().name())
- .tqarg(cg.highlightedText().name())
- .tqarg(cg.highlightedText().name());
+ .arg(cg.highlightedText().name())
+ .arg(cg.highlightedText().name())
+ .arg(cg.highlightedText().name())
+ .arg(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").tqarg(cg.highlight().name())
- .tqarg(cg.highlightedText().name());
+ "}\n\n").arg(cg.highlight().name())
+ .arg(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::tqpalette().active();
+ const TQColorGroup & cg = TQApplication::palette().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").tqarg(Settings::standardFont())
- .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
- .tqarg(cg.text().name())
- .tqarg(cg.base().name());
+ "}\n\n").arg(Settings::standardFont())
+ .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+ .arg(cg.text().name())
+ .arg(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")
- .tqarg(cg.link().name())
- .tqarg(cg.background().name())
- .tqarg(cg.text().name());
+ .arg(cg.link().name())
+ .arg(cg.background().name())
+ .arg(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")
- .tqarg(cg.highlightedText().name())
- .tqarg(cg.highlightedText().name())
- .tqarg(cg.highlightedText().name())
- .tqarg(cg.highlightedText().name());
+ .arg(cg.highlightedText().name())
+ .arg(cg.highlightedText().name())
+ .arg(cg.highlightedText().name())
+ .arg(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").tqarg(cg.highlight().name())
- .tqarg(cg.highlightedText().name());
+ "}\n\n").arg(cg.highlight().name())
+ .arg(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.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+ content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+ content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
else
- content = content.tqarg( "" );
+ content = content.arg( "" );
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")
- .tqarg(AKREGATOR_VERSION) // Akregator version
- .tqarg("http://akregator.kde.org/"); // Akregator homepage URL
+ .arg(AKREGATOR_VERSION) // Akregator version
+ .arg("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.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
+ write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
end();
}
TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article)
{
TQString text;
- text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
if (!article.title().isEmpty())
{
- text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
if (article.link().isValid())
text += "<a href=\""+article.link().url()+"\">";
text += article.title().replace("<", "&lt;").replace(">", "&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\">").tqarg(directionOf(i18n("Date")));
- text += TQString ("%1:").tqarg(i18n("Date"));
+ text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
+ text += TQString ("%1:").arg(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\">").tqarg(directionOf(i18n("Author")));
- text += TQString ("%1:").tqarg(i18n("Author"));
+ text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
+ text += TQString ("%1:").arg(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").tqarg(feed->htmlUrl()).tqarg(u.url());
+ text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
}
if (!article.description().isEmpty())
{
- text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
+ text += TQString("<div dir=\"%1\">").arg(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>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type);
+ //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(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").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+ text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
KURL link = article.link();
if (!article.title().isEmpty())
{
- text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
+ text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
if (link.isValid())
text += "<a href=\""+link.url()+"\">";
text += article.title().replace("<", "&lt;").replace(">", "&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\">").tqarg(directionOf(i18n("Date")));
- text += TQString ("%1:").tqarg(i18n("Date"));
+ text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
+ text += TQString ("%1:").arg(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\">").tqarg(directionOf(i18n("Author")));
- text += TQString ("%1:").tqarg(i18n("Author"));
+ text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
+ text += TQString ("%1:").arg(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").tqarg(feed->htmlUrl()).tqarg(u.url());
+ text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
}
if (!article.description().isEmpty())
{
- text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
+ text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
text += "<span class=\"content\">"+article.description()+"</span>";
text += "</div>";
}
diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp
index 5f48d5be..1141d465 100644
--- a/akregator/src/dragobjects.cpp
+++ b/akregator/src/dragobjects.cpp
@@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e)
bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles)
{
articles.clear();
- TQByteArray array = e->tqencodedData("akregator/articles");
+ TQByteArray array = e->encodedData("akregator/articles");
TQDataStream stream(array, IO_ReadOnly);
@@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
return 0;
}
-TQByteArray ArticleDrag::tqencodedData(const char* mime) const
+TQByteArray ArticleDrag::encodedData(const char* mime) const
{
TQCString mimetype(mime);
if (mimetype == "akregator/articles")
@@ -86,7 +86,7 @@ TQByteArray ArticleDrag::tqencodedData(const char* mime) const
}
else
{
- return KURLDrag::tqencodedData(mime);
+ return KURLDrag::encodedData(mime);
}
}
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index ebe931f6..3b4d7f8d 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -57,7 +57,7 @@ public:
protected:
- virtual TQByteArray tqencodedData(const char* mime) const;
+ virtual TQByteArray encodedData(const char* mime) const;
virtual const char* format(int i) const;
private:
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index 44d40977..f24c4809 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
TQValueList<Article>::Iterator en = tarticles.end();
for (it = tarticles.begin(); it != en; ++it)
- (*it).setqStatus(Article::Read);
+ (*it).seStatus(Article::Read);
setNotificationMode(true, true);
}
}
@@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
queue->addFeed(this);
else
{
- uint now = TQDateTime::tqcurrentDateTime().toTime_t();
+ uint now = TQDateTime::currentDateTime().toTime_t();
// workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
// this fixes annoying behaviour of akregator, especially when the host is reachable
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
d->addedArticlesNotify.append(mya);
if (!mya.isDeleted() && !markImmediatelyAsRead())
- mya.setqStatus(Article::New);
+ mya.seStatus(Article::New);
else
- mya.setqStatus(Article::Read);
+ mya.seStatus(Article::Read);
changed = true;
}
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
{
mya.setKeep(old.keep());
int oldstatus = old.status();
- old.setqStatus(Article::Read);
+ old.seStatus(Article::Read);
d->articles.remove(old.guid());
appendArticle(mya);
- mya.setqStatus(oldstatus);
+ mya.seStatus(oldstatus);
d->updatedArticlesNotify.append(mya);
changed = true;
@@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const
bool Feed::isExpired(const Article& a) const
{
- TQDateTime now = TQDateTime::tqcurrentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
int expiryAge = -1;
// check whether the feed uses the global default and the default is limitArticleAge
if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
{
if ((*it).status() == Article::New)
{
- (*it).setqStatus(Article::Unread);
+ (*it).seStatus(Article::Unread);
}
}
@@ -579,7 +579,7 @@ void Feed::tryFetch()
{
d->fetchError = false;
- d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
+ d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
//connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
}
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
nodeModified();
}
-void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
+void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
{
// Note that loader instances delete themselves
d->loader = 0;
@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
else
{
d->fetchError = true;
- d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
+ d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
emit fetchError(this);
}
return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
appendArticles(doc);
- d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
+ d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
emit fetched(this);
}
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
articlesModified();
}
-void Feed::setArticleChanged(Article& a, int oldtqStatus)
+void Feed::setArticleChanged(Article& a, int oldStatus)
{
- if (oldtqStatus != -1)
+ if (oldStatus != -1)
{
- int newtqStatus = a.status();
- if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
+ int newStatus = a.status();
+ if (oldStatus == Article::Read && newStatus != Article::Read)
setUnread(unread()+1);
- else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
+ else if (oldStatus != Article::Read && newStatus == Article::Read)
setUnread(unread()-1);
}
d->updatedArticlesNotify.append(a);
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 663723cb..2c5bc768 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -43,7 +43,7 @@ namespace KPIM {
// needed for slot fetchCompleted()
using RSS::Document;
using RSS::Loader;
-using RSS::tqStatus;
+using RSS::Status;
namespace Akregator
{
@@ -254,7 +254,7 @@ namespace Akregator
private slots:
- void fetchCompleted(Loader *loader, Document doc, tqStatus status);
+ void fetchCompleted(Loader *loader, Document doc, Status status);
void slotImageFetched(const TQPixmap& image);
private:
@@ -265,10 +265,10 @@ namespace Akregator
void setArticleDeleted(Article& a);
/** notifies that article @c mya was changed
- @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
+ @param oldStatus if the status was changed, it contains the old status, -1 otherwise
To be called by @ref Article
*/
- void setArticleChanged(Article& a, int oldtqStatus=-1);
+ void setArticleChanged(Article& a, int oldStatus=-1);
void enforceLimitArticleNumber();
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index 1daf1aa6..e05aded8 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
if ( !flatList()->contains(parent) )
parent = rootNode();
- TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
+ TQValueList<TreeNode*> children = list->rootNode()->children();
- TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() );
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
+ TQValueList<TreeNode*>::ConstIterator end( children.end() );
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
{
list->rootNode()->removeChild(*it);
parent->insertChild(*it, after);
@@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const
TQDomElement body = doc.createElement( "body" );
root.appendChild( body );
- TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
+ TQValueList<TreeNode*> children = rootNode()->children();
- TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() );
+ TQValueList<TreeNode*>::ConstIterator end( children.end() );
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
body.appendChild( (*it)->toOPML(body, doc) );
return doc;
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index aa6101de..8998882f 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
virtual bool visitFolder(Folder* node)
{
// delete child items recursively before deleting parent
- TQValueList<TreeNode*> tqchildren = node->tqchildren();
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it )
+ TQValueList<TreeNode*> children = node->children();
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
visit(*it);
visitTreeNode(node);
@@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
}
m_view->d->itemDict.insert(node, item);
- TQValueList<TreeNode*> tqchildren = node->tqchildren();
+ TQValueList<TreeNode*> children = node->children();
- // add tqchildren recursively
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it )
+ // add children recursively
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
visit(*it);
m_view->connectToNode(node);
@@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
}
m_view->d->itemDict.insert(node, item);
- // add tqchildren recursively
- TQValueList<TreeNode*> tqchildren = node->tqchildren();
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it )
+ // add children recursively
+ TQValueList<TreeNode*> children = node->children();
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it )
visit(*it);
m_view->connectToNode(node);
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index 52952089..8d4394e1 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -157,7 +157,7 @@ protected slots:
/** Called when a node in the tree is taken out of the tree (parent->removeChild())
- Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
+ Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
/** deletes the item belonging to the deleted node */
diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h
index 32e6c058..98176756 100644
--- a/akregator/src/feedstorage.h
+++ b/akregator/src/feedstorage.h
@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
virtual uint pubDate(const TQString& guid) = 0;
virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
virtual int status(const TQString& guid) = 0;
- virtual void setqStatus(const TQString& guid, int status) = 0;
+ virtual void seStatus(const TQString& guid, int status) = 0;
virtual TQString title(const TQString& guid) = 0;
virtual void setTitle(const TQString& guid, const TQString& title) = 0;
virtual TQString description(const TQString& guid) = 0;
diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp
index 5ae572a8..6fe97395 100644
--- a/akregator/src/feedstoragedummyimpl.cpp
+++ b/akregator/src/feedstoragedummyimpl.cpp
@@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid)
return contains(guid) ? d->entries[guid].status : 0;
}
-void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status)
+void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
{
if (contains(guid))
d->entries[guid].status = status;
@@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source
setHash(guid, source->hash(guid));
setLink(guid, source->link(guid));
setPubDate(guid, source->pubDate(guid));
- setqStatus(guid, source->status(guid));
+ seStatus(guid, source->status(guid));
setTitle(guid, source->title(guid));
TQStringList tags = source->tags(guid);
diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h
index bd71a11c..fc9ab31f 100644
--- a/akregator/src/feedstoragedummyimpl.h
+++ b/akregator/src/feedstoragedummyimpl.h
@@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage
virtual uint pubDate(const TQString& guid);
virtual void setPubDate(const TQString& guid, uint pubdate);
virtual int status(const TQString& guid);
- virtual void setqStatus(const TQString& guid, int status);
+ virtual void seStatus(const TQString& guid, int status);
virtual TQString title(const TQString& guid);
virtual void setTitle(const TQString& guid, const TQString& title);
virtual TQString description(const TQString& guid);
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index 1d2c6a5c..739b0cf1 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -39,9 +39,9 @@ namespace Akregator {
class Folder::FolderPrivate
{
public:
- /** List of tqchildren */
- TQValueList<TreeNode*> tqchildren;
- /** caching unread count of tqchildren */
+ /** List of children */
+ TQValueList<TreeNode*> children;
+ /** caching unread count of children */
int unread;
/** whether or not the folder is expanded */
bool open;
@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)
Folder* Folder::fromOPML(TQDomElement e)
{
- Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title")));
- fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false")));
- fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() );
+ Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title")));
+ fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false")));
+ fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() );
return fg;
}
@@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate)
Folder::~Folder()
{
TreeNode* tmp = 0;
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it)
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it)
{
delete tmp;
tmp = *it;
@@ -93,8 +93,8 @@ Folder::~Folder()
TQStringList Folder::tags() const
{
TQStringList t;
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
{
// intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now.
TQStringList t2 = (*it)->tags();
@@ -108,8 +108,8 @@ TQStringList Folder::tags() const
TQValueList<Article> Folder::articles(const TQString& tag)
{
TQValueList<Article> seq;
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
seq += (*it)->articles(tag);
return seq;
@@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
el.setAttribute("isOpen", d->open ? "true" : "false");
el.setAttribute( "id", TQString::number(id()) );
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
el.appendChild( (*it)->toOPML(el, document) );
return el;
}
-TQValueList<TreeNode*> Folder::tqchildren() const
+TQValueList<TreeNode*> Folder::children() const
{
- return d->tqchildren;
+ return d->children;
}
void Folder::insertChild(TreeNode* node, TreeNode* after)
{
- int pos = d->tqchildren.findIndex(after);
+ int pos = d->children.findIndex(after);
if (pos < 0)
prependChild(node);
@@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node)
// kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl;
if (node)
{
- if (index >= d->tqchildren.size())
- d->tqchildren.append(node);
+ if (index >= d->children.size())
+ d->children.append(node);
else
- d->tqchildren.insert(d->tqchildren.at(index), node);
+ d->children.insert(d->children.at(index), node);
node->setParent(this);
connectToNode(node);
updateUnreadCount();
@@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node)
// kdDebug() << "enter Folder::appendChild() " << node->title() << endl;
if (node)
{
- d->tqchildren.append(node);
+ d->children.append(node);
node->setParent(this);
connectToNode(node);
updateUnreadCount();
@@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node)
// kdDebug() << "enter Folder::prependChild() " << node->title() << endl;
if (node)
{
- d->tqchildren.prepend(node);
+ d->children.prepend(node);
node->setParent(this);
connectToNode(node);
updateUnreadCount();
@@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node)
void Folder::removeChild(TreeNode* node)
{
// kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
- if (node && d->tqchildren.contains(node))
+ if (node && d->children.contains(node))
{
node->setParent(0);
- d->tqchildren.remove(node);
+ d->children.remove(node);
disconnectFromNode(node);
updateUnreadCount();
emit signalChildRemoved(this, node);
@@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node)
TreeNode* Folder::firstChild()
{
- return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first();
+ return d->children.isEmpty() ? 0 : d->children.first();
}
TreeNode* Folder::lastChild()
{
- return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last();
+ return d->children.isEmpty() ? 0 : d->children.last();
}
bool Folder::isOpen() const
@@ -246,8 +246,8 @@ int Folder::totalCount() const
{
int totalCount = 0;
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
totalCount += (*it)->totalCount();
return totalCount;
@@ -257,8 +257,8 @@ void Folder::updateUnreadCount()
{
int unread = 0;
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
unread += (*it)->unread();
d->unread = unread;
@@ -267,8 +267,8 @@ void Folder::updateUnreadCount()
void Folder::slotMarkAllArticlesAsRead()
{
setNotificationMode(false);
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
(*it)->slotMarkAllArticlesAsRead();
setNotificationMode(true, true);
}
@@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/)
void Folder::slotChildDestroyed(TreeNode* node)
{
- d->tqchildren.remove(node);
+ d->children.remove(node);
updateUnreadCount();
nodeModified();
}
@@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node)
void Folder::slotDeleteExpiredArticles()
{
setNotificationMode(false);
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
(*it)->slotDeleteExpiredArticles();
setNotificationMode(true, true);
}
void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
{
- TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
- for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
+ TQValueList<TreeNode*>::ConstIterator en = d->children.end();
+ for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
(*it)->slotAddToFetchQueue(queue, intervalFetchOnly);
}
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index 6743dd57..f2a024dd 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -61,18 +61,18 @@ namespace Akregator
virtual bool accept(TreeNodeVisitor* visitor);
- /** returns recursively concatenated articles of tqchildren
- @return an article sequence containing articles of tqchildren */
+ /** returns recursively concatenated articles of children
+ @return an article sequence containing articles of children */
virtual TQValueList<Article> articles(const TQString& tag=TQString());
/** returns a list of all tags occurring in the subtree of this folder */
virtual TQStringList tags() const;
- /** returns the number of unread articles in all tqchildren
+ /** returns the number of unread articles in all children
@return number of unread articles */
virtual int unread() const;
- /** returns the number of articles in all tqchildren
+ /** returns the number of articles in all children
@return number of articles */
virtual int totalCount() const;
@@ -86,10 +86,10 @@ namespace Akregator
@return The newly created element representing this feed group */
virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
- /** returns the (direct) tqchildren of this node.
+ /** returns the (direct) children of this node.
@return a list of pointers to the child nodes
*/
- virtual TQValueList<TreeNode*> tqchildren() const;
+ virtual TQValueList<TreeNode*> children() const;
/** inserts @c node as child after child node @c after.
if @c after is not a child of this group, @c node will be inserted as first child
@@ -105,7 +105,7 @@ namespace Akregator
@param node the tree node to insert */
virtual void appendChild(TreeNode* node);
- /** remove @c node from tqchildren. Note that @c node will not be deleted
+ /** remove @c node from children. Note that @c node will not be deleted
@param node the child node to remove */
virtual void removeChild(TreeNode* node);
@@ -134,7 +134,7 @@ namespace Akregator
/** Delete expired articles recursively. */
virtual void slotDeleteExpiredArticles();
- /** Mark articles of tqchildren recursively as read. */
+ /** Mark articles of children recursively as read. */
virtual void slotMarkAllArticlesAsRead();
/** Called when a child was modified.
@@ -147,7 +147,7 @@ namespace Akregator
*/
virtual void slotChildDestroyed(TreeNode* node);
- /** enqueues tqchildren recursively for fetching
+ /** enqueues children recursively for fetching
@param queue a fetch queue
@param internvalFetchesOnly */
virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false);
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 647f580c..23cd86ef 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -23,7 +23,7 @@
*/
#include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kactioncollection.h>
#include <kdebug.h>
@@ -175,7 +175,7 @@ void Frame::setStarted()
{
if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false);
- m_progressItem->setqStatus(i18n("Loading..."));
+ m_progressItem->seStatus(i18n("Loading..."));
//connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
m_state=Started;
emit started();
@@ -184,7 +184,7 @@ void Frame::setStarted()
void Frame::setCanceled(const TQString &s)
{
if(m_progressItem) {
- m_progressItem->setqStatus(i18n("Loading canceled"));
+ m_progressItem->seStatus(i18n("Loading canceled"));
m_progressItem->setComplete();
m_progressItem = 0;
}
@@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s)
void Frame::setCompleted()
{
if(m_progressItem) {
- m_progressItem->setqStatus(i18n("Loading completed"));
+ m_progressItem->seStatus(i18n("Loading completed"));
m_progressItem->setComplete();
m_progressItem = 0;
}
diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h
index e12d6e8d..95dca1f6 100644
--- a/akregator/src/kcursorsaver.h
+++ b/akregator/src/kcursorsaver.h
@@ -17,9 +17,9 @@ namespace Akregator {
class KCursorSaver : public TQt
{
public:
- /// constructor taking TQCursor tqshapes
- KCursorSaver(TQt::tqCursorShape tqshape) {
- TQApplication::setOverrideCursor( TQCursor(tqshape) );
+ /// constructor taking TQCursor shapes
+ KCursorSaver(TQt::CursorShape shape) {
+ TQApplication::setOverrideCursor( TQCursor(shape) );
inited = true;
}
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 59949244..24413053 100644
--- a/akregator/src/librss/article.cpp
+++ b/akregator/src/librss/article.cpp
@@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
TQDomNode n;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
- if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
- (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
+ if ( (e.tagName()==TQString::fromLatin1("link")) &&
+ (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
{
- d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
+ d->link=n.toElement().attribute(TQString::fromLatin1("href"));
break;
}
}
}
else
{
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
d->link = elemText;
}
// prefer content/content:encoded over summary/description for feeds that provide it
- TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
+ TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
if (!(elemText = extractNode(node, tagName, false)).isNull())
d->description = elemText;
if (d->description.isEmpty())
{
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
d->description = elemText;
if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html
{
- if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
d->description = elemText;
}
}
@@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
if (format == AtomFeed)
{
if (version == vAtom_1_0)
- elemText = extractNode(node, TQString::tqfromLatin1("updated"));
+ elemText = extractNode(node, TQString::fromLatin1("updated"));
else
- elemText = extractNode(node, TQString::tqfromLatin1("issued"));
+ elemText = extractNode(node, TQString::fromLatin1("issued"));
if (!elemText.isNull())
time = parseISO8601Date(elemText);
}
else
{
- elemText = extractNode(node, TQString::tqfromLatin1("pubDate"));
+ elemText = extractNode(node, TQString::fromLatin1("pubDate"));
if (!elemText.isNull())
time = KRFCDate::parseDate(elemText);
}
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
{
time = parseISO8601Date(elemText);
}
@@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
if (time != 0)
d->pubDate.setTime_t(time);
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
+ if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
d->commentsLink = elemText;
}
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
+ if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
d->numComments = elemText.toInt();
}
@@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
// in RSS 1.0, we use <item about> attribute as ID
// FIXME: pass format version instead of checking for attribute
- if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about")))
+ if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about")))
{
- d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work
+ d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work
d->guidIsPermaLink = false;
}
else
{
- tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
+ tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
TQDomNode n = node.namedItem(tagName);
if (!n.isNull())
{
d->guidIsPermaLink = (format==AtomFeed)? false : true;
- if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
+ if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
if (!(elemText = extractNode(node, tagName)).isNull())
d->guid = elemText;
}
@@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
md5Machine.update(d->title.utf8());
md5Machine.update(d->description.utf8());
d->guid = TQString(md5Machine.hexDigest().data());
- d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
+ d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
}
- TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure"));
+ TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure"));
if (enclosure.isElement())
d->enclosure = Enclosure::fromXML(enclosure.toElement());
@@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
{
if (i.isElement())
{
- if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
+ if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
{
- TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
+ TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
d->meta[type] = i.toElement().text();
}
- else if (i.toElement().tagName() == TQString::tqfromLatin1("category"))
+ else if (i.toElement().tagName() == TQString::fromLatin1("category"))
{
d->categories.append(Category::fromXML(i.toElement()));
}
diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp
index c020655c..7f6c70c2 100644
--- a/akregator/src/librss/category.cpp
+++ b/akregator/src/librss/category.cpp
@@ -64,8 +64,8 @@ bool Category::isNull() const
Category Category::fromXML(const TQDomElement& e)
{
Category obj;
- if (e.hasAttribute(TQString::tqfromLatin1("domain")))
- obj.d->domain = e.attribute(TQString::tqfromLatin1("domain"));
+ if (e.hasAttribute(TQString::fromLatin1("domain")))
+ obj.d->domain = e.attribute(TQString::fromLatin1("domain"));
obj.d->category = e.text();
obj.d->isNull = false;
return obj;
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index 610cec4c..6d6e1057 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format)
TQDomNode n;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
- if ( (e.tagName() == TQString::tqfromLatin1("link"))
- && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
+ if ( (e.tagName() == TQString::fromLatin1("link"))
+ && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
{
- return n.toElement().attribute(TQString::tqfromLatin1("href"));
+ return n.toElement().attribute(TQString::fromLatin1("href"));
}
}
}
- return extractNode(node, TQString::tqfromLatin1("link"));
+ return extractNode(node, TQString::fromLatin1("link"));
}
@@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
TQString attr;
// we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
- if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
+ if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
d->valid=false;
else
d->valid=true;
- attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString());
- if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
+ attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString());
+ if (rootNode.toElement().tagName()==TQString::fromLatin1("feed"))
{
d->format=AtomFeed;
- if (attr == TQString::tqfromLatin1("0.3"))
+ if (attr == TQString::fromLatin1("0.3"))
d->version = vAtom_0_3;
- else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
+ else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
d->version = vAtom_0_2;
- else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
+ else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
d->version = vAtom_0_1;
else
d->version = vAtom_1_0;
@@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
else
{
d->format=RSSFeed;
- if (attr == TQString::tqfromLatin1("0.91"))
+ if (attr == TQString::fromLatin1("0.91"))
d->version = v0_91;
- else if (attr == TQString::tqfromLatin1("0.92"))
+ else if (attr == TQString::fromLatin1("0.92"))
d->version = v0_92;
- else if (attr == TQString::tqfromLatin1("0.93"))
+ else if (attr == TQString::fromLatin1("0.93"))
d->version = v0_93;
- else if (attr == TQString::tqfromLatin1("0.94"))
+ else if (attr == TQString::fromLatin1("0.94"))
d->version = v0_94;
else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally
// backward-compatible, this should work
@@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
if (d->format==UnknownFormat)
{
- attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString());
+ attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString());
if (!attr.isNull()) {
/*
* Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@@ -147,11 +147,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
* distinguish the RSS versions by analyzing the relationship between
* the nodes.
*/
- if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
+ if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
d->format=RSSFeed;
d->version = v0_90;
}
- else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
+ else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
d->format=RSSFeed;
d->version = v1_0;
}
@@ -163,7 +163,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
if (d->format == AtomFeed)
channelNode=rootNode;
else
- channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel"));
+ channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
if (!(elemText = extractTitle(channelNode)).isNull())
d->title = elemText;
@@ -192,27 +192,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
else
{
// following is a HACK for broken 0.91 feeds like xanga.com's
- if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
+ if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
parentNode = rootNode;
else
parentNode = channelNode;
}
// image and textinput aren't supported by Atom.. handle in case feed provides
- TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
+ TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
if (!n.isNull())
d->image = new Image(n);
- n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
+ n = parentNode.namedItem(TQString::fromLatin1("textinput"));
if (!n.isNull())
d->textInput = new TextInput(n);
// Our (hopefully faster) version of elementsByTagName()
TQString tagName;
if (d->format == AtomFeed)
- tagName=TQString::tqfromLatin1("entry");
+ tagName=TQString::fromLatin1("entry");
else
- tagName=TQString::tqfromLatin1("item");
+ tagName=TQString::fromLatin1("item");
for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
@@ -220,212 +220,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->articles.append(Article(e, d->format, d->version));
}
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
d->copyright = elemText;
if (d->format == AtomFeed)
- elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString());
+ elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString());
else
- elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
+ elemText = extractNode(channelNode, TQString::fromLatin1("language"));
if (!elemText.isNull()){
- if (elemText == TQString::tqfromLatin1("af"))
+ if (elemText == TQString::fromLatin1("af"))
d->language = af;
- else if (elemText == TQString::tqfromLatin1("sq"))
+ else if (elemText == TQString::fromLatin1("sq"))
d->language = sq;
- else if (elemText == TQString::tqfromLatin1("eu"))
+ else if (elemText == TQString::fromLatin1("eu"))
d->language = eu;
- else if (elemText == TQString::tqfromLatin1("be"))
+ else if (elemText == TQString::fromLatin1("be"))
d->language = be;
- else if (elemText == TQString::tqfromLatin1("bg"))
+ else if (elemText == TQString::fromLatin1("bg"))
d->language = bg;
- else if (elemText == TQString::tqfromLatin1("ca"))
+ else if (elemText == TQString::fromLatin1("ca"))
d->language = ca;
- else if (elemText == TQString::tqfromLatin1("zh-cn"))
+ else if (elemText == TQString::fromLatin1("zh-cn"))
d->language = zh_cn;
- else if (elemText == TQString::tqfromLatin1("zh-tw"))
+ else if (elemText == TQString::fromLatin1("zh-tw"))
d->language = zh_tw;
- else if (elemText == TQString::tqfromLatin1("hr"))
+ else if (elemText == TQString::fromLatin1("hr"))
d->language = hr;
- else if (elemText == TQString::tqfromLatin1("cs"))
+ else if (elemText == TQString::fromLatin1("cs"))
d->language = cs;
- else if (elemText == TQString::tqfromLatin1("da"))
+ else if (elemText == TQString::fromLatin1("da"))
d->language = da;
- else if (elemText == TQString::tqfromLatin1("nl"))
+ else if (elemText == TQString::fromLatin1("nl"))
d->language = nl;
- else if (elemText == TQString::tqfromLatin1("nl-be"))
+ else if (elemText == TQString::fromLatin1("nl-be"))
d->language = nl_be;
- else if (elemText == TQString::tqfromLatin1("nl-nl"))
+ else if (elemText == TQString::fromLatin1("nl-nl"))
d->language = nl_nl;
- else if (elemText == TQString::tqfromLatin1("en"))
+ else if (elemText == TQString::fromLatin1("en"))
d->language = en;
- else if (elemText == TQString::tqfromLatin1("en-au"))
+ else if (elemText == TQString::fromLatin1("en-au"))
d->language = en_au;
- else if (elemText == TQString::tqfromLatin1("en-bz"))
+ else if (elemText == TQString::fromLatin1("en-bz"))
d->language = en_bz;
- else if (elemText == TQString::tqfromLatin1("en-ca"))
+ else if (elemText == TQString::fromLatin1("en-ca"))
d->language = en_ca;
- else if (elemText == TQString::tqfromLatin1("en-ie"))
+ else if (elemText == TQString::fromLatin1("en-ie"))
d->language = en_ie;
- else if (elemText == TQString::tqfromLatin1("en-jm"))
+ else if (elemText == TQString::fromLatin1("en-jm"))
d->language = en_jm;
- else if (elemText == TQString::tqfromLatin1("en-nz"))
+ else if (elemText == TQString::fromLatin1("en-nz"))
d->language = en_nz;
- else if (elemText == TQString::tqfromLatin1("en-ph"))
+ else if (elemText == TQString::fromLatin1("en-ph"))
d->language = en_ph;
- else if (elemText == TQString::tqfromLatin1("en-za"))
+ else if (elemText == TQString::fromLatin1("en-za"))
d->language = en_za;
- else if (elemText == TQString::tqfromLatin1("en-tt"))
+ else if (elemText == TQString::fromLatin1("en-tt"))
d->language = en_tt;
- else if (elemText == TQString::tqfromLatin1("en-gb"))
+ else if (elemText == TQString::fromLatin1("en-gb"))
d->language = en_gb;
- else if (elemText == TQString::tqfromLatin1("en-us"))
+ else if (elemText == TQString::fromLatin1("en-us"))
d->language = en_us;
- else if (elemText == TQString::tqfromLatin1("en-zw"))
+ else if (elemText == TQString::fromLatin1("en-zw"))
d->language = en_zw;
- else if (elemText == TQString::tqfromLatin1("fo"))
+ else if (elemText == TQString::fromLatin1("fo"))
d->language = fo;
- else if (elemText == TQString::tqfromLatin1("fi"))
+ else if (elemText == TQString::fromLatin1("fi"))
d->language = fi;
- else if (elemText == TQString::tqfromLatin1("fr"))
+ else if (elemText == TQString::fromLatin1("fr"))
d->language = fr;
- else if (elemText == TQString::tqfromLatin1("fr-be"))
+ else if (elemText == TQString::fromLatin1("fr-be"))
d->language = fr_be;
- else if (elemText == TQString::tqfromLatin1("fr-ca"))
+ else if (elemText == TQString::fromLatin1("fr-ca"))
d->language = fr_ca;
- else if (elemText == TQString::tqfromLatin1("fr-fr"))
+ else if (elemText == TQString::fromLatin1("fr-fr"))
d->language = fr_fr;
- else if (elemText == TQString::tqfromLatin1("fr-lu"))
+ else if (elemText == TQString::fromLatin1("fr-lu"))
d->language = fr_lu;
- else if (elemText == TQString::tqfromLatin1("fr-mc"))
+ else if (elemText == TQString::fromLatin1("fr-mc"))
d->language = fr_mc;
- else if (elemText == TQString::tqfromLatin1("fr-ch"))
+ else if (elemText == TQString::fromLatin1("fr-ch"))
d->language = fr_ch;
- else if (elemText == TQString::tqfromLatin1("gl"))
+ else if (elemText == TQString::fromLatin1("gl"))
d->language = gl;
- else if (elemText == TQString::tqfromLatin1("gd"))
+ else if (elemText == TQString::fromLatin1("gd"))
d->language = gd;
- else if (elemText == TQString::tqfromLatin1("de"))
+ else if (elemText == TQString::fromLatin1("de"))
d->language = de;
- else if (elemText == TQString::tqfromLatin1("de-at"))
+ else if (elemText == TQString::fromLatin1("de-at"))
d->language = de_at;
- else if (elemText == TQString::tqfromLatin1("de-de"))
+ else if (elemText == TQString::fromLatin1("de-de"))
d->language = de_de;
- else if (elemText == TQString::tqfromLatin1("de-li"))
+ else if (elemText == TQString::fromLatin1("de-li"))
d->language = de_li;
- else if (elemText == TQString::tqfromLatin1("de-lu"))
+ else if (elemText == TQString::fromLatin1("de-lu"))
d->language = de_lu;
- else if (elemText == TQString::tqfromLatin1("de-ch"))
+ else if (elemText == TQString::fromLatin1("de-ch"))
d->language = de_ch;
- else if (elemText == TQString::tqfromLatin1("el"))
+ else if (elemText == TQString::fromLatin1("el"))
d->language = el;
- else if (elemText == TQString::tqfromLatin1("hu"))
+ else if (elemText == TQString::fromLatin1("hu"))
d->language = hu;
- else if (elemText == TQString::tqfromLatin1("is"))
+ else if (elemText == TQString::fromLatin1("is"))
d->language = is;
- else if (elemText == TQString::tqfromLatin1("id"))
+ else if (elemText == TQString::fromLatin1("id"))
d->language = id;
- else if (elemText == TQString::tqfromLatin1("ga"))
+ else if (elemText == TQString::fromLatin1("ga"))
d->language = ga;
- else if (elemText == TQString::tqfromLatin1("it"))
+ else if (elemText == TQString::fromLatin1("it"))
d->language = it;
- else if (elemText == TQString::tqfromLatin1("it-it"))
+ else if (elemText == TQString::fromLatin1("it-it"))
d->language = it_it;
- else if (elemText == TQString::tqfromLatin1("it-ch"))
+ else if (elemText == TQString::fromLatin1("it-ch"))
d->language = it_ch;
- else if (elemText == TQString::tqfromLatin1("ja"))
+ else if (elemText == TQString::fromLatin1("ja"))
d->language = ja;
- else if (elemText == TQString::tqfromLatin1("ko"))
+ else if (elemText == TQString::fromLatin1("ko"))
d->language = ko;
- else if (elemText == TQString::tqfromLatin1("mk"))
+ else if (elemText == TQString::fromLatin1("mk"))
d->language = mk;
- else if (elemText == TQString::tqfromLatin1("no"))
+ else if (elemText == TQString::fromLatin1("no"))
d->language = no;
- else if (elemText == TQString::tqfromLatin1("pl"))
+ else if (elemText == TQString::fromLatin1("pl"))
d->language = pl;
- else if (elemText == TQString::tqfromLatin1("pt"))
+ else if (elemText == TQString::fromLatin1("pt"))
d->language = pt;
- else if (elemText == TQString::tqfromLatin1("pt-br"))
+ else if (elemText == TQString::fromLatin1("pt-br"))
d->language = pt_br;
- else if (elemText == TQString::tqfromLatin1("pt-pt"))
+ else if (elemText == TQString::fromLatin1("pt-pt"))
d->language = pt_pt;
- else if (elemText == TQString::tqfromLatin1("ro"))
+ else if (elemText == TQString::fromLatin1("ro"))
d->language = ro;
- else if (elemText == TQString::tqfromLatin1("ro-mo"))
+ else if (elemText == TQString::fromLatin1("ro-mo"))
d->language = ro_mo;
- else if (elemText == TQString::tqfromLatin1("ro-ro"))
+ else if (elemText == TQString::fromLatin1("ro-ro"))
d->language = ro_ro;
- else if (elemText == TQString::tqfromLatin1("ru"))
+ else if (elemText == TQString::fromLatin1("ru"))
d->language = ru;
- else if (elemText == TQString::tqfromLatin1("ru-mo"))
+ else if (elemText == TQString::fromLatin1("ru-mo"))
d->language = ru_mo;
- else if (elemText == TQString::tqfromLatin1("ru-ru"))
+ else if (elemText == TQString::fromLatin1("ru-ru"))
d->language = ru_ru;
- else if (elemText == TQString::tqfromLatin1("sr"))
+ else if (elemText == TQString::fromLatin1("sr"))
d->language = sr;
- else if (elemText == TQString::tqfromLatin1("sk"))
+ else if (elemText == TQString::fromLatin1("sk"))
d->language = sk;
- else if (elemText == TQString::tqfromLatin1("sl"))
+ else if (elemText == TQString::fromLatin1("sl"))
d->language = sl;
- else if (elemText == TQString::tqfromLatin1("es"))
+ else if (elemText == TQString::fromLatin1("es"))
d->language = es;
- else if (elemText == TQString::tqfromLatin1("es-ar"))
+ else if (elemText == TQString::fromLatin1("es-ar"))
d->language = es_ar;
- else if (elemText == TQString::tqfromLatin1("es-bo"))
+ else if (elemText == TQString::fromLatin1("es-bo"))
d->language = es_bo;
- else if (elemText == TQString::tqfromLatin1("es-cl"))
+ else if (elemText == TQString::fromLatin1("es-cl"))
d->language = es_cl;
- else if (elemText == TQString::tqfromLatin1("es-co"))
+ else if (elemText == TQString::fromLatin1("es-co"))
d->language = es_co;
- else if (elemText == TQString::tqfromLatin1("es-cr"))
+ else if (elemText == TQString::fromLatin1("es-cr"))
d->language = es_cr;
- else if (elemText == TQString::tqfromLatin1("es-do"))
+ else if (elemText == TQString::fromLatin1("es-do"))
d->language = es_do;
- else if (elemText == TQString::tqfromLatin1("es-ec"))
+ else if (elemText == TQString::fromLatin1("es-ec"))
d->language = es_ec;
- else if (elemText == TQString::tqfromLatin1("es-sv"))
+ else if (elemText == TQString::fromLatin1("es-sv"))
d->language = es_sv;
- else if (elemText == TQString::tqfromLatin1("es-gt"))
+ else if (elemText == TQString::fromLatin1("es-gt"))
d->language = es_gt;
- else if (elemText == TQString::tqfromLatin1("es-hn"))
+ else if (elemText == TQString::fromLatin1("es-hn"))
d->language = es_hn;
- else if (elemText == TQString::tqfromLatin1("es-mx"))
+ else if (elemText == TQString::fromLatin1("es-mx"))
d->language = es_mx;
- else if (elemText == TQString::tqfromLatin1("es-ni"))
+ else if (elemText == TQString::fromLatin1("es-ni"))
d->language = es_ni;
- else if (elemText == TQString::tqfromLatin1("es-pa"))
+ else if (elemText == TQString::fromLatin1("es-pa"))
d->language = es_pa;
- else if (elemText == TQString::tqfromLatin1("es-py"))
+ else if (elemText == TQString::fromLatin1("es-py"))
d->language = es_py;
- else if (elemText == TQString::tqfromLatin1("es-pe"))
+ else if (elemText == TQString::fromLatin1("es-pe"))
d->language = es_pe;
- else if (elemText == TQString::tqfromLatin1("es-pr"))
+ else if (elemText == TQString::fromLatin1("es-pr"))
d->language = es_pr;
- else if (elemText == TQString::tqfromLatin1("es-es"))
+ else if (elemText == TQString::fromLatin1("es-es"))
d->language = es_es;
- else if (elemText == TQString::tqfromLatin1("es-uy"))
+ else if (elemText == TQString::fromLatin1("es-uy"))
d->language = es_uy;
- else if (elemText == TQString::tqfromLatin1("es-ve"))
+ else if (elemText == TQString::fromLatin1("es-ve"))
d->language = es_ve;
- else if (elemText == TQString::tqfromLatin1("sv"))
+ else if (elemText == TQString::fromLatin1("sv"))
d->language = sv;
- else if (elemText == TQString::tqfromLatin1("sv-fi"))
+ else if (elemText == TQString::fromLatin1("sv-fi"))
d->language = sv_fi;
- else if (elemText == TQString::tqfromLatin1("sv-se"))
+ else if (elemText == TQString::fromLatin1("sv-se"))
d->language = sv_se;
- else if (elemText == TQString::tqfromLatin1("tr"))
+ else if (elemText == TQString::fromLatin1("tr"))
d->language = tr;
- else if (elemText == TQString::tqfromLatin1("uk"))
+ else if (elemText == TQString::fromLatin1("uk"))
d->language = uk;
else
d->language = UndefinedLanguage;
}
if (d->format == AtomFeed)
- tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds
+ tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
// but some broken feeds do this
else
- tagName=TQString::tqfromLatin1("pubDate");
+ tagName=TQString::fromLatin1("pubDate");
if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
time_t _time;
@@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->pubDate.setTime_t(_time);
}
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) {
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) {
time_t _time = parseISO8601Date(elemText);
/* \bug This isn't really the right way since it will set the date to
* Jan 1 1970, 1:00:00 if the passed date was invalid; this means that
@@ -451,9 +451,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
}
if (d->format == AtomFeed)
- tagName=TQString::tqfromLatin1("modified");
+ tagName=TQString::fromLatin1("modified");
else
- tagName=TQString::tqfromLatin1("lastBuildDate");
+ tagName=TQString::fromLatin1("lastBuildDate");
if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
time_t _time;
if (d->format == AtomFeed)
@@ -463,44 +463,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->lastBuildDate.setTime_t(_time);
}
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
d->rating = elemText;
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
d->docs = elemText;
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
d->managingEditor = elemText;
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
d->webMaster = elemText;
- if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
d->ttl = elemText.toUInt();
- n = channelNode.namedItem(TQString::tqfromLatin1("skipHours"));
+ n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
if (!n.isNull())
for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
- if (e.tagName() == TQString::tqfromLatin1("hour"))
+ if (e.tagName() == TQString::fromLatin1("hour"))
d->skipHours.append(e.text().toUInt());
- n = channelNode.namedItem(TQString::tqfromLatin1("skipDays"));
+ n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
if (!n.isNull()) {
Day day;
TQString elemText;
for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
- if (e.tagName() == TQString::tqfromLatin1("day")) {
+ if (e.tagName() == TQString::fromLatin1("day")) {
elemText = e.text().lower();
- if (elemText == TQString::tqfromLatin1("monday"))
+ if (elemText == TQString::fromLatin1("monday"))
day = Monday;
- else if (elemText == TQString::tqfromLatin1("tuesday"))
+ else if (elemText == TQString::fromLatin1("tuesday"))
day = Tuesday;
- else if (elemText == TQString::tqfromLatin1("wednesday"))
+ else if (elemText == TQString::fromLatin1("wednesday"))
day = Wednesday;
- else if (elemText == TQString::tqfromLatin1("thursday"))
+ else if (elemText == TQString::fromLatin1("thursday"))
day = Thursday;
- else if (elemText == TQString::tqfromLatin1("friday"))
+ else if (elemText == TQString::fromLatin1("friday"))
day = Friday;
- else if (elemText == TQString::tqfromLatin1("saturday"))
+ else if (elemText == TQString::fromLatin1("saturday"))
day = Saturday;
- else if (elemText == TQString::tqfromLatin1("sunday"))
+ else if (elemText == TQString::fromLatin1("sunday"))
day = Sunday;
else
day = UndefinedDay;
@@ -529,17 +529,17 @@ Version Document::version() const
TQString Document::verbVersion() const
{
switch (d->version) {
- case v0_90: return TQString::tqfromLatin1("0.90");
- case v0_91: return TQString::tqfromLatin1("0.91");
- case v0_92: return TQString::tqfromLatin1("0.92");
- case v0_93: return TQString::tqfromLatin1("0.93");
- case v0_94: return TQString::tqfromLatin1("0.94");
- case v1_0: return TQString::tqfromLatin1("1.0");
- case v2_0: return TQString::tqfromLatin1("2.0");
- case vAtom_0_3: return TQString::tqfromLatin1("0.3");
- case vAtom_0_2: return TQString::tqfromLatin1("0.2");
- case vAtom_0_1: return TQString::tqfromLatin1("0.1");
- case vAtom_1_0: return TQString::tqfromLatin1("1.0");
+ case v0_90: return TQString::fromLatin1("0.90");
+ case v0_91: return TQString::fromLatin1("0.91");
+ case v0_92: return TQString::fromLatin1("0.92");
+ case v0_93: return TQString::fromLatin1("0.93");
+ case v0_94: return TQString::fromLatin1("0.94");
+ case v1_0: return TQString::fromLatin1("1.0");
+ case v2_0: return TQString::fromLatin1("2.0");
+ case vAtom_0_3: return TQString::fromLatin1("0.3");
+ case vAtom_0_2: return TQString::fromLatin1("0.2");
+ case vAtom_0_1: return TQString::fromLatin1("0.1");
+ case vAtom_1_0: return TQString::fromLatin1("1.0");
}
return TQString();
}
diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp
index 66616268..e048fa88 100644
--- a/akregator/src/librss/enclosure.cpp
+++ b/akregator/src/librss/enclosure.cpp
@@ -57,30 +57,30 @@ Enclosure Enclosure::fromXML(const TQDomElement& e)
TQString url, type;
int length = -1;
- if (e.hasAttribute(TQString::tqfromLatin1("url")))
- url = e.attribute(TQString::tqfromLatin1("url"));
+ if (e.hasAttribute(TQString::fromLatin1("url")))
+ url = e.attribute(TQString::fromLatin1("url"));
- if (e.hasAttribute(TQString::tqfromLatin1("length")))
+ if (e.hasAttribute(TQString::fromLatin1("length")))
{
bool ok;
- int c = e.attribute(TQString::tqfromLatin1("length")).toInt(&ok);
+ int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok);
length = ok ? c : -1;
}
- if (e.hasAttribute(TQString::tqfromLatin1("type")))
- type = e.attribute(TQString::tqfromLatin1("type"));
+ if (e.hasAttribute(TQString::fromLatin1("type")))
+ type = e.attribute(TQString::fromLatin1("type"));
return Enclosure(url, length, type);
}
TQDomElement Enclosure::toXML(TQDomDocument document) const
{
- TQDomElement e = document.createElement(TQString::tqfromLatin1("enclosure"));
+ TQDomElement e = document.createElement(TQString::fromLatin1("enclosure"));
if (!d->url.isNull())
- e.setAttribute(TQString::tqfromLatin1("url"), d->url);
+ e.setAttribute(TQString::fromLatin1("url"), d->url);
if (d->length != -1)
- e.setAttribute(TQString::tqfromLatin1("length"), TQString::number(d->length));
+ e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length));
if (!d->type.isNull())
- e.setAttribute(TQString::tqfromLatin1("type"), d->type);
+ e.setAttribute(TQString::fromLatin1("type"), d->type);
return e;
}
diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h
index c714f566..091018cb 100644
--- a/akregator/src/librss/global.h
+++ b/akregator/src/librss/global.h
@@ -42,7 +42,7 @@ namespace RSS
* Possible status values returned by the signal
* Loader::loadingComplete().
*/
- enum tqStatus {
+ enum Status {
Success, /**
* Nothing went wrong so far, but you still have to check
* what values are returned by the classes since it's not
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 98074be3..cb8d7c86 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private)
{
TQString elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
d->title = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
d->url = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
d->link = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
d->description = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
d->height = elemText.toUInt();
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
d->width = elemText.toUInt();
}
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index edc38432..5fad1409 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -268,7 +268,7 @@ Loader *Loader::create()
Loader *Loader::create(TQObject *object, const char *slot)
{
Loader *loader = create();
- connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
+ connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
object, slot);
return loader;
}
@@ -326,7 +326,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success)
d->retriever = NULL;
Document rssDoc;
- tqStatus status = Success;
+ Status status = Success;
if (success) {
TQDomDocument doc;
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 2129bc79..59f47c9c 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -211,8 +211,8 @@ namespace RSS
*
* \code
* Loader *loader = Loader::create();
- * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
- * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus)));
+ * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+ * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
* loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
* \endcode
*
@@ -236,7 +236,7 @@ namespace RSS
* 'slotLoadingComplete' method might look like this:
*
* \code
- * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status)
+ * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status)
* {
* // Note that Loader::~Loader() is private, so you cannot delete Loader instances.
* // You don't need to do that anyway since Loader instances delete themselves.
@@ -322,9 +322,9 @@ namespace RSS
* the case if you intend to call getPixmap() on Document::image()!
* @param status A status byte telling whether there were any problems
* while retrieving or parsing the data.
- * @see Document, tqStatus
+ * @see Document, Status
*/
- void loadingComplete(Loader *loader, Document doc, tqStatus status);
+ void loadingComplete(Loader *loader, Document doc, Status status);
private slots:
void slotRetrieverDone(const TQByteArray &data, bool success);
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 571717ae..7d88c3d1 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
void Tester::test( const TQString &url )
{
Loader *loader = Loader::create();
- connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
- this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) );
+ connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+ this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
loader->loadFrom( url, new FileRetriever );
}
-void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status )
+void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
{
if ( status == Success )
{
diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h
index 18e18327..3d3e963b 100644
--- a/akregator/src/librss/testlibrss.h
+++ b/akregator/src/librss/testlibrss.h
@@ -10,7 +10,7 @@
using RSS::Loader;
using RSS::Document;
-using RSS::tqStatus;
+using RSS::Status;
class Tester : public TQObject
{
@@ -20,7 +20,7 @@ class Tester : public TQObject
void test( const TQString &url );
private slots:
- void slotLoadingComplete( Loader *loader, Document doc, tqStatus status );
+ void slotLoadingComplete( Loader *loader, Document doc, Status status );
};
#endif
diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp
index a12442fa..04799fca 100644
--- a/akregator/src/librss/textinput.cpp
+++ b/akregator/src/librss/textinput.cpp
@@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private)
{
TQString elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
d->title = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
d->description = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("name"))))
+ if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
d->name = elemText;
- if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
d->link = elemText;
}
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index c4daa056..bd8ce39b 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.tqstartsWith(TQString::fromUtf8("text/"), false)
- && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false))
+ || (type.startsWith(TQString::fromUtf8("text/"), false)
+ && !type.startsWith(TQString::fromUtf8("text/xml"), false))
)
return Text;
@@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
if (xmltypes.contains(type)
- || type.tqendsWith(TQString::fromUtf8("+xml"), false)
- || type.tqendsWith(TQString::fromUtf8("/xml"), false))
+ || type.endsWith(TQString::fromUtf8("+xml"), false)
+ || type.endsWith(TQString::fromUtf8("/xml"), false))
return XML;
return Binary;
@@ -145,7 +145,7 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
TQString extractTitle(const TQDomNode & parent)
{
- TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
+ TQDomNode node = parent.namedItem(TQString::fromLatin1("title"));
if (node.isNull())
return TQString();
@@ -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>").tqarg(email).tqarg(name);
+ return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name);
else
return name;
}
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index a137f1fe..59e713b5 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -30,7 +30,7 @@
#include <kmultitabbar.h>
#include <tqiconset.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmap.h>
#include <tqptrlist.h>
#include <tqstring.h>
@@ -52,7 +52,7 @@ public:
int currentID;
TQValueList<NodeListView*> views;
TQMap<int, NodeListView*> idToView;
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
ViewMode viewMode;
TQMap<TQWidget*, TQString> captions;
};
@@ -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)").tqarg(d->captions[view]).tqarg(node->unread()));
+ //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread()));
d->tabWidget->changeTab(view, d->captions[view]);
}
else
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
d->current = 0;
d->currentID = -1;
d->viewMode = verticalTabs;
- d->tqlayout = new TQHBoxLayout(this);
- //d->tqlayout = new TQGridLayout(this, 1, 2);
+ d->layout = new TQHBoxLayout(this);
+ //d->layout = new TQGridLayout(this, 1, 2);
d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this);
d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
//d->tabBar->setStyle(KMultiTabBar::KDEV3);
d->tabBar->showActiveTabTexts(true);
d->tabBar->setPosition(KMultiTabBar::Left);
- d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
+ d->layout->addWidget(d->tabBar/*, 0, 0*/);
d->stack = new TQWidgetStack(this);
- d->tqlayout->addWidget(d->stack/*, 0, 1*/);
+ d->layout->addWidget(d->stack/*, 0, 1*/);
// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
}
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 2a820128..77260872 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -85,7 +85,7 @@ MainWindow::MainWindow()
int statH=fontMetrics().height()+2;
m_statusLabel = new KSqueezedTextLabel(this);
m_statusLabel->setTextFormat(TQt::RichText);
- m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+ m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_statusLabel->setMinimumWidth( 0 );
m_statusLabel->setFixedHeight( statH );
statusBar()->addWidget (m_statusLabel, 1, false);
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index 75ee1e2f..32af9096 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
}
-void FeedStorageMK4Impl::setqStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
{
int findidx = findArticle(guid);
if (findidx == -1)
@@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
setHash(guid, source->hash(guid));
setLink(guid, source->link(guid));
setPubDate(guid, source->pubDate(guid));
- setqStatus(guid, source->status(guid));
+ seStatus(guid, source->status(guid));
setTitle(guid, source->title(guid));
setAuthor(guid, source->author(guid));
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index 057ba2e7..6dff8283 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage
virtual uint pubDate(const TQString& guid);
virtual void setPubDate(const TQString& guid, uint pubdate);
virtual int status(const TQString& guid);
- virtual void setqStatus(const TQString& guid, int status);
+ virtual void seStatus(const TQString& guid, int status);
virtual TQString title(const TQString& guid);
virtual void setTitle(const TQString& guid, const TQString& title);
virtual TQString description(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 4f167afb..160c4bad 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -211,9 +211,9 @@
One was in SCXX, PWONumber.h - ouch and apologies (jcw). Changed
comparison logic in mk4too.cpp (64-bit ints, new code).
-2003-02-28 Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
+2003-02-28 Fixed relaxed layout in Mk4tcl, several Mk4py fixes
- Use list operators to convert a Tcl tqlayout to MK format. This used
+ Use list operators to convert a Tcl layout to MK format. This used
to crash, Tcl test 6.7 added to verify the fix. Changed test 3.1 to
use a different notation for nested defs (^).
@@ -605,13 +605,13 @@
c4_Storage::SaveTo function, memo's would sometimes not be written,
leading to a *damaged* datafile (and incorrect free-space tracking).
-2002-03-15 Better configure logic, "mk::view tqlayout" fix
+2002-03-15 Better configure logic, "mk::view layout" fix
Many tweaks to configures, makes, and libtool setup. Get rid of the
library version numbers and the special Mk4*.so targets. Instead of
Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
- Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
+ Fixed "mk::view layout", it was broken by the 10-2-2002 change.
2002-03-13 Extend partial access 'B' usage
@@ -658,9 +658,9 @@
causing it to detach empty top-level views, even when in use. Fixed,
added s39 to test for this case.
-2002-02-10 Improve Mk4tcl's "mk::view tqlayout"
+2002-02-10 Improve Mk4tcl's "mk::view layout"
- Avoid crash when asking for the tqlayout of a non-existent view. Now
+ Avoid crash when asking for the layout of a non-existent view. Now
returns an error instead.
2002-02-07 Fast commit with many empty subviews
@@ -996,9 +996,9 @@
M-solaris.sh and M-dyn.sh scripts need to be manually edited when
choosing between CC and gcc.
-2001-03-27 Double-tqalignment bug on Solaris
+2001-03-27 Double-alignment bug on Solaris
- Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment
+ Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment
problem for 8-byte doubles on Solaris. This caused tests b17, b23,
b24, s22, and s28 to fail.
@@ -1084,7 +1084,7 @@
2000-10-03 Fixes for Alpha Unix
- Moved _item in column.h up to fix tqalignment sensitivity. Config.h
+ Moved _item in column.h up to fix alignment sensitivity. Config.h
did not get SIZE_LONG right on Alpha Unix (0?).
2000-09-27 Contributed fixes and Python 2.0b2
@@ -1614,7 +1614,7 @@
new version in c4_Sequence allocate the c4_Bytes object lazily.
Faster, and decreases sequence object size (for lots of subviews).
- Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
+ Mk4tcl, mk::layout now returns the proper layout even if the views
are empty. Solved by adding extra arg to c4_Storage::Description,
to return structure of a single top-level view. Fixes "mk8basic.1",
and the returned string now has one bogus list layer stripped off.
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README
index 314c956b..21edd0fc 100644
--- a/akregator/src/mk4storage/metakit/README
+++ b/akregator/src/mk4storage/metakit/README
@@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads:
License info: http://www.equi4.com/mklicense.html
Contact info: http://www.equi4.com/contact.html
-ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit,
+ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit,
including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman,
Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard,
Nicholas Riley, Brian Kelley, and many more people who have reported bugs
diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h
index 96d1622e..3f6e4f15 100644
--- a/akregator/src/mk4storage/metakit/src/column.h
+++ b/akregator/src/mk4storage/metakit/src/column.h
@@ -169,7 +169,7 @@ private:
tSetter _setter;
union {
- t4_byte _item[8]; // holds temp result (careful with tqalignment!)
+ t4_byte _item[8]; // holds temp result (careful with alignment!)
double _aligner; // needed for SPARC
};
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 2cd5f084..0725f57f 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -100,7 +100,7 @@ main()
}
// Recursively display the entire view contents. The results shown do not
-// depend on file tqlayout (free space, file positions, flat vs. on-demand).
+// depend on file layout (free space, file positions, flat vs. on-demand).
static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
{
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index e2b8c63a..c5c837a5 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -46,7 +46,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 6bcee5f6..e79acb20 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -165,9 +165,9 @@ void NodeList::clear()
{
Q_ASSERT(rootNode());
- TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
+ TQValueList<TreeNode*> children = rootNode()->children();
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
delete *it; // emits signal "emitSignalDestroyed"
}
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index ce4251b8..6220e97c 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").tqarg(feeds[0]));
+ KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(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").tqarg(message));
+ KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
}
}
@@ -99,7 +99,7 @@ void NotificationManager::doNotify()
if (feedTitle != (*it).feed()->title())
{
feedTitle = (*it).feed()->title();
- message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle);
+ message += TQString("<p><b>%1:</b></p>").arg(feedTitle);
}
message += (*it).title() + "<br>";
}
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 7a042391..df96d80f 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -44,7 +44,7 @@
#include <kstdaccel.h>
#include <kparts/browserinterface.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqcstring.h>
#include <tqdatastream.h>
#include <tqdatetime.h>
@@ -356,7 +356,7 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ )
void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args)
{
- if (url.tqstartsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+ if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
{
KHTMLPart::urlSelected(url,button,state,_target,args);
}
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
if ( !obj ) // not all views have a browser extension !
return;
- int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
+ int id = obj->metaObject()->findSlot("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.tqsetWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
+ popup.setWhatsThis(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 108fcf9b..d12016d4 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>" )
- .tqarg( service->library() )
- .tqarg( loader->lastErrorMessage() ) );
+ .arg( service->library() )
+ .arg( 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.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 += 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 += "</table></body></html>";
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 7831a24f..b83faca3 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -23,7 +23,7 @@
*/
#include <tqmap.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <klocale.h>
#include <kstaticdeleter.h>
@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
{
if (d->progressItem)
{
- d->progressItem->setqStatus(i18n("Fetch completed"));
+ d->progressItem->seStatus(i18n("Fetch completed"));
d->progressItem->setComplete();
d->progressItem = 0;
}
@@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError()
{
if (d->progressItem)
{
- d->progressItem->setqStatus(i18n("Fetch error"));
+ d->progressItem->seStatus(i18n("Fetch error"));
d->progressItem->setComplete();
d->progressItem = 0;
}
@@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted()
{
if (d->progressItem)
{
- d->progressItem->setqStatus(i18n("Fetch aborted"));
+ d->progressItem->seStatus(i18n("Fetch aborted"));
d->progressItem->setComplete();
d->progressItem = 0;
}
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index b5b732ba..a0f13c47 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").tqarg(c));
+ setCaption(i18n("Properties of %1").arg(c));
}
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index 14adeb00..4ab1ea91 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -39,7 +39,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -100,7 +100,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -282,7 +282,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>99</width>
<height>20</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -362,7 +362,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -396,7 +396,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index 60e5f6fa..6fc5a6bd 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -65,7 +65,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
d->delay = 400;
setMargin(2);
setSpacing(5);
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
TQToolButton *clearButton = new TQToolButton(this);
clearButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
@@ -144,7 +144,7 @@ void SearchBar::slotClearSearch()
}
}
-void SearchBar::slotSetqStatus(int status)
+void SearchBar::slotSeStatus(int status)
{
d->searchCombo->setCurrentItem(status);
slotSearchComboChanged(status);
@@ -194,15 +194,15 @@ void SearchBar::slotActivateSearch()
{
case 1: // Unread
{
- Criterion crit1( Criterion::tqStatus, Criterion::Equals, Article::New);
- Criterion crit2( Criterion::tqStatus, Criterion::Equals, Article::Unread);
+ Criterion crit1( Criterion::Status, Criterion::Equals, Article::New);
+ Criterion crit2( Criterion::Status, Criterion::Equals, Article::Unread);
statusCriteria << crit1;
statusCriteria << crit2;
break;
}
case 2: // New
{
- Criterion crit( Criterion::tqStatus, Criterion::Equals, Article::New);
+ Criterion crit( Criterion::Status, Criterion::Equals, Article::New);
statusCriteria << crit;
break;
}
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 6aff87b5..a13a78ca 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -59,7 +59,7 @@ class SearchBar : public TQHBox
public slots:
void slotClearSearch();
- void slotSetqStatus(int status);
+ void slotSeStatus(int status);
void slotSetText(const TQString& text);
private slots:
diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui
index 5943f79a..352fbaf5 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>174</width>
<height>20</height>
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>260</height>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index fc7f39b0..c049638d 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 26faba49..68107e39 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -25,7 +25,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index 97dbcca1..b40d1c27 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>16</height>
@@ -96,7 +96,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index 4634e539..4632f724 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 5370bebe..1bceb672 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -31,7 +31,7 @@
#include <klistview.h>
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmap.h>
#include <tqwidget.h>
@@ -102,9 +102,9 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
virtual bool visitFolder(Folder* node)
{
visitTreeNode(node);
- TQValueList<TreeNode*> tqchildren = node->tqchildren();
+ TQValueList<TreeNode*> children = node->children();
m_view->d->nodeToItem[node]->setExpandable(true);
- for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
+ for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
createItems(*it);
return true;
}
@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
- TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
- tqlayout->addWidget(d->view, 0, 0);
+ TQGridLayout* layout = new TQGridLayout(this, 1, 1);
+ layout->addWidget(d->view, 0, 0);
d->visitor = new NodeVisitor(this);
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index be7857b6..7132bcec 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -27,7 +27,7 @@
#include <tqstyle.h>
#include <tqapplication.h>
#include <tqiconset.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqmap.h>
#include <tqptrdict.h>
#include <tqstring.h>
@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
- hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
- overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+ hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+ overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -198,7 +198,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
removeTabToolTip( sender );
uint lcw=0, rcw=0;
- int tabBarHeight = tabBar()->tqsizeHint().height();
+ int tabBarHeight = tabBar()->sizeHint().height();
if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
url = view->part()->url();
- kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
- kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
+ kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+ kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
}
void TabWidget::slotCloseTab()
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index d215eb8f..4e1e0222 100644
--- a/akregator/src/tag.h
+++ b/akregator/src/tag.h
@@ -81,7 +81,7 @@ class Tag
bool isNull() const;
- /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */
+ /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */
TQString id() const;
/** user-visible name of the tag */
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index d9c29a98..ec05f57b 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -90,7 +90,7 @@ int TagAction::plug(TQWidget* widget, int index)
return -1;
TagMenuItem* item = new TagMenuItem(d->tag);
- int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->tqcolorGroup()), item, -1, index);
+ int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index);
popup->connectItem (id, this, TQT_SLOT(slotActivated()));
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index 55273f72..4c4789df 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead()
setNotificationMode(false);
TQValueList<Article>::Iterator en = d->articles.end();
for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it)
- (*it).setqStatus(Article::Read);
+ (*it).seStatus(Article::Read);
setNotificationMode(true);
}
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index 85f3ae94..e6b4c34b 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -62,7 +62,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -91,7 +91,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>21</height>
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index fd1cd42f..66fb70aa 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -99,21 +99,21 @@ void TagSet::readFromXML(const TQDomDocument& doc)
if (root.isNull())
return;
- TQDomNodeList list = root.elementsByTagName(TQString::tqfromLatin1("tag"));
+ TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag"));
for (uint i = 0; i < list.length(); ++i)
{
TQDomElement e = list.item(i).toElement();
if (!e.isNull())
{
- if (e.hasAttribute(TQString::tqfromLatin1("id")))
+ if (e.hasAttribute(TQString::fromLatin1("id")))
{
- TQString id = e.attribute(TQString::tqfromLatin1("id"));
+ TQString id = e.attribute(TQString::fromLatin1("id"));
TQString name = e.text();
- TQString scheme = e.attribute(TQString::tqfromLatin1("scheme"));
+ TQString scheme = e.attribute(TQString::fromLatin1("scheme"));
Tag tag(id, name, scheme);
- TQString icon = e.attribute(TQString::tqfromLatin1("icon"));
+ TQString icon = e.attribute(TQString::fromLatin1("icon"));
if (!icon.isEmpty())
tag.setIcon(icon);
@@ -145,11 +145,11 @@ TQDomDocument TagSet::toXML() const
TQDomElement tn = doc.createElement("tag");
TQDomText text = doc.createTextNode((*it).name());
- tn.setAttribute(TQString::tqfromLatin1("id"),(*it).id());
+ tn.setAttribute(TQString::fromLatin1("id"),(*it).id());
if (!(*it).scheme().isEmpty())
- tn.setAttribute(TQString::tqfromLatin1("scheme"),(*it).scheme());
+ tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme());
if (!(*it).icon().isEmpty())
- tn.setAttribute(TQString::tqfromLatin1("icon"),(*it).icon());
+ tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon());
tn.appendChild(text);
root.appendChild(tn);
}
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 8bfb7895..31ced17a 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -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::tqpalette().active().foreground());
+ finalShot.fill(KApplication::palette().active().foreground());
painter.begin(&finalShot);
painter.drawPixmap(BORDER, BORDER, shot);
painter.end();
diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp
index 9cc716b4..a4ae0936 100644
--- a/akregator/src/treenode.cpp
+++ b/akregator/src/treenode.cpp
@@ -93,23 +93,23 @@ TreeNode* TreeNode::nextSibling() const
{
if (!d->parent)
return 0;
- TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
+ TQValueList<TreeNode*> children = d->parent->children();
TreeNode* me = (TreeNode*)this;
- int idx = tqchildren.findIndex(me);
+ int idx = children.findIndex(me);
- return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
+ return idx+1 < children.size() ? *(children.at(idx+1)) : 0L;
}
TreeNode* TreeNode::prevSibling() const
{
if (!d->parent)
return 0;
- TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
+ TQValueList<TreeNode*> children = d->parent->children();
TreeNode* me = (TreeNode*)this;
- int idx = tqchildren.findIndex(me);
- return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L;
+ int idx = children.findIndex(me);
+ return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L;
}
Folder* TreeNode::parent() const
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 32b12c9c..3299e278 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
}
-// TODO: reverse for reverse tqlayout
+// TODO: reverse for reverse layout
void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
int column, int width, int align )
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index d24e715f..d108d263 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -38,7 +38,7 @@
#include <kparts/browserextension.h>
#include <tqaccel.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpaintdevicemetrics.h>
#include "viewer.h"
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
{
TQString text = selectedText();
text.replace( TQChar( 0xa0 ), ' ' );
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
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::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
cb->setText(m_url.prettyURL(), TQClipboard::Selection);
}
diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui
index 68f81f19..08045325 100644
--- a/certmanager/certificateinfowidget.ui
+++ b/certmanager/certificateinfowidget.ui
@@ -12,7 +12,7 @@
<height>403</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>291</width>
<height>16</height>
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 1cf5a2b4..7c9a2467 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -56,14 +56,14 @@
// TQt
#include <tqlistview.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqheader.h>
#include <tqpushbutton.h>
#include <tqcursor.h>
#include <tqapplication.h>
#include <tqdatetime.h>
-#include <tqstylesheet.h>
-#include <tqtextcodec.h>
+#include <stylesheet.h>
+#include <textcodec.h>
// other
#include <assert.h>
@@ -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")
- .tqarg( time_t2string( key.subkey(0).creationTime() ),
+ .arg( 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 * parent, const GpgME::Error & err, con
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>")
- .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(),
+ .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) );
}
@@ -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").tqarg( i18n( "program not found" ) );
+ TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( 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.tqarg( i18n( "program cannot be executed" ) );
+ wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
else
- wmsg = wmsg.tqarg( strerror(rc) );
+ wmsg = wmsg.arg( 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)")
- .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
+ .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
item->setEnabled( false );
}
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui
index b0c2626a..54b5f877 100644
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@@ -55,7 +55,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="text">
<string>On this page, you will configure the cryptographic key length and the type of certificate to create.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -96,7 +96,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -140,7 +140,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -199,7 +199,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>60</height>
@@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="text">
<string>On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -240,7 +240,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>440</width>
<height>20</height>
@@ -268,7 +268,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -322,7 +322,7 @@ Once you are done with your settings, click
a kmail composer will be opened; you can add detailed information for the CA
there.&lt;/p&gt;&lt;qt&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -336,7 +336,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>31</height>
@@ -411,7 +411,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
<property name="name">
<cstring>generatePB</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
@@ -431,7 +431,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>118</width>
<height>16</height>
@@ -448,7 +448,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>119</width>
<height>16</height>
@@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi
If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA.
&lt;/qt&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index d24c7df9..cc9dadab 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -65,11 +65,11 @@
// TQt
#include <tqlineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
@@ -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):").tqarg( label, attr );
+ "*%1 (%2):").arg( label, attr );
else
return i18n("Format string for the labels in the \"Your Personal Data\" page",
- "%1 (%2):").tqarg( label, attr );
+ "%1 (%2):").arg( 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" ).tqarg( keyLengths[keyLengthCB->currentItem()] );
+ certParms += TQString( "Key-Length: %1\n" ).arg( 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" )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
+ .arg( 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" )
- .tqarg( TQString::tqfromLatin1( res.error().asString() ) ),
+ .arg( TQString::fromLatin1( res.error().asString() ) ),
i18n( "Certificate Manager Error" ) );
} else {
// next will stay enabled until the user clicks Generate
@@ -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" ).tqarg( error ) );
+ i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( 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?" ).tqarg( url.prettyURL() ),
+ "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return;
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 6d955703..fdf33f3a 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -500,7 +500,7 @@ static TQStringList stringlistFromSet( const std::set<std::string> & set ) {
TQStringList sl;
for ( std::set<std::string>::const_iterator it = set.begin() ; it != set.end() ; ++it )
// let's make extra sure, maybe someone tries to make TQt not support std::string->TQString conversion
- sl.push_back( TQString::tqfromLatin1( it->c_str() ) );
+ sl.push_back( TQString::fromLatin1( it->c_str() ) );
return sl;
}
@@ -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").tqarg( TQString::fromLocal8Bit( err.asString() ) ),
+ "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ),
i18n("Refreshing Keys Failed") );
}
@@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * parent, 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>" )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) );
}
@@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error
const TQString msg = i18n( "<qt><p>An error occurred while trying "
"to download the certificate %1:</p>"
"<p><b>%2</b></p></qt>" )
- .tqarg( certDisplayName )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( certDisplayName )
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) );
}
@@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * parent, 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>" )
- .tqarg( certDisplayName )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( certDisplayName )
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, 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.tqarg( i18n("Total number processed:"),
+ lines.push_back( normalLine.arg( i18n("Total number processed:"),
TQString::number( res.numConsidered() ) ) );
- lines.push_back( normalLine.tqarg( i18n("Imported:"),
+ lines.push_back( normalLine.arg( i18n("Imported:"),
TQString::number( res.numImported() ) ) );
if ( res.newSignatures() )
- lines.push_back( normalLine.tqarg( i18n("New signatures:"),
+ lines.push_back( normalLine.arg( i18n("New signatures:"),
TQString::number( res.newSignatures() ) ) );
if ( res.newUserIDs() )
- lines.push_back( normalLine.tqarg( i18n("New user IDs:"),
+ lines.push_back( normalLine.arg( i18n("New user IDs:"),
TQString::number( res.newUserIDs() ) ) );
if ( res.numKeysWithoutUserID() )
- lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"),
+ lines.push_back( normalLine.arg( i18n("Keys without user IDs:"),
TQString::number( res.numKeysWithoutUserID() ) ) );
if ( res.newSubkeys() )
- lines.push_back( normalLine.tqarg( i18n("New subkeys:"),
+ lines.push_back( normalLine.arg( i18n("New subkeys:"),
TQString::number( res.newSubkeys() ) ) );
if ( res.newRevocations() )
- lines.push_back( boldLine.tqarg( i18n("Newly revoked:"),
+ lines.push_back( boldLine.arg( i18n("Newly revoked:"),
TQString::number( res.newRevocations() ) ) );
if ( res.notImported() )
- lines.push_back( boldLine.tqarg( i18n("Not imported:"),
+ lines.push_back( boldLine.arg( i18n("Not imported:"),
TQString::number( res.notImported() ) ) );
if ( res.numUnchanged() )
- lines.push_back( normalLine.tqarg( i18n("Unchanged:"),
+ lines.push_back( normalLine.arg( i18n("Unchanged:"),
TQString::number( res.numUnchanged() ) ) );
if ( res.numSecretKeysConsidered() )
- lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"),
+ lines.push_back( normalLine.arg( i18n("Secret keys processed:"),
TQString::number( res.numSecretKeysConsidered() ) ) );
if ( res.numSecretKeysImported() )
- lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"),
+ lines.push_back( normalLine.arg( i18n("Secret keys imported:"),
TQString::number( res.numSecretKeysImported() ) ) );
if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 )
- lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"),
+ lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"),
TQString::number( res.numSecretKeysConsidered()
- res.numSecretKeysImported()
- res.numSecretKeysUnchanged() ) ) );
if ( res.numSecretKeysUnchanged() )
- lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"),
+ lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"),
TQString::number( res.numSecretKeysUnchanged() ) ) );
KMessageBox::information( this,
i18n( "<qt><p>Detailed results of importing %1:</p>"
"<table>%2</table></qt>" )
- .tqarg( displayName ).tqarg( lines.join( TQString() ) ),
+ .arg( displayName ).arg( 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").tqarg( 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").arg( 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." ).tqarg( processname ), i18n( "Certificate Manager Error" ) );
+ KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( 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").tqarg( 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").arg( 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 * parent, 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>")
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") );
}
@@ -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() ).tqarg( keysToDelete.size() - keys.size() )
+ keys.size() ).arg( 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.tqarg( i18n("Operation not supported by the backend.") ),
+ str.arg( i18n("Operation not supported by the backend.") ),
i18n("Certificate Deletion Failed") );
}
@@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * parent, 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>")
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, 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?" ).tqarg( url.prettyURL() ),
+ "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return false;
@@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & er
const TQString msg = i18n("<qt><p>An error occurred while trying to export "
"the secret key:</p>"
"<p><b>%1</b></p></qt>")
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") );
}
@@ -1338,7 +1338,7 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) {
};
TQStringList charsetList;
for ( const char** c = charsets; *c; ++c ) {
- charsetList.append( TQString::tqfromLatin1( *c ) );
+ charsetList.append( TQString::fromLatin1( *c ) );
}
// TODO this selection could be done in a derived KeySelectionDialog which would add a combobox,
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 6df2a9f6..07f9aa9e 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -137,7 +137,7 @@ private slots:
void slotConfigureGpgME();
void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point);
void slotDropped(const KURL::List&);
- /** Schedule a tqrepaint for the listview items. E.g. when the
+ /** Schedule a repaint for the listview items. E.g. when the
colour config has changed */
void slotRepaint();
/** Schedule a validating keylisting for the selected items (or
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 9e5d0f74..02889b9e 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -30,7 +30,7 @@
*/
#include "appearanceconfigpage.h"
-#include <tqlayout.h>
+#include <layout.h>
#include "appearanceconfigwidget.h"
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 309d03be..ad908955 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -50,7 +50,7 @@
#include <kcolordialog.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqcolor.h>
#include <tqfont.h>
@@ -139,7 +139,7 @@ private:
setText( 0, name );
}
- void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
private:
TQColor mForegroundColor, mBackgroundColor;
@@ -152,7 +152,7 @@ private:
bool mDirty;
};
-void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
TQColorGroup _cg = cg;
TQFont font = p->font();
if ( mHasFont )
@@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
if ( mBackgroundColor.isValid() )
_cg.setColor( TQColorGroup::Base, mBackgroundColor );
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
////
@@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked()
if ( !item )
return;
item->setDefaultAppearance();
- item->tqrepaint();
+ item->repaint();
slotSelectionChanged( item );
emit changed();
}
@@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() {
int result = KColorDialog::getColor( fg );
if ( result == KColorDialog::Accepted ) {
item->setForegroundColor( fg );
- item->tqrepaint();
+ item->repaint();
emit changed();
}
}
@@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() {
int result = KColorDialog::getColor( bg );
if ( result == KColorDialog::Accepted ) {
item->setBackgroundColor( bg );
- item->tqrepaint();
+ item->repaint();
emit changed();
}
}
@@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() {
int result = KFontDialog::getFont( font );
if ( result == KFontDialog::Accepted ) {
item->setFont( font );
- item->tqrepaint();
+ item->repaint();
emit changed();
}
}
@@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults()
for ( ; lvit.current() ; ++lvit ) {
CategoryListViewItem* item = static_cast<CategoryListViewItem *>( lvit.current() );
item->setDefaultAppearance();
- item->tqrepaint();
+ item->repaint();
}
emit changed();
}
@@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked()
CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
if ( item ) {
item->toggleItalic();
- item->tqrepaint();
+ item->repaint();
emit changed();
}
}
@@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked()
CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
if ( item ) {
item->toggleBold();
- item->tqrepaint();
+ item->repaint();
emit changed();
}
}
@@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked()
CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
if ( item ) {
item->toggleStrikeout();
- item->tqrepaint();
+ item->repaint();
emit changed();
}
}
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index 0d97a877..57029201 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 2aa622d0..db9c7739 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
// the KCMultiDialog starts with the size of the first kcm, not
// the largest one. This way at least after the first showing of
// the largest kcm the size is kept.
- const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
- const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
- const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
+ const KConfigGroup geometry( KGlobal::config(), "Geometry" );
+ const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
+ const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
if ( width != 0 && height != 0 ) {
setMinimumSize( width, height );
}
@@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
}
void ConfigureDialog::hideEvent( TQHideEvent * ) {
- KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
- tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
- tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
+ KConfigGroup geometry( KGlobal::config(), "Geometry" );
+ geometry.writeEntry( "ConfigureDialogWidth", width() );
+ geometry.writeEntry( "ConfigureDialogHeight",height() );
}
ConfigureDialog::~ConfigureDialog() {
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 436ef28e..a90a6c09 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -45,7 +45,7 @@
#include <tqlabel.h>
#include <tqdatetimeedit.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tdepimmacros.h>
@@ -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" ).tqarg( componentName, groupName, entryName ) );
+ KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( 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" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->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() ) );
return 0;
}
return entry;
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a224b6f7..b16c9a90 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -36,7 +36,7 @@
#include <tdepimmacros.h>
-#include <tqlayout.h>
+#include <layout.h>
DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
: KCModule( parent, name )
diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp
index 3318f8dd..e23993c2 100644
--- a/certmanager/crlview.cpp
+++ b/certmanager/crlview.cpp
@@ -43,9 +43,9 @@
#include <kstdguiitem.h>
#include <kglobalsettings.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqfontmetrics.h>
#include <tqtimer.h>
diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp
index fe0835eb..9e2c388f 100644
--- a/certmanager/hierarchyanalyser.cpp
+++ b/certmanager/hierarchyanalyser.cpp
@@ -69,7 +69,7 @@ const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char
std::vector<GpgME::Key> HierarchyAnalyser::subjectsForIssuerRecursive( const char * issuer_dn ) const {
std::vector<GpgME::Key> keys = subjectsForIssuer( issuer_dn );
- for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would tqinvalidate them
+ for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would invalidate them
if ( const char * fpr = keys[i].primaryFingerprint() ) {
const std::vector<GpgME::Key> & tmp = subjectsForIssuer( fpr );
std::copy( tmp.begin(), tmp.end(), std::back_inserter( keys ) );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 20c474a4..4f84c786 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -38,7 +38,7 @@
#include <kapplication.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqspinbox.h>
#include <tqcheckbox.h>
@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
group = new TQVGroupBox( i18n("WatchGnuPG"), top );
- group->tqlayout()->setSpacing( spacingHint() );
+ group->layout()->setSpacing( spacingHint() );
w = new TQWidget( group );
@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
/******************* Log Window group *******************/
group = new TQVGroupBox( i18n("Log Window"), top );
- group->tqlayout()->setSpacing( spacingHint() );
+ group->layout()->setSpacing( spacingHint() );
w = new TQWidget( group );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index e7690d4f..f8dc45a6 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -49,11 +49,11 @@
#include <kedittoolbar.h>
#include <kkeydialog.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqdir.h>
#include <tqeventloop.h>
#include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#define WATCHGNUPGBINARY "watchgnupg"
#define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket")
@@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
void KWatchGnuPGMainWindow::slotClear()
{
mCentralWidget->clear();
- mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
+ mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
}
void KWatchGnuPGMainWindow::createActions()
@@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions()
(void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
#if 0
- (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
+ (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
0, this, TQT_SLOT( slotConfigure() ),
actionCollection(), "configure" );
#endif
@@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher()
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
}
mCentralWidget->append(tqtr("[%1] Log stopped")
- .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
+ .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
}
mWatcher->clearArguments();
KConfig* config = kapp->config();
@@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher()
KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) );
} else {
mCentralWidget->append( tqtr("[%1] Log started")
- .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
+ .arg( TQDateTime::currentDateTime().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)").tqarg(*it).tqarg(comp->description());
+ logclients << TQString("%1 (%2)").arg(*it).arg(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?").tqarg(filename),
+ "to overwrite it?").arg(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 f27dad3b..e47909e2 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -224,9 +224,9 @@ namespace {
return TQVariant( data.defaults.boolean.value, int() );
case ArgType_String:
if ( isList() )
- return TQStringList( TQString::tqfromLatin1( data.defaults.string ) );
+ return TQStringList( TQString::fromLatin1( data.defaults.string ) );
else
- return TQString::tqfromLatin1( data.defaults.string );
+ return TQString::fromLatin1( data.defaults.string );
case ArgType_Int:
if ( isList() )
return TQValueList<TQVariant>() << data.defaults.integer;
@@ -240,15 +240,15 @@ namespace {
case ArgType_Path:
case ArgType_DirPath:
if ( isList() )
- return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path );
+ return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path );
else
- return TQString::tqfromLatin1( data.defaults.path );
+ return TQString::fromLatin1( data.defaults.path );
case ArgType_URL:
case ArgType_LDAPURL:
if ( isList() )
- return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url );
+ return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url );
else
- return TQString::tqfromLatin1( data.defaults.url );
+ return TQString::fromLatin1( data.defaults.url );
}
}
@@ -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\"" ).tqarg( "OpenPGP" );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
return false;
}
bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "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." ).tqarg( chiasmus );
+ *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( 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\"" ).tqarg( name );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
return 0;
}
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 9daaa620..edfe9be5 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & cap
const TQString msg = ( mMode == Encrypt
? i18n( "Encryption failed: %1" )
: i18n( "Decryption failed: %1" ) )
- .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
+ .arg( TQString::fromLocal8Bit( mError.asString() ) );
if ( !mStderr.isEmpty() ) {
- const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
+ const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
KMessageBox::detailedError( parent, msg, details, caption );
} else {
KMessageBox::error( parent, msg, caption );
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index a57685f2..002bf018 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" )
- .tqarg( libfile,KLibLoader::self()->lastErrorMessage() );
+ .arg( 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" )
- .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
+ .arg( 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 eccdf921..677fc6ec 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..." ).tqarg( mKeyPaths[mIndex] ),
+ emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ),
mIndex, mKeyPaths.size() );
const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index ab413080..ea3506b8 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -36,7 +36,7 @@
#include <kurl.h>
#include <tqsocketnotifier.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqstringlist.h>
#include <unistd.h>
@@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
if ( d->useStatusFD ) {
::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
- connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildtqStatus(int)) );
+ connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
}
return KProcess::commSetupDoneP();
}
@@ -124,12 +124,12 @@ int Kleo::GnuPGProcessBase::commSetupDoneC() {
return KProcess::commSetupDoneC();
}
-void Kleo::GnuPGProcessBase::slotChildtqStatus( int fd ) {
- if ( !childtqStatus(fd) )
- closetqStatus();
+void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
+ if ( !childStatus(fd) )
+ closeStatus();
}
-bool Kleo::GnuPGProcessBase::closetqStatus() {
+bool Kleo::GnuPGProcessBase::closeStatus() {
if ( !d->useStatusFD )
return false;
d->useStatusFD = false;
@@ -138,7 +138,7 @@ bool Kleo::GnuPGProcessBase::closetqStatus() {
return true;
}
-int Kleo::GnuPGProcessBase::childtqStatus( int fd ) {
+int Kleo::GnuPGProcessBase::childStatus( int fd ) {
char buf[1024];
const int len = ::read( fd, buf, sizeof(buf)-1 );
if ( len > 0 ) {
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index b6643144..c012b307 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -57,7 +57,7 @@ namespace Kleo {
/*! reimplementation */
bool start( RunMode runmode, Communication comm );
- bool closetqStatus();
+ bool closeStatus();
signals:
void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args );
@@ -70,11 +70,11 @@ namespace Kleo {
/*! reimplementation */
int commSetupDoneC();
- int childtqStatus( int fd );
+ int childStatus( int fd );
private slots:
- void slotChildtqStatus( int fd );
+ void slotChildStatus( int fd );
private:
void parseStatusOutput();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 9594edfa..27680585 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.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+ *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
else if ( ei.fileName() && !ei.version() )
- *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) );
+ *reason = i18n("Engine %1 is not installed properly.").arg( 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.")
- .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
+ .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
else
- *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+ *reason = i18n("Unknown problem with engine for protocol %1.").arg( 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\"" ).tqarg( name );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
return false;
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 51f8f68c..65ed9381 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -41,7 +41,7 @@
#include <ktempfile.h>
#include <tqfile.h>
#include <stdlib.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
// Just for the Q_ASSERT in the dtor. Not thread-safe, but who would
// have 2 threads talking to gpgconf anyway? :)
@@ -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.tqarg( i18n( "program not found" ) );
+ wmsg = wmsg.arg( i18n( "program not found" ) );
else if ( rc == -2 )
- wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
+ wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
else
- wmsg = wmsg.tqarg( strerror(rc) );
+ wmsg = wmsg.arg( 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" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) );
+ TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
KMessageBox::error(0, wmsg);
}
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
if ( !isList() ) // non-list non-string
{
if ( mArgType == ArgType_None ) {
- return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString();
+ return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString();
} else { // some int
Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index e55f237d..61da793e 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.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
+ msg = msg.arg( 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." )
- .tqarg( gpgAgent );
+ .arg( gpgAgent );
} else {
msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
- .tqarg( "1.9" )
- .tqarg( "http://www.gnupg.org/download" ); // add #gnupg2 if you can make this a real link
+ .arg( "1.9" )
+ .arg( "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" )
- .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
+ .arg( "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 d1d2591d..c6370674 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the keys from the backend:</p>"
"<p><b>%1</b></p></qt>" )
- .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) );
+ .arg( TQString::fromLocal8Bit( mResult.error().asString() ) );
KMessageBox::error( parent, msg, caption );
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index de673faf..c2e21bb9 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
static Map map;
for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) {
assert( tokens[i].token );
- const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower();
+ const TQString token = TQString::fromLatin1( tokens[i].token ).lower();
for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) {
const Desc & desc = tokens[i].desc[j];
assert( desc.display );
@@ -151,9 +151,9 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto
const Desc & desc = it2->second;
TQString result = i18n( desc.display );
if ( desc.useCur )
- result = result.tqarg( cur );
+ result = result.arg( cur );
if ( desc.useTot )
- result = result.tqarg( tot );
+ result = result.arg( tot );
return result;
}
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index fdcdadba..781e0513 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
TQT_SLOT(slotStderr(KProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
}
-void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
if ( proc != mProcess )
return;
TQStringList::const_iterator it = args.begin();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index f94957b3..be4c9f79 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
/*! \reimp from Job */
void slotCancel();
- void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+ void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
void slotStderr( KProcess *, char *, int );
void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index e4875824..8f2fd20d 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
TQT_SLOT(slotStderr(KProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
}
-void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
if ( proc != mProcess )
return;
TQStringList::const_iterator it = args.begin();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index aae3fd22..0c775a01 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
/*! \reimp from Job */
void slotCancel();
- void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+ void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
void slotStdout( KProcess *, char *, int );
void slotStderr( KProcess *, char *, int );
void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 53865edf..77a91451 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -789,7 +789,7 @@ sig_status_to_string( gpgme_sig_stat_t status )
// gpgme 0.3 version below, too!
static
void obtain_signature_information( gpgme_ctx_t ctx,
- gpgme_sig_stat_t & overalltqStatus,
+ gpgme_sig_stat_t & overallStatus,
struct CryptPlug::SignatureMetaData* sigmeta,
char** attrOrder,
const char* unknownAttrsHandling,
@@ -952,11 +952,11 @@ void obtain_signature_information( gpgme_ctx_t ctx,
storeNewCharPtr( &this_info.status_text, sig_status );
}
sigmeta->extended_info_count = sig_idx;
- overalltqStatus = intersect_stati( result->signatures );
- sigmeta->status_code = overalltqStatus;
- storeNewCharPtr( &sigmeta->status, sig_status_to_string( overalltqStatus ) );
+ overallStatus = intersect_stati( result->signatures );
+ sigmeta->status_code = overallStatus;
+ storeNewCharPtr( &sigmeta->status, sig_status_to_string( overallStatus ) );
if ( signatureFound )
- *signatureFound = ( overalltqStatus != GPGME_SIG_STAT_NONE );
+ *signatureFound = ( overallStatus != GPGME_SIG_STAT_NONE );
}
bool CryptPlug::checkMessageSignature( char** cleartext,
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 4ffc59c9..6f07c954 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name,
_libName( libName ),
_updateURL( update ),
_active( active ),
- _initqStatus( IniStatus_undef ),
+ _iniStatus( IniStatus_undef ),
_cp( 0 ),
_config( 0 ),
_cryptoConfig( 0 )
@@ -492,15 +492,15 @@ TQString CryptPlugWrapper::displayName() const
return i18n("(Unknown Protocol)");
}
-bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg )
+bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
{
if ( _cp )
return true;
- _initqStatus = IniStatus_undef;
+ _iniStatus = IniStatus_undef;
/* make sure we have a lib name */
if ( _libName.isEmpty() ) {
- _initqStatus = IniStatus_NoLibName;
+ _iniStatus = IniStatus_NoLibName;
kdDebug(5150) << "No library name was given.\n" << endl;
} else {
if ( _libName.contains( "smime" ) ) {
@@ -515,26 +515,26 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
}
if ( !_cp ) {
- _initqStatus = IniStatus_LoadError;
+ _iniStatus = IniStatus_LoadError;
kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl;
} else {
/* now call the init function */
if( !_cp->initialize() ) {
- _initqStatus = IniStatus_InitError;
+ _iniStatus = IniStatus_InitError;
kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
- _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName );
+ _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
if ( errorMsg )
*errorMsg = _lastError;
delete _cp; _cp = 0;
delete _config; _config = 0;
} else {
- _initqStatus = IniStatus_Ok;
+ _iniStatus = IniStatus_Ok;
}
}
}
- if( initqStatus )
- *initqStatus = _initqStatus;
- return _initqStatus == IniStatus_Ok;
+ if( iniStatus )
+ *iniStatus = _iniStatus;
+ return _iniStatus == IniStatus_Ok;
}
@@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize()
}
-CryptPlugWrapper::InitqStatus CryptPlugWrapper::initqStatus( TQString* errorMsg ) const
+CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const
{
if( errorMsg )
*errorMsg = _lastError;
- return _initqStatus;
+ return _iniStatus;
}
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index 2275f375..bf197670 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -462,7 +462,7 @@ public:
If initialize was not called before return value will be
\c CryptPlugInit_undef.
- \sa initqStatus, initialize
+ \sa iniStatus, initialize
*/
typedef enum {
IniStatus_undef = 0,
@@ -471,7 +471,7 @@ public:
IniStatus_NoLibName = 2,
IniStatus_LoadError = 0x1000,
IniStatus_InitError = 0x2000
- } InitqStatus;
+ } IniStatus;
/*! \ingroup groupSignAct
\brief Flags used to compose the SigStatusFlags value.
@@ -543,7 +543,7 @@ public:
or not.
\sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize
- \sa initqStatus
+ \sa iniStatus
*/
CryptPlugWrapper( const TQString& name=TQString(),
const TQString& libName=TQString(),
@@ -582,7 +582,7 @@ public:
structures - if just prevents the normal functions from
being called erroneously. When deactivated only the following
functions are operational: constructor , destructor ,
- setActive , active, setLibName , libName , initqStatus;
+ setActive , active, setLibName , libName , iniStatus;
calling other functions will be ignored and their return
values will be undefined.
@@ -590,7 +590,7 @@ public:
or not.
\sa active, CryptPlugWrapper(), ~CryptPlugWrapper
- \sa deinitialize, initialize, initqStatus
+ \sa deinitialize, initialize, iniStatus
*/
void setActive( bool active );
@@ -613,7 +613,7 @@ public:
This name may be set in the constructor or by calling setLibName().
\note Setting/changing the library name may only be done when
- the initqStatus() is <b>not</b> \c IniStatus_Ok.
+ the iniStatus() is <b>not</b> \c IniStatus_Ok.
If you want to change the name of the library after
successfully having called initialize() please make
sure to unload it by calling the deinitialize() function.
@@ -626,7 +626,7 @@ public:
above 'note'.
\sa libName, CryptPlugWrapper(), ~CryptPlugWrapper
- \sa deinitialize, initialize, initqStatus
+ \sa deinitialize, initialize, iniStatus
*/
bool setLibName( const TQString& libName );
@@ -666,13 +666,13 @@ private:
undefined in this case, this rule does not apply to the functions
\c setActive() and \c setLibName().
- \param initqStatus will receive the resulting InitqStatus if not NULL
+ \param iniStatus will receive the resulting IniStatus if not NULL
\param errorMsg will receive the system error message if not NULL
- \sa initqStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
+ \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
\sa setActive, active
*/
- bool initialize( InitqStatus* initqStatus, TQString* errorMsg );
+ bool initialize( IniStatus* iniStatus, TQString* errorMsg );
public:
/*! \ingroup groupGeneral
@@ -681,10 +681,10 @@ public:
After this function has been called, no other plugin functions
should be called; the behavior is undefined in this case.
- \note Deinitializing sets the internal initqStatus value back
+ \note Deinitializing sets the internal iniStatus value back
to \c IniStatus_undef.
- \sa initqStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
+ \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
\sa setActive, active
*/
void deinitialize();
@@ -693,7 +693,7 @@ public:
\brief Returns this CRYPTPLUG wrapper's initialization state.
\param errorMsg receives the last system error message, this value
- should be ignored if InitqStatus value equals \c IniStatus_Ok.
+ should be ignored if IniStatus value equals \c IniStatus_Ok.
\return whether the relative library was loaded and initialized
correctly
@@ -701,7 +701,7 @@ public:
\sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
\sa setActive, active
*/
- InitqStatus initqStatus( TQString* errorMsg ) const;
+ IniStatus iniStatus( TQString* errorMsg ) const;
/*! \ingroup groupGeneral
@@ -714,7 +714,7 @@ public:
however.
\note In case this function cannot be executed the system's error
- message may be retrieved by calling initqStatus( TQString* ).
+ message may be retrieved by calling iniStatus( TQString* ).
\return whether the relative feature is implemented or not
*/
@@ -824,7 +824,7 @@ private:
TQString _libName;
TQString _updateURL;
bool _active;
- InitqStatus _initqStatus;
+ IniStatus _iniStatus;
TQString _lastError;
CryptPlug* _cp;
// local parameters without representation in cryptplug.h
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index b79e1772..0d3cb1e9 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -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:")
- .tqarg( protocol, (*it)->displayName() ) );
+ .arg( protocol, (*it)->displayName() ) );
reasons->push_back( " " + reason );
}
}
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 685d241b..774302ba 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
TQString result;
for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
const TQChar ch = s[i];
- switch ( ch.tqunicode() ) {
+ switch ( ch.unicode() ) {
case ',':
case '+':
case '"':
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index a5944315..ffd3c6db 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -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").tqarg( current ).tqarg( total ), current, total );
+ emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
#endif
}
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index e83f923e..7d1a2730 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").tqarg( current ).tqarg( total ), current, total );
+ emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
}
GpgME::Error Kleo::MultiDeleteJob::startAJob() {
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index bc589ec4..a8bbb074 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -33,7 +33,7 @@
#ifndef __KLEO_TESTS_GNUPGVIEWER_H__
#define __KLEO_TESTS_GNUPGVIEWER_H__
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqstring.h>
namespace Kleo {
@@ -54,12 +54,12 @@ public:
private slots:
void slotStdout( KProcess *, char *, int );
void slotStderr( KProcess *, char *, int );
- void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+ void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
void slotProcessExited( KProcess * );
private:
Kleo::GnuPGProcessBase * mProcess;
- TQString mLastStdout, mLastStderr, mLastqStatus;
+ TQString mLastStdout, mLastStderr, mLasStatus;
};
#endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index de3a4ff0..6e6bf7c8 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
TQT_SLOT(slotStderr(KProcess*,char*,int)) );
connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
- TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+ TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
}
static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
append( "<b>stderr: " + escape( *it ) + "</b>" );
}
-void GnuPGViewer::slotqStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" );
}
void GnuPGViewer::slotProcessExited( KProcess * proc ) {
if ( !proc )
return;
if ( proc->normalExit() )
- append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitqStatus() ) );
+ append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) );
else
append( "<b>Process exit: killed</b>" );
}
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 8acef90f..a707b000 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -52,7 +52,7 @@
#include <tqmessagebox.h>
#include <tqstringlist.h>
#include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlabel.h>
@@ -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").tqarg( keyData.size() ),
+ KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ),
"Key Generation Finished" );
}
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index ca31b39a..363ec26a 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").tqarg( result.error().asString() ) );
+ TQString("KeyListResult Error: %1").arg( result.error().asString() ) );
else if ( result.isTruncated() )
TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" );
else
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index fc6f07a2..30b89d2d 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>21</height>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 1052cff5..255cb981 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -50,7 +50,7 @@
#include <dcopclient.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqtimer.h>
@@ -144,13 +144,13 @@ private:
// First one is the generic name (find a nice one for OpenPGP, SMIME)
const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0
? qstricmp( protocolName, "smime" ) != 0
- ? TQString::tqfromLatin1( protocolName )
+ ? TQString::fromLatin1( protocolName )
: i18n( "S/MIME" )
: i18n( "OpenPGP" );
// 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)" ).tqarg( protoName, impName );
+ "%1 (%2)" ).arg( protoName, impName );
}
const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index a16dcd22..b97884a5 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -47,7 +47,7 @@
#include <tqgrid.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqpushbutton.h>
@@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
dialogHeight = 500;
else // small (800x600, 640x480) desktop
dialogHeight = 400;
- TQSize sz = scrollView->tqsizeHint();
+ TQSize sz = scrollView->sizeHint();
scrollView->setMinimumSize( sz.width()
- + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
- TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
+ + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
+ TQMIN( compGUI->sizeHint().height(), dialogHeight ) );
}
if ( mComponentGUIs.empty() ) {
Q_ASSERT( face() == Plain );
@@ -134,9 +134,9 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
"properly. It did not return any components. "
"Try running \"%1\" on the command line for more "
"information.")
- .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+ .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
TQLabel * label = new TQLabel( msg, vbox );
- label->tqsetAlignment( TQt::WordBreak );
+ label->setAlignment( 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>" ).tqarg( mName );
+ descr = TQString( "<%1>" ).arg( mName );
return descr;
}
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 65cae249..0c5f0087 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -82,7 +82,7 @@ namespace Kleo {
public:
CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
- TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
+ TQGridLayout * layout, TQWidget* parent, const char* name = 0 );
bool save();
void load();
@@ -102,7 +102,7 @@ namespace Kleo {
static CryptoConfigEntryGUI* createEntryGUI(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const TQString& entryName,
- TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
+ TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
};
/**
@@ -154,7 +154,7 @@ namespace Kleo {
CryptoConfigEntryLineEdit( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
@@ -174,7 +174,7 @@ namespace Kleo {
CryptoConfigEntryPath( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
@@ -194,7 +194,7 @@ namespace Kleo {
CryptoConfigEntryDirPath( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
@@ -214,7 +214,7 @@ namespace Kleo {
CryptoConfigEntryURL( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
@@ -234,7 +234,7 @@ namespace Kleo {
CryptoConfigEntrySpinBox( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
virtual void doLoad();
@@ -254,7 +254,7 @@ namespace Kleo {
CryptoConfigEntryCheckBox( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
virtual void doLoad();
@@ -273,7 +273,7 @@ namespace Kleo {
CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const TQString& entryName,
- TQGridLayout * tqlayout,
+ TQGridLayout * layout,
TQWidget* parent, const char* name = 0 );
virtual void doSave();
virtual void doLoad();
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 4975e381..7c576aa8 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -63,7 +63,7 @@ public:
void setPassword( const TQString& pass ) {
mPassword = pass;
- setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) );
+ setText( 4, pass.isEmpty() ? TQString() : TQString::fromLatin1( "******" ) );
}
const TQString& password() const { return mPassword; }
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 59a01461..fcc7d493 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -44,7 +44,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>20</height>
@@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>20</height>
@@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>20</height>
@@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index a4fc7d9a..e86bd1d9 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -46,7 +46,7 @@
#include <kapplication.h>
#include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqlistview.h>
@@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
// the up/down/left/right arrow cross:
TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" );
- xlay->tqsetAlignment( AlignCenter );
+ xlay->setAlignment( AlignCenter );
static const struct {
const char * icon;
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index d736399f..c901a2fd 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 = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+ const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
if( va & AlignVCenter )
r.setTop( fm.height() / 2 ); // frame rect should be
else if( va & AlignTop )
@@ -115,11 +115,11 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const {
return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
}
-TQSize KDHorizontalLine::tqsizeHint() const {
- return tqminimumSizeHint();
+TQSize KDHorizontalLine::sizeHint() const {
+ return minimumSizeHint();
}
-TQSize KDHorizontalLine::tqminimumSizeHint() const {
+TQSize KDHorizontalLine::minimumSizeHint() const {
const int w = fontMetrics().width( mTitle, mLenVisible ) +
fontMetrics().width( TQChar( ' ' ) );
const int h = fontMetrics().height();
@@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
const int h = fm.height();
const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' '));
int x;
- if ( mAlign & AlignHCenter ) // center tqalignment
+ if ( mAlign & AlignHCenter ) // center alignment
x = frameRect().width()/2 - tw/2;
- else if ( mAlign & AlignRight ) // right tqalignment
+ else if ( mAlign & AlignRight ) // right alignment
x = frameRect().width() - tw;
- else if ( mAlign & AlignLeft ) // left tqalignment
+ else if ( mAlign & AlignLeft ) // left alignment
x = 0;
else { // auto align
if( TQApplication::reverseLayout() )
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
x = 0;
}
TQRect r( x, 0, tw, h );
- int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+ int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
if ( va & AlignTop )
r.moveBy( 0, fm.descent() );
- const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
- if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+ const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+ if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
va |= NoAccel;
- tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
+ tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
}
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 466b54bc..530b8908 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -55,11 +55,11 @@ public:
TQString title() const { return mTitle; }
- /*! \reimp to hard-code the frame tqshape */
+ /*! \reimp to hard-code the frame shape */
void setFrameStyle( int style );
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
TQSizePolicy sizePolicy() const;
static int indentHint();
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index afad1fb8..706c4d9c 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -51,7 +51,7 @@
#include <tqstringlist.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqscrollview.h>
@@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
// calculate the optimal width for the dialog
const int dialogWidth = marginHint()
+ sv->frameWidth()
- + view->tqsizeHint().width()
- + sv->verticalScrollBar()->tqsizeHint().width()
+ + view->sizeHint().width()
+ + sv->verticalScrollBar()->sizeHint().width()
+ sv->frameWidth()
+ marginHint()
+ 2;
@@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
+ fontMetrics().height()
+ spacingHint()
+ sv->frameWidth()
- + view->tqsizeHint().height()
- + sv->horizontalScrollBar()->tqsizeHint().height()
+ + view->sizeHint().height()
+ + sv->horizontalScrollBar()->sizeHint().height()
+ sv->frameWidth()
+ spacingHint()
- + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
+ + actionButton( KDialogBase::Cancel )->sizeHint().height()
+ marginHint()
+ 2;
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 32d5be21..100334f2 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -81,8 +81,8 @@ namespace {
if ( !item )
return;
- const TQRect tqitemRect = mKeyListView->tqitemRect( item );
- if ( !tqitemRect.isValid() )
+ const TQRect itemRect = mKeyListView->itemRect( item );
+ if ( !itemRect.isValid() )
return;
const int col = mKeyListView->header()->sectionAt( p.x() );
@@ -93,8 +93,8 @@ namespace {
if ( !headerRect.isValid() )
return;
- const TQRect cellRect( headerRect.left(), tqitemRect.top(),
- headerRect.width(), tqitemRect.height() );
+ const TQRect cellRect( headerRect.left(), itemRect.top(),
+ headerRect.width(), itemRect.height() );
TQString tipStr;
if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) )
@@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis
Kleo::KeyListView::~KeyListView() {
d->updateTimer->stop();
- // need to clear here, since in ~TQListView, our tqchildren won't have
+ // need to clear here, since in ~TQListView, our children won't have
// a valid listView() pointing to us anymore, and their dtors try to
// unregister from us.
clear();
@@ -395,7 +395,7 @@ Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewIte
}
Kleo::KeyListViewItem::~KeyListViewItem() {
- // delete the tqchildren first... When tqchildren are deleted in the
+ // delete the children first... When children are deleted in the
// TQLVI dtor, they don't have listView() anymore, thus they don't
// call deregister( this ), leading to stale entries in the
// itemMap...
@@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) {
if ( const TQPixmap * pix = cs->pixmap( key, i ) )
setPixmap( i, *pix );
}
- tqrepaint();
+ repaint();
}
TQString Kleo::KeyListViewItem::toolTip( int col ) const {
@@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi
return listView()->columnStrategy()->compare( this->key(), that->key(), col );
}
-void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
return;
}
const TQColor fg = ds->keyForeground( key(), cg.text() );
@@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i
_cg.setColor( TQColorGroup::Text, fg );
_cg.setColor( TQColorGroup::Base, bg );
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) {
@@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a
return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col );
}
-void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
return;
}
const TQColor fg = ds->subkeyForeground( subkey(), cg.text() );
@@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
_cg.setColor( TQColorGroup::Text, fg );
_cg.setColor( TQColorGroup::Base, bg );
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
@@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a
}
-void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
return;
}
const TQColor fg = ds->useridForeground( userID(), cg.text() );
@@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
_cg.setColor( TQColorGroup::Text, fg );
_cg.setColor( TQColorGroup::Base, bg );
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
@@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo
return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col );
}
-void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
if ( !ds ) {
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
return;
}
const TQColor fg = ds->signatureForeground( signature(), cg.text() );
@@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou
_cg.setColor( TQColorGroup::Text, fg );
_cg.setColor( TQColorGroup::Base, bg );
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 38ad0f5a..ada8354e 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -91,7 +91,7 @@ namespace Kleo {
/*! \reimp */
int rtti() const { return RTTI; }
/*! \reimp */
- void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
/*! \reimp */
void insertItem( TQListViewItem * item );
/*! \reimp */
@@ -127,7 +127,7 @@ namespace Kleo {
/*! \reimp */
int rtti() const { return RTTI; }
/*! \reimp */
- void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
private:
GpgME::Subkey mSubkey;
@@ -159,7 +159,7 @@ namespace Kleo {
/*! \reimp */
int rtti() const { return RTTI; }
/*! \reimp */
- void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
private:
GpgME::UserID mUserID;
@@ -191,7 +191,7 @@ namespace Kleo {
/*! \reimp */
int rtti() const { return RTTI; }
/*! \reimp */
- void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+ void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
private:
GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index ebde2c16..f793c0fa 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -72,7 +72,7 @@
// TQt
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -117,7 +117,7 @@ void Kleo::KeyRequester::init()
// the button to unset any key:
mEraseButton = new KPushButton( this );
mEraseButton->setAutoDefault( false );
- mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+ mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
TQSizePolicy::Minimum ) );
mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) );
TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -133,7 +133,7 @@ void Kleo::KeyRequester::init()
connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+ setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
setAllowedKeys( mKeyUsage );
@@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, 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>" )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
}
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index f017f202..998ff112 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -70,7 +70,7 @@
#include <tqlabel.h>
#include <tqpixmap.h>
#include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
@@ -248,19 +248,19 @@ namespace {
"Created: %2\n"
"Expiry: %3\n"
"Fingerprint: %4" )
- .tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+ .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
creation, expiry,
- fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
+ fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
else
return i18n( "S/MIME key for %1\n"
"Created: %2\n"
"Expiry: %3\n"
"Fingerprint: %4\n"
"Issuer: %5" )
- .tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+ .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
creation, expiry,
- fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
- .tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+ fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
+ .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
}
const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const {
@@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
KActiveLabel *textLabel = new KActiveLabel( text, page );
disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
- textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+ textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
} else {
KActiveLabel *textLabel = new KActiveLabel( text, page );
- textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+ textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
mTopLayout->addWidget( textLabel );
}
}
@@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, 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>" )
- .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+ .arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
}
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 2dfe083d..429f7d01 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -48,11 +48,11 @@
#include <kguiitem.h>
#include <kdebug.h>
-#include <tqtextedit.h>
-#include <tqtextstream.h>
+#include <textedit.h>
+#include <textstream.h>
#include <tqvbox.h>
#include <tqapplication.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <gpg-error.h>
@@ -127,7 +127,7 @@ private:
if ( const int err = file.status() )
KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
- .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+ .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
i18n("File Save Error") );
}
void slotUser2() {
@@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString &
if ( err.code() != GPG_ERR_NO_DATA ) {
KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
- .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
+ .arg( TQString::fromLocal8Bit( err.asString() ) ),
i18n("GnuPG Audit Log Error") );
return;
}
@@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * parent, const TQString & log ) {
static TQString to_information_string( const SigningResult & result ) {
return result.error()
- ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+ ? i18n("Signing failed: %1").arg( 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").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+ ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
: i18n("Encryption successful") ;
}
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index c97493d3..9ef0bad2 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -57,7 +57,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfontmetrics.h>
struct Kleo::PassphraseDialog::Private {
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index e0149b8f..d6552922 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" ).tqarg( mBaseText, what ) );
+ setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
setProgress( current, total );
}
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index b111b081..fd9e601b 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.tqresize( oldSize + data.size(), TQGArray::SpeedOptim );
+ m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim );
memcpy( m_data.data() + oldSize, data.data(), data.size() );
}
diff --git a/doc/api/doxygen.css b/doc/api/doxygen.css
index 9e45a547..e059f34a 100644
--- a/doc/api/doxygen.css
+++ b/doc/api/doxygen.css
@@ -362,7 +362,7 @@ display: none;
@media aural { .doNotDisplay {
display: inline;
}}
-/* Stylesheet that handles PIM-specific classes and tqlayout */
+/* Stylesheet that handles PIM-specific classes and layout */
#content h1
{
diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp
index f8d23b7a..49f42494 100644
--- a/indexlib/boost-compat/config/abi/borland_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp
@@ -8,11 +8,11 @@
// -b (on or off - effect emum sizes)
// -Vx (on or off - empty members)
// -Ve (on or off - empty base classes)
-// -aX (tqalignment - 5 options).
+// -aX (alignment - 5 options).
// -pX (Calling convention - 4 options)
-// -VmX (member pointer size and tqlayout - 5 options)
+// -VmX (member pointer size and layout - 5 options)
// -VC (on or off, changes name mangling)
-// -Vl (on or off, changes struct tqlayout).
+// -Vl (on or off, changes struct layout).
// In addition the following warnings are sufficiently annoying (and
// unfixable) to have them turned off by default:
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp
index c83e9af6..5a4a9d47 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.hpp
@@ -67,12 +67,12 @@
// BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any
// prefix/suffix headers that normally control things like struct
-// packing and tqalignment.
+// packing and alignment.
// #define BOOST_DISABLE_ABI_HEADERS
// BOOST_ABI_PREFIX: A prefix header to include in place of whatever
// boost.config would normally select, any replacement should set up
-// struct packing and tqalignment options as required.
+// struct packing and alignment options as required.
// #define BOOST_ABI_PREFIX my-header-name
// BOOST_ABI_SUFFIX: A suffix header to include in place of whatever
diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui
index 6744c23a..6d7be869 100644
--- a/kabc/frontend/mainWindow.ui
+++ b/kabc/frontend/mainWindow.ui
@@ -277,7 +277,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -540,7 +540,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -867,7 +867,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1011,7 +1011,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kaddressbook/TODO b/kaddressbook/TODO
index 83f33587..df0db82b 100644
--- a/kaddressbook/TODO
+++ b/kaddressbook/TODO
@@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten)
file to get a list of views) - DONE
- Redo and move the DCOP interface - 50%
- Cleanup the tableview more - DONE
-- Retqlayout the edit contact dialog - DONE
+- Relayout the edit contact dialog - DONE
- Remove ContactEntry*. Impelement supporting classes required
for this. - DONE
- Update the way the ConfigureView dialog gets the view config page - DONE
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index cc71bd4f..1008169e 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -26,13 +26,13 @@
#include <tqcheckbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
#include <tqsignal.h>
#include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
@@ -82,25 +82,25 @@ class TabPressEater : public TQObject
AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
- tqlayout->setSpacing( KDialog::spacingHint() );
+ TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 );
+ layout->setSpacing( KDialog::spacingHint() );
mTypeCombo = new AddressTypeCombo( mAddressList, this );
connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
TQT_SLOT( updateAddressEdit() ) );
- tqlayout->addWidget( mTypeCombo );
+ layout->addWidget( mTypeCombo );
mAddressField = new KActiveLabel( this );
mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
mAddressField->setMinimumHeight( 20 );
- mAddressField->tqsetAlignment( TQt::AlignTop );
+ mAddressField->setAlignment( TQt::AlignTop );
mAddressField->setTextFormat( TQt::PlainText );
- tqlayout->addWidget( mAddressField );
+ layout->addWidget( mAddressField );
mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
- tqlayout->addWidget( mEditButton );
+ layout->addWidget( mEditButton );
}
AddressEditWidget::~AddressEditWidget()
@@ -273,8 +273,8 @@ 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:" ).tqarg( KABC::Address::streetLabel() ), page );
- label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
+ TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
+ label->setAlignment( TQt::AlignTop | TQt::AlignLeft );
topLayout->addWidget( label, 1, 0 );
mStreetTextEdit = new TQTextEdit( page );
mStreetTextEdit->setTextFormat( TQt::PlainText );
@@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
mStreetTextEdit->installEventFilter( eater );
- label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).tqarg( KABC::Address::postOfficeBoxLabel() ), page );
+ label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( 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:" ).tqarg( KABC::Address::localityLabel() ), page );
+ label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( 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:" ).tqarg( KABC::Address::regionLabel() ), page );
+ label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( 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:" ).tqarg( KABC::Address::postalCodeLabel() ), page );
+ label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( 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:" ).tqarg( KABC::Address::countryLabel() ), page );
+ label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page );
topLayout->addWidget( label, 6, 0 );
mCountryCombo = new KComboBox( page );
mCountryCombo->setEditable( true );
@@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
parent, "AddressTypeDialog" )
{
TQWidget *page = plainPage();
- TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
+ TQVBoxLayout *layout = new TQVBoxLayout( page );
mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
- tqlayout->addWidget( mGroup );
+ layout->addWidget( mGroup );
mTypeList = KABC::Address::typeList();
mTypeList.remove( KABC::Address::Pref );
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index a742c3f7..b2e9345d 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -22,7 +22,7 @@
*/
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
TQWidget *page = plainPage();
- TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
+ TQVBoxLayout *layout = new TQVBoxLayout( page );
if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) {
mEditorWidget = new SimpleAddresseeEditor( page );
@@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
mEditorWidget = new AddresseeEditorWidget( page );
}
connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) );
- tqlayout->addWidget( mEditorWidget );
+ layout->addWidget( mEditorWidget );
enableButton( KDialogBase::Apply, false );
@@ -147,7 +147,7 @@ void AddresseeEditorDialog::slotCancel()
void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr )
{
if ( !addr.realName().isEmpty() )
- setCaption( i18n( "Edit Contact '%1'" ).tqarg( addr.realName() ) );
+ setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) );
}
#include "addresseeeditordialog.moc"
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index 72e119d9..f2719f5b 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <klocale.h>
@@ -36,14 +36,14 @@
AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
: KAB::ExtensionWidget( core, parent, name )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor )
mAddresseeEditor = new SimpleAddresseeEditor( this );
else
mAddresseeEditor = new AddresseeEditorWidget( this );
- tqlayout->addWidget( mAddresseeEditor );
+ layout->addWidget( mAddresseeEditor );
}
AddresseeEditorExtension::~AddresseeEditorExtension()
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 6d2e2ea8..690f9fd5 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -24,11 +24,11 @@
#include <tqcheckbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqtabwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
@@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& )
void AddresseeEditorWidget::initGUI()
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
mTabWidget = new TQTabWidget( this );
- tqlayout->addWidget( mTabWidget );
+ layout->addWidget( mTabWidget );
setupTab1();
setupTab2();
@@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1()
// This is the General tab
TQWidget *tab1 = new TQWidget( mTabWidget );
- TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 );
- tqlayout->setMargin( KDialogBase::marginHint() );
- tqlayout->setSpacing( KDialogBase::spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 );
+ layout->setMargin( KDialogBase::marginHint() );
+ layout->setSpacing( KDialogBase::spacingHint() );
TQLabel *label;
KSeparator* bar;
@@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1()
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
KIcon::SizeMedium ) );
- tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
+ layout->addMultiCellWidget( label, 0, 1, 0, 0 );
// First name
button = new TQPushButton( i18n( "Edit Name..." ), tab1 );
@@ -178,76 +178,76 @@ void AddresseeEditorWidget::setupTab1()
mNameLabel->show();
}
- tqlayout->addWidget( button, 0, 1 );
- tqlayout->addWidget( mNameEdit, 0, 2 );
- tqlayout->addWidget( mNameLabel, 0, 2 );
- label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).tqarg( KABC::Addressee::roleLabel() ), tab1 );
+ layout->addWidget( button, 0, 1 );
+ layout->addWidget( mNameEdit, 0, 2 );
+ layout->addWidget( mNameLabel, 0, 2 );
+ label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
mRoleEdit = new KLineEdit( tab1 );
connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mRoleEdit );
- tqlayout->addWidget( label, 1, 1 );
- tqlayout->addWidget( mRoleEdit, 1, 2 );
+ layout->addWidget( label, 1, 1 );
+ layout->addWidget( mRoleEdit, 1, 2 );
// Organization
- label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).tqarg( KABC::Addressee::organizationLabel() ), tab1 );
+ label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
mOrgEdit = new KLineEdit( tab1 );
label->setBuddy( mOrgEdit );
connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( organizationTextChanged( const TQString& ) ) );
- tqlayout->addWidget( label, 2, 1 );
- tqlayout->addWidget( mOrgEdit, 2, 2 );
+ layout->addWidget( label, 2, 1 );
+ layout->addWidget( mOrgEdit, 2, 2 );
// File as (formatted name)
label = new TQLabel( i18n( "Formatted name:" ), tab1 );
mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
- tqlayout->addWidget( label, 3, 1 );
- tqlayout->addWidget( mFormattedNameLabel, 3, 2 );
+ layout->addWidget( label, 3, 1 );
+ layout->addWidget( mFormattedNameLabel, 3, 2 );
// Left hand separator. This separator doesn't go all the way
// across so the dialog still flows from top to bottom
bar = new KSeparator( KSeparator::HLine, tab1 );
- tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 );
+ layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
//////////////////////////////////////
// Phone numbers (upper right)
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook",
KIcon::Desktop, KIcon::SizeMedium ) );
- tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 );
+ layout->addMultiCellWidget( label, 0, 1, 3, 3 );
mPhoneEditWidget = new PhoneEditWidget( tab1 );
connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
- tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
+ layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
bar = new KSeparator( KSeparator::HLine, tab1 );
- tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 );
+ layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
//////////////////////////////////////
// Addresses (lower left)
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop,
KIcon::SizeMedium ) );
- tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 );
+ layout->addMultiCellWidget( label, 5, 6, 0, 0 );
mAddressEditWidget = new AddressEditWidget( tab1 );
connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
- tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
+ layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
//////////////////////////////////////
// Email / Web (lower right)
label = new TQLabel( tab1 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop,
KIcon::SizeMedium ) );
- tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 );
+ layout->addMultiCellWidget( label, 5, 6, 3, 3 );
mEmailWidget = new EmailEditWidget( tab1 );
connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
- tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
+ layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
// add the separator
bar = new KSeparator( KSeparator::HLine, tab1 );
- tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 );
+ layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 );
@@ -256,14 +256,14 @@ void AddresseeEditorWidget::setupTab1()
KIcon::SizeMedium ) );
homePageLayout->addWidget( label );
- label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).tqarg( KABC::Addressee::urlLabel() ), tab1 );
+ label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
mURLEdit = new KLineEdit( tab1 );
connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mURLEdit );
homePageLayout->addWidget( label );
homePageLayout->addWidget( mURLEdit );
- tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
+ layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 );
label = new TQLabel( i18n("Blog feed:"), tab1 );
@@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1()
connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
TQT_SLOT( textChanged( const TQString & ) ) );
label->setBuddy( mBlogEdit );
- tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
+ layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
mIMWidget = new IMEditWidget( tab1, mAddressee );
connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
- tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
+ layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
- tqlayout->addColSpacing( 6, 50 );
+ layout->addColSpacing( 6, 50 );
bar = new KSeparator( KSeparator::HLine, tab1 );
- tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 );
+ layout->addMultiCellWidget( bar, 11, 11, 0, 6 );
///////////////////////////////////////
TQHBox *categoryBox = new TQHBox( tab1 );
@@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1()
mSecrecyWidget = new SecrecyWidget( categoryBox );
connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
- tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
+ layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
- // Build the tqlayout and add to the tab widget
- tqlayout->activate(); // required
+ // Build the layout and add to the tab widget
+ layout->activate(); // required
mTabWidget->addTab( tab1, i18n( "&General" ) );
}
@@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2()
// This is the Details tab
TQWidget *tab2 = new TQWidget( mTabWidget );
- TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 );
- tqlayout->setMargin( KDialogBase::marginHint() );
- tqlayout->setSpacing( KDialogBase::spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 );
+ layout->setMargin( KDialogBase::marginHint() );
+ layout->setSpacing( KDialogBase::spacingHint() );
TQLabel *label;
KSeparator* bar;
@@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2()
label = new TQLabel( tab2 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop,
KIcon::SizeMedium ) );
- tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
+ layout->addMultiCellWidget( label, 0, 1, 0, 0 );
label = new TQLabel( i18n( "Department:" ), tab2 );
- tqlayout->addWidget( label, 0, 1 );
+ layout->addWidget( label, 0, 1 );
mDepartmentEdit = new KLineEdit( tab2 );
connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mDepartmentEdit );
- tqlayout->addWidget( mDepartmentEdit, 0, 2 );
+ layout->addWidget( mDepartmentEdit, 0, 2 );
label = new TQLabel( i18n( "Office:" ), tab2 );
- tqlayout->addWidget( label, 1, 1 );
+ layout->addWidget( label, 1, 1 );
mOfficeEdit = new KLineEdit( tab2 );
connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mOfficeEdit );
- tqlayout->addWidget( mOfficeEdit, 1, 2 );
+ layout->addWidget( mOfficeEdit, 1, 2 );
label = new TQLabel( i18n( "Profession:" ), tab2 );
- tqlayout->addWidget( label, 2, 1 );
+ layout->addWidget( label, 2, 1 );
mProfessionEdit = new KLineEdit( tab2 );
connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mProfessionEdit );
- tqlayout->addWidget( mProfessionEdit, 2, 2 );
+ layout->addWidget( mProfessionEdit, 2, 2 );
label = new TQLabel( i18n( "Manager\'s name:" ), tab2 );
- tqlayout->addWidget( label, 0, 3 );
+ layout->addWidget( label, 0, 3 );
mManagerEdit = new KPIM::AddresseeLineEdit( tab2 );
connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mManagerEdit );
- tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
+ layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
label = new TQLabel( i18n( "Assistant's name:" ), tab2 );
- tqlayout->addWidget( label, 1, 3 );
+ layout->addWidget( label, 1, 3 );
mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 );
connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mAssistantEdit );
- tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
+ layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
- label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).tqarg( KABC::Addressee::titleLabel() ), tab2 );
- tqlayout->addWidget( label, 2, 3 );
+ label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+ layout->addWidget( label, 2, 3 );
mTitleEdit = new KLineEdit( tab2 );
connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mTitleEdit );
- tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
+ layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
bar = new KSeparator( KSeparator::HLine, tab2 );
- tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 );
+ layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
/////////////////////////////////////////////////
// Personal info
@@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2()
label = new TQLabel( tab2 );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
KIcon::SizeMedium ) );
- tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 );
+ layout->addMultiCellWidget( label, 4, 5, 0, 0 );
label = new TQLabel( i18n( "Nickname:" ), tab2 );
- tqlayout->addWidget( label, 4, 1 );
+ layout->addWidget( label, 4, 1 );
mNicknameEdit = new KLineEdit( tab2 );
connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mNicknameEdit );
- tqlayout->addWidget( mNicknameEdit, 4, 2 );
+ layout->addWidget( mNicknameEdit, 4, 2 );
label = new TQLabel( i18n( "Partner's name:" ), tab2 );
- tqlayout->addWidget( label, 5, 1 );
+ layout->addWidget( label, 5, 1 );
mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 );
connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
label->setBuddy( mSpouseEdit );
- tqlayout->addWidget( mSpouseEdit, 5, 2 );
+ layout->addWidget( mSpouseEdit, 5, 2 );
label = new TQLabel( i18n( "Birthdate:" ), tab2 );
- tqlayout->addWidget( label, 4, 3 );
+ layout->addWidget( label, 4, 3 );
mBirthdayPicker = new KDateEdit( tab2 );
connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
TQT_SLOT( dateChanged( const TQDate& ) ) );
connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( emitModified() ) );
label->setBuddy( mBirthdayPicker );
- tqlayout->addWidget( mBirthdayPicker, 4, 4 );
+ layout->addWidget( mBirthdayPicker, 4, 4 );
label = new TQLabel( i18n( "Anniversary:" ), tab2 );
- tqlayout->addWidget( label, 5, 3 );
+ layout->addWidget( label, 5, 3 );
mAnniversaryPicker = new KDateEdit( tab2 );
connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
TQT_SLOT( dateChanged( const TQDate& ) ) );
connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( emitModified() ) );
label->setBuddy( mAnniversaryPicker );
- tqlayout->addWidget( mAnniversaryPicker, 5, 4 );
+ layout->addWidget( mAnniversaryPicker, 5, 4 );
bar = new KSeparator( KSeparator::HLine, tab2 );
- tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 );
+ layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
//////////////////////////////////////
// Notes
label = new TQLabel( i18n( "Note:" ), tab2 );
- label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft );
- tqlayout->addWidget( label, 7, 0 );
+ label->setAlignment( TQt::AlignTop | TQt::AlignLeft );
+ layout->addWidget( label, 7, 0 );
mNoteEdit = new TQTextEdit( tab2 );
mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
- mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() );
+ mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) );
label->setBuddy( mNoteEdit );
- tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
+ layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
- // Build the tqlayout and add to the tab widget
- tqlayout->activate(); // required
+ // Build the layout and add to the tab widget
+ layout->activate(); // required
mTabWidget->addTab( tab2, i18n( "&Details" ) );
}
@@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
page->addWidget( widget );
}
- // query the tqlayout update
+ // query the layout update
TQDictIterator<ContactEditorTabPage> it( mTabPages );
for ( ; it.current(); ++it )
it.current()->updateLayout();
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index d63a33fa..d2ac4cf7 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -23,7 +23,7 @@
#include <tqbuttongroup.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqradiobutton.h>
@@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
TQWidget *page = plainPage();
- TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 );
- tqlayout->setSpacing( spacingHint() );
- tqlayout->setRowStretch( 1, 1 );
- tqlayout->setColStretch( 1, 1 );
+ TQGridLayout *layout = new TQGridLayout( page, 2, 2 );
+ layout->setSpacing( spacingHint() );
+ layout->setRowStretch( 1, 1 );
+ layout->setColStretch( 1, 1 );
TQLabel *label = new TQLabel( i18n( "View name:" ), page );
- tqlayout->addWidget( label, 0, 0 );
+ layout->addWidget( label, 0, 0 );
mViewNameEdit = new TQLineEdit( page );
connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
- tqlayout->addWidget( mViewNameEdit, 0, 1 );
+ layout->addWidget( mViewNameEdit, 0, 1 );
mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
- tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
- TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
+ layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
+ TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 );
groupLayout->setSpacing( spacingHint() );
int row = 0;
@@ -69,7 +69,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()),
mTypeGroup, (*iter)->type().latin1() );
label = new TQLabel( (*iter)->description(), mTypeGroup );
- label->tqsetAlignment( TQt::WordBreak );
+ label->setAlignment( TQt::WordBreak );
groupLayout->addWidget( button, row, 0, TQt::AlignTop );
groupLayout->addWidget( label, row, 1, TQt::AlignTop );
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index 9ba59052..753c6cc9 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -26,11 +26,11 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqdatetimeedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqspinbox.h>
#include <tqregexp.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqwidgetfactory.h>
#include <kdatepicker.h>
@@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly )
void AdvancedCustomFields::initGUI( const TQString &uiFile )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
mFields = new KPIM::DesignerFields( uiFile, this );
- tqlayout->addWidget( mFields );
+ layout->addWidget( mFields );
connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) );
}
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index 910fc151..932f6f10 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" ).tqarg( baseGroup ).tqarg( i ) );
+ config->deleteGroup( TQString( "%1_%2" ).arg( baseGroup ).arg( 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" ).tqarg( baseGroup )
- .tqarg( index ) );
+ KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup )
+ .arg( 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" ).tqarg( baseGroup ).tqarg( i ) );
+ KConfigGroupSaver s( config, TQString( "%1_%2" ).arg( baseGroup ).arg( i ) );
f.restore( config );
}
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index 35abdd04..c0c92bdc 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase
void setLocationMapURL( const TQString &locationMapURL )
{
- if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) )
+ if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) )
mLocationMapURL = locationMapURL;
}
@@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase
void setLocationMapURLs( const TQStringList &locationMapURLs )
{
- if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) )
+ if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) )
mLocationMapURLs = locationMapURLs;
}
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 0e1d4e9c..2fbda71c 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().tqarg( KGlobal::locale()->country() );
+ TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( 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 1e3677c5..c4f65e6c 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <kdialog.h>
@@ -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" ).tqarg( KAB_CEW_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) );
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index 5c7ff9fb..6bc418eb 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -96,7 +96,7 @@ class ContactEditorTabPage : public TQWidget
void setReadOnly( bool readOnly );
/**
- Calculates the tqlayout of the widgets and moves them to the
+ Calculates the layout of the widgets and moves them to the
correct position.
*/
void updateLayout();
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 1466e990..54571a23 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -25,7 +25,7 @@
#include <tqdatetimeedit.h>
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqvalidator.h>
#include <tqspinbox.h>
@@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
{
TQWidget *page = plainPage();
- TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
TQLabel *label = new TQLabel( i18n( "Title:" ), page );
- tqlayout->addWidget( label, 0, 0 );
+ layout->addWidget( label, 0, 0 );
mTitle = new KLineEdit( page );
mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) );
label->setBuddy( mTitle );
- tqlayout->addWidget( mTitle, 0, 1 );
+ layout->addWidget( mTitle, 0, 1 );
label = new TQLabel( i18n( "Type:" ), page );
- tqlayout->addWidget( label, 1, 0 );
+ layout->addWidget( label, 1, 0 );
mType = new KComboBox( page );
label->setBuddy( mType );
- tqlayout->addWidget( mType, 1, 1 );
+ layout->addWidget( mType, 1, 1 );
mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page );
mGlobal->setChecked( true );
- tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
+ layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
this, TQT_SLOT( nameChanged( const TQString& ) ) );
@@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name )
FieldWidget::FieldWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
- mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
- mGlobalLayout->tqsetAlignment( TQt::AlignTop );
+ mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
+ mGlobalLayout->setAlignment( TQt::AlignTop );
mSeparator = new TQFrame( this );
mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
mSeparator->hide();
- tqlayout->addWidget( mSeparator );